Merge tag 'v3.3.3' into 3.3.x-agglayer

Author: vcastellm

Cargo.lock

@@ -26,7 +26,7 @@ edition = "2021"
 authors = ["ratankaliani", "zachobront", "fakedev9999", "yuwen01"]
 homepage = "https://succinctlabs.github.io/op-succinct/"
 repository = "https://github.com/succinctlabs/op-succinct"
-version = "3.3.2"
+version = "3.3.3"
 
 [workspace.dependencies]
 # general
@@ -77,40 +77,40 @@ strum_macros = "0.27.1"
 tempfile = "3.10.1"
 
 # kona
-kona-mpt = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.6" }
-kona-derive = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.6", default-features = false }
-kona-driver = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.6" }
-kona-preimage = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.6", features = [
+kona-mpt = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.7" }
+kona-derive = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.7", default-features = false }
+kona-driver = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.7" }
+kona-preimage = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.7", features = [
     "rkyv",
     "serde",
 ] }
-kona-executor = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.6" }
-kona-proof = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.6" }
+kona-executor = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.7" }
+kona-proof = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.7" }
 
-kona-client = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.6" }
-kona-host = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.6" }
-kona-providers-alloy = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.6" }
-kona-rpc = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.6", default-features = false }
-kona-protocol = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.6", default-features = false }
-kona-registry = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.6", default-features = false }
-kona-genesis = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.6", default-features = false }
+kona-client = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.7" }
+kona-host = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.7" }
+kona-providers-alloy = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.7" }
+kona-rpc = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.7", default-features = false }
+kona-protocol = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.7", default-features = false }
+kona-registry = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.7", default-features = false }
+kona-genesis = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.1.7", default-features = false }
 
 # hana
-hana-blobstream = { git = "https://github.com/celestiaorg/hana", tag = "v1.2.2-mocha" }
-hana-celestia = { git = "https://github.com/celestiaorg/hana", tag = "v1.2.2-mocha" }
-hana-host = { git = "https://github.com/celestiaorg/hana", tag = "v1.2.2-mocha" }
-hana-oracle = { git = "https://github.com/celestiaorg/hana", tag = "v1.2.2-mocha" }
+hana-blobstream = { git = "https://github.com/celestiaorg/hana", rev = "1d272dd83263dbcc2ad97daaac84b2e578a0b288" }
+hana-celestia = { git = "https://github.com/celestiaorg/hana", rev = "1d272dd83263dbcc2ad97daaac84b2e578a0b288" }
+hana-host = { git = "https://github.com/celestiaorg/hana", rev = "1d272dd83263dbcc2ad97daaac84b2e578a0b288" }
+hana-oracle = { git = "https://github.com/celestiaorg/hana", rev = "1d272dd83263dbcc2ad97daaac84b2e578a0b288" }
 
 # hokulea
-hokulea-compute-proof = { git = "https://github.com/Layr-Labs/hokulea", rev = "28eaa376e3399a12a81b0699060a8e8ed74bbaf8" }
-hokulea-eigenda = { git = "https://github.com/Layr-Labs/hokulea", rev = "28eaa376e3399a12a81b0699060a8e8ed74bbaf8" }
-hokulea-host-bin = { git = "https://github.com/Layr-Labs/hokulea", rev = "28eaa376e3399a12a81b0699060a8e8ed74bbaf8" }
-hokulea-proof = { git = "https://github.com/Layr-Labs/hokulea", rev = "28eaa376e3399a12a81b0699060a8e8ed74bbaf8" }
-hokulea-witgen = { git = "https://github.com/Layr-Labs/hokulea", rev = "28eaa376e3399a12a81b0699060a8e8ed74bbaf8" }
-hokulea-zkvm-verification = { git = "https://github.com/Layr-Labs/hokulea", rev = "28eaa376e3399a12a81b0699060a8e8ed74bbaf8" }
-canoe-sp1-cc-host = { git = "https://github.com/Layr-Labs/hokulea", rev = "28eaa376e3399a12a81b0699060a8e8ed74bbaf8" }
-canoe-sp1-cc-verifier = { git = "https://github.com/Layr-Labs/hokulea", rev = "28eaa376e3399a12a81b0699060a8e8ed74bbaf8" }
-canoe-verifier-address-fetcher = { git = "https://github.com/Layr-Labs/hokulea", rev = "28eaa376e3399a12a81b0699060a8e8ed74bbaf8" }
+hokulea-compute-proof = { git = "https://github.com/Layr-Labs/hokulea", rev = "ede4e93969fa3e181093c8807576afb85c60cb0e" }
+hokulea-eigenda = { git = "https://github.com/Layr-Labs/hokulea", rev = "ede4e93969fa3e181093c8807576afb85c60cb0e" }
+hokulea-host-bin = { git = "https://github.com/Layr-Labs/hokulea", rev = "ede4e93969fa3e181093c8807576afb85c60cb0e" }
+hokulea-proof = { git = "https://github.com/Layr-Labs/hokulea", rev = "ede4e93969fa3e181093c8807576afb85c60cb0e" }
+hokulea-witgen = { git = "https://github.com/Layr-Labs/hokulea", rev = "ede4e93969fa3e181093c8807576afb85c60cb0e" }
+hokulea-zkvm-verification = { git = "https://github.com/Layr-Labs/hokulea", rev = "ede4e93969fa3e181093c8807576afb85c60cb0e" }
+canoe-sp1-cc-host = { git = "https://github.com/Layr-Labs/hokulea", rev = "ede4e93969fa3e181093c8807576afb85c60cb0e" }
+canoe-sp1-cc-verifier = { git = "https://github.com/Layr-Labs/hokulea", rev = "ede4e93969fa3e181093c8807576afb85c60cb0e" }
+canoe-verifier-address-fetcher = { git = "https://github.com/Layr-Labs/hokulea", rev = "ede4e93969fa3e181093c8807576afb85c60cb0e" }
 
 # op-succinct
 op-succinct-prove = { path = "scripts/prove" }
@@ -133,31 +133,31 @@ op-succinct-range-utils = { path = "programs/range/utils" }
 op-succinct-bindings = { path = "bindings" }
 
 # Alloy (Network)
-alloy-signer-local = { version = "1.0.38" }
-alloy-provider = { version = "1.0.38" }
-alloy-transport = { version = "1.0.38" }
-alloy-transport-http = { version = "1.0.38" }
-alloy-contract = { version = "1.0.38" }
-alloy-network = { version = "1.0.38" }
+alloy-signer-local = { version = "1.1.0" }
+alloy-provider = { version = "1.1.0" }
+alloy-transport = { version = "1.1.0" }
+alloy-transport-http = { version = "1.1.0" }
+alloy-contract = { version = "1.1.0" }
+alloy-network = { version = "1.1.0" }
 
 # Alloy
 alloy-rlp = { version = "0.3.12", default-features = false }
 alloy-trie = { version = "0.9.1", default-features = false, features = [
     "ethereum",
 ] }
-alloy-eips = { version = "1.0.38", default-features = false }
-alloy-serde = { version = "1.0.38", default-features = false }
-alloy-consensus = { version = "1.0.38", default-features = false }
-alloy-rpc-types = { version = "1.0.38", default-features = false }
-alloy-rpc-client = { version = "1.0.38", default-features = false }
-alloy-node-bindings = { version = "1.0.38", default-features = false }
-alloy-rpc-types-engine = { version = "1.0.38", default-features = false }
-alloy-rpc-types-beacon = { version = "1.0.38", default-features = false }
-alloy-rpc-types-eth = { version = "1.0.38", default-features = false }
-alloy-rpc-types-trace = { version = "1.0.38", default-features = false }
-alloy-signer = { version = "1.0.38", default-features = false }
-alloy-signer-gcp = { version = "1.0.38", default-features = false }
-alloy = { version = "1.0.38", features = [
+alloy-eips = { version = "1.1.0", default-features = false }
+alloy-serde = { version = "1.1.0", default-features = false }
+alloy-consensus = { version = "1.1.0", default-features = false }
+alloy-rpc-types = { version = "1.1.0", default-features = false }
+alloy-rpc-client = { version = "1.1.0", default-features = false }
+alloy-node-bindings = { version = "1.1.0", default-features = false }
+alloy-rpc-types-engine = { version = "1.1.0", default-features = false }
+alloy-rpc-types-beacon = { version = "1.1.0", default-features = false }
+alloy-rpc-types-eth = { version = "1.1.0", default-features = false }
+alloy-rpc-types-trace = { version = "1.1.0", default-features = false }
+alloy-signer = { version = "1.1.0", default-features = false }
+alloy-signer-gcp = { version = "1.1.0", default-features = false }
+alloy = { version = "1.1.0", features = [
     "reqwest",
     "network",
     "providers",
@@ -174,21 +174,20 @@ alloy-sol-macro = { version = "1.3.1", default-features = false }
 alloy-chains = { version = "0.2.7", default-features = false }
 
 # OP Alloy
-op-alloy-consensus = { version = "0.20.0", default-features = false }
-op-alloy-rpc-types = { version = "0.20.0", default-features = false }
-op-alloy-rpc-types-engine = { version = "0.20.0", default-features = false }
-op-alloy-network = { version = "0.20.0", default-features = false }
+op-alloy-consensus = { version = "0.22.0", default-features = false }
+op-alloy-rpc-types = { version = "0.22.0", default-features = false }
+op-alloy-rpc-types-engine = { version = "0.22.0", default-features = false }
+op-alloy-network = { version = "0.22.0", default-features = false }
 
 # Execution
-alloy-evm = { version = "0.21.0", default-features = false }
-alloy-op-evm = { version = "0.21.0", default-features = false }
+alloy-evm = { version = "0.23.1", default-features = false }
+alloy-op-evm = { version = "0.23.1", default-features = false }
 # Use kzg-rs and substrate-bn for the zkVM.
-revm = { version = "29.0.1", default-features = false, features = [
-    "kzg-rs",
+revm = { version = "31.0.0", default-features = false, features = [
     "bn",
 ] }
-revm-precompile = { version = "27.0.0", default-features = false }
-op-revm = { version = "10.1.0", default-features = false }
+revm-precompile = { version = "29.0.0", default-features = false }
+op-revm = { version = "12.0.0", default-features = false }
 
 # SP1
 sp1-sdk = { version = "=5.2.2", default-features = false, features = ["network"] }

Cargo.toml

@@ -11,7 +11,7 @@ sp1_zkvm::entrypoint!(main);
 
 use canoe_sp1_cc_verifier::CanoeSp1CCVerifier;
 use canoe_verifier_address_fetcher::CanoeVerifierAddressFetcherDeployedByEigenLabs;
-use hokulea_proof::eigenda_witness::EigenDAWitness;
+use hokulea_proof::{eigenda_witness::EigenDAWitness, recency::DisabledZeroRecencyWindowProvider};
 use hokulea_zkvm_verification::eigenda_witness_to_preloaded_provider;
 use op_succinct_client_utils::witness::{EigenDAWitnessData, WitnessData};
 use op_succinct_eigenda_client_utils::executor::EigenDAWitnessExecutor;
@@ -43,6 +43,7 @@ fn main() {
             oracle.clone(),
             CanoeSp1CCVerifier {},
             CanoeVerifierAddressFetcherDeployedByEigenLabs {},
+            DisabledZeroRecencyWindowProvider {},
             eigenda_witness,
         )
         .await

elf/aggregation-elf

@@ -0,0 +1,38 @@
+//! Custom crypto provider for KZG proof verification.
+
+use kzg_rs::{Bytes32, Bytes48, KzgProof, KzgSettings};
+use revm::precompile::{Crypto, PrecompileError};
+
+/// Custom cryptography provider using kzg-rs for KZG proof verification.
+#[derive(Debug)]
+pub struct CustomCrypto {
+    kzg_settings: KzgSettings,
+}
+
+impl Default for CustomCrypto {
+    fn default() -> Self {
+        Self { kzg_settings: KzgSettings::load_trusted_setup_file().unwrap() }
+    }
+}
+
+impl Crypto for CustomCrypto {
+    fn verify_kzg_proof(
+        &self,
+        z: &[u8; 32],
+        y: &[u8; 32],
+        commitment: &[u8; 48],
+        proof: &[u8; 48],
+    ) -> Result<(), PrecompileError> {
+        let z = Bytes32::from_slice(z).map_err(|_| PrecompileError::BlobVerifyKzgProofFailed)?;
+        let y = Bytes32::from_slice(y).map_err(|_| PrecompileError::BlobVerifyKzgProofFailed)?;
+        let commitment = Bytes48::from_slice(commitment)
+            .map_err(|_| PrecompileError::BlobVerifyKzgProofFailed)?;
+        let proof =
+            Bytes48::from_slice(proof).map_err(|_| PrecompileError::BlobVerifyKzgProofFailed)?;
+
+        KzgProof::verify_kzg_proof(&commitment, &z, &y, &proof, &self.kzg_settings)
+            .map_err(|_| PrecompileError::BlobVerifyKzgProofFailed)?;
+
+        Ok(())
+    }
+}

elf/celestia-range-elf-embedded

@@ -8,7 +8,7 @@ use op_revm::{
     OpTransactionError,
 };
 use revm::{
-    context::{result::EVMError, Evm as RevmEvm, TxEnv},
+    context::{result::EVMError, BlockEnv, Evm as RevmEvm, TxEnv},
     handler::instructions::EthInstructions,
     inspector::NoOpInspector,
     Context, Inspector,
@@ -39,6 +39,7 @@ impl EvmFactory for ZkvmOpEvmFactory {
         EVMError<DBError, OpTransactionError>;
     type HaltReason = OpHaltReason;
     type Spec = OpSpecId;
+    type BlockEnv = BlockEnv;
     type Precompiles = OpZkvmPrecompiles;
 
     fn create_evm<DB: Database>(