Stake Table Integration test

.env

@@ -33,7 +33,7 @@ ESPRESSO_SEQUENCER4_API_PORT=24004
 ESPRESSO_SEQUENCER_URL=http://sequencer0:${ESPRESSO_SEQUENCER_API_PORT}
 ESPRESSO_SEQUENCER_MAX_CONNECTIONS=25
 ESPRESSO_SEQUENCER_STORAGE_PATH=/store/sequencer
-ESPRESSO_SEQUENCER_GENESIS_FILE=/genesis/demo.toml
+ESPRESSO_SEQUENCER_GENESIS_FILE=data/genesis/demo.toml
 ESPRESSO_SEQUENCER_L1_PORT=8545
 ESPRESSO_SEQUENCER_L1_POLLING_INTERVAL=100ms
 ESPRESSO_SEQUENCER_L1_WS_PORT=8546
@@ -57,10 +57,10 @@ ESPRESSO_BUILDER_ETH_ACCOUNT_INDEX=8
 ESPRESSO_DEPLOYER_ACCOUNT_INDEX=9
 
 # Contracts
-ESPRESSO_SEQUENCER_LIGHT_CLIENT_PROXY_ADDRESS=0x0c8e79f3534b00d9a3d4a856b665bf4ebc22f2ba
+ESPRESSO_SEQUENCER_LIGHT_CLIENT_PROXY_ADDRESS=0xe1da8919f262ee86f9be05059c9280142cf23f48
 ESPRESSO_SEQUENCER_LIGHTCLIENT_ADDRESS=$ESPRESSO_SEQUENCER_LIGHT_CLIENT_PROXY_ADDRESS
 ESPRESSO_SEQUENCER_PERMISSIONED_PROVER=0x14dc79964da2c08b23698b3d3cc7ca32193d9955
-ESPRESSO_SEQUENCER_PERMISSIONED_STAKE_TABLE_ADDRESS=0x8ce361602b935680e8dec218b820ff5056beb7af
+ESPRESSO_SEQUENCER_PERMISSIONED_STAKE_TABLE_ADDRESS=0xb19b36b1456e65e3a6d514d3f715f204bd59f431
 
 # Example sequencer demo private keys
 ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_0=BLS_SIGNING_KEY~lNDh4Pn-pTAyzyprOAFdXHwhrKhEwqwtMtkD3CZF4x3o

.github/workflows/build.yml

@@ -45,10 +45,10 @@ jobs:
       - name: Build
         # Build in release without `testing` feature, this should work without `hotshot_example` config.
         run: |
-          cargo build --locked --release --workspace
+          cargo build --features "fee, pos, marketplace" --locked --release --workspace
 
       - name: Build sequencer-sqlite 
-        run: cargo build --locked --release --manifest-path ./sequencer-sqlite/Cargo.toml --target-dir ./target
+        run: cargo build --features "fee, pos, marketplace" --locked --release --manifest-path ./sequencer-sqlite/Cargo.toml --target-dir ./target
 
       - name: Build Espresso Dev Node
         # Espresso Dev Node currently requires testing feature, so it is built separately.

.github/workflows/test.yml

@@ -51,7 +51,7 @@ jobs:
           comment_on_pr: false
 
       - name: Build and archive tests
-        run: cargo nextest archive --locked --workspace --archive-file nextest-archive-postgres.tar.zst
+        run: cargo nextest archive --features "fee, pos, marketplace" --locked --workspace --archive-file nextest-archive-postgres.tar.zst
 
       - name: Upload archive to workflow
         uses: actions/upload-artifact@v4
@@ -86,7 +86,7 @@ jobs:
           comment_on_pr: false
 
       - name: Build and archive tests
-        run: cargo nextest archive --locked --features "embedded-db testing" --workspace --archive-file nextest-archive-sqlite.tar.zst
+        run: cargo nextest archive --locked --features "fee, pos, marketplace, embedded-db, testing" --workspace --archive-file nextest-archive-sqlite.tar.zst
 
       - name: Upload archive to workflow
         uses: actions/upload-artifact@v4
@@ -110,8 +110,8 @@ jobs:
 
       - name: Build Bins
         run: |
-          cargo build --locked --profile test --bins
-          cargo build --manifest-path ./sequencer-sqlite/Cargo.toml --target-dir ./target
+          cargo build --features "fee, pos, marketplace" --locked --profile test --bins 
+          cargo build --features "fee, pos, marketplace" --manifest-path ./sequencer-sqlite/Cargo.toml --target-dir ./target 
         timeout-minutes: 60
 
       - name: Upload archive to workflow
@@ -209,10 +209,13 @@ jobs:
     needs: [build-test-bins, build-test-artifacts-postgres]
     strategy:
       matrix:
-        version: [02,99]
+        version: [02,03,99]
         include:
           - version: 02
             compose: "-f process-compose.yaml"
+
+          - version: 03
+            compose: "-f process-compose.yaml"
 
           - version: 99
             compose: "-f process-compose.yaml -f process-compose-mp.yml"
@@ -251,7 +254,7 @@ jobs:
           NEXTEST_PROFILE: integration
           INTEGRATION_TEST_SEQUENCER_VERSION: ${{ matrix.version }}
         run: |
-          cargo nextest run --archive-file nextest-archive-postgres.tar.zst --verbose --no-fail-fast --nocapture \
+          cargo nextest run --archive-file nextest-archive-postgres.tar.zst --verbose --no-fail-fast \
           --workspace-remap $PWD $(if [ "${{ matrix.version }}" == "2" ]; then echo " smoke"; fi)
         timeout-minutes: 10
 

.gitignore

@@ -56,4 +56,7 @@ contracts/broadcast/*/11155111/
 docs/
 
 # Autogen files
-.vscode/
+.vscode/
+
+# initial stake table
+data/initial_stake_table.toml

builder/Cargo.toml

@@ -5,6 +5,12 @@ version = { workspace = true }
 authors = { workspace = true }
 edition = { workspace = true }
 
+[features]
+default = ["pos"]
+fee = []
+pos = []
+marketplace = []
+
 [dependencies]
 anyhow = { workspace = true }
 async-broadcast = { workspace = true }

builder/src/bin/permissionless-builder.rs

@@ -2,10 +2,7 @@ use std::{num::NonZeroUsize, path::PathBuf, time::Duration};
 
 use builder::non_permissioned::{build_instance_state, BuilderConfig};
 use clap::Parser;
-use espresso_types::{
-    eth_signature_key::EthKeyPair, parse_duration, FeeVersion, MarketplaceVersion,
-    SequencerVersions, V0_0,
-};
+use espresso_types::{eth_signature_key::EthKeyPair, parse_duration, SequencerVersions};
 use futures::future::pending;
 use hotshot::traits::ValidatedState;
 use hotshot_types::{
@@ -120,12 +117,42 @@ async fn main() -> anyhow::Result<()> {
     let upgrade = genesis.upgrade_version;
 
     match (base, upgrade) {
-        (FeeVersion::VERSION, MarketplaceVersion::VERSION) => {
-            run::<SequencerVersions<FeeVersion, MarketplaceVersion>>(genesis, opt).await
+        #[cfg(all(feature = "fee", feature = "pos"))]
+        (espresso_types::FeeVersion::VERSION, espresso_types::EpochVersion::VERSION) => {
+            run::<SequencerVersions<espresso_types::FeeVersion, espresso_types::EpochVersion>>(
+                genesis, opt
+            )
+            .await
+        }
+        #[cfg(feature = "pos")]
+        (espresso_types::EpochVersion::VERSION, _) => {
+            run::<SequencerVersions<espresso_types::FeeVersion, espresso_types::MarketplaceVersion>>(
+                genesis, opt
+                // Specifying V0_0 disables upgrades
+            )
+            .await
+        }
+        #[cfg(all(feature = "fee", feature = "marketplace"))]
+        (espresso_types::FeeVersion::VERSION, espresso_types::MarketplaceVersion::VERSION) => {
+            run::<SequencerVersions<espresso_types::FeeVersion, espresso_types::MarketplaceVersion>>(
+                genesis, opt
+            )
+            .await
+        },
+        #[cfg(feature = "fee")]
+        (espresso_types::FeeVersion::VERSION, _) => {
+            run::<SequencerVersions<espresso_types::FeeVersion, espresso_types::V0_0>>(
+                genesis, opt
+            )
+            .await
         },
-        (FeeVersion::VERSION, _) => run::<SequencerVersions<FeeVersion, V0_0>>(genesis, opt).await,
-        (MarketplaceVersion::VERSION, _) => {
-            run::<SequencerVersions<MarketplaceVersion, V0_0>>(genesis, opt).await
+        #[cfg(feature = "marketplace")]
+        (espresso_types::MarketplaceVersion::VERSION, _) => {
+            run::<SequencerVersions<espresso_types::MarketplaceVersion, espresso_types::V0_0>>(
+                genesis, opt
+            )
+            .await
+
         },
         _ => panic!(
             "Invalid base ({base}) and upgrade ({upgrade}) versions specified in the toml file."

builder/src/lib.rs

@@ -139,7 +139,7 @@ pub mod testing {
                 start_voting_time: 0,
                 stop_proposing_time: 0,
                 stop_voting_time: 0,
-                epoch_height: 0,
+                epoch_height: 150,
                 epoch_start_block: 0,
             };
 

client/Cargo.toml

@@ -10,7 +10,9 @@ anyhow = { workspace = true }
 espresso-types = { path = "../types" }
 ethers = { workspace = true }
 futures = { workspace = true }
+hotshot-types = { workspace = true }
 jf-merkle-tree = { workspace = true }
+serde_json = { workspace = true }
 surf-disco = { workspace = true }
 tokio = { workspace = true }
 tracing = { workspace = true }

client/src/lib.rs

@@ -1,9 +1,12 @@
 use std::time::Duration;
 
 use anyhow::Context;
-use espresso_types::{FeeAccount, FeeAmount, FeeMerkleTree, Header};
+use espresso_types::{
+    config::PublicNetworkConfig, FeeAccount, FeeAmount, FeeMerkleTree, Header, PubKey,
+};
 use ethers::types::Address;
 use futures::{stream::BoxStream, StreamExt};
+use hotshot_types::stake_table::StakeTableEntry;
 use jf_merkle_tree::{
     prelude::{MerkleProof, Sha3Node},
     MerkleTreeScheme,
@@ -120,6 +123,38 @@ impl SequencerClient {
         let balance = proof.elem().copied().unwrap_or(0.into());
         Ok(balance)
     }
+
+    pub async fn current_epoch(&self) -> anyhow::Result<Option<u64>> {
+        self.0
+            .get::<Option<u64>>("node/current_epoch")
+            .send()
+            .await
+            .context("getting epoch value")
+    }
+
+    pub async fn stake_table(&self, epoch: u64) -> anyhow::Result<Vec<StakeTableEntry<PubKey>>> {
+        self.0
+            .get::<_>(&format!("node/stake-table/{epoch}"))
+            .send()
+            .await
+            .context("getting stake table")
+    }
+
+    pub async fn da_members(&self, epoch: u64) -> anyhow::Result<Vec<StakeTableEntry<PubKey>>> {
+        self.0
+            .get::<_>(&format!("node/stake-table/da/{epoch}"))
+            .send()
+            .await
+            .context("getting da stake table")
+    }
+
+    pub async fn config(&self) -> anyhow::Result<PublicNetworkConfig> {
+        self.0
+            .get::<PublicNetworkConfig>("config/hotshot")
+            .send()
+            .await
+            .context("getting hotshot config")
+    }
 }
 
 #[cfg(test)]

data/genesis/demo-pos-base.toml

@@ -0,0 +1,21 @@
+base_version = "0.3"
+upgrade_version = "0.3"
+epoch_height = 30
+
+[stake_table]
+capacity = 10
+
+[chain_config]
+chain_id = 999999999
+max_block_size = '1mb'
+base_fee = '1 wei'
+fee_recipient = "0x0000000000000000000000000000000000000000"
+fee_contract = "0xa15bb66138824a1c7167f5e85b957d04dd34e468"
+stake_table_contract = "0xb19b36b1456e65e3a6d514d3f715f204bd59f431"
+
+[header]
+timestamp = "1970-01-01T00:00:00Z"
+
+[l1_finalized]
+number = 0
+

data/genesis/demo-epoch.toml → data/genesis/demo-pos.toml

@@ -1,12 +1,13 @@
 base_version = "0.2"
 upgrade_version = "0.3"
+epoch_height = 30
 
 [stake_table]
 capacity = 10
 
 [chain_config]
 chain_id = 999999999
-base_fee = '0 wei'
+base_fee = '1 wei'
 max_block_size = '1mb'
 fee_recipient = '0x0000000000000000000000000000000000000000'
 fee_contract = '0xa15bb66138824a1c7167f5e85b957d04dd34e468'
@@ -18,16 +19,15 @@ timestamp = "1970-01-01T00:00:00Z"
 number = 0
 
 [[upgrade]]
-version = "0.99"
+version = "0.3"
 start_proposing_view = 10
-stop_proposing_view = 60
+stop_proposing_view = 50
 
 [upgrade.epoch]
 [upgrade.epoch.chain_config]
 chain_id = 999999999
 max_block_size = '1mb'
 base_fee = '1 wei'
 fee_recipient = "0x0000000000000000000000000000000000000000"
-bid_recipient = "0x0000000000000000000000000000000000000000"
 fee_contract = "0xa15bb66138824a1c7167f5e85b957d04dd34e468"
-stake_table_contract = "0x8ce361602b935680e8dec218b820ff5056beb7af"
+stake_table_contract = "0xb19b36b1456e65e3a6d514d3f715f204bd59f431"

data/v3/messages.json

@@ -18,7 +18,8 @@
                         "chain_id": "35353",
                         "fee_contract": null,
                         "fee_recipient": "0x0000000000000000000000000000000000000000",
-                        "max_block_size": "30720"
+                        "max_block_size": "30720",
+                        "stake_table_contract": null
                       }
                     }
                   },