Skip to content

Commit 65a8ea8

Browse files
sanket1729sanket1729
committed
Merge #359: Release 7.0.0
271191b Release 7.0.0 (Dr Maxim Orlovsky) Pull request description: Rename SigHash* into Sighash accross the repo Reproducible with automatic case-sensetive search/replace Make taproot leaf script depth to be u8 everywhere I have changed the release notes title from 7.0.0-rc.2 to 7.0.0. ACKs for top commit: apoelstra: ACK 271191b Tree-SHA512: c77bddaef4ac0862be9920c1d65a6abf2e67226b3b18ce9f873ddfa33d2889427fb05f29cf31174b00fe2849ee84ddb006f8e8632b3ba4497abaf42e66d1fe75
2 parents 19f4e06 + 271191b commit 65a8ea8

File tree

13 files changed

+92
-90
lines changed

13 files changed

+92
-90
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
# 7.0.0-rc.1 - March 14, 2022
1+
# 7.0.0 - April 20, 2022
22

3+
- Fixed miniscript type system bug. This is a security vulnerability and users are strongly encouraged to upgrade.
4+
See this (link)[https://github.com/rust-bitcoin/rust-miniscript/pull/349/commits/db97c39afa4053c2c3917f04392f6e24964b3972] for details.
35
- Support for `tr` descriptors with miniscript leaves and multi_a fragment
46
- Changes to MiniscriptKey and ToPublicKey traits for x-only keys support
57
- Add `PsbtExt` trait for psbt operations
@@ -15,7 +17,7 @@
1517
- Overhaul the interpreter API to provide simpler APIs `iter(prevouts)` and `iter_assume_sig()`
1618
so that it no longer takes a closure input.
1719
- Add interpreter support for taproot transactions.
18-
- Works with rust-bitcoin 0.28.0-rc.1
20+
- Works with rust-bitcoin 0.28.0
1921
# 6.0.1 - Aug 5, 2021
2022

2123
- The `lift` method on a Miniscript node was fixed. It would previously mix up

‎Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "miniscript"
3-
version = "7.0.0-rc.2"
3+
version = "7.0.0"
44
authors = ["Andrew Poelstra <[email protected]>, Sanket Kanjalkar <[email protected]>"]
55
repository = "https://github.com/apoelstra/miniscript"
66
description = "Miniscript: a subset of Bitcoin Script designed for analysis"
@@ -15,7 +15,7 @@ use-serde = ["bitcoin/use-serde", "serde"]
1515
rand = ["bitcoin/rand"]
1616

1717
[dependencies]
18-
bitcoin = "0.28.0-rc.2"
18+
bitcoin = "0.28.0"
1919

2020
[dependencies.serde]
2121
version = "1.0"

‎examples/sign_multisig.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ fn main() {
7272
531d75c136272f127a5dc14acc0722301cbddc222262934151f140da345af177",
7373
)
7474
.unwrap(),
75-
hash_ty: bitcoin::EcdsaSigHashType::All,
75+
hash_ty: bitcoin::EcdsaSighashType::All,
7676
};
7777

7878
let descriptor_str = format!(

‎examples/verify_tx.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ fn main() {
167167

168168
let iter = interpreter.iter_custom(Box::new(|key_sig: &KeySigPair| {
169169
let (pk, ecdsa_sig) = key_sig.as_ecdsa().expect("Ecdsa Sig");
170-
ecdsa_sig.hash_ty == bitcoin::EcdsaSigHashType::All
170+
ecdsa_sig.hash_ty == bitcoin::EcdsaSighashType::All
171171
&& secp
172172
.verify_ecdsa(&message, &ecdsa_sig.sig, &pk.inner)
173173
.is_ok()

‎integration_test/src/test_cpp.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ pub fn test_from_cpp_ms(cl: &Client, testdata: &TestData) {
172172
.collect();
173173
// Get the required sighash message
174174
let amt = btc(1).as_sat();
175-
let mut sighash_cache = bitcoin::util::sighash::SigHashCache::new(&psbts[i].unsigned_tx);
176-
let sighash_ty = bitcoin::EcdsaSigHashType::All;
175+
let mut sighash_cache = bitcoin::util::sighash::SighashCache::new(&psbts[i].unsigned_tx);
176+
let sighash_ty = bitcoin::EcdsaSighashType::All;
177177
let sighash = sighash_cache
178178
.segwit_signature_hash(0, &ms.encode(), amt, sighash_ty)
179179
.unwrap();

‎integration_test/src/test_desc.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use bitcoin::blockdata::witness::Witness;
88
use bitcoin::secp256k1;
99
use bitcoin::util::psbt::PartiallySignedTransaction as Psbt;
10-
use bitcoin::util::sighash::SigHashCache;
10+
use bitcoin::util::sighash::SighashCache;
1111
use bitcoin::util::taproot::{LeafVersion, TapLeafHash};
1212
use bitcoin::util::{psbt, sighash};
1313
use bitcoin::{self, Amount, OutPoint, SchnorrSig, Script, Transaction, TxIn, TxOut, Txid};
@@ -119,11 +119,11 @@ pub fn test_desc_satisfy(cl: &Client, testdata: &TestData, desc: &str) -> Witnes
119119
// AKA the signer role of psbt
120120
// Get all the pubkeys and the corresponding secret keys
121121

122-
let mut sighash_cache = SigHashCache::new(&psbt.unsigned_tx);
122+
let mut sighash_cache = SighashCache::new(&psbt.unsigned_tx);
123123
match derived_desc {
124124
Descriptor::Tr(ref tr) => {
125125
// Fixme: take a parameter
126-
let hash_ty = sighash::SchnorrSigHashType::Default;
126+
let hash_ty = sighash::SchnorrSighashType::Default;
127127

128128
let internal_key_present = x_only_pks
129129
.iter()
@@ -226,7 +226,7 @@ pub fn test_desc_satisfy(cl: &Client, testdata: &TestData, desc: &str) -> Witnes
226226
.to_secp_msg();
227227

228228
// Fixme: Take a parameter
229-
let hash_ty = bitcoin::EcdsaSigHashType::All;
229+
let hash_ty = bitcoin::EcdsaSighashType::All;
230230

231231
// Finally construct the signature and add to psbt
232232
for sk in sks_reqd {

‎src/descriptor/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,7 @@ mod tests {
833833
use bitcoin::hashes::hex::{FromHex, ToHex};
834834
use bitcoin::hashes::{hash160, sha256};
835835
use bitcoin::util::bip32;
836-
use bitcoin::{self, secp256k1, EcdsaSigHashType, PublicKey};
836+
use bitcoin::{self, secp256k1, EcdsaSighashType, PublicKey};
837837
use descriptor::key::Wildcard;
838838
use descriptor::{
839839
DescriptorPublicKey, DescriptorSecretKey, DescriptorSinglePub, DescriptorXKey,
@@ -1128,7 +1128,7 @@ mod tests {
11281128
if *pk == self.pk {
11291129
Some(bitcoin::EcdsaSig {
11301130
sig: self.sig,
1131-
hash_ty: bitcoin::EcdsaSigHashType::All,
1131+
hash_ty: bitcoin::EcdsaSighashType::All,
11321132
})
11331133
} else {
11341134
None
@@ -1397,14 +1397,14 @@ mod tests {
13971397
a,
13981398
bitcoin::EcdsaSig {
13991399
sig: sig_a,
1400-
hash_ty: EcdsaSigHashType::All,
1400+
hash_ty: EcdsaSighashType::All,
14011401
},
14021402
);
14031403
satisfier.insert(
14041404
b,
14051405
bitcoin::EcdsaSig {
14061406
sig: sig_b,
1407-
hash_ty: EcdsaSigHashType::All,
1407+
hash_ty: EcdsaSighashType::All,
14081408
},
14091409
);
14101410

‎src/descriptor/tr.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -313,14 +313,14 @@ pub struct TapTreeIter<'a, Pk: MiniscriptKey>
313313
where
314314
Pk: 'a,
315315
{
316-
stack: Vec<(usize, &'a TapTree<Pk>)>,
316+
stack: Vec<(u8, &'a TapTree<Pk>)>,
317317
}
318318

319319
impl<'a, Pk> Iterator for TapTreeIter<'a, Pk>
320320
where
321321
Pk: MiniscriptKey + 'a,
322322
{
323-
type Item = (usize, &'a Miniscript<Pk, Tap>);
323+
type Item = (u8, &'a Miniscript<Pk, Tap>);
324324

325325
fn next(&mut self) -> Option<Self::Item> {
326326
while !self.stack.is_empty() {
@@ -681,8 +681,8 @@ impl<P: MiniscriptKey, Q: MiniscriptKey> TranslatePk<P, Q> for Tr<P> {
681681
}
682682

683683
// Helper function to compute the len of control block at a given depth
684-
fn control_block_len(depth: usize) -> usize {
685-
TAPROOT_CONTROL_BASE_SIZE + depth * TAPROOT_CONTROL_NODE_SIZE
684+
fn control_block_len(depth: u8) -> usize {
685+
TAPROOT_CONTROL_BASE_SIZE + (depth as usize) * TAPROOT_CONTROL_NODE_SIZE
686686
}
687687

688688
// Helper function to get a script spend satisfaction

‎src/interpreter/error.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ pub enum Error {
5252
/// MultiSig missing at least `1` witness elements out of `k + 1` required
5353
InsufficientSignaturesMultiSig,
5454
/// Invalid Sighash type
55-
InvalidSchnorrSigHashType(Vec<u8>),
55+
InvalidSchnorrSighashType(Vec<u8>),
5656
/// ecdsa Signature failed to verify
5757
InvalidEcdsaSignature(bitcoin::PublicKey),
5858
/// Signature failed to verify
5959
InvalidSchnorrSignature(bitcoin::XOnlyPublicKey),
6060
/// Last byte of this signature isn't a standard sighash type
61-
NonStandardSigHash(Vec<u8>),
61+
NonStandardSighash(Vec<u8>),
6262
/// Miniscript error
6363
Miniscript(::Error),
6464
/// MultiSig requires 1 extra zero element apart from the `k` signatures
@@ -212,7 +212,7 @@ impl fmt::Display for Error {
212212
}
213213
Error::IncorrectWScriptHash => f.write_str("witness script did not match scriptpubkey"),
214214
Error::InsufficientSignaturesMultiSig => f.write_str("Insufficient signatures for CMS"),
215-
Error::InvalidSchnorrSigHashType(ref sig) => {
215+
Error::InvalidSchnorrSighashType(ref sig) => {
216216
write!(
217217
f,
218218
"Invalid sighash type for schnorr signature '{}'",
@@ -221,7 +221,7 @@ impl fmt::Display for Error {
221221
}
222222
Error::InvalidEcdsaSignature(pk) => write!(f, "bad ecdsa signature with pk {}", pk),
223223
Error::InvalidSchnorrSignature(pk) => write!(f, "bad schnorr signature with pk {}", pk),
224-
Error::NonStandardSigHash(ref sig) => {
224+
Error::NonStandardSighash(ref sig) => {
225225
write!(
226226
f,
227227
"Non standard sighash type for signature '{}'",

‎src/interpreter/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ impl<'txin> Interpreter<'txin> {
248248
sighash::Prevouts::All(prevouts) => prevouts.get(input_index),
249249
}
250250
}
251-
let mut cache = bitcoin::util::sighash::SigHashCache::new(tx);
251+
let mut cache = bitcoin::util::sighash::SighashCache::new(tx);
252252
match sig {
253253
KeySigPair::Ecdsa(key, ecdsa_sig) => {
254254
let script_pubkey = self.script_code.as_ref().expect("Legacy have script code");
@@ -1076,7 +1076,7 @@ mod tests {
10761076
let sig = secp.sign_ecdsa(&msg, &sk);
10771077
ecdsa_sigs.push(bitcoin::EcdsaSig {
10781078
sig,
1079-
hash_ty: bitcoin::EcdsaSigHashType::All,
1079+
hash_ty: bitcoin::EcdsaSighashType::All,
10801080
});
10811081
let mut sigser = sig.serialize_der().to_vec();
10821082
sigser.push(0x01); // sighash_all
@@ -1088,7 +1088,7 @@ mod tests {
10881088
let schnorr_sig = secp.sign_schnorr_with_aux_rand(&msg, &keypair, &[0u8; 32]);
10891089
let schnorr_sig = bitcoin::SchnorrSig {
10901090
sig: schnorr_sig,
1091-
hash_ty: bitcoin::SchnorrSigHashType::Default,
1091+
hash_ty: bitcoin::SchnorrSighashType::Default,
10921092
};
10931093
ser_schnorr_sigs.push(schnorr_sig.to_vec());
10941094
schnorr_sigs.push(schnorr_sig);

‎src/miniscript/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1061,7 +1061,7 @@ mod tests {
10611061
) -> Option<bitcoin::SchnorrSig> {
10621062
Some(bitcoin::SchnorrSig {
10631063
sig: self.0,
1064-
hash_ty: bitcoin::SchnorrSigHashType::Default,
1064+
hash_ty: bitcoin::SchnorrSighashType::Default,
10651065
})
10661066
}
10671067
}

‎src/policy/compiler.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1367,7 +1367,7 @@ mod tests {
13671367

13681368
let bitcoinsig = bitcoin::EcdsaSig {
13691369
sig,
1370-
hash_ty: bitcoin::EcdsaSigHashType::All,
1370+
hash_ty: bitcoin::EcdsaSighashType::All,
13711371
};
13721372
let sigvec = bitcoinsig.to_vec();
13731373

0 commit comments

Comments
 (0)