Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[wallet] Default to SIGHASH_ALL if not specified #135

Merged
merged 1 commit into from
Oct 16, 2020
Merged

[wallet] Default to SIGHASH_ALL if not specified #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/wallet/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ use std::sync::Arc;
use bitcoin::consensus::encode::serialize;
use bitcoin::util::bip32::ChildNumber;
use bitcoin::util::psbt::PartiallySignedTransaction as PSBT;
use bitcoin::{Address, Network, OutPoint, Script, SigHashType, Transaction, TxOut, Txid};
use bitcoin::{Address, Network, OutPoint, Script, Transaction, TxOut, Txid};

use miniscript::psbt::PsbtInputSatisfier;

Expand Down Expand Up @@ -1025,8 +1025,11 @@ where
None => continue,
};

// Add sighash, default is obviously "ALL"
psbt_input.sighash_type = builder.sighash.or(Some(SigHashType::All));
// Only set it if the builder has a custom one, otherwise leave blank which defaults to
// SIGHASH_ALL
if let Some(sighash_type) = builder.sighash {
psbt_input.sighash_type = Some(sighash_type);
}

// Try to find the prev_script in our db to figure out if this is internal or external,
// and the derivation index
Expand Down Expand Up @@ -1742,7 +1745,7 @@ mod test {
)]))
.unwrap();

assert_eq!(psbt.inputs[0].sighash_type, Some(bitcoin::SigHashType::All));
assert_eq!(psbt.inputs[0].sighash_type, None);
}

#[test]
Expand Down
6 changes: 2 additions & 4 deletions src/wallet/signer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,6 @@ pub enum SignerError {
InvalidKey,
/// The user canceled the operation
UserCanceled,
/// The sighash is missing in the PSBT input
MissingSighash,
/// Input index is out of range
InputIndexOutOfRange,
/// The `non_witness_utxo` field of the transaction is required to sign this input
Expand Down Expand Up @@ -432,7 +430,7 @@ impl ComputeSighash for Legacy {
let psbt_input = &psbt.inputs[input_index];
let tx_input = &psbt.global.unsigned_tx.input[input_index];

let sighash = psbt_input.sighash_type.ok_or(SignerError::MissingSighash)?;
let sighash = psbt_input.sighash_type.unwrap_or(SigHashType::All);
let script = match psbt_input.redeem_script {
Some(ref redeem_script) => redeem_script.clone(),
None => {
Expand Down Expand Up @@ -479,7 +477,7 @@ impl ComputeSighash for Segwitv0 {

let psbt_input = &psbt.inputs[input_index];

let sighash = psbt_input.sighash_type.ok_or(SignerError::MissingSighash)?;
let sighash = psbt_input.sighash_type.unwrap_or(SigHashType::All);

let witness_utxo = psbt_input
.witness_utxo
Expand Down