fixes: fetching implementation ABI for proxy contracts | rate limits …

cli/src/commands/add.rs

@@ -1,4 +1,4 @@
-use std::{borrow::Cow, fs, path::PathBuf};
+use std::{borrow::Cow, fs, path::PathBuf, time::Duration};
 
 use ethers::{
     addressbook::{Address, Chain},
@@ -81,10 +81,32 @@ pub async fn handle_add_contract_command(
         .parse()
         .inspect_err(|e| print_error_message(&format!("Invalid contract address: {}", e)))?;
 
+    let mut abi_lookup_address = address;
+    let mut timeout = 1000;
+    let mut retry_attempts = 0;
+    let max_retries = 3;
+
     loop {
-        let metadata = client.contract_source_code(address).await.inspect_err(|e| {
-            print_error_message(&format!("Failed to fetch contract metadata: {}", e))
-        })?;
+        let metadata = match client.contract_source_code(abi_lookup_address).await {
+            Ok(data) => data,
+            Err(e) => {
+                if retry_attempts >= max_retries {
+                    print_error_message(&format!(
+                        "Failed to fetch contract metadata: {}, retries: {}",
+                        e, retry_attempts
+                    ));
+                    return Err(Box::new(e));
+                }
+                // Different verifiers have different rate limits which leads to
+                // rate limit errors when adding a contract.
+                // Etherscan has good rate limits whereas Arbiscan is not as good
+                // Sleeping here avoids APIs hitting rate limit
+                tokio::time::sleep(Duration::from_millis(timeout)).await;
+                retry_attempts += 1;
+                timeout *= retry_attempts * 2;
+                continue;
+            }
+        };
 
         if metadata.items.is_empty() {
             print_error_message(&format!(
@@ -96,7 +118,12 @@ pub async fn handle_add_contract_command(
 
         let item = &metadata.items[0];
         if item.proxy == 1 && item.implementation.is_some() {
-            println!("This contract is a proxy contract. Loading the implementation contract...");
+            abi_lookup_address = item.implementation.unwrap();
+            println!(
+                "This contract is a proxy contract. Loading the implementation contract {}",
+                abi_lookup_address
+            );
+            tokio::time::sleep(Duration::from_millis(1000)).await;
             continue;
         }
 

documentation/docs/pages/docs/changelog.mdx

@@ -8,7 +8,8 @@
 
 ### Bug fixes
 -------------------------------------------------
-
+- fix: fixing the query of implemntation ABI for proxy contracts
+- fix: add request timeouts to adapt to different verifier's rate limits
 ### Breaking changes
 -------------------------------------------------