Feat truncate config file

Author: Mechanix97

aggregation_mode/src/backend/config.rs

@@ -1,21 +1,21 @@
-use serde::Deserialize;
-use std::{fs::File, io::Read};
+use serde::{Deserialize, Serialize};
+use std::{fs::File, fs::OpenOptions, io::Read, io::Write};
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Serialize)]
 pub struct ECDSAConfig {
     pub private_key_store_path: String,
     pub private_key_store_password: String,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Serialize)]
 pub struct Config {
     pub eth_rpc_url: String,
     pub eth_ws_url: String,
     pub max_proofs_in_queue: u16,
     pub proof_aggregation_service_address: String,
     pub aligned_service_manager_address: String,
+    pub last_processed_block: u64,
     pub ecdsa: ECDSAConfig,
-    pub last_processed_block: u64
 }
 
 impl Config {
@@ -26,4 +26,11 @@ impl Config {
         let config: Config = serde_yaml::from_str(&contents)?;
         Ok(config)
     }
+
+    pub fn save_to_file(&self, file_path: &str) -> Result<(), Box<dyn std::error::Error>>  {
+        let mut file = OpenOptions::new().write(true).truncate(true).open(file_path)?;
+        let content = serde_yaml::to_string(&self)?;
+        file.write_all(content.as_bytes())?;
+        Ok(())
+    }
 }

aggregation_mode/src/backend/fetcher.rs

@@ -44,33 +44,34 @@ impl ProofsFetcher {
         }
     }
 
-    pub async fn fetch(&self) -> Result<Vec<AlignedProof>, ProofsFetcherError> {
+    pub async fn fetch(&mut self) -> Result<Vec<AlignedProof>, ProofsFetcherError> {
+        // Get current block
+        let current_block = self
+            .rpc_provider
+            .get_block_number()
+            .await
+            .map_err(|_| ProofsFetcherError::BlockNumber)?;
+
         info!(
-            "Fetching proofs from batch logs starting from block number {}",
-            self.last_processed_block
+            "Fetching proofs from batch logs starting from block number {} upto {}",
+            self.last_processed_block,
+            current_block
         );
+            
         // Subscribe to NewBatch event from AlignedServiceManager
         let logs = self
             .aligned_service_manager
             .NewBatchV3_filter()
             .from_block(self.last_processed_block)
+            .to_block(current_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
-        );
+        // Update last processed block after collecting logs
+        self.last_processed_block = current_block;
 
         let mut proofs = vec![];
 
@@ -127,14 +128,4 @@ 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)?;
-
-        Ok(block_number.saturating_sub(self.last_processed_block))
-    }
 }

aggregation_mode/src/main.rs

@@ -28,4 +28,6 @@ async fn main() {
 
     let mut proof_aggregator = ProofAggregator::new(&config);
     proof_aggregator.start().await;
+
+    config.save_to_file(&config_file_path).unwrap();   
 }

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

@@ -1,10 +1,9 @@
-aligned_service_manager_address: "0x851356ae760d987E095750cCeb3bC6014560891C"
-proof_aggregation_service_address: "0xB0D4afd8879eD9F52b28595d31B441D079B2Ca07"
-eth_rpc_url: "http://localhost:8545"
-eth_ws_url: "ws://localhost:8545"
+eth_rpc_url: http://localhost:8545
+eth_ws_url: ws://localhost:8545
 max_proofs_in_queue: 1000
+proof_aggregation_service_address: 0xB0D4afd8879eD9F52b28595d31B441D079B2Ca07
+aligned_service_manager_address: 0x851356ae760d987E095750cCeb3bC6014560891C
 last_processed_block: 0
-
 ecdsa:
-  private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"
-  private_key_store_password: ""
+  private_key_store_path: config-files/anvil.proof-aggregator.ecdsa.key.json
+  private_key_store_password: ''