mirror of
https://github.com/ElementsProject/lightning.git
synced 2024-11-20 10:39:49 +01:00
7401b26824
Before: Ten builds, laptop -j5, no ccache: ``` real 0m36.686000-38.956000(38.608+/-0.65)s user 2m32.864000-42.253000(40.7545+/-2.7)s sys 0m16.618000-18.316000(17.8531+/-0.48)s ``` Ten builds, laptop -j5, ccache (warm): ``` real 0m8.212000-8.577000(8.39989+/-0.13)s user 0m12.731000-13.212000(12.9751+/-0.17)s sys 0m3.697000-3.902000(3.83722+/-0.064)s ``` After: Ten builds, laptop -j5, no ccache: 8% faster ``` real 0m33.802000-35.773000(35.468+/-0.54)s user 2m19.073000-27.754000(26.2542+/-2.3)s sys 0m15.784000-17.173000(16.7165+/-0.37)s ``` Ten builds, laptop -j5, ccache (warm): 1% faster ``` real 0m8.200000-8.485000(8.30138+/-0.097)s user 0m12.485000-13.100000(12.7344+/-0.19)s sys 0m3.702000-3.889000(3.78787+/-0.056)s ``` Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
215 lines
6.4 KiB
C
215 lines
6.4 KiB
C
#include "config.h"
|
|
#include <bitcoin/psbt.h>
|
|
#include <bitcoin/script.h>
|
|
#include <ccan/tal/str/str.h>
|
|
#include <common/blockheight_states.h>
|
|
#include <common/channel_type.h>
|
|
#include <common/fee_states.h>
|
|
#include <common/initial_channel.h>
|
|
#include <common/initial_commit_tx.h>
|
|
#include <common/keyset.h>
|
|
#include <common/type_to_string.h>
|
|
|
|
struct channel *new_initial_channel(const tal_t *ctx,
|
|
const struct channel_id *cid,
|
|
const struct bitcoin_txid *funding_txid,
|
|
unsigned int funding_txout,
|
|
u32 minimum_depth,
|
|
const struct height_states *height_states TAKES,
|
|
u32 lease_expiry,
|
|
struct amount_sat funding,
|
|
struct amount_msat local_msatoshi,
|
|
const struct fee_states *fee_states TAKES,
|
|
const struct channel_config *local,
|
|
const struct channel_config *remote,
|
|
const struct basepoints *local_basepoints,
|
|
const struct basepoints *remote_basepoints,
|
|
const struct pubkey *local_funding_pubkey,
|
|
const struct pubkey *remote_funding_pubkey,
|
|
const struct channel_type *type TAKES,
|
|
bool option_wumbo,
|
|
enum side opener)
|
|
{
|
|
struct channel *channel = tal(ctx, struct channel);
|
|
struct amount_msat remote_msatoshi;
|
|
|
|
channel->cid = *cid;
|
|
channel->funding_txid = *funding_txid;
|
|
channel->funding_txout = funding_txout;
|
|
channel->funding = funding;
|
|
channel->minimum_depth = minimum_depth;
|
|
channel->lease_expiry = lease_expiry;
|
|
if (!amount_sat_sub_msat(&remote_msatoshi,
|
|
channel->funding, local_msatoshi))
|
|
return tal_free(channel);
|
|
|
|
channel->opener = opener;
|
|
channel->config[LOCAL] = *local;
|
|
channel->config[REMOTE] = *remote;
|
|
channel->funding_pubkey[LOCAL] = *local_funding_pubkey;
|
|
channel->funding_pubkey[REMOTE] = *remote_funding_pubkey;
|
|
channel->htlcs = NULL;
|
|
|
|
/* takes() if necessary */
|
|
channel->fee_states = dup_fee_states(channel, fee_states);
|
|
|
|
/* takes() if necessary */
|
|
if (!height_states)
|
|
channel->blockheight_states = NULL;
|
|
else
|
|
channel->blockheight_states
|
|
= dup_height_states(channel, height_states);
|
|
|
|
channel->view[LOCAL].owed[LOCAL]
|
|
= channel->view[REMOTE].owed[LOCAL]
|
|
= local_msatoshi;
|
|
channel->view[REMOTE].owed[REMOTE]
|
|
= channel->view[LOCAL].owed[REMOTE]
|
|
= remote_msatoshi;
|
|
|
|
channel->basepoints[LOCAL] = *local_basepoints;
|
|
channel->basepoints[REMOTE] = *remote_basepoints;
|
|
|
|
channel->commitment_number_obscurer
|
|
= commit_number_obscurer(&channel->basepoints[opener].payment,
|
|
&channel->basepoints[!opener].payment);
|
|
|
|
channel->option_wumbo = option_wumbo;
|
|
/* takes() if necessary */
|
|
channel->type = tal_dup(channel, struct channel_type, type);
|
|
|
|
return channel;
|
|
}
|
|
|
|
/* FIXME: We could cache this. */
|
|
struct bitcoin_tx *initial_channel_tx(const tal_t *ctx,
|
|
const u8 **wscript,
|
|
const struct channel *channel,
|
|
const struct pubkey *per_commitment_point,
|
|
enum side side,
|
|
struct wally_tx_output *direct_outputs[NUM_SIDES],
|
|
char** err_reason)
|
|
{
|
|
struct keyset keyset;
|
|
struct bitcoin_tx *init_tx;
|
|
u32 csv_lock;
|
|
|
|
/* This assumes no HTLCs! */
|
|
assert(!channel->htlcs);
|
|
|
|
if (!derive_keyset(per_commitment_point,
|
|
&channel->basepoints[side],
|
|
&channel->basepoints[!side],
|
|
channel_has(channel, OPT_STATIC_REMOTEKEY),
|
|
&keyset)) {
|
|
*err_reason = "Cannot derive keyset";
|
|
return NULL;
|
|
}
|
|
|
|
/* Figure out the csv_lock (if there's a lease) */
|
|
if (channel->lease_expiry == 0)
|
|
csv_lock = 1;
|
|
else
|
|
/* For the initial commitment, starts max lease */
|
|
csv_lock = channel->lease_expiry
|
|
- get_blockheight(channel->blockheight_states,
|
|
channel->opener,
|
|
side);
|
|
|
|
*wscript = bitcoin_redeem_2of2(ctx,
|
|
&channel->funding_pubkey[side],
|
|
&channel->funding_pubkey[!side]);
|
|
|
|
init_tx = initial_commit_tx(ctx, &channel->funding_txid,
|
|
channel->funding_txout,
|
|
channel->funding,
|
|
channel->funding_pubkey,
|
|
channel->opener,
|
|
/* They specify our to_self_delay and v.v. */
|
|
channel->config[!side].to_self_delay,
|
|
&keyset,
|
|
channel_feerate(channel, side),
|
|
channel->config[side].dust_limit,
|
|
channel->view[side].owed[side],
|
|
channel->view[side].owed[!side],
|
|
channel->config[!side].channel_reserve,
|
|
0 ^ channel->commitment_number_obscurer,
|
|
direct_outputs,
|
|
side, csv_lock,
|
|
channel_has(channel, OPT_ANCHOR_OUTPUTS),
|
|
err_reason);
|
|
|
|
if (init_tx) {
|
|
psbt_input_add_pubkey(init_tx->psbt, 0,
|
|
&channel->funding_pubkey[side]);
|
|
psbt_input_add_pubkey(init_tx->psbt, 0,
|
|
&channel->funding_pubkey[!side]);
|
|
}
|
|
|
|
return init_tx;
|
|
}
|
|
|
|
u32 channel_feerate(const struct channel *channel, enum side side)
|
|
{
|
|
return get_feerate(channel->fee_states, channel->opener, side);
|
|
}
|
|
|
|
u32 channel_blockheight(const struct channel *channel, enum side side)
|
|
{
|
|
return get_blockheight(channel->blockheight_states,
|
|
channel->opener, side);
|
|
}
|
|
|
|
struct channel_type **channel_upgradable_types(const tal_t *ctx,
|
|
const struct channel *channel)
|
|
{
|
|
struct channel_type **arr = tal_arr(ctx, struct channel_type *, 0);
|
|
|
|
if (!channel_has(channel, OPT_STATIC_REMOTEKEY))
|
|
tal_arr_expand(&arr, channel_type_static_remotekey(arr));
|
|
|
|
return arr;
|
|
}
|
|
|
|
struct channel_type *channel_desired_type(const tal_t *ctx,
|
|
const struct channel *channel)
|
|
{
|
|
/* We don't actually want to downgrade anchors! */
|
|
if (channel_has(channel, OPT_ANCHOR_OUTPUTS))
|
|
return channel_type_anchor_outputs(ctx);
|
|
|
|
/* For now, we just want option_static_remotekey */
|
|
return channel_type_static_remotekey(ctx);
|
|
}
|
|
|
|
bool channel_has(const struct channel *channel, int feature)
|
|
{
|
|
return channel_type_has(channel->type, feature);
|
|
}
|
|
|
|
static char *fmt_channel_view(const tal_t *ctx, const struct channel_view *view)
|
|
{
|
|
return tal_fmt(ctx, "{ owed_local=%s,"
|
|
" owed_remote=%s }",
|
|
type_to_string(tmpctx, struct amount_msat,
|
|
&view->owed[LOCAL]),
|
|
type_to_string(tmpctx, struct amount_msat,
|
|
&view->owed[REMOTE]));
|
|
}
|
|
|
|
/* FIXME: This should reference HTLCs somehow, and feerates! */
|
|
static char *fmt_channel(const tal_t *ctx, const struct channel *channel)
|
|
{
|
|
return tal_fmt(ctx, "{ funding=%s,"
|
|
" opener=%s,"
|
|
" local=%s,"
|
|
" remote=%s }",
|
|
type_to_string(tmpctx, struct amount_sat,
|
|
&channel->funding),
|
|
side_to_str(channel->opener),
|
|
fmt_channel_view(ctx, &channel->view[LOCAL]),
|
|
fmt_channel_view(ctx, &channel->view[REMOTE]));
|
|
}
|
|
/* Magic comment. */
|
|
REGISTER_TYPE_TO_STRING(channel, fmt_channel);
|