Merge bitcoin#25497: wallet: more accurate target for large transactions

achow101 · achow101 · commit 749b80b29e87 · 2022-06-29T11:48:19.000-04:00
25e4762 wallet: more accurate tx_noinputs_size (S3RK) Pull request description: Rationale: more accurate non-input fee estimation for txs with >=253 inputs ACKs for top commit: laanwj: Concept and code review ACK 25e4762 achow101: ACK 25e4762 furszy: Code review ACK 25e4762. left a small nit. Tree-SHA512: bda8fad725d32ad3e13c007fa56ddb6679ac1a32098ddb08d9a114054acfa681cb66cd703ac675297f731cb381b09067a99a4efa31320140bbdd03f0cfdc81af
diff --git a/src/wallet/spend.cpp b/src/wallet/spend.cpp
@@ -760,7 +760,8 @@ static std::optional<CreatedTransactionResult> CreateTransactionInternal(
 
     // vouts to the payees
     if (!coin_selection_params.m_subtract_fee_outputs) {
-        coin_selection_params.tx_noinputs_size = 11; // Static vsize overhead + outputs vsize. 4 nVersion, 4 nLocktime, 1 input count, 1 output count, 1 witness overhead (dummy, flag, stack size)
+        coin_selection_params.tx_noinputs_size = 10; // Static vsize overhead + outputs vsize. 4 nVersion, 4 nLocktime, 1 input count, 1 witness overhead (dummy, flag, stack size)
+        coin_selection_params.tx_noinputs_size += GetSizeOfCompactSize(vecSend.size()); // bytes for output count
     }
     for (const auto& recipient : vecSend)
     {

Original file line number	Diff line number	Diff line change
`@@ -760,7 +760,8 @@ static std::optional<CreatedTransactionResult> CreateTransactionInternal(`
`760`	`760`
`761`	`761`	`// vouts to the payees`
`762`	`762`	`if (!coin_selection_params.m_subtract_fee_outputs) {`
`763`		`- coin_selection_params.tx_noinputs_size = 11; // Static vsize overhead + outputs vsize. 4 nVersion, 4 nLocktime, 1 input count, 1 output count, 1 witness overhead (dummy, flag, stack size)`
	`763`	`+ coin_selection_params.tx_noinputs_size = 10; // Static vsize overhead + outputs vsize. 4 nVersion, 4 nLocktime, 1 input count, 1 witness overhead (dummy, flag, stack size)`
	`764`	`+ coin_selection_params.tx_noinputs_size += GetSizeOfCompactSize(vecSend.size()); // bytes for output count`
`764`	`765`	`}`
`765`	`766`	`for (const auto& recipient : vecSend)`
`766`	`767`	`{`