Merge remote-tracking branch 'origin/main' into ma/sequencer-catchup

.env

@@ -12,9 +12,9 @@ ESPRESSO_ORCHESTRATOR_PORT=40001
 ESPRESSO_ORCHESTRATOR_NUM_NODES=5
 ESPRESSO_ORCHESTRATOR_START_DELAY=5s
 ESPRESSO_ORCHESTRATOR_NEXT_VIEW_TIMEOUT=30s
-ESPRESSO_ORCHESTRATOR_MIN_TRANSACTIONS=1
-ESPRESSO_ORCHESTRATOR_MIN_PROPOSE_TIME=0s
-ESPRESSO_ORCHESTRATOR_MAX_PROPOSE_TIME=1s
+ESPRESSO_ORCHESTRATOR_MIN_TRANSACTIONS=50
+ESPRESSO_ORCHESTRATOR_MIN_PROPOSE_TIME=1s
+ESPRESSO_ORCHESTRATOR_MAX_PROPOSE_TIME=2s
 ESPRESSO_CONSENSUS_SERVER_PORT=40002
 ESPRESSO_DA_SERVER_PORT=40003
 ESPRESSO_SEQUENCER_DA_SERVER_URL=http://da-server:$ESPRESSO_WEB_SERVER_PORT

.github/workflows/build_static.yml

@@ -43,7 +43,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Nix
-        uses: cachix/install-nix-action@v25
+        uses: cachix/install-nix-action@v26
 
       - name: Enable Cachix
         uses: cachix/cachix-action@v14

.github/workflows/contracts.yml

@@ -21,10 +21,11 @@ env:
 
 jobs:
   contracts:
+    timeout-minutes: 20
     runs-on: ubuntu-latest
     steps:
       - name: Install Nix
-        uses: cachix/install-nix-action@v25
+        uses: cachix/install-nix-action@v26
 
       - name: Enable Cachix
         uses: cachix/cachix-action@v14
@@ -70,9 +71,19 @@ jobs:
           git status
           git diff
 
-      - name: Run tests
+      - name: Build diff-test
         run: |
           nix develop --accept-flake-config -c cargo build --bin diff-test --release
+
+      - name: Run tests (quick version for PR)
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          export FOUNDRY_PROFILE=quick
+          nix develop --accept-flake-config -c  forge test -vvv
+
+      - name: Run tests (full version for main)
+        if: ${{ github.event_name != 'pull_request' }}
+        run: |
           nix develop --accept-flake-config -c forge test -vvv
 
       - name: Gas Report

.github/workflows/test-demo-native.yml

@@ -29,7 +29,7 @@ jobs:
         uses: foundry-rs/foundry-toolchain@v1
 
       - name: Install Nix
-        uses: cachix/install-nix-action@v25
+        uses: cachix/install-nix-action@v26
 
       - name: Install process-compose
         run: |

.github/workflows/ubuntu-install-without-nix.yml

@@ -9,19 +9,16 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-
 jobs:
-  build:
+  ubuntu:
     runs-on: ubuntu-latest
-    container:
-      image: ubuntu:latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Enable Rust Caching
+        uses: Swatinem/rust-cache@v2
+
       - name: Install and test
-        # Execute all lines that start with four spaces, and remove leading 'sudo '
-        # because we're in a container and already root.
-        run: |
-          grep '^    ' doc/ubuntu.md \
-            | sed 's/^    //' \
-            | sed 's/^sudo //' \
-            | bash -exo pipefail
+        run: scripts/ubuntu-install-test-no-nix

.github/workflows/unused-deps.yml

@@ -0,0 +1,26 @@
+on: [push]
+
+name: udeps
+
+env:
+  RUSTFLAGS: '--cfg async_executor_impl="async-std" --cfg async_channel_impl="async-std"'
+
+jobs:
+  check:
+    name: Rust project
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install nightly toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          override: true
+
+      - name: Run cargo-udeps
+        uses: aig787/cargo-udeps-action@v1
+        with:
+          version: 'latest'
+          args: '--all-targets'

.github/workflows/update_nix.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Nix
-        uses: cachix/install-nix-action@v25
+        uses: cachix/install-nix-action@v26
 
       - uses: cachix/cachix-action@v14
         with:

Cargo.toml

@@ -32,6 +32,7 @@ async-compatibility-layer = { git = "https://github.com/EspressoSystems/async-co
 ] }
 async-std = "1.12.0"
 async-trait = "0.1.77"
+base64 = "0.22"
 clap = { version = "4.4", features = ["derive", "env"] }
 cld = "0.5"
 derive_more = "0.99.17"

README.md

@@ -4,6 +4,7 @@
 [![Contracts](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/contracts.yml/badge.svg)](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/contracts.yml)
 [![Lint](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/lint.yml/badge.svg)](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/lint.yml)
 [![Audit](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/audit.yml/badge.svg)](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/audit.yml)
+[![Ubuntu](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/ubuntu-install-without-nix.yml/badge.svg)](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/ubuntu-install-without-nix.yml)
 
 The Espresso Sequencer offers rollups credible neutrality and enhanced interoperability, without compromising on scale.
 Consisting of a data availability solution and a decentralized network of nodes that sequences transactions, layer-2

contracts/rust/adapter/Cargo.toml

@@ -15,7 +15,6 @@ ark-poly = { workspace = true }
 ark-serialize = { workspace = true }
 ark-std = { workspace = true }
 contract-bindings = { path = "../../../contract-bindings" }
-crs = { git = "https://github.com/alxiong/crs" }
 diff-test-bn254 = { git = "https://github.com/EspressoSystems/solidity-bn254.git" }
 ethers = { version = "2.0.4" }
 hotshot-types = { workspace = true }
@@ -25,9 +24,6 @@ jf-utils = { workspace = true }
 num-bigint = { version = "0.4", default-features = false }
 num-traits = { version = "0.2", default-features = false }
 
-[dev-dependencies]
-hotshot-stake-table = { workspace = true }
-
 [[bin]]
 name = "eval-domain"
 path = "src/bin/eval_domain.rs"

contracts/rust/diff-test/Cargo.toml

@@ -12,9 +12,9 @@ ark-ec = { workspace = true }
 ark-ed-on-bn254 = { workspace = true }
 ark-ff = { workspace = true }
 ark-poly = { workspace = true }
+ark-srs = { git = "https://github.com/alxiong/ark-srs", tag = "v0.1.0" }
 ark-std = { workspace = true }
 clap = { version = "^4.4", features = ["derive"] }
-crs = { git = "https://github.com/alxiong/crs" }
 diff-test-bn254 = { git = "https://github.com/EspressoSystems/solidity-bn254.git" }
 digest = { version = "0.10", default-features = false, features = ["alloc"] }
 ethers = { version = "2.0.4" }

contracts/rust/gen-vk-contract/Cargo.toml

@@ -6,7 +6,7 @@ authors = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-crs = { git = "https://github.com/alxiong/crs" }
+ark-srs = { git = "https://github.com/alxiong/ark-srs", tag = "v0.1.0" }
 hotshot-contract-adapter = { path = "../adapter" }
 hotshot-stake-table = { workspace = true }
 hotshot-state-prover = { path = "../../../hotshot-state-prover" }

contracts/rust/gen-vk-contract/src/main.rs

@@ -14,8 +14,8 @@ use jf_primitives::pcs::prelude::UnivariateUniversalParams;
 fn main() {
     let srs = {
         // load SRS from Aztec's ceremony
-        let srs =
-            crs::aztec20::kzg10_setup(2u64.pow(20) as usize + 2).expect("Aztec SRS fail to load");
+        let srs = ark_srs::aztec20::kzg10_setup(2u64.pow(20) as usize + 2)
+            .expect("Aztec SRS fail to load");
         // convert to Jellyfish type
         // TODO: (alex) use constructor instead https://github.com/EspressoSystems/jellyfish/issues/440
         UnivariateUniversalParams {

contracts/test/LightClient.t.sol

@@ -119,6 +119,7 @@ contract LightClient_newFinalizedState_Test is LightClientCommonTest {
 
     /// @dev Test happy path for (BLOCK_PER_EPOCH + 1) consecutive new finalized blocks
     /// forge-config: default.fuzz.runs = 1
+    /// forge-config: quick.fuzz.runs = 1
     /// forge-config: ci.fuzz.runs = 10
     function testFuzz_ConsecutiveUpdate(
         uint64 numInitValidators,
@@ -191,6 +192,7 @@ contract LightClient_newFinalizedState_Test is LightClientCommonTest {
 
     /// @dev Test happy path for updating after skipping a few blocks (but not an epoch)
     /// forge-config: default.fuzz.runs = 4
+    /// forge-config: quick.fuzz.runs = 1
     /// forge-config: ci.fuzz.runs = 10
     function test_UpdateAfterSkippedBlocks(uint32 numBlockSkipped, uint32 numBlockPerEpoch)
         external

contracts/test/PolynomialEval.t.sol

@@ -48,6 +48,7 @@ contract PolynomialEval_domainElements_Test is Test {
     /// @dev Test if the domain elements are generated correctly
     function testFuzz_domainElements_matches(uint256 logSize, uint256 length) external {
         logSize = bound(logSize, 16, 20);
+        length = bound(length, 0, 10000);
         Poly.EvalDomain memory domain = Poly.newEvalDomain(2 ** logSize);
 
         if (length > domain.size) {

data/header.json

@@ -9,7 +9,7 @@
     },
     "payload_commitment": "HASH~1yS-KEtL3oDZDBJdsW51Pd7zywIiHesBZsTbpOzrxOfu",
     "ns_table": {
-        "bytes": [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+        "bytes": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
     },
     "block_merkle_tree_root":"MERKLE_COMM~yB4_Aqa35_PoskgTpcCR1oVLh6BUdLHIs7erHKWi-usUAAAAAAAAAAEAAAAAAAAAJg",
     "fee_merkle_tree_root":"MERKLE_COMM~VJ9z239aP9GZDrHp3VxwPd_0l28Hc5KEAB1pFeCIxhYgAAAAAAAAAAIAAAAAAAAAdA",

data/ns_table.json

@@ -1,3 +1,3 @@
 {
-    "bytes": [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+    "bytes": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
 }

data/transaction.json

@@ -0,0 +1,4 @@
+{
+	"namespace": 12648430,
+	"payload": "TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2NpbmcgZWxpdC4gRG9uZWMgbGVjdHVzIHZlbGl0LCBjb21tb2RvIGVnZXQgdGVsbHVzIHZpdGFlLCBtb2xlc3RpZSBtYXhpbXVzIHR1cnBpcy4gTWFlY2VuYXMgbGFjdXMgbWF1cmlzLCBhdWN0b3IgcXVpcyBsYWN1cyBhdCwgYXVjdG9yIHZvbHV0cGF0IG5pc2kuIEZ1c2NlIG1vbGVzdGllIHVybmEgc2l0IGFtZXQgcXVhbSBpbXBlcmRpZXQgc3VzY2lwaXQuIERvbmVjIGVsaXQgbGVjdHVzLCBkYXBpYnVzIGluIGlwc3VtIGV0LCB2aXZlcnJhIHBoYXJldHJhIGZlbGlzLiBTZWQgc2VkIHNlbSBzZWQgbGliZXJvIHNlbXBlciBwb3N1ZXJlLiBVdCBldWlzbW9kIHB1cnVzIGF0IG1vbGVzdGllIHZvbHV0cGF0LiBOdW5jIGV1aXNtb2QgaWQgZXN0IG5lYyBldWlzbW9kLiBBbGlxdWFtIHF1aXMgZXJhdCBiaWJlbmR1bSwgZWdlc3RhcyBhdWd1ZSBxdWlzLCB0aW5jaWR1bnQgdGVsbHVzLiBEdWlzIGRhcGlidXMgYWMganVzdG8gdXQgcmhvbmN1cy4gTnVsbGEgdmVoaWN1bGEgYXVndWUgbm9uIGFyY3UgdmVzdGlidWx1bSB0ZW1wdXMuIER1aXMgdWxsYW1jb3JwZXIgc2l0IGFtZXQgbGFjdXMgZXQgZGlnbmlzc2ltLiBNYXVyaXMgYXVjdG9yIHNvbGxpY2l0dWRpbiBmZXVnaWF0LiBGdXNjZSB0aW5jaWR1bnQgY29uZGltZW50dW0gZGFwaWJ1cy4gQWxpcXVhbSBhcmN1IGxlY3R1cywgYmxhbmRpdCBzZWQgc2VtIHNpdCBhbWV0LCBmZXJtZW50dW0gdmVoaWN1bGEgbWV0dXMuIE1hZWNlbmFzIHR1cnBpcyBuZXF1ZSwgdHJpc3RpcXVlIGVnZXQgdGluY2lkdW50IHV0LCBzY2VsZXJpc3F1ZSBldSBsYWN1cy4gVXQgYmxhbmRpdCBldSBsZW8gdml0YWUgdm9sdXRwYXQu"
+}