Skip to content

Commit 6895a06

Browse files
apoelstraapoelstra
committed
Merge #679: Upgrade to bitcoin v0.32.0
cf8c1c8 Upgrade bitcoin v0.32.0 (Tobin C. Harding) Pull request description: We just released a new version of `bitcoin`, lets use it. Includes upgrading the version of: - `bitcoind` to `v0.36.0` - `secp256k1` to `0.29.0` ACKs for top commit: apoelstra: ACK cf8c1c8 Tree-SHA512: 510ff079869b94f2a9a11d05e09a00b19cc7b606b916af559d30b25037dae1b188c0cb9263a8c8718c1f119c64dc6552cc977acde3a5fdbba53d62beda9ecc98
2 parents b507ff6 + cf8c1c8 commit 6895a06

File tree

19 files changed

+155
-105
lines changed

19 files changed

+155
-105
lines changed

Diff for: ‎Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ edition = "2018"
1313
[features]
1414
default = ["std"]
1515
std = ["bitcoin/std", "bitcoin/secp-recovery", "bech32/std"]
16-
no-std = ["bitcoin/no-std", "bech32/alloc"]
16+
no-std = ["bech32/alloc"]
1717
compiler = []
1818
trace = []
1919

@@ -23,15 +23,15 @@ base64 = ["bitcoin/base64"]
2323

2424
[dependencies]
2525
bech32 = { version = "0.11.0", default-features = false }
26-
bitcoin = { version = "0.31.0", default-features = false }
26+
bitcoin = { version = "0.32.0", default-features = false }
2727

2828
# Do NOT use this as a feature! Use the `serde` feature instead.
2929
actual-serde = { package = "serde", version = "1.0.103", optional = true }
3030

3131
[dev-dependencies]
3232
serde_test = "1.0.147"
33-
bitcoin = { version = "0.31.0", features = ["base64"] }
34-
secp256k1 = {version = "0.28.0", features = ["rand-std"]}
33+
bitcoin = { version = "0.32.0", features = ["base64"] }
34+
secp256k1 = {version = "0.29.0", features = ["rand-std"]}
3535

3636
[[example]]
3737
name = "htlc"

Diff for: ‎bitcoind-tests/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ publish = false
99

1010
[dependencies]
1111
miniscript = {path = "../"}
12-
bitcoind = { version = "0.34.0" }
12+
bitcoind = { version = "0.36.0" }
1313
actual-rand = { package = "rand", version = "0.8.4"}
14-
secp256k1 = {version = "0.28.0", features = ["rand-std"]}
14+
secp256k1 = {version = "0.29.0", features = ["rand-std"]}

Diff for: ‎bitcoind-tests/tests/test_cpp.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,9 @@ pub fn test_from_cpp_ms(cl: &Client, testdata: &TestData) {
170170
// Get the required sighash message
171171
let amt = btc(1);
172172
let mut sighash_cache = bitcoin::sighash::SighashCache::new(&psbts[i].unsigned_tx);
173-
let sighash_ty = bitcoin::sighash::EcdsaSighashType::All;
173+
let sighash_type = bitcoin::sighash::EcdsaSighashType::All;
174174
let sighash = sighash_cache
175-
.p2wsh_signature_hash(0, &ms.encode(), amt, sighash_ty)
175+
.p2wsh_signature_hash(0, &ms.encode(), amt, sighash_type)
176176
.unwrap();
177177

178178
// requires both signing and verification because we check the tx
@@ -181,11 +181,11 @@ pub fn test_from_cpp_ms(cl: &Client, testdata: &TestData) {
181181

182182
// Finally construct the signature and add to psbt
183183
for sk in sks_reqd {
184-
let sig = secp.sign_ecdsa(&msg, &sk);
184+
let signature = secp.sign_ecdsa(&msg, &sk);
185185
let pk = pks[sks.iter().position(|&x| x == sk).unwrap()];
186186
psbts[i].inputs[0]
187187
.partial_sigs
188-
.insert(pk, bitcoin::ecdsa::Signature { sig, hash_ty: sighash_ty });
188+
.insert(pk, bitcoin::ecdsa::Signature { signature, sighash_type });
189189
}
190190
// Add the hash preimages to the psbt
191191
psbts[i].inputs[0]

Diff for: ‎bitcoind-tests/tests/test_desc.rs

+11-10
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ pub fn test_desc_satisfy(
155155
match derived_desc {
156156
Descriptor::Tr(ref tr) => {
157157
// Fixme: take a parameter
158-
let hash_ty = sighash::TapSighashType::Default;
158+
let sighash_type = sighash::TapSighashType::Default;
159159

160160
let internal_key_present = x_only_pks
161161
.iter()
@@ -170,14 +170,15 @@ pub fn test_desc_satisfy(
170170
.add_xonly_tweak(&secp, &tr.spend_info().tap_tweak().to_scalar())
171171
.expect("Tweaking failed");
172172
let sighash_msg = sighash_cache
173-
.taproot_key_spend_signature_hash(0, &prevouts, hash_ty)
173+
.taproot_key_spend_signature_hash(0, &prevouts, sighash_type)
174174
.unwrap();
175175
let msg = secp256k1::Message::from_digest(sighash_msg.to_byte_array());
176176
let mut aux_rand = [0u8; 32];
177177
rand::thread_rng().fill_bytes(&mut aux_rand);
178178
let schnorr_sig =
179179
secp.sign_schnorr_with_aux_rand(&msg, &internal_keypair, &aux_rand);
180-
psbt.inputs[0].tap_key_sig = Some(taproot::Signature { sig: schnorr_sig, hash_ty });
180+
psbt.inputs[0].tap_key_sig =
181+
Some(taproot::Signature { signature: schnorr_sig, sighash_type });
181182
} else {
182183
// No internal key
183184
}
@@ -194,17 +195,17 @@ pub fn test_desc_satisfy(
194195
.collect();
195196
for (keypair, leaf_hash) in x_only_keypairs_reqd {
196197
let sighash_msg = sighash_cache
197-
.taproot_script_spend_signature_hash(0, &prevouts, leaf_hash, hash_ty)
198+
.taproot_script_spend_signature_hash(0, &prevouts, leaf_hash, sighash_type)
198199
.unwrap();
199200
let msg = secp256k1::Message::from_digest(sighash_msg.to_byte_array());
200201
let mut aux_rand = [0u8; 32];
201202
rand::thread_rng().fill_bytes(&mut aux_rand);
202-
let sig = secp.sign_schnorr_with_aux_rand(&msg, &keypair, &aux_rand);
203+
let signature = secp.sign_schnorr_with_aux_rand(&msg, &keypair, &aux_rand);
203204
let x_only_pk =
204205
x_only_pks[xonly_keypairs.iter().position(|&x| x == keypair).unwrap()];
205206
psbt.inputs[0]
206207
.tap_script_sigs
207-
.insert((x_only_pk, leaf_hash), taproot::Signature { sig, hash_ty });
208+
.insert((x_only_pk, leaf_hash), taproot::Signature { signature, sighash_type });
208209
}
209210
}
210211
_ => {
@@ -246,16 +247,16 @@ pub fn test_desc_satisfy(
246247
.to_secp_msg();
247248

248249
// Fixme: Take a parameter
249-
let hash_ty = sighash::EcdsaSighashType::All;
250+
let sighash_type = sighash::EcdsaSighashType::All;
250251

251252
// Finally construct the signature and add to psbt
252253
for sk in sks_reqd {
253-
let sig = secp.sign_ecdsa(&msg, &sk);
254+
let signature = secp.sign_ecdsa(&msg, &sk);
254255
let pk = pks[sks.iter().position(|&x| x == sk).unwrap()];
255-
assert!(secp.verify_ecdsa(&msg, &sig, &pk.inner).is_ok());
256+
assert!(secp.verify_ecdsa(&msg, &signature, &pk.inner).is_ok());
256257
psbt.inputs[0]
257258
.partial_sigs
258-
.insert(pk, ecdsa::Signature { sig, hash_ty });
259+
.insert(pk, ecdsa::Signature { signature, sighash_type });
259260
}
260261
}
261262
}

Diff for: ‎examples/psbt_sign_finalize.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ fn main() {
134134

135135
psbt.inputs[0]
136136
.partial_sigs
137-
.insert(pk1, bitcoin::ecdsa::Signature { sig: sig1, hash_ty });
137+
.insert(pk1, bitcoin::ecdsa::Signature { signature: sig1, sighash_type: hash_ty });
138138

139139
println!("{:#?}", psbt);
140140
println!("{}", psbt);
@@ -150,7 +150,7 @@ fn main() {
150150
fn get_vout(tx: &Transaction, spk: &Script) -> (OutPoint, TxOut) {
151151
for (i, txout) in tx.clone().output.into_iter().enumerate() {
152152
if spk == &txout.script_pubkey {
153-
return (OutPoint::new(tx.txid(), i as u32), txout);
153+
return (OutPoint::new(tx.compute_txid(), i as u32), txout);
154154
}
155155
}
156156
panic!("Only call get vout on functions which have the expected outpoint");

Diff for: ‎examples/sign_multisig.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,14 @@ fn list_of_three_arbitrary_public_keys() -> Vec<bitcoin::PublicKey> {
118118
// a valid signature for this transaction; Miniscript does not verify the validity.
119119
fn random_signature_from_the_blockchain() -> ecdsa::Signature {
120120
ecdsa::Signature {
121-
sig: secp256k1::ecdsa::Signature::from_str(
121+
signature: secp256k1::ecdsa::Signature::from_str(
122122
"3045\
123123
0221\
124124
00f7c3648c390d87578cd79c8016940aa8e3511c4104cb78daa8fb8e429375efc1\
125125
0220\
126126
531d75c136272f127a5dc14acc0722301cbddc222262934151f140da345af177",
127127
)
128128
.unwrap(),
129-
hash_ty: bitcoin::sighash::EcdsaSighashType::All,
129+
sighash_type: bitcoin::sighash::EcdsaSighashType::All,
130130
}
131131
}

Diff for: ‎examples/verify_tx.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ fn main() {
8787

8888
let iter = interpreter.iter_custom(Box::new(|key_sig: &KeySigPair| {
8989
let (pk, ecdsa_sig) = key_sig.as_ecdsa().expect("Ecdsa Sig");
90-
ecdsa_sig.hash_ty == bitcoin::sighash::EcdsaSighashType::All
90+
ecdsa_sig.sighash_type == bitcoin::sighash::EcdsaSighashType::All
9191
&& secp
92-
.verify_ecdsa(&message, &ecdsa_sig.sig, &pk.inner)
92+
.verify_ecdsa(&message, &ecdsa_sig.signature, &pk.inner)
9393
.is_ok()
9494
}));
9595

Diff for: ‎src/descriptor/bare.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ impl<Pk: MiniscriptKey + ToPublicKey> Pkh<Pk> {
273273

274274
/// Obtains the corresponding script pubkey for this descriptor.
275275
pub fn address(&self, network: Network) -> Address {
276-
Address::p2pkh(&self.pk.to_public_key(), network)
276+
Address::p2pkh(self.pk.to_public_key(), network)
277277
}
278278

279279
/// Obtains the underlying miniscript for this descriptor.

Diff for: ‎src/descriptor/key.rs

+8-9
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use core::str::FromStr;
77
use std::error;
88

99
use bitcoin::bip32::{self, XKeyIdentifier};
10-
use bitcoin::hashes::hex::FromHex;
1110
use bitcoin::hashes::{hash160, ripemd160, sha256, Hash, HashEngine};
1211
use bitcoin::key::XOnlyPublicKey;
1312
use bitcoin::secp256k1::{Secp256k1, Signing, Verification};
@@ -1234,17 +1233,17 @@ mod test {
12341233
fn test_wildcard() {
12351234
let public_key = DescriptorPublicKey::from_str("[abcdef00/0'/1']tpubDBrgjcxBxnXyL575sHdkpKohWu5qHKoQ7TJXKNrYznh5fVEGBv89hA8ENW7A8MFVpFUSvgLqc4Nj1WZcpePX6rrxviVtPowvMuGF5rdT2Vi/2").unwrap();
12361235
assert_eq!(public_key.master_fingerprint().to_string(), "abcdef00");
1237-
assert_eq!(public_key.full_derivation_path().unwrap().to_string(), "m/0'/1'/2");
1236+
assert_eq!(public_key.full_derivation_path().unwrap().to_string(), "0'/1'/2");
12381237
assert!(!public_key.has_wildcard());
12391238

12401239
let public_key = DescriptorPublicKey::from_str("[abcdef00/0'/1']tpubDBrgjcxBxnXyL575sHdkpKohWu5qHKoQ7TJXKNrYznh5fVEGBv89hA8ENW7A8MFVpFUSvgLqc4Nj1WZcpePX6rrxviVtPowvMuGF5rdT2Vi/*").unwrap();
12411240
assert_eq!(public_key.master_fingerprint().to_string(), "abcdef00");
1242-
assert_eq!(public_key.full_derivation_path().unwrap().to_string(), "m/0'/1'");
1241+
assert_eq!(public_key.full_derivation_path().unwrap().to_string(), "0'/1'");
12431242
assert!(public_key.has_wildcard());
12441243

12451244
let public_key = DescriptorPublicKey::from_str("[abcdef00/0'/1']tpubDBrgjcxBxnXyL575sHdkpKohWu5qHKoQ7TJXKNrYznh5fVEGBv89hA8ENW7A8MFVpFUSvgLqc4Nj1WZcpePX6rrxviVtPowvMuGF5rdT2Vi/*h").unwrap();
12461245
assert_eq!(public_key.master_fingerprint().to_string(), "abcdef00");
1247-
assert_eq!(public_key.full_derivation_path().unwrap().to_string(), "m/0'/1'");
1246+
assert_eq!(public_key.full_derivation_path().unwrap().to_string(), "0'/1'");
12481247
assert!(public_key.has_wildcard());
12491248
}
12501249

@@ -1256,32 +1255,32 @@ mod test {
12561255
let public_key = secret_key.to_public(&secp).unwrap();
12571256
assert_eq!(public_key.to_string(), "[2cbe2a6d/0'/1']tpubDBrgjcxBxnXyL575sHdkpKohWu5qHKoQ7TJXKNrYznh5fVEGBv89hA8ENW7A8MFVpFUSvgLqc4Nj1WZcpePX6rrxviVtPowvMuGF5rdT2Vi/2");
12581257
assert_eq!(public_key.master_fingerprint().to_string(), "2cbe2a6d");
1259-
assert_eq!(public_key.full_derivation_path().unwrap().to_string(), "m/0'/1'/2");
1258+
assert_eq!(public_key.full_derivation_path().unwrap().to_string(), "0'/1'/2");
12601259
assert!(!public_key.has_wildcard());
12611260

12621261
let secret_key = DescriptorSecretKey::from_str("tprv8ZgxMBicQKsPcwcD4gSnMti126ZiETsuX7qwrtMypr6FBwAP65puFn4v6c3jrN9VwtMRMph6nyT63NrfUL4C3nBzPcduzVSuHD7zbX2JKVc/0'/1'/2'").unwrap();
12631262
let public_key = secret_key.to_public(&secp).unwrap();
12641263
assert_eq!(public_key.to_string(), "[2cbe2a6d/0'/1'/2']tpubDDPuH46rv4dbFtmF6FrEtJEy1CvLZonyBoVxF6xsesHdYDdTBrq2mHhm8AbsPh39sUwL2nZyxd6vo4uWNTU9v4t893CwxjqPnwMoUACLvMV");
12651264
assert_eq!(public_key.master_fingerprint().to_string(), "2cbe2a6d");
1266-
assert_eq!(public_key.full_derivation_path().unwrap().to_string(), "m/0'/1'/2'");
1265+
assert_eq!(public_key.full_derivation_path().unwrap().to_string(), "0'/1'/2'");
12671266

12681267
let secret_key = DescriptorSecretKey::from_str("tprv8ZgxMBicQKsPcwcD4gSnMti126ZiETsuX7qwrtMypr6FBwAP65puFn4v6c3jrN9VwtMRMph6nyT63NrfUL4C3nBzPcduzVSuHD7zbX2JKVc/0/1/2").unwrap();
12691268
let public_key = secret_key.to_public(&secp).unwrap();
12701269
assert_eq!(public_key.to_string(), "tpubD6NzVbkrYhZ4WQdzxL7NmJN7b85ePo4p6RSj9QQHF7te2RR9iUeVSGgnGkoUsB9LBRosgvNbjRv9bcsJgzgBd7QKuxDm23ZewkTRzNSLEDr/0/1/2");
12711270
assert_eq!(public_key.master_fingerprint().to_string(), "2cbe2a6d");
1272-
assert_eq!(public_key.full_derivation_path().unwrap().to_string(), "m/0/1/2");
1271+
assert_eq!(public_key.full_derivation_path().unwrap().to_string(), "0/1/2");
12731272

12741273
let secret_key = DescriptorSecretKey::from_str("[aabbccdd]tprv8ZgxMBicQKsPcwcD4gSnMti126ZiETsuX7qwrtMypr6FBwAP65puFn4v6c3jrN9VwtMRMph6nyT63NrfUL4C3nBzPcduzVSuHD7zbX2JKVc/0/1/2").unwrap();
12751274
let public_key = secret_key.to_public(&secp).unwrap();
12761275
assert_eq!(public_key.to_string(), "[aabbccdd]tpubD6NzVbkrYhZ4WQdzxL7NmJN7b85ePo4p6RSj9QQHF7te2RR9iUeVSGgnGkoUsB9LBRosgvNbjRv9bcsJgzgBd7QKuxDm23ZewkTRzNSLEDr/0/1/2");
12771276
assert_eq!(public_key.master_fingerprint().to_string(), "aabbccdd");
1278-
assert_eq!(public_key.full_derivation_path().unwrap().to_string(), "m/0/1/2");
1277+
assert_eq!(public_key.full_derivation_path().unwrap().to_string(), "0/1/2");
12791278

12801279
let secret_key = DescriptorSecretKey::from_str("[aabbccdd/90']tprv8ZgxMBicQKsPcwcD4gSnMti126ZiETsuX7qwrtMypr6FBwAP65puFn4v6c3jrN9VwtMRMph6nyT63NrfUL4C3nBzPcduzVSuHD7zbX2JKVc/0'/1'/2").unwrap();
12811280
let public_key = secret_key.to_public(&secp).unwrap();
12821281
assert_eq!(public_key.to_string(), "[aabbccdd/90'/0'/1']tpubDBrgjcxBxnXyL575sHdkpKohWu5qHKoQ7TJXKNrYznh5fVEGBv89hA8ENW7A8MFVpFUSvgLqc4Nj1WZcpePX6rrxviVtPowvMuGF5rdT2Vi/2");
12831282
assert_eq!(public_key.master_fingerprint().to_string(), "aabbccdd");
1284-
assert_eq!(public_key.full_derivation_path().unwrap().to_string(), "m/90'/0'/1'/2");
1283+
assert_eq!(public_key.full_derivation_path().unwrap().to_string(), "90'/0'/1'/2");
12851284
}
12861285

12871286
#[test]

Diff for: ‎src/descriptor/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1267,8 +1267,8 @@ mod tests {
12671267
) -> Option<bitcoin::ecdsa::Signature> {
12681268
if *pk == self.pk {
12691269
Some(bitcoin::ecdsa::Signature {
1270-
sig: self.sig,
1271-
hash_ty: bitcoin::sighash::EcdsaSighashType::All,
1270+
signature: self.sig,
1271+
sighash_type: bitcoin::sighash::EcdsaSighashType::All,
12721272
})
12731273
} else {
12741274
None
@@ -1534,11 +1534,11 @@ mod tests {
15341534

15351535
satisfier.insert(
15361536
a,
1537-
bitcoin::ecdsa::Signature { sig: sig_a, hash_ty: EcdsaSighashType::All },
1537+
bitcoin::ecdsa::Signature { signature: sig_a, sighash_type: EcdsaSighashType::All },
15381538
);
15391539
satisfier.insert(
15401540
b,
1541-
bitcoin::ecdsa::Signature { sig: sig_b, hash_ty: EcdsaSighashType::All },
1541+
bitcoin::ecdsa::Signature { signature: sig_b, sighash_type: EcdsaSighashType::All },
15421542
);
15431543

15441544
satisfier

Diff for: ‎src/descriptor/segwitv0.rs

+11-4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
//! Implementation of Segwit Descriptors. Contains the implementation
66
//! of wsh, wpkh and sortedmulti inside wsh.
77
8+
use core::convert::TryFrom;
89
use core::fmt;
910

1011
use bitcoin::{Address, Network, ScriptBuf, Weight};
@@ -374,15 +375,21 @@ impl<Pk: MiniscriptKey> Wpkh<Pk> {
374375
impl<Pk: MiniscriptKey + ToPublicKey> Wpkh<Pk> {
375376
/// Obtains the corresponding script pubkey for this descriptor.
376377
pub fn script_pubkey(&self) -> ScriptBuf {
377-
let addr = Address::p2wpkh(&self.pk.to_public_key(), Network::Bitcoin)
378+
let pk = self.pk.to_public_key();
379+
let compressed = bitcoin::key::CompressedPublicKey::try_from(pk)
378380
.expect("wpkh descriptors have compressed keys");
381+
382+
let addr = Address::p2wpkh(&compressed, Network::Bitcoin);
379383
addr.script_pubkey()
380384
}
381385

382386
/// Obtains the corresponding script pubkey for this descriptor.
383387
pub fn address(&self, network: Network) -> Address {
384-
Address::p2wpkh(&self.pk.to_public_key(), network)
385-
.expect("Rust Miniscript types don't allow uncompressed pks in segwit descriptors")
388+
let pk = self.pk.to_public_key();
389+
let compressed = bitcoin::key::CompressedPublicKey::try_from(pk)
390+
.expect("Rust Miniscript types don't allow uncompressed pks in segwit descriptors");
391+
392+
Address::p2wpkh(&compressed, network)
386393
}
387394

388395
/// Obtains the underlying miniscript for this descriptor.
@@ -394,7 +401,7 @@ impl<Pk: MiniscriptKey + ToPublicKey> Wpkh<Pk> {
394401
// the previous txo's scriptPubKey.
395402
// The item 5:
396403
// - For P2WPKH witness program, the scriptCode is `0x1976a914{20-byte-pubkey-hash}88ac`.
397-
let addr = Address::p2pkh(&self.pk.to_public_key(), Network::Bitcoin);
404+
let addr = Address::p2pkh(self.pk.to_public_key(), Network::Bitcoin);
398405
addr.script_pubkey()
399406
}
400407

Diff for: ‎src/interpreter/error.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ pub enum Error {
9595
/// Schnorr Signature error
9696
SchnorrSig(bitcoin::taproot::SigFromSliceError),
9797
/// Errors in signature hash calculations
98-
SighashError(bitcoin::sighash::Error),
98+
SighashError(bitcoin::sighash::InvalidSighashTypeError),
9999
/// Taproot Annex Unsupported
100100
TapAnnexUnsupported,
101101
/// An uncompressed public key was encountered in a context where it is
@@ -242,8 +242,8 @@ impl From<secp256k1::Error> for Error {
242242
}
243243

244244
#[doc(hidden)]
245-
impl From<bitcoin::sighash::Error> for Error {
246-
fn from(e: bitcoin::sighash::Error) -> Error { Error::SighashError(e) }
245+
impl From<bitcoin::sighash::InvalidSighashTypeError> for Error {
246+
fn from(e: bitcoin::sighash::InvalidSighashTypeError) -> Error { Error::SighashError(e) }
247247
}
248248

249249
#[doc(hidden)]

0 commit comments

Comments
 (0)