aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 15:14:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

funding: wire up funding_continue

Browse Source 
Big wiring re-org for funding-continue

In openingd, we move the 'persistent' state (their basepoints,
pubkey, and the minimum_depth requirement for the opening tx) into
the state object. We also look to keep code-reuse between
'continue' and normal 'fundchannel' as high as possible. Both
of these call the same 'fundchannel_reply' at the end.

In opening_control.c, we remap fundchannel_reply such that it is
now aware of the difference between an external/internally funded
channel open. It's the same return path, with the difference that
one finishes making and broadcasting the funding transaction; the
other is skips this.
This commit is contained in:
lisa neigut
2019-05-31 14:46:04 -07:00
committed by Rusty Russell
parent 8a60caaed9
commit 478762dbd2
2 changed files with 415 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

201
lightningd/opening_control.c
View File

@@ -259,6 +259,21 @@ static void funding_broadcast_failed(struct channel *channel,
/* Keep in state CHANNELD_AWAITING_LOCKIN until (manual) broadcast */ /* Keep in state CHANNELD_AWAITING_LOCKIN until (manual) broadcast */
} }
static void funding_success(struct channel *channel)
{
struct json_stream *response;
struct funding_channel *fc = channel->peer->uncommitted_channel->fc;
struct command *cmd = fc->cmd;
response = json_stream_success(cmd);
json_object_start(response, NULL);
json_add_string(response, "channel_id",
type_to_string(tmpctx, struct channel_id, &fc->cid));
json_add_bool(response, "commitments_secured", true);
json_object_end(response);
was_pending(command_success(cmd, response));
}
static void funding_broadcast_success(struct channel *channel) static void funding_broadcast_success(struct channel *channel)
{ {
struct json_stream *response; struct json_stream *response;
@@ -334,58 +349,20 @@ failed:
tal_free(fc->uc); tal_free(fc->uc);
} }
static void opening_funder_finished(struct subd *openingd, const u8 *resp, static bool compose_and_broadcast_tx(struct lightningd *ld,
const int *fds, const u8 *resp,
struct funding_channel *fc) struct funding_channel *fc,
struct channel_info *channel_info,
struct channel *channel,
struct bitcoin_txid *expected_txid,
u32 feerate)
{ {
u8 *msg; u8 *msg;
struct channel_info channel_info;
struct bitcoin_tx *fundingtx;
struct bitcoin_txid funding_txid, expected_txid;
struct pubkey changekey; struct pubkey changekey;
struct bitcoin_signature remote_commit_sig;
struct bitcoin_tx *remote_commit;
u16 funding_outnum; u16 funding_outnum;
u32 feerate; struct bitcoin_tx *fundingtx;
struct amount_sat change; struct amount_sat change;
struct channel *channel; struct bitcoin_txid funding_txid;
struct lightningd *ld = openingd->ld;
u8 *remote_upfront_shutdown_script;
struct per_peer_state *pps;
/* This is a new channel_info.their_config so set its ID to 0 */
channel_info.their_config.id = 0;
if (!fromwire_opening_funder_reply(resp, resp,
&channel_info.their_config,
&remote_commit,
&remote_commit_sig,
&pps,
&channel_info.theirbase.revocation,
&channel_info.theirbase.payment,
&channel_info.theirbase.htlc,
&channel_info.theirbase.delayed_payment,
&channel_info.remote_per_commit,
&fc->uc->minimum_depth,
&channel_info.remote_fundingkey,
&expected_txid,
&funding_outnum,
&feerate,
&fc->uc->our_config.channel_reserve,
&remote_upfront_shutdown_script)) {
log_broken(fc->uc->log,
"bad OPENING_FUNDER_REPLY %s",
tal_hex(resp, resp));
was_pending(command_fail(fc->cmd, LIGHTNINGD,
"bad OPENING_FUNDER_REPLY %s",
tal_hex(fc->cmd, resp)));
goto failed;
}
per_peer_state_set_fds_arr(pps, fds);
log_debug(ld->log,
"%s", type_to_string(tmpctx, struct pubkey,
&channel_info.remote_per_commit));
/* Generate the funding tx. */ /* Generate the funding tx. */
if (!amount_sat_eq(fc->wtx->change, AMOUNT_SAT(0)) if (!amount_sat_eq(fc->wtx->change, AMOUNT_SAT(0))
@@ -396,7 +373,7 @@ static void opening_funder_finished(struct subd *openingd, const u8 *resp,
fundingtx = funding_tx(tmpctx, &funding_outnum, fundingtx = funding_tx(tmpctx, &funding_outnum,
fc->wtx->utxos, fc->wtx->amount, fc->wtx->utxos, fc->wtx->amount,
&fc->uc->local_funding_pubkey, &fc->uc->local_funding_pubkey,
&channel_info.remote_fundingkey, &channel_info->remote_fundingkey,
fc->wtx->change, &changekey, fc->wtx->change, &changekey,
ld->wallet->bip32_base); ld->wallet->bip32_base);
@@ -418,7 +395,7 @@ static void opening_funder_finished(struct subd *openingd, const u8 *resp,
bitcoin_txid(fundingtx, &funding_txid); bitcoin_txid(fundingtx, &funding_txid);
if (!bitcoin_txid_eq(&funding_txid, &expected_txid)) { if (!bitcoin_txid_eq(&funding_txid, expected_txid)) {
log_broken(fc->uc->log, log_broken(fc->uc->log,
"Funding txid mismatch:" "Funding txid mismatch:"
" amount %s change %s" " amount %s change %s"
@@ -432,7 +409,7 @@ static void opening_funder_finished(struct subd *openingd, const u8 *resp,
type_to_string(fc, struct pubkey, type_to_string(fc, struct pubkey,
&fc->uc->local_funding_pubkey), &fc->uc->local_funding_pubkey),
type_to_string(fc, struct pubkey, type_to_string(fc, struct pubkey,
&channel_info.remote_fundingkey)); &channel_info->remote_fundingkey));
was_pending(command_fail(fc->cmd, JSONRPC2_INVALID_PARAMS, was_pending(command_fail(fc->cmd, JSONRPC2_INVALID_PARAMS,
"Funding txid mismatch:" "Funding txid mismatch:"
" amount %s change %s" " amount %s change %s"
@@ -448,26 +425,8 @@ static void opening_funder_finished(struct subd *openingd, const u8 *resp,
type_to_string(fc, struct pubkey, type_to_string(fc, struct pubkey,
&fc->uc->local_funding_pubkey), &fc->uc->local_funding_pubkey),
type_to_string(fc, struct pubkey, type_to_string(fc, struct pubkey,
&channel_info.remote_fundingkey))); &channel_info->remote_fundingkey)));
goto failed; return false;
}
/* Steals fields from uc */
channel = wallet_commit_channel(ld, fc->uc,
remote_commit,
&remote_commit_sig,
&funding_txid,
funding_outnum,
fc->wtx->amount,
fc->push,
fc->channel_flags,
&channel_info,
feerate,
remote_upfront_shutdown_script);
if (!channel) {
was_pending(command_fail(fc->cmd, LIGHTNINGD,
"Key generation failure"));
goto failed;
} }
/* Get HSM to sign the funding tx. */ /* Get HSM to sign the funding tx. */
@@ -477,7 +436,7 @@ static void opening_funder_finished(struct subd *openingd, const u8 *resp,
fc->wtx->change, fc->wtx->change,
fc->wtx->change_key_index, fc->wtx->change_key_index,
&fc->uc->local_funding_pubkey, &fc->uc->local_funding_pubkey,
&channel_info.remote_fundingkey, &channel_info->remote_fundingkey,
fc->wtx->utxos); fc->wtx->utxos);
if (!wire_sync_write(ld->hsm_fd, take(msg))) if (!wire_sync_write(ld->hsm_fd, take(msg)))
@@ -497,28 +456,114 @@ static void opening_funder_finished(struct subd *openingd, const u8 *resp,
if (fundingtx->wtx->num_outputs == 2) if (fundingtx->wtx->num_outputs == 2)
txfilter_add_scriptpubkey(ld->owned_txfilter, bitcoin_tx_output_get_script(tmpctx, fundingtx, !funding_outnum)); txfilter_add_scriptpubkey(ld->owned_txfilter, bitcoin_tx_output_get_script(tmpctx, fundingtx, !funding_outnum));
/* We need these to compose cmd's response in funding_broadcast_success */
fc->hextx = tal_hex(fc, linearize_tx(fc->cmd, fundingtx));
derive_channel_id(&fc->cid, &channel->funding_txid, funding_outnum);
/* Send it out and watch for confirms. */ /* Send it out and watch for confirms. */
broadcast_tx(ld->topology, channel, fundingtx, funding_broadcast_failed_or_success); broadcast_tx(ld->topology, channel, fundingtx, funding_broadcast_failed_or_success);
channel_watch_funding(ld, channel);
/* Mark consumed outputs as spent */ /* Mark consumed outputs as spent */
wallet_confirm_utxos(ld->wallet, fc->wtx->utxos); wallet_confirm_utxos(ld->wallet, fc->wtx->utxos);
wallet_transaction_annotate(ld->wallet, &funding_txid, wallet_transaction_annotate(ld->wallet, &funding_txid,
TX_CHANNEL_FUNDING, channel->dbid); TX_CHANNEL_FUNDING, channel->dbid);
/* We need these to compose cmd's response in funding_broadcast_success */
fc->hextx = tal_hex(fc, linearize_tx(fc->cmd, fundingtx));
return true;
}
static void opening_funder_finished(struct subd *openingd, const u8 *resp,
const int *fds,
struct funding_channel *fc)
{
struct channel_info channel_info;
struct bitcoin_txid funding_txid;
u16 funding_txout;
struct bitcoin_signature remote_commit_sig;
struct bitcoin_tx *remote_commit;
u32 feerate;
struct channel *channel;
struct lightningd *ld = openingd->ld;
u8 *remote_upfront_shutdown_script;
struct per_peer_state *pps;
/* This is a new channel_info.their_config so set its ID to 0 */
channel_info.their_config.id = 0;
if (!fromwire_opening_funder_reply(resp, resp,
&channel_info.their_config,
&remote_commit,
&remote_commit_sig,
&pps,
&channel_info.theirbase.revocation,
&channel_info.theirbase.payment,
&channel_info.theirbase.htlc,
&channel_info.theirbase.delayed_payment,
&channel_info.remote_per_commit,
&fc->uc->minimum_depth,
&channel_info.remote_fundingkey,
&funding_txid,
&funding_txout,
&feerate,
&fc->uc->our_config.channel_reserve,
&remote_upfront_shutdown_script)) {
log_broken(fc->uc->log,
"bad OPENING_FUNDER_REPLY %s",
tal_hex(resp, resp));
was_pending(command_fail(fc->cmd, LIGHTNINGD,
"bad OPENING_FUNDER_REPLY %s",
tal_hex(fc->cmd, resp)));
goto cleanup;
}
per_peer_state_set_fds_arr(pps, fds);
log_debug(ld->log,
"%s", type_to_string(tmpctx, struct pubkey,
&channel_info.remote_per_commit));
/* Steals fields from uc */
channel = wallet_commit_channel(ld, fc->uc,
remote_commit,
&remote_commit_sig,
&funding_txid,
funding_txout,
fc->funding,
fc->push,
fc->channel_flags,
&channel_info,
feerate,
remote_upfront_shutdown_script);
if (!channel) {
was_pending(command_fail(fc->cmd, LIGHTNINGD,
"Key generation failure"));
goto cleanup;
}
/* Watch for funding confirms */
channel_watch_funding(ld, channel);
/* Needed for the success statement */
derive_channel_id(&fc->cid, &channel->funding_txid, funding_txout);
/* Was this an external wallet initiation ? */
if (fc->inflight) {
funding_success(channel);
peer_start_channeld(channel, pps, NULL, false);
goto cleanup;
}
if (!compose_and_broadcast_tx(ld, resp, fc, &channel_info,
channel, &funding_txid,
feerate))
goto cleanup;
/* Start normal channel daemon. */ /* Start normal channel daemon. */
peer_start_channeld(channel, pps, NULL, false); peer_start_channeld(channel, pps, NULL, false);
subd_release_channel(openingd, fc->uc); subd_release_channel(openingd, fc->uc);
fc->uc->openingd = NULL; fc->uc->openingd = NULL;
return; return;
failed: cleanup:
subd_release_channel(openingd, fc->uc); subd_release_channel(openingd, fc->uc);
fc->uc->openingd = NULL; fc->uc->openingd = NULL;
/* Frees fc too, and tmpctx */ /* Frees fc too, and tmpctx */
@@ -1094,6 +1139,8 @@ static struct command_result *json_fund_channel_continue(struct command *cmd,
if (!peer->uncommitted_channel->fc || !peer->uncommitted_channel->fc->inflight) if (!peer->uncommitted_channel->fc || !peer->uncommitted_channel->fc->inflight)
return command_fail(cmd, LIGHTNINGD, "No channel funding in progress."); return command_fail(cmd, LIGHTNINGD, "No channel funding in progress.");
/* Update the cmd to the new cmd */
peer->uncommitted_channel->fc->cmd = cmd;
msg = towire_opening_funder_continue(NULL, msg = towire_opening_funder_continue(NULL,
funding_txid, funding_txid,
funding_txout); funding_txout);

509
openingd/openingd.c
View File

@@ -73,6 +73,10 @@ struct state {
struct basepoints our_points; struct basepoints our_points;
struct pubkey our_funding_pubkey; struct pubkey our_funding_pubkey;
/* Information we need between funding_start and funding_continue */
struct basepoints their_points;
struct pubkey their_funding_pubkey;
/* hsmd gives us our first per-commitment point, and peer tells us /* hsmd gives us our first per-commitment point, and peer tells us
* theirs */ * theirs */
struct pubkey first_per_commitment_point[NUM_SIDES]; struct pubkey first_per_commitment_point[NUM_SIDES];
@@ -472,12 +476,9 @@ static bool setup_channel_funder(struct state *state)
static u8 *funder_channel_start(struct state *state, static u8 *funder_channel_start(struct state *state,
u8 channel_flags) u8 channel_flags)
{ {
struct channel_id id_in;
u8 *msg; u8 *msg;
struct basepoints theirs;
struct pubkey their_funding_pubkey;
u32 minimum_depth;
u8 *funding_output_script; u8 *funding_output_script;
struct channel_id id_in;
if (!setup_channel_funder(state)) if (!setup_channel_funder(state))
return NULL; return NULL;
@@ -545,14 +546,14 @@ static u8 *funder_channel_start(struct state *state,
&state->remoteconf.max_htlc_value_in_flight, &state->remoteconf.max_htlc_value_in_flight,
&state->remoteconf.channel_reserve, &state->remoteconf.channel_reserve,
&state->remoteconf.htlc_minimum, &state->remoteconf.htlc_minimum,
&minimum_depth, &state->minimum_depth,
&state->remoteconf.to_self_delay, &state->remoteconf.to_self_delay,
&state->remoteconf.max_accepted_htlcs, &state->remoteconf.max_accepted_htlcs,
&their_funding_pubkey, &state->their_funding_pubkey,
&theirs.revocation, &state->their_points.revocation,
&theirs.payment, &state->their_points.payment,
&theirs.delayed_payment, &state->their_points.delayed_payment,
&theirs.htlc, &state->their_points.htlc,
&state->first_per_commitment_point[REMOTE], &state->first_per_commitment_point[REMOTE],
&state->remote_upfront_shutdown_script)) &state->remote_upfront_shutdown_script))
peer_failed(state->pps, peer_failed(state->pps,
@@ -563,14 +564,14 @@ static u8 *funder_channel_start(struct state *state,
&state->remoteconf.max_htlc_value_in_flight, &state->remoteconf.max_htlc_value_in_flight,
&state->remoteconf.channel_reserve, &state->remoteconf.channel_reserve,
&state->remoteconf.htlc_minimum, &state->remoteconf.htlc_minimum,
&minimum_depth, &state->minimum_depth,
&state->remoteconf.to_self_delay, &state->remoteconf.to_self_delay,
&state->remoteconf.max_accepted_htlcs, &state->remoteconf.max_accepted_htlcs,
&their_funding_pubkey, &state->their_funding_pubkey,
&theirs.revocation, &state->their_points.revocation,
&theirs.payment, &state->their_points.payment,
&theirs.delayed_payment, &state->their_points.delayed_payment,
&theirs.htlc, &state->their_points.htlc,
&state->first_per_commitment_point[REMOTE])) &state->first_per_commitment_point[REMOTE]))
peer_failed(state->pps, peer_failed(state->pps,
&state->channel_id, &state->channel_id,
@@ -608,7 +609,7 @@ static u8 *funder_channel_start(struct state *state,
scriptpubkey_p2wsh(tmpctx, scriptpubkey_p2wsh(tmpctx,
bitcoin_redeem_2of2(tmpctx, bitcoin_redeem_2of2(tmpctx,
&state->our_funding_pubkey, &state->our_funding_pubkey,
&their_funding_pubkey)); &state->their_funding_pubkey));
/* Update the billboard with our infos */ /* Update the billboard with our infos */
peer_billboard(false, peer_billboard(false,
@@ -617,11 +618,252 @@ static u8 *funder_channel_start(struct state *state,
return towire_opening_funder_start_reply(state, funding_output_script); return towire_opening_funder_start_reply(state, funding_output_script);
} }
static u8 *funder_channel_continue(struct state *state, static bool funder_finalize_channel_setup(struct state *state,
struct bitcoin_txid *funding_txid) struct amount_msat local_msat,
struct bitcoin_signature *sig,
struct bitcoin_tx **tx)
{ {
// now the what. ok we've got a funding_txid.. u8 *msg;
struct channel_id id_in;
const u8 *wscript;
char* err_reason;
/*~ Now we can initialize the `struct channel`. This represents
* the current channel state and is how we can generate the current
* commitment transaction.
*
* The routines to support `struct channel` are split into a common
* part (common/initial_channel) which doesn't support HTLCs and is
* enough for us here, and the complete channel support required by
* `channeld` which lives in channeld/full_channel. */
state->channel = new_initial_channel(state,
&state->chainparams->genesis_blockhash,
&state->funding_txid,
state->funding_txout,
state->minimum_depth,
state->funding,
local_msat,
state->feerate_per_kw,
&state->localconf,
&state->remoteconf,
&state->our_points,
&state->their_points,
&state->our_funding_pubkey,
&state->their_funding_pubkey,
/* Funder is local */
LOCAL);
/* We were supposed to do enough checks above, but just in case,
* new_initial_channel will fail to create absurd channels */
if (!state->channel)
peer_failed(state->pps,
&state->channel_id,
"could not create channel with given config");
/* BOLT #2:
*
* ### The `funding_created` Message
*
* This message describes the outpoint which the funder has created
* for the initial commitment transactions. After receiving the
* peer's signature, via `funding_signed`, it will broadcast the funding
* transaction.
*/
/* This gives us their first commitment transaction. */
*tx = initial_channel_tx(state, &wscript, state->channel,
&state->first_per_commitment_point[REMOTE],
REMOTE, &err_reason);
if (!*tx) {
/* This should not happen: we should never create channels we
* can't afford the fees for after reserve. */
negotiation_failed(state, true,
"Could not meet their fees and reserve: %s", err_reason);
goto fail;
}
/* We ask the HSM to sign their commitment transaction for us: it knows
* our funding key, it just needs the remote funding key to create the
* witness script. It also needs the amount of the funding output,
* as segwit signatures commit to that as well, even though it doesn't
* explicitly appear in the transaction itself. */
msg = towire_hsm_sign_remote_commitment_tx(NULL,
*tx,
&state->channel->funding_pubkey[REMOTE],
state->channel->funding);
wire_sync_write(HSM_FD, take(msg));
msg = wire_sync_read(tmpctx, HSM_FD);
if (!fromwire_hsm_sign_tx_reply(msg, sig))
status_failed(STATUS_FAIL_HSM_IO, "Bad sign_tx_reply %s",
tal_hex(tmpctx, msg));
/* You can tell this has been a problem before, since there's a debug
* message here: */
status_trace("signature %s on tx %s using key %s",
type_to_string(tmpctx, struct bitcoin_signature, sig),
type_to_string(tmpctx, struct bitcoin_tx, *tx),
type_to_string(tmpctx, struct pubkey,
&state->our_funding_pubkey));
/* Now we give our peer the signature for their first commitment
* transaction. */
msg = towire_funding_created(state, &state->channel_id,
&state->funding_txid,
state->funding_txout,
&sig->s);
sync_crypto_write(state->pps, msg);
/* BOLT #2:
*
* ### The `funding_signed` Message
*
* This message gives the funder the signature it needs for the first
* commitment transaction, so it can broadcast the transaction knowing
* that funds can be redeemed, if need be.
*/
peer_billboard(false,
"Funding channel: create first tx, now waiting for their signature");
/* Now they send us their signature for that first commitment
* transaction. */
msg = opening_negotiate_msg(tmpctx, state, true);
if (!msg)
goto fail;
sig->sighash_type = SIGHASH_ALL;
if (!fromwire_funding_signed(msg, &id_in, &sig->s))
peer_failed(state->pps,
&state->channel_id,
"Parsing funding_signed: %s", tal_hex(msg, msg));
/* BOLT #2:
*
* This message introduces the `channel_id` to identify the channel.
* It's derived from the funding transaction by combining the
* `funding_txid` and the `funding_output_index`, using big-endian
* exclusive-OR (i.e. `funding_output_index` alters the last 2
* bytes).
*/
/*~ Back in Milan, we chose to allow multiple channels between peers in
* the protocol. I insisted that we multiplex these over the same
* socket, and (even though I didn't plan on implementing it anytime
* soon) that we put it into the first version of the protocol
* because it would be painful to add in later.
*
* My logic seemed sound: we treat new connections as an implication
* that the old connection has disconnected, which happens more often
* than you'd hope on modern networks. However, supporting multiple
* channels via multiple connections would be far easier for us to
* support with our (introduced-since) separate daemon model.
*
* Let this be a lesson: beware premature specification, even if you
* suspect "we'll need it later!". */
derive_channel_id(&state->channel_id,
&state->funding_txid, state->funding_txout);
if (!channel_id_eq(&id_in, &state->channel_id))
peer_failed(state->pps, &id_in,
"funding_signed ids don't match: expected %s got %s",
type_to_string(msg, struct channel_id,
&state->channel_id),
type_to_string(msg, struct channel_id, &id_in));
/* BOLT #2:
*
* The recipient:
* - if `signature` is incorrect:
* - MUST fail the channel.
*/
/* So we create *our* initial commitment transaction, and check the
* signature they sent against that. */
*tx = initial_channel_tx(state, &wscript, state->channel,
&state->first_per_commitment_point[LOCAL],
LOCAL, &err_reason);
if (!*tx) {
negotiation_failed(state, true,
"Could not meet our fees and reserve: %s", err_reason);
goto fail;
}
if (!check_tx_sig(*tx, 0, NULL, wscript, &state->their_funding_pubkey, sig)) {
peer_failed(state->pps,
&state->channel_id,
"Bad signature %s on tx %s using key %s",
type_to_string(tmpctx, struct bitcoin_signature,
sig),
type_to_string(tmpctx, struct bitcoin_tx, *tx),
type_to_string(tmpctx, struct pubkey,
&state->their_funding_pubkey));
}
peer_billboard(false, "Funding channel: opening negotiation succeeded");
return true;
fail:
tal_free(wscript);
return false;
}
static u8 *funder_channel_continue(struct state *state)
{
struct bitcoin_tx *tx;
struct bitcoin_signature sig;
struct amount_msat local_msat;
/* Update the billboard about what we're doing*/
peer_billboard(false,
"Funding channel con't: continuing with funding_txid %s",
type_to_string(tmpctx, struct bitcoin_txid, &state->funding_txid));
/* We recalculate the local_msat from cached values; should
* succeed because we checked it earlier */
assert(amount_sat_sub_msat(&local_msat, state->funding, state->push_msat));
state->channel = new_initial_channel(state,
&state->chainparams->genesis_blockhash,
&state->funding_txid,
state->funding_txout,
state->minimum_depth,
state->funding,
local_msat,
state->feerate_per_kw,
&state->localconf,
&state->remoteconf,
&state->our_points,
&state->their_points,
&state->our_funding_pubkey,
&state->their_funding_pubkey,
/* Funder is local */
LOCAL);
/* We were supposed to do enough checks above, but just in case,
* new_initial_channel will fail to create absurd channels */
if (!state->channel)
peer_failed(state->pps,
&state->channel_id,
"could not create channel with given config");
if (!funder_finalize_channel_setup(state, local_msat, &sig, &tx))
return NULL; return NULL;
return towire_opening_funder_reply(state,
&state->remoteconf,
tx,
&sig,
state->pps,
&state->their_points.revocation,
&state->their_points.payment,
&state->their_points.htlc,
&state->their_points.delayed_payment,
&state->first_per_commitment_point[REMOTE],
state->minimum_depth,
&state->their_funding_pubkey,
&state->funding_txid,
state->funding_txout,
state->feerate_per_kw,
state->localconf.channel_reserve,
state->remote_upfront_shutdown_script);
} }
/*~ OK, let's fund a channel! Returns the reply for lightningd on success, /*~ OK, let's fund a channel! Returns the reply for lightningd on success,
@@ -635,16 +877,10 @@ static u8 *funder_channel(struct state *state,
{ {
struct channel_id id_in; struct channel_id id_in;
u8 *msg; u8 *msg;
struct bitcoin_tx *tx;
struct basepoints theirs;
struct pubkey their_funding_pubkey;
struct pubkey *changekey; struct pubkey *changekey;
struct bitcoin_signature sig; struct bitcoin_signature sig;
u32 minimum_depth; struct bitcoin_tx *funding, *tx;
struct bitcoin_tx *funding;
const u8 *wscript;
struct amount_msat local_msat; struct amount_msat local_msat;
char* err_reason;
if (!setup_channel_funder(state)) if (!setup_channel_funder(state))
goto fail; goto fail;
@@ -723,14 +959,14 @@ static u8 *funder_channel(struct state *state,
&state->remoteconf.max_htlc_value_in_flight, &state->remoteconf.max_htlc_value_in_flight,
&state->remoteconf.channel_reserve, &state->remoteconf.channel_reserve,
&state->remoteconf.htlc_minimum, &state->remoteconf.htlc_minimum,
&minimum_depth, &state->minimum_depth,
&state->remoteconf.to_self_delay, &state->remoteconf.to_self_delay,
&state->remoteconf.max_accepted_htlcs, &state->remoteconf.max_accepted_htlcs,
&their_funding_pubkey, &state->their_funding_pubkey,
&theirs.revocation, &state->their_points.revocation,
&theirs.payment, &state->their_points.payment,
&theirs.delayed_payment, &state->their_points.delayed_payment,
&theirs.htlc, &state->their_points.htlc,
&state->first_per_commitment_point[REMOTE], &state->first_per_commitment_point[REMOTE],
&state->remote_upfront_shutdown_script)) &state->remote_upfront_shutdown_script))
peer_failed(state->pps, peer_failed(state->pps,
@@ -741,14 +977,14 @@ static u8 *funder_channel(struct state *state,
&state->remoteconf.max_htlc_value_in_flight, &state->remoteconf.max_htlc_value_in_flight,
&state->remoteconf.channel_reserve, &state->remoteconf.channel_reserve,
&state->remoteconf.htlc_minimum, &state->remoteconf.htlc_minimum,
&minimum_depth, &state->minimum_depth,
&state->remoteconf.to_self_delay, &state->remoteconf.to_self_delay,
&state->remoteconf.max_accepted_htlcs, &state->remoteconf.max_accepted_htlcs,
&their_funding_pubkey, &state->their_funding_pubkey,
&theirs.revocation, &state->their_points.revocation,
&theirs.payment, &state->their_points.payment,
&theirs.delayed_payment, &state->their_points.delayed_payment,
&theirs.htlc, &state->their_points.htlc,
&state->first_per_commitment_point[REMOTE])) &state->first_per_commitment_point[REMOTE]))
peer_failed(state->pps, peer_failed(state->pps,
&state->channel_id, &state->channel_id,
@@ -773,12 +1009,12 @@ static u8 *funder_channel(struct state *state,
* - if `minimum_depth` is unreasonably large: * - if `minimum_depth` is unreasonably large:
* - MAY reject the channel. * - MAY reject the channel.
*/ */
if (minimum_depth > 10) { if (state->minimum_depth > 10) {
/* negotiation_failed just tells peer and lightningd /* negotiation_failed just tells peer and lightningd
* (hence fundchannel call) that this opening failed. */ * (hence fundchannel call) that this opening failed. */
negotiation_failed(state, true, negotiation_failed(state, true,
"minimum_depth %u larger than %u", "minimum_depth %u larger than %u",
minimum_depth, 10); state->minimum_depth, 10);
goto fail; goto fail;
} }
@@ -839,180 +1075,16 @@ static u8 *funder_channel(struct state *state,
cast_const2(const struct utxo **, utxos), cast_const2(const struct utxo **, utxos),
state->funding, state->funding,
&state->our_funding_pubkey, &state->our_funding_pubkey,
&their_funding_pubkey, &state->their_funding_pubkey,
change, changekey, change, changekey,
bip32_base); bip32_base);
bitcoin_txid(funding, &state->funding_txid); bitcoin_txid(funding, &state->funding_txid);
/*~ Now we can initialize the `struct channel`. This represents if (!funder_finalize_channel_setup(state, local_msat, &sig, &tx)) {
* the current channel state and is how we can generate the current tal_free(funding);
* commitment transaction. goto fail;
*
* The routines to support `struct channel` are split into a common
* part (common/initial_channel) which doesn't support HTLCs and is
* enough for us here, and the complete channel support required by
* `channeld` which lives in channeld/full_channel. */
state->channel = new_initial_channel(state,
&state->chainparams->genesis_blockhash,
&state->funding_txid,
state->funding_txout,
minimum_depth,
state->funding,
local_msat,
state->feerate_per_kw,
&state->localconf,
&state->remoteconf,
&state->our_points, &theirs,
&state->our_funding_pubkey,
&their_funding_pubkey,
/* Funder is local */
LOCAL);
/* We were supposed to do enough checks above, but just in case,
* new_initial_channel will fail to create absurd channels */
if (!state->channel)
peer_failed(state->pps,
&state->channel_id,
"could not create channel with given config");
/* BOLT #2:
*
* ### The `funding_created` Message
*
* This message describes the outpoint which the funder has created
* for the initial commitment transactions. After receiving the
* peer's signature, via `funding_signed`, it will broadcast the funding
* transaction.
*/
/* This gives us their first commitment transaction. */
tx = initial_channel_tx(state, &wscript, state->channel,
&state->first_per_commitment_point[REMOTE],
REMOTE, &err_reason);
if (!tx) {
/* This should not happen: we should never create channels we
* can't afford the fees for after reserve. */
negotiation_failed(state, true,
"Could not meet their fees and reserve: %s", err_reason);
goto fail_2;
} }
/* We ask the HSM to sign their commitment transaction for us: it knows
* our funding key, it just needs the remote funding key to create the
* witness script. It also needs the amount of the funding output,
* as segwit signatures commit to that as well, even though it doesn't
* explicitly appear in the transaction itself. */
msg = towire_hsm_sign_remote_commitment_tx(NULL,
tx,
&state->channel->funding_pubkey[REMOTE],
state->channel->funding);
wire_sync_write(HSM_FD, take(msg));
msg = wire_sync_read(tmpctx, HSM_FD);
if (!fromwire_hsm_sign_tx_reply(msg, &sig))
status_failed(STATUS_FAIL_HSM_IO, "Bad sign_tx_reply %s",
tal_hex(tmpctx, msg));
/* You can tell this has been a problem before, since there's a debug
* message here: */
status_trace("signature %s on tx %s using key %s",
type_to_string(tmpctx, struct bitcoin_signature, &sig),
type_to_string(tmpctx, struct bitcoin_tx, tx),
type_to_string(tmpctx, struct pubkey,
&state->our_funding_pubkey));
/* Now we give our peer the signature for their first commitment
* transaction. */
msg = towire_funding_created(state, &state->channel_id,
&state->funding_txid,
state->funding_txout,
&sig.s);
sync_crypto_write(state->pps, msg);
/* BOLT #2:
*
* ### The `funding_signed` Message
*
* This message gives the funder the signature it needs for the first
* commitment transaction, so it can broadcast the transaction knowing
* that funds can be redeemed, if need be.
*/
peer_billboard(false,
"Funding channel: create first tx, now waiting for their signature");
/* Now they send us their signature for that first commitment
* transaction. */
msg = opening_negotiate_msg(tmpctx, state, true);
if (!msg)
goto fail_2;
sig.sighash_type = SIGHASH_ALL;
if (!fromwire_funding_signed(msg, &id_in, &sig.s))
peer_failed(state->pps,
&state->channel_id,
"Parsing funding_signed: %s", tal_hex(msg, msg));
/* BOLT #2:
*
* This message introduces the `channel_id` to identify the channel.
* It's derived from the funding transaction by combining the
* `funding_txid` and the `funding_output_index`, using big-endian
* exclusive-OR (i.e. `funding_output_index` alters the last 2
* bytes).
*/
/*~ Back in Milan, we chose to allow multiple channels between peers in
* the protocol. I insisted that we multiplex these over the same
* socket, and (even though I didn't plan on implementing it anytime
* soon) that we put it into the first version of the protocol
* because it would be painful to add in later.
*
* My logic seemed sound: we treat new connections as an implication
* that the old connection has disconnected, which happens more often
* than you'd hope on modern networks. However, supporting multiple
* channels via multiple connections would be far easier for us to
* support with our (introduced-since) separate daemon model.
*
* Let this be a lesson: beware premature specification, even if you
* suspect "we'll need it later!". */
derive_channel_id(&state->channel_id,
&state->funding_txid, state->funding_txout);
if (!channel_id_eq(&id_in, &state->channel_id))
peer_failed(state->pps, &id_in,
"funding_signed ids don't match: expected %s got %s",
type_to_string(msg, struct channel_id,
&state->channel_id),
type_to_string(msg, struct channel_id, &id_in));
/* BOLT #2:
*
* The recipient:
* - if `signature` is incorrect:
* - MUST fail the channel.
*/
/* So we create *our* initial commitment transaction, and check the
* signature they sent against that. */
tx = initial_channel_tx(state, &wscript, state->channel,
&state->first_per_commitment_point[LOCAL],
LOCAL, &err_reason);
if (!tx) {
negotiation_failed(state, true,
"Could not meet our fees and reserve: %s", err_reason);
goto fail_2;
}
if (!check_tx_sig(tx, 0, NULL, wscript, &their_funding_pubkey, &sig)) {
peer_failed(state->pps,
&state->channel_id,
"Bad signature %s on tx %s using key %s",
type_to_string(tmpctx, struct bitcoin_signature,
&sig),
type_to_string(tmpctx, struct bitcoin_tx, tx),
type_to_string(tmpctx, struct pubkey,
&their_funding_pubkey));
}
peer_billboard(false, "Funding channel: opening negotiation succeeded");
if (taken(utxos)) if (taken(utxos))
tal_free(utxos); tal_free(utxos);
@@ -1030,22 +1102,19 @@ static u8 *funder_channel(struct state *state,
tx, tx,
&sig, &sig,
state->pps, state->pps,
&theirs.revocation, &state->their_points.revocation,
&theirs.payment, &state->their_points.payment,
&theirs.htlc, &state->their_points.htlc,
&theirs.delayed_payment, &state->their_points.delayed_payment,
&state->first_per_commitment_point[REMOTE], &state->first_per_commitment_point[REMOTE],
minimum_depth, state->minimum_depth,
&their_funding_pubkey, &state->their_funding_pubkey,
&state->funding_txid, &state->funding_txid,
state->funding_txout, state->funding_txout,
state->feerate_per_kw, state->feerate_per_kw,
state->localconf.channel_reserve, state->localconf.channel_reserve,
state->remote_upfront_shutdown_script); state->remote_upfront_shutdown_script);
fail_2:
tal_free(wscript);
tal_free(funding);
fail: fail:
if (taken(utxos)) if (taken(utxos))
tal_free(utxos); tal_free(utxos);
@@ -1611,7 +1680,9 @@ static u8 *handle_master_in(struct state *state)
&funding_txid, &funding_txid,
&funding_txout)) &funding_txout))
master_badmsg(WIRE_OPENING_FUNDER_CONTINUE, msg); master_badmsg(WIRE_OPENING_FUNDER_CONTINUE, msg);
return funder_channel_continue(state, &funding_txid); state->funding_txid = funding_txid;
state->funding_txout = funding_txout;
return funder_channel_continue(state);
case WIRE_OPENING_DEV_MEMLEAK: case WIRE_OPENING_DEV_MEMLEAK:
#if DEVELOPER #if DEVELOPER
handle_dev_memleak(state, msg); handle_dev_memleak(state, msg);