mirror of
https://github.com/ElementsProject/lightning.git
synced 2024-11-19 18:11:28 +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>
74 lines
2.4 KiB
C
74 lines
2.4 KiB
C
#include "config.h"
|
|
#include <common/utxo.h>
|
|
#include <wire/wire.h>
|
|
|
|
void towire_utxo(u8 **pptr, const struct utxo *utxo)
|
|
{
|
|
/* Is this a unilateral close output and needs the
|
|
* close_info? */
|
|
bool is_unilateral_close = utxo->close_info != NULL;
|
|
towire_bitcoin_txid(pptr, &utxo->txid);
|
|
towire_u32(pptr, utxo->outnum);
|
|
towire_amount_sat(pptr, utxo->amount);
|
|
towire_u32(pptr, utxo->keyindex);
|
|
towire_bool(pptr, utxo->is_p2sh);
|
|
|
|
towire_u16(pptr, tal_count(utxo->scriptPubkey));
|
|
towire_u8_array(pptr, utxo->scriptPubkey, tal_count(utxo->scriptPubkey));
|
|
|
|
towire_bool(pptr, is_unilateral_close);
|
|
if (is_unilateral_close) {
|
|
towire_u64(pptr, utxo->close_info->channel_id);
|
|
towire_node_id(pptr, &utxo->close_info->peer_id);
|
|
towire_bool(pptr, utxo->close_info->commitment_point != NULL);
|
|
if (utxo->close_info->commitment_point)
|
|
towire_pubkey(pptr, utxo->close_info->commitment_point);
|
|
towire_bool(pptr, utxo->close_info->option_anchor_outputs);
|
|
towire_u32(pptr, utxo->close_info->csv);
|
|
}
|
|
}
|
|
|
|
struct utxo *fromwire_utxo(const tal_t *ctx, const u8 **ptr, size_t *max)
|
|
{
|
|
struct utxo *utxo = tal(ctx, struct utxo);
|
|
|
|
fromwire_bitcoin_txid(ptr, max, &utxo->txid);
|
|
utxo->outnum = fromwire_u32(ptr, max);
|
|
utxo->amount = fromwire_amount_sat(ptr, max);
|
|
utxo->keyindex = fromwire_u32(ptr, max);
|
|
utxo->is_p2sh = fromwire_bool(ptr, max);
|
|
|
|
utxo->scriptPubkey = fromwire_tal_arrn(utxo, ptr, max, fromwire_u16(ptr, max));
|
|
|
|
if (fromwire_bool(ptr, max)) {
|
|
utxo->close_info = tal(utxo, struct unilateral_close_info);
|
|
utxo->close_info->channel_id = fromwire_u64(ptr, max);
|
|
fromwire_node_id(ptr, max, &utxo->close_info->peer_id);
|
|
if (fromwire_bool(ptr, max)) {
|
|
utxo->close_info->commitment_point = tal(utxo,
|
|
struct pubkey);
|
|
fromwire_pubkey(ptr, max,
|
|
utxo->close_info->commitment_point);
|
|
} else
|
|
utxo->close_info->commitment_point = NULL;
|
|
utxo->close_info->option_anchor_outputs
|
|
= fromwire_bool(ptr, max);
|
|
utxo->close_info->csv = fromwire_u32(ptr, max);
|
|
} else {
|
|
utxo->close_info = NULL;
|
|
}
|
|
return utxo;
|
|
}
|
|
|
|
size_t utxo_spend_weight(const struct utxo *utxo, size_t min_witness_weight)
|
|
{
|
|
size_t wit_weight = bitcoin_tx_simple_input_witness_weight();
|
|
/* If the min is less than what we'd use for a 'normal' tx,
|
|
* we return the value with the greater added/calculated */
|
|
if (wit_weight < min_witness_weight)
|
|
return bitcoin_tx_input_weight(utxo->is_p2sh,
|
|
min_witness_weight);
|
|
|
|
return bitcoin_tx_input_weight(utxo->is_p2sh, wit_weight);
|
|
}
|