perf: Add static Optimism precompiles for Fjord & Granite

crates/optimism/Cargo.toml

@@ -28,6 +28,7 @@ precompile = { workspace = true, features = ["secp256r1"] }
 
 # misc
 enumn = { version = "0.1" }
+once_cell = { version = "1.19", default-features = false, features = ["alloc"] }
 
 # Optional
 serde = { version = "1.0", default-features = false, features = [

crates/optimism/src/handler_register.rs

@@ -2,6 +2,7 @@
 
 use crate::{
     optimism_spec_to_generic,
+    precompile::{fjord, granite},
     transaction::{
         deposit::DepositTransaction, error::OpTransactionError, OpTransactionType, OpTxTrait,
     },
@@ -17,7 +18,7 @@ use revm::{
         register::EvmHandler,
     },
     interpreter::{return_ok, return_revert, Gas},
-    precompile::{secp256r1, PrecompileSpecId},
+    precompile::PrecompileSpecId,
     primitives::{HashMap, U256},
     state::Account,
     transaction::CommonTxFields,
@@ -194,23 +195,13 @@ pub fn refund<EvmWiringT: OptimismWiring, SPEC: OptimismSpec>(
 #[inline]
 pub fn load_precompiles<EvmWiringT: OptimismWiring, SPEC: OptimismSpec>(
 ) -> ContextPrecompiles<EvmWiringT> {
-    let mut precompiles = ContextPrecompiles::new(PrecompileSpecId::from_spec_id(SPEC::SPEC_ID));
-
-    if SPEC::optimism_enabled(OptimismSpecId::FJORD) {
-        precompiles.extend([
-            // EIP-7212: secp256r1 P256verify
-            secp256r1::P256VERIFY,
-        ])
-    }
-
     if SPEC::optimism_enabled(OptimismSpecId::GRANITE) {
-        precompiles.extend([
-            // Restrict bn256Pairing input size
-            crate::bn128::pair::GRANITE,
-        ])
+        ContextPrecompiles::from_static_precompiles(granite())
+    } else if SPEC::optimism_enabled(OptimismSpecId::FJORD) {
+        ContextPrecompiles::from_static_precompiles(fjord())
+    } else {
+        ContextPrecompiles::new(PrecompileSpecId::from_spec_id(SPEC::SPEC_ID))
     }
-
-    precompiles
 }
 
 /// Load account (make them warm) and l1 data from database.

crates/optimism/src/lib.rs

@@ -9,6 +9,7 @@ pub mod bn128;
 pub mod fast_lz;
 pub mod handler_register;
 pub mod l1block;
+pub mod precompile;
 pub mod result;
 pub mod spec;
 pub mod transaction;

crates/optimism/src/precompile.rs

@@ -0,0 +1,32 @@
+use once_cell::race::OnceBox;
+use revm::precompile::{secp256r1, Precompiles};
+
+/// Returns precompiles for Fjord spec.
+pub fn fjord() -> &'static Precompiles {
+    static INSTANCE: OnceBox<Precompiles> = OnceBox::new();
+    INSTANCE.get_or_init(|| {
+        let mut precompiles = Precompiles::cancun().clone();
+
+        precompiles.extend([
+            // EIP-7212: secp256r1 P256verify
+            secp256r1::P256VERIFY,
+        ]);
+
+        Box::new(precompiles)
+    })
+}
+
+/// Returns precompiles for Granite spec.
+pub fn granite() -> &'static Precompiles {
+    static INSTANCE: OnceBox<Precompiles> = OnceBox::new();
+    INSTANCE.get_or_init(|| {
+        let mut precompiles = fjord().clone();
+
+        precompiles.extend([
+            // Restrict bn256Pairing input size
+            crate::bn128::pair::GRANITE,
+        ]);
+
+        Box::new(precompiles)
+    })
+}