milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #70 from TheBlueMatt/2018-03-bip143-ref-ergonomics 

Only provide the required TxIn to bip143 sighash_all
This commit is contained in:
Matt Corallo 2018-04-02 13:04:09 -04:00 committed by GitHub
parent 157d0312c4 0e1d927b47
commit bcf57e69df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/util/bip143.rs
View File

@ -20,7 +20,7 @@
//! //!
use blockdata::script::Script; use blockdata::script::Script;
use blockdata::transaction::Transaction; use blockdata::transaction::{Transaction, TxIn};
use network::encodable::ConsensusEncodable; use network::encodable::ConsensusEncodable;
use util::hash::{Sha256dHash, Sha256dEncoder}; use util::hash::{Sha256dHash, Sha256dEncoder};
@ -28,6 +28,8 @@ use util::hash::{Sha256dHash, Sha256dEncoder};
/// sufficient (in conjunction with a private key) to sign the transaction /// sufficient (in conjunction with a private key) to sign the transaction
#[derive(Clone, PartialEq, Eq, Debug)] #[derive(Clone, PartialEq, Eq, Debug)]
pub struct SighashComponents { pub struct SighashComponents {
tx_version: u32,
tx_locktime: u32,
/// Hash of all the previous outputs /// Hash of all the previous outputs
pub hash_prevouts: Sha256dHash, pub hash_prevouts: Sha256dHash,
/// Hash of all the input sequence nos /// Hash of all the input sequence nos
@ -38,7 +40,9 @@ pub struct SighashComponents {
impl SighashComponents { impl SighashComponents {
/// Compute the sighash components from an unsigned transaction and auxiliary /// Compute the sighash components from an unsigned transaction and auxiliary
/// information about its inputs /// information about its inputs.
/// For the generated sighashes to be valid, no fields in the transaction may change except for
/// script_sig and witnesses.
pub fn new(tx: &Transaction) -> SighashComponents { pub fn new(tx: &Transaction) -> SighashComponents {
let hash_prevouts = { let hash_prevouts = {
let mut enc = Sha256dEncoder::new(); let mut enc = Sha256dEncoder::new();
@ -66,6 +70,8 @@ impl SighashComponents {
}; };
SighashComponents { SighashComponents {
tx_version: tx.version,
tx_locktime: tx.lock_time,
hash_prevouts: hash_prevouts, hash_prevouts: hash_prevouts,
hash_sequence: hash_sequence, hash_sequence: hash_sequence,
hash_outputs: hash_outputs, hash_outputs: hash_outputs,
@ -73,25 +79,25 @@ impl SighashComponents {
} }
/// Compute the BIP143 sighash for a `SIGHASH_ALL` signature for the given /// Compute the BIP143 sighash for a `SIGHASH_ALL` signature for the given
/// input index /// input.
pub fn sighash_all(&self, tx: &Transaction, index: usize, witness_script: &Script, value: u64) -> Sha256dHash { pub fn sighash_all(&self, txin: &TxIn, witness_script: &Script, value: u64) -> Sha256dHash {
let mut enc = Sha256dEncoder::new(); let mut enc = Sha256dEncoder::new();
tx.version.consensus_encode(&mut enc).unwrap(); self.tx_version.consensus_encode(&mut enc).unwrap();
self.hash_prevouts.consensus_encode(&mut enc).unwrap(); self.hash_prevouts.consensus_encode(&mut enc).unwrap();
self.hash_sequence.consensus_encode(&mut enc).unwrap(); self.hash_sequence.consensus_encode(&mut enc).unwrap();
tx.input[index] txin
.prev_hash .prev_hash
.consensus_encode(&mut enc) .consensus_encode(&mut enc)
.unwrap(); .unwrap();
tx.input[index] txin
.prev_index .prev_index
.consensus_encode(&mut enc) .consensus_encode(&mut enc)
.unwrap(); .unwrap();
witness_script.consensus_encode(&mut enc).unwrap(); witness_script.consensus_encode(&mut enc).unwrap();
value.consensus_encode(&mut enc).unwrap(); value.consensus_encode(&mut enc).unwrap();
tx.input[index].sequence.consensus_encode(&mut enc).unwrap(); txin.sequence.consensus_encode(&mut enc).unwrap();
self.hash_outputs.consensus_encode(&mut enc).unwrap(); self.hash_outputs.consensus_encode(&mut enc).unwrap();
tx.lock_time.consensus_encode(&mut enc).unwrap(); self.tx_locktime.consensus_encode(&mut enc).unwrap();
1u32.consensus_encode(&mut enc).unwrap(); // hashtype 1u32.consensus_encode(&mut enc).unwrap(); // hashtype
enc.into_hash() enc.into_hash()
} }
@ -130,6 +136,8 @@ mod tests {
assert_eq!( assert_eq!(
comp, comp,
SighashComponents { SighashComponents {
tx_version: 1,
tx_locktime: 0,
hash_prevouts: hex_hash!( hash_prevouts: hex_hash!(
"74afdc312af5183c4198a40ca3c1a275b485496dd3929bca388c4b5e31f7aaa0" "74afdc312af5183c4198a40ca3c1a275b485496dd3929bca388c4b5e31f7aaa0"
), ),
@ -143,7 +151,7 @@ mod tests {
); );
assert_eq!( assert_eq!(
comp.sighash_all(&tx, 0, &witness_script, value), comp.sighash_all(&tx.input[0], &witness_script, value),
hex_hash!("185c0be5263dce5b4bb50a047973c1b6272bfbd0103a89444597dc40b248ee7c") hex_hash!("185c0be5263dce5b4bb50a047973c1b6272bfbd0103a89444597dc40b248ee7c")
); );
} }