Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small fix and changes #98

Merged
merged 2 commits into from
Jan 19, 2025
Merged

Small fix and changes #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c057ad7
fix(prt-client): block timestamp -> block number
stephenctw Jan 19, 2025
bbfcb95
chore(prt-rollups): add convenient just targets to run test from root
stephenctw Jan 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,18 @@ build-release-rust-workspace *ARGS: bind

build: build-smart-contracts bind build-rust-workspace



build-docker-image TAG="dave:dev":
docker build -f test/Dockerfile -t {{TAG}} .

run-dockered +CMD: build-docker-image
docker run -it dave:dev {{CMD}}

docker run -it --rm --name dave-node dave:dev {{CMD}}
exec-dockered +CMD:
docker exec dave-node {{CMD}}

test-rollups-echo:
just -f ./prt/tests/rollups/justfile test-echo
view-rollups-echo:
just -f ./prt/tests/rollups/justfile read-node-logs

hello:
echo $(echo "Hello")
28 changes: 14 additions & 14 deletions prt/client-lua/player/reader.lua
View file
Open in desktop
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 All @@ -129,7 +129,7 @@ function Reader:new(endpoint)
return reader
end

function Reader._get_block(block)
function Reader._get_block_number(block)
local cmd = string.format("cast block " .. block .. " 2>&1")

local handle = io.popen(cmd)
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_number("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