lukechilds
/
lightning
mirror of https://github.com/lukechilds/lightning.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

lightningd/channel: hand commit_index in when creating txs only. 

Don't store it persistently, as we want to be explicit anyway.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
ppa-0.6.1
Rusty Russell 8 years ago
parent
90284af249
commit
b600e6118c
8 changed files with 98 additions and 101 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      lightningd/channel.c
  2. 9
      lightningd/channel.h
  3. 111
      lightningd/channel/channel.c
  4. 21
      lightningd/derive_basepoints.c
  5. 6
      lightningd/derive_basepoints.h
  6. 20
      lightningd/opening/opening.c
  7. 3
      lightningd/peer_control.c
  8. 20
      lightningd/test/run-channel.c

9
lightningd/channel.c
View File

@ -141,8 +141,6 @@ struct channel *new_channel(const tal_t *ctx,
u64 funding_satoshis,
u64 local_msatoshi,
u32 feerate_per_kw,
u64 local_commit_index,
u64 remote_commit_index,
const struct channel_config *local,
const struct channel_config *remote,
const struct basepoints *local_basepoints,
@ -180,9 +178,6 @@ struct channel *new_channel(const tal_t *ctx,
= channel->view[LOCAL].owed_msat[REMOTE]
= channel->funding_msat - local_msatoshi;
channel->view[LOCAL].commitment_number = local_commit_index;
channel->view[REMOTE].commitment_number = remote_commit_index;
channel->basepoints[LOCAL] = *local_basepoints;
channel->basepoints[REMOTE] = *remote_basepoints;
@ -263,6 +258,7 @@ struct bitcoin_tx **channel_txs(const tal_t *ctx,
const u8 ***wscripts,
const struct channel *channel,
const struct pubkey *per_commitment_point,
u64 commitment_number,
enum side side)
{
struct bitcoin_tx **txs;
@ -317,8 +313,7 @@ struct bitcoin_tx **channel_txs(const tal_t *ctx,
channel->view[side].owed_msat[!side],
committed,
htlcmap,
channel->view[side].commitment_number
^ channel->commitment_number_obscurer,
commitment_number ^ channel->commitment_number_obscurer,
side);
*wscripts = tal_arr(ctx, const u8 *, 1);

9
lightningd/channel.h
View File

@ -21,9 +21,6 @@ struct channel_view {
/* Current feerate in satoshis per 1000 weight. */
u64 feerate_per_kw;
/* What commitment number are we up to */
u64 commitment_number;
/* How much is owed to each side (includes pending changes) */
u64 owed_msat[NUM_SIDES];
};
@ -129,8 +126,6 @@ static inline u16 to_self_delay(const struct channel *channel, enum side side)
* @funding_satoshis: The commitment transaction amount.
* @local_msatoshi: The amount for the local side (remainder goes to remote)
* @feerate_per_kw: feerate per kiloweight (satoshis)
* @local_commit_index: local commitment number
* @remote_commit_index: remote commitment number
* @local: local channel configuration
* @remote: remote channel configuration
* @local_basepoints: local basepoints.
@ -147,8 +142,6 @@ struct channel *new_channel(const tal_t *ctx,
u64 funding_satoshis,
u64 local_msatoshi,
u32 feerate_per_kw,
u64 local_commit_index,
u64 remote_commit_index,
const struct channel_config *local,
const struct channel_config *remote,
const struct basepoints *local_basepoints,
@ -164,6 +157,7 @@ struct channel *new_channel(const tal_t *ctx,
* @htlc_map: Pointer to htlcs for each tx output (allocated off @ctx) or NULL.
* @wscripts: Pointer to array of wscript for each tx returned (alloced off @ctx)
* @per_commitment_point: Per-commitment point to determine keys
* @commitment_number: The index of this commitment.
* @side: which side to get the commitment transaction for
*
* Returns the unsigned commitment transaction for the committed state
@ -176,6 +170,7 @@ struct bitcoin_tx **channel_txs(const tal_t *ctx,
const u8 ***wscripts,
const struct channel *channel,
const struct pubkey *per_commitment_point,
u64 commitment_number,
enum side side);
/**

111
lightningd/channel/channel.c
View File

@ -56,11 +56,16 @@ struct commit_sigs {
struct peer {
struct peer_crypto_state pcs;
struct channel_config conf[NUM_SIDES];
struct pubkey old_per_commit[NUM_SIDES];
struct pubkey current_per_commit[NUM_SIDES];
bool funding_locked[NUM_SIDES];
u64 commit_index[NUM_SIDES];
/* Remote's current per-commit point. */
struct pubkey remote_per_commit;
/* Remotes's last per-commitment point: we keep this to check
* revoke_and_ack's `per_commitment_secret` is correct. */
struct pubkey old_remote_per_commit;
/* Their sig for current commit. */
secp256k1_ecdsa_signature their_commit_sig;
@ -282,8 +287,9 @@ static struct io_plan *handle_peer_funding_locked(struct io_conn *conn,
{
struct channel_id chanid;
peer->old_remote_per_commit = peer->remote_per_commit;
if (!fromwire_funding_locked(msg, NULL, &chanid,
&peer->current_per_commit[REMOTE]))
&peer->remote_per_commit))
status_failed(WIRE_CHANNEL_PEER_BAD_MESSAGE,
"Bad funding_locked %s", tal_hex(msg, msg));
@ -297,7 +303,7 @@ static struct io_plan *handle_peer_funding_locked(struct io_conn *conn,
peer->funding_locked[REMOTE] = true;
daemon_conn_send(&peer->master,
take(towire_channel_got_funding_locked(peer,
&peer->current_per_commit[REMOTE])));
&peer->remote_per_commit)));
if (peer->funding_locked[LOCAL]) {
daemon_conn_send(&peer->master,
@ -457,19 +463,28 @@ static struct commit_sigs *calc_commitsigs(const tal_t *ctx,
if (!derive_simple_privkey(&peer->our_secrets.payment_basepoint_secret,
&peer->channel->basepoints[LOCAL].payment,
&peer->current_per_commit[REMOTE],
&peer->remote_per_commit,
&local_secretkey))
status_failed(WIRE_CHANNEL_CRYPTO_FAILED,
"Deriving local_secretkey");
if (!derive_simple_key(&peer->channel->basepoints[LOCAL].payment,
&peer->current_per_commit[REMOTE],
&peer->remote_per_commit,
&localkey))
status_failed(WIRE_CHANNEL_CRYPTO_FAILED,
"Deriving localkey");
status_trace("Derived key %s from basepoint %s, point %s",
type_to_string(trc, struct pubkey, &localkey),
type_to_string(trc, struct pubkey,
&peer->channel->basepoints[LOCAL].payment),
type_to_string(trc, struct pubkey,
&peer->remote_per_commit));
txs = channel_txs(tmpctx, &htlc_map, &wscripts, peer->channel,
&peer->current_per_commit[REMOTE], REMOTE);
&peer->remote_per_commit,
peer->commit_index[REMOTE],
REMOTE);
sign_tx_input(txs[0], 0, NULL,
wscripts[0],
@ -477,7 +492,8 @@ static struct commit_sigs *calc_commitsigs(const tal_t *ctx,
&peer->channel->funding_pubkey[LOCAL],
&commit_sigs->commit_sig);
status_trace("Creating commit_sig signature %s for tx %s wscript %s key %s",
status_trace("Creating commit_sig signature %"PRIu64" %s for tx %s wscript %s key %s",
peer->commit_index[REMOTE],
type_to_string(trc, secp256k1_ecdsa_signature,
&commit_sigs->commit_sig),
type_to_string(trc, struct bitcoin_tx, txs[0]),
@ -552,7 +568,7 @@ static void send_commit(struct peer *peer)
status_trace("Telling master we're about to commit...");
/* Tell master to save this next commit to database, then wait. */
msg = sending_commitsig_msg(tmpctx, peer->commit_index[REMOTE] + 1,
msg = sending_commitsig_msg(tmpctx, peer->commit_index[REMOTE],
changed_htlcs,
&peer->next_commit_sigs->commit_sig,
peer->next_commit_sigs->htlc_sigs);
@ -578,26 +594,30 @@ static void start_commit_timer(struct peer *peer)
/* We come back here once master has acked the commit_sig we received */
static struct io_plan *send_revocation(struct io_conn *conn, struct peer *peer)
{
struct pubkey oldpoint = peer->old_per_commit[LOCAL], test;
struct pubkey oldpoint, point;
struct sha256 old_commit_secret;
u8 *msg;
peer->old_per_commit[LOCAL] = peer->current_per_commit[LOCAL];
/* Get N-1th secret. */
per_commit_secret(&peer->shaseed, &old_commit_secret,
peer->commit_index[LOCAL] - 1);
pubkey_from_privkey((struct privkey *)&old_commit_secret, &test);
if (!pubkey_eq(&test, &oldpoint))
/* Sanity check that it corresponds to the point we sent. */
pubkey_from_privkey((struct privkey *)&old_commit_secret, &point);
if (!per_commit_point(&peer->shaseed, &oldpoint,
peer->commit_index[LOCAL]-1))
status_failed(WIRE_CHANNEL_CRYPTO_FAILED,
"Invalid point %"PRIu64" for commit_point",
peer->commit_index[LOCAL]-1);
if (!pubkey_eq(&point, &oldpoint))
status_failed(WIRE_CHANNEL_CRYPTO_FAILED,
"Invalid secret %s for commit_point",
tal_hexstr(trc, &old_commit_secret,
sizeof(old_commit_secret)));
/* Send N+1th point. */
if (!per_commit_point(&peer->shaseed,
&peer->current_per_commit[LOCAL],
if (!per_commit_point(&peer->shaseed, &point,
++peer->commit_index[LOCAL]))
status_failed(WIRE_CHANNEL_CRYPTO_FAILED,
"Deriving next commit_point");
@ -609,7 +629,7 @@ static struct io_plan *send_revocation(struct io_conn *conn, struct peer *peer)
}
msg = towire_revoke_and_ack(peer, &peer->channel_id, &old_commit_secret,
&peer->current_per_commit[LOCAL]);
&point);
msg_enqueue(&peer->peer_out, take(msg));
return peer_read_message(conn, &peer->pcs, peer_in);
@ -727,7 +747,7 @@ static struct io_plan *handle_peer_commit_sig(struct io_conn *conn,
const tal_t *tmpctx = tal_tmpctx(peer);
struct channel_id channel_id;
secp256k1_ecdsa_signature commit_sig, *htlc_sigs;
struct pubkey remotekey;
struct pubkey remotekey, point;
struct bitcoin_tx **txs;
const struct htlc **htlc_map, **changed_htlcs;
const u8 **wscripts;
@ -755,15 +775,24 @@ static struct io_plan *handle_peer_commit_sig(struct io_conn *conn,
WIRE_CHANNEL_PEER_BAD_MESSAGE,
"Bad commit_sig %s", tal_hex(msg, msg));
if (!per_commit_point(&peer->shaseed, &point,
peer->commit_index[LOCAL]))
status_failed(WIRE_CHANNEL_CRYPTO_FAILED,
"Deriving per_commit_point for %"PRIu64,
peer->commit_index[LOCAL]);
txs = channel_txs(tmpctx, &htlc_map, &wscripts, peer->channel,
&peer->current_per_commit[LOCAL], LOCAL);
&point, peer->commit_index[LOCAL], LOCAL);
if (!derive_simple_key(&peer->channel->basepoints[REMOTE].payment,
&peer->current_per_commit[LOCAL],
&remotekey))
&point, &remotekey))
status_failed(WIRE_CHANNEL_CRYPTO_FAILED,
"Deriving remotekey");
status_trace("Derived key %s from basepoint %s, point %s",
type_to_string(trc, struct pubkey, &remotekey),
type_to_string(trc, struct pubkey,
&peer->channel->basepoints[REMOTE].payment),
type_to_string(trc, struct pubkey, &point));
/* BOLT #2:
*
* A receiving node MUST fail the channel if `signature` is not valid
@ -777,7 +806,8 @@ static struct io_plan *handle_peer_commit_sig(struct io_conn *conn,
&peer->pcs.cs,
&peer->channel_id,
WIRE_CHANNEL_PEER_BAD_MESSAGE,
"Bad commit_sig signature %s for tx %s wscript %s key %s",
"Bad commit_sig signature %"PRIu64" %s for tx %s wscript %s key %s",
peer->commit_index[LOCAL],
type_to_string(msg, secp256k1_ecdsa_signature,
&commit_sig),
type_to_string(msg, struct bitcoin_tx, txs[0]),
@ -905,7 +935,7 @@ static struct io_plan *handle_peer_revoke_and_ack(struct io_conn *conn,
"Bad privkey %s",
type_to_string(msg, struct privkey, &privkey));
}
if (!pubkey_eq(&per_commit_point, &peer->old_per_commit[REMOTE])) {
if (!pubkey_eq(&per_commit_point, &peer->old_remote_per_commit)) {
peer_failed(io_conn_fd(peer->peer_conn),
&peer->pcs.cs,
&peer->channel_id,
@ -913,7 +943,7 @@ static struct io_plan *handle_peer_revoke_and_ack(struct io_conn *conn,
"Wrong privkey %s for %s",
type_to_string(msg, struct privkey, &privkey),
type_to_string(msg, struct pubkey,
&peer->old_per_commit[REMOTE]));
&peer->old_remote_per_commit));
}
/* We start timer even if this returns false: we might have delayed
@ -924,7 +954,7 @@ static struct io_plan *handle_peer_revoke_and_ack(struct io_conn *conn,
status_trace("No commits outstanding after recv revoke_and_ack");
/* Tell master about things this locks in, wait for response */
msg = got_revoke_msg(msg, peer->commit_index[REMOTE],
msg = got_revoke_msg(msg, peer->commit_index[REMOTE] - 1,
&old_commit_secret, &next_per_commit,
changed_htlcs);
master_sync_reply(peer, take(msg),
@ -932,8 +962,8 @@ static struct io_plan *handle_peer_revoke_and_ack(struct io_conn *conn,
handle_reply_wake_peer);
peer->commit_index[REMOTE]++;
peer->old_per_commit[REMOTE] = peer->current_per_commit[REMOTE];
peer->current_per_commit[REMOTE] = next_per_commit;
peer->old_remote_per_commit = peer->remote_per_commit;
peer->remote_per_commit = next_per_commit;
/* And peer waits for reply. */
return io_wait(conn, peer, accepted_revocation, peer);
@ -1270,7 +1300,7 @@ static void init_channel(struct peer *peer)
&points[REMOTE].revocation,
&points[REMOTE].payment,
&points[REMOTE].delayed_payment,
&peer->old_per_commit[REMOTE],
&peer->remote_per_commit,
&am_funder,
&peer->fee_base,
&peer->fee_per_satoshi,
@ -1300,26 +1330,20 @@ static void init_channel(struct peer *peer)
assert(commits_sent > 0);
assert(commits_received > 0);
peer->commit_index[LOCAL] = commits_sent - 1;
peer->commit_index[REMOTE] = commits_received - 1;
peer->commit_index[LOCAL] = commits_sent;
peer->commit_index[REMOTE] = commits_received;
/* channel_id is set from funding txout */
derive_channel_id(&peer->channel_id, &funding_txid, funding_txout);
/* We derive everything from the one secret seed. */
derive_basepoints(&seed, &funding_pubkey[LOCAL], &points[LOCAL],
&peer->our_secrets, &peer->shaseed,
&peer->old_per_commit[LOCAL],
peer->commit_index[LOCAL]);
status_trace("First per_commit_point = %s",
type_to_string(trc, struct pubkey,
&peer->old_per_commit[LOCAL]));
&peer->our_secrets, &peer->shaseed);
peer->channel = new_channel(peer, &funding_txid, funding_txout,
funding_satoshi,
local_msatoshi,
peer->fee_base,
0, 0,
&peer->conf[LOCAL], &peer->conf[REMOTE],
&points[LOCAL], &points[REMOTE],
&funding_pubkey[LOCAL],
@ -1348,17 +1372,20 @@ static void init_channel(struct peer *peer)
static void handle_funding_locked(struct peer *peer, const u8 *msg)
{
struct pubkey next_per_commit_point;
if (!fromwire_channel_funding_locked(msg, NULL,
&peer->short_channel_ids[LOCAL]))
status_failed(WIRE_CHANNEL_BAD_COMMAND, "%s", tal_hex(msg, msg));
per_commit_point(&peer->shaseed,
&peer->current_per_commit[LOCAL],
++peer->commit_index[LOCAL]);
&next_per_commit_point, peer->commit_index[LOCAL]);
status_trace("funding_locked: sending commit index %"PRIu64": %s",
peer->commit_index[LOCAL],
type_to_string(trc, struct pubkey, &next_per_commit_point));
msg = towire_funding_locked(peer,
&peer->channel_id,
&peer->current_per_commit[LOCAL]);
&peer->channel_id, &next_per_commit_point);
msg_enqueue(&peer->peer_out, take(msg));
peer->funding_locked[LOCAL] = true;

21
lightningd/derive_basepoints.c
View File

@ -9,11 +9,8 @@ bool derive_basepoints(const struct privkey *seed,
struct pubkey *funding_pubkey,
struct basepoints *basepoints,
struct secrets *secrets,
struct sha256 *shaseed,
struct pubkey *per_commit_point,
u64 per_commit_index)
struct sha256 *shaseed)
{
struct sha256 per_commit_secret;
struct keys {
struct privkey f, r, p, d;
struct sha256 shaseed;
@ -49,22 +46,6 @@ bool derive_basepoints(const struct privkey *seed,
if (shaseed)
*shaseed = keys.shaseed;
shachain_from_seed(&keys.shaseed, shachain_index(per_commit_index),
&per_commit_secret);
/* BOLT #3:
*
* The `per_commitment_point` is generated using EC multiplication:
*
* per_commitment_point = per_commitment_secret * G
*/
if (per_commit_point) {
if (secp256k1_ec_pubkey_create(secp256k1_ctx,
&per_commit_point->pubkey,
per_commit_secret.u.u8) != 1)
return false;
}
return true;
}

6
lightningd/derive_basepoints.h
View File

@ -26,16 +26,12 @@ struct secrets {
* @basepoints: (out) basepoints for channel (if non-NULL)
* @secrets: (out) basepoints for channel (if non-NULL)
* @shaseed: (out) seed for shachain (if non-NULL)
* @per_commit_point: (out) per-commit-point for @per_commit_index (if non-NULL)
* @per_commit_index: (in) which @per_commit_point to set.
*/
bool derive_basepoints(const struct privkey *seed,
struct pubkey *funding_pubkey,
struct basepoints *basepoints,
struct secrets *secrets,
struct sha256 *shaseed,
struct pubkey *per_commit_point,
u64 per_commit_index);
struct sha256 *shaseed);
/**
* per_commit_secret - get a secret for this index.

20
lightningd/opening/opening.c
View File

@ -342,7 +342,6 @@ static u8 *funder_channel(struct state *state,
state->funding_satoshis * 1000
- state->push_msat,
state->feerate_per_kw,
0, 0,
&state->localconf,
state->remoteconf,
ours, &theirs,
@ -362,7 +361,7 @@ static u8 *funder_channel(struct state *state,
* peer's signature, it will broadcast the funding transaction.
*/
txs = channel_txs(tmpctx, NULL, &wscripts, state->channel,
&state->next_per_commit[REMOTE], REMOTE);
&state->next_per_commit[REMOTE], 0, REMOTE);
sign_tx_input(txs[0], 0, NULL, wscripts[0],
&state->our_secrets.funding_privkey,
@ -420,7 +419,7 @@ static u8 *funder_channel(struct state *state,
* The recipient MUST fail the channel if `signature` is incorrect.
*/
txs = channel_txs(tmpctx, NULL, &wscripts, state->channel,
&state->next_per_commit[LOCAL], LOCAL);
&state->next_per_commit[LOCAL], 0, LOCAL);
if (!check_tx_sig(txs[0], 0, NULL, wscripts[0], &their_funding_pubkey,
&sig)) {
@ -597,7 +596,6 @@ static u8 *fundee_channel(struct state *state,
state->funding_satoshis,
state->push_msat,
state->feerate_per_kw,
0, 0,
&state->localconf,
state->remoteconf,
ours, &theirs,
@ -613,7 +611,7 @@ static u8 *fundee_channel(struct state *state,
* The recipient MUST fail the channel if `signature` is incorrect.
*/
txs = channel_txs(state, NULL, &wscripts, state->channel,
&state->next_per_commit[LOCAL], LOCAL);
&state->next_per_commit[LOCAL], 0, LOCAL);
if (!check_tx_sig(txs[0], 0, NULL, wscripts[0], &their_funding_pubkey,
&theirsig)) {
@ -646,7 +644,7 @@ static u8 *fundee_channel(struct state *state,
* redeem their funds if they need to.
*/
txs = channel_txs(state, NULL, &wscripts, state->channel,
&state->next_per_commit[REMOTE], REMOTE);
&state->next_per_commit[REMOTE], 0, REMOTE);
sign_tx_input(txs[0], 0, NULL, wscripts[0],
&state->our_secrets.funding_privkey,
our_funding_pubkey, &sig);
@ -715,12 +713,18 @@ int main(int argc, char *argv[])
/* We derive everything from the one secret seed. */
if (!derive_basepoints(&seed, &our_funding_pubkey,
&our_points, &state->our_secrets,
&state->shaseed, &state->next_per_commit[LOCAL],
0))
&state->shaseed))
status_failed(WIRE_OPENING_KEY_DERIVATION_FAILED,
"Secret derivation failed, secret = %s",
type_to_string(trc, struct privkey, &seed));
if (!per_commit_point(&state->shaseed, &state->next_per_commit[LOCAL],
0))
status_failed(WIRE_OPENING_KEY_DERIVATION_FAILED,
"First per_commitment_point derivation failed,"
" secret = %s",
type_to_string(trc, struct privkey, &seed));
status_trace("First per_commit_point = %s",
type_to_string(trc, struct pubkey,
&state->next_per_commit[LOCAL]));

3
lightningd/peer_control.c
View File

@ -1064,8 +1064,7 @@ static bool opening_funder_finished(struct subd *opening, const u8 *resp,
&changekey, fc->change_keyindex))
fatal("Error deriving change key %u", fc->change_keyindex);
derive_basepoints(fc->peer->seed, &local_fundingkey,
NULL, NULL, NULL, NULL, 0);
derive_basepoints(fc->peer->seed, &local_fundingkey, NULL, NULL, NULL);
fc->funding_tx = funding_tx(fc, &fc->peer->funding_outnum,
fc->utxomap, fc->peer->funding_satoshi,

20
lightningd/test/run-channel.c
View File

@ -421,7 +421,6 @@ int main(void)
lchannel = new_channel(tmpctx, &funding_txid, funding_output_index,
funding_amount_satoshi, to_local_msat,
feerate_per_kw,
42, 0,
local_config,
remote_config,
&localbase, &remotebase,
@ -430,7 +429,6 @@ int main(void)
rchannel = new_channel(tmpctx, &funding_txid, funding_output_index,
funding_amount_satoshi, to_remote_msat,
feerate_per_kw,
0, 42,
remote_config,
local_config,
&remotebase, &localbase,
@ -467,7 +465,7 @@ int main(void)
NULL, &htlc_map, 0x2bb038521914 ^ 42, LOCAL);
txs = channel_txs(tmpctx, &htlc_map, &wscripts,
lchannel, &local_per_commitment_point, LOCAL);
lchannel, &local_per_commitment_point, 42, LOCAL);
assert(tal_count(txs) == 1);
assert(tal_count(htlc_map) == 2);
assert(tal_count(wscripts) == 1);
@ -475,7 +473,7 @@ int main(void)
tx_must_be_eq(txs[0], raw_tx);
txs2 = channel_txs(tmpctx, &htlc_map, &wscripts,
rchannel, &local_per_commitment_point, REMOTE);
rchannel, &local_per_commitment_point, 42, REMOTE);
txs_must_be_eq(txs, txs2);
/* BOLT #3:
@ -502,10 +500,10 @@ int main(void)
== rchannel->view[LOCAL].owed_msat[LOCAL]);
txs = channel_txs(tmpctx, &htlc_map, &wscripts,
lchannel, &local_per_commitment_point, LOCAL);
lchannel, &local_per_commitment_point, 42, LOCAL);
assert(tal_count(txs) == 1);
txs2 = channel_txs(tmpctx, &htlc_map, &wscripts,
rchannel, &local_per_commitment_point, REMOTE);
rchannel, &local_per_commitment_point, 42, REMOTE);
txs_must_be_eq(txs, txs2);
/* FIXME: Adjust properly! */
@ -520,10 +518,10 @@ int main(void)
== rchannel->view[LOCAL].owed_msat[LOCAL]);
txs = channel_txs(tmpctx, &htlc_map, &wscripts,
lchannel, &local_per_commitment_point, LOCAL);
lchannel, &local_per_commitment_point, 42, LOCAL);
assert(tal_count(txs) == 6);
txs2 = channel_txs(tmpctx, &htlc_map, &wscripts,
rchannel, &local_per_commitment_point, REMOTE);
rchannel, &local_per_commitment_point, 42, REMOTE);
txs_must_be_eq(txs, txs2);
/* FIXME: Compare signatures! */
@ -589,11 +587,13 @@ int main(void)
0x2bb038521914 ^ 42, LOCAL);
txs = channel_txs(tmpctx, &htlc_map, &wscripts,
lchannel, &local_per_commitment_point, LOCAL);
lchannel, &local_per_commitment_point,
42, LOCAL);
tx_must_be_eq(txs[0], raw_tx);
txs2 = channel_txs(tmpctx, &htlc_map, &wscripts,
rchannel, &local_per_commitment_point, REMOTE);
rchannel, &local_per_commitment_point,
42, REMOTE);
txs_must_be_eq(txs, txs2);
}

Write Preview
Loading…
Cancel
Save