fix: added retries and delay in contract verification

Author: BornPsych

circom/src/contract.rs

@@ -208,54 +208,120 @@ pub async fn deploy_verifier_contract(payload: Payload) -> Result<String> {
 
     if let Ok(_) = env::var("ETHERSCAN_API_KEY") {
         info!(LOG, "Verify contracts");
-        if let Err(e) = run_command(
-            "forge",
-            &[
-                "verify-contract",
-                "--chain-id",
-                payload.chain_id.to_string().as_str(),
-                contract_addresses.get("ClientProofVerifier").unwrap(),
-                "tmp/ClientProofVerifier.sol:ClientProofVerifier",
-            ],
-            None,
-        )
-        .await
-        {
-            info!(LOG, "Warning: Failed to verify ClientProofVerifier: {}", e);
+
+        // Verify ClientProofVerifier with retries
+        for attempt in 1..=3 {
+            info!(
+                LOG,
+                "Attempting to verify ClientProofVerifier (attempt {}/3)", attempt
+            );
+            match run_command(
+                "forge",
+                &[
+                    "verify-contract",
+                    "--chain-id",
+                    payload.chain_id.to_string().as_str(),
+                    contract_addresses.get("ClientProofVerifier").unwrap(),
+                    "tmp/ClientProofVerifier.sol:ClientProofVerifier",
+                ],
+                None,
+            )
+            .await
+            {
+                Ok(_) => {
+                    info!(LOG, "Successfully verified ClientProofVerifier");
+                    break;
+                }
+                Err(e) => {
+                    info!(
+                        LOG,
+                        "Attempt {}/3 failed to verify ClientProofVerifier: {}", attempt, e
+                    );
+                    if attempt < 3 {
+                        info!(LOG, "Waiting 10 seconds before retry...");
+                        tokio::time::sleep(tokio::time::Duration::from_secs(10)).await;
+                    }
+                }
+            }
         }
 
-        if let Err(e) = run_command(
-            "forge",
-            &[
-                "verify-contract",
-                "--chain-id",
-                payload.chain_id.to_string().as_str(),
-                contract_addresses.get("ServerProofVerifier").unwrap(),
-                "tmp/ServerProofVerifier.sol:ServerProofVerifier",
-            ],
-            None,
-        )
-        .await
-        {
-            info!(LOG, "Warning: Failed to verify ServerProofVerifier: {}", e);
+        // Delay between contract verifications
+        info!(LOG, "Waiting 5 seconds before next verification...");
+        tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
+
+        // Verify ServerProofVerifier with retries
+        for attempt in 1..=3 {
+            info!(
+                LOG,
+                "Attempting to verify ServerProofVerifier (attempt {}/3)", attempt
+            );
+            match run_command(
+                "forge",
+                &[
+                    "verify-contract",
+                    "--chain-id",
+                    payload.chain_id.to_string().as_str(),
+                    contract_addresses.get("ServerProofVerifier").unwrap(),
+                    "tmp/ServerProofVerifier.sol:ServerProofVerifier",
+                ],
+                None,
+            )
+            .await
+            {
+                Ok(_) => {
+                    info!(LOG, "Successfully verified ServerProofVerifier");
+                    break;
+                }
+                Err(e) => {
+                    info!(
+                        LOG,
+                        "Attempt {}/3 failed to verify ServerProofVerifier: {}", attempt, e
+                    );
+                    if attempt < 3 {
+                        info!(LOG, "Waiting 10 seconds before retry...");
+                        tokio::time::sleep(tokio::time::Duration::from_secs(10)).await;
+                    }
+                }
+            }
         }
 
-        if let Err(e) = run_command(
-            "forge",
-            &[
-                "verify-contract",
-                "--chain-id",
-                payload.chain_id.to_string().as_str(),
-                "--constructor-args",
-                &constructor_args,
-                contract_addresses.get("Contract").unwrap(),
-                "tmp/Contract.sol:Contract",
-            ],
-            None,
-        )
-        .await
-        {
-            info!(LOG, "Warning: Failed to verify Contract: {}", e);
+        // Delay between contract verifications
+        info!(LOG, "Waiting 5 seconds before next verification...");
+        tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
+
+        // Verify Contract with retries
+        for attempt in 1..=3 {
+            info!(LOG, "Attempting to verify Contract (attempt {}/3)", attempt);
+            match run_command(
+                "forge",
+                &[
+                    "verify-contract",
+                    "--chain-id",
+                    payload.chain_id.to_string().as_str(),
+                    "--constructor-args",
+                    &constructor_args,
+                    contract_addresses.get("Contract").unwrap(),
+                    "tmp/Contract.sol:Contract",
+                ],
+                None,
+            )
+            .await
+            {
+                Ok(_) => {
+                    info!(LOG, "Successfully verified Contract");
+                    break;
+                }
+                Err(e) => {
+                    info!(
+                        LOG,
+                        "Attempt {}/3 failed to verify Contract: {}", attempt, e
+                    );
+                    if attempt < 3 {
+                        info!(LOG, "Waiting 10 seconds before retry...");
+                        tokio::time::sleep(tokio::time::Duration::from_secs(10)).await;
+                    }
+                }
+            }
         }
     }