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

Use Amount for verify_with_flags

This commit is contained in:
Riccardo Casatta 2021-05-01 10:22:35 +02:00
parent d1f4c0a5c8
commit 69117a1f63
No known key found for this signature in database
GPG Key ID: FD986A969E450397
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/blockdata/script.rs
View File

@ -451,7 +451,7 @@ impl Script {
#[cfg(feature="bitcoinconsensus")] #[cfg(feature="bitcoinconsensus")]
/// Shorthand for [Self::verify_with_flags] with flag [bitcoinconsensus::VERIFY_ALL] /// Shorthand for [Self::verify_with_flags] with flag [bitcoinconsensus::VERIFY_ALL]
pub fn verify (&self, index: usize, amount: u64, spending: &[u8]) -> Result<(), Error> { pub fn verify (&self, index: usize, amount: u64, spending: &[u8]) -> Result<(), Error> {
self.verify_with_flags(index, amount, spending, ::bitcoinconsensus::VERIFY_ALL) self.verify_with_flags(index, ::Amount::from_sat(amount), spending, ::bitcoinconsensus::VERIFY_ALL)
} }
#[cfg(feature="bitcoinconsensus")] #[cfg(feature="bitcoinconsensus")]
@ -461,8 +461,8 @@ impl Script {
/// * `amount` - the amount this script guards /// * `amount` - the amount this script guards
/// * `spending` - the transaction that attempts to spend the output holding this script /// * `spending` - the transaction that attempts to spend the output holding this script
/// * `flags` - verification flags, see [bitcoinconsensus::VERIFY_ALL] and similar /// * `flags` - verification flags, see [bitcoinconsensus::VERIFY_ALL] and similar
pub fn verify_with_flags<F: Into<u32>>(&self, index: usize, amount: u64, spending: &[u8], flags: F) -> Result<(), Error> { pub fn verify_with_flags<F: Into<u32>>(&self, index: usize, amount: ::Amount, spending: &[u8], flags: F) -> Result<(), Error> {
Ok(bitcoinconsensus::verify_with_flags (&self.0[..], amount, spending, index, flags.into())?) Ok(bitcoinconsensus::verify_with_flags (&self.0[..], amount.as_sat(), spending, index, flags.into())?)
} }
/// Write the assembly decoding of the script bytes to the formatter. /// Write the assembly decoding of the script bytes to the formatter.

2
src/blockdata/transaction.rs
View File

@ -478,7 +478,7 @@ impl Transaction {
let flags: u32 = flags.into(); let flags: u32 = flags.into();
for (idx, input) in self.input.iter().enumerate() { for (idx, input) in self.input.iter().enumerate() {
if let Some(output) = spent(&input.previous_output) { if let Some(output) = spent(&input.previous_output) {
output.script_pubkey.verify_with_flags(idx, output.value, tx.as_slice(), flags)?; output.script_pubkey.verify_with_flags(idx, ::Amount::from_sat(output.value), tx.as_slice(), flags)?;
} else { } else {
return Err(script::Error::UnknownSpentOutput(input.previous_output.clone())); return Err(script::Error::UnknownSpentOutput(input.previous_output.clone()));
} }