Hotshot confirmations Nitro-Timeboost CI (#476)

* log error if we cant connect to nitro node, delayed inbox cleanup

* add submodule for test node

* bring up test node in background

* update to latest commit

* debugging

* more testing

* more testing

* more logging

* make debug level

* print docker status

* dont use espresso dev node, send to decaf

* remove debugging

* update submodule

* try docker fix

* fix

* print out docker logs

* fix

* update

* bind to all interfaces

* update test-node

* use release

* address comment

* fixes for config

* Update timeboost/src/forwarder/nitro_forwarder.rs

Co-authored-by: Toralf Wittner <[email protected]>

* latest

* only display logs on failure

---------

Co-authored-by: Toralf Wittner <[email protected]>

Author: lukeiannucci

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

@@ -180,22 +180,23 @@ jobs:
       run: rustup component add --toolchain nightly rustfmt
     - name: Install Foundry
       uses: foundry-rs/foundry-toolchain@v1
-    - name: Clone Espresso Testnode Repository
-      run: |
-        git clone --recursive https://github.com/EspressoSystems/decentralized-timeboost-nitro-testnode.git
     - name: Run Test Node with Timeboost
       run: |
-        cd decentralized-timeboost-nitro-testnode
-        chmod +x test-node.bash
-        ./test-node.bash \
+        ./test-node/test-node.bash \
           --build-dev-nitro \
           --batchposters 0 \
           --redundantsequencers 1 \
           --decentralized-timeboost \
           --init &
-        cd ..
     - name: Run test timeboost with nitro sequencer
       run: just run_demo --ignore-stamp -c test-configs/nitro-ci-committee --rounds 10000 --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
+    - name: Docker Logs Sequencer 2
+      if: failure()
+      run: docker logs test-node-sequencer_b-1
+

.gitmodules

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

justfile

@@ -119,7 +119,7 @@ mkconfig_docker DATETIME *ARGS:
 mkconfig_nitro DATETIME *ARGS:
   cargo run --bin mkconfig -- -n 2 \
     --public-addr "127.0.0.1:8000" \
-    --internal-addr "127.0.0.1:8003" \
+    --internal-addr "0.0.0.0:8003" \
     --http-api "127.0.0.1:8004" \
     --nitro-addr "localhost:55000" \
     --chain-namespace 412346 \

scripts/run-timeboost-demo

@@ -101,7 +101,7 @@ fi
 RUST_LOG=${RUST_LOG:-}
 
 if [ -z "$RUST_LOG" ]; then
-    RUST_LOG="sailfish=info,timeboost=info,sailfish_consensus=warn,cliquenet=warn,sailfish_rbc=info"
+    RUST_LOG="sailfish=info,timeboost=info,sailfish_consensus=warn,cliquenet=warn,sailfish_rbc=info,robusta=debug"
 fi
 
 cmd=("test-contract-deploy" "--keep-anvil")

scripts/test-contract-deploy

@@ -77,14 +77,14 @@ sleep 1
 cast send --value 1ether --private-key "$FAUCET_PRIVATE_KEY" "$MANAGER_ADDRESS"
 
 # Run the deploy command
-RUST_LOG=info cargo run --bin deploy -- -m "$MANAGER_MNEMONIC" -i "$MANAGER_ACCOUNT_INDEX" -u "$URL" -o "$DEPLOYMENT_FILE"
+RUST_LOG=info cargo run --release --bin deploy -- -m "$MANAGER_MNEMONIC" -i "$MANAGER_ACCOUNT_INDEX" -u "$URL" -o "$DEPLOYMENT_FILE"
 
 # Extract the deployed KeyManager address
 km_addr=$(sed -nr 's/^key_manager.*=.*"(.+)"/\1/p' "$DEPLOYMENT_FILE")
 
 # Update the contract
 committee_config="test-configs/$COMMITTEE_PATH/committee.toml"
-RUST_LOG=info cargo run --bin register -- -m "$MANAGER_MNEMONIC" -i "$MANAGER_ACCOUNT_INDEX" -u "$URL" -k "$km_addr" -c "$committee_config"
+RUST_LOG=info cargo run --release --bin register -- -m "$MANAGER_MNEMONIC" -i "$MANAGER_ACCOUNT_INDEX" -u "$URL" -k "$km_addr" -c "$committee_config"
 
 # Finally, clean up the temporary deployment file
 rm -f "$DEPLOYMENT_FILE"

test-configs/nitro-ci-committee/node_0.toml

@@ -5,7 +5,7 @@ address = "127.0.0.1:8000"
 http_api = "127.0.0.1:8004"
 
 [net.internal]
-address = "127.0.0.1:8003"
+address = "0.0.0.0:8003"
 nitro = "localhost:55000"
 
 [keys.signing]

test-configs/nitro-ci-committee/node_1.toml

@@ -5,8 +5,8 @@ address = "127.0.0.1:8010"
 http_api = "127.0.0.1:8014"
 
 [net.internal]
-address = "127.0.0.1:8013"
-nitro = "localhost:55001"
+address = "0.0.0.0:8013"
+nitro = "localhost:55010"
 
 [keys.signing]
 secret = "FWJzNGvEjFS3h1N1sSMkcvvroWwjT5LQuGkGHu9JMAYs"

test-node

@@ -6,7 +6,8 @@ use sailfish::rbc::RbcConfig;
 use sailfish::types::CommitteeVec;
 use timeboost_config::ChainConfig;
 use timeboost_crypto::prelude::DkgDecKey;
-use timeboost_types::{Address, DelayedInboxIndex, KeyStore, ThresholdKeyCell};
+use timeboost_types::{Address, KeyStore, ThresholdKeyCell};
+
 #[derive(Debug, Clone, Builder)]
 pub struct SequencerConfig {
     /// The keypair to sign messages.
@@ -34,10 +35,6 @@ pub struct SequencerConfig {
     #[builder(default)]
     pub(crate) priority_addr: Address,
 
-    /// The delayed inbox index.
-    #[builder(default)]
-    pub(crate) delayed_inbox_index: DelayedInboxIndex,
-
     /// Is this sequencer recovering from a crash?
     #[builder(default = true)]
     pub(crate) recover: bool,

timeboost-sequencer/src/config.rs

@@ -38,7 +38,7 @@ pub struct Includer {
 }
 
 impl Includer {
-    pub fn new(c: Committee, i: DelayedInboxIndex) -> Self {
+    pub fn new(c: Committee) -> Self {
         let now = Timestamp::default();
         Self {
             committee: c,
@@ -47,7 +47,7 @@ impl Includer {
             time: now,
             epoch: now.into(),
             seqno: SeqNo::zero(),
-            index: i,
+            index: 0.into(),
             cache: BTreeMap::new(),
         }
     }