mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 05:12:45 +01:00
Code Issues Projects Releases Wiki Activity

walletrpc: Split owned output detection out and use it for change

Browse Source 
Splitting the detection for outputs that we own into a separate
`wallet_extract_owned_outputs` function and use it when the broadcast
succeeds to re-add the change output back to the database.
This commit is contained in:
Christian Decker 2017-06-22 14:20:41 +02:00 committed by Rusty Russell
parent 938ab67a01
commit a1faccb9dc
2 changed files with 53 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wallet/wallet.c
View File

@ -197,7 +197,7 @@ bool wallet_can_spend(struct wallet *w, const u8 *script,
else
return false;
for (i = 0; i < bip32_max_index; i++) {
for (i = 0; i <= bip32_max_index; i++) {
u8 *s;
if (bip32_key_from_parent(w->bip32_base, i,

80
wallet/walletrpc.c
View File

@ -23,6 +23,39 @@ struct withdrawal {
const char *hextx;
};
/**
* wallet_extract_owned_outputs - given a tx, extract all of our outputs
*/
static int wallet_extract_owned_outputs(struct wallet *w,
const struct bitcoin_tx *tx,
u64 *total_satoshi)
{
int num_utxos = 0;
for (size_t output = 0; output < tal_count(tx->output); output++) {
struct utxo *utxo;
u32 index;
bool is_p2sh;
if (!wallet_can_spend(w, tx->output[output].script, &index, &is_p2sh))
continue;
utxo = tal(w, struct utxo);
utxo->keyindex = index;
utxo->is_p2sh = is_p2sh;
utxo->amount = tx->output[output].amount;
utxo->status = output_state_available;
bitcoin_txid(tx, &utxo->txid);
utxo->outnum = output;
if (!wallet_add_utxo(w, utxo, p2sh_wpkh)) {
tal_free(utxo);
return -1;
}
*total_satoshi += utxo->amount;
num_utxos++;
}
return num_utxos;
}
/**
* wallet_withdrawal_broadcast - The tx has been broadcast (or it failed)
*
@ -38,12 +71,22 @@ static void wallet_withdrawal_broadcast(struct bitcoind *bitcoind,
{
struct command *cmd = withdraw->cmd;
struct lightningd *ld = ld_from_dstate(withdraw->cmd->dstate);
struct bitcoin_tx *tx;
u64 change_satoshi = 0;
/* Massage output into shape so it doesn't kill the JSON serialization */
char *output = tal_strjoin(cmd, tal_strsplit(cmd, msg, "\n", STR_NO_EMPTY), " ", STR_NO_TRAIL);
if (exitstatus == 0) {
/* Mark used outputs as spent */
wallet_confirm_utxos(ld->wallet, withdraw->utxos);
/* TODO(cdecker) Add the change output to the database */
/* Parse the tx and extract the change output. We
* generated the hex tx, so this should always work */
tx = bitcoin_tx_from_hex(withdraw, withdraw->hextx, strlen(withdraw->hextx));
assert(tx != NULL);
wallet_extract_owned_outputs(ld->wallet, tx, &change_satoshi);
assert(change_satoshi == withdraw->changesatoshi);
struct json_result *response = new_json_result(cmd);
json_object_start(response, NULL);
json_add_string(response, "tx", withdraw->hextx);
@ -245,8 +288,8 @@ static void json_addfunds(struct command *cmd,
struct json_result *response = new_json_result(cmd);
jsmntok_t *txtok;
struct bitcoin_tx *tx;
int output;
size_t txhexlen, num_utxos = 0;
size_t txhexlen;
int num_utxos = 0;
u64 total_satoshi = 0;
if (!json_get_params(buffer, params, "tx", &txtok, NULL)) {
@ -264,31 +307,12 @@ static void json_addfunds(struct command *cmd,
}
/* Find an output we know how to spend. */
for (output = 0; output < tal_count(tx->output); output++) {
struct utxo *utxo;
u32 index;
bool is_p2sh;
if (!wallet_can_spend(ld->wallet, tx->output[output].script, &index, &is_p2sh))
continue;
utxo = tal(ld, struct utxo);
utxo->keyindex = index;
utxo->is_p2sh = is_p2sh;
utxo->amount = tx->output[output].amount;
utxo->status = output_state_available;
bitcoin_txid(tx, &utxo->txid);
utxo->outnum = output;
if (!wallet_add_utxo(ld->wallet, utxo, p2sh_wpkh)) {
command_fail(cmd, "Could add outputs to wallet");
tal_free(utxo);
return;
}
total_satoshi += utxo->amount;
num_utxos++;
}
if (!num_utxos) {
num_utxos =
wallet_extract_owned_outputs(ld->wallet, tx, &total_satoshi);
if (num_utxos < 0) {
command_fail(cmd, "Could add outputs to wallet");
return;
} else if (!num_utxos) {
command_fail(cmd, "No usable outputs");
return;
}