mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-17 19:03:42 +01:00
Code Issues Projects Releases Wiki Activity

permute_tx: fix map logic (again!)

Browse Source 
8a4246cb36 (permute: use BIP69 order) removed the invert_map change
from a25ba452f3 (permute_tx: fix horrible thinko.) but it's still
needed.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2016-05-02 15:57:56 +09:30
parent 4fe90ee3f5
commit 7bfbee136e
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
permute_tx.c
View File

@ -13,6 +13,21 @@ static void init_map(size_t *map, size_t len)
map[i] = i;
}
/* This map says where things ended up, eg. 0 might be in slot 3. we
* want to change it so map[0] = 3. */
static void invert_map(size_t *map, size_t len)
{
if (map) {
size_t i, newmap[len];
memset(newmap, 0, sizeof(newmap));
for (i = 0; i < len; i++) {
newmap[map[i]] = i;
}
memcpy(map, newmap, sizeof(newmap));
}
}
static bool input_better(const struct bitcoin_tx_input *a,
const struct bitcoin_tx_input *b)
{
@ -75,6 +90,8 @@ void permute_inputs(struct bitcoin_tx_input *inputs,
swap_inputs(inputs, map,
i, i + find_best_in(inputs + i, num_inputs - i));
}
invert_map(map, num_inputs);
}
static void swap_outputs(struct bitcoin_tx_output *outputs, size_t *map,
@ -141,4 +158,6 @@ void permute_outputs(struct bitcoin_tx_output *outputs,
swap_outputs(outputs, map,
i, i + find_best_out(outputs + i, num_outputs - i));
}
invert_map(map, num_outputs);
}