Merge remote-tracking branch 'origin/main' into feat/restart-with-state

.env

@@ -34,13 +34,15 @@ ESPRESSO_SEQUENCER_L1_WS_PROVIDER=ws://demo-l1-network:$ESPRESSO_SEQUENCER_L1_WS
 ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG=true
 ESPRESSO_SEQUENCER_ETH_MNEMONIC="test test test test test test test test test test test junk"
 ESPRESSO_SEQUENCER_HOTSHOT_ACCOUNT_INDEX=5
+ESPRESSO_SEQUENCER_HOTSHOT_NUM_BLOCKS_PER_EPOCH=4294967295 # u32::MAX for now as we do not handle epochs
 ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX=8
 ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS=0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f
 ESPRESSO_COMMITMENT_TASK_PORT=60000
 ESPRESSO_SEQUENCER_DB_PORT=5432
 ESPRESSO_STATE_RELAY_SERVER_PORT=40004
 ESPRESSO_STATE_RELAY_SERVER_URL=http://state-relay-server:$ESPRESSO_STATE_RELAY_SERVER_PORT
 
+
 # Example rollup demo variables
 ESPRESSO_DEMO_ROLLUP_PORT=8084
 ESPRESSO_DEMO_L1_HTTP_PROVIDER=$ESPRESSO_SEQUENCER_L1_PROVIDER
@@ -56,6 +58,12 @@ ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_2=BLS_SIGNING_KEY~LY0x6w5BheYvEI3ro3
 ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_3=BLS_SIGNING_KEY~w4jERAaQfBdCdmlStEgj8PfIJJOWmCvbsL2wckpTfCbo
 ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_4=BLS_SIGNING_KEY~FTAq-zib6oUVGSOdIlgntYB1IelS0vK6icYW8Z8OUySv
 
+ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_0=STATEKEY~YC2YwzvFypi98JLHHEydp6EGMkcSsEZBEnByNBnajgE-
+ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_1=STATEKEY~5JJJJ9OhX320me8TUKZ15iRTVHslYyULwlDm3FG5vAOk
+ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_2=STATEKEY~IYHeI3VJfDXiTRskUfhXSp5sW7-MTiOyTwrB3cu5kwDS
+ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_3=STATEKEY~drnertCZzwwZ_KYYWTkY13jDzNS32d0YLY9t0kBQqgX2
+ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_4=STATEKEY~J_0yej2Wdg2EILyBORqyrGZPnQGXg1yIlifkgomlNAMx
+
 # Foundry
 # The mnemonic used by foundry to deploy contracts.
 MNEMONIC="test test test test test test test test test test test junk"

.github/workflows/build.yml

@@ -61,7 +61,6 @@ jobs:
             target/release/web-server
             target/release/state-relay-server
             target/release/state-prover
-            target/release/gen-demo-contract
             target/release/sequencer
             target/release/cli
             target/release/commitment-task
@@ -101,7 +100,6 @@ jobs:
             target/release/web-server
             target/release/state-relay-server
             target/release/state-prover
-            target/release/gen-demo-contract
             target/release/sequencer
             target/release/cli
             target/release/commitment-task

.github/workflows/build_static.yml

@@ -79,7 +79,6 @@ jobs:
             ${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/web-server
             ${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/state-relay-server
             ${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/state-prover
-            ${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/gen-demo-contract
             ${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/sequencer
             ${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/cli
             ${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/commitment-task

.github/workflows/test.yml

@@ -31,6 +31,8 @@ jobs:
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
+        with:
+            version: nightly-2cb875799419c907cc3709e586ece2559e6b340e # Not using the default version because likely of this bug https://github.com/foundry-rs/foundry/issues/7120
 
       - name: Install just command runner
         run: |
@@ -49,6 +51,8 @@ jobs:
         # Build test binary with `testing` feature, which requires `hotshot_example` config
         run: |
           export RUSTFLAGS="$RUSTFLAGS --cfg hotshot_example"
+          export PATH="$PWD/target/release:$PATH"
+          cargo build --bin diff-test --release
           cargo test --release --workspace --all-features --no-run
           cargo test --release --workspace --all-features --verbose -- --test-threads 1 --nocapture
         timeout-minutes: 30