aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-21 08:04:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

newaddr: support bech32 p2wpkh funding addresses

Browse Source 
* Add optional addresstype param to newaddr, which can be one of:

    - bech32
    - p2sh-segwit
    - nothing (defaults to p2sh-segwit)

The naming here mirrors bitcoind

* txfilter already looks for p2wpkh outputs, so we're covered there

Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2018-01-23 23:01:21 -08:00
committed by Rusty Russell
parent 4fd7e26bf7
commit 37ea24e9c9
1 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
wallet/walletrpc.c
View File

@@ -318,10 +318,30 @@ static void json_newaddr(struct command *cmd,
struct json_result *response = new_json_result(cmd); struct json_result *response = new_json_result(cmd);
struct ext_key ext; struct ext_key ext;
struct sha256 h; struct sha256 h;
struct ripemd160 p2sh; struct ripemd160 h160;
struct pubkey pubkey; struct pubkey pubkey;
jsmntok_t *addrtype;
u8 *redeemscript; u8 *redeemscript;
bool is_p2wpkh, ok;
s64 keyidx; s64 keyidx;
char *out;
const char *hrp;
if (!json_get_params(cmd, buffer, params,
"?addresstype", &addrtype, NULL)) {
return;
}
if (!addrtype || json_tok_streq(buffer, addrtype, "p2sh-segwit"))
is_p2wpkh = false;
else if (json_tok_streq(buffer, addrtype, "bech32"))
is_p2wpkh = true;
else {
command_fail(cmd,
"Invalid address type "
"(expected bech32 or p2sh-segwit)");
return;
}
keyidx = wallet_get_newindex(cmd->ld); keyidx = wallet_get_newindex(cmd->ld);
if (keyidx < 0) { if (keyidx < 0) {
@@ -343,14 +363,27 @@ static void json_newaddr(struct command *cmd,
txfilter_add_derkey(cmd->ld->owned_txfilter, ext.pub_key); txfilter_add_derkey(cmd->ld->owned_txfilter, ext.pub_key);
if (is_p2wpkh) {
hrp = get_chainparams(cmd->ld)->bip173_name;
/* out buffer is 73 + strlen(human readable part). see bech32.h */
out = tal_arr(cmd, char, 73 + strlen(hrp));
pubkey_to_hash160(&pubkey, &h160);
ok = segwit_addr_encode(out, hrp, 0, h160.u.u8, sizeof(h160.u.u8));
if (!ok) {
command_fail(cmd, "p2wpkh address encoding failure.");
return;
}
}
else {
redeemscript = bitcoin_redeem_p2sh_p2wpkh(cmd, &pubkey); redeemscript = bitcoin_redeem_p2sh_p2wpkh(cmd, &pubkey);
sha256(&h, redeemscript, tal_count(redeemscript)); sha256(&h, redeemscript, tal_count(redeemscript));
ripemd160(&p2sh, h.u.u8, sizeof(h)); ripemd160(&h160, h.u.u8, sizeof(h));
out = p2sh_to_base58(cmd,
get_chainparams(cmd->ld)->testnet, &h160);
}
json_object_start(response, NULL); json_object_start(response, NULL);
json_add_string(response, "address", json_add_string(response, "address", out);
p2sh_to_base58(cmd, get_chainparams(cmd->ld)->testnet,
&p2sh));
json_object_end(response); json_object_end(response);
command_success(cmd, response); command_success(cmd, response);
} }
@@ -358,7 +391,7 @@ static void json_newaddr(struct command *cmd,
static const struct json_command newaddr_command = { static const struct json_command newaddr_command = {
"newaddr", "newaddr",
json_newaddr, json_newaddr,
"Get a new address to fund a channel" "Get a new {bech32, p2sh-segwit} address to fund a channel"
}; };
AUTODATA(json_command, &newaddr_command); AUTODATA(json_command, &newaddr_command);