[DO NOT MERGE] V37 taiko

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         rust: ["stable", "beta", "nightly"]
-        flags: ["--no-default-features", "", "--all-features"]
+        flags: ["--no-default-features", "", "--features taiko"]
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
@@ -38,7 +38,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        features: ["", "optimism"]
+        features: ["", "taiko"]
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
@@ -80,7 +80,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: rust-docs
-      - run: cargo doc --workspace --all-features --no-deps --document-private-items
+      - run: cargo doc --workspace --features taiko --no-deps --document-private-items
         env:
           RUSTDOCFLAGS: "--cfg docsrs -D warnings"
 

CHANGELOG.md

@@ -278,7 +278,7 @@ date: 20.1.2022
 
 # v3 tag
 
-* revm: v1.0.0 
+* revm: v1.0.0
 * revme: v0.1.0
 
 # v2 tag

bins/revme/Cargo.toml

@@ -17,7 +17,6 @@ microbench = "0.5"
 plain_hasher = "0.2"
 revm = { path = "../../crates/revm", version = "10.0.0", default-features = false, features = [
     "ethersdb",
-    "std",
     "serde-json",
     "c-kzg",
     "blst"
@@ -26,10 +25,14 @@ alloy-rlp = { version = "0.3", default-features = false, features = [
     "arrayvec",
     "derive",
 ] }
-serde = { version = "1.0", features = ["derive", "rc"] }
-serde_json = { version = "1.0", features = ["preserve_order"] }
+serde = { version = "1.0", default-features = false, features = ["derive", "rc"] }
+serde_json = { version = "1.0", default-features = false, features = ["alloc"]}
 structopt = "0.3"
 thiserror = "1.0"
 triehash = "0.8"
 walkdir = "2.5"
 k256 = { version = "0.13.3", features = ["ecdsa"] }
+
+[features]
+default = ["std"]
+std = ["serde/std", "serde_json/std", "alloy-rlp/std", "revm/std"]

crates/interpreter/Cargo.toml

@@ -55,15 +55,11 @@ asm-keccak = ["revm-primitives/asm-keccak"]
 portable = ["revm-primitives/portable"]
 parse = ["dep:paste", "dep:phf"]
 
-optimism = ["revm-primitives/optimism"]
-# Optimism default handler enabled Optimism handler register by default in EvmBuilder.
-optimism-default-handler = [
-    "optimism",
-    "revm-primitives/optimism-default-handler",
-]
-negate-optimism-default-handler = [
-    "revm-primitives/negate-optimism-default-handler",
-]
+optimism = []
+taiko = ["revm-primitives/taiko"]
+# taiko default handler enabled taiko handler register by default in EvmBuilder.
+taiko-default-handler = ["taiko", "revm-primitives/taiko-default-handler"]
+negate-taiko-default-handler = ["revm-primitives/negate-taiko-default-handler"]
 
 dev = [
     "memory_limit",

crates/interpreter/src/function_stack.rs

@@ -51,9 +51,8 @@ impl FunctionStack {
 
     /// Pops a frame from the stack and sets current_code_idx to the popped frame's idx.
     pub fn pop(&mut self) -> Option<FunctionReturnFrame> {
-        self.return_stack.pop().map(|frame| {
+        self.return_stack.pop().inspect(|frame| {
             self.current_code_idx = frame.idx;
-            frame
         })
     }
 

crates/interpreter/src/gas/calc.rs

@@ -288,7 +288,7 @@ pub const fn selfdestruct_cost(spec_id: SpecId, res: SelfDestructResult) -> u64
 /// * Account access gas. after berlin it can be cold or warm.
 /// * Transfer value gas. If value is transferred and balance of target account is updated.
 /// * If account is not existing and needs to be created. After Spurious dragon
-/// this is only accounted if value is transferred.
+///   this is only accounted if value is transferred.
 #[inline]
 pub const fn call_cost(
     spec_id: SpecId,

crates/interpreter/src/instruction_result.rs

@@ -105,8 +105,6 @@ impl From<HaltReason> for InstructionResult {
             HaltReason::EofAuxDataOverflow => Self::EofAuxDataOverflow,
             HaltReason::EofAuxDataTooSmall => Self::EofAuxDataTooSmall,
             HaltReason::EOFFunctionStackOverflow => Self::EOFFunctionStackOverflow,
-            #[cfg(feature = "optimism")]
-            HaltReason::FailedDeposit => Self::FatalExternalError,
         }
     }
 }

crates/precompile/CHANGELOG.md

@@ -226,7 +226,7 @@ date: 20.1.2022
 
 # v0.3.0
 
-* switch stacks H256 with U256 
+* switch stacks H256 with U256
 * Error type is changed to `Return` in revm so it is in precompiles.
 # v0.2.0
 

crates/precompile/Cargo.toml

@@ -24,9 +24,15 @@ all = "warn"
 revm-primitives = { path = "../primitives", version = "5.0.0", default-features = false }
 once_cell = { version = "1.19", default-features = false, features = ["alloc"] }
 
-# ecRecover
+# Optional KZG point evaluation precompile
+c-kzg = { git = "https://github.com/brechtpd/c-kzg-4844", branch = "for-alpha7", default-features = false, optional = true, features = [
+    "preload-kzg-settings",
+    "no-threads",
+] }
+
+# ecRecover precompile
 k256 = { version = "0.13.3", default-features = false, features = ["ecdsa"] }
-secp256k1 = { version = ">=0.28, <=0.29", default-features = false, features = [
+secp256k1 = { version = "0.29", default-features = false, features = [
     "alloc",
     "recovery",
     "rand",
@@ -43,9 +49,6 @@ aurora-engine-modexp = { version = "1.1", default-features = false }
 # ecAdd, ecMul, ecPairing
 bn = { package = "substrate-bn", version = "0.6", default-features = false }
 
-# KZG point evaluation precompile
-c-kzg = { version = "1.0.2", default-features = false, optional = true }
-
 # BLS12-381 precompiles
 blst = { version = "0.3.12", optional = true }
 
@@ -77,15 +80,11 @@ std = [
 hashbrown = ["revm-primitives/hashbrown"]
 asm-keccak = ["revm-primitives/asm-keccak"]
 
-optimism = ["revm-primitives/optimism", "secp256r1"]
-# Optimism default handler enabled Optimism handler register by default in EvmBuilder.
-optimism-default-handler = [
-    "optimism",
-    "revm-primitives/optimism-default-handler",
-]
-negate-optimism-default-handler = [
-    "revm-primitives/negate-optimism-default-handler",
-]
+optimism = []
+taiko = ["revm-primitives/taiko"]
+# taiko default handler enabled taiko handler register by default in EvmBuilder.
+taiko-default-handler = ["taiko", "revm-primitives/taiko-default-handler"]
+negate-taiko-default-handler = ["revm-primitives/negate-taiko-default-handler"]
 
 # Enables the p256verify precompile.
 secp256r1 = ["dep:p256"]
@@ -101,6 +100,7 @@ portable = ["revm-primitives/portable", "c-kzg?/portable"]
 # In Linux it passes. If you don't require to build wasm on win/mac, it is safe to use it and it is enabled by default.
 secp256k1 = ["dep:secp256k1"]
 
+sp1-cycle-tracker = []
 # Enables the BLS12-381 precompiles.
 blst = ["dep:blst"]
 

crates/precompile/src/blake2.rs

@@ -1,3 +1,4 @@
+use crate::zk_op::{self, ZkOperation};
 use crate::{Error, Precompile, PrecompileResult, PrecompileWithAddress};
 use revm_primitives::{Bytes, PrecompileOutput};
 
@@ -11,6 +12,9 @@ pub const FUN: PrecompileWithAddress =
 /// input format:
 /// [4 bytes for rounds][64 bytes for h][128 bytes for m][8 bytes for t_0][8 bytes for t_1][1 byte for f]
 pub fn run(input: &Bytes, gas_limit: u64) -> PrecompileResult {
+    #[cfg(feature = "sp1-cycle-tracker")]
+    println!("cycle-tracker-start: blake2");
+
     let input = &input[..];
 
     if input.len() != INPUT_LENGTH {
@@ -30,26 +34,38 @@ pub fn run(input: &Bytes, gas_limit: u64) -> PrecompileResult {
         return Err(Error::OutOfGas.into());
     }
 
-    let mut h = [0u64; 8];
-    let mut m = [0u64; 16];
+    let out = if zk_op::contains_operation(&ZkOperation::Blake2) {
+        zk_op::ZKVM_OPERATOR
+            .get()
+            .unwrap()
+            .blake2_run(input)
+            .unwrap()
+    } else {
+        let mut h = [0u64; 8];
+        let mut m = [0u64; 16];
+
+        for (i, pos) in (4..68).step_by(8).enumerate() {
+            h[i] = u64::from_le_bytes(input[pos..pos + 8].try_into().unwrap());
+        }
+        for (i, pos) in (68..196).step_by(8).enumerate() {
+            m[i] = u64::from_le_bytes(input[pos..pos + 8].try_into().unwrap());
+        }
+        let t = [
+            u64::from_le_bytes(input[196..196 + 8].try_into().unwrap()),
+            u64::from_le_bytes(input[204..204 + 8].try_into().unwrap()),
+        ];
 
-    for (i, pos) in (4..68).step_by(8).enumerate() {
-        h[i] = u64::from_le_bytes(input[pos..pos + 8].try_into().unwrap());
-    }
-    for (i, pos) in (68..196).step_by(8).enumerate() {
-        m[i] = u64::from_le_bytes(input[pos..pos + 8].try_into().unwrap());
-    }
-    let t = [
-        u64::from_le_bytes(input[196..196 + 8].try_into().unwrap()),
-        u64::from_le_bytes(input[204..204 + 8].try_into().unwrap()),
-    ];
+        algo::compress(rounds, &mut h, m, t, f);
 
-    algo::compress(rounds, &mut h, m, t, f);
+        let mut out = [0u8; 64];
+        for (i, h) in (0..64).step_by(8).zip(h.iter()) {
+            out[i..i + 8].copy_from_slice(&h.to_le_bytes());
+        }
 
-    let mut out = [0u8; 64];
-    for (i, h) in (0..64).step_by(8).zip(h.iter()) {
-        out[i..i + 8].copy_from_slice(&h.to_le_bytes());
-    }
+        out
+    };
+    #[cfg(feature = "sp1-cycle-tracker")]
+    println!("cycle-tracker-end: blake2");
 
     Ok(PrecompileOutput::new(gas_used, out.into()))
 }

crates/precompile/src/bls12_381/pairing.rs

@@ -26,6 +26,7 @@ const INPUT_LENGTH: usize = 384;
 /// following structure:
 ///    * 128 bytes of G1 point encoding
 ///    * 256 bytes of G2 point encoding
+///
 /// Each point is expected to be in the subgroup of order q.
 /// Output is 32 bytes where first 31 bytes are equal to 0x00 and the last byte
 /// is 0x01 if pairing result is equal to the multiplicative identity in a pairing

crates/precompile/src/bls12_381/utils.rs

@@ -56,11 +56,11 @@ pub(super) fn remove_padding(input: &[u8]) -> Result<&[u8; FP_LENGTH], Precompil
 ///
 /// From [EIP-2537](https://eips.ethereum.org/EIPS/eip-2537):
 /// * A scalar for the multiplication operation is encoded as 32 bytes by performing BigEndian
-/// encoding of the corresponding (unsigned) integer.
+///   encoding of the corresponding (unsigned) integer.
 ///
 /// We do not check that the scalar is a canonical Fr element, because the EIP specifies:
 /// * The corresponding integer is not required to be less than or equal than main subgroup order
-/// `q`.
+///   `q`.
 pub(super) fn extract_scalar_input(input: &[u8]) -> Result<blst_scalar, PrecompileError> {
     if input.len() != SCALAR_LENGTH {
         return Err(PrecompileError::Other(format!(