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

openingd: set channel_id on failure messages.

Browse Source 
"zero" means all channels, which works, but is overkill.

Fixes: #262
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2017-09-06 10:55:49 +09:30
committed by Christian Decker
parent b19a4516d4
commit 80c6db865b
1 changed files with 104 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
openingd/opening.c
View File

@@ -38,6 +38,9 @@ struct state {
struct crypto_state cs; struct crypto_state cs;
struct pubkey next_per_commit[NUM_SIDES]; struct pubkey next_per_commit[NUM_SIDES];
/* Initially temporary, then final channel id. */
struct channel_id channel_id;
/* Funding and feerate: set by opening peer. */ /* Funding and feerate: set by opening peer. */
u64 funding_satoshis, push_msat; u64 funding_satoshis, push_msat;
u32 feerate_per_kw; u32 feerate_per_kw;
@@ -209,7 +212,7 @@ static u8 *funder_channel(struct state *state,
const struct utxo *utxos, const struct utxo *utxos,
const struct ext_key *bip32_base) const struct ext_key *bip32_base)
{ {
struct channel_id channel_id, id_in; struct channel_id id_in;
u8 *msg; u8 *msg;
struct bitcoin_tx *tx; struct bitcoin_tx *tx;
struct basepoints theirs; struct basepoints theirs;
@@ -223,14 +226,15 @@ static u8 *funder_channel(struct state *state,
set_reserve(&state->localconf.channel_reserve_satoshis, set_reserve(&state->localconf.channel_reserve_satoshis,
state->funding_satoshis); state->funding_satoshis);
temporary_channel_id(&channel_id); temporary_channel_id(&state->channel_id);
/* BOLT #2: /* BOLT #2:
* *
* The sender MUST set `funding_satoshis` to less than 2^24 satoshi. */ * The sender MUST set `funding_satoshis` to less than 2^24 satoshi. */
if (state->funding_satoshis >= 1 << 24) if (state->funding_satoshis >= 1 << 24)
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_BAD_PARAM, status_failed(WIRE_OPENING_BAD_PARAM,
"funding_satoshis must be < 2^24"); "funding_satoshis must be < 2^24, not %"PRIu64,
state->funding_satoshis);
/* BOLT #2: /* BOLT #2:
* *
@@ -238,13 +242,13 @@ static u8 *funder_channel(struct state *state,
* `funding_satoshis`. * `funding_satoshis`.
*/ */
if (state->push_msat > 1000 * state->funding_satoshis) if (state->push_msat > 1000 * state->funding_satoshis)
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_BAD_PARAM, status_failed(WIRE_OPENING_BAD_PARAM,
"push-msat must be < %"PRIu64, "push-msat must be < %"PRIu64,
1000 * state->funding_satoshis); 1000 * state->funding_satoshis);
msg = towire_open_channel(state, msg = towire_open_channel(state,
&state->chainparams->genesis_blockhash, &state->chainparams->genesis_blockhash,
&channel_id, &state->channel_id,
state->funding_satoshis, state->push_msat, state->funding_satoshis, state->push_msat,
state->localconf.dust_limit_satoshis, state->localconf.dust_limit_satoshis,
state->localconf.max_htlc_value_in_flight_msat, state->localconf.max_htlc_value_in_flight_msat,
@@ -260,14 +264,15 @@ static u8 *funder_channel(struct state *state,
&state->next_per_commit[LOCAL], &state->next_per_commit[LOCAL],
channel_flags); channel_flags);
if (!sync_crypto_write(&state->cs, PEER_FD, msg)) if (!sync_crypto_write(&state->cs, PEER_FD, msg))
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_PEER_WRITE_FAILED, status_failed(WIRE_OPENING_PEER_WRITE_FAILED,
"Writing open_channel"); "Writing open_channel: %s", strerror(errno));
state->remoteconf = tal(state, struct channel_config); state->remoteconf = tal(state, struct channel_config);
msg = read_next_peer_msg(state, state); msg = read_next_peer_msg(state, state);
if (!msg) if (!msg)
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_PEER_READ_FAILED, peer_failed(PEER_FD, &state->cs, &state->channel_id,
WIRE_OPENING_PEER_READ_FAILED,
"Reading accept_channel"); "Reading accept_channel");
/* BOLT #2: /* BOLT #2:
@@ -292,18 +297,21 @@ static u8 *funder_channel(struct state *state,
&theirs.payment, &theirs.payment,
&theirs.delayed_payment, &theirs.delayed_payment,
&state->next_per_commit[REMOTE])) &state->next_per_commit[REMOTE]))
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_PEER_READ_FAILED, peer_failed(PEER_FD, &state->cs, &state->channel_id,
WIRE_OPENING_PEER_READ_FAILED,
"Parsing accept_channel %s", tal_hex(msg, msg)); "Parsing accept_channel %s", tal_hex(msg, msg));
/* BOLT #2: /* BOLT #2:
* *
* The `temporary_channel_id` MUST be the same as the * The `temporary_channel_id` MUST be the same as the
* `temporary_channel_id` in the `open_channel` message. */ * `temporary_channel_id` in the `open_channel` message. */
if (!structeq(&id_in, &channel_id)) if (!structeq(&id_in, &state->channel_id))
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_PEER_READ_FAILED, peer_failed(PEER_FD, &state->cs, &id_in,
WIRE_OPENING_PEER_READ_FAILED,
"accept_channel ids don't match: sent %s got %s", "accept_channel ids don't match: sent %s got %s",
type_to_string(msg, struct channel_id, &id_in), type_to_string(msg, struct channel_id, &id_in),
type_to_string(msg, struct channel_id, &channel_id)); type_to_string(msg, struct channel_id,
&state->channel_id));
/* BOLT #2: /* BOLT #2:
* *
@@ -314,7 +322,8 @@ static u8 *funder_channel(struct state *state,
* `open_channel`. * `open_channel`.
*/ */
if (minimum_depth > max_minimum_depth) if (minimum_depth > max_minimum_depth)
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_BAD_PARAM, peer_failed(PEER_FD, &state->cs, &state->channel_id,
WIRE_OPENING_BAD_PARAM,
"minimum_depth %u larger than %u", "minimum_depth %u larger than %u",
minimum_depth, max_minimum_depth); minimum_depth, max_minimum_depth);
check_config_bounds(state, state->remoteconf); check_config_bounds(state, state->remoteconf);
@@ -349,7 +358,8 @@ static u8 *funder_channel(struct state *state,
&their_funding_pubkey, &their_funding_pubkey,
LOCAL); LOCAL);
if (!state->channel) if (!state->channel)
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_BAD_PARAM, peer_failed(PEER_FD, &state->cs, &state->channel_id,
WIRE_OPENING_BAD_PARAM,
"could not create channel with given config"); "could not create channel with given config");
/* BOLT #2: /* BOLT #2:
@@ -371,12 +381,13 @@ static u8 *funder_channel(struct state *state,
type_to_string(trc, struct bitcoin_tx, tx), type_to_string(trc, struct bitcoin_tx, tx),
type_to_string(trc, struct pubkey, our_funding_pubkey)); type_to_string(trc, struct pubkey, our_funding_pubkey));
msg = towire_funding_created(state, &channel_id, msg = towire_funding_created(state, &state->channel_id,
&state->funding_txid.sha, &state->funding_txid.sha,
state->funding_txout, state->funding_txout,
&sig); &sig);
if (!sync_crypto_write(&state->cs, PEER_FD, msg)) if (!sync_crypto_write(&state->cs, PEER_FD, msg))
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_PEER_WRITE_FAILED, peer_failed(PEER_FD, &state->cs, &state->channel_id,
WIRE_OPENING_PEER_WRITE_FAILED,
"Writing funding_created"); "Writing funding_created");
/* BOLT #2: /* BOLT #2:
@@ -389,11 +400,13 @@ static u8 *funder_channel(struct state *state,
*/ */
msg = read_next_peer_msg(state, state); msg = read_next_peer_msg(state, state);
if (!msg) if (!msg)
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_PEER_READ_FAILED, peer_failed(PEER_FD, &state->cs, &state->channel_id,
WIRE_OPENING_PEER_READ_FAILED,
"Reading funding_signed"); "Reading funding_signed");
if (!fromwire_funding_signed(msg, NULL, &id_in, &sig)) if (!fromwire_funding_signed(msg, NULL, &id_in, &sig))
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_PEER_READ_FAILED, peer_failed(PEER_FD, &state->cs, &state->channel_id,
WIRE_OPENING_PEER_READ_FAILED,
"Parsing funding_signed (%s)", "Parsing funding_signed (%s)",
wire_type_name(fromwire_peektype(msg))); wire_type_name(fromwire_peektype(msg)));
@@ -405,13 +418,15 @@ static u8 *funder_channel(struct state *state,
* exclusive-OR (ie. `funding_output_index` alters the last two * exclusive-OR (ie. `funding_output_index` alters the last two
* bytes). * bytes).
*/ */
derive_channel_id(&channel_id, derive_channel_id(&state->channel_id,
&state->funding_txid, state->funding_txout); &state->funding_txid, state->funding_txout);
if (!structeq(&id_in, &channel_id)) if (!structeq(&id_in, &state->channel_id))
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_PEER_READ_FAILED, peer_failed(PEER_FD, &state->cs, &id_in,
WIRE_OPENING_PEER_READ_FAILED,
"funding_signed ids don't match: expceted %s got %s", "funding_signed ids don't match: expceted %s got %s",
type_to_string(msg, struct channel_id, &channel_id), type_to_string(msg, struct channel_id,
&state->channel_id),
type_to_string(msg, struct channel_id, &id_in)); type_to_string(msg, struct channel_id, &id_in));
/* BOLT #2: /* BOLT #2:
@@ -422,7 +437,8 @@ static u8 *funder_channel(struct state *state,
&state->next_per_commit[LOCAL], LOCAL); &state->next_per_commit[LOCAL], LOCAL);
if (!check_tx_sig(tx, 0, NULL, wscript, &their_funding_pubkey, &sig)) { if (!check_tx_sig(tx, 0, NULL, wscript, &their_funding_pubkey, &sig)) {
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_PEER_READ_FAILED, peer_failed(PEER_FD, &state->cs, &state->channel_id,
WIRE_OPENING_PEER_READ_FAILED,
"Bad signature %s on tx %s using key %s", "Bad signature %s on tx %s using key %s",
type_to_string(trc, secp256k1_ecdsa_signature, type_to_string(trc, secp256k1_ecdsa_signature,
&sig), &sig),
@@ -459,7 +475,7 @@ static u8 *fundee_channel(struct state *state,
u32 minimum_depth, u32 minimum_depth,
u32 min_feerate, u32 max_feerate, const u8 *peer_msg) u32 min_feerate, u32 max_feerate, const u8 *peer_msg)
{ {
struct channel_id id_in, channel_id; struct channel_id id_in;
struct basepoints theirs; struct basepoints theirs;
struct pubkey their_funding_pubkey; struct pubkey their_funding_pubkey;
secp256k1_ecdsa_signature theirsig, sig; secp256k1_ecdsa_signature theirsig, sig;
@@ -478,7 +494,8 @@ static u8 *fundee_channel(struct state *state,
* `delayed_payment_basepoint` are not valid DER-encoded compressed * `delayed_payment_basepoint` are not valid DER-encoded compressed
* secp256k1 pubkeys. * secp256k1 pubkeys.
*/ */
if (!fromwire_open_channel(peer_msg, NULL, &chain_hash, &channel_id, if (!fromwire_open_channel(peer_msg, NULL, &chain_hash,
&state->channel_id,
&state->funding_satoshis, &state->push_msat, &state->funding_satoshis, &state->push_msat,
&state->remoteconf->dust_limit_satoshis, &state->remoteconf->dust_limit_satoshis,
&state->remoteconf->max_htlc_value_in_flight_msat, &state->remoteconf->max_htlc_value_in_flight_msat,
@@ -493,7 +510,8 @@ static u8 *fundee_channel(struct state *state,
&theirs.delayed_payment, &theirs.delayed_payment,
&state->next_per_commit[REMOTE], &state->next_per_commit[REMOTE],
&channel_flags)) &channel_flags))
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_PEER_BAD_INITIAL_MESSAGE, peer_failed(PEER_FD, &state->cs, NULL,
WIRE_OPENING_PEER_BAD_INITIAL_MESSAGE,
"Parsing open_channel %s", "Parsing open_channel %s",
tal_hex(peer_msg, peer_msg)); tal_hex(peer_msg, peer_msg));
@@ -504,7 +522,7 @@ static u8 *fundee_channel(struct state *state,
* unknown to the receiver. * unknown to the receiver.
*/ */
if (!structeq(&chain_hash, &state->chainparams->genesis_blockhash)) { if (!structeq(&chain_hash, &state->chainparams->genesis_blockhash)) {
peer_failed(PEER_FD, &state->cs, NULL, peer_failed(PEER_FD, &state->cs, &state->channel_id,
WIRE_OPENING_PEER_BAD_INITIAL_MESSAGE, WIRE_OPENING_PEER_BAD_INITIAL_MESSAGE,
"Unknown chain-hash %s", "Unknown chain-hash %s",
type_to_string(peer_msg, struct sha256_double, type_to_string(peer_msg, struct sha256_double,
@@ -516,7 +534,8 @@ static u8 *fundee_channel(struct state *state,
* The receiving node ... MUST fail the channel if `funding-satoshis` * The receiving node ... MUST fail the channel if `funding-satoshis`
* is greater than or equal to 2^24 */ * is greater than or equal to 2^24 */
if (state->funding_satoshis >= 1 << 24) if (state->funding_satoshis >= 1 << 24)
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_PEER_BAD_FUNDING, peer_failed(PEER_FD, &state->cs, &state->channel_id,
WIRE_OPENING_PEER_BAD_FUNDING,
"funding_satoshis %"PRIu64" too large", "funding_satoshis %"PRIu64" too large",
state->funding_satoshis); state->funding_satoshis);
@@ -526,7 +545,8 @@ static u8 *fundee_channel(struct state *state,
* greater than `funding_satoshis` * 1000. * greater than `funding_satoshis` * 1000.
*/ */
if (state->push_msat > state->funding_satoshis * 1000) if (state->push_msat > state->funding_satoshis * 1000)
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_PEER_BAD_FUNDING, peer_failed(PEER_FD, &state->cs, &state->channel_id,
WIRE_OPENING_PEER_BAD_FUNDING,
"push_msat %"PRIu64 "push_msat %"PRIu64
" too large for funding_satoshis %"PRIu64, " too large for funding_satoshis %"PRIu64,
state->push_msat, state->funding_satoshis); state->push_msat, state->funding_satoshis);
@@ -537,12 +557,14 @@ static u8 *fundee_channel(struct state *state,
* too small for timely processing, or unreasonably large. * too small for timely processing, or unreasonably large.
*/ */
if (state->feerate_per_kw < min_feerate) if (state->feerate_per_kw < min_feerate)
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_PEER_BAD_FUNDING, peer_failed(PEER_FD, &state->cs, &state->channel_id,
WIRE_OPENING_PEER_BAD_FUNDING,
"feerate_per_kw %u below minimum %u", "feerate_per_kw %u below minimum %u",
state->feerate_per_kw, min_feerate); state->feerate_per_kw, min_feerate);
if (state->feerate_per_kw > max_feerate) if (state->feerate_per_kw > max_feerate)
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_PEER_BAD_FUNDING, peer_failed(PEER_FD, &state->cs, &state->channel_id,
WIRE_OPENING_PEER_BAD_FUNDING,
"feerate_per_kw %u above maximum %u", "feerate_per_kw %u above maximum %u",
state->feerate_per_kw, max_feerate); state->feerate_per_kw, max_feerate);
@@ -550,7 +572,7 @@ static u8 *fundee_channel(struct state *state,
state->funding_satoshis); state->funding_satoshis);
check_config_bounds(state, state->remoteconf); check_config_bounds(state, state->remoteconf);
msg = towire_accept_channel(state, &channel_id, msg = towire_accept_channel(state, &state->channel_id,
state->localconf.dust_limit_satoshis, state->localconf.dust_limit_satoshis,
state->localconf state->localconf
.max_htlc_value_in_flight_msat, .max_htlc_value_in_flight_msat,
@@ -566,29 +588,34 @@ static u8 *fundee_channel(struct state *state,
&state->next_per_commit[LOCAL]); &state->next_per_commit[LOCAL]);
if (!sync_crypto_write(&state->cs, PEER_FD, take(msg))) if (!sync_crypto_write(&state->cs, PEER_FD, take(msg)))
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_PEER_WRITE_FAILED, peer_failed(PEER_FD, &state->cs, &state->channel_id,
WIRE_OPENING_PEER_WRITE_FAILED,
"Writing accept_channel"); "Writing accept_channel");
msg = read_next_peer_msg(state, state); msg = read_next_peer_msg(state, state);
if (!msg) if (!msg)
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_PEER_READ_FAILED, peer_failed(PEER_FD, &state->cs, &state->channel_id,
WIRE_OPENING_PEER_READ_FAILED,
"Reading funding_created"); "Reading funding_created");
if (!fromwire_funding_created(msg, NULL, &id_in, if (!fromwire_funding_created(msg, NULL, &id_in,
&state->funding_txid.sha, &state->funding_txid.sha,
&state->funding_txout, &state->funding_txout,
&theirsig)) &theirsig))
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_PEER_READ_FAILED, peer_failed(PEER_FD, &state->cs, &state->channel_id,
WIRE_OPENING_PEER_READ_FAILED,
"Parsing funding_created"); "Parsing funding_created");
/* BOLT #2: /* BOLT #2:
* *
* The sender MUST set `temporary_channel_id` the same as the * The sender MUST set `temporary_channel_id` the same as the
* `temporary_channel_id` in the `open_channel` message. */ * `temporary_channel_id` in the `open_channel` message. */
if (!structeq(&id_in, &channel_id)) if (!structeq(&id_in, &state->channel_id))
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_PEER_READ_FAILED, peer_failed(PEER_FD, &state->cs, &id_in,
WIRE_OPENING_PEER_READ_FAILED,
"funding_created ids don't match: sent %s got %s", "funding_created ids don't match: sent %s got %s",
type_to_string(msg, struct channel_id, &channel_id), type_to_string(msg, struct channel_id,
&state->channel_id),
type_to_string(msg, struct channel_id, &id_in)); type_to_string(msg, struct channel_id, &id_in));
state->channel = new_initial_channel(state, state->channel = new_initial_channel(state,
@@ -604,7 +631,8 @@ static u8 *fundee_channel(struct state *state,
&their_funding_pubkey, &their_funding_pubkey,
REMOTE); REMOTE);
if (!state->channel) if (!state->channel)
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_BAD_PARAM, peer_failed(PEER_FD, &state->cs, &state->channel_id,
WIRE_OPENING_BAD_PARAM,
"could not create channel with given config"); "could not create channel with given config");
/* BOLT #2: /* BOLT #2:
@@ -616,7 +644,8 @@ static u8 *fundee_channel(struct state *state,
if (!check_tx_sig(tx, 0, NULL, wscript, &their_funding_pubkey, if (!check_tx_sig(tx, 0, NULL, wscript, &their_funding_pubkey,
&theirsig)) { &theirsig)) {
peer_failed(PEER_FD, &state->cs, NULL, WIRE_OPENING_PEER_READ_FAILED, peer_failed(PEER_FD, &state->cs, &state->channel_id,
WIRE_OPENING_PEER_READ_FAILED,
"Bad signature %s on tx %s using key %s", "Bad signature %s on tx %s using key %s",
type_to_string(trc, secp256k1_ecdsa_signature, type_to_string(trc, secp256k1_ecdsa_signature,
&theirsig), &theirsig),
@@ -633,7 +662,7 @@ static u8 *fundee_channel(struct state *state,
* exclusive-OR (ie. `funding_output_index` alters the last two * exclusive-OR (ie. `funding_output_index` alters the last two
* bytes). * bytes).
*/ */
derive_channel_id(&channel_id, derive_channel_id(&state->channel_id,
&state->funding_txid, state->funding_txout); &state->funding_txid, state->funding_txout);
/* BOLT #2: /* BOLT #2:
@@ -652,7 +681,7 @@ static u8 *fundee_channel(struct state *state,
/* We don't send this ourselves: channeld does, because master needs /* We don't send this ourselves: channeld does, because master needs
* to save state to disk before doing so. */ * to save state to disk before doing so. */
msg = towire_funding_signed(state, &channel_id, &sig); msg = towire_funding_signed(state, &state->channel_id, &sig);
return towire_opening_fundee_reply(state, return towire_opening_fundee_reply(state,
state->remoteconf, state->remoteconf,