From f358a3864eed8e56b6f77c3fc9f1a7b21ba38703 Mon Sep 17 00:00:00 2001
From: Niklas Adolfsson <niklasadolfsson1@gmail.com>
Date: Thu, 24 Oct 2024 12:35:16 +0200
Subject: [PATCH] chore(deps): bump subxt signer deps (#1840)

---
 Cargo.lock          | 47 ++++++++++++++++++++++++++++++++-------------
 Cargo.toml          |  6 +++---
 signer/src/ecdsa.rs |  2 +-
 3 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a77d87d0d0..9c0d2b6ae8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -914,11 +914,11 @@ dependencies = [
 
 [[package]]
 name = "bip39"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f"
+checksum = "33415e24172c1b7d6066f6d999545375ab8e1d95421d6784bdfff9496f292387"
 dependencies = [
- "bitcoin_hashes 0.11.0",
+ "bitcoin_hashes 0.13.0",
  "serde",
  "unicode-normalization",
 ]
@@ -945,10 +945,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb"
 
 [[package]]
-name = "bitcoin_hashes"
-version = "0.11.0"
+name = "bitcoin-io"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4"
+checksum = "340e09e8399c7bd8912f495af6aa58bea0c9214773417ffaa8f6460f93aaee56"
 
 [[package]]
 name = "bitcoin_hashes"
@@ -957,7 +957,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b"
 dependencies = [
  "bitcoin-internals",
- "hex-conservative",
+ "hex-conservative 0.1.1",
+]
+
+[[package]]
+name = "bitcoin_hashes"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16"
+dependencies = [
+ "bitcoin-io",
+ "hex-conservative 0.2.1",
 ]
 
 [[package]]
@@ -3627,6 +3637,15 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "30ed443af458ccb6d81c1e7e661545f94d3176752fb1df2f543b902a1e0f51e2"
 
+[[package]]
+name = "hex-conservative"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd"
+dependencies = [
+ "arrayvec 0.7.4",
+]
+
 [[package]]
 name = "hex-literal"
 version = "0.4.1"
@@ -8701,10 +8720,12 @@ dependencies = [
 
 [[package]]
 name = "secp256k1"
-version = "0.29.1"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113"
+checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252"
 dependencies = [
+ "bitcoin_hashes 0.14.0",
+ "rand",
  "secp256k1-sys 0.10.1",
 ]
 
@@ -8737,9 +8758,9 @@ dependencies = [
 
 [[package]]
 name = "secrecy"
-version = "0.10.2"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba079fa568d52545cd70b334b2ce6f88f62b8fc2bda9290f48a0578388a49331"
+checksum = "e891af845473308773346dc847b2c23ee78fe442e0472ac50e22a18a93d3ae5a"
 dependencies = [
  "zeroize",
 ]
@@ -10721,8 +10742,8 @@ dependencies = [
  "regex",
  "schnorrkel",
  "scrypt",
- "secp256k1 0.29.1",
- "secrecy 0.10.2",
+ "secp256k1 0.30.0",
+ "secrecy 0.10.3",
  "serde",
  "serde_json",
  "sha2 0.10.8",
diff --git a/Cargo.toml b/Cargo.toml
index ebdd50a23c..a7f14b9e66 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -149,14 +149,14 @@ test-runtime = { path = "testing/test-runtime" }
 substrate-runner = { path = "testing/substrate-runner" }
 
 # subxt-signer deps that I expect aren't useful anywhere else:
-bip39 = { version = "2.0.0", default-features = false }
+bip39 = { version = "2.1.0", default-features = false }
 bip32 = { version = "0.5.2", default-features = false }
 hmac = { version = "0.12.1", default-features = false }
 pbkdf2 = { version = "0.12.2", default-features = false }
 schnorrkel = { version = "0.11.4", default-features = false }
-secp256k1 = { version = "0.29.1", default-features = false }
+secp256k1 = { version = "0.30.0", default-features = false }
 keccak-hash = { version = "0.11.0", default-features = false }
-secrecy = "0.10.2"
+secrecy = "0.10.3"
 sha2 = { version = "0.10.8", default-features = false }
 zeroize = { version = "1", default-features = false }
 base64 = { version = "0.22.1", default-features = false }
diff --git a/signer/src/ecdsa.rs b/signer/src/ecdsa.rs
index 50efa437f4..69bda852e7 100644
--- a/signer/src/ecdsa.rs
+++ b/signer/src/ecdsa.rs
@@ -203,7 +203,7 @@ pub(crate) mod internal {
         let (recid, sig): (_, [u8; 64]) = recsig.serialize_compact();
         let mut signature_bytes: [u8; 65] = [0; 65];
         signature_bytes[..64].copy_from_slice(&sig);
-        signature_bytes[64] = (recid.to_i32() & 0xFF) as u8;
+        signature_bytes[64] = (i32::from(recid) & 0xFF) as u8;
         signature_bytes
     }