diff --git a/doc/undoc-flags.json b/doc/undoc-flags.json index 123b7b313..ef8b8fe23 100644 --- a/doc/undoc-flags.json +++ b/doc/undoc-flags.json @@ -13,6 +13,7 @@ "funder-policy", "funder-policy-mod", "funder-reserve-tank", + "lease-fee-base-sat", "lease-fee-base-msat", "lease-fee-basis", "lease-funding-weight" diff --git a/plugins/funder.c b/plugins/funder.c index bbe3bbebc..d2c572a63 100644 --- a/plugins/funder.c +++ b/plugins/funder.c @@ -1259,7 +1259,7 @@ int main(int argc, char **argv) plugin_option("funder-fuzz-percent", "int", "Percent to fuzz the policy contribution by." - " Defaults to 5%. Max is 100%", + " Defaults to 0%. Max is 100%", u32_option, ¤t_policy->fuzz_factor), plugin_option("funder-fund-probability", @@ -1276,7 +1276,12 @@ int main(int argc, char **argv) " being advertised", bool_option, ¤t_policy->leases_only), - plugin_option("lease-fee-base-msat", + plugin_option("lease-fee-base-sat", + "string", + "Channel lease rates, base fee for leased" + " funds, in satoshi.", + option_lease_fee_base, current_policy), + plugin_option_deprecated("lease-fee-base-msat", "string", "Channel lease rates, base fee for leased" " funds, in satoshi.", diff --git a/tests/test_closing.py b/tests/test_closing.py index d449154d5..4643c8e8b 100644 --- a/tests/test_closing.py +++ b/tests/test_closing.py @@ -737,9 +737,9 @@ def test_channel_lease_falls_behind(node_factory, bitcoind): their blockheight, the lessor fails the channel ''' opts = [{'funder-policy': 'match', 'funder-policy-mod': 100, - 'lease-fee-base-msat': '100sat', 'lease-fee-basis': 100}, + 'lease-fee-base-sat': '100sat', 'lease-fee-basis': 100}, {'funder-policy': 'match', 'funder-policy-mod': 100, - 'lease-fee-base-msat': '100sat', 'lease-fee-basis': 100}] + 'lease-fee-base-sat': '100sat', 'lease-fee-basis': 100}] l1, l2, = node_factory.get_nodes(2, opts=opts) amount = 500000 feerate = 2000 @@ -776,7 +776,7 @@ def test_channel_lease_post_expiry(node_factory, bitcoind, chainparams): coin_mvt_plugin = os.path.join(os.getcwd(), 'tests/plugins/coin_movements.py') opts = {'funder-policy': 'match', 'funder-policy-mod': 100, - 'lease-fee-base-msat': '100sat', 'lease-fee-basis': 100, + 'lease-fee-base-sat': '100sat', 'lease-fee-basis': 100, 'may_reconnect': True, 'plugin': coin_mvt_plugin} l1, l2, = node_factory.get_nodes(2, opts=opts) @@ -884,7 +884,7 @@ def test_channel_lease_unilat_closes(node_factory, bitcoind): l2-l3: l2 leases funds from l3; l3 goes to chain unilaterally ''' opts = {'funder-policy': 'match', 'funder-policy-mod': 100, - 'lease-fee-base-msat': '100sat', 'lease-fee-basis': 100, + 'lease-fee-base-sat': '100sat', 'lease-fee-basis': 100, 'funder-lease-requests-only': False} l1, l2, l3 = node_factory.get_nodes(3, opts=opts) @@ -988,11 +988,11 @@ def test_channel_lease_lessor_cheat(node_factory, bitcoind, chainparams): ''' balance_snaps = os.path.join(os.getcwd(), 'tests/plugins/balance_snaps.py') opts = [{'funder-policy': 'match', 'funder-policy-mod': 100, - 'lease-fee-base-msat': '100sat', 'lease-fee-basis': 100, + 'lease-fee-base-sat': '100sat', 'lease-fee-basis': 100, 'may_reconnect': True, 'allow_warning': True, 'plugin': balance_snaps}, {'funder-policy': 'match', 'funder-policy-mod': 100, - 'lease-fee-base-msat': '100sat', 'lease-fee-basis': 100, + 'lease-fee-base-sat': '100sat', 'lease-fee-basis': 100, 'may_reconnect': True, 'allow_broken_log': True, 'plugin': balance_snaps}] l1, l2, = node_factory.get_nodes(2, opts=opts) @@ -1063,10 +1063,10 @@ def test_channel_lease_lessee_cheat(node_factory, bitcoind, chainparams): Check that lessor can recover funds if lessee cheats ''' opts = [{'funder-policy': 'match', 'funder-policy-mod': 100, - 'lease-fee-base-msat': '100sat', 'lease-fee-basis': 100, + 'lease-fee-base-sat': '100sat', 'lease-fee-basis': 100, 'may_reconnect': True, 'allow_broken_log': True}, {'funder-policy': 'match', 'funder-policy-mod': 100, - 'lease-fee-base-msat': '100sat', 'lease-fee-basis': 100, + 'lease-fee-base-sat': '100sat', 'lease-fee-basis': 100, 'may_reconnect': True}] l1, l2, = node_factory.get_nodes(2, opts=opts) amount = 500000 diff --git a/tests/test_gossip.py b/tests/test_gossip.py index e23d9caaf..4899f5971 100644 --- a/tests/test_gossip.py +++ b/tests/test_gossip.py @@ -1066,7 +1066,7 @@ def test_gossip_addresses(node_factory, bitcoind): @pytest.mark.openchannel('v2') def test_gossip_lease_rates(node_factory, bitcoind): lease_opts = {'lease-fee-basis': 50, - 'lease-fee-base-msat': '2000msat', + 'lease-fee-base-sat': '2000msat', 'channel-fee-max-base-msat': '500sat', 'channel-fee-max-proportional-thousandths': 200} l1, l2 = node_factory.get_nodes(2, opts=[lease_opts, {}]) diff --git a/tests/test_opening.py b/tests/test_opening.py index c56537bf8..c1c3dfa57 100644 --- a/tests/test_opening.py +++ b/tests/test_opening.py @@ -339,7 +339,7 @@ def test_v2_rbf_single(node_factory, bitcoind, chainparams): def test_v2_rbf_liquidity_ad(node_factory, bitcoind, chainparams): opts = {'funder-policy': 'match', 'funder-policy-mod': 100, - 'lease-fee-base-msat': '100sat', 'lease-fee-basis': 100, + 'lease-fee-base-sat': '100sat', 'lease-fee-basis': 100, 'may_reconnect': True} l1, l2 = node_factory.get_nodes(2, opts=opts)