diff --git a/Cargo.lock b/Cargo.lock index cf7aa95444..e98c4d8a04 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -599,7 +599,7 @@ name = "bls12_381" version = "0.8.0" source = "git+https://github.com/scroll-tech/bls12_381?branch=feat/impl_scalar_field#2c515f73a2462fef8681c8e884edf1710f52b22a" dependencies = [ - "ff", + "ff 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "group", "pairing", "pasta_curves", @@ -619,6 +619,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "bn254" +version = "0.1.0" +source = "git+https://github.com/scroll-tech/bn254#1773ed6c51f14652272056370cf135ff5d7a01c5" +dependencies = [ + "ff 0.13.0 (git+https://github.com/scroll-tech/ff?branch=feat/sp1)", + "getrandom", + "rand", + "rand_core", + "subtle", +] + [[package]] name = "bs58" version = "0.5.1" @@ -1352,7 +1364,7 @@ dependencies = [ "base16ct", "crypto-bigint", "digest 0.10.7", - "ff", + "ff 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "generic-array", "group", "pkcs8", @@ -1841,6 +1853,16 @@ dependencies = [ "subtle", ] +[[package]] +name = "ff" +version = "0.13.0" +source = "git+https://github.com/scroll-tech/ff?branch=feat/sp1#244b1098f6be1d19c5fd3f0ec60117ac2940e6ca" +dependencies = [ + "bitvec", + "rand_core", + "subtle", +] + [[package]] name = "fixed-hash" version = "0.8.0" @@ -2121,7 +2143,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "ff", + "ff 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core", "subtle", ] @@ -2150,7 +2172,7 @@ name = "halo2-base" version = "0.2.2" source = "git+https://github.com/scroll-tech/halo2-lib?branch=develop#817cace374a9f4b2eca682b1cc36f143255ea25f" dependencies = [ - "ff", + "ff 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "halo2_proofs", "itertools 0.10.5", "num-bigint", @@ -2165,7 +2187,7 @@ name = "halo2-ecc" version = "0.2.2" source = "git+https://github.com/scroll-tech/halo2-lib?branch=develop#817cace374a9f4b2eca682b1cc36f143255ea25f" dependencies = [ - "ff", + "ff 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "group", "halo2-base", "itertools 0.10.5", @@ -2225,7 +2247,7 @@ source = "git+https://github.com/scroll-tech/halo2.git?branch=v1.1#6c5e9eec5088d dependencies = [ "arrayvec", "bitvec", - "ff", + "ff 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "group", "halo2_proofs", "halo2curves", @@ -2244,7 +2266,7 @@ dependencies = [ "blake2b_simd", "cfg-if 0.1.10", "crossbeam", - "ff", + "ff 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "group", "halo2curves", "log", @@ -2267,7 +2289,7 @@ source = "git+https://github.com/scroll-tech/halo2curves?branch=v0.1.0#112f5b9bf dependencies = [ "blake2b_simd", "bls12_381", - "ff", + "ff 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "group", "lazy_static", "maybe-rayon", @@ -3211,7 +3233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3e57598f73cc7e1b2ac63c79c517b31a0877cd7c402cdcaa311b5208de7a095" dependencies = [ "blake2b_simd", - "ff", + "ff 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "group", "lazy_static", "rand", @@ -3447,6 +3469,7 @@ name = "poseidon-bn254" version = "0.1.0" source = "git+https://github.com/scroll-tech/poseidon-bn254?branch=master#9a4f940c968aef3d017da9b68129c1ffadc21621" dependencies = [ + "bn254", "halo2curves", "itertools 0.13.0", ] @@ -3456,7 +3479,7 @@ name = "poseidon-circuit" version = "0.1.0" source = "git+https://github.com/scroll-tech/poseidon-circuit.git?branch=main#7b96835c6201afdbfaf3d13d641efbaaf5db2d20" dependencies = [ - "ff", + "ff 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "halo2_proofs", "log", "poseidon-base", @@ -4534,7 +4557,7 @@ source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#58c46 dependencies = [ "bincode", "ethereum-types", - "ff", + "ff 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "halo2-base", "hex", "itertools 0.12.1", @@ -5708,7 +5731,7 @@ dependencies = [ "eth-types", "ethers-core", "ethers-signers", - "ff", + "ff 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "gadgets", "halo2-base", "halo2-ecc", diff --git a/eth-types/Cargo.toml b/eth-types/Cargo.toml index 53bf6b9389..928620e40d 100644 --- a/eth-types/Cargo.toml +++ b/eth-types/Cargo.toml @@ -37,7 +37,7 @@ bincode.workspace = true default = ["warn-unimplemented", "secp256k1", "poseidon-bn254/halo2curves_v1"] warn-unimplemented = [] secp256k1 = ["halo2curves"] -poseidon-bn254 = ["poseidon-bn254/halo2curves_v1"] +poseidon-bn254 = ["poseidon-bn254/bn254"] scroll = ["revm-precompile/scroll", "revm-primitives/scroll"] # trace heap allocation related feature switches