diff --git a/Cargo.lock b/Cargo.lock index 597bb987..54dfadab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -31,11 +31,11 @@ dependencies = [ [[package]] name = "aggregator" version = "0.13.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=v0.13#6ac8a73c799f0006263ce438b3c582f98d98fc25" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=v0.13#eb748a5f1e996f86cb9bea50414f4d0078ea20bc" dependencies = [ "ark-std 0.3.0", "bitstream-io", - "c-kzg 1.0.2", + "c-kzg 1.0.3", "ctor", "encoder", "env_logger", @@ -55,8 +55,8 @@ dependencies = [ "revm-primitives 4.0.0", "serde", "serde_json", - "snark-verifier 0.1.0 (git+https://github.com/scroll-tech/snark-verifier?branch=v0.1)", - "snark-verifier-sdk 0.0.1 (git+https://github.com/scroll-tech/snark-verifier?branch=v0.1)", + "snark-verifier", + "snark-verifier-sdk", "strum 0.25.0", "strum_macros 0.25.3", "zkevm-circuits", @@ -89,6 +89,30 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +[[package]] +name = "alloy-eip2930" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0069cf0642457f87a01a014f6dc29d5d893cd4fd8fddf0c3cdfad1bb3ebafc41" +dependencies = [ + "alloy-primitives 0.8.13", + "alloy-rlp", + "serde", +] + +[[package]] +name = "alloy-eip7702" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ffc577390ce50234e02d841214b3dc0bea6aaaae8e04bbf3cb82e9a45da9eb" +dependencies = [ + "alloy-primitives 0.8.13", + "alloy-rlp", + "derive_more 1.0.0", + "k256", + "serde", +] + [[package]] name = "alloy-primitives" version = "0.4.2" @@ -99,7 +123,7 @@ dependencies = [ "bytes", "cfg-if 1.0.0", "const-hex", - "derive_more", + "derive_more 0.99.17", "hex-literal", "itoa", "ruint", @@ -116,7 +140,7 @@ dependencies = [ "bytes", "cfg-if 1.0.0", "const-hex", - "derive_more", + "derive_more 0.99.17", "hex-literal", "itoa", "k256", @@ -128,6 +152,34 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "alloy-primitives" +version = "0.8.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3aeeb5825c2fc8c2662167058347cd0cafc3cb15bcb5cdb1758a63c2dca0409e" +dependencies = [ + "alloy-rlp", + "bytes", + "cfg-if 1.0.0", + "const-hex", + "derive_more 1.0.0", + "foldhash", + "hashbrown 0.15.2", + "hex-literal", + "indexmap 2.7.1", + "itoa", + "k256", + "keccak-asm", + "paste", + "proptest", + "rand", + "ruint", + "rustc-hash 2.1.0", + "serde", + "sha3 0.10.8", + "tiny-keccak", +] + [[package]] name = "alloy-rlp" version = "0.3.4" @@ -465,7 +517,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", "syn 2.0.66", "which", @@ -605,7 +657,7 @@ checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "bus-mapping" version = "0.13.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=v0.13#6ac8a73c799f0006263ce438b3c582f98d98fc25" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=v0.13#eb748a5f1e996f86cb9bea50414f4d0078ea20bc" dependencies = [ "eth-types", "ethers-core", @@ -665,15 +717,16 @@ dependencies = [ [[package]] name = "c-kzg" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf100c4cea8f207e883ff91ca886d621d8a166cb04971dfaa9bb8fd99ed95df" +checksum = "f0307f72feab3300336fb803a57134159f6e20139af1357f36c54cb90d8e8928" dependencies = [ "blst", "cc", "glob", "hex", "libc", + "once_cell", "serde", ] @@ -754,7 +807,7 @@ dependencies = [ "bitflags 1.3.2", "clap_derive", "clap_lex", - "indexmap", + "indexmap 1.9.3", "once_cell", "strsim", "termcolor", @@ -841,7 +894,7 @@ dependencies = [ "serde", "serde_derive", "sha2", - "sha3 0.10.6", + "sha3 0.10.8", "thiserror", ] @@ -1124,6 +1177,27 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", + "unicode-xid", +] + [[package]] name = "digest" version = "0.9.0" @@ -1199,7 +1273,7 @@ dependencies = [ [[package]] name = "encoder" version = "0.1.0" -source = "git+https://github.com/scroll-tech/da-codec.git?tag=v0.1.0#5a28b752d4504bf0966734fe4a6a5433981c74c2" +source = "git+https://github.com/scroll-tech/da-codec.git?tag=v0.1.2#8c5d2f0cd707153151a5154fef702204f6ca40b3" dependencies = [ "zstd", ] @@ -1227,7 +1301,7 @@ dependencies = [ "rand", "rlp", "serde", - "sha3 0.10.6", + "sha3 0.10.8", "zeroize", ] @@ -1255,6 +1329,12 @@ dependencies = [ "termcolor", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.3.3" @@ -1293,7 +1373,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "sha3 0.10.6", + "sha3 0.10.8", "thiserror", "uuid", ] @@ -1301,7 +1381,7 @@ dependencies = [ [[package]] name = "eth-types" version = "0.13.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=v0.13#6ac8a73c799f0006263ce438b3c582f98d98fc25" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=v0.13#eb748a5f1e996f86cb9bea50414f4d0078ea20bc" dependencies = [ "base64 0.13.1", "ethers-core", @@ -1319,7 +1399,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "sha3 0.10.6", + "sha3 0.10.8", "strum 0.25.0", "strum_macros 0.25.3", "subtle", @@ -1338,7 +1418,7 @@ dependencies = [ "regex", "serde", "serde_json", - "sha3 0.10.6", + "sha3 0.10.8", "thiserror", "uint", ] @@ -1457,7 +1537,7 @@ dependencies = [ [[package]] name = "external-tracer" version = "0.13.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=v0.13#6ac8a73c799f0006263ce438b3c582f98d98fc25" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=v0.13#eb748a5f1e996f86cb9bea50414f4d0078ea20bc" dependencies = [ "eth-types", "geth-utils", @@ -1513,6 +1593,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f" + [[package]] name = "form_urlencoded" version = "1.1.0" @@ -1639,12 +1725,12 @@ dependencies = [ [[package]] name = "gadgets" version = "0.13.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=v0.13#6ac8a73c799f0006263ce438b3c582f98d98fc25" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=v0.13#eb748a5f1e996f86cb9bea50414f4d0078ea20bc" dependencies = [ "eth-types", "halo2_proofs", "poseidon-base", - "sha3 0.10.6", + "sha3 0.10.8", "strum 0.25.0", ] @@ -1662,7 +1748,7 @@ dependencies = [ [[package]] name = "geth-utils" version = "0.13.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=v0.13#6ac8a73c799f0006263ce438b3c582f98d98fc25" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=v0.13#eb748a5f1e996f86cb9bea50414f4d0078ea20bc" dependencies = [ "env_logger", "gobuild", @@ -1757,7 +1843,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -1767,7 +1853,7 @@ dependencies = [ [[package]] name = "halo2-base" version = "0.2.2" -source = "git+https://github.com/scroll-tech/halo2-lib?branch=develop#817cace374a9f4b2eca682b1cc36f143255ea25f" +source = "git+https://github.com/scroll-tech/halo2-lib?branch=v0.2#817cace374a9f4b2eca682b1cc36f143255ea25f" dependencies = [ "ff", "halo2_proofs", @@ -1776,13 +1862,13 @@ dependencies = [ "num-integer", "num-traits", "rand_chacha", - "rustc-hash", + "rustc-hash 1.1.0", ] [[package]] name = "halo2-ecc" version = "0.2.2" -source = "git+https://github.com/scroll-tech/halo2-lib?branch=develop#817cace374a9f4b2eca682b1cc36f143255ea25f" +source = "git+https://github.com/scroll-tech/halo2-lib?branch=v0.2#817cace374a9f4b2eca682b1cc36f143255ea25f" dependencies = [ "ff", "group", @@ -1927,6 +2013,15 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +dependencies = [ + "foldhash", +] + [[package]] name = "hashers" version = "1.0.1" @@ -2162,6 +2257,16 @@ dependencies = [ "hashbrown 0.12.3", ] +[[package]] +name = "indexmap" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" +dependencies = [ + "equivalent", + "hashbrown 0.15.2", +] + [[package]] name = "inout" version = "0.1.3" @@ -2197,8 +2302,8 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "snark-verifier 0.1.0 (git+https://github.com/scroll-tech/snark-verifier?branch=develop)", - "snark-verifier-sdk 0.0.1 (git+https://github.com/scroll-tech/snark-verifier?branch=develop)", + "snark-verifier", + "snark-verifier-sdk", "tokio", ] @@ -2298,9 +2403,9 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] @@ -2495,7 +2600,7 @@ dependencies = [ [[package]] name = "mock" version = "0.13.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=v0.13#6ac8a73c799f0006263ce438b3c582f98d98fc25" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=v0.13#eb748a5f1e996f86cb9bea50414f4d0078ea20bc" dependencies = [ "eth-types", "ethers-core", @@ -2510,7 +2615,7 @@ dependencies = [ [[package]] name = "mpt-zktrie" version = "0.13.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=v0.13#6ac8a73c799f0006263ce438b3c582f98d98fc25" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=v0.13#eb748a5f1e996f86cb9bea50414f4d0078ea20bc" dependencies = [ "eth-types", "halo2curves", @@ -2915,7 +3020,7 @@ dependencies = [ [[package]] name = "poseidon-base" version = "0.1.0" -source = "git+https://github.com/scroll-tech/poseidon-circuit.git?branch=main#d52fa404e8f03b5c3f85c090ccb8b08c112e2f4d" +source = "git+https://github.com/scroll-tech/poseidon-circuit.git?branch=main#b978cee00aae1e0a1e79e0d74c4683b137f5ea2d" dependencies = [ "bitvec", "halo2curves", @@ -2926,7 +3031,7 @@ dependencies = [ [[package]] name = "poseidon-circuit" version = "0.1.0" -source = "git+https://github.com/scroll-tech/poseidon-circuit.git?branch=main#d52fa404e8f03b5c3f85c090ccb8b08c112e2f4d" +source = "git+https://github.com/scroll-tech/poseidon-circuit.git?branch=main#b978cee00aae1e0a1e79e0d74c4683b137f5ea2d" dependencies = [ "ff", "halo2_proofs", @@ -3039,7 +3144,7 @@ dependencies = [ [[package]] name = "prover" version = "0.13.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=v0.13#6ac8a73c799f0006263ce438b3c582f98d98fc25" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=v0.13#eb748a5f1e996f86cb9bea50414f4d0078ea20bc" dependencies = [ "aggregator", "anyhow", @@ -3060,13 +3165,14 @@ dependencies = [ "num-bigint", "rand", "rand_xorshift", + "revm 17.1.0", "serde", "serde_derive", "serde_json", "serde_stacker", "sha2", - "snark-verifier 0.1.0 (git+https://github.com/scroll-tech/snark-verifier?branch=v0.1)", - "snark-verifier-sdk 0.0.1 (git+https://github.com/scroll-tech/snark-verifier?branch=v0.1)", + "snark-verifier", + "snark-verifier-sdk", "zkevm-circuits", ] @@ -3255,7 +3361,7 @@ dependencies = [ "primitive-types", "revm_precompiles", "rlp", - "sha3 0.10.6", + "sha3 0.10.8", ] [[package]] @@ -3265,10 +3371,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68f4ca8ae0345104523b4af1a8a7ea97cfa1865cdb7a7c25d23c1a18d9b48598" dependencies = [ "auto_impl", - "revm-interpreter", + "revm-interpreter 1.3.0", "revm-precompile 2.2.0", ] +[[package]] +name = "revm" +version = "17.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "055bee6a81aaeee8c2389ae31f0d4de87f44df24f4444a1116f9755fd87a76ad" +dependencies = [ + "auto_impl", + "cfg-if 1.0.0", + "dyn-clone", + "revm-interpreter 13.0.0", + "revm-precompile 14.0.0", + "serde", + "serde_json", +] + [[package]] name = "revm-interpreter" version = "1.3.0" @@ -3278,6 +3399,16 @@ dependencies = [ "revm-primitives 1.3.0", ] +[[package]] +name = "revm-interpreter" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fac2034454f8bc69dc7d3c94cdb1b57559e27f5ef0518771f1787de543d7d6a1" +dependencies = [ + "revm-primitives 13.0.0", + "serde", +] + [[package]] name = "revm-precompile" version = "2.2.0" @@ -3301,7 +3432,7 @@ version = "7.0.0" source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor/v36#36c304d9e9ba4e4b2d5468d91a6bd27210133b6a" dependencies = [ "aurora-engine-modexp", - "c-kzg 1.0.2", + "c-kzg 1.0.3", "k256", "once_cell", "revm-primitives 4.0.0", @@ -3311,6 +3442,24 @@ dependencies = [ "substrate-bn", ] +[[package]] +name = "revm-precompile" +version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a88c8c7c5f9b988a9e65fc0990c6ce859cdb74114db705bd118a96d22d08027" +dependencies = [ + "aurora-engine-modexp", + "c-kzg 1.0.3", + "cfg-if 1.0.0", + "k256", + "once_cell", + "revm-primitives 13.0.0", + "ripemd", + "secp256k1 0.29.0", + "sha2", + "substrate-bn", +] + [[package]] name = "revm-primitives" version = "1.3.0" @@ -3336,9 +3485,9 @@ dependencies = [ "auto_impl", "bitflags 2.6.0", "bitvec", - "c-kzg 1.0.2", + "c-kzg 1.0.3", "cfg-if 1.0.0", - "derive_more", + "derive_more 0.99.17", "dyn-clone", "enumn", "halo2curves", @@ -3349,6 +3498,25 @@ dependencies = [ "serde", ] +[[package]] +name = "revm-primitives" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d11fa1e195b0bebaf3fb18596f314a13ba3a4cb1fdd16d3465934d812fd921e" +dependencies = [ + "alloy-eip2930", + "alloy-eip7702", + "alloy-primitives 0.8.13", + "auto_impl", + "bitflags 2.6.0", + "bitvec", + "cfg-if 1.0.0", + "dyn-clone", + "enumn", + "hex", + "serde", +] + [[package]] name = "revm_precompiles" version = "1.1.2" @@ -3363,7 +3531,7 @@ dependencies = [ "ripemd", "secp256k1 0.24.3", "sha2", - "sha3 0.10.6", + "sha3 0.10.8", "substrate-bn", ] @@ -3465,6 +3633,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" + [[package]] name = "rustc-hex" version = "2.1.0" @@ -3597,7 +3771,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cfdffd972d76b22f3d7f81c8be34b2296afd3a25e0a547bd9abe340a4dbbe97" dependencies = [ "cfg-if 1.0.0", - "derive_more", + "derive_more 0.99.17", "parity-scale-codec", "scale-info-derive", ] @@ -3788,6 +3962,7 @@ version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" dependencies = [ + "indexmap 1.9.3", "itoa", "ryu", "serde", @@ -3873,9 +4048,9 @@ dependencies = [ [[package]] name = "sha3" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ "digest 0.10.7", "keccak", @@ -3934,30 +4109,7 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "snark-verifier" version = "0.1.0" -source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#58c46b74c73156b9e09dc27617369d2acfb4461b" -dependencies = [ - "bytes", - "ethereum-types", - "halo2-base", - "halo2-ecc", - "hex", - "itertools 0.12.1", - "num-bigint", - "num-integer", - "num-traits", - "poseidon", - "rand", - "revm 2.3.1", - "rlp", - "rustc-hash", - "serde", - "sha3 0.10.6", -] - -[[package]] -name = "snark-verifier" -version = "0.1.0" -source = "git+https://github.com/scroll-tech/snark-verifier?branch=v0.1#58c46b74c73156b9e09dc27617369d2acfb4461b" +source = "git+https://github.com/scroll-tech/snark-verifier?branch=v0.1#a4f92916c0f61193f325de6c195a733289a7f6a0" dependencies = [ "bytes", "ethereum-types", @@ -3972,37 +4124,15 @@ dependencies = [ "rand", "revm 2.3.1", "rlp", - "rustc-hash", + "rustc-hash 1.1.0", "serde", - "sha3 0.10.6", -] - -[[package]] -name = "snark-verifier-sdk" -version = "0.0.1" -source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#58c46b74c73156b9e09dc27617369d2acfb4461b" -dependencies = [ - "bincode", - "ethereum-types", - "ff", - "halo2-base", - "hex", - "itertools 0.12.1", - "log", - "num-bigint", - "num-integer", - "num-traits", - "rand", - "rand_chacha", - "serde", - "serde_json", - "snark-verifier 0.1.0 (git+https://github.com/scroll-tech/snark-verifier?branch=develop)", + "sha3 0.10.8", ] [[package]] name = "snark-verifier-sdk" version = "0.0.1" -source = "git+https://github.com/scroll-tech/snark-verifier?branch=v0.1#58c46b74c73156b9e09dc27617369d2acfb4461b" +source = "git+https://github.com/scroll-tech/snark-verifier?branch=v0.1#a4f92916c0f61193f325de6c195a733289a7f6a0" dependencies = [ "bincode", "ethereum-types", @@ -4018,7 +4148,7 @@ dependencies = [ "rand_chacha", "serde", "serde_json", - "snark-verifier 0.1.0 (git+https://github.com/scroll-tech/snark-verifier?branch=v0.1)", + "snark-verifier", ] [[package]] @@ -4354,7 +4484,7 @@ version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" dependencies = [ - "indexmap", + "indexmap 1.9.3", "toml_datetime", "winnow", ] @@ -5022,7 +5152,7 @@ dependencies = [ [[package]] name = "zkevm-circuits" version = "0.13.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=v0.13#6ac8a73c799f0006263ce438b3c582f98d98fc25" +source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=v0.13#eb748a5f1e996f86cb9bea50414f4d0078ea20bc" dependencies = [ "array-init", "bus-mapping", @@ -5053,9 +5183,9 @@ dependencies = [ "rayon", "serde", "serde_json", - "sha3 0.10.6", - "snark-verifier 0.1.0 (git+https://github.com/scroll-tech/snark-verifier?branch=v0.1)", - "snark-verifier-sdk 0.0.1 (git+https://github.com/scroll-tech/snark-verifier?branch=v0.1)", + "sha3 0.10.8", + "snark-verifier", + "snark-verifier-sdk", "strum 0.25.0", "strum_macros 0.25.3", "subtle", diff --git a/integration/Cargo.toml b/integration/Cargo.toml index 50b80afa..d4b6cc72 100644 --- a/integration/Cargo.toml +++ b/integration/Cargo.toml @@ -18,8 +18,8 @@ serde_derive.workspace = true tokio.workspace = true revm = { version = "3.5.0", default-features = false, features = ["std"] } -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"] } +snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", branch = "v0.1" } +snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", branch = "v0.1", default-features = false, features = ["loader_halo2", "loader_evm", "halo2-pse"] } halo2_proofs.workspace = true prover.workspace = true diff --git a/integration/src/verifier.rs b/integration/src/verifier.rs index b365f4af..12f5a0c0 100644 --- a/integration/src/verifier.rs +++ b/integration/src/verifier.rs @@ -1,6 +1,5 @@ use halo2_proofs::{halo2curves::bn256::Bn256, poly::kzg::commitment::ParamsKZG}; use prover::{common::Verifier, config, consts, io::force_to_read, CompressionCircuit}; -use snark_verifier_sdk::verify_evm_calldata; use std::{collections::BTreeMap, env}; type SnarkVerifier<'a> = Verifier<'a, CompressionCircuit>; @@ -57,6 +56,8 @@ impl EVMVerifier { } pub fn verify_evm_proof(&self, call_data: Vec) -> bool { - verify_evm_calldata(self.0.clone(), call_data) + let res = prover::deploy_and_call(self.0.clone(), call_data); + log::info!("verify_evm_proof result {:?}", res); + res.is_ok() } }