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

state: cleanup after anchor has been transmitted.

Browse Source 
If something goes wrong after we've broadcast the anchor tx, we need to use
the commit tx to spend it.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-03-08 10:38:15 +10:30
parent 09358498cd
commit a2f4000d22
4 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
daemon/peer.c
View File

@@ -987,8 +987,7 @@ bool committed_to_htlcs(const struct peer *peer)
} }
/* Create a bitcoin close tx. */ /* Create a bitcoin close tx. */
const struct bitcoin_tx *bitcoin_close(const tal_t *ctx, const struct bitcoin_tx *bitcoin_close(const tal_t *ctx, struct peer *peer)
const struct peer *peer)
{ {
/* Must be signed! */ /* Must be signed! */
assert(peer->close_tx->input[0].script_length != 0); assert(peer->close_tx->input[0].script_length != 0);

2
state.c
View File

@@ -281,7 +281,7 @@ enum command_status state(const tal_t *ctx,
BITCOIN_ANCHOR_DEPTHOK, BITCOIN_ANCHOR_DEPTHOK,
INPUT_NONE); INPUT_NONE);
complete_cmd(peer, &cstatus, CMD_FAIL); complete_cmd(peer, &cstatus, CMD_FAIL);
goto unexpected_pkt_nocleanup; goto unexpected_pkt;
} }
break; break;
case STATE_OPEN_WAITING_THEIRANCHOR: case STATE_OPEN_WAITING_THEIRANCHOR:

3
state.h
View File

@@ -351,8 +351,7 @@ void bitcoin_release_anchor(struct peer *peer, enum state_input done);
const struct bitcoin_tx *bitcoin_anchor(const tal_t *ctx, struct peer *peer); const struct bitcoin_tx *bitcoin_anchor(const tal_t *ctx, struct peer *peer);
/* Create a bitcoin close tx. */ /* Create a bitcoin close tx. */
const struct bitcoin_tx *bitcoin_close(const tal_t *ctx, const struct bitcoin_tx *bitcoin_close(const tal_t *ctx, struct peer *peer);
const struct peer *peer);
/* Create a bitcoin spend tx (to spend our commit's outputs) */ /* Create a bitcoin spend tx (to spend our commit's outputs) */
const struct bitcoin_tx *bitcoin_spend_ours(const tal_t *ctx, const struct bitcoin_tx *bitcoin_spend_ours(const tal_t *ctx,

22
test/test_state_coverage.c
View File

@@ -125,6 +125,10 @@ struct peer {
/* Have we created an anchor tx? */ /* Have we created an anchor tx? */
bool anchor; bool anchor;
/* Have we broadcast anchor? */
bool anchor_broadcast;
/* Have we spent anchor (or seen them do it?) */
bool anchor_spent;
unsigned int num_htlcs_to_them, num_htlcs_to_us; unsigned int num_htlcs_to_them, num_htlcs_to_us;
struct htlc htlcs_to_them[MAX_HTLCS], htlcs_to_us[MAX_HTLCS]; struct htlc htlcs_to_them[MAX_HTLCS], htlcs_to_us[MAX_HTLCS];
@@ -870,12 +874,14 @@ const struct bitcoin_tx *bitcoin_anchor(const tal_t *ctx, struct peer *peer)
if (!peer->anchor) if (!peer->anchor)
report_trail(peer->trail, "Can't create anchor tx: no anchor!"); report_trail(peer->trail, "Can't create anchor tx: no anchor!");
peer->anchor = false; peer->anchor = false;
peer->anchor_broadcast = true;
return bitcoin_tx("anchor"); return bitcoin_tx("anchor");
} }
const struct bitcoin_tx *bitcoin_close(const tal_t *ctx, const struct bitcoin_tx *bitcoin_close(const tal_t *ctx,
const struct peer *peer) struct peer *peer)
{ {
peer->anchor_spent = true;
return bitcoin_tx("close"); return bitcoin_tx("close");
} }
@@ -903,6 +909,7 @@ const struct bitcoin_tx *bitcoin_steal(const tal_t *ctx,
const struct bitcoin_tx *bitcoin_commit(const tal_t *ctx, struct peer *peer) const struct bitcoin_tx *bitcoin_commit(const tal_t *ctx, struct peer *peer)
{ {
peer->anchor_spent = true;
return bitcoin_tx("our commit"); return bitcoin_tx("our commit");
} }
@@ -950,6 +957,8 @@ static void peer_init(struct peer *peer,
peer->error = NULL; peer->error = NULL;
peer->htlc_declined = false; peer->htlc_declined = false;
peer->anchor = false; peer->anchor = false;
peer->anchor_broadcast = false;
peer->anchor_spent = false;
memset(peer->core.outputs, 0, sizeof(peer->core.outputs)); memset(peer->core.outputs, 0, sizeof(peer->core.outputs));
peer->pkt_data[0] = -1; peer->pkt_data[0] = -1;
peer->core.current_command = INPUT_NONE; peer->core.current_command = INPUT_NONE;
@@ -1541,6 +1550,9 @@ static const char *check_changes(const struct peer *old, struct peer *new,
if (have_event(new->core.event_notifies, if (have_event(new->core.event_notifies,
INPUT_CLOSE_COMPLETE_TIMEOUT)) INPUT_CLOSE_COMPLETE_TIMEOUT))
return tal_fmt(NULL, "CLOSED with pending close timeout"); return tal_fmt(NULL, "CLOSED with pending close timeout");
/* We must not leave anchor dangling, if we broadcast it. */
if (new->anchor_broadcast && !new->anchor_spent)
return tal_fmt(NULL, "CLOSED with unspent anchor?");
} }
if (input == PKT_ERROR) { if (input == PKT_ERROR) {
@@ -1829,6 +1841,14 @@ static void try_input(const struct peer *peer,
init_trail(&t, i, idata, peer, prev_trail); init_trail(&t, i, idata, peer, prev_trail);
copy.trail = &t; copy.trail = &t;
/* The anchor is resolved in some way by these. */
if (i == BITCOIN_ANCHOR_UNSPENT
|| i == BITCOIN_ANCHOR_TIMEOUT
|| i == BITCOIN_ANCHOR_THEIRSPEND
|| i == BITCOIN_ANCHOR_OTHERSPEND
|| i == BITCOIN_CLOSE_DONE)
copy.anchor_spent = true;
eliminate_input(&hist->inputs_per_state[copy.state], i); eliminate_input(&hist->inputs_per_state[copy.state], i);
cstatus = state(ctx, &copy, i, idata, &output, &broadcast); cstatus = state(ctx, &copy, i, idata, &output, &broadcast);