aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 15:14:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

psbt: add transaction inputs to the psbt struct

Browse Source 
Make sure that we permute them also!

Fixes weird spacing also
This commit is contained in:
niftynei
2020-05-21 11:27:00 +09:30
committed by Rusty Russell
parent a1e1073752
commit cf9de86dba
4 changed files with 42 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
common/permute_tx.c
View File

@@ -36,24 +36,37 @@ static size_t find_best_in(struct wally_tx_input *inputs, size_t num)
}
static void swap_wally_inputs(struct wally_tx_input *inputs,
const void **map,
size_t i1, size_t i2)
struct wally_tx_input *psbt_global_ins,
struct wally_psbt_input *psbt_ins,
const void **map,
size_t i1, size_t i2)
{
struct wally_tx_input tmpinput;
const void *tmp;
struct wally_tx_input tmpinput;
struct wally_psbt_input tmppsbtin;
const void *tmp;
if (i1 == i2)
return;
if (i1 == i2)
return;
tmpinput = inputs[i1];
inputs[i1] = inputs[i2];
inputs[i2] = tmpinput;
tmpinput = inputs[i1];
inputs[i1] = inputs[i2];
inputs[i2] = tmpinput;
if (map) {
tmp = map[i1];
map[i1] = map[i2];
map[i2] = tmp;
}
/* For the PSBT, we swap the psbt inputs and
* the global tx's inputs */
tmpinput = psbt_global_ins[i1];
psbt_global_ins[i1] = psbt_global_ins[i2];
psbt_global_ins[i2] = tmpinput;
tmppsbtin = psbt_ins[i1];
psbt_ins[i1] = psbt_ins[i2];
psbt_ins[i2] = tmppsbtin;
if (map) {
tmp = map[i1];
map[i1] = map[i2];
map[i2] = tmp;
}
}
static void swap_input_amounts(struct amount_sat **amounts, size_t i1,
@@ -78,7 +91,10 @@ void permute_inputs(struct bitcoin_tx *tx, const void **map)
for (i = 0; i < num_inputs-1; i++) {
best_pos = i + find_best_in(inputs + i, num_inputs - i);
/* Swap best into first place. */
swap_wally_inputs(tx->wtx->inputs, map, i, best_pos);
swap_wally_inputs(tx->wtx->inputs,
tx->psbt->tx->inputs,
tx->psbt->inputs,
map, i, best_pos);
swap_input_amounts(tx->input_amounts, i, best_pos);
}
}