use registeredBlkNum from contract for from_block

Author: alxiong

contracts

@@ -53,6 +53,7 @@ mod tests {
     use alloy::{
         eips::BlockNumberOrTag,
         node_bindings::Anvil,
+        primitives::U256,
         providers::{Provider, ProviderBuilder, WalletProvider},
         rpc::types::Filter,
         sol_types::{SolEvent, SolValue},
@@ -94,8 +95,11 @@ mod tests {
                 .await
                 .unwrap()
                 .abi_encode_sequence(),
+            // deploy takes first 2 blocks: deploying implementation contract and proxy contract
+            // setNextCommittee is the 3rd tx, thus in 3rd block
             CommitteeSol {
                 id: 0,
+                registeredBlockNumber: U256::from(3),
                 effectiveTimestamp: timestamp,
                 members,
             }

timeboost-contract/src/deployer.rs

@@ -6,15 +6,15 @@ use std::{ops::Deref, pin::Pin};
 use alloy::{
     eips::BlockNumberOrTag,
     network::EthereumWallet,
-    primitives::{Address, BlockNumber},
+    primitives::Address,
     providers::{Provider, ProviderBuilder},
     rpc::types::{Filter, Log},
     signers::local::{LocalSignerError, MnemonicBuilder, PrivateKeySigner, coins_bip39::English},
     sol_types::SolEvent,
     transports::{http::reqwest::Url, ws::WsConnect},
 };
 use futures::{Stream, StreamExt};
-use timeboost_types::{HttpProvider, HttpProviderWithWallet, Timestamp};
+use timeboost_types::{HttpProvider, HttpProviderWithWallet};
 use tracing::error;
 
 /// Build a local signer from wallet mnemonic and account index
@@ -97,43 +97,4 @@ impl PubSubProvider {
 
         Ok(Box::pin(validated))
     }
-
-    /// Returns the smallest block number whose timestamp is >= `target_ts` through binary search.
-    /// Useful to determine `from_block` input of `Self::event_stream()` subscription.
-    pub async fn get_block_number_by_timestamp(
-        &self,
-        target_ts: Timestamp,
-    ) -> anyhow::Result<Option<BlockNumber>> {
-        let latest = self.get_block_number().await?;
-        let mut lo: u64 = 0;
-        let mut hi: u64 = latest;
-
-        while lo <= hi {
-            let mid = lo + (hi - lo) / 2;
-
-            let block = match self
-                .0
-                .get_block_by_number(BlockNumberOrTag::Number(mid))
-                .await?
-            {
-                Some(b) => b,
-                None => {
-                    lo = mid + 1;
-                    continue;
-                }
-            };
-
-            if block.header.timestamp >= target_ts.into() {
-                if mid == 0 {
-                    return Ok(Some(0));
-                }
-                hi = mid - 1;
-            } else {
-                lo = mid + 1;
-            }
-        }
-
-        // At this point, `lo` is the smallest index with ts >= target_ts (if any)
-        if lo > latest { Ok(None) } else { Ok(Some(lo)) }
-    }
 }

timeboost-contract/src/provider.rs

@@ -107,6 +107,7 @@ async fn main() -> Result<()> {
 
     let config = TimeboostConfig::builder()
         .sailfish_committee(sailfish_committee)
+        .registered_blk(*comm_info.registered_block())
         .maybe_prev_committee(prev_comm)
         .decrypt_committee(decrypt_committee)
         .certifier_committee(certifier_committee)

timeboost/src/binaries/timeboost.rs

@@ -16,7 +16,7 @@ use timeboost_config::{CERTIFIER_PORT_OFFSET, DECRYPTER_PORT_OFFSET, ParentChain
 use timeboost_contract::KeyManager::{self, CommitteeCreated};
 use timeboost_contract::provider::PubSubProvider;
 use timeboost_crypto::prelude::DkgEncKey;
-use timeboost_types::{KeyStore, Timestamp};
+use timeboost_types::{BlockNumber, KeyStore, Timestamp};
 use tracing::error;
 use url::Url;
 
@@ -29,6 +29,7 @@ pub type NewCommitteeStream = Pin<Box<dyn Stream<Item = CommitteeInfo>>>;
 pub struct CommitteeInfo {
     id: CommitteeId,
     timestamp: Timestamp,
+    registered_blk: BlockNumber,
     signing_keys: Vec<multisig::PublicKey>,
     dh_keys: Vec<x25519::PublicKey>,
     dkg_keys: Vec<DkgEncKey>,
@@ -78,6 +79,7 @@ impl CommitteeInfo {
         Ok(Self {
             id: committee_id,
             timestamp: c.effectiveTimestamp.into(),
+            registered_blk: c.registeredBlockNumber.to::<u64>().into(),
             signing_keys,
             dh_keys,
             dkg_keys,
@@ -93,6 +95,10 @@ impl CommitteeInfo {
         self.timestamp
     }
 
+    pub fn registered_block(&self) -> BlockNumber {
+        self.registered_blk
+    }
+
     pub fn signing_keys(&self) -> &[multisig::PublicKey] {
         &self.signing_keys
     }
@@ -160,17 +166,13 @@ impl CommitteeInfo {
     /// subscribe an event stream
     pub async fn new_committee_stream(
         provider: &PubSubProvider,
-        start_ts: Timestamp,
+        from_block: BlockNumber,
         config: &ParentChain,
     ) -> Result<NewCommitteeStream> {
-        let from_block = provider
-            .get_block_number_by_timestamp(start_ts)
-            .await?
-            .unwrap_or_default();
         let events = provider
             .event_stream::<CommitteeCreated>(
                 config.key_manager_contract,
-                BlockNumberOrTag::Number(from_block),
+                BlockNumberOrTag::Number(*from_block),
             )
             .await
             .map_err(|e| {

timeboost/src/committee.rs

@@ -1,3 +1,4 @@
+use alloy::primitives::BlockNumber;
 use bon::Builder;
 use cliquenet::{Address, AddressableCommittee};
 use multisig::{Keypair, x25519};
@@ -14,6 +15,9 @@ pub struct TimeboostConfig {
     /// The sailfish peers that this node will connect to.
     pub(crate) sailfish_committee: AddressableCommittee,
 
+    /// The block in which the current committee is registered
+    pub(crate) registered_blk: BlockNumber,
+
     /// Previous committee info stored on chain
     pub(crate) prev_committee: Option<CommitteeInfo>,
 

timeboost/src/conf.rs

@@ -68,14 +68,17 @@ impl Timeboost {
         };
 
         let provider = PubSubProvider::new(cfg.chain_config.parent.ws_url.clone()).await?;
-        let start_ts = cfg
+        let from_blk = cfg
             .prev_committee
             .as_ref()
-            .map(|c| c.effective_timestamp())
-            .unwrap_or_default();
-        let events =
-            CommitteeInfo::new_committee_stream(&provider, start_ts, &cfg.chain_config.parent)
-                .await?;
+            .map_or_else(|| cfg.registered_blk, |prev| *prev.registered_block());
+
+        let events = CommitteeInfo::new_committee_stream(
+            &provider,
+            from_blk.into(),
+            &cfg.chain_config.parent,
+        )
+        .await?;
 
         let (tx, rx) = mpsc::channel(100);