aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 15:14:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

lightningd: put ignore_fee_limits bool into channel struct.

Browse Source 
For now, it's set from the global config.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2023-07-21 16:45:22 +09:30
parent 5471289b39
commit 95b69c2cf8
5 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lightningd/channel.c
View File

@@ -262,6 +262,7 @@ struct channel *new_unsaved_channel(struct peer *peer,
channel->future_per_commitment_point = NULL; channel->future_per_commitment_point = NULL;
channel->lease_commit_sig = NULL; channel->lease_commit_sig = NULL;
channel->ignore_fee_limits = ld->config.ignore_fee_limits;
/* No shachain yet */ /* No shachain yet */
channel->their_shachain.id = 0; channel->their_shachain.id = 0;
@@ -393,7 +394,8 @@ struct channel *new_channel(struct peer *peer, u64 dbid,
u32 lease_chan_max_msat, u32 lease_chan_max_msat,
u16 lease_chan_max_ppt, u16 lease_chan_max_ppt,
struct amount_msat htlc_minimum_msat, struct amount_msat htlc_minimum_msat,
struct amount_msat htlc_maximum_msat) struct amount_msat htlc_maximum_msat,
bool ignore_fee_limits)
{ {
struct channel *channel = tal(peer->ld, struct channel); struct channel *channel = tal(peer->ld, struct channel);
struct amount_msat htlc_min, htlc_max; struct amount_msat htlc_min, htlc_max;
@@ -541,6 +543,7 @@ struct channel *new_channel(struct peer *peer, u64 dbid,
channel->closer = closer; channel->closer = closer;
channel->close_blockheight = NULL; channel->close_blockheight = NULL;
channel->state_change_cause = reason; channel->state_change_cause = reason;
channel->ignore_fee_limits = ignore_fee_limits;
/* Make sure we see any spends using this key */ /* Make sure we see any spends using this key */
if (!local_shutdown_scriptpubkey) { if (!local_shutdown_scriptpubkey) {

6
lightningd/channel.h
View File

@@ -269,6 +269,9 @@ struct channel {
/* `Channel-shell` of this channel /* `Channel-shell` of this channel
* (Minimum information required to backup this channel). */ * (Minimum information required to backup this channel). */
struct scb_chan *scb; struct scb_chan *scb;
/* Do we allow the peer to set any fee it wants? */
bool ignore_fee_limits;
}; };
bool channel_is_connected(const struct channel *channel); bool channel_is_connected(const struct channel *channel);
@@ -345,7 +348,8 @@ struct channel *new_channel(struct peer *peer, u64 dbid,
u32 lease_chan_max_msat, u32 lease_chan_max_msat,
u16 lease_chan_max_ppt, u16 lease_chan_max_ppt,
struct amount_msat htlc_minimum_msat, struct amount_msat htlc_minimum_msat,
struct amount_msat htlc_maximum_msat); struct amount_msat htlc_maximum_msat,
bool ignore_fee_limits);
/* new_inflight - Create a new channel_inflight for a channel */ /* new_inflight - Create a new channel_inflight for a channel */
struct channel_inflight * struct channel_inflight *

6
lightningd/opening_control.c
View File

@@ -231,7 +231,8 @@ wallet_commit_channel(struct lightningd *ld,
&lease_start_blockheight)), &lease_start_blockheight)),
0, NULL, 0, 0, /* No leases on v1s */ 0, NULL, 0, 0, /* No leases on v1s */
ld->config.htlc_minimum_msat, ld->config.htlc_minimum_msat,
ld->config.htlc_maximum_msat); ld->config.htlc_maximum_msat,
ld->config.ignore_fee_limits);
/* Now we finally put it in the database. */ /* Now we finally put it in the database. */
wallet_channel_insert(ld->wallet, channel); wallet_channel_insert(ld->wallet, channel);
@@ -1464,7 +1465,8 @@ static struct channel *stub_chan(struct command *cmd,
&blockht)), &blockht)),
0, NULL, 0, 0, /* No leases on v1s */ 0, NULL, 0, 0, /* No leases on v1s */
ld->config.htlc_minimum_msat, ld->config.htlc_minimum_msat,
ld->config.htlc_maximum_msat); ld->config.htlc_maximum_msat,
false);
return channel; return channel;
} }

3
wallet/test/run-wallet.c
View File

@@ -1672,7 +1672,8 @@ static bool test_channel_inflight_crud(struct lightningd *ld, const tal_t *ctx)
lease_commit_sig, lease_commit_sig,
7777, 22, 7777, 22,
AMOUNT_MSAT(0), AMOUNT_MSAT(0),
AMOUNT_MSAT(-1ULL)); AMOUNT_MSAT(-1ULL),
false);
db_begin_transaction(w->db); db_begin_transaction(w->db);
CHECK(!wallet_err); CHECK(!wallet_err);
wallet_channel_insert(w, chan); wallet_channel_insert(w, chan);

4
wallet/wallet.c
View File

@@ -1619,7 +1619,9 @@ static struct channel *wallet_stmt2channel(struct wallet *w, struct db_stmt *stm
lease_chan_max_msat, lease_chan_max_msat,
lease_chan_max_ppt, lease_chan_max_ppt,
htlc_minimum_msat, htlc_minimum_msat,
htlc_maximum_msat); htlc_maximum_msat,
/* FIXME: load from db! */
false);
if (!wallet_channel_load_inflights(w, chan)) { if (!wallet_channel_load_inflights(w, chan)) {
tal_free(chan); tal_free(chan);