change last_aggregated_block

Author: Mechanix97

.gitignore

@@ -12,7 +12,7 @@ batcher/aligned/batch_inclusion_responses/*
 **/broadcast
 volume
 config-files/*.last_processed_batch.json
-config-files/*.last_processed_block.json
+config-files/*.last_aggregated_block.json
 
 nonce_*.bin
 

aggregation_mode/src/backend/config.rs

@@ -8,8 +8,8 @@ pub struct ECDSAConfig {
 }
 
 #[derive(Debug, Deserialize, Serialize)]
-pub struct LastProcessedBlock {
-    pub last_processed_block: u64,
+pub struct LastAggregatedBlock {
+    pub last_aggregated_block: u64,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
@@ -19,7 +19,7 @@ pub struct Config {
     pub max_proofs_in_queue: u16,
     pub proof_aggregation_service_address: String,
     pub aligned_service_manager_address: String,
-    pub last_processed_block_filepath: String,
+    pub last_aggregated_block_filepath: String,
     pub ecdsa: ECDSAConfig,
 }
 
@@ -32,34 +32,34 @@ impl Config {
         Ok(config)
     }
 
-    pub fn get_last_processed_block(&self) -> Result<u64, Box<dyn std::error::Error>> {
-        match File::open(&self.last_processed_block_filepath) {
+    pub fn get_last_aggregated_block(&self) -> Result<u64, Box<dyn std::error::Error>> {
+        match File::open(&self.last_aggregated_block_filepath) {
             Err(_) => {
                 // if file doesn't exist, default 0
                 Ok(0)
             }
             Ok(mut file) => {
                 let mut contents = String::new();
                 file.read_to_string(&mut contents)?;
-                let lpb: LastProcessedBlock = serde_json::from_str(&contents)?;
-                Ok(lpb.last_processed_block)
+                let lpb: LastAggregatedBlock = serde_json::from_str(&contents)?;
+                Ok(lpb.last_aggregated_block)
             }
         }
     }
 
-    pub fn update_last_processed_block(
+    pub fn update_last_aggregated_block(
         &self,
-        last_processed_block: u64,
+        last_aggregated_block: u64,
     ) -> Result<(), Box<dyn std::error::Error>> {
-        let last_processed_block_struct = LastProcessedBlock {
-            last_processed_block,
+        let last_processed_block_struct = LastAggregatedBlock {
+            last_aggregated_block,
         };
 
         let mut file = OpenOptions::new()
             .write(true)
             .truncate(true)
             .create(true)
-            .open(&self.last_processed_block_filepath)?;
+            .open(&self.last_aggregated_block_filepath)?;
 
         let content = serde_json::to_string(&last_processed_block_struct)?;
         file.write_all(content.as_bytes())?;

aggregation_mode/src/backend/fetcher.rs

@@ -24,7 +24,7 @@ pub enum ProofsFetcherError {
 pub struct ProofsFetcher {
     rpc_provider: RPCProvider,
     aligned_service_manager: AlignedLayerServiceManagerContract,
-    last_processed_block: u64,
+    last_aggregated_block: u64,
 }
 
 impl ProofsFetcher {
@@ -37,12 +37,12 @@ impl ProofsFetcher {
             rpc_provider.clone(),
         );
 
-        let last_processed_block = config.get_last_processed_block().unwrap();
+        let last_aggregated_block = config.get_last_aggregated_block().unwrap();
 
         Self {
             rpc_provider,
             aligned_service_manager,
-            last_processed_block,
+            last_aggregated_block,
         }
     }
 
@@ -54,22 +54,22 @@ impl ProofsFetcher {
             .await
             .map_err(|e| ProofsFetcherError::GetBlockNumber(e.to_string()))?;
 
-        if current_block < self.last_processed_block {
+        if current_block < self.last_aggregated_block {
             return Err(ProofsFetcherError::GetBlockNumber(
                 "Invalid last processed block".to_string(),
             ));
         }
 
         info!(
             "Fetching proofs from batch logs starting from block number {} upto {}",
-            self.last_processed_block, current_block
+            self.last_aggregated_block, current_block
         );
 
         // Subscribe to NewBatch event from AlignedServiceManager
         let logs = self
             .aligned_service_manager
             .NewBatchV3_filter()
-            .from_block(self.last_processed_block)
+            .from_block(self.last_aggregated_block)
             .to_block(current_block)
             .query()
             .await
@@ -78,7 +78,7 @@ impl ProofsFetcher {
         info!("Logs collected {}", logs.len());
 
         // Update last processed block after collecting logs
-        self.last_processed_block = current_block;
+        self.last_aggregated_block = current_block;
 
         let mut proofs = vec![];
 
@@ -136,7 +136,7 @@ impl ProofsFetcher {
         Ok(proofs)
     }
 
-    pub fn get_last_processed_block(&self) -> u64 {
-        self.last_processed_block
+    pub fn get_last_aggregated_block(&self) -> u64 {
+        self.last_aggregated_block
     }
 }

aggregation_mode/src/backend/mod.rs

@@ -78,7 +78,7 @@ impl ProofAggregator {
         match res {
             Ok(()) => {
                 config
-                    .update_last_processed_block(self.fetcher.get_last_processed_block())
+                    .update_last_aggregated_block(self.fetcher.get_last_aggregated_block())
                     .unwrap();
                 info!("Process finished successfully");
             }

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

@@ -3,7 +3,7 @@ eth_ws_url: ws://localhost:8545
 max_proofs_in_queue: 1000
 proof_aggregation_service_address: 0xB0D4afd8879eD9F52b28595d31B441D079B2Ca07
 aligned_service_manager_address: 0x851356ae760d987E095750cCeb3bC6014560891C
-last_processed_block_filepath: config-files/proof-aggregator.last_processed_block.json
+last_aggregated_block_filepath: config-files/proof-aggregator.last_aggregated_block.json
 ecdsa:
   private_key_store_path: config-files/anvil.proof-aggregator.ecdsa.key.json
   private_key_store_password: ''

config-files/config-proof-aggregator.yaml

@@ -3,7 +3,7 @@ proof_aggregation_service_address: "0xcbEAF3BDe82155F56486Fb5a1072cb8baAf547cc"
 eth_rpc_url: "http://localhost:8545"
 eth_ws_url: "ws://localhost:8545"
 max_proofs_in_queue: 1000
-last_processed_block_filepath: config-files/proof-aggregator.last_processed_block.json
+last_aggregated_block_filepath: config-files/proof-aggregator.last_aggregated_block.json
 
 ecdsa:
     private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"