fix generic static bug

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

Hide file tree

Showing 3 changed files with 84 additions and 45 deletions.
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) }>().clone(),
+            Precompiles::new(SpecId::to_precompile_id($spec::SPEC_ID)).clone(),
         )) as Box<dyn Transact + 'a>
     };
 }

diff --git a/crates/revm/src/specification.rs b/crates/revm/src/specification.rs
@@ -29,15 +29,15 @@ pub enum SpecId {
 }
 
 impl SpecId {
-    pub const fn to_precompile_id(self) -> u8 {
+    pub const fn to_precompile_id(self) -> PrecompileId {
         match self {
             FRONTIER | FRONTIER_THAWING | HOMESTEAD | DAO_FORK | TANGERINE | SPURIOUS_DRAGON => {
-                PrecompileId::HOMESTEAD as u8
+                PrecompileId::HOMESTEAD
             }
-            BYZANTIUM | CONSTANTINOPLE | PETERSBURG => PrecompileId::BYZANTIUM as u8,
-            ISTANBUL | MUIR_GLACIER => PrecompileId::ISTANBUL as u8,
+            BYZANTIUM | CONSTANTINOPLE | PETERSBURG => PrecompileId::BYZANTIUM,
+            ISTANBUL | MUIR_GLACIER => PrecompileId::ISTANBUL,
             BERLIN | LONDON | ARROW_GLACIER | GRAY_GLACIER | MERGE | LATEST => {
-                PrecompileId::BERLIN as u8
+                PrecompileId::BERLIN
             }
         }
     }

diff --git a/crates/revm_precompiles/src/lib.rs b/crates/revm_precompiles/src/lib.rs
@@ -69,7 +69,7 @@ pub struct Precompiles {
 
 impl Default for Precompiles {
     fn default() -> Self {
-        Self::new::<3>().clone() //berlin
+        Self::new(SpecId::LATEST).clone() //berlin
     }
 }
 
@@ -84,6 +84,7 @@ pub enum SpecId {
     BYZANTIUM = 1,
     ISTANBUL = 2,
     BERLIN = 3,
+    LATEST = 4,
 }
 
 impl SpecId {
@@ -93,51 +94,89 @@ impl SpecId {
 }
 
 impl Precompiles {
-    pub fn new<const SPEC_ID: u8>() -> &'static Self {
+    pub fn homestead() -> &'static Self {
         static INSTANCE: OnceCell<Precompiles> = OnceCell::new();
+        INSTANCE.get_or_init(|| {
+            let fun = vec![
+                secp256k1::ECRECOVER,
+                hash::SHA256,
+                hash::RIPEMD160,
+                identity::FUN,
+            ]
+            .into_iter()
+            .collect();
+            Self { fun }
+        })
+    }
 
+    pub fn byzantium() -> &'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);
-            }
+            let mut precompiles = Self::homestead().clone();
+            precompiles.fun.extend(
+                vec![
+                    // 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.
+                    bn128::add::BYZANTIUM,
+                    bn128::mul::BYZANTIUM,
+                    bn128::pair::BYZANTIUM,
+                    // EIP-198: Big integer modular exponentiation.
+                    modexp::BYZANTIUM,
+                ]
+                .into_iter(),
+            );
+            precompiles
+        })
+    }
 
-            Self { fun }
+    pub fn istanbul() -> &'static Self {
+        static INSTANCE: OnceCell<Precompiles> = OnceCell::new();
+        INSTANCE.get_or_init(|| {
+            let mut precompiles = Self::byzantium().clone();
+            precompiles.fun.extend(
+                vec![
+                    // EIP-152: Add BLAKE2 compression function `F` precompile.
+                    blake2::FUN,
+                    // EIP-1108: Reduce alt_bn128 precompile gas costs.
+                    bn128::add::ISTANBUL,
+                    bn128::mul::ISTANBUL,
+                    bn128::pair::ISTANBUL,
+                ]
+                .into_iter(),
+            );
+            precompiles
         })
     }
 
+    pub fn berlin() -> &'static Self {
+        static INSTANCE: OnceCell<Precompiles> = OnceCell::new();
+        INSTANCE.get_or_init(|| {
+            let mut precompiles = Self::istanbul().clone();
+            precompiles.fun.extend(
+                vec![
+                    // EIP-2565: ModExp Gas Cost.
+                    modexp::BERLIN,
+                ]
+                .into_iter(),
+            );
+            precompiles
+        })
+    }
+
+    pub fn latest() -> &'static Self {
+        Self::berlin()
+    }
+
+    pub fn new(spec: SpecId) -> &'static Self {
+        match spec {
+            SpecId::HOMESTEAD => Self::homestead(),
+            SpecId::BYZANTIUM => Self::byzantium(),
+            SpecId::ISTANBUL => Self::istanbul(),
+            SpecId::BERLIN => Self::berlin(),
+            SpecId::LATEST => Self::latest(),
+        }
+    }
+
     pub fn addresses(&self) -> impl IntoIterator<Item = &Address> {
         self.fun.keys()
     }