fix: handle all payload errors (#6805)

foundry-rs · Jan 15, 2024 · f208187 · f208187
1 parent fbd8c34
commit f208187
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/anvil/src/eth/backend/fork.rs b/crates/anvil/src/eth/backend/fork.rs
@@ -434,10 +434,12 @@ impl ClientFork {
         if self.predates_fork_inclusive(number) {
             let receipts = self.provider().get_block_receipts(BlockNumber::Number(number)).await?;
 
-            let mut storage = self.storage_write();
-            storage.block_receipts.insert(number, receipts.clone());
+            if let Some(receipts) = receipts.clone() {
+                let mut storage = self.storage_write();
+                storage.block_receipts.insert(number, receipts);
+            }
 
-            return Ok(Some(receipts));
+            return Ok(receipts);
         }
 
         Ok(None)

diff --git a/crates/common/src/provider/tower.rs b/crates/common/src/provider/tower.rs
@@ -108,13 +108,16 @@ impl Service<RequestPacket> for RetryBackoffService<RuntimeTransport> {
 
                 match fut {
                     Ok(res) => {
-                        this.requests_enqueued.fetch_sub(1, Ordering::SeqCst);
-                        return Ok(res)
+                        if let Some(e) = res.as_error() {
+                            err = TransportError::ErrorResp(e.clone())
+                        } else {
+                            this.requests_enqueued.fetch_sub(1, Ordering::SeqCst);
+                            return Ok(res)
+                        }
                     }
                     Err(e) => err = e,
                 }
 
-                let err = TransportError::from(err);
                 let should_retry = this.policy.should_retry(&err);
                 if should_retry {
                     rate_limit_retry_number += 1;
@@ -159,7 +162,7 @@ impl Service<RequestPacket> for RetryBackoffService<RuntimeTransport> {
                     }
 
                     this.requests_enqueued.fetch_sub(1, Ordering::SeqCst);
-                    return Err(TransportErrorKind::custom_str("Max retries exceeded"))
+                    return Err(err)
                 }
             }
         })