mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 05:12:45 +01:00
Code Issues Projects Releases Wiki Activity

gossip: Tracking tx index in topology

Browse Source 
The txlocator was reporting the index in the purged array of
transactions instead of the index in the original block.
This commit is contained in:
Christian Decker 2016-12-11 23:22:08 +01:00 committed by Rusty Russell
parent 57d5ae96a4
commit e8d68757f6
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
daemon/chaintopology.c
View File

@ -37,6 +37,9 @@ struct block {
/* Transactions in this block we care about */ /* Transactions in this block we care about */
struct sha256_double *txids; struct sha256_double *txids;
/* And their associated index in the block */
u32 *txnums;
/* Full copy of txs (trimmed to txs list in connect_block) */ /* Full copy of txs (trimmed to txs list in connect_block) */
struct bitcoin_tx **full_txs; struct bitcoin_tx **full_txs;
}; };
@ -107,12 +110,14 @@ static u32 get_mediantime(const struct topology *topo, const struct block *b)
} }
/* FIXME: Remove tx from block when peer done. */ /* FIXME: Remove tx from block when peer done. */
static void add_tx_to_block(struct block *b, const struct sha256_double *txid) static void add_tx_to_block(struct block *b, const struct sha256_double *txid, const u32 txnum)
{ {
size_t n = tal_count(b->txids); size_t n = tal_count(b->txids);
tal_resize(&b->txids, n+1); tal_resize(&b->txids, n+1);
tal_resize(&b->txnums, n+1);
b->txids[n] = *txid; b->txids[n] = *txid;
b->txnums[n] = txnum;
} }
static bool we_broadcast(struct lightningd_state *dstate, static bool we_broadcast(struct lightningd_state *dstate,
@ -171,7 +176,7 @@ static void connect_block(struct lightningd_state *dstate,
/* We did spends first, in case that tells us to watch tx. */ /* We did spends first, in case that tells us to watch tx. */
bitcoin_txid(tx, &txid); bitcoin_txid(tx, &txid);
if (watching_txid(dstate, &txid) || we_broadcast(dstate, &txid)) if (watching_txid(dstate, &txid) || we_broadcast(dstate, &txid))
add_tx_to_block(b, &txid); add_tx_to_block(b, &txid, i);
} }
b->full_txs = tal_free(b->full_txs); b->full_txs = tal_free(b->full_txs);
@ -403,6 +408,7 @@ static struct block *new_block(struct lightningd_state *dstate,
b->hdr = blk->hdr; b->hdr = blk->hdr;
b->txids = tal_arr(b, struct sha256_double, 0); b->txids = tal_arr(b, struct sha256_double, 0);
b->txnums = tal_arr(b, u32, 0);
b->full_txs = tal_steal(b, blk->tx); b->full_txs = tal_steal(b, blk->tx);
return b; return b;
@ -547,16 +553,15 @@ struct txlocator *locate_tx(const void *ctx, struct lightningd_state *dstate,
struct txlocator *loc = talz(ctx, struct txlocator); struct txlocator *loc = talz(ctx, struct txlocator);
loc->blkheight = block->height; loc->blkheight = block->height;
size_t i, n = tal_count(block->txids); size_t i, n = tal_count(block->txids);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (structeq(&block->txids[i], txid)){ if (structeq(&block->txids[i], txid)){
loc->index = i; loc->index = block->txnums[i];
break;
}
}
return loc; return loc;
} }
}
return tal_free(loc);
}
static void json_dev_broadcast(struct command *cmd, static void json_dev_broadcast(struct command *cmd,
const char *buffer, const jsmntok_t *params) const char *buffer, const jsmntok_t *params)