aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-16 20:34:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

wtx_select_utxos: use wallet_tx as our allocation context for utxos.

Browse Source 
We currently allocate utxos off cmd, but the next commit will persist a
wtx beyond the command which created it, breaking that assumption.

In general, a struct member should be owned by the struct itself, and
a tal context should be an explicit arg, not implicit.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2019-06-05 14:59:05 +09:30
parent 663315c325
commit 3b91a6f7c3
3 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/wallet_tx.c
View File

@@ -65,7 +65,7 @@ struct command_result *wtx_select_utxos(struct wallet_tx *tx,
if (tx->all_funds) {
struct amount_sat amount;
tx->utxos = wallet_select_all(tx->cmd, tx->cmd->ld->wallet,
tx->utxos = wallet_select_all(tx, tx->cmd->ld->wallet,
fee_rate_per_kw, out_len,
maxheight,
&amount,
@@ -87,7 +87,7 @@ struct command_result *wtx_select_utxos(struct wallet_tx *tx,
tx->utxos = tal_free(tx->utxos);
}
tx->utxos = wallet_select_coins(tx->cmd, tx->cmd->ld->wallet,
tx->utxos = wallet_select_coins(tx, tx->cmd->ld->wallet,
tx->amount,
fee_rate_per_kw, out_len,
maxheight,

57
lightningd/opening_control.c
View File

@@ -70,7 +70,7 @@ struct uncommitted_channel {
struct funding_channel {
struct command *cmd; /* Which initially owns us until openingd request */
struct wallet_tx wtx;
struct wallet_tx *wtx;
struct amount_msat push;
u8 channel_flags;
@@ -131,7 +131,7 @@ void json_add_uncommitted_channel(struct json_stream *response,
}
/* These should never fail. */
if (amount_sat_to_msat(&total, uc->fc->wtx.amount)
if (amount_sat_to_msat(&total, uc->fc->wtx->amount)
&& amount_msat_sub(&ours, total, uc->fc->push)) {
json_add_amount_msat_compat(response, ours,
"msatoshi_to_us", "to_us_msat");
@@ -336,16 +336,16 @@ static void opening_funder_finished(struct subd *openingd, const u8 *resp,
&channel_info.remote_per_commit));
/* Generate the funding tx. */
if (!amount_sat_eq(fc->wtx.change, AMOUNT_SAT(0))
if (!amount_sat_eq(fc->wtx->change, AMOUNT_SAT(0))
&& !bip32_pubkey(ld->wallet->bip32_base,
&changekey, fc->wtx.change_key_index))
fatal("Error deriving change key %u", fc->wtx.change_key_index);
&changekey, fc->wtx->change_key_index))
fatal("Error deriving change key %u", fc->wtx->change_key_index);
fundingtx = funding_tx(tmpctx, &funding_outnum,
fc->wtx.utxos, fc->wtx.amount,
fc->wtx->utxos, fc->wtx->amount,
&fc->uc->local_funding_pubkey,
&channel_info.remote_fundingkey,
fc->wtx.change, &changekey,
fc->wtx->change, &changekey,
ld->wallet->bip32_base);
log_debug(fc->uc->log, "Funding tx has %zi inputs, %zu outputs:",
@@ -358,8 +358,8 @@ static void opening_funder_finished(struct subd *openingd, const u8 *resp,
log_debug(fc->uc->log, "%zi: %s (%s) %s\n",
i,
type_to_string(tmpctx, struct amount_sat,
&fc->wtx.utxos[i]->amount),
fc->wtx.utxos[i]->is_p2sh ? "P2SH" : "SEGWIT",
&fc->wtx->utxos[i]->amount),
fc->wtx->utxos[i]->is_p2sh ? "P2SH" : "SEGWIT",
type_to_string(tmpctx, struct bitcoin_txid,
&tmptxid));
}
@@ -373,10 +373,10 @@ static void opening_funder_finished(struct subd *openingd, const u8 *resp,
" changeidx %u"
" localkey %s remotekey %s",
type_to_string(tmpctx, struct amount_sat,
&fc->wtx.amount),
&fc->wtx->amount),
type_to_string(tmpctx, struct amount_sat,
&fc->wtx.change),
fc->wtx.change_key_index,
&fc->wtx->change),
fc->wtx->change_key_index,
type_to_string(fc, struct pubkey,
&fc->uc->local_funding_pubkey),
type_to_string(fc, struct pubkey,
@@ -388,11 +388,11 @@ static void opening_funder_finished(struct subd *openingd, const u8 *resp,
" localkey %s remotekey %s",
type_to_string(tmpctx,
struct amount_sat,
&fc->wtx.amount),
&fc->wtx->amount),
type_to_string(tmpctx,
struct amount_sat,
&fc->wtx.change),
fc->wtx.change_key_index,
&fc->wtx->change),
fc->wtx->change_key_index,
type_to_string(fc, struct pubkey,
&fc->uc->local_funding_pubkey),
type_to_string(fc, struct pubkey,
@@ -406,7 +406,7 @@ static void opening_funder_finished(struct subd *openingd, const u8 *resp,
&remote_commit_sig,
&funding_txid,
funding_outnum,
fc->wtx.amount,
fc->wtx->amount,
fc->push,
fc->channel_flags,
&channel_info,
@@ -422,11 +422,11 @@ static void opening_funder_finished(struct subd *openingd, const u8 *resp,
log_debug(channel->log, "Getting HSM to sign funding tx");
msg = towire_hsm_sign_funding(tmpctx, channel->funding,
fc->wtx.change,
fc->wtx.change_key_index,
fc->wtx->change,
fc->wtx->change_key_index,
&fc->uc->local_funding_pubkey,
&channel_info.remote_fundingkey,
fc->wtx.utxos);
fc->wtx->utxos);
if (!wire_sync_write(ld->hsm_fd, take(msg)))
fatal("Could not write to HSM: %s", strerror(errno));
@@ -454,7 +454,7 @@ static void opening_funder_finished(struct subd *openingd, const u8 *resp,
channel_watch_funding(ld, channel);
/* Mark consumed outputs as spent */
wallet_confirm_utxos(ld->wallet, fc->wtx.utxos);
wallet_confirm_utxos(ld->wallet, fc->wtx->utxos);
/* Start normal channel daemon. */
peer_start_channeld(channel, pps, NULL, false);
@@ -999,10 +999,11 @@ static struct command_result *json_fund_channel(struct command *cmd,
fc->cmd = cmd;
fc->uc = NULL;
wtx_init(cmd, &fc->wtx, max_funding_satoshi);
fc->wtx = tal(fc, struct wallet_tx);
wtx_init(cmd, fc->wtx, max_funding_satoshi);
if (!param(fc->cmd, buffer, params,
p_req("id", param_node_id, &id),
p_req("satoshi", param_wtx, &fc->wtx),
p_req("satoshi", param_wtx, fc->wtx),
p_opt("feerate", param_feerate, &feerate_per_kw),
p_opt_def("announce", param_bool, &announce_channel, true),
p_opt_def("minconf", param_number, &minconf, 1),
@@ -1052,24 +1053,24 @@ static struct command_result *json_fund_channel(struct command *cmd,
}
maxheight = minconf_to_maxheight(*minconf, cmd->ld);
res = wtx_select_utxos(&fc->wtx, *feerate_per_kw,
res = wtx_select_utxos(fc->wtx, *feerate_per_kw,
BITCOIN_SCRIPTPUBKEY_P2WSH_LEN, maxheight);
if (res)
return res;
assert(!amount_sat_greater(fc->wtx.amount, max_funding_satoshi));
assert(!amount_sat_greater(fc->wtx->amount, max_funding_satoshi));
peer->uncommitted_channel->fc = tal_steal(peer->uncommitted_channel, fc);
fc->uc = peer->uncommitted_channel;
msg = towire_opening_funder(NULL,
fc->wtx.amount,
fc->wtx->amount,
fc->push,
*feerate_per_kw,
fc->wtx.change,
fc->wtx.change_key_index,
fc->wtx->change,
fc->wtx->change_key_index,
fc->channel_flags,
fc->wtx.utxos,
fc->wtx->utxos,
cmd->ld->wallet->bip32_base);
/* Openingd will either succeed, or fail, or tell us the other side

25
wallet/walletrpc.c
View File

@@ -29,7 +29,7 @@
struct withdrawal {
struct command *cmd;
struct wallet_tx wtx;
struct wallet_tx *wtx;
u8 *destination;
const char *hextx;
};
@@ -55,7 +55,7 @@ static void wallet_withdrawal_broadcast(struct bitcoind *bitcoind UNUSED,
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->wtx.utxos);
wallet_confirm_utxos(ld->wallet, withdraw->wtx->utxos);
/* Parse the tx and extract the change output. We
* generated the hex tx, so this should always work */
@@ -65,9 +65,9 @@ static void wallet_withdrawal_broadcast(struct bitcoind *bitcoind UNUSED,
/* Extract the change output and add it to the DB */
wallet_extract_owned_outputs(ld->wallet, tx, NULL, &change);
/* Note normally, change_satoshi == withdraw->wtx.change, but
/* Note normally, change_satoshi == withdraw->wtx->change, but
* not if we're actually making a payment to ourselves! */
assert(amount_sat_greater_eq(change, withdraw->wtx.change));
assert(amount_sat_greater_eq(change, withdraw->wtx->change));
struct json_stream *response = json_stream_success(cmd);
json_object_start(response, NULL);
@@ -126,12 +126,13 @@ static struct command_result *json_withdraw(struct command *cmd,
u32 *minconf, maxheight;
withdraw->cmd = cmd;
wtx_init(cmd, &withdraw->wtx, AMOUNT_SAT(-1ULL));
withdraw->wtx = tal(withdraw, struct wallet_tx);
wtx_init(cmd, withdraw->wtx, AMOUNT_SAT(-1ULL));
if (!param(cmd, buffer, params,
p_req("destination", param_bitcoin_address,
(const u8 **)&withdraw->destination),
p_req("satoshi", param_wtx, &withdraw->wtx),
p_req("satoshi", param_wtx, withdraw->wtx),
p_opt("feerate", param_feerate, &feerate_per_kw),
p_opt_def("minconf", param_number, &minconf, 1),
NULL))
@@ -145,24 +146,24 @@ static struct command_result *json_withdraw(struct command *cmd,
}
maxheight = minconf_to_maxheight(*minconf, cmd->ld);
res = wtx_select_utxos(&withdraw->wtx, *feerate_per_kw,
res = wtx_select_utxos(withdraw->wtx, *feerate_per_kw,
tal_count(withdraw->destination), maxheight);
if (res)
return res;
if (!bip32_pubkey(cmd->ld->wallet->bip32_base, &changekey,
withdraw->wtx.change_key_index)) {
withdraw->wtx->change_key_index)) {
return command_fail(cmd, LIGHTNINGD, "Keys generation failure");
}
txfilter_add_scriptpubkey(cmd->ld->owned_txfilter,
scriptpubkey_p2wpkh(tmpctx, &changekey));
u8 *msg = towire_hsm_sign_withdrawal(cmd,
withdraw->wtx.amount,
withdraw->wtx.change,
withdraw->wtx.change_key_index,
withdraw->wtx->amount,
withdraw->wtx->change,
withdraw->wtx->change_key_index,
withdraw->destination,
withdraw->wtx.utxos);
withdraw->wtx->utxos);
if (!wire_sync_write(cmd->ld->hsm_fd, take(msg)))
fatal("Could not write sign_withdrawal to HSM: %s",