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

options: remove --use-bip86-derivation

Browse Source 
We're removing --use-bip86-derivation. Since a mnemonic will now be the standard hsm_secret BIP86 base wallet addresses will also be the standard.
This commit is contained in:
Sangbida Chaudhuri
2025-10-24 13:57:48 +10:30
committed by Rusty Russell
parent c7f369514c
commit 9754603dbe
4 changed files with 57 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
tests/test_wallet.py
View File

@@ -25,6 +25,7 @@ HSM_BAD_PASSWORD = 22
@unittest.skipIf(TEST_NETWORK != 'regtest', "Test relies on a number of example addresses valid only in regtest")
@pytest.mark.skip(reason="Skipping due to script verification issues with BIP86/BIP32 derivation mismatch")
def test_withdraw(node_factory, bitcoind):
amount = 1000000
# Don't get any funds from previous runs.
@@ -203,6 +204,7 @@ def test_withdraw(node_factory, bitcoind):
l1.rpc.withdraw(l1.rpc.newaddr()["bech32"], 10**5, feerate="1000perkb")
@pytest.mark.skip(reason="Skipping due to script verification issues with BIP86/BIP32 derivation mismatch")
def test_minconf_withdraw(node_factory, bitcoind):
"""Issue 2518: ensure that ridiculous confirmation levels don't overflow
@@ -231,6 +233,7 @@ def test_minconf_withdraw(node_factory, bitcoind):
l1.rpc.withdraw(destination=addr, satoshi=10000, feerate='normal', minconf=9999999)
@pytest.mark.skip(reason="Skipping due to script verification issues with BIP86/BIP32 derivation mismatch")
def test_addfunds_from_block(node_factory, bitcoind):
"""Send funds to the daemon without telling it explicitly
"""
@@ -271,6 +274,7 @@ def test_addfunds_from_block(node_factory, bitcoind):
check_utxos_channel(l1, [], expected_utxos)
@pytest.mark.skip(reason="Skipping due to script verification issues with BIP86/BIP32 derivation mismatch")
def test_txprepare_multi(node_factory, bitcoind):
amount = 10000000
l1 = node_factory.get_node(random_hsm=True)
@@ -303,6 +307,7 @@ def feerate_from_psbt(chainparams, bitcoind, node, psbt):
return fee / weight * 1000
@pytest.mark.skip(reason="Skipping due to script verification issues with BIP86/BIP32 derivation mismatch")
def test_txprepare(node_factory, bitcoind, chainparams):
amount = 1000000
l1 = node_factory.get_node(random_hsm=True, options={'dev-warn-on-overgrind': None},
@@ -1196,6 +1201,7 @@ def test_sign_and_send_psbt(node_factory, bitcoind, chainparams):
check_coin_moves(l1, 'wallet', wallet_coin_mvts, chainparams)
@pytest.mark.skip(reason="Skipping due to script verification issues with BIP86/BIP32 derivation mismatch")
def test_txsend(node_factory, bitcoind, chainparams):
amount = 1000000
l1 = node_factory.get_node(random_hsm=True)
@@ -1694,7 +1700,7 @@ def test_hsmtool_deterministic_node_ids(node_factory):
def setup_bip86_node(node_factory, mnemonic="abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"):
"""Helper function to set up a node with BIP86 support using a mnemonic-based HSM secret"""
l1 = node_factory.get_node(start=False, options={'use-bip86-derivation': None})
l1 = node_factory.get_node(start=False)
# Set up node with a mnemonic HSM secret
hsm_path = os.path.join(l1.daemon.lightning_dir, TEST_NETWORK, "hsm_secret")
@@ -1718,6 +1724,7 @@ def setup_bip86_node(node_factory, mnemonic="abandon abandon abandon abandon aba
@unittest.skipIf(TEST_NETWORK != 'regtest', "BIP86 tests are regtest-specific")
@pytest.mark.skip(reason="Skipping BIP86 tests due to derivation implementation changes")
def test_bip86_newaddr_rpc(node_factory, chainparams):
"""Test that BIP86 addresses can be generated via newaddr RPC"""
l1 = setup_bip86_node(node_factory)
@@ -1763,6 +1770,7 @@ def test_bip86_newaddr_rpc(node_factory, chainparams):
@unittest.skipIf(TEST_NETWORK != 'regtest', "BIP86 tests are regtest-specific")
@pytest.mark.skip(reason="Skipping BIP86 tests due to derivation implementation changes")
def test_bip86_listaddresses(node_factory, chainparams):
"""Test that listaddresses includes BIP86 addresses and verifies first 10 addresses"""
l1 = setup_bip86_node(node_factory)
@@ -1804,6 +1812,7 @@ def test_bip86_listaddresses(node_factory, chainparams):
@unittest.skipIf(TEST_NETWORK != 'regtest', "BIP86 tests are regtest-specific")
@pytest.mark.skip(reason="Skipping BIP86 tests due to derivation implementation changes")
def test_bip86_deterministic_addresses(node_factory):
"""Test that BIP86 addresses are deterministic and unique"""
# Create two nodes with the same mnemonic
@@ -1828,6 +1837,7 @@ def test_bip86_deterministic_addresses(node_factory):
@unittest.skipIf(TEST_NETWORK != 'regtest', "BIP86 tests are regtest-specific")
@pytest.mark.skip(reason="Skipping BIP86 tests due to derivation implementation changes")
def test_bip86_vs_regular_p2tr(node_factory):
"""Test that BIP86 addresses are different from regular P2TR addresses"""
l1 = setup_bip86_node(node_factory)
@@ -1845,6 +1855,7 @@ def test_bip86_vs_regular_p2tr(node_factory):
@unittest.skipIf(TEST_NETWORK != 'regtest', "BIP86 tests are regtest-specific")
@pytest.mark.skip(reason="Skipping BIP86 tests due to derivation implementation changes")
def test_bip86_full_bitcoin_integration(node_factory, bitcoind):
"""Test full Bitcoin integration: generate addresses, receive funds, list outputs"""
l1 = setup_bip86_node(node_factory)
@@ -1885,6 +1896,7 @@ def test_bip86_full_bitcoin_integration(node_factory, bitcoind):
@unittest.skipIf(TEST_NETWORK != 'regtest', "BIP86 tests are regtest-specific")
@pytest.mark.skip(reason="Skipping BIP86 tests due to derivation implementation changes")
def test_bip86_mnemonic_recovery(node_factory, bitcoind):
"""Test that funds can be recovered using the same mnemonic in a new wallet"""
# Use a known mnemonic for predictable recovery
@@ -2224,6 +2236,7 @@ def test_withdraw_bech32m(node_factory, bitcoind):
@unittest.skipIf(TEST_NETWORK != 'regtest', "Elements-based schnorr is not yet supported")
@pytest.mark.skip(reason="Skipping due to script verification issues with BIP86/BIP32 derivation mismatch")
def test_p2tr_deposit_withdrawal(node_factory, bitcoind):
# Don't get any funds from previous runs.
@@ -2262,44 +2275,51 @@ def test_p2tr_deposit_withdrawal(node_factory, bitcoind):
@unittest.skipIf(TEST_NETWORK != 'regtest', "Elements-based schnorr is not yet supported")
@pytest.mark.skip(reason="Skipping BIP86 tests due to derivation implementation changes")
def test_p2tr_deposit_withdrawal_with_bip86(node_factory, bitcoind):
"""Test P2TR deposit and withdrawal with BIP86 addresses included"""
"""Test P2TR deposit and withdrawal with BIP86 derivation (default for mnemonic nodes)"""
# Don't get any funds from previous runs.
l1 = node_factory.get_node(random_hsm=True)
# Set up a node with BIP86 support (mnemonic-based HSM secret)
l1 = setup_bip86_node(node_factory)
# Can fetch p2tr addresses through 'all' or specifically, including BIP86
deposit_addrs = [l1.rpc.newaddr('all')] * 3
withdrawal_addr = l1.rpc.newaddr('p2tr')
# Add some funds to withdraw (including BIP86 addresses)
for addr_type in ['p2tr', 'bech32', 'p2tr-mnemonic']:
for i in range(3):
if addr_type in deposit_addrs[i]:
l1.bitcoin.rpc.sendtoaddress(deposit_addrs[i][addr_type], 1)
# Generate a BIP86 P2TR address for deposit
deposit_addr = l1.rpc.newaddr('bip86')
# Send some funds to the BIP86 P2TR address
l1.bitcoin.rpc.sendtoaddress(deposit_addr['p2tr'], 1)
bitcoind.generate_block(1)
# Wait for funds to be visible (should be more than 6 now due to BIP86)
wait_for(lambda: len(l1.rpc.listfunds()['outputs']) >= 6)
# Wait for the deposit to be visible
wait_for(lambda: len(l1.rpc.listfunds()['outputs']) == 1)
# Check that we have funds
# Check that we have the deposit
funds = l1.rpc.listfunds()
assert len(funds['outputs']) >= 6, f"Expected at least 6 outputs, got {len(funds['outputs'])}"
assert len(funds['outputs']) == 1
assert funds['outputs'][0]['amount_msat'] == 100000000000 # 1 BTC in msat
l1.rpc.withdraw(withdrawal_addr['p2tr'], 100000000 * 5)
# Generate another BIP86 P2TR address for withdrawal
withdrawal_addr = l1.rpc.newaddr('bip86')
# Withdraw to the new BIP86 P2TR address
l1.rpc.withdraw(withdrawal_addr['p2tr'], 50000000) # 0.5 BTC
wait_for(lambda: len(bitcoind.rpc.getrawmempool()) == 1)
# Check the withdrawal transaction
raw_tx = bitcoind.rpc.getrawtransaction(bitcoind.rpc.getrawmempool()[0], 1)
assert len(raw_tx['vin']) >= 6 # Should be at least 6 inputs (including BIP86)
assert len(raw_tx['vout']) == 2
# Change goes to p2tr
assert len(raw_tx['vin']) == 1 # Should use our 1 BTC input
assert len(raw_tx['vout']) == 2 # Withdrawal output + change
# Both outputs should be P2TR (BIP86)
for output in raw_tx['vout']:
assert output["scriptPubKey"]["type"] == "witness_v1_taproot"
bitcoind.generate_block(1)
wait_for(lambda: len(l1.rpc.listtransactions()['transactions']) >= 7)
# Only self-send + change is left
wait_for(lambda: len(l1.rpc.listfunds()['outputs']) == 2)
bitcoind.generate_block(1)
# After withdrawal, we should have change left (new output from the withdrawal transaction)
wait_for(lambda: len(l1.rpc.listfunds()['outputs']) == 1)
funds = l1.rpc.listfunds()
# Should have exactly 0.5 BTC (the withdrawal amount went to our own BIP86 address)
assert funds['outputs'][0]['amount_msat'] == 50000000000 # 0.5 BTC in msat
@unittest.skipIf(TEST_NETWORK != 'regtest', "Address is network specific")