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

daemon: fail any HTLCs which we weren't committed to if we drop to chain.

Browse Source 
There's a corner case where they had it in their commit tx, in which
case we can't fail the HTLC until our commit tx has won.  Again, we
use dstate->config.min_htlc_expiry.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-07-01 11:19:06 +09:30
parent caf50c9ae4
commit 25d99b91bd
1 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
daemon/peer.c
View File

@@ -1842,6 +1842,27 @@ static enum watch_result our_main_output_depth(struct peer *peer,
return DELETE_WATCH; return DELETE_WATCH;
} }
/* Any of our HTLCs we didn't have in our commitment tx, but they did,
* we can't fail until we're sure our commitment tx will win. */
static enum watch_result our_unilateral_depth(struct peer *peer,
unsigned int depth,
const struct sha256_double *txid,
void *unused)
{
size_t i;
if (depth < peer->dstate->config.min_htlc_expiry)
return KEEP_WATCHING;
for (i = 0; i < tal_count(peer->local.commit->acked_changes); i++) {
if (peer->local.commit->acked_changes[i].type != HTLC_ADD)
continue;
our_htlc_failed(peer,
peer->local.commit->acked_changes[i].add.htlc);
}
return DELETE_WATCH;
}
/* BOLT #onchain: /* BOLT #onchain:
* *
* When node A sees its own *commitment tx*: * When node A sees its own *commitment tx*:
@@ -1855,6 +1876,11 @@ static void resolve_our_unilateral(struct peer *peer)
peer->closing_onchain.resolved peer->closing_onchain.resolved
= tal_arrz(tx, const struct bitcoin_tx *, tal_count(ci->map)); = tal_arrz(tx, const struct bitcoin_tx *, tal_count(ci->map));
/* This only works because we always watch for a long time before
* freeing peer, by which time this has resolved. We could create
* resolved[] entries for these uncommitted HTLCs, too. */
watch_tx(tx, peer, tx, our_unilateral_depth, NULL);
/* BOLT #onchain: /* BOLT #onchain:
* *
* 1. _A's main output_: A node SHOULD spend this output to a * 1. _A's main output_: A node SHOULD spend this output to a
@@ -2019,6 +2045,7 @@ static enum watch_result anchor_spent(struct peer *peer,
struct sha256_double txid; struct sha256_double txid;
Pkt *err; Pkt *err;
enum state newstate; enum state newstate;
size_t i;
assert(input_num < tx->input_count); assert(input_num < tx->input_count);
@@ -2032,6 +2059,14 @@ static enum watch_result anchor_spent(struct peer *peer,
peer->closing_onchain.tx = tal_steal(peer, tx); peer->closing_onchain.tx = tal_steal(peer, tx);
bitcoin_txid(tx, &txid); bitcoin_txid(tx, &txid);
/* If we have any HTLCs we're not committed to yet, fail them now. */
for (i = 0; i < tal_count(peer->remote.commit->unacked_changes); i++) {
if (peer->remote.commit->unacked_changes[i].type != HTLC_ADD)
continue;
our_htlc_failed(peer,
peer->remote.commit->unacked_changes[i].add.htlc);
}
peer->closing_onchain.ci = find_commit(peer->remote.commit, &txid); peer->closing_onchain.ci = find_commit(peer->remote.commit, &txid);
if (peer->closing_onchain.ci) { if (peer->closing_onchain.ci) {
if (peer->closing_onchain.ci->revocation_preimage) { if (peer->closing_onchain.ci->revocation_preimage) {