Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

funder cleanups! #5650

Merged
merged 13 commits into from
Oct 20, 2022
Merged

funder cleanups! #5650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b6ef966
chainparams/dual-open: set max_supply; use for max on wumbo channels
niftynei Oct 17, 2022
2506347
funder: we always pass in channel_max, no need to special case it
niftynei Sep 18, 2022
dba991a
df: put requested_lease onto state, so it persists
niftynei Sep 22, 2022
c7cbe3b
df: for rbfs, since we know what they asked for, we can abort
niftynei Sep 22, 2022
0482ad2
openchannel2: may re-use rates
niftynei Oct 4, 2022
a5ef12f
df: pass lease data back to funder for rbfs
niftynei Oct 4, 2022
c6470fa
funder: rm quote that makes nifty cringe every time she sees it
niftynei Oct 4, 2022
3d8466e
funder: save utxos of signed txs to datastore
niftynei Oct 5, 2022
0fbf1b5
funder: pull out previous input list from datastore on RBF
niftynei Oct 5, 2022
edc907e
funder: use previous outputs in count towards available funding
niftynei Oct 5, 2022
6e07113
funder: use utxopsbt to build psbt for RBFs
niftynei Oct 5, 2022
2adb06c
funder: filter prev-outs such that we only use still unspent ones
niftynei Oct 7, 2022
ebcc865
funder: cleanup datastore on state-change/channel failure
niftynei Oct 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions bitcoin/chainparams.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ const struct chainparams networks[] = {
*/
.max_funding = AMOUNT_SAT_INIT((1 << 24) - 1),
.max_payment = AMOUNT_MSAT_INIT(0xFFFFFFFFULL),
.max_supply = AMOUNT_SAT_INIT(2100000000000000),
/* "Lightning Charge Powers Developers & Blockstream Store" */
.when_lightning_became_cool = 504500,
.p2pkh_version = 0,
Expand All @@ -76,6 +77,7 @@ const struct chainparams networks[] = {
.dust_limit = { 546 },
.max_funding = AMOUNT_SAT_INIT((1 << 24) - 1),
.max_payment = AMOUNT_MSAT_INIT(0xFFFFFFFFULL),
.max_supply = AMOUNT_SAT_INIT(2100000000000000),
.when_lightning_became_cool = 1,
.p2pkh_version = 111,
.p2sh_version = 196,
Expand All @@ -102,6 +104,7 @@ const struct chainparams networks[] = {
.dust_limit = { 546 },
.max_funding = AMOUNT_SAT_INIT((1 << 24) - 1),
.max_payment = AMOUNT_MSAT_INIT(0xFFFFFFFFULL),
.max_supply = AMOUNT_SAT_INIT(2100000000000000),
.when_lightning_became_cool = 1,
.p2pkh_version = 111,
.p2sh_version = 196,
Expand All @@ -126,6 +129,7 @@ const struct chainparams networks[] = {
.dust_limit = { 546 },
.max_funding = AMOUNT_SAT_INIT((1 << 24) - 1),
.max_payment = AMOUNT_MSAT_INIT(0xFFFFFFFFULL),
.max_supply = AMOUNT_SAT_INIT(2100000000000000),
.p2pkh_version = 111,
.p2sh_version = 196,
.testnet = true,
Expand All @@ -150,6 +154,7 @@ const struct chainparams networks[] = {
.dust_limit = { 100000 },
.max_funding = AMOUNT_SAT_INIT(60 * ((1 << 24) - 1)),
.max_payment = AMOUNT_MSAT_INIT(60 * 0xFFFFFFFFULL),
.max_supply = AMOUNT_SAT_INIT(2100000000000000),
.when_lightning_became_cool = 1320000,
.p2pkh_version = 48,
.p2sh_version = 50,
Expand All @@ -175,6 +180,7 @@ const struct chainparams networks[] = {
.dust_limit = { 100000 },
.max_funding = AMOUNT_SAT_INIT(60 * ((1 << 24) - 1)),
.max_payment = AMOUNT_MSAT_INIT(60 * 0xFFFFFFFFULL),
.max_supply = AMOUNT_SAT_INIT(2100000000000000),
.when_lightning_became_cool = 1,
.p2pkh_version = 111,
.p2sh_version = 58,
Expand All @@ -199,6 +205,7 @@ const struct chainparams networks[] = {
.dust_limit = {546},
.max_funding = AMOUNT_SAT_INIT((1 << 24) - 1),
.max_payment = AMOUNT_MSAT_INIT(0xFFFFFFFFULL),
.max_supply = AMOUNT_SAT_INIT(2100000000000000),
.when_lightning_became_cool = 1,
.p2pkh_version = 91,
.p2sh_version = 75,
Expand All @@ -223,6 +230,7 @@ const struct chainparams networks[] = {
.dust_limit = {546},
.max_funding = AMOUNT_SAT_INIT((1 << 24) - 1),
.max_payment = AMOUNT_MSAT_INIT(0xFFFFFFFFULL),
.max_supply = AMOUNT_SAT_INIT(2100000000000000),
.when_lightning_became_cool = 1,
.p2pkh_version = 57,
.p2sh_version = 39,
Expand Down
2 changes: 2 additions & 0 deletions bitcoin/chainparams.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ struct chainparams {
const struct amount_sat dust_limit;
const struct amount_sat max_funding;
const struct amount_msat max_payment;
/* Total coins in network */
const struct amount_sat max_supply;
const u32 when_lightning_became_cool;
const u8 p2pkh_version;
const u8 p2sh_version;
Expand Down
5 changes: 4 additions & 1 deletion doc/PLUGINS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1372,12 +1372,15 @@ requests an RBF for a channel funding transaction.
"rbf_channel": {
"id": "03864ef025fde8fb587d989186ce6a4a186895ee44a926bfc370e2c366597a3f8f",
"channel_id": "252d1b0a1e57895e84137f28cf19ab2c35847e284c112fefdecc7afeaa5c1de7",
"their_last_funding_msat": 100000000,
"their_funding_msat": 100000000,
"our_last_funding_msat": 100000000,
"funding_feerate_per_kw": 7500,
"feerate_our_max": 10000,
"feerate_our_min": 253,
"channel_max_msat": 16777215000,
"locktime": 2453
"locktime": 2453,
"requested_lease_msat": 100000000,
}
}
```
Expand Down
62 changes: 42 additions & 20 deletions lightningd/dual_open_control.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,9 @@ struct rbf_channel_payload {

/* Info specific to this RBF */
struct channel_id channel_id;
struct amount_sat their_funding;
struct amount_sat their_last_funding;
struct amount_sat their_proposed_funding;
struct amount_sat our_last_funding;
u32 funding_feerate_per_kw;
u32 locktime;

Expand All @@ -179,6 +181,9 @@ struct rbf_channel_payload {
* this channel can hold */
struct amount_sat channel_max;

/* If they've requested funds, this is their request */
struct amount_sat *requested_lease_amt;

/* Returned from hook */
struct amount_sat our_funding;
struct wally_psbt *psbt;
Expand All @@ -192,9 +197,12 @@ static void rbf_channel_hook_serialize(struct rbf_channel_payload *payload,
json_object_start(stream, "rbf_channel");
json_add_node_id(stream, "id", &payload->peer_id);
json_add_channel_id(stream, "channel_id", &payload->channel_id);
json_add_amount_sats_deprecated(stream,
"their_funding", "their_funding_msat",
payload->their_funding);
json_add_amount_sat_msat(stream, "their_last_funding_msat",
payload->their_last_funding);
json_add_amount_sat_msat(stream, "their_funding_msat",
payload->their_proposed_funding);
json_add_amount_sat_msat(stream, "our_last_funding_msat",
payload->our_last_funding);
json_add_num(stream, "locktime", payload->locktime);
json_add_num(stream, "feerate_our_max",
payload->feerate_our_max);
Expand All @@ -204,6 +212,10 @@ static void rbf_channel_hook_serialize(struct rbf_channel_payload *payload,
payload->funding_feerate_per_kw);
json_add_amount_sat_msat(stream, "channel_max_msat",
payload->channel_max);

if (payload->requested_lease_amt)
json_add_amount_sat_msat(stream, "requested_lease_msat",
*payload->requested_lease_amt);
json_object_end(stream);
}

Expand Down Expand Up @@ -243,7 +255,7 @@ struct openchannel2_payload {
* this channel can hold */
struct amount_sat channel_max;
/* If they've requested funds, this is their request */
struct amount_sat requested_lease_amt;
struct amount_sat *requested_lease_amt;
u32 lease_blockheight_start;
u32 node_blockheight;

Expand Down Expand Up @@ -287,9 +299,9 @@ static void openchannel2_hook_serialize(struct openchannel2_payload *payload,
payload->shutdown_scriptpubkey);
json_add_amount_sat_msat(stream, "channel_max_msat",
payload->channel_max);
if (!amount_sat_zero(payload->requested_lease_amt)) {
if (payload->requested_lease_amt) {
json_add_amount_sat_msat(stream, "requested_lease_msat",
payload->requested_lease_amt);
*payload->requested_lease_amt);
json_add_num(stream, "lease_blockheight_start",
payload->lease_blockheight_start);
json_add_num(stream, "node_blockheight",
Expand Down Expand Up @@ -745,7 +757,9 @@ openchannel2_hook_deserialize(struct openchannel2_payload *payload,


struct amount_msat fee_base, fee_max_base;
payload->rates = tal(payload, struct lease_rates);
/* deserialized may be called multiple times */
if (!payload->rates)
payload->rates = tal(payload, struct lease_rates);
err = json_scan(payload, buffer, toks,
"{lease_fee_base_msat:%"
",lease_fee_basis:%"
Expand Down Expand Up @@ -1812,11 +1826,14 @@ static void rbf_got_offer(struct subd *dualopend, const u8 *msg)
payload->dualopend = dualopend;
payload->channel = channel;

if (!fromwire_dualopend_got_rbf_offer(msg,
if (!fromwire_dualopend_got_rbf_offer(payload, msg,
&payload->channel_id,
&payload->their_funding,
&payload->their_last_funding,
&payload->their_proposed_funding,
&payload->our_last_funding,
&payload->funding_feerate_per_kw,
&payload->locktime)) {
&payload->locktime,
&payload->requested_lease_amt)) {
channel_internal_error(channel,
"Bad WIRE_DUALOPEND_GOT_RBF_OFFER: %s",
tal_hex(msg, msg));
Expand All @@ -1842,18 +1859,17 @@ static void rbf_got_offer(struct subd *dualopend, const u8 *msg)
payload->feerate_our_max = feerate_max(dualopend->ld, NULL);
payload->feerate_our_min = feerate_min(dualopend->ld, NULL);

/* Set our contributions to empty, in case there is no plugin */
payload->our_funding = AMOUNT_SAT(0);
payload->psbt = NULL;

/* No error message known (yet) */
payload->err_msg = NULL;

payload->channel_max = chainparams->max_funding;
if (feature_negotiated(dualopend->ld->our_features,
channel->peer->their_features,
OPT_LARGE_CHANNELS))
payload->channel_max = AMOUNT_SAT(UINT_MAX);
payload->channel_max = chainparams->max_supply;
else
payload->channel_max = chainparams->max_funding;

tal_add_destructor2(dualopend, rbf_channel_remove_dualopend, payload);
plugin_hook_call_rbf_channel(dualopend->ld, NULL, payload);
Expand All @@ -1879,6 +1895,7 @@ static void accepter_got_offer(struct subd *dualopend,
payload->accepter_funding = AMOUNT_SAT(0);
payload->our_shutdown_scriptpubkey = NULL;
payload->peer_id = channel->peer->id;
payload->rates = NULL;
payload->err_msg = NULL;

if (!fromwire_dualopend_got_offer(payload, msg,
Expand Down Expand Up @@ -1910,11 +1927,12 @@ static void accepter_got_offer(struct subd *dualopend,
payload->feerate_our_max = feerate_max(dualopend->ld, NULL);
payload->node_blockheight = get_block_height(dualopend->ld->topology);

payload->channel_max = chainparams->max_funding;
if (feature_negotiated(dualopend->ld->our_features,
channel->peer->their_features,
OPT_LARGE_CHANNELS))
payload->channel_max = AMOUNT_SAT(UINT64_MAX);
payload->channel_max = chainparams->max_supply;
else
payload->channel_max = chainparams->max_funding;

tal_add_destructor2(dualopend, openchannel2_remove_dualopend, payload);
plugin_hook_call_openchannel2(dualopend->ld, NULL, payload);
Expand Down Expand Up @@ -2756,7 +2774,8 @@ static struct command_result *json_openchannel_init(struct command *cmd,
*feerate_per_kw,
*feerate_per_kw_funding,
channel->channel_flags,
*request_amt,
amount_sat_zero(*request_amt) ?
NULL : request_amt,
get_block_height(cmd->ld->topology),
false,
rates);
Expand Down Expand Up @@ -3243,7 +3262,8 @@ static struct command_result *json_queryrates(struct command *cmd,
*feerate_per_kw,
*feerate_per_kw_funding,
channel->channel_flags,
*request_amt,
amount_sat_zero(*request_amt) ?
NULL : request_amt,
get_block_height(cmd->ld->topology),
true,
NULL);
Expand Down Expand Up @@ -3493,7 +3513,9 @@ bool peer_restart_dualopend(struct peer *peer,
inflight->lease_expiry,
inflight->lease_commit_sig,
inflight->lease_chan_max_msat,
inflight->lease_chan_max_ppt);
inflight->lease_chan_max_ppt,
/* FIXME: requested lease? */
NULL);

subd_send_msg(channel->owner, take(msg));
return true;
Expand Down
Loading