mirror of
https://github.com/aljazceru/lightning.git
synced 2026-01-04 14:54:26 +01:00
bcli: become less aggressive with onchain fee levels.
Users are more upset recently with the cost of unilateral closes than they are the risk of being cheated. While we complete our anchor implementation so we can use low fees there, let's get less aggressive (we already have 34 or 18 blocks to close in the worst case). The changes are: - Commit transactions were "2 CONSERVATIVE" now "6 ECONOMICAL". - HTLC resolution txs were "3 CONSERVATIVE" now "6 ECONOMICAL". - Penalty txs were "3 CONSERVATIVE" now "12 ECONOMICAL". - Normal txs were "4 ECONOMICAL" now "12 ECONOMICAL". There can be no perfect levels, but we have had understandable complaints recently about how high our default fee levels are. Changelog-Changed: Protocol: channel feerates reduced to bitcoind's "6 block ECONOMICAL" rate. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
@@ -814,7 +814,7 @@ def test_penalty_htlc_tx_fulfill(node_factory, bitcoind, chainparams):
|
||||
|
||||
# reconnect with l1, which will fulfill the payment
|
||||
l2.rpc.connect(l1.info['id'], 'localhost', l1.port)
|
||||
l2.daemon.wait_for_log('got commitsig .*: feerate 15000, 0 added, 1 fulfilled, 0 failed, 0 changed')
|
||||
l2.daemon.wait_for_log('got commitsig .*: feerate 11000, 0 added, 1 fulfilled, 0 failed, 0 changed')
|
||||
l2.daemon.wait_for_log('coins payment_hash: {}'.format(sticky_inv['payment_hash']))
|
||||
|
||||
# l2 moves on for closed l3
|
||||
@@ -970,7 +970,7 @@ def test_penalty_htlc_tx_timeout(node_factory, bitcoind, chainparams):
|
||||
|
||||
# reconnect with l1, which will fulfill the payment
|
||||
l2.rpc.connect(l1.info['id'], 'localhost', l1.port)
|
||||
l2.daemon.wait_for_log('got commitsig .*: feerate 15000, 0 added, 1 fulfilled, 0 failed, 0 changed')
|
||||
l2.daemon.wait_for_log('got commitsig .*: feerate 11000, 0 added, 1 fulfilled, 0 failed, 0 changed')
|
||||
l2.daemon.wait_for_log('coins payment_hash: {}'.format(sticky_inv_2['payment_hash']))
|
||||
|
||||
# l2 moves on for closed l3
|
||||
@@ -2000,11 +2000,11 @@ def test_onchain_different_fees(node_factory, bitcoind, executor):
|
||||
# Both sides should have correct feerate
|
||||
assert l1.db_query('SELECT min_possible_feerate, max_possible_feerate FROM channels;') == [{
|
||||
'min_possible_feerate': 5000,
|
||||
'max_possible_feerate': 16000
|
||||
'max_possible_feerate': 11000
|
||||
}]
|
||||
assert l2.db_query('SELECT min_possible_feerate, max_possible_feerate FROM channels;') == [{
|
||||
'min_possible_feerate': 5000,
|
||||
'max_possible_feerate': 16000
|
||||
'max_possible_feerate': 11000
|
||||
}]
|
||||
|
||||
bitcoind.generate_block(5)
|
||||
|
||||
Reference in New Issue
Block a user