Fix new way to save last block

Author: Mechanix97

aggregation_mode/src/backend/config.rs

@@ -7,14 +7,19 @@ pub struct ECDSAConfig {
     pub private_key_store_password: String,
 }
 
+#[derive(Debug, Deserialize, Serialize)]
+pub struct LastProcessedBlock {
+    pub last_processed_block: u64,
+}
+
 #[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 last_processed_block_filepath: String,
     pub ecdsa: ECDSAConfig,
 }
 
@@ -27,13 +32,30 @@ impl Config {
         Ok(config)
     }
 
-    pub fn save_to_file(&self, file_path: &str) -> Result<(), Box<dyn std::error::Error>> {
+    pub fn get_last_processed_block(&self) -> Result<u64, Box<dyn std::error::Error>> {
+        let mut file = File::open(&self.last_processed_block_filepath)?;
+        let mut contents = String::new();
+        file.read_to_string(&mut contents)?;
+        let lpb: LastProcessedBlock = serde_json::from_str(&contents)?;
+        Ok(lpb.last_processed_block)
+    }
+
+    pub fn update_last_processed_block(
+        &self,
+        last_processed_block: u64,
+    ) -> Result<(), Box<dyn std::error::Error>> {
+        let last_processed_block_struct = LastProcessedBlock {
+            last_processed_block: last_processed_block,
+        };
+
         let mut file = OpenOptions::new()
             .write(true)
             .truncate(true)
-            .open(file_path)?;
-        let content = serde_yaml::to_string(&self)?;
+            .open(&self.last_processed_block_filepath)?;
+
+        let content = serde_json::to_string(&last_processed_block_struct)?;
         file.write_all(content.as_bytes())?;
+
         Ok(())
     }
 }

aggregation_mode/src/backend/fetcher.rs

@@ -37,10 +37,12 @@ impl ProofsFetcher {
             rpc_provider.clone(),
         );
 
+        let last_processed_block = config.get_last_processed_block().unwrap();
+
         Self {
             rpc_provider,
             aligned_service_manager,
-            last_processed_block: config.last_processed_block,
+            last_processed_block: last_processed_block,
         }
     }
 

aggregation_mode/src/backend/mod.rs

@@ -69,15 +69,17 @@ impl ProofAggregator {
         }
     }
 
-    pub async fn start(&mut self, config: &mut Config) {
+    pub async fn start(&mut self, config: &Config) {
         info!("Starting proof aggregator service",);
 
         info!("About to aggregate and submit proof to be verified on chain");
         let res = self.aggregate_and_submit_proofs_on_chain().await;
 
         match res {
             Ok(()) => {
-                config.last_processed_block = self.fetcher.get_last_processed_block();
+                config
+                    .update_last_processed_block(self.fetcher.get_last_processed_block())
+                    .unwrap();
                 info!("Process finished successfully");
             }
             Err(err) => {

aggregation_mode/src/main.rs

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

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: 0
+last_processed_block_filepath: config-files/proof-aggregator.last_processed_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: 0
+last_processed_block_filepath: config-files/proof-aggregator.last_processed_block.json
 
 ecdsa:
     private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"

config-files/proof-aggregator.last_processed_block.json

@@ -0,0 +1 @@
+{"last_processed_block":1305}