Skip to content

Commit 015ade0

Browse files
Merge pull request #75 from getlipa/feature/upgrade-deps
Upgrade dependencies
2 parents 2a0885d + 5838a75 commit 015ade0

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

chameleon/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ graphql = { path = "../graphql" }
88
honey-badger = { path = "../honey-badger" }
99

1010
[dev-dependencies]
11-
bitcoin = { version = "0.29.2" }
11+
bitcoin = { version = "0.30.1" }
1212
ctor = "0.2.0"
1313
simplelog = { version ="0.12.0", features = ["test"] }

crow/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ isocountry = { version = "0.3.2" }
1010
isolanguage-1 = { version = "0.2.2" }
1111

1212
[dev-dependencies]
13-
bitcoin = { version = "0.29.2" }
13+
bitcoin = { version = "0.30.1" }

honey-badger/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ edition = "2021"
55

66
[dependencies]
77
base64 = "0.21.0"
8-
bdk = { version = "0.28.0", features = ["keys-bip39"] }
8+
bdk = { version = "0.29.0", features = ["keys-bip39"] }
9+
hex = "0.4.3"
910
log = "0.4.17"
1011
rand = "0.8.5"
11-
secp256k1 = { version = "0.24.3", features = ["global-context"] }
12+
secp256k1 = { version = "0.27.0", features = ["global-context"] }
1213
serde_json = "1.0"
1314

1415
graphql = { path = "../graphql" }

honey-badger/src/secrets.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
use bdk::bitcoin::hashes::hex::ToHex;
1+
use bdk::bitcoin::bip32::{DerivationPath, ExtendedPrivKey};
22
use bdk::bitcoin::secp256k1::PublicKey;
3-
use bdk::bitcoin::util::bip32::{DerivationPath, ExtendedPrivKey};
43
use bdk::bitcoin::Network;
54
use bdk::keys::bip39::Mnemonic;
65
use bdk::keys::{DerivableKey, ExtendedKey};
@@ -66,8 +65,8 @@ fn derive_auth_keypair(master_xpriv: ExtendedPrivKey) -> KeyPair {
6665
.to_bytes();
6766

6867
KeyPair {
69-
secret_key: auth_priv_key.to_hex(),
70-
public_key: auth_pub_key.to_hex(),
68+
secret_key: hex::encode(auth_priv_key),
69+
public_key: hex::encode(auth_pub_key),
7170
}
7271
}
7372

@@ -82,7 +81,7 @@ pub fn generate_keypair() -> KeyPair {
8281
let (secret_key, public_key) = SECP256K1.generate_keypair(&mut rng);
8382

8483
KeyPair {
85-
secret_key: secret_key.secret_bytes().to_hex(),
86-
public_key: public_key.serialize().to_hex(),
84+
secret_key: hex::encode(secret_key.secret_bytes()),
85+
public_key: hex::encode(public_key.serialize()),
8786
}
8887
}

mole/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ graphql = { path = "../graphql" }
1111
honey-badger = { path = "../honey-badger" }
1212

1313
[dev-dependencies]
14-
bitcoin = { version = "0.29.2" }
14+
bitcoin = { version = "0.30.1" }
1515
ctor = "0.2.0"
1616
rand = "0.8.5"
1717
simplelog = { version ="0.12.0", features = ["test"] }

0 commit comments

Comments
 (0)