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

peer: use commit_tx's newly exposed witness script helpers.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-08-18 14:23:45 +09:30
parent ef77cb8349
commit 0af04b0576
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
daemon/peer.c
View File

@@ -581,14 +581,13 @@ static const struct bitcoin_tx *htlc_fulfill_tx(const struct peer *peer,
htlc = htlc_by_index(ci, i); htlc = htlc_by_index(ci, i);
assert(htlc->r); assert(htlc->r);
wscript = bitcoin_redeem_htlc_recv(peer, wscript = wscript_for_htlc(peer, peer->dstate->secpctx, htlc,
peer->dstate->secpctx, &peer->local.finalkey,
&peer->local.finalkey, &peer->remote.finalkey,
&peer->remote.finalkey, &peer->local.locktime,
&htlc->expiry, &peer->remote.locktime,
&peer->remote.locktime, &ci->revocation_hash,
&ci->revocation_hash, REMOTE);
&htlc->rhash);
tx->input[0].index = ci->map[i]; tx->input[0].index = ci->map[i];
bitcoin_txid(ci->tx, &tx->input[0].txid); bitcoin_txid(ci->tx, &tx->input[0].txid);