From 9961d46bb183c2d7117cbfd7f2aa5730b5b725f4 Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Fri, 20 Jun 2025 19:56:43 +0200
Subject: [PATCH] fix: add missing historical RPC endpoints for Optimism
 pre-bedrock (#16976)

Co-authored-by: Claude <noreply@anthropic.com>
---
 crates/optimism/rpc/src/historical.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crates/optimism/rpc/src/historical.rs b/crates/optimism/rpc/src/historical.rs
index c364271ae3..133bce6a7d 100644
--- a/crates/optimism/rpc/src/historical.rs
+++ b/crates/optimism/rpc/src/historical.rs
@@ -114,10 +114,12 @@ where
                     parse_block_id_from_params(&req.params(), 0)
                 }
                 "eth_getBalance" |
-                "eth_getStorageAt" |
                 "eth_getCode" |
                 "eth_getTransactionCount" |
-                "eth_call" => parse_block_id_from_params(&req.params(), 1),
+                "eth_call" |
+                "eth_estimateGas" |
+                "eth_createAccessList" => parse_block_id_from_params(&req.params(), 1),
+                "eth_getStorageAt" | "eth_getProof" => parse_block_id_from_params(&req.params(), 2),
                 _ => None,
             };