feat: get block number based on provided config param

Author: MarcosNicolau

aggregation-mode/src/backend/config.rs

@@ -12,11 +12,12 @@ pub struct Config {
     pub eth_rpc_url: String,
     pub eth_ws_url: String,
     pub private_key: String,
-    pub submit_proofs_every_secs: u64,
     pub max_proofs_in_queue: u16,
     pub proof_aggregation_service_address: String,
     pub aligned_service_manager_address: String,
     pub ecdsa: ECDSAConfig,
+    pub fetch_logs_from_secs_ago: u64,
+    pub block_time_secs: u64,
 }
 
 impl Config {

aggregation-mode/src/backend/fetcher.rs

@@ -2,47 +2,61 @@ use std::str::FromStr;
 
 use super::{
     config::Config,
-    types::{AlignedLayerServiceManager, AlignedLayerServiceManagerContract},
+    types::{AlignedLayerServiceManager, AlignedLayerServiceManagerContract, RPCProvider},
 };
 use crate::{
     backend::s3::get_aligned_batch_from_s3,
     zk::{backends::sp1::SP1Proof, Proof},
 };
 use aligned_sdk::core::types::ProvingSystemId;
-use alloy::{primitives::Address, providers::ProviderBuilder};
+use alloy::{
+    primitives::Address,
+    providers::{Provider, ProviderBuilder},
+};
 use tracing::{error, info};
 
 #[derive(Debug)]
 pub enum ProofsFetcherError {
     QueryingLogs,
+    BlockNumber,
 }
 
 pub struct ProofsFetcher {
+    rpc_provider: RPCProvider,
     aligned_service_manager: AlignedLayerServiceManagerContract,
+    fetch_from_secs_ago: u64,
+    block_time_secs: u64,
 }
 
 impl ProofsFetcher {
     pub fn new(config: &Config) -> Self {
         let rpc_url = config.eth_rpc_url.parse().expect("correct url");
-        let provider = ProviderBuilder::new().on_http(rpc_url);
+        let rpc_provider = ProviderBuilder::new().on_http(rpc_url);
         let aligned_service_manager = AlignedLayerServiceManager::new(
             Address::from_str(&config.aligned_service_manager_address)
                 .expect("Address to be correct"),
-            provider,
+            rpc_provider.clone(),
         );
 
         Self {
+            rpc_provider,
             aligned_service_manager,
+            fetch_from_secs_ago: config.fetch_logs_from_secs_ago,
+            block_time_secs: config.block_time_secs,
         }
     }
 
     pub async fn fetch(&self) -> Result<Vec<Proof>, ProofsFetcherError> {
-        info!("Fetching proofs from batch logs");
+        let from_block = self.get_block_number_to_fetch_from().await?;
+        info!(
+            "Fetching proofs from batch logs starting from block number {}",
+            from_block
+        );
         // Subscribe to NewBatch event from AlignedServiceManager
         let logs = self
             .aligned_service_manager
             .NewBatchV3_filter()
-            .from_block(0)
+            .from_block(from_block)
             .query()
             .await
             .map_err(|_| ProofsFetcherError::QueryingLogs)?;
@@ -101,4 +115,16 @@ impl ProofsFetcher {
 
         Ok(proofs)
     }
+
+    async fn get_block_number_to_fetch_from(&self) -> Result<u64, ProofsFetcherError> {
+        let block_number = self
+            .rpc_provider
+            .get_block_number()
+            .await
+            .map_err(|_| ProofsFetcherError::BlockNumber)?;
+
+        let number_of_blocks_in_the_past = self.fetch_from_secs_ago / self.block_time_secs;
+
+        Ok(block_number.saturating_sub(number_of_blocks_in_the_past))
+    }
 }

aggregation-mode/src/backend/types.rs

@@ -48,3 +48,20 @@ pub type AlignedLayerServiceManagerContract = AlignedLayerServiceManagerInstance
         RootProvider,
     >,
 >;
+
+pub type RPCProvider = alloy::providers::fillers::FillProvider<
+    alloy::providers::fillers::JoinFill<
+        alloy::providers::Identity,
+        alloy::providers::fillers::JoinFill<
+            alloy::providers::fillers::GasFiller,
+            alloy::providers::fillers::JoinFill<
+                alloy::providers::fillers::BlobGasFiller,
+                alloy::providers::fillers::JoinFill<
+                    alloy::providers::fillers::NonceFiller,
+                    alloy::providers::fillers::ChainIdFiller,
+                >,
+            >,
+        >,
+    >,
+    alloy::providers::RootProvider,
+>;

config-files/config-proof-aggregator.yaml

@@ -4,7 +4,10 @@ private_key: "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6
 eth_rpc_url: "http://localhost:8545"
 eth_ws_url: "ws://localhost:8545"
 max_proofs_in_queue: 1000
-submit_proofs_every_secs: 10
+# How far in the past should the service go to fetch batch logs
+fetch_logs_from_secs_ago: 86400 # 24hs
+# Anvil start with block time is 7 seconds
+block_time_secs: 7
 
 ecdsa:
   private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"