feat: default from_block to 24hs ago if not provided

Author: MarcosNicolau

batcher/aligned-sdk/src/agg_mode.rs

@@ -8,6 +8,10 @@ use ethers::{
 };
 use sha3::{Digest, Keccak256};
 
+/// How much to go back from current block if from_block is not provided
+/// 7500 blocks = 25hr
+const FROM_BLOCKS_AGO_DEFAULT: u64 = 7500;
+
 #[derive(Debug)]
 pub enum ProofVerificationAggModeError {
     ProvingSystemNotSupportedInAggMode,
@@ -26,6 +30,7 @@ pub enum ProofVerificationAggModeError {
 ///
 /// ⚠️ The `from` block used in the verification process must not be older than 18 days,
 /// as blobs expire after that period and will no longer be retrievable.
+/// If not provided, it  defaults to fetch logs from the past 25hs
 ///
 /// The step-by-step verification process includes:
 /// 1. Querying the blob versioned hash from the latest event emitted by the aligned proof aggregation service contract
@@ -40,12 +45,23 @@ pub async fn is_proof_verified_in_aggregation_mode(
     network: Network,
     eth_rpc_url: String,
     beacon_client_url: String,
-    from_block: u64,
+    from_block: Option<u64>,
 ) -> Result<[u8; 32], ProofVerificationAggModeError> {
     let eth_rpc_provider = Provider::<Http>::try_from(eth_rpc_url)
         .map_err(|e| ProofVerificationAggModeError::EthereumProviderError(e.to_string()))?;
     let beacon_client = BeaconClient::new(beacon_client_url);
 
+    let from_block = match from_block {
+        Some(from_block) => from_block,
+        None => {
+            let block_number = eth_rpc_provider
+                .get_block_number()
+                .await
+                .map_err(|e| ProofVerificationAggModeError::EthereumProviderError(e.to_string()))?;
+            block_number.as_u64() - FROM_BLOCKS_AGO_DEFAULT
+        }
+    };
+
     let filter = Filter::new()
         .address(network.get_aligned_proof_agg_service_address())
         .event("AggregatedProofVerified(bytes32,bytes32)")
@@ -111,7 +127,7 @@ pub async fn is_proof_verified_in_aggregation_mode(
         }
     }
 
-    return Err(ProofVerificationAggModeError::ProofNotFoundInLogs);
+    Err(ProofVerificationAggModeError::ProofNotFoundInLogs)
 }
 
 fn decoded_blob(blob_data: Vec<u8>) -> Vec<[u8; 32]> {

batcher/aligned/src/main.rs

@@ -289,20 +289,19 @@ pub struct VerifyProofInAggModeArgs {
     #[arg(
         name = "Ethereum RPC provider url",
         long = "rpc_url",
-        default_value = "https://ethereum-holesky-rpc.publicnode.com"
+        default_value = "http://localhost:8545"
     )]
     eth_rpc_url: String,
-    #[arg(
-        name = "Ethereum Beacon client url",
-        long = "beacon_url",
-        default_value = "http://100.90.212.34:5052"
-    )]
+    #[arg(name = "Ethereum Beacon client url", long = "beacon_url")]
     beacon_client_url: String,
-    #[arg(name = "Proof Hash", long = "proof-hash")]
-    proof_hash: String,
+    #[arg(name = "Proof commitment", long = "proof-commitment")]
+    proof_commitment: String,
     #[clap(flatten)]
     network: NetworkArg,
-    #[arg(name = "From which block to start", long = "from-block")]
+    #[arg(
+        name = "From which block to start, if not provided it defaults to fetch logs from the past 25hs",
+        long = "from-block"
+    )]
     from_block: Option<u64>,
 }
 
@@ -759,7 +758,7 @@ async fn main() -> Result<(), AlignedError> {
             return Ok(());
         }
         AlignedCommands::VerifyProofInAggMode(args) => {
-            let proof_hash_bytes: [u8; 32] = hex::decode(args.proof_hash.replace("0x", ""))
+            let proof_hash_bytes: [u8; 32] = hex::decode(args.proof_commitment.replace("0x", ""))
                 .expect("Proof to be a valid hex encoded hash")
                 .try_into()
                 .expect("Proof be raw bytes to be of len 32");
@@ -769,7 +768,7 @@ async fn main() -> Result<(), AlignedError> {
                 args.network.into(),
                 args.eth_rpc_url,
                 args.beacon_client_url,
-                args.from_block.unwrap_or(0),
+                args.from_block,
             )
             .await
             {