Merge remote-tracking branch 'origin/main' into jb/gc

.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}
@@ -149,5 +150,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

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"
@@ -124,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,
     );

contracts/script/multisigTransactionProposals/README.md

@@ -33,7 +33,7 @@ source .env.contracts && \
 ts-node contracts/script/multisigTransactionProposals/safeSDK/modifyProverModeProposal.ts setProver
 ```
 
-Open the the URL shown in the console to sign the transaction in the Safe UI.
+Open the URL shown in the console to sign the transaction in the Safe UI.
 
 Once successful, all signers will see a transaction request on the SAFE UI e.g.
 `https://app.safe.global/transactions/queue?safe=$SAFE_MULTISIG_ADDRESS`
@@ -84,7 +84,7 @@ source .env.contracts && \
 ts-node contracts/script/multisigTransactionProposals/safeSDK/modifyStateHistoryRetentionPeriod.ts
 ```
 
-Open the the URL shown in the console to sign the transaction in the Safe UI.
+Open the URL shown in the console to sign the transaction in the Safe UI.
 
 Once successful, all signers will see a transaction request on the SAFE UI e.g.
 `https://app.safe.global/transactions/queue?safe=$SAFE_MULTISIG_ADDRESS`