Merge branch 'main' into 2370-staketable-update-validator-identificat…

…ion-keys

.env

@@ -35,6 +35,7 @@ ESPRESSO_SEQUENCER_MAX_CONNECTIONS=25
 ESPRESSO_SEQUENCER_STORAGE_PATH=/store/sequencer
 ESPRESSO_SEQUENCER_GENESIS_FILE=/genesis/demo.toml
 ESPRESSO_SEQUENCER_L1_PORT=8545
+ESPRESSO_SEQUENCER_L1_POLLING_INTERVAL=100ms
 ESPRESSO_SEQUENCER_L1_WS_PORT=8546
 ESPRESSO_SEQUENCER_L1_PROVIDER=http://demo-l1-network:${ESPRESSO_SEQUENCER_L1_PORT}
 ESPRESSO_SEQUENCER_L1_WS_PROVIDER=ws://demo-l1-network:${ESPRESSO_SEQUENCER_L1_WS_PORT}
@@ -57,9 +58,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=0xf7cd8fa9b94db2aa972023b379c7f72c65e4de9d
 ESPRESSO_SEQUENCER_LIGHTCLIENT_ADDRESS=$ESPRESSO_SEQUENCER_LIGHT_CLIENT_PROXY_ADDRESS
 ESPRESSO_SEQUENCER_PERMISSIONED_PROVER=0x14dc79964da2c08b23698b3d3cc7ca32193d9955
+SPRESSO_SEQUENCER_PERMISSIONED_STAKE_TABLE_ADDRESS=0x8ce361602b935680e8dec218b820ff5056beb7af
 
 # Example sequencer demo private keys
 ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_0=BLS_SIGNING_KEY~lNDh4Pn-pTAyzyprOAFdXHwhrKhEwqwtMtkD3CZF4x3o
@@ -149,5 +151,5 @@ INTEGRATION_TEST_PROTO=http
 # `03`, marketplace upgrade will be tested.
 INTEGRATION_TEST_SEQUENCER_VERSION=02
 
-# max database connections 
-ESPRESSO_SEQUENCER_DATABASE_MAX_CONNECTIONS=25
+# max database connections
+ESPRESSO_SEQUENCER_DATABASE_MAX_CONNECTIONS=25

.typos.toml

@@ -1,7 +1,9 @@
 [files]
 extend-exclude = [
+  "data/initial_stake_table.toml",
   ".env",
   "*.json",
+  "**/*.pdf",
   "doc/*.svg",
   "doc/*.puml",
   "contracts/lib",

Cargo.toml

@@ -40,6 +40,7 @@ ark-poly = "0.4"
 ark-serialize = "0.4"
 ark-srs = "0.3.1"
 async-broadcast = "0.7.0"
+async-channel = "2"
 async-lock = "3"
 async-once-cell = "0.5"
 async-trait = "0.1"
@@ -54,7 +55,6 @@ cld = "0.5"
 derive_more = { version = "1.0", features = ["full"] }
 es-version = { git = "https://github.com/EspressoSystems/es-version.git", branch = "main" }
 dotenvy = "0.15"
-dyn-clone = "1.0"
 ethers = { version = "2.0", features = ["solc", "ws"] }
 futures = "0.3"
 tokio = { version = "1", default-features = false, features = [
@@ -125,6 +125,7 @@ thiserror = "1.0.69"
 tracing = "0.1"
 bytesize = "1.3"
 itertools = "0.12"
+priority-queue = "2"
 rand_chacha = "0.3"
 rand_distr = "0.4"
 reqwest = "0.12"

builder/src/non_permissioned.rs

@@ -19,6 +19,7 @@ use hotshot_types::{
     data::{fake_commitment, ViewNumber},
     traits::{
         block_contents::{vid_commitment, GENESIS_VID_NUM_STORAGE_NODES},
+        metrics::NoMetrics,
         node_implementation::Versions,
         EncodeBytes,
     },
@@ -53,6 +54,7 @@ pub async fn build_instance_state<V: Versions>(
         Arc::new(StatePeers::<SequencerApiVersion>::from_urls(
             state_peers,
             Default::default(),
+            &NoMetrics,
         )),
         V::Base::VERSION,
     );

contract-bindings/src/lib.rs

@@ -10,6 +10,7 @@ pub mod light_client;
 pub mod light_client_mock;
 pub mod light_client_state_update_vk;
 pub mod light_client_state_update_vk_mock;
+pub mod permissioned_stake_table;
 pub mod plonk_verifier;
 pub mod plonk_verifier_2;
 pub mod shared_types;