davide/palladum-lightning
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

lightningd: remove support for long-deprecated old-style feerate responses.

Browse Source 
This was supposed to be removed in v24.05.  Finally remove it now.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Removed: lightningd: `estimatefeesv1` support for older bcli plugins (deprecated v23.05, disabled by default v24.05).
This commit is contained in:
Rusty Russell
2026-01-20 14:56:27 +10:30
parent f8ef6e143b
commit 95d876011a
1 changed files with 8 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
lightningd/bitcoind.c
View File

@@ -93,9 +93,10 @@ void bitcoind_check_commands(struct bitcoind *bitcoind)
} }
/* Our Bitcoin backend plugin gave us a bad response. We can't recover. */ /* Our Bitcoin backend plugin gave us a bad response. We can't recover. */
static void bitcoin_plugin_error(struct bitcoind *bitcoind, const char *buf, static void NORETURN
const jsmntok_t *toks, const char *method, bitcoin_plugin_error(struct bitcoind *bitcoind, const char *buf,
const char *fmt, ...) const jsmntok_t *toks, const char *method,
const char *fmt, ...)
{ {
va_list ap; va_list ap;
char *reason; char *reason;
@@ -137,19 +138,7 @@ static void bitcoin_plugin_send(struct bitcoind *bitcoind,
* - `min` is the minimum acceptable feerate * - `min` is the minimum acceptable feerate
* - `max` is the maximum acceptable feerate * - `max` is the maximum acceptable feerate
* *
* Plugin response (deprecated): * Plugin response:
* {
* "opening": <sat per kVB>,
* "mutual_close": <sat per kVB>,
* "unilateral_close": <sat per kVB>,
* "delayed_to_us": <sat per kVB>,
* "htlc_resolution": <sat per kVB>,
* "penalty": <sat per kVB>,
* "min_acceptable": <sat per kVB>,
* "max_acceptable": <sat per kVB>,
* }
*
* Plugin response (modern):
* { * {
* "feerate_floor": <sat per kVB>, * "feerate_floor": <sat per kVB>,
* "feerates": { * "feerates": {
@@ -230,55 +219,6 @@ static struct feerate_est *parse_feerate_ranges(const tal_t *ctx,
return rates; return rates;
} }
static struct feerate_est *parse_deprecated_feerates(const tal_t *ctx,
struct bitcoind *bitcoind,
const char *buf,
const jsmntok_t *toks)
{
struct feerate_est *rates = tal_arr(ctx, struct feerate_est, 0);
struct oldstyle {
const char *name;
size_t blockcount;
size_t multiplier;
} oldstyles[] = { { "max_acceptable", 2, 10 },
{ "unilateral_close", 6, 1 },
{ "opening", 12, 1 },
{ "mutual_close", 100, 1 } };
for (size_t i = 0; i < ARRAY_SIZE(oldstyles); i++) {
const jsmntok_t *feeratetok;
struct feerate_est rate;
feeratetok = json_get_member(buf, toks, oldstyles[i].name);
if (!feeratetok) {
bitcoin_plugin_error(bitcoind, buf, toks,
"estimatefees",
"missing '%s' field",
oldstyles[i].name);
}
if (!json_to_u32(buf, feeratetok, &rate.rate)) {
if (chainparams->testnet)
log_debug(bitcoind->log,
"Unable to estimate %s fees",
oldstyles[i].name);
else
log_unusual(bitcoind->log,
"Unable to estimate %s fees",
oldstyles[i].name);
continue;
}
if (rate.rate == 0)
continue;
/* Cancel out the 10x multiplier on max_acceptable */
rate.rate /= oldstyles[i].multiplier;
rate.blockcount = oldstyles[i].blockcount;
tal_arr_expand(&rates, rate);
}
return rates;
}
static void estimatefees_callback(const char *buf, const jsmntok_t *toks, static void estimatefees_callback(const char *buf, const jsmntok_t *toks,
const jsmntok_t *idtok, const jsmntok_t *idtok,
struct estimatefee_call *call) struct estimatefee_call *call)
@@ -302,20 +242,9 @@ static void estimatefees_callback(const char *buf, const jsmntok_t *toks,
"feerates"), "feerates"),
&floor); &floor);
} else { } else {
if (!lightningd_deprecated_in_ok(call->bitcoind->ld, bitcoin_plugin_error(call->bitcoind, buf, resulttok,
call->bitcoind->ld->log, "estimatefees",
call->bitcoind->ld->deprecated_ok, "missing feerate_floor field");
"estimatefeesv1", NULL,
"v23.05", "v24.05",
NULL)) {
bitcoin_plugin_error(call->bitcoind, buf, resulttok,
"estimatefees",
"missing feerate_floor field");
}
feerates = parse_deprecated_feerates(call, call->bitcoind,
buf, resulttok);
floor = feerate_from_style(FEERATE_FLOOR, FEERATE_PER_KSIPA);
} }
/* Convert to perkw */ /* Convert to perkw */