From 9b857b9c24c70eb05af6eefd88f8fa733abdfe86 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Thu, 21 Oct 2021 08:49:57 +1100
Subject: [PATCH 1/3] Change to secp256k1-zkp upstream

Our patches have been accepted.
---
 Cargo.lock              | 4 ++--
 cfd_protocol/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 60b6907..73e15ea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2391,7 +2391,7 @@ dependencies = [
 [[package]]
 name = "secp256k1-zkp"
 version = "0.4.0"
-source = "git+https://github.com/klochowicz/rust-secp256k1-zkp?branch=ecdsa-signatures-release-build#e8692101e357fbda0a613023e0cd3e36457d9bf4"
+source = "git+https://github.com/ElementsProject/rust-secp256k1-zkp#c8ff901516c9c299c9cc7331b15a7a14a05ced89"
 dependencies = [
  "rand 0.6.5",
  "secp256k1",
@@ -2402,7 +2402,7 @@ dependencies = [
 [[package]]
 name = "secp256k1-zkp-sys"
 version = "0.4.0"
-source = "git+https://github.com/klochowicz/rust-secp256k1-zkp?branch=ecdsa-signatures-release-build#e8692101e357fbda0a613023e0cd3e36457d9bf4"
+source = "git+https://github.com/ElementsProject/rust-secp256k1-zkp#c8ff901516c9c299c9cc7331b15a7a14a05ced89"
 dependencies = [
  "cc",
  "secp256k1-sys",
diff --git a/cfd_protocol/Cargo.toml b/cfd_protocol/Cargo.toml
index 0c0835b..69def5c 100644
--- a/cfd_protocol/Cargo.toml
+++ b/cfd_protocol/Cargo.toml
@@ -9,7 +9,7 @@ bdk = { version = "0.12", default-features = false }
 bit-vec = "0.6"
 itertools = "0.10"
 rand = "0.6"
-secp256k1-zkp = { git = "https://github.com/klochowicz/rust-secp256k1-zkp", branch = "ecdsa-signatures-release-build", features = ["bitcoin_hashes", "global-context", "serde"] }
+secp256k1-zkp = { git = "https://github.com/ElementsProject/rust-secp256k1-zkp", features = ["bitcoin_hashes", "global-context", "serde"] }
 thiserror = "1"
 
 [dev-dependencies]

From 0bceba2483e1258c0161c07abda662e41c3686ca Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Thu, 21 Oct 2021 08:51:48 +1100
Subject: [PATCH 2/3] Patch secp256k1-zkp via root Cargo.toml

---
 Cargo.toml              | 1 +
 cfd_protocol/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 991f689..6ae64ff 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,3 +5,4 @@ resolver = "2"
 [patch.crates-io]
 rocket = { git = "https://github.com/SergioBenitez/Rocket" } # Need to patch rocket dependency of `rocket_basicauth` until there is an official release.
 xtra = { git = "https://github.com/luckysori/xtra", rev = "19684c196f71ec762e595906cc88c6142b82092e" } # Need to patch xtra dependency until there is an official release as it contains useful PRs from us.
+secp256k1-zkp = { git = "https://github.com/ElementsProject/rust-secp256k1-zkp" } # Latest master has crucial patches.
diff --git a/cfd_protocol/Cargo.toml b/cfd_protocol/Cargo.toml
index 69def5c..9046cf8 100644
--- a/cfd_protocol/Cargo.toml
+++ b/cfd_protocol/Cargo.toml
@@ -9,7 +9,7 @@ bdk = { version = "0.12", default-features = false }
 bit-vec = "0.6"
 itertools = "0.10"
 rand = "0.6"
-secp256k1-zkp = { git = "https://github.com/ElementsProject/rust-secp256k1-zkp", features = ["bitcoin_hashes", "global-context", "serde"] }
+secp256k1-zkp = { version = "0.4", features = ["bitcoin_hashes", "global-context", "serde"] }
 thiserror = "1"
 
 [dev-dependencies]

From 994f118b69d8913107faf55f0bfb6d4e66b626b0 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Thu, 21 Oct 2021 08:53:02 +1100
Subject: [PATCH 3/3] Depend on latest upstream HEAD instead of fork

---
 Cargo.lock | 2 +-
 Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 73e15ea..5b26854 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3479,7 +3479,7 @@ dependencies = [
 [[package]]
 name = "xtra"
 version = "0.6.0"
-source = "git+https://github.com/luckysori/xtra?rev=19684c196f71ec762e595906cc88c6142b82092e#19684c196f71ec762e595906cc88c6142b82092e"
+source = "git+https://github.com/Restioson/xtra#8bc69134b9204a5c247e3926f7ccc4132212dbea"
 dependencies = [
  "async-trait",
  "barrage",
diff --git a/Cargo.toml b/Cargo.toml
index 6ae64ff..761a767 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,5 +4,5 @@ resolver = "2"
 
 [patch.crates-io]
 rocket = { git = "https://github.com/SergioBenitez/Rocket" } # Need to patch rocket dependency of `rocket_basicauth` until there is an official release.
-xtra = { git = "https://github.com/luckysori/xtra", rev = "19684c196f71ec762e595906cc88c6142b82092e" } # Need to patch xtra dependency until there is an official release as it contains useful PRs from us.
+xtra = { git = "https://github.com/Restioson/xtra" } # Latest master has crucial patches.
 secp256k1-zkp = { git = "https://github.com/ElementsProject/rust-secp256k1-zkp" } # Latest master has crucial patches.