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

Change weight to call predict_weight

This commit is contained in:
yancy 2023-06-25 00:24:36 +02:00
parent 12e014e288
commit 80a4d692c4
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bitcoin/src/blockdata/transaction.rs
View File

@ -19,7 +19,6 @@ use hashes::{self, sha256d, Hash};
use internals::write_err; use internals::write_err;
use super::Weight; use super::Weight;
use crate::blockdata::constants::WITNESS_SCALE_FACTOR;
use crate::blockdata::locktime::absolute::{self, Height, Time}; use crate::blockdata::locktime::absolute::{self, Height, Time};
use crate::blockdata::locktime::relative; use crate::blockdata::locktime::relative;
#[cfg(feature = "bitcoinconsensus")] #[cfg(feature = "bitcoinconsensus")]
@ -838,7 +837,14 @@ impl Transaction {
/// and can therefore avoid this ambiguity. /// and can therefore avoid this ambiguity.
#[inline] #[inline]
pub fn weight(&self) -> Weight { pub fn weight(&self) -> Weight {
Weight::from_wu(self.scaled_size(WITNESS_SCALE_FACTOR) as u64) let inputs = self.input.iter().map(|txin| {
InputWeightPrediction::new(
txin.script_sig.len(),
txin.witness.iter().map(|elem| elem.len()),
)
});
let outputs = self.output.iter().map(|txout| txout.script_pubkey.len());
predict_weight(inputs, outputs)
} }
/// Returns the regular byte-wise consensus-serialized size of this transaction. /// Returns the regular byte-wise consensus-serialized size of this transaction.