From f4bffe6d0b50cdbdce2c6133534de5c975b02560 Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Thu, 7 Oct 2021 07:15:33 +0100
Subject: [PATCH] Less deps: Stop using old version of libsecp256k1 (#9947)

(Moving further to 0.7 would require upgrading rand first)
---
 substrate/Cargo.lock                          | 33 ++-----------------
 substrate/frame/contracts/Cargo.toml          |  2 +-
 .../frame/contracts/src/benchmarking/mod.rs   |  2 +-
 3 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock
index c3de1d3f74..0a502439b7 100644
--- a/substrate/Cargo.lock
+++ b/substrate/Cargo.lock
@@ -2623,17 +2623,6 @@ dependencies = [
  "digest 0.9.0",
 ]
 
-[[package]]
-name = "hmac-drbg"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b"
-dependencies = [
- "digest 0.8.1",
- "generic-array 0.12.4",
- "hmac 0.7.1",
-]
-
 [[package]]
 name = "hmac-drbg"
 version = "0.3.0"
@@ -3787,22 +3776,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "libsecp256k1"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc1e2c808481a63dc6da2074752fdd4336a3c8fcc68b83db6f1fd5224ae7962"
-dependencies = [
- "arrayref",
- "crunchy",
- "digest 0.8.1",
- "hmac-drbg 0.2.0",
- "rand 0.7.3",
- "sha2 0.8.2",
- "subtle 2.4.0",
- "typenum",
-]
-
 [[package]]
 name = "libsecp256k1"
 version = "0.5.0"
@@ -3812,7 +3785,7 @@ dependencies = [
  "arrayref",
  "base64 0.12.3",
  "digest 0.9.0",
- "hmac-drbg 0.3.0",
+ "hmac-drbg",
  "libsecp256k1-core 0.2.2",
  "libsecp256k1-gen-ecmult 0.2.1",
  "libsecp256k1-gen-genmult 0.2.1",
@@ -3831,7 +3804,7 @@ dependencies = [
  "arrayref",
  "base64 0.12.3",
  "digest 0.9.0",
- "hmac-drbg 0.3.0",
+ "hmac-drbg",
  "libsecp256k1-core 0.2.2",
  "libsecp256k1-gen-ecmult 0.2.1",
  "libsecp256k1-gen-genmult 0.2.1",
@@ -5306,7 +5279,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex-literal",
- "libsecp256k1 0.3.5",
+ "libsecp256k1 0.6.0",
  "log 0.4.14",
  "pallet-balances",
  "pallet-contracts-primitives",
diff --git a/substrate/frame/contracts/Cargo.toml b/substrate/frame/contracts/Cargo.toml
index 08fd416496..c094e01507 100644
--- a/substrate/frame/contracts/Cargo.toml
+++ b/substrate/frame/contracts/Cargo.toml
@@ -28,7 +28,7 @@ smallvec = { version = "1", default-features = false, features = [
 wasmi-validation = { version = "0.4", default-features = false }
 
 # Only used in benchmarking to generate random contract code
-libsecp256k1 = { version = "0.3.5", optional = true, default-features = false, features = ["hmac"] }
+libsecp256k1 = { version = "0.6.0", optional = true, default-features = false, features = ["hmac", "static-context"] }
 rand = { version = "0.7.3", optional = true, default-features = false }
 rand_pcg = { version = "0.2", optional = true }
 
diff --git a/substrate/frame/contracts/src/benchmarking/mod.rs b/substrate/frame/contracts/src/benchmarking/mod.rs
index e382e616f2..5c753c2d95 100644
--- a/substrate/frame/contracts/src/benchmarking/mod.rs
+++ b/substrate/frame/contracts/src/benchmarking/mod.rs
@@ -1425,7 +1425,7 @@ benchmarks! {
 		let message_hash = sp_io::hashing::blake2_256("Hello world".as_bytes());
 		let signatures = (0..r * API_BENCHMARK_BATCH_SIZE)
 			.map(|i| {
-				use secp256k1::{SecretKey, Message, sign};
+				use libsecp256k1::{SecretKey, Message, sign};
 
 				let private_key = SecretKey::random(&mut rng);
 				let (signature, recovery_id) = sign(&Message::parse(&message_hash), &private_key);