Feat use last processed block

Author: Mechanix97

aggregation_mode/src/backend/config.rs

@@ -15,8 +15,7 @@ pub struct Config {
     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,
+    pub last_processed_block: u64
 }
 
 impl Config {

aggregation_mode/src/backend/fetcher.rs

@@ -24,8 +24,7 @@ pub enum ProofsFetcherError {
 pub struct ProofsFetcher {
     rpc_provider: RPCProvider,
     aligned_service_manager: AlignedLayerServiceManagerContract,
-    fetch_from_secs_ago: u64,
-    block_time_secs: u64,
+    last_processed_block: u64
 }
 
 impl ProofsFetcher {
@@ -41,28 +40,38 @@ impl ProofsFetcher {
         Self {
             rpc_provider,
             aligned_service_manager,
-            fetch_from_secs_ago: config.fetch_logs_from_secs_ago,
-            block_time_secs: config.block_time_secs,
+            last_processed_block: config.last_processed_block,
         }
     }
 
     pub async fn fetch(&self) -> Result<Vec<AlignedProof>, ProofsFetcherError> {
-        let from_block = self.get_block_number_to_fetch_from().await?;
         info!(
             "Fetching proofs from batch logs starting from block number {}",
-            from_block
+            self.last_processed_block
         );
         // Subscribe to NewBatch event from AlignedServiceManager
         let logs = self
             .aligned_service_manager
             .NewBatchV3_filter()
-            .from_block(from_block)
+            .from_block(self.last_processed_block)
             .query()
             .await
             .map_err(|_| ProofsFetcherError::QueryingLogs)?;
 
         info!("Logs collected {}", logs.len());
 
+        // Get current block
+        self.last_processed_block = self
+            .rpc_provider
+            .get_block_number()
+            .await
+            .map_err(|_| ProofsFetcherError::BlockNumber)?;
+
+        info!(
+            "Fetched proofs from batch logs upto  block number {}",
+            self.last_processed_block
+        );
+
         let mut proofs = vec![];
 
         for (batch, _) in logs {
@@ -126,8 +135,6 @@ impl ProofsFetcher {
             .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))
+        Ok(block_number.saturating_sub(self.last_processed_block))
     }
 }

config-files/config-proof-aggregator-mock.yaml

@@ -3,10 +3,7 @@ proof_aggregation_service_address: "0xB0D4afd8879eD9F52b28595d31B441D079B2Ca07"
 eth_rpc_url: "http://localhost:8545"
 eth_ws_url: "ws://localhost:8545"
 max_proofs_in_queue: 1000
-# 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
+last_processed_block: 0
 
 ecdsa:
   private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"

config-files/config-proof-aggregator.yaml

@@ -3,10 +3,7 @@ proof_aggregation_service_address: "0xcbEAF3BDe82155F56486Fb5a1072cb8baAf547cc"
 eth_rpc_url: "http://localhost:8545"
 eth_ws_url: "ws://localhost:8545"
 max_proofs_in_queue: 1000
-# 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
+last_processed_block: 0
 
 ecdsa:
     private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"