Fetch Memberships from l1

sequencer/src/api.rs

@@ -187,7 +187,7 @@ impl<N: ConnectedNetwork<PubKey>, V: Versions, P: SequencerPersistence>
             self.consensus().await.read().await.cur_epoch().await
         };
 
-        <StaticCommittee as Membership<SeqTypes>>::stake_table(
+        <SeqTypes as NodeType>::Membership::stake_table(
             &self.consensus().await.read().await.memberships,
             epoch,
         )

sequencer/src/context.rs

@@ -80,7 +80,7 @@ impl<N: ConnectedNetwork<PubKey>, P: SequencerPersistence, V: Versions> Sequence
     pub async fn init(
         network_config: NetworkConfig<PubKey>,
         validator_config: ValidatorConfig<<SeqTypes as NodeType>::SignatureKey>,
-        membership: StaticCommittee,
+        membership: Arc<RwLock<StaticCommittee>>,
         instance_state: NodeState,
         persistence: P,
         network: Arc<N>,

sequencer/src/lib.rs

@@ -13,6 +13,7 @@ mod restart_tests;
 mod message_compat_tests;
 
 use anyhow::Context;
+use async_lock::RwLock;
 use catchup::StatePeers;
 use context::SequencerContext;
 use espresso_types::StaticCommittee;
@@ -479,12 +480,12 @@ pub async fn init_node<P: SequencerPersistence, V: Versions>(
     };
 
     // Create the HotShot membership
-    let membership = StaticCommittee::new_stake(
+    let membership = Arc::new(RwLock::new(StaticCommittee::new_stake(
         network_config.config.known_nodes_with_stake.clone(),
         network_config.config.known_nodes_with_stake.clone(),
         &instance_state,
-        Default::default(),
-    );
+        network_config.config.epoch_height,
+    )));
 
     // Initialize the Libp2p network
     let network = {

types/Cargo.toml

@@ -53,6 +53,7 @@ tokio = { workspace = true }
 tracing = { workspace = true }
 url = { workspace = true }
 vbs = { workspace = true }
+async-lock = { workspace = true }
 
 [dev-dependencies]
 portpicker = { workspace = true }

types/src/v0/impls/header.rs

@@ -1182,7 +1182,11 @@ mod test_headers {
     use std::sync::Arc;
 
     use ethers::{types::Address, utils::Anvil};
-    use hotshot_types::{traits::signature_key::BuilderSignatureKey, vid::vid_scheme};
+    use hotshot_types::{
+        data::EpochNumber,
+        traits::{node_implementation::ConsensusTime, signature_key::BuilderSignatureKey},
+        vid::vid_scheme,
+    };
 
     use sequencer_utils::test_utils::setup_test;
     use v0_1::{BlockMerkleTree, FeeMerkleTree, L1Client};
@@ -1243,6 +1247,7 @@ mod test_headers {
                 block_merkle_tree: block_merkle_tree.clone(),
                 fee_merkle_tree,
                 chain_config: genesis.instance_state.chain_config.into(),
+                prev_block_epoch: EpochNumber::new(0),
             };
 
             let (fee_account, fee_key) = FeeAccount::generated_from_seed_indexed([0; 32], 0);

types/src/v0/impls/l1.rs

@@ -33,8 +33,7 @@ use url::Url;
 
 use super::{L1BlockInfo, L1ClientMetrics, L1State, L1UpdateTask, RpcClient};
 use crate::{
-    v0::impls::stake_table::StakeTables, FeeInfo, L1Client, L1ClientOptions, L1Event,
-    L1ReconnectTask, L1Snapshot,
+    v0_3::StakeTables, FeeInfo, L1Client, L1ClientOptions, L1Event, L1ReconnectTask, L1Snapshot,
 };
 
 impl PartialOrd for L1BlockInfo {
@@ -785,7 +784,11 @@ impl L1Client {
     }
 
     /// Get `StakeTable` at block height.
-    pub async fn get_stake_table(&self, block: u64, address: Address) -> StakeTables {
+    pub async fn get_stake_table(
+        &self,
+        block: u64,
+        address: Address,
+    ) -> anyhow::Result<StakeTables> {
         // TODO epoch size may need to be passed in as well
         // TODO here or in memberships check if we have fetched table this epoch
         let stake_table_contract = PermissionedStakeTable::new(address, self.provider.clone());
@@ -795,10 +798,9 @@ impl L1Client {
             .from_block(0)
             .to_block(block)
             .query()
-            .await
-            .unwrap();
+            .await?;
 
-        StakeTables::from_l1_events(events.clone())
+        Ok(StakeTables::from_l1_events(events.clone()))
     }
 }
 
@@ -1306,7 +1308,8 @@ mod test {
         let block = client.get_block(BlockNumber::Latest).await?.unwrap();
         let nodes = l1_client
             .get_stake_table(block.number.unwrap().as_u64(), address)
-            .await;
+            .await
+            .unwrap();
 
         let result = nodes.consensus_stake_table.0[0].clone();
         assert_eq!(result.stake_amount.as_u64(), 1);