diff --git a/primitives/Cargo.lock b/primitives/Cargo.lock index c027b5e..3ad587d 100644 --- a/primitives/Cargo.lock +++ b/primitives/Cargo.lock @@ -514,7 +514,7 @@ dependencies = [ [[package]] name = "codecs-derive" version = "0.1.0-alpha.18" -source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#a888bc7abcbd86d217e91bb39998576212ac1f87" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#3b31e8b34dcef9d34355846d9f1a803dbc4c44af" dependencies = [ "convert_case 0.6.0", "parity-scale-codec", @@ -1530,7 +1530,7 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reth-codecs" version = "0.1.0-alpha.18" -source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#a888bc7abcbd86d217e91bb39998576212ac1f87" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#3b31e8b34dcef9d34355846d9f1a803dbc4c44af" dependencies = [ "alloy-primitives", "bytes", @@ -1540,7 +1540,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "0.1.0-alpha.18" -source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#a888bc7abcbd86d217e91bb39998576212ac1f87" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#3b31e8b34dcef9d34355846d9f1a803dbc4c44af" dependencies = [ "alloy-chains", "alloy-primitives", @@ -1553,7 +1553,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "0.1.0-alpha.18" -source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#a888bc7abcbd86d217e91bb39998576212ac1f87" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#3b31e8b34dcef9d34355846d9f1a803dbc4c44af" dependencies = [ "alloy-chains", "alloy-eips", @@ -1575,8 +1575,8 @@ dependencies = [ "reth-codecs", "reth-ethereum-forks", "reth-rpc-types", - "revm 5.0.0 (git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0.0-patched)", - "revm-primitives 2.0.0 (git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0.0-patched)", + "revm", + "revm-primitives", "serde", "serde_json", "sha2", @@ -1591,7 +1591,7 @@ dependencies = [ [[package]] name = "reth-rpc-types" version = "0.1.0-alpha.18" -source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#a888bc7abcbd86d217e91bb39998576212ac1f87" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#3b31e8b34dcef9d34355846d9f1a803dbc4c44af" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -1611,76 +1611,36 @@ dependencies = [ [[package]] name = "revm" version = "5.0.0" -source = "git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" +source = "git+https://github.com/sp1-patches/revm?branch=patch-v5.0.0#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" dependencies = [ "auto_impl", "cfg-if", - "revm-interpreter 2.1.0 (git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched)", - "revm-precompile 4.0.0 (git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched)", + "revm-interpreter", + "revm-precompile", "serde", "serde_json", ] -[[package]] -name = "revm" -version = "5.0.0" -source = "git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" -dependencies = [ - "auto_impl", - "cfg-if", - "revm-interpreter 2.1.0 (git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0.0-patched)", - "revm-precompile 4.0.0 (git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0.0-patched)", - "serde", - "serde_json", -] - -[[package]] -name = "revm-interpreter" -version = "2.1.0" -source = "git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" -dependencies = [ - "revm-primitives 2.0.0 (git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched)", - "serde", -] - [[package]] name = "revm-interpreter" version = "2.1.0" -source = "git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" +source = "git+https://github.com/sp1-patches/revm?branch=patch-v5.0.0#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" dependencies = [ - "revm-primitives 2.0.0 (git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0.0-patched)", + "revm-primitives", "serde", ] [[package]] name = "revm-precompile" version = "4.0.0" -source = "git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" -dependencies = [ - "anyhow", - "aurora-engine-modexp", - "c-kzg", - "k256", - "once_cell", - "revm-primitives 2.0.0 (git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched)", - "ripemd", - "secp256k1", - "sha2", - "sp1-precompiles", - "substrate-bn", -] - -[[package]] -name = "revm-precompile" -version = "4.0.0" -source = "git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" +source = "git+https://github.com/sp1-patches/revm?branch=patch-v5.0.0#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" dependencies = [ "anyhow", "aurora-engine-modexp", "c-kzg", "k256", "once_cell", - "revm-primitives 2.0.0 (git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0.0-patched)", + "revm-primitives", "ripemd", "secp256k1", "sha2", @@ -1691,23 +1651,7 @@ dependencies = [ [[package]] name = "revm-primitives" version = "2.0.0" -source = "git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" -dependencies = [ - "alloy-primitives", - "auto_impl", - "bitflags", - "bitvec", - "cfg-if", - "enumn", - "hashbrown 0.14.3", - "hex", - "serde", -] - -[[package]] -name = "revm-primitives" -version = "2.0.0" -source = "git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" +source = "git+https://github.com/sp1-patches/revm?branch=patch-v5.0.0#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" dependencies = [ "alloy-primitives", "auto_impl", @@ -2003,7 +1947,7 @@ dependencies = [ [[package]] name = "sp1-precompiles" version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git#cf58553c9ba6811d597b3871fbdbaa7849cdfee2" +source = "git+https://github.com/succinctlabs/sp1.git#8e4937cc77e3bc22ef6cad5b8b534b6a90003778" dependencies = [ "anyhow", "bincode", @@ -2028,7 +1972,7 @@ dependencies = [ "hex", "hex-literal", "reth-primitives", - "revm 5.0.0 (git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched)", + "revm", "rlp", "serde", "serde_json", diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 721fbcf..1ef82d3 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -19,7 +19,7 @@ alloy-primitives = { version = "0.6.0", default-features = false, features = [ # reth-primitives = { git = "https://github.com/paradigmxyz/reth.git" } reth-primitives = { git = "https://github.com/sp1-patches/reth", default-features = false, branch = "sp1-reth" } # revm = "5.0.0" -revm = { git = "https://github.com/sp1-patches/revm", branch = "john/v5.0.0-patched", features = ["std"], default-features = false } +revm = { git = "https://github.com/sp1-patches/revm", branch = "patch-v5.0.0", features = ["std"], default-features = false } anyhow = "1.0.79" hashbrown = "0.14.3" # ethers-core = "2.0.13" diff --git a/program/Cargo.lock b/program/Cargo.lock index 6954801..f9938da 100644 --- a/program/Cargo.lock +++ b/program/Cargo.lock @@ -514,7 +514,7 @@ dependencies = [ [[package]] name = "codecs-derive" version = "0.1.0-alpha.18" -source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#03cf47506a0c59aa94144c3fc88e134495597973" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#3b31e8b34dcef9d34355846d9f1a803dbc4c44af" dependencies = [ "convert_case 0.6.0", "parity-scale-codec", @@ -1530,7 +1530,7 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reth-codecs" version = "0.1.0-alpha.18" -source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#03cf47506a0c59aa94144c3fc88e134495597973" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#3b31e8b34dcef9d34355846d9f1a803dbc4c44af" dependencies = [ "alloy-primitives", "bytes", @@ -1540,7 +1540,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "0.1.0-alpha.18" -source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#03cf47506a0c59aa94144c3fc88e134495597973" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#3b31e8b34dcef9d34355846d9f1a803dbc4c44af" dependencies = [ "alloy-chains", "alloy-primitives", @@ -1553,7 +1553,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "0.1.0-alpha.18" -source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#03cf47506a0c59aa94144c3fc88e134495597973" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#3b31e8b34dcef9d34355846d9f1a803dbc4c44af" dependencies = [ "alloy-chains", "alloy-eips", @@ -1575,8 +1575,8 @@ dependencies = [ "reth-codecs", "reth-ethereum-forks", "reth-rpc-types", - "revm 5.0.0 (git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched)", - "revm-primitives 2.0.0 (git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched)", + "revm", + "revm-primitives", "serde", "serde_json", "sha2", @@ -1591,7 +1591,7 @@ dependencies = [ [[package]] name = "reth-rpc-types" version = "0.1.0-alpha.18" -source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#03cf47506a0c59aa94144c3fc88e134495597973" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#3b31e8b34dcef9d34355846d9f1a803dbc4c44af" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -1608,19 +1608,6 @@ dependencies = [ "url", ] -[[package]] -name = "revm" -version = "5.0.0" -source = "git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" -dependencies = [ - "auto_impl", - "cfg-if", - "revm-interpreter 2.1.0 (git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched)", - "revm-precompile 4.0.0 (git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched)", - "serde", - "serde_json", -] - [[package]] name = "revm" version = "5.0.0" @@ -1628,48 +1615,21 @@ source = "git+https://github.com/sp1-patches/revm?branch=patch-v5.0.0#c993e0d60b dependencies = [ "auto_impl", "cfg-if", - "revm-interpreter 2.1.0 (git+https://github.com/sp1-patches/revm?branch=patch-v5.0.0)", - "revm-precompile 4.0.0 (git+https://github.com/sp1-patches/revm?branch=patch-v5.0.0)", + "revm-interpreter", + "revm-precompile", "serde", "serde_json", ] -[[package]] -name = "revm-interpreter" -version = "2.1.0" -source = "git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" -dependencies = [ - "revm-primitives 2.0.0 (git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched)", - "serde", -] - [[package]] name = "revm-interpreter" version = "2.1.0" source = "git+https://github.com/sp1-patches/revm?branch=patch-v5.0.0#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" dependencies = [ - "revm-primitives 2.0.0 (git+https://github.com/sp1-patches/revm?branch=patch-v5.0.0)", + "revm-primitives", "serde", ] -[[package]] -name = "revm-precompile" -version = "4.0.0" -source = "git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" -dependencies = [ - "anyhow", - "aurora-engine-modexp", - "c-kzg", - "k256", - "once_cell", - "revm-primitives 2.0.0 (git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched)", - "ripemd", - "secp256k1", - "sha2", - "sp1-precompiles", - "substrate-bn", -] - [[package]] name = "revm-precompile" version = "4.0.0" @@ -1680,7 +1640,7 @@ dependencies = [ "c-kzg", "k256", "once_cell", - "revm-primitives 2.0.0 (git+https://github.com/sp1-patches/revm?branch=patch-v5.0.0)", + "revm-primitives", "ripemd", "secp256k1", "sha2", @@ -1688,23 +1648,6 @@ dependencies = [ "substrate-bn", ] -[[package]] -name = "revm-primitives" -version = "2.0.0" -source = "git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" -dependencies = [ - "alloy-primitives", - "auto_impl", - "bitflags", - "bitvec", - "c-kzg", - "cfg-if", - "enumn", - "hashbrown 0.14.3", - "hex", - "serde", -] - [[package]] name = "revm-primitives" version = "2.0.0" @@ -1714,6 +1657,7 @@ dependencies = [ "auto_impl", "bitflags", "bitvec", + "c-kzg", "cfg-if", "enumn", "hashbrown 0.14.3", @@ -2002,7 +1946,7 @@ dependencies = [ [[package]] name = "sp1-precompiles" version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git#81f01f96fd95e262c3ca79a37f8ebe0cc9c6121c" +source = "git+https://github.com/succinctlabs/sp1.git#8e4937cc77e3bc22ef6cad5b8b534b6a90003778" dependencies = [ "anyhow", "bincode", @@ -2025,7 +1969,7 @@ dependencies = [ "hashbrown 0.14.3", "hex", "reth-primitives", - "revm 5.0.0 (git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched)", + "revm", "rlp", "serde", "thiserror", @@ -2042,7 +1986,7 @@ dependencies = [ "hashbrown 0.14.3", "hex", "reth-primitives", - "revm 5.0.0 (git+https://github.com/sp1-patches/revm?branch=patch-v5.0.0)", + "revm", "serde", "sp1-reth-primitives", "sp1-zkvm", @@ -2052,13 +1996,13 @@ dependencies = [ [[package]] name = "sp1-zkvm" version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git#aaf765deff685159c1eb7a8530b4c97cb6a3882b" +source = "git+https://github.com/succinctlabs/sp1.git#dcf8e3fa53dbff827583dc451516c87c804bef97" dependencies = [ - "anyhow", "bincode", "cfg-if", "getrandom", "k256", + "libm", "rand", "serde", "sp1-precompiles", diff --git a/program/elf/riscv32im-succinct-zkvm-elf b/program/elf/riscv32im-succinct-zkvm-elf index 3f221c3..6272479 100755 Binary files a/program/elf/riscv32im-succinct-zkvm-elf and b/program/elf/riscv32im-succinct-zkvm-elf differ diff --git a/script/Cargo.lock b/script/Cargo.lock index cddb196..7af857d 100644 --- a/script/Cargo.lock +++ b/script/Cargo.lock @@ -682,6 +682,11 @@ dependencies = [ "rayon", ] +[[package]] +name = "blake3-zkvm" +version = "0.1.0" +source = "git+https://github.com/sp1-patches/BLAKE3.git?branch=patch-blake3_zkvm/v.1.0.0#bac2d59f9122b07a4d91475560b4c3214ae62444" + [[package]] name = "block-buffer" version = "0.10.4" @@ -816,7 +821,7 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "codecs-derive" version = "0.1.0-alpha.18" -source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#a888bc7abcbd86d217e91bb39998576212ac1f87" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#3b31e8b34dcef9d34355846d9f1a803dbc4c44af" dependencies = [ "convert_case 0.6.0", "parity-scale-codec", @@ -1876,6 +1881,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + [[package]] name = "itertools" version = "0.12.1" @@ -2320,7 +2334,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "p3-air" version = "0.1.0" -source = "git+https://github.com/succinctlabs/plonky3.git#b6f8bb0b6e7034090af3cea816bfd4e95f7f34a2" +source = "git+https://github.com/Plonky3/Plonky3.git?branch=sp1#4809fa7bedd9ba8f6f5d3267b1592618e3776c57" dependencies = [ "p3-field", "p3-matrix", @@ -2329,9 +2343,13 @@ dependencies = [ [[package]] name = "p3-baby-bear" version = "0.1.0" -source = "git+https://github.com/succinctlabs/plonky3.git#b6f8bb0b6e7034090af3cea816bfd4e95f7f34a2" +source = "git+https://github.com/Plonky3/Plonky3.git?branch=sp1#4809fa7bedd9ba8f6f5d3267b1592618e3776c57" dependencies = [ + "num-bigint", "p3-field", + "p3-mds", + "p3-poseidon2", + "p3-symmetric", "rand", "serde", ] @@ -2339,7 +2357,7 @@ dependencies = [ [[package]] name = "p3-blake3" version = "0.1.0" -source = "git+https://github.com/succinctlabs/plonky3.git#b6f8bb0b6e7034090af3cea816bfd4e95f7f34a2" +source = "git+https://github.com/Plonky3/Plonky3.git?branch=sp1#4809fa7bedd9ba8f6f5d3267b1592618e3776c57" dependencies = [ "blake3", "p3-symmetric", @@ -2348,42 +2366,48 @@ dependencies = [ [[package]] name = "p3-challenger" version = "0.1.0" -source = "git+https://github.com/succinctlabs/plonky3.git#b6f8bb0b6e7034090af3cea816bfd4e95f7f34a2" +source = "git+https://github.com/Plonky3/Plonky3.git?branch=sp1#4809fa7bedd9ba8f6f5d3267b1592618e3776c57" dependencies = [ "p3-field", "p3-maybe-rayon", "p3-symmetric", + "p3-util", "tracing", ] [[package]] name = "p3-commit" version = "0.1.0" -source = "git+https://github.com/succinctlabs/plonky3.git#b6f8bb0b6e7034090af3cea816bfd4e95f7f34a2" +source = "git+https://github.com/Plonky3/Plonky3.git?branch=sp1#4809fa7bedd9ba8f6f5d3267b1592618e3776c57" dependencies = [ + "itertools 0.12.1", "p3-challenger", "p3-field", "p3-matrix", + "p3-util", "serde", ] [[package]] name = "p3-dft" version = "0.1.0" -source = "git+https://github.com/succinctlabs/plonky3.git#b6f8bb0b6e7034090af3cea816bfd4e95f7f34a2" +source = "git+https://github.com/Plonky3/Plonky3.git?branch=sp1#4809fa7bedd9ba8f6f5d3267b1592618e3776c57" dependencies = [ "p3-field", "p3-matrix", "p3-maybe-rayon", "p3-util", + "tracing", ] [[package]] name = "p3-field" version = "0.1.0" -source = "git+https://github.com/succinctlabs/plonky3.git#b6f8bb0b6e7034090af3cea816bfd4e95f7f34a2" +source = "git+https://github.com/Plonky3/Plonky3.git?branch=sp1#4809fa7bedd9ba8f6f5d3267b1592618e3776c57" dependencies = [ "itertools 0.12.1", + "num-bigint", + "num-traits", "p3-util", "rand", "serde", @@ -2392,7 +2416,7 @@ dependencies = [ [[package]] name = "p3-fri" version = "0.1.0" -source = "git+https://github.com/succinctlabs/plonky3.git#b6f8bb0b6e7034090af3cea816bfd4e95f7f34a2" +source = "git+https://github.com/Plonky3/Plonky3.git?branch=sp1#4809fa7bedd9ba8f6f5d3267b1592618e3776c57" dependencies = [ "itertools 0.12.1", "p3-challenger", @@ -2410,9 +2434,14 @@ dependencies = [ [[package]] name = "p3-goldilocks" version = "0.1.0" -source = "git+https://github.com/succinctlabs/plonky3.git#b6f8bb0b6e7034090af3cea816bfd4e95f7f34a2" +source = "git+https://github.com/Plonky3/Plonky3.git?branch=sp1#4809fa7bedd9ba8f6f5d3267b1592618e3776c57" dependencies = [ + "num-bigint", + "p3-dft", "p3-field", + "p3-mds", + "p3-poseidon2", + "p3-symmetric", "p3-util", "rand", "serde", @@ -2421,7 +2450,7 @@ dependencies = [ [[package]] name = "p3-interpolation" version = "0.1.0" -source = "git+https://github.com/succinctlabs/plonky3.git#b6f8bb0b6e7034090af3cea816bfd4e95f7f34a2" +source = "git+https://github.com/Plonky3/Plonky3.git?branch=sp1#4809fa7bedd9ba8f6f5d3267b1592618e3776c57" dependencies = [ "p3-field", "p3-matrix", @@ -2431,7 +2460,7 @@ dependencies = [ [[package]] name = "p3-keccak" version = "0.1.0" -source = "git+https://github.com/succinctlabs/plonky3.git#b6f8bb0b6e7034090af3cea816bfd4e95f7f34a2" +source = "git+https://github.com/Plonky3/Plonky3.git?branch=sp1#4809fa7bedd9ba8f6f5d3267b1592618e3776c57" dependencies = [ "p3-symmetric", "tiny-keccak", @@ -2440,7 +2469,7 @@ dependencies = [ [[package]] name = "p3-keccak-air" version = "0.1.0" -source = "git+https://github.com/succinctlabs/plonky3.git#b6f8bb0b6e7034090af3cea816bfd4e95f7f34a2" +source = "git+https://github.com/Plonky3/Plonky3.git?branch=sp1#4809fa7bedd9ba8f6f5d3267b1592618e3776c57" dependencies = [ "p3-air", "p3-field", @@ -2452,19 +2481,21 @@ dependencies = [ [[package]] name = "p3-matrix" version = "0.1.0" -source = "git+https://github.com/succinctlabs/plonky3.git#b6f8bb0b6e7034090af3cea816bfd4e95f7f34a2" +source = "git+https://github.com/Plonky3/Plonky3.git?branch=sp1#4809fa7bedd9ba8f6f5d3267b1592618e3776c57" dependencies = [ + "itertools 0.12.1", "p3-field", "p3-maybe-rayon", "p3-util", "rand", "serde", + "tracing", ] [[package]] name = "p3-maybe-rayon" version = "0.1.0" -source = "git+https://github.com/succinctlabs/plonky3.git#b6f8bb0b6e7034090af3cea816bfd4e95f7f34a2" +source = "git+https://github.com/Plonky3/Plonky3.git?branch=sp1#4809fa7bedd9ba8f6f5d3267b1592618e3776c57" dependencies = [ "rayon", ] @@ -2472,14 +2503,12 @@ dependencies = [ [[package]] name = "p3-mds" version = "0.1.0" -source = "git+https://github.com/succinctlabs/plonky3.git#b6f8bb0b6e7034090af3cea816bfd4e95f7f34a2" +source = "git+https://github.com/Plonky3/Plonky3.git?branch=sp1#4809fa7bedd9ba8f6f5d3267b1592618e3776c57" dependencies = [ - "p3-baby-bear", + "itertools 0.11.0", "p3-dft", "p3-field", - "p3-goldilocks", "p3-matrix", - "p3-mersenne-31", "p3-symmetric", "p3-util", "rand", @@ -2488,7 +2517,7 @@ dependencies = [ [[package]] name = "p3-merkle-tree" version = "0.1.0" -source = "git+https://github.com/succinctlabs/plonky3.git#b6f8bb0b6e7034090af3cea816bfd4e95f7f34a2" +source = "git+https://github.com/Plonky3/Plonky3.git?branch=sp1#4809fa7bedd9ba8f6f5d3267b1592618e3776c57" dependencies = [ "itertools 0.12.1", "p3-commit", @@ -2501,31 +2530,12 @@ dependencies = [ "tracing", ] -[[package]] -name = "p3-mersenne-31" -version = "0.1.0" -source = "git+https://github.com/succinctlabs/plonky3.git#b6f8bb0b6e7034090af3cea816bfd4e95f7f34a2" -dependencies = [ - "itertools 0.12.1", - "p3-dft", - "p3-field", - "p3-matrix", - "p3-maybe-rayon", - "p3-util", - "rand", - "serde", -] - [[package]] name = "p3-poseidon2" version = "0.1.0" -source = "git+https://github.com/succinctlabs/plonky3.git#b6f8bb0b6e7034090af3cea816bfd4e95f7f34a2" +source = "git+https://github.com/Plonky3/Plonky3.git?branch=sp1#4809fa7bedd9ba8f6f5d3267b1592618e3776c57" dependencies = [ - "p3-baby-bear", "p3-field", - "p3-goldilocks", - "p3-mds", - "p3-mersenne-31", "p3-symmetric", "rand", ] @@ -2533,16 +2543,17 @@ dependencies = [ [[package]] name = "p3-symmetric" version = "0.1.0" -source = "git+https://github.com/succinctlabs/plonky3.git#b6f8bb0b6e7034090af3cea816bfd4e95f7f34a2" +source = "git+https://github.com/Plonky3/Plonky3.git?branch=sp1#4809fa7bedd9ba8f6f5d3267b1592618e3776c57" dependencies = [ "itertools 0.12.1", "p3-field", + "serde", ] [[package]] name = "p3-uni-stark" version = "0.1.0" -source = "git+https://github.com/succinctlabs/plonky3.git#b6f8bb0b6e7034090af3cea816bfd4e95f7f34a2" +source = "git+https://github.com/Plonky3/Plonky3.git?branch=sp1#4809fa7bedd9ba8f6f5d3267b1592618e3776c57" dependencies = [ "itertools 0.12.1", "p3-air", @@ -2560,7 +2571,7 @@ dependencies = [ [[package]] name = "p3-util" version = "0.1.0" -source = "git+https://github.com/succinctlabs/plonky3.git#b6f8bb0b6e7034090af3cea816bfd4e95f7f34a2" +source = "git+https://github.com/Plonky3/Plonky3.git?branch=sp1#4809fa7bedd9ba8f6f5d3267b1592618e3776c57" dependencies = [ "serde", ] @@ -2973,7 +2984,7 @@ dependencies = [ [[package]] name = "reth-codecs" version = "0.1.0-alpha.18" -source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#a888bc7abcbd86d217e91bb39998576212ac1f87" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#3b31e8b34dcef9d34355846d9f1a803dbc4c44af" dependencies = [ "alloy-primitives", "bytes", @@ -2983,7 +2994,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "0.1.0-alpha.18" -source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#a888bc7abcbd86d217e91bb39998576212ac1f87" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#3b31e8b34dcef9d34355846d9f1a803dbc4c44af" dependencies = [ "alloy-chains", "alloy-primitives", @@ -2996,7 +3007,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "0.1.0-alpha.18" -source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#a888bc7abcbd86d217e91bb39998576212ac1f87" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#3b31e8b34dcef9d34355846d9f1a803dbc4c44af" dependencies = [ "alloy-chains", "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=b9dd518)", @@ -3018,8 +3029,8 @@ dependencies = [ "reth-codecs", "reth-ethereum-forks", "reth-rpc-types", - "revm 5.0.0 (git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0.0-patched)", - "revm-primitives 2.0.0 (git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0.0-patched)", + "revm", + "revm-primitives", "serde", "serde_json", "sha2", @@ -3034,7 +3045,7 @@ dependencies = [ [[package]] name = "reth-rpc-types" version = "0.1.0-alpha.18" -source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#a888bc7abcbd86d217e91bb39998576212ac1f87" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#3b31e8b34dcef9d34355846d9f1a803dbc4c44af" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -3054,25 +3065,12 @@ dependencies = [ [[package]] name = "revm" version = "5.0.0" -source = "git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" -dependencies = [ - "auto_impl", - "cfg-if", - "revm-interpreter 2.1.0 (git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched)", - "revm-precompile 4.0.0 (git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched)", - "serde", - "serde_json", -] - -[[package]] -name = "revm" -version = "5.0.0" -source = "git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" +source = "git+https://github.com/sp1-patches/revm?branch=patch-v5.0.0#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" dependencies = [ "auto_impl", "cfg-if", - "revm-interpreter 2.1.0 (git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0.0-patched)", - "revm-precompile 4.0.0 (git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0.0-patched)", + "revm-interpreter", + "revm-precompile", "serde", "serde_json", ] @@ -3080,50 +3078,23 @@ dependencies = [ [[package]] name = "revm-interpreter" version = "2.1.0" -source = "git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" +source = "git+https://github.com/sp1-patches/revm?branch=patch-v5.0.0#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" dependencies = [ - "revm-primitives 2.0.0 (git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched)", + "revm-primitives", "serde", ] -[[package]] -name = "revm-interpreter" -version = "2.1.0" -source = "git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" -dependencies = [ - "revm-primitives 2.0.0 (git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0.0-patched)", - "serde", -] - -[[package]] -name = "revm-precompile" -version = "4.0.0" -source = "git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" -dependencies = [ - "anyhow", - "aurora-engine-modexp", - "c-kzg", - "k256", - "once_cell", - "revm-primitives 2.0.0 (git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched)", - "ripemd", - "secp256k1", - "sha2", - "sp1-precompiles", - "substrate-bn", -] - [[package]] name = "revm-precompile" version = "4.0.0" -source = "git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" +source = "git+https://github.com/sp1-patches/revm?branch=patch-v5.0.0#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" dependencies = [ "anyhow", "aurora-engine-modexp", "c-kzg", "k256", "once_cell", - "revm-primitives 2.0.0 (git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0.0-patched)", + "revm-primitives", "ripemd", "secp256k1", "sha2", @@ -3134,23 +3105,7 @@ dependencies = [ [[package]] name = "revm-primitives" version = "2.0.0" -source = "git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" -dependencies = [ - "alloy-primitives", - "auto_impl", - "bitflags 2.4.2", - "bitvec", - "cfg-if", - "enumn", - "hashbrown 0.14.3", - "hex", - "serde", -] - -[[package]] -name = "revm-primitives" -version = "2.0.0" -source = "git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" +source = "git+https://github.com/sp1-patches/revm?branch=patch-v5.0.0#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" dependencies = [ "alloy-primitives", "auto_impl", @@ -3700,15 +3655,19 @@ dependencies = [ [[package]] name = "sp1-core" version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git#d2b1cd899c0328d86c22b2a071b6fe98ef787ccc" +source = "git+https://github.com/succinctlabs/sp1.git#dcf8e3fa53dbff827583dc451516c87c804bef97" dependencies = [ "anyhow", "bincode", + "blake3", + "blake3-zkvm", + "cfg-if", "clap", "curve25519-dalek", "elf", "elliptic-curve", "flate2", + "hashbrown 0.14.3", "hex", "itertools 0.12.1", "k256", @@ -3716,6 +3675,7 @@ dependencies = [ "log", "nohash-hasher", "num", + "num_cpus", "p3-air", "p3-baby-bear", "p3-blake3", @@ -3739,6 +3699,7 @@ dependencies = [ "rrs-lib", "serde", "serde_json", + "serde_with", "serial_test", "size", "sp1-derive", @@ -3753,7 +3714,7 @@ dependencies = [ [[package]] name = "sp1-derive" version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git#d2b1cd899c0328d86c22b2a071b6fe98ef787ccc" +source = "git+https://github.com/succinctlabs/sp1.git#dcf8e3fa53dbff827583dc451516c87c804bef97" dependencies = [ "proc-macro2", "quote", @@ -3763,7 +3724,7 @@ dependencies = [ [[package]] name = "sp1-precompiles" version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git#d2b1cd899c0328d86c22b2a071b6fe98ef787ccc" +source = "git+https://github.com/succinctlabs/sp1.git#8e4937cc77e3bc22ef6cad5b8b534b6a90003778" dependencies = [ "anyhow", "bincode", @@ -3792,7 +3753,7 @@ dependencies = [ "ethers-providers", "hashbrown 0.14.3", "reth-primitives", - "revm 5.0.0 (git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched)", + "revm", "rlp", "serde", "sp1-core", @@ -3815,7 +3776,7 @@ dependencies = [ "hashbrown 0.14.3", "hex", "reth-primitives", - "revm 5.0.0 (git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched)", + "revm", "rlp", "serde", "thiserror", diff --git a/script/Cargo.toml b/script/Cargo.toml index fe59faa..bb1054a 100644 --- a/script/Cargo.toml +++ b/script/Cargo.toml @@ -25,7 +25,7 @@ alloy-primitives = { version = "0.6.0", default-features = false, features = [ ] } reth-primitives = { git = "https://github.com/sp1-patches/reth", default-features = false, branch = "sp1-reth" } # revm = "5.0.0" -revm = { git = "https://github.com/sp1-patches/revm", branch = "john/v5.0.0-patched", features = ["std"], default-features = false } +revm = { git = "https://github.com/sp1-patches/revm", branch = "patch-v5.0.0", features = ["std"], default-features = false } anyhow = "1.0.79" hashbrown = "0.14.3" ethers-core = "2.0.13"