From fbc79210262bad61a959be40cd46e1df500eede0 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 7 Feb 2024 15:20:25 +0100
Subject: [PATCH] upgrade halo2

---
 Cargo.toml         | 10 ----------
 backend/Cargo.toml |  2 +-
 halo2/Cargo.toml   | 10 ++++++----
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 7abead3b4..d9e1672b6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,16 +33,6 @@ license = "MIT"
 homepage = "https://powdr.org"
 repository = "https://github.com/powdr-labs/powdr"
 
-[patch."https://github.com/privacy-scaling-explorations/halo2.git"]
-# TODO change back to this once the PR is merged
-#halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", rev = "d3746109d7d38be53afc8ddae8fdfaf1f02ad1d7" }
-halo2_proofs = { git = "https://github.com/powdr-org/halo2", branch = "kilic/shuffle" }
-
-[patch.crates-io]
-# TODO change back to this once the PR is merged
-#halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", rev = "d3746109d7d38be53afc8ddae8fdfaf1f02ad1d7" }
-halo2_proofs = { git = "https://github.com/powdr-org/halo2", branch = "kilic/shuffle" }
-
 [profile.pr-tests]
 inherits = "dev"
 opt-level = 3
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index fd782ad7d..0a3311e60 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -20,7 +20,7 @@ strum = { version = "0.24.1", features = ["derive"] }
 log = "0.4.17"
 serde_json = "1.0"
 thiserror = "1.0.43"
-starky = { git = "https://github.com/0xEigenLabs/eigen-zkvm.git", rev = "a54965f" }
+starky = { git = "https://github.com/0xEigenLabs/eigen-zkvm.git", rev = "83c6c44" }
 
 [dev-dependencies]
 mktemp = "0.5.0"
diff --git a/halo2/Cargo.toml b/halo2/Cargo.toml
index 18f24694b..06e4d7d38 100644
--- a/halo2/Cargo.toml
+++ b/halo2/Cargo.toml
@@ -12,10 +12,12 @@ powdr-ast = { path = "../ast" }
 powdr-number = { path = "../number" }
 powdr-pil-analyzer = { path = "../pil-analyzer" }
 
-polyexen = { git = "https://github.com/Dhole/polyexen", branch = "feature/shuffles" }
-halo2_proofs = "0.2"
-halo2_curves = { git = "https://github.com/privacy-scaling-explorations/halo2curves", tag = "0.3.2", package = "halo2curves" }
-snark-verifier = { git = "https://github.com/privacy-scaling-explorations/snark-verifier", rev = "c400ffcd629c337111c4e3cbf95acfe1230b068b" }
+polyexen = { git = "https://github.com/leonardoalt/polyexen", rev = "16a85c5" }
+
+halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2", tag = "v0.3.0" }
+halo2_curves = { version = "0.6.1", package = "halo2curves" }
+snark-verifier = { git = "https://github.com/privacy-scaling-explorations/snark-verifier", tag = "v2024_01_31" }
+
 num-traits = "0.2.15"
 num-integer = "0.1.45"
 itertools = "^0.10"