mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-19 09:54:16 +01:00
Code Issues Projects Releases Wiki Activity

lightningd: use bitcoin_outpoint in watch.

Browse Source 
This makes more sense than two args.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2021-10-13 14:15:36 +10:30 committed by Christian Decker
parent 2bb13bacc2
commit b24b7f90c4
3 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lightningd/chaintopology.c
View File

@ -72,10 +72,10 @@ static void filter_block_txs(struct chain_topology *topo, struct block *b)
/* Tell them if it spends a txo we care about. */
for (j = 0; j < tx->wtx->num_inputs; j++) {
struct txwatch_output out;
struct bitcoin_outpoint out;
struct txowatch *txo;
bitcoin_tx_input_get_txid(tx, j, &out.txid);
out.index = tx->wtx->inputs[j].index;
out.n = tx->wtx->inputs[j].index;
txo = txowatch_hash_get(&topo->txowatches, &out);
if (txo) {

22
lightningd/watch.c
View File

@ -40,7 +40,7 @@ struct txowatch {
struct channel *channel;
/* Output to watch. */
struct txwatch_output out;
struct bitcoin_outpoint out;
/* A new tx. */
enum watch_result (*cb)(struct channel *channel,
@ -71,24 +71,24 @@ struct txwatch {
unsigned int depth);
};
const struct txwatch_output *txowatch_keyof(const struct txowatch *w)
const struct bitcoin_outpoint *txowatch_keyof(const struct txowatch *w)
{
return &w->out;
}
size_t txo_hash(const struct txwatch_output *out)
size_t txo_hash(const struct bitcoin_outpoint *out)
{
/* This hash-in-one-go trick only works if they're consecutive. */
BUILD_ASSERT(offsetof(struct txwatch_output, index)
== sizeof(((struct txwatch_output *)NULL)->txid));
return siphash24(siphash_seed(), &out->txid,
sizeof(out->txid) + sizeof(out->index));
BUILD_ASSERT(offsetof(struct bitcoin_outpoint, n)
== sizeof(((struct bitcoin_outpoint *)NULL)->txid));
return siphash24(siphash_seed(), out,
sizeof(out->txid) + sizeof(out->n));
}
bool txowatch_eq(const struct txowatch *w, const struct txwatch_output *out)
bool txowatch_eq(const struct txowatch *w, const struct bitcoin_outpoint *out)
{
return bitcoin_txid_eq(&w->out.txid, &out->txid)
&& w->out.index == out->index;
&& w->out.n == out->n;
}
static void destroy_txowatch(struct txowatch *w)
@ -198,7 +198,7 @@ struct txowatch *watch_txo(const tal_t *ctx,
w->topo = topo;
w->out.txid = *txid;
w->out.index = output;
w->out.n = output;
w->channel = channel;
w->cb = cb;
@ -266,7 +266,7 @@ void txowatch_fire(const struct txowatch *txow,
log_debug(txow->channel->log,
"Got UTXO spend for %s:%u: %s",
type_to_string(tmpctx, struct bitcoin_txid, &txow->out.txid),
txow->out.index,
txow->out.n,
type_to_string(tmpctx, struct bitcoin_txid, &txid));
r = txow->cb(txow->channel, tx, input_num, block);

12
lightningd/watch.h
View File

@ -4,7 +4,6 @@
#include <bitcoin/tx.h>
#include <ccan/htable/htable_type.h>
struct bitcoin_tx;
struct block;
struct channel;
struct chain_topology;
@ -17,14 +16,9 @@ enum watch_result {
KEEP_WATCHING = -2
};
struct txwatch_output {
struct bitcoin_txid txid;
unsigned int index;
};
const struct txwatch_output *txowatch_keyof(const struct txowatch *w);
size_t txo_hash(const struct txwatch_output *out);
bool txowatch_eq(const struct txowatch *w, const struct txwatch_output *out);
const struct bitcoin_outpoint *txowatch_keyof(const struct txowatch *w);
size_t txo_hash(const struct bitcoin_outpoint *out);
bool txowatch_eq(const struct txowatch *w, const struct bitcoin_outpoint *out);
HTABLE_DEFINE_TYPE(struct txowatch, txowatch_keyof, txo_hash, txowatch_eq,
txowatch_hash);