mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-19 18:11:28 +01:00
Code Issues Projects Releases Wiki Activity

Rearrange checking of withdrawal address parsing success in json_withdraw.

Browse Source
This commit is contained in:
ZmnSCPxj 2017-12-10 06:49:51 +00:00 committed by Rusty Russell
parent b56fea8b2a
commit 9f481226fa
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wallet/walletrpc.c
View File

@ -108,14 +108,22 @@ static void json_withdraw(struct command *cmd,
command_fail(cmd, "Invalid satoshis");
return;
}
if (!bitcoin_from_base58(&testnet, &p2pkh_destination,
buffer + desttok->start,
desttok->end - desttok->start)) {
withdraw->destination = NULL;
if (bitcoin_from_base58(&testnet, &p2pkh_destination,
buffer + desttok->start,
desttok->end - desttok->start)) {
withdraw->destination
= scriptpubkey_p2pkh(withdraw, &p2pkh_destination);
}
/* TODO Insert other supported addresses here. */
/* Check that destination address could be understood. */
if (!withdraw->destination) {
command_fail(cmd, "Could not parse destination address");
return;
}
withdraw->destination
= scriptpubkey_p2pkh(withdraw, &p2pkh_destination);
/* Check address given is compatible with the chain we are on. */
if (testnet != get_chainparams(cmd->ld)->testnet) {