mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-22 14:42:40 +01:00
Code Issues Projects Releases Wiki Activity

withdraw: make rpc call accept 'all' as a value.

Browse source 
Closes: #409
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2017-12-20 06:40:19 +10:30
parent 8cd7ebb924
commit 3da93319fb
2 changed files with 43 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tests/test_lightningd.py
View file

@ -2141,6 +2141,21 @@ class LightningDTests(BaseLightningDTests):
# Non-zero padding in 8-to-5 conversion # Non-zero padding in 8-to-5 conversion
self.assertRaises(ValueError, l1.rpc.withdraw, 'tb1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3pjxtptv', 2*amount) self.assertRaises(ValueError, l1.rpc.withdraw, 'tb1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3pjxtptv', 2*amount)
# Should have 6 outputs available.
c = db.cursor()
c.execute('SELECT COUNT(*) FROM outputs WHERE status=0')
assert(c.fetchone()[0] == 6)
out = l1.rpc.withdraw(waddr, 'all')
c = db.cursor()
c.execute('SELECT COUNT(*) FROM outputs WHERE status=0')
assert(c.fetchone()[0] == 0)
# This should fail, can't even afford fee.
self.assertRaises(ValueError, l1.rpc.withdraw, waddr, 'all')
l1.daemon.wait_for_log('Cannot afford fee')
def test_funding_change(self): def test_funding_change(self):
"""Add some funds, fund a channel, and make sure we remember the change """Add some funds, fund a channel, and make sure we remember the change
""" """

25
wallet/walletrpc.c
View file

@ -9,6 +9,7 @@
#include <common/withdraw_tx.h> #include <common/withdraw_tx.h>
#include <errno.h> #include <errno.h>
#include <hsmd/gen_hsm_client_wire.h> #include <hsmd/gen_hsm_client_wire.h>
#include <inttypes.h>
#include <lightningd/bitcoind.h> #include <lightningd/bitcoind.h>
#include <lightningd/chaintopology.h> #include <lightningd/chaintopology.h>
#include <lightningd/hsm_control.h> #include <lightningd/hsm_control.h>
@ -199,6 +200,7 @@ static void json_withdraw(struct command *cmd,
struct pubkey changekey; struct pubkey changekey;
secp256k1_ecdsa_signature *sigs; secp256k1_ecdsa_signature *sigs;
struct bitcoin_tx *tx; struct bitcoin_tx *tx;
bool withdraw_all = false;
if (!json_get_params(buffer, params, if (!json_get_params(buffer, params,
"destination", &desttok, "destination", &desttok,
@ -211,7 +213,9 @@ static void json_withdraw(struct command *cmd,
withdraw = tal(cmd, struct withdrawal); withdraw = tal(cmd, struct withdrawal);
withdraw->cmd = cmd; withdraw->cmd = cmd;
if (!json_tok_u64(buffer, sattok, &withdraw->amount)) { if (json_tok_streq(buffer, sattok, "all"))
withdraw_all = true;
else if (!json_tok_u64(buffer, sattok, &withdraw->amount)) {
command_fail(cmd, "Invalid satoshis"); command_fail(cmd, "Invalid satoshis");
return; return;
} }
@ -241,14 +245,29 @@ static void json_withdraw(struct command *cmd,
} }
/* Select the coins */ /* Select the coins */
if (withdraw_all) {
withdraw->utxos = wallet_select_all(cmd, cmd->ld->wallet,
feerate_per_kw,
&withdraw->amount,
&fee_estimate);
/* FIXME Pull dust amount from the daemon config */
if (!withdraw->utxos || withdraw->amount < 546) {
command_fail(cmd, "Cannot afford fee %"PRIu64,
fee_estimate);
return;
}
withdraw->changesatoshi = 0;
} else {
withdraw->utxos = wallet_select_coins(cmd, cmd->ld->wallet, withdraw->utxos = wallet_select_coins(cmd, cmd->ld->wallet,
withdraw->amount, withdraw->amount,
feerate_per_kw, &fee_estimate, feerate_per_kw,
&fee_estimate,
&withdraw->changesatoshi); &withdraw->changesatoshi);
if (!withdraw->utxos) { if (!withdraw->utxos) {
command_fail(cmd, "Not enough funds available"); command_fail(cmd, "Not enough funds available");
return; return;
} }
}
/* FIXME(cdecker) Pull this from the daemon config */ /* FIXME(cdecker) Pull this from the daemon config */
if (withdraw->changesatoshi <= 546) if (withdraw->changesatoshi <= 546)
@ -314,7 +333,7 @@ static void json_withdraw(struct command *cmd,
static const struct json_command withdraw_command = { static const struct json_command withdraw_command = {
"withdraw", "withdraw",
json_withdraw, json_withdraw,
"Send {satoshi} to the {destination} address via Bitcoin transaction", "Send {satoshi} (or 'all') to the {destination} address via Bitcoin transaction",
"Returns the withdrawal transaction ID" "Returns the withdrawal transaction ID"
}; };
AUTODATA(json_command, &withdraw_command); AUTODATA(json_command, &withdraw_command);