Waylon/eip4844

crates/interpreter/src/gas/constants.rs

@@ -39,3 +39,6 @@ pub const WARM_STORAGE_READ_COST: u64 = 100;
 pub const INITCODE_WORD_COST: u64 = 2;
 
 pub const CALL_STIPEND: u64 = 2300;
+
+/// EIP-4844: HASH_OPCODE_GAS
+pub const HASH_OPCODE_GAS: u64 = 3;

crates/interpreter/src/instructions.rs

@@ -178,6 +178,7 @@ pub fn eval<H: Host, S: Spec>(opcode: u8, interp: &mut Interpreter, host: &mut H
         opcode::STATICCALL => host::static_call::<S>(interp, host), //check
         opcode::CHAINID => host_env::chainid::<S>(interp, host),
         opcode::MCOPY => memory::mcopy::<S>(interp, host),
+        opcode::HASH_OPCODE_BYTE => memory::blob_hash::<S>(interp, host),
         _ => return_not_found(interp, host),
     }
 }

crates/interpreter/src/instructions/memory.rs

@@ -1,13 +1,9 @@
-use core::cmp::max;
+use core::ops::Index;
 
-use revm_primitives::SpecId::CANCUN;
+use crate::{gas, interpreter::Interpreter, primitives::U256, Host, InstructionResult};
+use core::cmp::max;
 
-use crate::{
-    gas,
-    interpreter::Interpreter,
-    primitives::{Spec, U256},
-    Host, InstructionResult,
-};
+use revm_primitives::{Spec, SpecId::CANCUN};
 
 pub fn mload(interpreter: &mut Interpreter, _host: &mut dyn Host) {
     gas!(interpreter, gas::VERYLOW);
@@ -68,3 +64,24 @@ pub fn mcopy<SPEC: Spec>(interpreter: &mut Interpreter, _host: &mut dyn Host) {
     // copy memory in place
     interpreter.memory.copy(dest, src, len);
 }
+
+/// see https://eips.ethereum.org/EIPS/eip-4844
+pub fn blob_hash<SPEC: Spec>(interpreter: &mut Interpreter, host: &mut dyn Host) {
+    check!(interpreter, SPEC::enabled(CANCUN));
+    // We add an instruction BLOBHASH (with opcode HASH_OPCODE_BYTE) which reads index from the top of the stack as big-endian uint256,
+    // and replaces it on the stack with tx.blob_versioned_hashes[index] if index < len(tx.blob_versioned_hashes),
+    // and otherwise with a zeroed bytes32 value. The opcode has a gas cost of HASH_OPCODE_GAS.
+    gas!(interpreter, gas::HASH_OPCODE_GAS);
+    pop_top!(interpreter, index);
+    let index = as_usize_saturated!(index);
+    if index < host.env().tx.blob_versioned_hashes.len() {
+        // Replace the top of the stack with the versioned hash here
+        push!(
+            interpreter,
+            *host.env().tx.blob_versioned_hashes.index(index)
+        );
+    } else {
+        // else write out a zerod out 32 bytes
+        push!(interpreter, U256::ZERO);
+    }
+}

crates/interpreter/src/instructions/opcode.rs

@@ -124,6 +124,7 @@ pub const INVALID: u8 = 0xfe;
 pub const ADDRESS: u8 = 0x30;
 pub const BALANCE: u8 = 0x31;
 pub const BASEFEE: u8 = 0x48;
+pub const HASH_OPCODE_BYTE: u8 = 0x49;
 pub const ORIGIN: u8 = 0x32;
 pub const CALLER: u8 = 0x33;
 pub const CALLVALUE: u8 = 0x34;
@@ -262,7 +263,7 @@ pub const OPCODE_JUMPMAP: [Option<&'static str>; 256] = [
     /* 0x46 */ Some("CHAINID"),
     /* 0x47 */ Some("SELFBALANCE"),
     /* 0x48 */ Some("BASEFEE"),
-    /* 0x49 */ None,
+    /* 0x49 */ Some("HASH_OPCODE_BYTE"),
     /* 0x4a */ None,
     /* 0x4b */ None,
     /* 0x4c */ None,
@@ -642,7 +643,7 @@ macro_rules! gas_opcodee {
             } else {
                 0
             }),
-            /* 0x49 */ OpInfo::none(),
+            /* 0x49 */ OpInfo::gas(3),
             /* 0x4a */ OpInfo::none(),
             /* 0x4b */ OpInfo::none(),
             /* 0x4c */ OpInfo::none(),

crates/precompile/Cargo.toml

@@ -21,6 +21,10 @@ secp256k1 = { version = "0.27.0", default-features = false, features = [
 ], optional = true }
 sha2 = { version = "0.10.5", default-features = false }
 
+# For the audited ckzg ffi bindings from the EF
+c-kzg = { git = "https://github.com/ethereum/c-kzg-4844", package = "c-kzg" }
+
+
 [dev-dependencies]
 hex = "0.4"
 

crates/precompile/src/lib.rs

@@ -8,6 +8,7 @@ mod bn128;
 mod hash;
 mod identity;
 mod modexp;
+mod point_evaluation;
 mod secp256k1;
 
 use once_cell::sync::OnceCell;
@@ -92,7 +93,8 @@ pub enum SpecId {
     BYZANTIUM = 1,
     ISTANBUL = 2,
     BERLIN = 3,
-    LATEST = 4,
+    CANCUN = 4,
+    LATEST = 5,
 }
 
 impl SpecId {
@@ -191,6 +193,22 @@ impl Precompiles {
         })
     }
 
+    pub fn cancun() -> &'static Self {
+        static INSTANCE: OnceCell<Precompiles> = OnceCell::new();
+        INSTANCE.get_or_init(|| {
+            let mut precompiles = Self::berlin().clone();
+            precompiles.fun.extend(
+                vec![
+                    // EIP-4848: Point evaluation precompile.
+                    point_evaluation::POINT_EVALUATION_PRECOMPILE,
+                ]
+                .into_iter()
+                .map(From::from),
+            );
+            precompiles
+        })
+    }
+
     pub fn latest() -> &'static Self {
         Self::berlin()
     }
@@ -201,6 +219,7 @@ impl Precompiles {
             SpecId::BYZANTIUM => Self::byzantium(),
             SpecId::ISTANBUL => Self::istanbul(),
             SpecId::BERLIN => Self::berlin(),
+            SpecId::CANCUN => Self::cancun(),
             SpecId::LATEST => Self::latest(),
         }
     }