Cache precompiles hashmap

bluealloy · Aug 29, 2022 · d851763 · d851763
1 parent 4317474
commit d851763
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 41 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/revm/src/evm.rs b/crates/revm/src/evm.rs
@@ -139,7 +139,7 @@ macro_rules! create_evm {
             $db,
             $env,
             $inspector,
-            Precompiles::new::<{ SpecId::to_precompile_id($spec::SPEC_ID) }>(),
+            Precompiles::new::<{ SpecId::to_precompile_id($spec::SPEC_ID) }>().clone(),
         )) as Box<dyn Transact + 'a>
     };
 }

diff --git a/crates/revm_precompiles/Cargo.toml b/crates/revm_precompiles/Cargo.toml
@@ -19,6 +19,7 @@ secp256k1 = { version = "0.24.0", default-features = false, features = ["alloc",
 sha2 = { version = "0.10.2", default-features = false }
 sha3 = { version = "0.10.1", default-features = false }
 hashbrown = { version = "0.12" }
+once_cell = "1.13"
 
 [dev-dependencies]
 hex = "0.4"

diff --git a/crates/revm_precompiles/src/lib.rs b/crates/revm_precompiles/src/lib.rs
@@ -1,6 +1,7 @@
 #![no_std]
 
 use bytes::Bytes;
+use once_cell::sync::OnceCell;
 use primitive_types::{H160 as Address, H256, U256};
 
 mod blake2;
@@ -61,13 +62,14 @@ pub type PrecompileResult = Result<PrecompileOutput, Return>;
 pub type StandardPrecompileFn = fn(&[u8], u64) -> PrecompileResult;
 pub type CustomPrecompileFn = fn(&[u8], u64) -> PrecompileResult;
 
+#[derive(Clone)]
 pub struct Precompiles {
     fun: HashMap<Address, Precompile>,
 }
 
 impl Default for Precompiles {
     fn default() -> Self {
-        Self::new::<3>() //berlin
+        Self::new::<3>().clone() //berlin
     }
 }
 
@@ -91,45 +93,49 @@ impl SpecId {
 }
 
 impl Precompiles {
-    pub fn new<const SPEC_ID: u8>() -> Self {
-        let mut fun: HashMap<Address, Precompile> = HashMap::new();
-        let mut insert_fun =
-            |precompile: (Address, Precompile)| fun.insert(precompile.0, precompile.1);
-
-        if SpecId::HOMESTEAD.enabled(SPEC_ID) {
-            insert_fun(secp256k1::ECRECOVER);
-            insert_fun(hash::SHA256);
-            insert_fun(hash::RIPEMD160);
-            insert_fun(identity::FUN);
-        }
-
-        if SpecId::ISTANBUL.enabled(SPEC_ID) {
-            // EIP-152: Add BLAKE2 compression function `F` precompile.
-            insert_fun(blake2::FUN);
-        }
-
-        if SpecId::ISTANBUL.enabled(SPEC_ID) {
-            // EIP-1108: Reduce alt_bn128 precompile gas costs.
-            insert_fun(bn128::add::ISTANBUL);
-            insert_fun(bn128::mul::ISTANBUL);
-            insert_fun(bn128::pair::ISTANBUL);
-        } else if SpecId::BYZANTIUM.enabled(SPEC_ID) {
-            // EIP-196: Precompiled contracts for addition and scalar multiplication on the elliptic curve alt_bn128.
-            // EIP-197: Precompiled contracts for optimal ate pairing check on the elliptic curve alt_bn128.
-            insert_fun(bn128::add::BYZANTIUM);
-            insert_fun(bn128::mul::BYZANTIUM);
-            insert_fun(bn128::pair::BYZANTIUM);
-        }
-
-        if SpecId::BERLIN.enabled(SPEC_ID) {
-            // EIP-2565: ModExp Gas Cost.
-            insert_fun(modexp::BERLIN);
-        } else if SpecId::BYZANTIUM.enabled(SPEC_ID) {
-            // EIP-198: Big integer modular exponentiation.
-            insert_fun(modexp::BYZANTIUM);
-        }
-
-        Self { fun }
+    pub fn new<const SPEC_ID: u8>() -> &'static Self {
+        static INSTANCE: OnceCell<Precompiles> = OnceCell::new();
+
+        INSTANCE.get_or_init(|| {
+            let mut fun: HashMap<Address, Precompile> = HashMap::new();
+            let mut insert_fun =
+                |precompile: (Address, Precompile)| fun.insert(precompile.0, precompile.1);
+
+            if SpecId::HOMESTEAD.enabled(SPEC_ID) {
+                insert_fun(secp256k1::ECRECOVER);
+                insert_fun(hash::SHA256);
+                insert_fun(hash::RIPEMD160);
+                insert_fun(identity::FUN);
+            }
+
+            if SpecId::ISTANBUL.enabled(SPEC_ID) {
+                // EIP-152: Add BLAKE2 compression function `F` precompile.
+                insert_fun(blake2::FUN);
+            }
+
+            if SpecId::ISTANBUL.enabled(SPEC_ID) {
+                // EIP-1108: Reduce alt_bn128 precompile gas costs.
+                insert_fun(bn128::add::ISTANBUL);
+                insert_fun(bn128::mul::ISTANBUL);
+                insert_fun(bn128::pair::ISTANBUL);
+            } else if SpecId::BYZANTIUM.enabled(SPEC_ID) {
+                // EIP-196: Precompiled contracts for addition and scalar multiplication on the elliptic curve alt_bn128.
+                // EIP-197: Precompiled contracts for optimal ate pairing check on the elliptic curve alt_bn128.
+                insert_fun(bn128::add::BYZANTIUM);
+                insert_fun(bn128::mul::BYZANTIUM);
+                insert_fun(bn128::pair::BYZANTIUM);
+            }
+
+            if SpecId::BERLIN.enabled(SPEC_ID) {
+                // EIP-2565: ModExp Gas Cost.
+                insert_fun(modexp::BERLIN);
+            } else if SpecId::BYZANTIUM.enabled(SPEC_ID) {
+                // EIP-198: Big integer modular exponentiation.
+                insert_fun(modexp::BYZANTIUM);
+            }
+
+            Self { fun }
+        })
     }
 
     pub fn addresses(&self) -> impl IntoIterator<Item = &Address> {