From efd8ed1616aaf04c0f7a3c8d569f40ae9cd2f83e Mon Sep 17 00:00:00 2001 From: lightsing Date: Wed, 26 Jun 2024 16:38:24 +0800 Subject: [PATCH] sp1 patch --- Cargo.lock | 25 +++++++++++++++++++++---- Cargo.toml | 5 ++++- crates/primitives/Cargo.toml | 2 +- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5ecdfdbadc..6bdb49258f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1406,8 +1406,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", @@ -1704,6 +1703,24 @@ dependencies = [ "subtle", ] +[[package]] +name = "halo2curves" +version = "0.3.3" +source = "git+https://github.com/scroll-tech/halo2curves.git?branch=feat/sp1#acae565b82093989f112557ab0f59f3d53a4d83a" +dependencies = [ + "ff", + "group", + "lazy_static", + "num-bigint", + "num-traits", + "pasta_curves", + "paste", + "rand", + "rand_core", + "static_assertions", + "subtle", +] + [[package]] name = "hash-db" version = "0.15.2" @@ -2687,7 +2704,7 @@ version = "0.1.0" source = "git+https://github.com/scroll-tech/poseidon-circuit.git?branch=main#1133859759f9a6abe0707a27f82ea79c17503f4a" dependencies = [ "bitvec", - "halo2curves", + "halo2curves 0.1.0", "lazy_static", ] @@ -3079,7 +3096,7 @@ dependencies = [ "derive_more", "dyn-clone", "enumn", - "halo2curves", + "halo2curves 0.3.3", "hashbrown", "hex", "once_cell", diff --git a/Cargo.toml b/Cargo.toml index bcad47214b..bec1dd0a09 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,4 +21,7 @@ debug = true [profile.ethtests] inherits = "test" -opt-level = 3 \ No newline at end of file +opt-level = 3 + +[patch.crates-io] +ff = { git = "https://github.com/scroll-tech/ff", branch = "feat/sp1" } \ No newline at end of file diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml index 35c42da52a..d713b1ac4a 100644 --- a/crates/primitives/Cargo.toml +++ b/crates/primitives/Cargo.toml @@ -47,7 +47,7 @@ serde = { version = "1.0", default-features = false, features = [ ], optional = true } # scroll -halo2curves = { version = "0.1.0", optional = true } +halo2curves = { git = "https://github.com/scroll-tech/halo2curves.git", branch = "feat/sp1", optional = true } poseidon-base = { git = "https://github.com/scroll-tech/poseidon-circuit.git", branch = "main", optional = true } [build-dependencies]