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

chaintopology: fix rebroadcast code.

Browse Source 
broadcast_remainder() does two things: get the error message for the
previous transaction, and send the next one (shrinking the array).

But it has two bugs:
1) It logs results on the tx at the end of the array, which is the one
   it is *about* to send, and
2) The initial caller (rebroadcast_txs) hands it the complete array,
   so the first tx gets broadcast twice.

The correct thing to do is to strip the array, then send the tail for
the next callback.  And use nicely-named vars to help document what
we're doing.

Reported-by: Christian Decker
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-11-07 23:04:02 +10:30
parent dbd8e07924
commit 13b1d922bb
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
daemon/chaintopology.c
View File

@@ -213,32 +213,36 @@ size_t get_tx_depth(struct lightningd_state *dstate,
return topo->tip->height - b->height + 1;
}
/* We just sent the last entry in txs[]. Shrink and send the next last. */
static void broadcast_remainder(struct lightningd_state *dstate,
int exitstatus, const char *msg, char **txs)
{
size_t num_txs = tal_count(txs);
const char *this_tx;
const char *sent_tx, *next_tx;
sent_tx = txs[num_txs-1];
/* These are expected. */
if (strstr(msg, "txn-mempool-conflict")
|| strstr(msg, "transaction already in block chain"))
log_debug(dstate->base_log,
"Expected error broadcasting tx %s: %s",
txs[num_txs-1], msg);
sent_tx, msg);
else if (exitstatus)
log_unusual(dstate->base_log, "Broadcasting tx %s: %i %s",
txs[num_txs-1], exitstatus, msg);
sent_tx, exitstatus, msg);
if (num_txs == 1) {
/* Strip off last one. */
tal_resize(&txs, --num_txs);
if (num_txs == 0) {
tal_free(txs);
return;
}
/* Strip off last one. */
this_tx = txs[num_txs-1];
tal_resize(&txs, num_txs-1);
bitcoind_sendrawtx(NULL, dstate, this_tx, broadcast_remainder, txs);
/* Broadcast next one. */
next_tx = txs[num_txs-1];
bitcoind_sendrawtx(NULL, dstate, next_tx, broadcast_remainder, txs);
}
/* FIXME: This is dumb. We can group txs and avoid bothering bitcoind