diff --git a/Cargo.lock b/Cargo.lock index b88eebbd..68f39b81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3849,6 +3849,7 @@ dependencies = [ "log", "log4rs", "rand", + "revm 17.1.0", "scroll-prover", "serde", "serde_derive", @@ -4000,6 +4001,19 @@ dependencies = [ "sha3-asm", ] +[[package]] +name = "kzg-rs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0850eb19206463a61bede4f7b7e6b21731807137619044b1f3c287ebcfe2b3b0" +dependencies = [ + "ff 0.13.0", + "hex", + "sha2", + "sp1_bls12_381", + "spin 0.9.8", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -5165,7 +5179,7 @@ dependencies = [ "bn254", "itertools 0.13.0", "sp1-intrinsics", - "sp1-lib", + "sp1-lib 2.0.0", ] [[package]] @@ -5825,6 +5839,7 @@ dependencies = [ "c-kzg", "cfg-if 1.0.0", "k256", + "kzg-rs", "once_cell", "p256", "revm-primitives 13.0.0", @@ -5866,11 +5881,13 @@ dependencies = [ "auto_impl", "bitflags 2.6.0", "bitvec", + "c-kzg", "cfg-if 1.0.0", "dyn-clone", "enumn", "getrandom", "hex", + "kzg-rs", "poseidon-bn254", "serde", ] @@ -7026,6 +7043,20 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "sp1-lib" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bea7811abd2d3a991007fcb284f41152840b8388c171288d0c52c6793956609c" +dependencies = [ + "anyhow", + "bincode", + "cfg-if 1.0.0", + "hex", + "serde", + "snowbridge-amcl", +] + [[package]] name = "sp1-lib" version = "2.0.0" @@ -7295,6 +7326,21 @@ dependencies = [ "tracing", ] +[[package]] +name = "sp1_bls12_381" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a27c4b8901334dc09099dd82f80a72ddfc76b0046f4b342584c808f1931bed5a" +dependencies = [ + "cfg-if 1.0.0", + "ff 0.13.0", + "group 0.13.0", + "pairing 0.23.0", + "rand_core", + "sp1-lib 1.2.0", + "subtle", +] + [[package]] name = "spin" version = "0.5.2" diff --git a/Cargo.toml b/Cargo.toml index a110f47e..e8654bf8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,6 +32,8 @@ prover = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = " integration = { path = "integration" } scroll-prover = { path = "prover" } +revm = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/feat/v49/sp1", features = ["negate-scroll-default-handler"] } + [patch.crates-io] halo2curves = { git = "https://github.com/scroll-tech/halo2curves", branch = "v0.1.0" } ethers-core = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" } @@ -64,8 +66,8 @@ alloy-core = { git = "https://github.com/scroll-tech/alloy-core", branch = "v0.8 alloy-primitives = { git = "https://github.com/scroll-tech/alloy-core", branch = "v0.8.10" } alloy-sol-types = {git = "https://github.com/scroll-tech/alloy-core", branch = "v0.8.10" } # ========== revm patches, unify revm usage in sbv / zkevm-circuit -revm = { git = "https://github.com/scroll-tech//revm", branch = "scroll-evm-executor/feat/v49/sp1" } -revm-primitives = { git = "https://github.com/scroll-tech//revm", branch = "scroll-evm-executor/feat/v49/sp1" } +revm = { git = "https://github.com/scroll-tech//revm", branch = "scroll-evm-executor/feat/v49/sp1"} +#revm-primitives = { git = "https://github.com/scroll-tech//revm", branch = "scroll-evm-executor/feat/v49/sp1" } [patch."https://github.com/privacy-scaling-explorations/halo2.git"] diff --git a/integration/Cargo.toml b/integration/Cargo.toml index 5b548635..9fec4cc6 100644 --- a/integration/Cargo.toml +++ b/integration/Cargo.toml @@ -16,6 +16,7 @@ serde.workspace = true serde_json.workspace = true serde_derive.workspace = true tokio.workspace = true +revm.workspace = true snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop" } snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop", default-features = false, features = ["loader_halo2", "loader_evm", "halo2-pse"] }