Skip to content

Commit

Permalink
fix(prt-client): block timestamp -> block number
Browse files Browse the repository at this point in the history
  • Loading branch information
stephenctw committed Jan 19, 2025
1 parent 513ebc0 commit 7433512
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions prt/client-lua/player/reader.lua
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ end
local CommitmentClock = {}
CommitmentClock.__index = CommitmentClock

function CommitmentClock:new(allowance, last_resume, block_time)
function CommitmentClock:new(allowance, last_resume, block_number)
local clock = {
allowance = tonumber(allowance),
last_resume = tonumber(last_resume),
block_time = tonumber(block_time)
block_number = tonumber(block_number)
}

setmetatable(clock, self)
Expand All @@ -80,18 +80,18 @@ end

function CommitmentClock:__tostring()
local c = self
local b = c.block_time
local b = c.block_number
local s
if c.last_resume == 0 then
local time_left = c.allowance
s = string.format("clock paused, %d seconds left", time_left)
local blocks_left = c.allowance
s = string.format("clock paused, %d blocks left", blocks_left)
else
local current = b
local time_left = c.allowance - (current - c.last_resume)
if time_left >= 0 then
s = string.format("clock running, %d seconds left", time_left)
local blocks_left = c.allowance - (current - c.last_resume)
if blocks_left >= 0 then
s = string.format("clock ticking, %d blocks left", blocks_left)
else
s = string.format("clock running, %d seconds overdue", -time_left)
s = string.format("clock ticking, %d blocks overdue", -blocks_left)
end
end
return s
Expand All @@ -102,7 +102,7 @@ function CommitmentClock:has_time()
if clock.last_resume == 0 then
return true
else
local current = clock.block_time
local current = clock.block_number
return (clock.last_resume + clock.allowance) > current
end
end
Expand All @@ -112,7 +112,7 @@ function CommitmentClock:time_since_timeout()
if clock.last_resume == 0 then
return
else
local current = clock.block_time
local current = clock.block_number
return current - (clock.last_resume + clock.allowance)
end
end
Expand Down Expand Up @@ -302,10 +302,10 @@ function Reader:read_commitment(tournament_address, commitment_hash)
assert(allowance)
assert(last_resume)

local block_time = Reader._get_block("latest")
local block_number = Reader._get_block("latest")

local commitment = {
clock = CommitmentClock:new(allowance, last_resume, block_time),
clock = CommitmentClock:new(allowance, last_resume, block_number),
final_state = Hash:from_digest_hex(ret[2]),
}

Expand Down

0 comments on commit 7433512

Please sign in to comment.