lukechilds
/
lightning
mirror of https://github.com/lukechilds/lightning.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

chaintopology: simply track txids, not watches. 

This is less efficient, but simpler.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
ppa-0.6.1
Rusty Russell 9 years ago
parent
57ec0397ad
commit
4e102ccfcf
4 changed files with 44 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 69
      daemon/chaintopology.c
  2. 3
      daemon/chaintopology.h
  3. 21
      daemon/watch.c
  4. 7
      daemon/watch.h

69
daemon/chaintopology.c
View File

@ -14,12 +14,6 @@
static struct timeout topology_timeout; static struct timeout topology_timeout;
struct tx_in_block {
struct list_node list;
struct txwatch *w;
struct block *block;
};
struct block { struct block {
int height; int height;
@ -39,9 +33,9 @@ struct block {
u32 mediantime; u32 mediantime;
/* Transactions in this block we care about */ /* Transactions in this block we care about */
struct list_head txs; struct sha256_double *txids;
/* Full copy of txs (trimmed to txs list in connect_blocks) */ /* Full copy of txs (trimmed to txs list in connect_block) */
struct bitcoin_tx **full_txs; struct bitcoin_tx **full_txs;
}; };
@ -96,20 +90,13 @@ static u32 get_mediantime(const struct topology *topo, const struct block *b)
return times[ARRAY_SIZE(times) / 2]; return times[ARRAY_SIZE(times) / 2];
} }
static void remove_tx(struct tx_in_block *t) /* FIXME: Remove tx from block when peer done. */
static void add_tx_to_block(struct block *b, const struct sha256_double *txid)
{ {
list_del_from(&t->block->txs, &t->list); size_t n = tal_count(b->txids);
}
static void add_tx_to_block(struct block *b, struct txwatch *w) tal_resize(&b->txids, n+1);
{ b->txids[n] = *txid;
/* We attach this to watch, so removed when that is */
struct tx_in_block *t = tal(w, struct tx_in_block);
t->block = b;
t->w = w;
list_add_tail(&b->txs, &t->list);
tal_add_destructor(t, remove_tx);
} }
/* Fills in prev, height, mediantime. */ /* Fills in prev, height, mediantime. */
@ -134,9 +121,7 @@ static void connect_block(struct lightningd_state *dstate,
/* Now we see if any of those txs are interesting. */ /* Now we see if any of those txs are interesting. */
for (i = 0; i < tal_count(b->full_txs); i++) { for (i = 0; i < tal_count(b->full_txs); i++) {
struct bitcoin_tx *tx = b->full_txs[i]; struct bitcoin_tx *tx = b->full_txs[i];
struct txwatch *w;
struct sha256_double txid; struct sha256_double txid;
struct txwatch_hash_iter iter;
size_t j; size_t j;
/* Tell them if it spends a txo we care about. */ /* Tell them if it spends a txo we care about. */
@ -151,16 +136,10 @@ static void connect_block(struct lightningd_state *dstate,
txowatch_fire(dstate, txo, tx, j); txowatch_fire(dstate, txo, tx, j);
} }
/* We do 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);
for (w = txwatch_hash_getfirst(&dstate->txwatches, &txid, &iter); if (watching_txid(dstate, &txid))
w; add_tx_to_block(b, &txid);
w = txwatch_hash_getnext(&dstate->txwatches, &txid, &iter)){
add_tx_to_block(b, w);
/* Fire if it's the first we've seen it: this might
* set up txo watches, which could fire in this block */
txwatch_fire(dstate, w, 0);
}
} }
b->full_txs = tal_free(b->full_txs); b->full_txs = tal_free(b->full_txs);
} }
@ -168,19 +147,20 @@ static void connect_block(struct lightningd_state *dstate,
static bool tx_in_block(const struct block *b, static bool tx_in_block(const struct block *b,
const struct sha256_double *txid) const struct sha256_double *txid)
{ {
struct tx_in_block *tx; size_t i, n = tal_count(b->txids);
list_for_each(&b->txs, tx, list) { for (i = 0; i < n; i++) {
if (structeq(&tx->w->txid, txid)) if (structeq(&b->txids[i], txid))
return true; return true;
} }
return false; return false;
} }
/* FIXME: put block pointer in txwatch. */ /* FIXME: Use hash table. */
static struct block *block_for_tx(struct topology *topo, static struct block *block_for_tx(struct lightningd_state *dstate,
const struct sha256_double *txid) const struct sha256_double *txid)
{ {
struct topology *topo = dstate->topology;
struct block *b; struct block *b;
for (b = topo->tip; b; b = b->prev) { for (b = topo->tip; b; b = b->prev) {
@ -190,12 +170,13 @@ static struct block *block_for_tx(struct topology *topo,
return NULL; return NULL;
} }
size_t get_tx_depth(struct lightningd_state *dstate, const struct txwatch *w) size_t get_tx_depth(struct lightningd_state *dstate,
const struct sha256_double *txid)
{ {
struct topology *topo = dstate->topology; struct topology *topo = dstate->topology;
const struct block *b; const struct block *b;
b = block_for_tx(topo, &w->txid); b = block_for_tx(dstate, txid);
if (!b) if (!b)
return 0; return 0;
return topo->tip->height - b->height + 1; return topo->tip->height - b->height + 1;
@ -244,7 +225,7 @@ static void rebroadcast_txs(struct lightningd_state *dstate)
list_for_each(&peer->outgoing_txs, otx, list) { list_for_each(&peer->outgoing_txs, otx, list) {
u8 *rawtx; u8 *rawtx;
if (block_for_tx(dstate->topology, &otx->txid)) if (block_for_tx(dstate, &otx->txid))
continue; continue;
tal_resize(&txs, num_txs+1); tal_resize(&txs, num_txs+1);
@ -291,11 +272,11 @@ static void free_blocks(struct lightningd_state *dstate, struct block *b)
struct block *next; struct block *next;
while (b) { while (b) {
struct tx_in_block *tx, *n; size_t i, n = tal_count(b->txids);
/* Notify that txs are kicked out. */ /* Notify that txs are kicked out. */
list_for_each_safe(&b->txs, tx, n, list) for (i = 0; i < n; i++)
txwatch_fire(dstate, tx->w, 0); txwatch_fire(dstate, &b->txids[i], 0);
next = b->next; next = b->next;
tal_free(b); tal_free(b);
@ -349,7 +330,7 @@ static struct block *new_block(struct lightningd_state *dstate,
b->hdr = blk->hdr; b->hdr = blk->hdr;
list_head_init(&b->txs); b->txids = tal_arr(b, struct sha256_double, 0);
b->full_txs = tal_steal(b, blk->tx); b->full_txs = tal_steal(b, blk->tx);
return b; return b;
@ -441,7 +422,7 @@ u32 get_tx_mediantime(struct lightningd_state *dstate,
{ {
struct block *b; struct block *b;
b = block_for_tx(dstate->topology, txid); b = block_for_tx(dstate, txid);
if (b) if (b)
return b->mediantime; return b->mediantime;

3
daemon/chaintopology.h
View File

@ -8,7 +8,8 @@ struct txwatch;
/* This is the number of blocks which would have to be mined to invalidate /* This is the number of blocks which would have to be mined to invalidate
* the tx. */ * the tx. */
size_t get_tx_depth(struct lightningd_state *dstate, const struct txwatch *w); size_t get_tx_depth(struct lightningd_state *dstate,
const struct sha256_double *txid);
/* Get the mediantime of the block including this tx (must be one!) */ /* Get the mediantime of the block including this tx (must be one!) */
u32 get_tx_mediantime(struct lightningd_state *dstate, u32 get_tx_mediantime(struct lightningd_state *dstate,

21
daemon/watch.c
View File

@ -91,7 +91,7 @@ struct txwatch *watch_txid_(const tal_t *ctx,
struct txwatch *w; struct txwatch *w;
w = tal(ctx, struct txwatch); w = tal(ctx, struct txwatch);
w->depth = -1; w->depth = 0;
w->txid = *txid; w->txid = *txid;
w->dstate = peer->dstate; w->dstate = peer->dstate;
w->peer = peer; w->peer = peer;
@ -104,6 +104,12 @@ struct txwatch *watch_txid_(const tal_t *ctx,
return w; return w;
} }
bool watching_txid(struct lightningd_state *dstate,
const struct sha256_double *txid)
{
return txwatch_hash_get(&dstate->txwatches, txid) != NULL;
}
struct txwatch *watch_tx_(const tal_t *ctx, struct txwatch *watch_tx_(const tal_t *ctx,
struct peer *peer, struct peer *peer,
const struct bitcoin_tx *tx, const struct bitcoin_tx *tx,
@ -142,12 +148,13 @@ struct txowatch *watch_txo_(const tal_t *ctx,
return w; return w;
} }
void txwatch_fire(struct lightningd_state *dstate, void txwatch_fire(struct lightningd_state *dstate,
struct txwatch *txw, const struct sha256_double *txid,
unsigned int depth) unsigned int depth)
{ {
if (depth != txw->depth) { struct txwatch *txw = txwatch_hash_get(&dstate->txwatches, txid);
if (txw && depth != txw->depth) {
log_debug(txw->peer->log, log_debug(txw->peer->log,
"Got depth change %u for %02x%02x%02x...\n", "Got depth change %u for %02x%02x%02x...\n",
txw->depth, txw->depth,
@ -194,11 +201,7 @@ again:
w = txwatch_hash_next(&dstate->txwatches, &i)) { w = txwatch_hash_next(&dstate->txwatches, &i)) {
size_t depth; size_t depth;
/* Don't fire if we haven't seen it at all. */ depth = get_tx_depth(dstate, &w->txid);
if (w->depth == -1)
continue;
depth = get_tx_depth(dstate, w);
if (depth != w->depth) { if (depth != w->depth) {
w->depth = depth; w->depth = depth;
w->cb(w->peer, w->depth, &w->txid, w->cbdata); w->cb(w->peer, w->depth, &w->txid, w->cbdata);

7
daemon/watch.h
View File

@ -45,7 +45,7 @@ struct txwatch {
/* Peer who owns us. */ /* Peer who owns us. */
struct peer *peer; struct peer *peer;
/* Transaction to watch. */ /* Transaction to watch. */
struct sha256_double txid; struct sha256_double txid;
int depth; int depth;
@ -118,12 +118,15 @@ struct txowatch *watch_txo_(const tal_t *ctx,
(cbdata)) (cbdata))
void txwatch_fire(struct lightningd_state *dstate, void txwatch_fire(struct lightningd_state *dstate,
struct txwatch *txw, const struct sha256_double *txid,
unsigned int depth); unsigned int depth);
void txowatch_fire(struct lightningd_state *dstate, void txowatch_fire(struct lightningd_state *dstate,
const struct txowatch *txow, const struct txowatch *txow,
const struct bitcoin_tx *tx, size_t input_num); const struct bitcoin_tx *tx, size_t input_num);
bool watching_txid(struct lightningd_state *dstate,
const struct sha256_double *txid);
void watch_topology_changed(struct lightningd_state *dstate); void watch_topology_changed(struct lightningd_state *dstate);
#endif /* LIGHTNING_DAEMON_WATCH_H */ #endif /* LIGHTNING_DAEMON_WATCH_H */

Write Preview
Loading…
Cancel
Save