Merge #402

402: Revise Git dependencies r=thomaseizinger a=thomaseizinger

- Change to secp256k1-zkp upstream
- Patch secp256k1-zkp via root Cargo.toml
- Depend on latest upstream HEAD instead of fork


Co-authored-by: Thomas Eizinger <thomas@eizinger.io>

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",
@@ -3488,7 +3488,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",

Cargo.toml

@@ -4,4 +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.

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 = { version = "0.4", features = ["bitcoin_hashes", "global-context", "serde"] }
 thiserror = "1"
 
 [dev-dependencies]