From 54e3507361235727c2620181485d6ae5e3890aa9 Mon Sep 17 00:00:00 2001
From: Ratan Kaliani <ratankaliani@berkeley.edu>
Date: Wed, 1 May 2024 18:36:21 -0700
Subject: [PATCH] fix

---
 Cargo.lock               | 65 +++++++++++++++++++++++++++++++++++-----
 plonky2x/core/Cargo.toml |  6 ++--
 rustx/Cargo.toml         |  8 +----
 3 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b9d6f2ab..40a3d70b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2879,6 +2879,30 @@ version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c"
 
+[[package]]
+name = "plonky2"
+version = "0.2.0"
+source = "git+https://github.com/0xPolygonZero/plonky2.git?tag=v0.2.0#7445ec911b0c5a1d94062ef2d5cae4ec08ee9a3f"
+dependencies = [
+ "ahash",
+ "anyhow",
+ "getrandom",
+ "hashbrown 0.14.3",
+ "itertools 0.11.0",
+ "keccak-hash",
+ "log",
+ "num",
+ "plonky2_field 0.2.0 (git+https://github.com/0xPolygonZero/plonky2.git?tag=v0.2.0)",
+ "plonky2_maybe_rayon 0.2.0 (git+https://github.com/0xPolygonZero/plonky2.git?tag=v0.2.0)",
+ "plonky2_util 0.2.0 (git+https://github.com/0xPolygonZero/plonky2.git?tag=v0.2.0)",
+ "rand 0.8.5",
+ "rand_chacha",
+ "serde",
+ "static_assertions",
+ "unroll",
+ "web-time",
+]
+
 [[package]]
 name = "plonky2"
 version = "0.2.0"
@@ -2892,17 +2916,31 @@ dependencies = [
  "keccak-hash",
  "log",
  "num",
- "plonky2_field",
+ "plonky2_field 0.2.0 (git+https://github.com/mir-protocol/plonky2.git)",
  "plonky2_maybe_rayon 0.2.0 (git+https://github.com/mir-protocol/plonky2.git)",
- "plonky2_util",
+ "plonky2_util 0.2.0 (git+https://github.com/mir-protocol/plonky2.git)",
  "rand 0.8.5",
- "rand_chacha",
  "serde",
  "static_assertions",
  "unroll",
  "web-time",
 ]
 
+[[package]]
+name = "plonky2_field"
+version = "0.2.0"
+source = "git+https://github.com/0xPolygonZero/plonky2.git?tag=v0.2.0#7445ec911b0c5a1d94062ef2d5cae4ec08ee9a3f"
+dependencies = [
+ "anyhow",
+ "itertools 0.11.0",
+ "num",
+ "plonky2_util 0.2.0 (git+https://github.com/0xPolygonZero/plonky2.git?tag=v0.2.0)",
+ "rand 0.8.5",
+ "serde",
+ "static_assertions",
+ "unroll",
+]
+
 [[package]]
 name = "plonky2_field"
 version = "0.2.0"
@@ -2911,7 +2949,7 @@ dependencies = [
  "anyhow",
  "itertools 0.11.0",
  "num",
- "plonky2_util",
+ "plonky2_util 0.2.0 (git+https://github.com/mir-protocol/plonky2.git)",
  "rand 0.8.5",
  "serde",
  "static_assertions",
@@ -2927,6 +2965,14 @@ dependencies = [
  "rayon",
 ]
 
+[[package]]
+name = "plonky2_maybe_rayon"
+version = "0.2.0"
+source = "git+https://github.com/0xPolygonZero/plonky2.git?tag=v0.2.0#7445ec911b0c5a1d94062ef2d5cae4ec08ee9a3f"
+dependencies = [
+ "rayon",
+]
+
 [[package]]
 name = "plonky2_maybe_rayon"
 version = "0.2.0"
@@ -2935,6 +2981,11 @@ dependencies = [
  "rayon",
 ]
 
+[[package]]
+name = "plonky2_util"
+version = "0.2.0"
+source = "git+https://github.com/0xPolygonZero/plonky2.git?tag=v0.2.0#7445ec911b0c5a1d94062ef2d5cae4ec08ee9a3f"
+
 [[package]]
 name = "plonky2_util"
 version = "0.2.0"
@@ -2965,7 +3016,7 @@ dependencies = [
  "log",
  "num",
  "num-bigint 0.4.4",
- "plonky2",
+ "plonky2 0.2.0 (git+https://github.com/0xPolygonZero/plonky2.git?tag=v0.2.0)",
  "plonky2x-derive",
  "rand 0.8.5",
  "reqwest",
@@ -3556,7 +3607,7 @@ dependencies = [
  "ethers",
  "hex",
  "log",
- "plonky2",
+ "plonky2 0.2.0 (git+https://github.com/0xPolygonZero/plonky2.git?tag=v0.2.0)",
  "plonky2x",
  "serde",
  "serde_json",
@@ -3983,7 +4034,7 @@ dependencies = [
  "itertools 0.10.5",
  "log",
  "num",
- "plonky2",
+ "plonky2 0.2.0 (git+https://github.com/mir-protocol/plonky2.git)",
  "plonky2_maybe_rayon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.8.5",
  "serde",
diff --git a/plonky2x/core/Cargo.toml b/plonky2x/core/Cargo.toml
index aa2b128a..21ae4221 100644
--- a/plonky2x/core/Cargo.toml
+++ b/plonky2x/core/Cargo.toml
@@ -13,9 +13,9 @@ std = ["plonky2/std", "itertools/use_std"]
 timing = ["plonky2/timing"]
 
 [dependencies]
-plonky2 = { git = "https://github.com/mir-protocol/plonky2.git", version = "0.2.0", default-features = false }
+plonky2 = { git = "https://github.com/0xPolygonZero/plonky2.git", tag = "v0.2.0", default-features = false }
 plonky2x-derive = { path = "../derive" }
-starkyx = { git = "https://github.com/succinctlabs/starkyx.git" }
+starkyx = { git = "https://github.com/succinctlabs/starkyx.git", branch = "ratan/fix-plonky2-pin" }
 
 anyhow = "1.0.75"
 array-macro = "2.1.5"
@@ -52,7 +52,7 @@ uuid = { version = "1.4.1", features = ["serde"] }
 
 [dev-dependencies]
 env_logger = "0.10.0"
-plonky2 = { git = "https://github.com/mir-protocol/plonky2.git", version = "0.2.0", features = [
+plonky2 = { git = "https://github.com/0xPolygonZero/plonky2.git", tag = "v0.2.0", features = [
   "gate_testing",
 ] }
 rust-crypto = "0.2"
diff --git a/rustx/Cargo.toml b/rustx/Cargo.toml
index fe1c70f7..f26f4c09 100644
--- a/rustx/Cargo.toml
+++ b/rustx/Cargo.toml
@@ -21,13 +21,7 @@ env_logger = "0.10.0"
 ethers = "2.0.10"
 hex = "0.4.3"
 log = "0.4.20"
-plonky2 = {git = "https://github.com/mir-protocol/plonky2.git", default-features = false, version = "0.2.0"}
-plonky2x = {path = "../plonky2x/core"}
+plonky2x = { path = "../plonky2x/core" }
 serde = "1.0.188"
 serde_json = "1.0.107"
 tokio = "1.33.0"
-
-[dev-dependencies]
-plonky2 = {git = "https://github.com/mir-protocol/plonky2.git", version = "0.2.0", features = [
-  "gate_testing",
-]}