aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-02-03 05:04:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

chaintopology: get fees using a timer, not on each block.

Browse Source 
It definitely changes when we get a block, but it also changes between
blocks as mempool fills.  So put it on its own timer.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2017-12-21 21:37:55 +10:30
committed by Christian Decker
parent 985a0b431f
commit 6f6d7a5e44
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lightningd/chaintopology.c
View File

@@ -308,6 +308,9 @@ static const char *feerate_name(enum feerate feerate)
: feerate == FEERATE_NORMAL ? "Normal" : "Slow";
}
/* Mutual recursion via timer. */
static void next_updatefee_timer(struct chain_topology *topo);
/* We sanitize feerates if necessary to put them in descending order. */
static void update_feerates(struct bitcoind *bitcoind,
const u32 *satoshi_per_kw,
@@ -340,12 +343,11 @@ static void update_feerates(struct bitcoind *bitcoind,
if (changed)
notify_feerate_change(bitcoind->ld);
next_updatefee_timer(topo);
}
/* B is the new chain (linked by ->next); update topology */
static void topology_changed(struct chain_topology *topo,
struct block *prev,
struct block *b)
static void start_fee_estimate(struct chain_topology *topo)
{
/* FEERATE_IMMEDIATE, FEERATE_NORMAL, FEERATE_SLOW */
const char *estmodes[] = { "CONSERVATIVE", "ECONOMICAL", "ECONOMICAL" };
@@ -353,6 +355,23 @@ static void topology_changed(struct chain_topology *topo,
BUILD_ASSERT(ARRAY_SIZE(blocks) == NUM_FEERATES);
/* Once per new block head, update fee estimates. */
bitcoind_estimate_fees(topo->bitcoind, blocks, estmodes, NUM_FEERATES,
update_feerates, topo);
}
static void next_updatefee_timer(struct chain_topology *topo)
{
/* This takes care of its own lifetime. */
notleak(new_reltimer(topo->timers, topo, topo->poll_time,
start_fee_estimate, topo));
}
/* B is the new chain (linked by ->next); update topology */
static void topology_changed(struct chain_topology *topo,
struct block *prev,
struct block *b)
{
/* Eliminate any old chain. */
if (prev->next)
free_blocks(topo, prev->next);
@@ -369,10 +388,6 @@ static void topology_changed(struct chain_topology *topo,
/* Maybe need to rebroadcast. */
rebroadcast_txs(topo, NULL);
/* Once per new block head, update fee estimates. */
bitcoind_estimate_fees(topo->bitcoind, blocks, estmodes, NUM_FEERATES,
update_feerates, topo);
}
static struct block *new_block(struct chain_topology *topo,
@@ -745,6 +760,9 @@ void setup_topology(struct chain_topology *topo,
tal_add_destructor(topo, destroy_outgoing_txs);
/* Begin fee estimation. */
start_fee_estimate(topo);
/* Once it gets topology, it calls io_break() and we return. */
io_loop(NULL, NULL);
assert(!topo->startup);