EXTCODECOPY fix gas hardfork

crates/revm/src/gas/calc.rs

@@ -123,17 +123,14 @@ pub fn verylowcopy_cost(len: U256) -> Option<u64> {
 pub fn extcodecopy_cost<SPEC: Spec>(len: U256, is_cold: bool) -> Option<u64> {
     let wordd = len / U256::from(32);
     let wordr = len % U256::from(32);
-    let base_gas: u64 = if SPEC::enabled(BERLIN) {
-        if is_cold {
-            COLD_ACCOUNT_ACCESS_COST
-        } else {
-            WARM_STORAGE_READ_COST
-        }
-    } else if SPEC::enabled(ISTANBUL) {
-        700
+
+    let base_gas: u64 = if SPEC::enabled(BERLIN) && is_cold {
+        // WARM_STORAGE_READ_COST is already calculated
+        COLD_ACCOUNT_ACCESS_COST - WARM_STORAGE_READ_COST
     } else {
-        20
+        0
     };
+    // TODO make this u64 friendly, U256 does not make sense.
     let gas =
         U256::from(base_gas).checked_add(U256::from(COPY).checked_mul(if wordr.is_zero() {
             wordd

crates/revm/src/instructions/opcode.rs

@@ -314,7 +314,14 @@ macro_rules! gas_opcodee {
             } else {
                 20
             }),
-            /* 0x3c  EXTCODECOPY */ OpInfo::dynamic_gas(),
+            /* 0x3c  EXTCODECOPY */
+            OpInfo::gas(if SpecId::enabled($spec_id, SpecId::BERLIN) {
+                gas::WARM_STORAGE_READ_COST // add only part of gas
+            } else if SpecId::enabled($spec_id, SpecId::TANGERINE) {
+                700
+            } else {
+                20
+            }),
             /* 0x3d  RETURNDATASIZE */
             OpInfo::gas(if SpecId::enabled($spec_id, SpecId::BYZANTIUM) {
                 gas::BASE