aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-07 08:04:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

elements: fix gross weight differential.

Browse Source 
Firstly, we were not adding the extra fee output on our dummy tx,
because the fee amount was 0.  We probably should always do this, even
if it's 0.

Secondly, there are 6 witnesses, not 1, for elements txs.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2022-01-26 12:42:34 +10:30
committed by Christian Decker
parent de28bbd792
commit a55cfab00d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bitcoin/tx.c
View File

@@ -162,7 +162,7 @@ static int elements_tx_add_fee_output(struct bitcoin_tx *tx)
int pos;
/* If we aren't using elements, we don't add explicit fee outputs */
if (!chainparams->is_elements || amount_sat_eq(fee, AMOUNT_SAT(0)))
if (!chainparams->is_elements)
return -1;
/* Try to find any existing fee output */
@@ -462,9 +462,12 @@ size_t bitcoin_tx_weight(const struct bitcoin_tx *tx)
/* If we don't have witnesses *yet*, libwally doesn't encode
* in BIP 141 style, omitting the flag and marker bytes */
wally_tx_get_witness_count(tx->wtx, &num_witnesses);
if (num_witnesses == 0)
extra = 2;
else
if (num_witnesses == 0) {
if (chainparams->is_elements)
extra = 7;
else
extra = 2;
} else
extra = 0;
return extra + wally_tx_weight(tx->wtx);