mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-20 10:39:49 +01:00
Code Issues Projects Releases Wiki Activity

peer: fix steal (penalty tx) generation code.

Browse Source 
In particular, we got a segv because we were measuring the wrong
wscript, then we miswired the inputs.  It only worked because our
current steal tests don't have a to_us_idx output.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2016-11-10 23:28:35 +10:30
parent b26afcb3df
commit e7e7345596
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
daemon/peer.c
View File

@ -4046,7 +4046,7 @@ static void resolve_their_steal(struct peer *peer,
steal_tx->input[n].amount = tal_dup(steal_tx, u64,
&tx->output[i].amount);
/* Track witness size, for fee. */
wsize += tal_count(peer->onchain.wscripts[n]);
wsize += tal_count(peer->onchain.wscripts[i]);
input_total += tx->output[i].amount;
n++;
}
@ -4072,22 +4072,29 @@ static void resolve_their_steal(struct peer *peer,
steal_tx->output[0].script_length = tal_count(steal_tx->output[0].script);
/* Now, we can sign them all (they're all of same form). */
for (i = 0; i < n; i++) {
n = 0;
for (i = 0; i < tx->output_count; i++) {
struct bitcoin_signature sig;
/* Don't bother stealing the output already to us. */
if (i == peer->onchain.to_us_idx)
continue;
sig.stype = SIGHASH_ALL;
peer_sign_steal_input(peer, steal_tx, i,
peer_sign_steal_input(peer, steal_tx, n,
peer->onchain.wscripts[i],
&sig.sig);
steal_tx->input[i].witness
steal_tx->input[n].witness
= bitcoin_witness_secret(steal_tx,
peer->dstate->secpctx,
revocation_preimage,
sizeof(*revocation_preimage),
&sig,
peer->onchain.wscripts[i]);
n++;
}
assert(n == steal_tx->input_count);
broadcast_tx(peer, steal_tx, NULL);
}