From 84aa7d79cd437d92c2f9b4ed9a1a41345138c331 Mon Sep 17 00:00:00 2001 From: Lucas Clemente Vella Date: Wed, 16 Oct 2024 18:52:42 +0100 Subject: [PATCH] Pinning git dependencies to git revision. Tag is also acceptable. Branch is not. --- backend/Cargo.toml | 6 +++--- number/Cargo.toml | 6 +++--- plonky3/Cargo.toml | 38 +++++++++++++++++++------------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/backend/Cargo.toml b/backend/Cargo.toml index 1d1798b0d1..39e6981e3b 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -28,12 +28,12 @@ pil-stark-prover = { git = "https://github.com/powdr-labs/pil-stark-prover.git", # TODO change this once Halo2 releases 0.3.1 #halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2", tag = "v0.3.0", features = ["circuit-params"] } -halo2_proofs = { git = "https://github.com/powdr-labs/halo2", branch = "make-emit-public-v0.3.0", features = ["circuit-params"], optional = true } +halo2_proofs = { git = "https://github.com/powdr-labs/halo2.git", rev = "fb8087565115ff38da4074b9d1777e9a97222caa", features = ["circuit-params"], optional = true } halo2_curves = { version = "0.6.1", package = "halo2curves", optional = true} # TODO change this once Halo2 releases 0.3.1 and snark-verifier uses it #snark-verifier = { git = "https://github.com/privacy-scaling-explorations/snark-verifier", tag = "v2024_01_31" } -snark-verifier = { git = "https://github.com/powdr-labs/snark-verifier", branch = "powdr-halo2", optional = true } -halo2_solidity_verifier = { git = "https://github.com/powdr-labs/halo2-solidity-verifier", branch = "main", features = ["evm"], optional = true } +snark-verifier = { git = "https://github.com/powdr-labs/snark-verifier.git", rev = "55012261fd4b0b8d21b581a9782d05258afe4104", optional = true } +halo2_solidity_verifier = { git = "https://github.com/powdr-labs/halo2-solidity-verifier.git", rev = "ecae7fd2f62178c18b5fe18011630aa71da3371f", features = ["evm"], optional = true } strum = { version = "0.24.1", features = ["derive"] } log = "0.4.17" diff --git a/number/Cargo.toml b/number/Cargo.toml index e207f8d432..7c1ac9e7f4 100644 --- a/number/Cargo.toml +++ b/number/Cargo.toml @@ -13,9 +13,9 @@ ark-bn254 = { version = "0.4.0", default-features = false, features = [ ] } ark-ff = "0.4.2" ark-serialize = "0.4.2" -p3-baby-bear = { git = "https://github.com/plonky3/Plonky3.git" } -p3-mersenne-31 = { git = "https://github.com/plonky3/Plonky3.git" } -p3-field = { git = "https://github.com/plonky3/Plonky3.git" } +p3-baby-bear = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0" } +p3-mersenne-31 = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0" } +p3-field = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0" } num-bigint = { version = "0.4.3", features = ["serde"] } num-traits = "0.2.15" csv = "1.3" diff --git a/plonky3/Cargo.toml b/plonky3/Cargo.toml index d4c474ef4f..415ef2ef5f 100644 --- a/plonky3/Cargo.toml +++ b/plonky3/Cargo.toml @@ -13,32 +13,32 @@ rand = "0.8.5" powdr-analysis = { path = "../analysis" } powdr-executor = { path = "../executor" } -p3-air = { git = "https://github.com/plonky3/Plonky3.git" } -p3-matrix = { git = "https://github.com/plonky3/Plonky3.git" } -p3-field = { git = "https://github.com/plonky3/Plonky3.git" } -p3-uni-stark = { git = "https://github.com/plonky3/Plonky3.git" } -p3-commit = { git = "https://github.com/plonky3/Plonky3.git", features = [ +p3-air = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0" } +p3-matrix = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0" } +p3-field = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0" } +p3-uni-stark = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0" } +p3-commit = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0", features = [ "test-utils", ] } -p3-poseidon2 = { git = "https://github.com/plonky3/Plonky3.git" } -p3-poseidon = { git = "https://github.com/plonky3/Plonky3.git" } -p3-fri = { git = "https://github.com/plonky3/Plonky3.git" } +p3-poseidon2 = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0" } +p3-poseidon = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0" } +p3-fri = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0" } # 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/plonky3/Plonky3.git", features = [ +p3-maybe-rayon = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0", features = [ "parallel", ] } -p3-mds = { git = "https://github.com/plonky3/Plonky3.git" } -p3-merkle-tree = { git = "https://github.com/plonky3/Plonky3.git" } -p3-mersenne-31 = { git = "https://github.com/plonky3/Plonky3.git" } -p3-circle = { git = "https://github.com/plonky3/Plonky3.git" } -p3-baby-bear = { git = "https://github.com/plonky3/Plonky3.git" } -p3-goldilocks = { git = "https://github.com/plonky3/Plonky3.git" } -p3-symmetric = { git = "https://github.com/plonky3/Plonky3.git" } -p3-dft = { git = "https://github.com/plonky3/Plonky3.git" } -p3-challenger = { git = "https://github.com/plonky3/Plonky3.git" } -p3-util = { git = "https://github.com/plonky3/Plonky3.git" } +p3-mds = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0" } +p3-merkle-tree = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0" } +p3-mersenne-31 = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0" } +p3-circle = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0" } +p3-baby-bear = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0" } +p3-goldilocks = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0" } +p3-symmetric = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0" } +p3-dft = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0" } +p3-challenger = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0" } +p3-util = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0" } lazy_static = "1.4.0" rand_chacha = "0.3.1" bincode = "1.3.3"