Merge branch 'main' into li/keymanager-address

Author: lukeiannucci

.github/workflows/build-and-test.yml

@@ -217,20 +217,15 @@ jobs:
       uses: foundry-rs/foundry-toolchain@v1
     - name: Run Test Node with Timeboost
       run: |
-        ./test-node/test-node.bash \
-          --build-dev-nitro \
-          --batchposters 0 \
-          --redundantsequencers 1 \
-          --decentralized-timeboost \
-          --init &
+        just run-integration-nitro-ci
     - name: Run test timeboost with nitro sequencer
-      run: just run-demo --ignore-stamp -c test-configs/nitro-ci --rounds 10000 --yapper --nitro http://localhost:8547
+      run: just run-demo --ignore-stamp -c test-configs/nitro-ci --rounds 10000 --nitro-senders 2 --yapper --nitro http://localhost:8547
     - name: Verify sequencer blocks
       run: |
         RUST_LOG=info just verify-blocks
     - name: Docker Logs Sequencer 1
       if: failure()
-      run: docker logs test-node-sequencer-1
+      run: docker logs timeboost-nitro0-1
     - name: Docker Logs Sequencer 2
       if: failure()
-      run: docker logs test-node-sequencer_b-1
+      run: docker logs timeboost-nitro0-1

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "contracts"]
 	path = contracts
 	url = https://github.com/EspressoSystems/timeboost-contracts.git
-[submodule "test-node"]
-	path = test-node
-	url = https://github.com/EspressoSystems/decentralized-timeboost-nitro-testnode

Cargo.lock

@@ -77,7 +77,7 @@ parking_lot = "0.12.3"
 prometheus = "0.14"
 prost = "0.14.1"
 quickcheck = "1.0.3"
-quick_cache = "0.6.16"
+quick_cache = "0.6.18"
 rand = "0.9"
 rayon = "1.10"
 rustix = { version = "1.1.2", features = ["process"] }
@@ -86,7 +86,7 @@ secp256k1 = { version = "0.31.0", features = ["global-context", "hashes", "rand"
 serde = { version = "1", features = ["derive", "rc"] }
 serde_bytes = "0.11.15"
 serde_json = { version = "1.0" }
-serde_with = "3.12.0"
+serde_with = "3.15.1"
 sha2 = { version = "0.10", default-features = false }
 smallvec = "1.15.1"
 snow = "0.10.0"

Cargo.toml

@@ -56,8 +56,8 @@ timeboost-times nodes: (build "times")
         --run   "3:scripts/deploy-contract -c test-configs/linux/committee.toml --max-nodes {{nodes}} -u http://11.0.1.0:8545" \
         --spawn "4:target/release/block-maker --bind 11.0.1.0:55000 -c test-configs/linux/committee.toml --max-nodes {{nodes}}" \
         --spawn "4:target/release/yapper -c test-configs/linux/ --max-nodes {{nodes}}" \
-        --spawn-as-root "5:target/release/run-committee -u $(id -u) -g $(id -g) -c test-configs/linux/ --times-until 10000 --max-nodes {{nodes}}" \
-        target/release/block-checker -- -c test-configs/linux -b 10000 --max-nodes {{nodes}}
+        --spawn-as-root "5:target/release/run-committee -u $(id -u) -g $(id -g) -c test-configs/linux/ --times-until 3000 --max-nodes {{nodes}}" \
+        target/release/block-checker -- -c test-configs/linux -b 3000 --max-nodes {{nodes}}
 
 plot-node gnuplot output csv:
     #!/usr/bin/env bash

benchmarks/justfile

@@ -2,9 +2,12 @@ set termopt enhanced
 set datafile separator ','
 set xlabel 'Round'
 set ylabel 'Duration (ms)'
+set key outside right bottom
+set margins 10,25,5,5
+set yrange [0:30]
 
 set term svg size 800,600 background "#FFFFFF"
 
-plot filename using 1:2 with lines lc rgb "#A0DD0000" title 'Commit latency',\
-     filename using 1:3 with lines lc rgb "#A000DD00" title 'Message validation',\
-     filename using 1:4 with lines lc rgb "#A00000DD" title 'RBC delivery'
+plot filename using 1:2 with lines lc rgb "#A000DD00" title 'Round start',\
+     filename using 1:3 with lines lc rgb "#A00000DD" title 'RBC leader info',\
+     filename using 1:4 with lines lc rgb "#A0DD0000" title 'Commit'

benchmarks/sailfish.gnuplot

@@ -2,12 +2,14 @@ set termopt enhanced
 set datafile separator ','
 set xlabel 'Round'
 set ylabel 'Duration (ms)'
+set key outside right bottom
+set margins 10,20,5,5
 
 set term svg size 800,600 background "#FFFFFF"
 
-plot filename using 1:2 with lines lc rgb "#A000DD00" title 'Message validation',\
-     filename using 1:3 with lines lc rgb "#A00000DD" title 'RBC delivery',\
-     filename using 1:4 with lines lc rgb "#A0DD0000" title 'Sailfish commit',\
-     filename using 1:5 with lines lc rgb "#A000DDDD" title 'Decrypt',\
-     filename using 1:6 with lines lc rgb "#A0DD00DD" title 'Certify', \
-     filename using 1:7 with lines lc rgb "#A0000000" title 'Sailfish commit ⟶ Certify'
+plot filename using 1:2 with lines lc rgb "#A000DD00" title 'Round start',\
+     filename using 1:3 with lines lc rgb "#A0DDDD00" title 'RBC leader info',\
+     filename using 1:4 with lines lc rgb "#A00000DD" title 'Commit',\
+     filename using 1:5 with lines lc rgb "#A0DD0000" title 'Decrypt',\
+     filename using 1:6 with lines lc rgb "#A000DDDD" title 'Certify',\
+     filename using 1:7 with lines lc rgb "#A0DD00DD" title 'Total'