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

Merge pull request #401 from dpc/sighhash_u32 

Improve `sighash_u32` handling
This commit is contained in:
Steven Roose 2020-12-07 11:37:26 +00:00 committed by GitHub
parent b4c8e12f36 cf2c12a816
commit 02c3d8fca5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/blockdata/transaction.rs
View File

@ -307,22 +307,27 @@ impl Transaction {
/// through an ECDSA signer, the SigHashType appended to the resulting sig, and a script /// through an ECDSA signer, the SigHashType appended to the resulting sig, and a script
/// written around this, but this is the general (and hard) part. /// written around this, but this is the general (and hard) part.
/// ///
/// The `sighash_type` supports arbitrary `u32` value, instead of just [`SigHashType`],
/// because internally 4 bytes are being hashed, even though only lowest byte
/// is appended to signature in a transaction.
///
/// *Warning* This does NOT attempt to support OP_CODESEPARATOR. In general this would require /// *Warning* This does NOT attempt to support OP_CODESEPARATOR. In general this would require
/// evaluating `script_pubkey` to determine which separators get evaluated and which don't, /// evaluating `script_pubkey` to determine which separators get evaluated and which don't,
/// which we don't have the information to determine. /// which we don't have the information to determine.
/// ///
/// # Panics Panics if `input_index` is greater than or equal to `self.input.len()` /// # Panics Panics if `input_index` is greater than or equal to `self.input.len()`
/// ///
pub fn encode_signing_data_to<Write: io::Write>( pub fn encode_signing_data_to<Write: io::Write, U: Into<u32>>(
&self, &self,
mut writer: Write, mut writer: Write,
input_index: usize, input_index: usize,
script_pubkey: &Script, script_pubkey: &Script,
sighash_u32: u32 sighash_type: U,
) -> Result<(), encode::Error> { ) -> Result<(), encode::Error> {
let sighash_type : u32 = sighash_type.into();
assert!(input_index < self.input.len()); // Panic on OOB assert!(input_index < self.input.len()); // Panic on OOB
let (sighash, anyone_can_pay) = SigHashType::from_u32(sighash_u32).split_anyonecanpay_flag(); let (sighash, anyone_can_pay) = SigHashType::from_u32(sighash_type).split_anyonecanpay_flag();
// Special-case sighash_single bug because this is easy enough. // Special-case sighash_single bug because this is easy enough.
if sighash == SigHashType::Single && input_index >= self.output.len() { if sighash == SigHashType::Single && input_index >= self.output.len() {
@ -374,7 +379,7 @@ impl Transaction {
}; };
// hash the result // hash the result
tx.consensus_encode(&mut writer)?; tx.consensus_encode(&mut writer)?;
let sighash_arr = endian::u32_to_array_le(sighash_u32); let sighash_arr = endian::u32_to_array_le(sighash_type);
sighash_arr.consensus_encode(&mut writer)?; sighash_arr.consensus_encode(&mut writer)?;
Ok(()) Ok(())
} }
@ -681,6 +686,11 @@ impl SigHashType {
pub fn as_u32(self) -> u32 { self as u32 } pub fn as_u32(self) -> u32 { self as u32 }
} }
impl From<SigHashType> for u32 {
fn from(t: SigHashType) -> u32 {
t.as_u32()
}
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {