Merge remote-tracking branch 'origin/main' into ax/step1

Author: alxiong

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

@@ -13,7 +13,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         submodules: recursive
         fetch-depth: 0
@@ -50,7 +50,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         submodules: recursive
         fetch-depth: 0
@@ -74,7 +74,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         submodules: recursive
         fetch-depth: 0
@@ -99,7 +99,7 @@ jobs:
   build-docker:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         submodules: recursive
         fetch-depth: 0
@@ -116,7 +116,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 25
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         submodules: recursive
         fetch-depth: 0

.github/workflows/push-docker.yml

@@ -12,7 +12,7 @@ jobs:
     outputs:
       tag: ${{ steps.set-tag.outputs.tag }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         submodules: recursive
         fetch-depth: 0

.gitignore

@@ -35,6 +35,7 @@ __pycache__/
 
 # Rust bindings for smart contracts
 timeboost-contract/src/bindings
+foundry.lock
 
 # env var files that may contains secrets
 .env*

Cargo.lock

@@ -36,8 +36,8 @@ check-individually:
     cargo check -p $pkg || exit 1; \
   done
 
-fmt:
-  cargo +nightly fmt --all
+fmt *ARGS='--all':
+  cargo +nightly fmt {{ARGS}}
 
 fmt_check:
   cargo +nightly fmt --check

justfile

@@ -157,7 +157,7 @@ where
             keypair,
             state: State::Startup,
             clock: ConsensusTime(Default::default()),
-            nodes: NodeInfo::new(&committee),
+            nodes: NodeInfo::new(&committee, committee.quorum_size()),
             dag: Dag::new(committee.size()),
             round: RoundNumber::genesis(),
             committed_round: RoundNumber::genesis(),

sailfish-consensus/src/lib.rs

@@ -1,3 +1,5 @@
+use std::num::NonZeroUsize;
+
 use multisig::{Committee, PublicKey};
 
 #[derive(Debug)]
@@ -7,10 +9,10 @@ pub struct NodeInfo<T> {
 }
 
 impl<T: Default + PartialOrd> NodeInfo<T> {
-    pub fn new(c: &Committee) -> Self {
+    pub fn new(c: &Committee, q: NonZeroUsize) -> Self {
         Self {
             nodes: c.parties().map(|k| (*k, T::default())).collect(),
-            quorum: c.quorum_size().get(),
+            quorum: q.get(),
         }
     }
 

sailfish-types/src/nodeinfo.rs

@@ -37,6 +37,10 @@ while [[ $# -gt 0 ]]; do
             rounds="$2"
             shift 2
             ;;
+        -t|--tps)
+            tps="$2"
+            shift 2
+            ;;
         --nitro)
             nitro_enabled=true
             shift

scripts/run-timeboost-demo

@@ -8,13 +8,15 @@ rust-version.workspace = true
 [dependencies]
 alloy = { workspace = true }
 async-trait = { workspace = true }
+blake3 = { workspace = true }
 bytes = { workspace = true }
 cliquenet = { path = "../cliquenet", features = ["turmoil"] }
 committable = { workspace = true }
 crossbeam-queue = { workspace = true }
 futures = { workspace = true }
 metrics = { path = "../metrics" }
 multisig = { path = "../multisig" }
+parking_lot = { workspace = true }
 portpicker = { workspace = true }
 rand = { workspace = true }
 sailfish = { path = "../sailfish", features = ["test"] }

tests/Cargo.toml

@@ -118,6 +118,7 @@ where
             .sign_keypair(kpair)
             .dh_keypair(xpair)
             .address(pa)
+            .recover(recover_index.map(|r| r == i).unwrap_or(false))
             .committee(produce_committee.clone())
             .build();
         enc_keys.push(enc_key);