Switching dependencies to main branch of Plonky3 fork (#1670)

Merging https://github.com/powdr-labs/Plonky3/tree/uni-stark-with-fixed and changing dependencies accordingly. Co-authored-by: schaeff <[email protected]>
powdr-labs · Aug 26, 2024 · 6cd2ba1 · 6cd2ba1
1 parent fb74fc1
commit 6cd2ba1
Showing 1 changed file with 20 additions and 16 deletions.
diff --git a/plonky3/Cargo.toml b/plonky3/Cargo.toml
@@ -13,24 +13,28 @@ rand = "0.8.5"
 powdr-analysis = { path = "../analysis" }
 powdr-executor = { path = "../executor" }
 
-p3-air = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "uni-stark-with-fixed" }
-p3-matrix = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "uni-stark-with-fixed" }
-p3-field = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "uni-stark-with-fixed" }
-p3-uni-stark = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "uni-stark-with-fixed" }
-p3-commit = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "uni-stark-with-fixed", features = ["test-utils"] }
-p3-poseidon2 = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "uni-stark-with-fixed" }
-p3-poseidon = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "uni-stark-with-fixed" }
-p3-fri = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "uni-stark-with-fixed" }
+p3-air = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "main" }
+p3-matrix = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "main" }
+p3-field = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "main" }
+p3-uni-stark = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "main" }
+p3-commit = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "main", features = [
+    "test-utils",
+] }
+p3-poseidon2 = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "main" }
+p3-poseidon = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "main" }
+p3-fri = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "main" }
 # We don't use p3-maybe-rayon directly, but it is a dependency of p3-uni-stark.
 # Activating the "parallel" feature gives us parallelism in the prover.
-p3-maybe-rayon = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "uni-stark-with-fixed", features = ["parallel"] }
-p3-mds = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "uni-stark-with-fixed" }
-p3-merkle-tree = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "uni-stark-with-fixed" }
-p3-goldilocks = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "uni-stark-with-fixed" }
-p3-symmetric = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "uni-stark-with-fixed" }
-p3-dft = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "uni-stark-with-fixed" }
-p3-challenger = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "uni-stark-with-fixed" }
-p3-util = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "uni-stark-with-fixed" }
+p3-maybe-rayon = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "main", features = [
+    "parallel",
+] }
+p3-mds = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "main" }
+p3-merkle-tree = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "main" }
+p3-goldilocks = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "main" }
+p3-symmetric = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "main" }
+p3-dft = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "main" }
+p3-challenger = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "main" }
+p3-util = { git = "https://github.com/powdr-labs/Plonky3.git", branch = "main" }
 lazy_static = "1.4.0"
 rand_chacha = "0.3.1"
 bincode = "1.3.3"