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

Fix internal weight calculation 

This function calls helper function predict_weight_internal and that
function was refactored.  The refactor changed the interface to accept
the input_weight instead of partial input_weight, however this function
was not updated with the refactor and was still passing a partial input
weight.  This commit is a followup that fixes the internal calculation
error by pass input_weight instead of partial_weight to the helper
function predict_weight_internal.
This commit is contained in:
yancy 2024-11-26 14:29:38 -06:00
parent cefcce5bbf
commit 3352032892
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -920,14 +920,14 @@ pub const fn predict_weight_from_slices(
inputs: &[InputWeightPrediction], inputs: &[InputWeightPrediction],
output_script_lens: &[usize], output_script_lens: &[usize],
) -> Weight { ) -> Weight {
let mut partial_input_weight = 0; let mut input_weight = 0;
let mut inputs_with_witnesses = 0; let mut inputs_with_witnesses = 0;
// for loops not supported in const fn // for loops not supported in const fn
let mut i = 0; let mut i = 0;
while i < inputs.len() { while i < inputs.len() {
let prediction = inputs[i]; let prediction = inputs[i];
partial_input_weight += prediction.witness_weight().to_wu() as usize; input_weight += prediction.total_weight().to_wu() as usize;
inputs_with_witnesses += (prediction.witness_size > 0) as usize; inputs_with_witnesses += (prediction.witness_size > 0) as usize;
i += 1; i += 1;
} }
@ -943,7 +943,7 @@ pub const fn predict_weight_from_slices(
predict_weight_internal( predict_weight_internal(
inputs.len(), inputs.len(),
partial_input_weight, input_weight,
inputs_with_witnesses, inputs_with_witnesses,
output_script_lens.len(), output_script_lens.len(),
output_scripts_size, output_scripts_size,