diff --git a/Cargo.lock b/Cargo.lock index 82ee3d4..5c89eea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -331,12 +331,6 @@ dependencies = [ "rand", ] -[[package]] -name = "arrayref" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" - [[package]] name = "arrayvec" version = "0.7.6" @@ -509,17 +503,6 @@ dependencies = [ "wyz", ] -[[package]] -name = "blake2b_simd" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -542,19 +525,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "bls12_381" -version = "0.8.0" -source = "git+https://github.com/scroll-tech/bls12_381?branch=feat/impl_scalar_field#2c515f73a2462fef8681c8e884edf1710f52b22a" -dependencies = [ - "ff", - "group", - "pairing", - "pasta_curves", - "rand_core", - "subtle", -] - [[package]] name = "blst" version = "0.3.13" @@ -567,6 +537,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "bn254" +version = "0.1.0" +source = "git+https://github.com/scroll-tech/bn254#1773ed6c51f14652272056370cf135ff5d7a01c5" +dependencies = [ + "ff", + "getrandom", + "rand", + "rand_core", + "subtle", +] + [[package]] name = "bs58" version = "0.5.1" @@ -613,9 +595,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.17.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" +checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" [[package]] name = "byteorder" @@ -811,12 +793,6 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" -[[package]] -name = "constant_time_eq" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" - [[package]] name = "convert_case" version = "0.4.0" @@ -1167,19 +1143,18 @@ dependencies = [ [[package]] name = "eth-types" version = "0.12.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits?branch=feat/rkyv#75b6a84130d3369719d57800070c974e2848a7a0" +source = "git+https://github.com/scroll-tech/zkevm-circuits?branch=feat/rkyv#f93a72070256439608cb97f51e93a69eb850d8d6" dependencies = [ "base64 0.13.1", "ethereum-types", "ethers-core", "ethers-signers", - "halo2curves", "hex", "itertools 0.11.0", "log", "num", "num-bigint", - "poseidon-base", + "poseidon-bn254", "primitive-types", "regex", "revm-precompile", @@ -1366,8 +1341,7 @@ dependencies = [ [[package]] name = "ff" version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +source = "git+https://github.com/scroll-tech/ff?branch=feat/sp1#244b1098f6be1d19c5fd3f0ec60117ac2940e6ca" dependencies = [ "bitvec", "rand_core", @@ -1611,30 +1585,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "halo2curves" -version = "0.1.0" -source = "git+https://github.com/scroll-tech/halo2curves?branch=v0.1.0#a495a7b11ad13e5cd0cca7ca5d737b398cfaf1b7" -dependencies = [ - "blake2b_simd", - "bls12_381 0.8.0 (git+https://github.com/scroll-tech/bls12_381?branch=feat/impl_scalar_field)", - "ff", - "group", - "lazy_static", - "maybe-rayon", - "num-bigint", - "num-traits", - "pairing", - "pasta_curves", - "paste", - "rand", - "rand_core", - "serde", - "serde_arrays", - "static_assertions", - "subtle", -] - [[package]] name = "hashbrown" version = "0.12.3" @@ -2032,7 +1982,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd9920cd4460ce3cbca19c62f3bb9a9611562478a4dc9d2c556f4a7d049c5b6b" dependencies = [ - "bls12_381 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bls12_381", "glob", "hex", "once_cell", @@ -2093,15 +2043,6 @@ dependencies = [ "regex-automata 0.1.10", ] -[[package]] -name = "maybe-rayon" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" -dependencies = [ - "cfg-if", -] - [[package]] name = "memchr" version = "2.7.4" @@ -2147,14 +2088,13 @@ dependencies = [ [[package]] name = "mpt-zktrie" version = "0.12.0" -source = "git+https://github.com/scroll-tech/zkevm-circuits?branch=feat/rkyv#75b6a84130d3369719d57800070c974e2848a7a0" +source = "git+https://github.com/scroll-tech/zkevm-circuits?branch=feat/rkyv#f93a72070256439608cb97f51e93a69eb850d8d6" dependencies = [ "eth-types", - "halo2curves", "hex", "log", "num-bigint", - "poseidon-base", + "poseidon-bn254", "zktrie", ] @@ -2386,7 +2326,7 @@ version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", "syn 1.0.109", @@ -2421,21 +2361,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "pasta_curves" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e57598f73cc7e1b2ac63c79c517b31a0877cd7c402cdcaa311b5208de7a095" -dependencies = [ - "blake2b_simd", - "ff", - "group", - "lazy_static", - "rand", - "static_assertions", - "subtle", -] - [[package]] name = "paste" version = "1.0.15" @@ -2531,14 +2456,12 @@ dependencies = [ ] [[package]] -name = "poseidon-base" +name = "poseidon-bn254" version = "0.1.0" -source = "git+https://github.com/scroll-tech/poseidon-circuit.git?branch=main#6cc36ab9dfa153f554ff7b84305f39838366a8df" +source = "git+https://github.com/scroll-tech/poseidon-bn254?branch=master#9a4f940c968aef3d017da9b68129c1ffadc21621" dependencies = [ - "bitvec", - "halo2curves", - "lazy_static", - "once_cell", + "bn254", + "itertools 0.13.0", ] [[package]] @@ -2604,11 +2527,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit 0.22.20", ] [[package]] @@ -2829,8 +2752,8 @@ dependencies = [ [[package]] name = "revm" -version = "12.1.0" -source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor/v40#5e215742c4d9d771f73d74fcba39628b1a2e3452" +version = "13.0.0" +source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor/v41#c7f33a1800cf69e78db0d81fc6ae4b5cc65a32c2" dependencies = [ "auto_impl", "cfg-if", @@ -2843,8 +2766,8 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "8.1.0" -source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor/v40#5e215742c4d9d771f73d74fcba39628b1a2e3452" +version = "9.0.0" +source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor/v41#c7f33a1800cf69e78db0d81fc6ae4b5cc65a32c2" dependencies = [ "cfg-if", "revm-primitives", @@ -2853,8 +2776,8 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "9.2.0" -source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor/v40#5e215742c4d9d771f73d74fcba39628b1a2e3452" +version = "10.0.0" +source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor/v41#c7f33a1800cf69e78db0d81fc6ae4b5cc65a32c2" dependencies = [ "aurora-engine-modexp", "c-kzg", @@ -2870,8 +2793,8 @@ dependencies = [ [[package]] name = "revm-primitives" -version = "7.1.0" -source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor/v40#5e215742c4d9d771f73d74fcba39628b1a2e3452" +version = "8.0.0" +source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor/v41#c7f33a1800cf69e78db0d81fc6ae4b5cc65a32c2" dependencies = [ "alloy-eips", "alloy-primitives", @@ -2882,11 +2805,10 @@ dependencies = [ "cfg-if", "dyn-clone", "enumn", - "halo2curves", "hashbrown 0.14.5", "hex", "kzg-rs", - "poseidon-base", + "poseidon-bn254", "serde", ] @@ -3031,9 +2953,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" dependencies = [ "bitflags 2.6.0", "errno", @@ -3093,7 +3015,7 @@ version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", "syn 1.0.109", @@ -3201,15 +3123,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde_arrays" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38636132857f68ec3d5f3eb121166d2af33cb55174c4d5ff645db6165cbef0fd" -dependencies = [ - "serde", -] - [[package]] name = "serde_derive" version = "1.0.209" @@ -3753,18 +3666,18 @@ checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap 2.4.0", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap 2.4.0", "toml_datetime", - "winnow", + "winnow 0.6.18", ] [[package]] @@ -4256,6 +4169,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.50.0" diff --git a/Cargo.toml b/Cargo.toml index b43e56d..92ac09e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,8 +15,8 @@ mpt-zktrie = { git = "https://github.com/scroll-tech/zkevm-circuits", branch = " zktrie = { git = "https://github.com/scroll-tech/zktrie.git", branch = "main", features= ["rs_zktrie"] } # for local development -# eth-types = { path = "../zkevm-circuits/eth-types", features = ["scroll"] } -# mpt-zktrie = { path = "../zkevm-circuits/zktrie" } +#eth-types = { path = "../zkevm-circuits/eth-types", default-features = false, features = ["scroll", "poseidon-bn254"] } +#mpt-zktrie = { path = "../zkevm-circuits/zktrie" } # revm = {path = "../revm/crates/revm", default-features = false, features = ["scroll-default-handler", "std", "optional_no_base_fee"] } # v40 # zktrie = { path = "../zktrie", features= ["rs_zktrie"] } @@ -49,7 +49,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"], optional = tr [dependencies.revm] # v40 git = "https://github.com/scroll-tech/revm" -branch = "scroll-evm-executor/v40" +branch = "scroll-evm-executor/v41" default-features = false features = [ "scroll-default-handler", @@ -96,9 +96,9 @@ ordered-db = ["revm/ordered-cache-db"] [patch.crates-io] ethers-core = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "feat/rkyv" } ethers-signers = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "feat/rkyv" } -halo2curves = { git = "https://github.com/scroll-tech/halo2curves", branch = "v0.1.0" } primitive-types = { git = "https://github.com/scroll-tech/parity-common.git", branch = "feat/rkyv" } ethereum-types = { git = "https://github.com/scroll-tech/parity-common.git", branch = "feat/rkyv" } +ff = { git = "https://github.com/scroll-tech/ff", branch = "feat/sp1" } # ethers-core = { path = "../ethers-rs/ethers-core" } # ethers-providers = { path = "../ethers-rs/ethers-providers" } @@ -108,8 +108,5 @@ ethereum-types = { git = "https://github.com/scroll-tech/parity-common.git", bra # primitive-types = { path = "../parity-common/primitive-types" } # ethereum-types = { path = "../parity-common/ethereum-types" } -[patch."https://github.com/privacy-scaling-explorations/bls12_381"] -bls12_381 = { git = "https://github.com/scroll-tech/bls12_381", branch = "feat/impl_scalar_field" } - [profile.release] debug-assertions = true