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

wallet: change dev_listaddrs to also list bip86 addresses

Browse Source 
listaddrs is dev only and used in tests so it's okay if we change the API here, the usage is by positional arguments in tests so we're okay. Also changing est_option_upfront_shutdown_script to handle both old hsmsecret and the newer mnemonic one.
This commit is contained in:
Sangbida Chaudhuri
2026-01-14 08:24:22 +10:30
committed by Rusty Russell
parent 5fdc56c544
commit e19fd5d62c
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
wallet/walletrpc.c
View File

@@ -292,28 +292,40 @@ static struct command_result *json_listaddrs(struct command *cmd,
{
struct json_stream *response;
struct pubkey pubkey;
u64 *bip32_max_index;
u64 *max_index;
bool use_bip86 = (cmd->ld->bip86_base != NULL);
if (!param(cmd, buffer, params,
p_opt("bip32_max_index", param_u64, &bip32_max_index),
p_opt("max_index", param_u64, &max_index),
NULL))
return command_param_failed();
if (!bip32_max_index) {
bip32_max_index = tal(cmd, u64);
*bip32_max_index = db_get_intvar(cmd->ld->wallet->db,
"bip32_max_index", 0);
if (!max_index) {
max_index = tal(cmd, u64);
/* Use bip86_max_index for BIP86 wallets, bip32_max_index for legacy */
if (use_bip86) {
*max_index = db_get_intvar(cmd->ld->wallet->db,
"bip86_max_index", 0);
} else {
*max_index = db_get_intvar(cmd->ld->wallet->db,
"bip32_max_index", 0);
}
}
response = json_stream_success(cmd);
json_array_start(response, "addresses");
for (s64 keyidx = 1; keyidx <= *bip32_max_index; keyidx++) {
for (s64 keyidx = 1; keyidx <= *max_index; keyidx++) {
if (keyidx == BIP32_INITIAL_HARDENED_CHILD){
break;
}
bip32_pubkey(cmd->ld, &pubkey, keyidx);
/* Use BIP86 derivation for BIP86 wallets, BIP32 for legacy */
if (use_bip86) {
bip86_pubkey(cmd->ld, &pubkey, keyidx);
} else {
bip32_pubkey(cmd->ld, &pubkey, keyidx);
}
// bech32 : p2wpkh
u8 *redeemscript_p2wpkh;