From c057ad71f0935946cd4759273ed036e936377ad9 Mon Sep 17 00:00:00 2001
From: Stephen Chen <20940639+stephenctw@users.noreply.github.com>
Date: Sun, 19 Jan 2025 14:39:27 +0800
Subject: [PATCH 1/2] fix(prt-client): block timestamp -> block number

---
 prt/client-lua/player/reader.lua | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/prt/client-lua/player/reader.lua b/prt/client-lua/player/reader.lua
index 7368787..143e9a1 100644
--- a/prt/client-lua/player/reader.lua
+++ b/prt/client-lua/player/reader.lua
@@ -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)
@@ -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
@@ -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
@@ -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
@@ -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)
@@ -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]),
     }
 

From bbfcb95151fd08f38d167824d06bdbd3a62147b2 Mon Sep 17 00:00:00 2001
From: Stephen Chen <20940639+stephenctw@users.noreply.github.com>
Date: Sun, 19 Jan 2025 14:39:58 +0800
Subject: [PATCH 2/2] chore(prt-rollups): add convenient just targets to run
 test from root

---
 justfile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/justfile b/justfile
index efd9215..827a076 100644
--- a/justfile
+++ b/justfile
@@ -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")