Skip to content

Commit 4ed7605

Browse files
sanket1729sanket1729
committed
Merge #48: SigHash -> Sighash
f6d0667 rust-elements 0.22.0 -> 0.23.0 (Riccardo Casatta) Pull request description: Draft because requires: * release rust-elements 0.32 ElementsProject/rust-elements#170 * ~~ElementsProject/rust-elements#169 * ~~rust-bitcoin/rust-secp256k1#630 Top commit has no ACKs. Tree-SHA512: 2986d7a32b7c2917343205d8d319ffa91eac7e255e126a27c3cb354485c10d441caaa3e5ce8b4b8b932b5081da5e2f428d912c56a78482d0e8862d0261b379af
2 parents 4fafddc + f6d0667 commit 4ed7605

File tree

19 files changed

+96
-96
lines changed

19 files changed

+96
-96
lines changed

‎Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ base64 = ["bitcoin/base64"]
2020

2121
[dependencies]
2222
bitcoin = "0.30.0"
23-
elements = "0.22.0"
23+
elements = "0.23.0"
2424
bitcoin-miniscript = { package = "miniscript", version = "10.0" }
25-
simplicity = { git = "https://github.com/BlockstreamResearch/rust-simplicity", rev = "8ed4d4e0caf550148f1e17784af7665bad74b384" }
25+
simplicity = { git = "https://github.com/BlockstreamResearch/rust-simplicity", rev = "d5c0d65320816bfdf36411feed4bdff0708b5b12" }
2626

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

‎bitcoind-tests/tests/test_arith.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//!
55
66
use elements::pset::PartiallySignedTransaction as Psbt;
7-
use elements::sighash::SigHashCache;
7+
use elements::sighash::SighashCache;
88
use elements::taproot::TapLeafHash;
99
use elements::{
1010
confidential, pset as psbt, secp256k1_zkp as secp256k1, sighash, OutPoint, Script, Sequence,
@@ -97,10 +97,10 @@ pub fn test_desc_satisfy(cl: &ElementsD, testdata: &TestData, desc: &str) -> Vec
9797
// Get all the pubkeys and the corresponding secret keys
9898

9999
let unsigned_tx = &psbt.extract_tx().unwrap();
100-
let mut sighash_cache = SigHashCache::new(unsigned_tx);
100+
let mut sighash_cache = SighashCache::new(unsigned_tx);
101101
match derived_desc {
102102
Descriptor::TrExt(ref tr) => {
103-
let hash_ty = sighash::SchnorrSigHashType::Default;
103+
let hash_ty = sighash::SchnorrSighashType::Default;
104104

105105
let prevouts = [witness_utxo];
106106
let prevouts = sighash::Prevouts::All(&prevouts);

‎bitcoind-tests/tests/test_cpp.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ pub fn test_from_cpp_ms(cl: &ElementsD, testdata: &TestData) {
142142
// Get the required sighash message
143143
let amt = confidential::Value::Explicit(100_000_000);
144144
let unsigned_tx = psbts[i].extract_tx().unwrap();
145-
let mut sighash_cache = elements::sighash::SigHashCache::new(&unsigned_tx);
146-
let sighash_ty = elements::EcdsaSigHashType::All;
145+
let mut sighash_cache = elements::sighash::SighashCache::new(&unsigned_tx);
146+
let sighash_ty = elements::EcdsaSighashType::All;
147147
let sighash = sighash_cache.segwitv0_sighash(0, &ms.encode(), amt, sighash_ty);
148148

149149
// requires both signing and verification because we check the tx

‎bitcoind-tests/tests/test_csfs.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//!
55
66
use elements::pset::PartiallySignedTransaction as Psbt;
7-
use elements::sighash::SigHashCache;
7+
use elements::sighash::SighashCache;
88
use elements::taproot::TapLeafHash;
99
use elements::{
1010
confidential, pset as psbt, secp256k1_zkp as secp256k1, sighash, OutPoint, Script, Sequence,
@@ -98,10 +98,10 @@ pub fn test_desc_satisfy(cl: &ElementsD, testdata: &TestData, desc: &str) -> Vec
9898
// Get all the pubkeys and the corresponding secret keys
9999

100100
let unsigned_tx = &psbt.extract_tx().unwrap();
101-
let mut sighash_cache = SigHashCache::new(unsigned_tx);
101+
let mut sighash_cache = SighashCache::new(unsigned_tx);
102102
match derived_desc {
103103
Descriptor::TrExt(ref tr) => {
104-
let hash_ty = sighash::SchnorrSigHashType::Default;
104+
let hash_ty = sighash::SchnorrSighashType::Default;
105105

106106
let prevouts = [witness_utxo];
107107
let prevouts = sighash::Prevouts::All(&prevouts);

‎bitcoind-tests/tests/test_desc.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::{error, fmt};
88

99
use elements::hashes::{sha256d, Hash};
1010
use elements::pset::PartiallySignedTransaction as Psbt;
11-
use elements::sighash::SigHashCache;
11+
use elements::sighash::SighashCache;
1212
use elements::taproot::TapLeafHash;
1313
use elements::{
1414
confidential, pset as psbt, secp256k1_zkp as secp256k1, sighash, OutPoint, SchnorrSig, Script,
@@ -133,11 +133,11 @@ pub fn test_desc_satisfy(
133133
// Get all the pubkeys and the corresponding secret keys
134134

135135
let unsigned_tx = &psbt.extract_tx().unwrap();
136-
let mut sighash_cache = SigHashCache::new(unsigned_tx);
136+
let mut sighash_cache = SighashCache::new(unsigned_tx);
137137
match derived_desc {
138138
Descriptor::Tr(ref tr) => {
139139
// Fixme: take a parameter
140-
let hash_ty = sighash::SchnorrSigHashType::Default;
140+
let hash_ty = sighash::SchnorrSighashType::Default;
141141

142142
let internal_key_present = x_only_pks
143143
.iter()
@@ -251,7 +251,7 @@ pub fn test_desc_satisfy(
251251
.to_secp_msg();
252252

253253
// Fixme: Take a parameter
254-
let hash_ty = elements::EcdsaSigHashType::All;
254+
let hash_ty = elements::EcdsaSighashType::All;
255255

256256
// Finally construct the signature and add to psbt
257257
for sk in sks_reqd {

‎bitcoind-tests/tests/test_introspect.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//!
55
66
use elements::pset::PartiallySignedTransaction as Psbt;
7-
use elements::sighash::SigHashCache;
7+
use elements::sighash::SighashCache;
88
use elements::taproot::TapLeafHash;
99
use elements::{
1010
confidential, pset as psbt, secp256k1_zkp as secp256k1, sighash, OutPoint, Script, Sequence,
@@ -97,10 +97,10 @@ pub fn test_desc_satisfy(cl: &ElementsD, testdata: &TestData, desc: &str) -> Vec
9797
// Get all the pubkeys and the corresponding secret keys
9898

9999
let unsigned_tx = &psbt.extract_tx().unwrap();
100-
let mut sighash_cache = SigHashCache::new(unsigned_tx);
100+
let mut sighash_cache = SighashCache::new(unsigned_tx);
101101
match derived_desc {
102102
Descriptor::TrExt(ref tr) => {
103-
let hash_ty = sighash::SchnorrSigHashType::Default;
103+
let hash_ty = sighash::SchnorrSighashType::Default;
104104

105105
let prevouts = [witness_utxo];
106106
let prevouts = sighash::Prevouts::All(&prevouts);

‎examples/psbt_sign_finalize.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::str::FromStr;
33
use elements::bitcoin::PrivateKey;
44
use elements::encode::{serialize, serialize_hex};
55
use elements::hashes::Hash;
6-
use elements::sighash::SigHashCache;
6+
use elements::sighash::SighashCache;
77
use elements::{confidential, AssetId, LockTime, TxOutWitness};
88
use miniscript::elements::pset::PartiallySignedTransaction as Psbt;
99
use miniscript::elements::{
@@ -135,7 +135,7 @@ fn main() {
135135
psbt.inputs_mut()[0].witness_utxo = Some(witness_utxo);
136136

137137
let tx = &psbt.extract_tx().unwrap();
138-
let mut sighash_cache = SigHashCache::new(tx);
138+
let mut sighash_cache = SighashCache::new(tx);
139139

140140
// genesis hash is not used at all for sighash calculation
141141
let genesis_hash = elements::BlockHash::all_zeros();
@@ -145,7 +145,7 @@ fn main() {
145145
.to_secp_msg();
146146

147147
// Fixme: Take a parameter
148-
let hash_ty = elements::EcdsaSigHashType::All;
148+
let hash_ty = elements::EcdsaSighashType::All;
149149

150150
let sk1 = backup1_private.inner;
151151
let sk2 = backup2_private.inner;

‎examples/sign_multisig.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ fn main() {
7575
531d75c136272f127a5dc14acc0722301cbddc222262934151f140da345af177",
7676
)
7777
.unwrap(),
78-
elements::EcdsaSigHashType::All,
78+
elements::EcdsaSighashType::All,
7979
);
8080

8181
let descriptor_str = format!(

‎examples/verify_tx.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ fn main() {
133133
let iter = interpreter.iter_custom(
134134
Box::new(|key_sig: &KeySigPair| {
135135
let (pk, ecdsa_sig) = key_sig.as_ecdsa().expect("Ecdsa Sig");
136-
ecdsa_sig.1 == elements::EcdsaSigHashType::All
136+
ecdsa_sig.1 == elements::EcdsaSighashType::All
137137
&& secp.verify_ecdsa(&message, &ecdsa_sig.0, &pk.inner).is_ok()
138138
}),
139139
None, // txenv

‎src/descriptor/csfs_cov/mod.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ mod tests {
6464
use elements::secp256k1_zkp::ZERO_TWEAK;
6565
use elements::{
6666
self, confidential, opcodes, script, secp256k1_zkp, AssetId, AssetIssuance,
67-
EcdsaSigHashType, LockTime, OutPoint, Script, Sequence, Transaction, TxIn, TxInWitness,
67+
EcdsaSighashType, LockTime, OutPoint, Script, Sequence, Transaction, TxIn, TxInWitness,
6868
TxOut, Txid,
6969
};
7070

@@ -225,7 +225,7 @@ mod tests {
225225
0,
226226
confidential::Value::Explicit(200_000),
227227
&script_code,
228-
EcdsaSigHashType::All,
228+
EcdsaSighashType::All,
229229
);
230230

231231
// Create a signature to sign the input
@@ -236,7 +236,7 @@ mod tests {
236236
&secp256k1_zkp::Message::from_slice(&sighash_u256[..]).unwrap(),
237237
&cov_sk,
238238
);
239-
let el_sig = (sig, EcdsaSigHashType::All);
239+
let el_sig = (sig, EcdsaSighashType::All);
240240

241241
// For satisfying the Pk part of the covenant
242242
struct SimpleSat {
@@ -284,7 +284,7 @@ mod tests {
284284
assert_eq!(
285285
constraints.last().unwrap(),
286286
&SatisfiedConstraint::PublicKey {
287-
key_sig: interpreter::KeySigPair::Ecdsa(desc.pk, (sig, EcdsaSigHashType::All))
287+
key_sig: interpreter::KeySigPair::Ecdsa(desc.pk, (sig, EcdsaSighashType::All))
288288
}
289289
);
290290
Ok(())
@@ -429,7 +429,7 @@ mod tests {
429429
0,
430430
confidential::Value::Explicit(200_000),
431431
&script_code,
432-
EcdsaSigHashType::All,
432+
EcdsaSighashType::All,
433433
);
434434

435435
// Create a signature to sign the input
@@ -440,7 +440,7 @@ mod tests {
440440
&secp256k1_zkp::Message::from_slice(&sighash_u256[..]).unwrap(),
441441
&sks[0],
442442
);
443-
let sig = (sig, EcdsaSigHashType::All);
443+
let sig = (sig, EcdsaSighashType::All);
444444

445445
// For satisfying the Pk part of the covenant
446446
struct SimpleSat {

0 commit comments

Comments
 (0)