diff --git a/primitives/Cargo.lock b/primitives/Cargo.lock index b3b3458..c027b5e 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/succinctlabs/reth-private.git?branch=sp1-reth#8ab36c4e537d72de5a856cf9e41230f3b8843c71" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#a888bc7abcbd86d217e91bb39998576212ac1f87" 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/succinctlabs/reth-private.git?branch=sp1-reth#8ab36c4e537d72de5a856cf9e41230f3b8843c71" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#a888bc7abcbd86d217e91bb39998576212ac1f87" 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/succinctlabs/reth-private.git?branch=sp1-reth#8ab36c4e537d72de5a856cf9e41230f3b8843c71" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#a888bc7abcbd86d217e91bb39998576212ac1f87" 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/succinctlabs/reth-private.git?branch=sp1-reth#8ab36c4e537d72de5a856cf9e41230f3b8843c71" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#a888bc7abcbd86d217e91bb39998576212ac1f87" dependencies = [ "alloy-chains", "alloy-eips", @@ -1575,12 +1575,13 @@ dependencies = [ "reth-codecs", "reth-ethereum-forks", "reth-rpc-types", - "revm", - "revm-primitives", + "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)", "serde", "serde_json", "sha2", "smallvec", + "sp1-precompiles", "strum", "tempfile", "thiserror", @@ -1590,7 +1591,7 @@ dependencies = [ [[package]] name = "reth-rpc-types" version = "0.1.0-alpha.18" -source = "git+https://github.com/succinctlabs/reth-private.git?branch=sp1-reth#8ab36c4e537d72de5a856cf9e41230f3b8843c71" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#a888bc7abcbd86d217e91bb39998576212ac1f87" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -1607,6 +1608,19 @@ 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" @@ -1614,21 +1628,48 @@ source = "git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0. dependencies = [ "auto_impl", "cfg-if", - "revm-interpreter", - "revm-precompile", + "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" dependencies = [ - "revm-primitives", + "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" @@ -1639,7 +1680,7 @@ dependencies = [ "c-kzg", "k256", "once_cell", - "revm-primitives", + "revm-primitives 2.0.0 (git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0.0-patched)", "ripemd", "secp256k1", "sha2", @@ -1647,6 +1688,22 @@ 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", + "cfg-if", + "enumn", + "hashbrown 0.14.3", + "hex", + "serde", +] + [[package]] name = "revm-primitives" version = "2.0.0" @@ -1971,7 +2028,7 @@ dependencies = [ "hex", "hex-literal", "reth-primitives", - "revm", + "revm 5.0.0 (git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched)", "rlp", "serde", "serde_json", diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index c30419f..721fbcf 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -17,9 +17,9 @@ alloy-primitives = { version = "0.6.0", default-features = false, features = [ "std", ] } # reth-primitives = { git = "https://github.com/paradigmxyz/reth.git" } -reth-primitives = { git = "https://github.com/succinctlabs/reth-private.git", default-features = false, branch = "sp1-reth" } +reth-primitives = { git = "https://github.com/sp1-patches/reth", default-features = false, branch = "sp1-reth" } # revm = "5.0.0" -revm = { git = "https://github.com/succinctlabs/revm-private.git", branch = "john/v5.0.0-patched", features = ["std"], default-features = false } +revm = { git = "https://github.com/sp1-patches/revm", branch = "john/v5.0.0-patched", 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 3aac79b..6954801 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/succinctlabs/reth-private.git?branch=sp1-reth#787209eb4fe3f785ca889ed4685263850eeefa93" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#03cf47506a0c59aa94144c3fc88e134495597973" 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/succinctlabs/reth-private.git?branch=sp1-reth#787209eb4fe3f785ca889ed4685263850eeefa93" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#03cf47506a0c59aa94144c3fc88e134495597973" 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/succinctlabs/reth-private.git?branch=sp1-reth#787209eb4fe3f785ca889ed4685263850eeefa93" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#03cf47506a0c59aa94144c3fc88e134495597973" 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/succinctlabs/reth-private.git?branch=sp1-reth#787209eb4fe3f785ca889ed4685263850eeefa93" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#03cf47506a0c59aa94144c3fc88e134495597973" dependencies = [ "alloy-chains", "alloy-eips", @@ -1575,8 +1575,8 @@ dependencies = [ "reth-codecs", "reth-ethereum-forks", "reth-rpc-types", - "revm", - "revm-primitives", + "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)", "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/succinctlabs/reth-private.git?branch=sp1-reth#787209eb4fe3f785ca889ed4685263850eeefa93" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#03cf47506a0c59aa94144c3fc88e134495597973" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -1611,12 +1611,25 @@ dependencies = [ [[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=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" dependencies = [ "auto_impl", "cfg-if", - "revm-interpreter", - "revm-precompile", + "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/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=patch-v5.0.0)", + "revm-precompile 4.0.0 (git+https://github.com/sp1-patches/revm?branch=patch-v5.0.0)", "serde", "serde_json", ] @@ -1624,23 +1637,50 @@ dependencies = [ [[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=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" dependencies = [ - "revm-primitives", + "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)", "serde", ] [[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=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" dependencies = [ "anyhow", "aurora-engine-modexp", "c-kzg", "k256", "once_cell", - "revm-primitives", + "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/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/sp1-patches/revm?branch=patch-v5.0.0)", "ripemd", "secp256k1", "sha2", @@ -1651,7 +1691,7 @@ dependencies = [ [[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=john/v5.0.0-patched#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" dependencies = [ "alloy-primitives", "auto_impl", @@ -1665,6 +1705,22 @@ dependencies = [ "serde", ] +[[package]] +name = "revm-primitives" +version = "2.0.0" +source = "git+https://github.com/sp1-patches/revm?branch=patch-v5.0.0#c993e0d60b49e4ee97a160ac4629a4e63f2a2e69" +dependencies = [ + "alloy-primitives", + "auto_impl", + "bitflags", + "bitvec", + "cfg-if", + "enumn", + "hashbrown 0.14.3", + "hex", + "serde", +] + [[package]] name = "rfc6979" version = "0.4.0" @@ -1906,8 +1962,7 @@ dependencies = [ [[package]] name = "sha2" version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +source = "git+https://github.com/sp1-patches/RustCrypto-hashes?branch=v0.10.8#3d692aa90b91513886d757d01f8fc2d51c0ec0d7" dependencies = [ "cfg-if", "cpufeatures", @@ -1947,7 +2002,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#81f01f96fd95e262c3ca79a37f8ebe0cc9c6121c" dependencies = [ "anyhow", "bincode", @@ -1970,7 +2025,7 @@ dependencies = [ "hashbrown 0.14.3", "hex", "reth-primitives", - "revm", + "revm 5.0.0 (git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched)", "rlp", "serde", "thiserror", @@ -1987,7 +2042,7 @@ dependencies = [ "hashbrown 0.14.3", "hex", "reth-primitives", - "revm", + "revm 5.0.0 (git+https://github.com/sp1-patches/revm?branch=patch-v5.0.0)", "serde", "sp1-reth-primitives", "sp1-zkvm", @@ -1997,7 +2052,7 @@ dependencies = [ [[package]] name = "sp1-zkvm" version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git#cf58553c9ba6811d597b3871fbdbaa7849cdfee2" +source = "git+https://github.com/succinctlabs/sp1.git#aaf765deff685159c1eb7a8530b4c97cb6a3882b" dependencies = [ "anyhow", "bincode", @@ -2181,7 +2236,7 @@ dependencies = [ [[package]] name = "tiny-keccak" version = "2.0.2" -source = "git+https://github.com/succinctlabs/tiny-keccak-private.git?branch=chris/test#aa70bacdfece9dc7ea4936f808887c43a09b3b0a" +source = "git+https://github.com/sp1-patches/tiny-keccak?branch=patch-v2.0.2#aa70bacdfece9dc7ea4936f808887c43a09b3b0a" dependencies = [ "cfg-if", "crunchy", diff --git a/program/Cargo.toml b/program/Cargo.toml index a4bb724..c95f798 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -7,9 +7,9 @@ edition = "2021" [dependencies] sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git" } sp1-reth-primitives = { path = "../primitives" } -revm = { git = "https://github.com/succinctlabs/revm-private.git", 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 } # reth-primitives = { path = "../../reth/crates/primitives", default-features = false} -reth-primitives = { git = "https://github.com/succinctlabs/reth-private.git", default-features = false, branch = "sp1-reth" } +reth-primitives = { git = "https://github.com/sp1-patches/reth", default-features = false, branch = "sp1-reth" } alloy-rlp = { version = "0.3", default-features = false } serde = { version = "1.0", features = ["derive"] } thiserror = "1.0" @@ -24,4 +24,5 @@ hashbrown = "0.14.3" hex = "0.4.3" [patch.crates-io] -tiny-keccak = { git = "https://github.com/succinctlabs/tiny-keccak-private.git", branch = "chris/test" } +tiny-keccak = { git = "https://github.com/sp1-patches/tiny-keccak", branch = "patch-v2.0.2" } +sha2-v0-10-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "v0.10.8" } diff --git a/program/elf/riscv32im-succinct-zkvm-elf b/program/elf/riscv32im-succinct-zkvm-elf index 0a101ca..3f221c3 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 6fa63f9..cddb196 100644 --- a/script/Cargo.lock +++ b/script/Cargo.lock @@ -816,7 +816,7 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "codecs-derive" version = "0.1.0-alpha.18" -source = "git+https://github.com/succinctlabs/reth-private.git?branch=sp1-reth#8ab36c4e537d72de5a856cf9e41230f3b8843c71" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#a888bc7abcbd86d217e91bb39998576212ac1f87" dependencies = [ "convert_case 0.6.0", "parity-scale-codec", @@ -1385,6 +1385,12 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + [[package]] name = "flate2" version = "1.0.28" @@ -2641,6 +2647,16 @@ dependencies = [ "ucd-trie", ] +[[package]] +name = "petgraph" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap 2.2.3", +] + [[package]] name = "pharos" version = "0.5.3" @@ -2957,7 +2973,7 @@ dependencies = [ [[package]] name = "reth-codecs" version = "0.1.0-alpha.18" -source = "git+https://github.com/succinctlabs/reth-private.git?branch=sp1-reth#8ab36c4e537d72de5a856cf9e41230f3b8843c71" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#a888bc7abcbd86d217e91bb39998576212ac1f87" dependencies = [ "alloy-primitives", "bytes", @@ -2967,7 +2983,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "0.1.0-alpha.18" -source = "git+https://github.com/succinctlabs/reth-private.git?branch=sp1-reth#8ab36c4e537d72de5a856cf9e41230f3b8843c71" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#a888bc7abcbd86d217e91bb39998576212ac1f87" dependencies = [ "alloy-chains", "alloy-primitives", @@ -2980,7 +2996,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "0.1.0-alpha.18" -source = "git+https://github.com/succinctlabs/reth-private.git?branch=sp1-reth#8ab36c4e537d72de5a856cf9e41230f3b8843c71" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#a888bc7abcbd86d217e91bb39998576212ac1f87" dependencies = [ "alloy-chains", "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=b9dd518)", @@ -3002,12 +3018,13 @@ dependencies = [ "reth-codecs", "reth-ethereum-forks", "reth-rpc-types", - "revm", - "revm-primitives", + "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)", "serde", "serde_json", "sha2", "smallvec", + "sp1-precompiles", "strum 0.26.1", "tempfile", "thiserror", @@ -3017,7 +3034,7 @@ dependencies = [ [[package]] name = "reth-rpc-types" version = "0.1.0-alpha.18" -source = "git+https://github.com/succinctlabs/reth-private.git?branch=sp1-reth#8ab36c4e537d72de5a856cf9e41230f3b8843c71" +source = "git+https://github.com/sp1-patches/reth?branch=sp1-reth#a888bc7abcbd86d217e91bb39998576212ac1f87" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -3034,6 +3051,19 @@ 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" @@ -3041,21 +3071,48 @@ source = "git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0. dependencies = [ "auto_impl", "cfg-if", - "revm-interpreter", - "revm-precompile", + "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" dependencies = [ - "revm-primitives", + "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" @@ -3066,7 +3123,7 @@ dependencies = [ "c-kzg", "k256", "once_cell", - "revm-primitives", + "revm-primitives 2.0.0 (git+https://github.com/succinctlabs/revm-private.git?branch=john/v5.0.0-patched)", "ripemd", "secp256k1", "sha2", @@ -3074,6 +3131,22 @@ 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 2.4.2", + "bitvec", + "cfg-if", + "enumn", + "hashbrown 0.14.3", + "hex", + "serde", +] + [[package]] name = "revm-primitives" version = "2.0.0" @@ -3627,7 +3700,7 @@ dependencies = [ [[package]] name = "sp1-core" version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git#aaf765deff685159c1eb7a8530b4c97cb6a3882b" +source = "git+https://github.com/succinctlabs/sp1.git#d2b1cd899c0328d86c22b2a071b6fe98ef787ccc" dependencies = [ "anyhow", "bincode", @@ -3662,6 +3735,7 @@ dependencies = [ "p3-symmetric", "p3-uni-stark", "p3-util", + "petgraph", "rrs-lib", "serde", "serde_json", @@ -3679,7 +3753,7 @@ dependencies = [ [[package]] name = "sp1-derive" version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git#aaf765deff685159c1eb7a8530b4c97cb6a3882b" +source = "git+https://github.com/succinctlabs/sp1.git#d2b1cd899c0328d86c22b2a071b6fe98ef787ccc" dependencies = [ "proc-macro2", "quote", @@ -3689,7 +3763,7 @@ dependencies = [ [[package]] name = "sp1-precompiles" version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git#aaf765deff685159c1eb7a8530b4c97cb6a3882b" +source = "git+https://github.com/succinctlabs/sp1.git#d2b1cd899c0328d86c22b2a071b6fe98ef787ccc" dependencies = [ "anyhow", "bincode", @@ -3718,7 +3792,7 @@ dependencies = [ "ethers-providers", "hashbrown 0.14.3", "reth-primitives", - "revm", + "revm 5.0.0 (git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched)", "rlp", "serde", "sp1-core", @@ -3741,7 +3815,7 @@ dependencies = [ "hashbrown 0.14.3", "hex", "reth-primitives", - "revm", + "revm 5.0.0 (git+https://github.com/sp1-patches/revm?branch=john/v5.0.0-patched)", "rlp", "serde", "thiserror", diff --git a/script/Cargo.toml b/script/Cargo.toml index 6b34188..fe59faa 100644 --- a/script/Cargo.toml +++ b/script/Cargo.toml @@ -23,9 +23,9 @@ alloy-primitives = { version = "0.6.0", default-features = false, features = [ "serde", "std", ] } -reth-primitives = { git = "https://github.com/succinctlabs/reth-private.git", default-features = false, branch = "sp1-reth" } +reth-primitives = { git = "https://github.com/sp1-patches/reth", default-features = false, branch = "sp1-reth" } # revm = "5.0.0" -revm = { git = "https://github.com/succinctlabs/revm-private.git", branch = "john/v5.0.0-patched", features = ["std"], default-features = false } +revm = { git = "https://github.com/sp1-patches/revm", branch = "john/v5.0.0-patched", features = ["std"], default-features = false } anyhow = "1.0.79" hashbrown = "0.14.3" ethers-core = "2.0.13"