From 68840b65f54c84f991cee6d8d800bbd6bab9dcc3 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Mon, 4 Jan 2021 15:25:45 +1100
Subject: [PATCH 1/2] Bump to secp256k1 0.20

This version removes the fuzztarget and endomorphism features.
---
 Cargo.toml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 0a4d131c..5e6d197a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,18 +14,17 @@ readme = "README.md"
 [features]
 default = [ "secp-recovery" ]
 base64 = [ "base64-compat" ]
-fuzztarget = ["secp256k1/fuzztarget", "bitcoin_hashes/fuzztarget"]
+fuzztarget = ["bitcoin_hashes/fuzztarget"]
 unstable = []
 rand = ["secp256k1/rand-std"]
 use-serde = ["serde", "bitcoin_hashes/serde", "secp256k1/serde"]
-secp-endomorphism = ["secp256k1/endomorphism"]
 secp-lowmemory = ["secp256k1/lowmemory"]
 secp-recovery = ["secp256k1/recovery"]
 
 [dependencies]
 bech32 = "0.7.2"
 bitcoin_hashes = "0.9.1"
-secp256k1 = { version = "0.19.0", features = [ "recovery" ] }
+secp256k1 = { version = "0.20.0", features = [ "recovery" ] }
 
 base64-compat = { version = "1.0.0", optional = true }
 bitcoinconsensus = { version = "0.19.0-1", optional = true }
@@ -34,6 +33,6 @@ serde = { version = "1", features = [ "derive" ], optional = true }
 [dev-dependencies]
 serde_json = "<1.0.45"
 serde_test = "1"
-secp256k1 = { version = "0.19.0", features = [ "recovery", "rand-std" ] }
+secp256k1 = { version = "0.20.0", features = [ "recovery", "rand-std" ] }
 # We need to pin ryu (transitive dep from serde_json) to stay compatible with Rust 1.22.0
 ryu = "<1.0.5"

From e52e48eebb0999a0f44eb48fa737abefb7dee838 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Mon, 4 Jan 2021 15:26:26 +1100
Subject: [PATCH 2/2] Don't enable `recovery` of `secp256k1` in the dependency
 declaration

Enabling this feature in the dependency declaration defeats the point
of exposing a feature in rust-bitcoin that enables this because
cargo currently does not provide a way to disable a once activated feature.
---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 5e6d197a..f7f925e2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,7 +24,7 @@ secp-recovery = ["secp256k1/recovery"]
 [dependencies]
 bech32 = "0.7.2"
 bitcoin_hashes = "0.9.1"
-secp256k1 = { version = "0.20.0", features = [ "recovery" ] }
+secp256k1 = "0.20.0"
 
 base64-compat = { version = "1.0.0", optional = true }
 bitcoinconsensus = { version = "0.19.0-1", optional = true }