mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-22 14:42:40 +01:00
Code Issues Projects Releases Wiki Activity

tx: add measure_tx_len() helper.

Browse source 
We currently linearize and then measure the string; this is better since
we're about to do it in a second place.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2016-04-12 13:07:04 +09:30
parent e84bf16bf8
commit 772a960c41
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bitcoin/tx.c
View file

@ -295,6 +295,18 @@ u8 *linearize_tx_force_extended(const tal_t *ctx,
return arr;
}
static void add_measure(const void *data, size_t len, void *lenp)
{
*(size_t *)lenp += len;
}
size_t measure_tx_len(const struct bitcoin_tx *tx)
{
size_t len = 0;
add_tx(tx, add_measure, &len, uses_witness(tx));
return len;
}
void bitcoin_txid(const struct bitcoin_tx *tx, struct sha256_double *txid)
{
struct sha256_ctx ctx = SHA256_INIT;

3
bitcoin/tx.h
View file

@ -53,6 +53,9 @@ u8 *linearize_tx(const tal_t *ctx, const struct bitcoin_tx *tx);
u8 *linearize_tx_force_extended(const tal_t *ctx,
const struct bitcoin_tx *tx);
/* Get length of tx in bytes. */
size_t measure_tx_len(const struct bitcoin_tx *tx);
/* Allocate a tx: you just need to fill in inputs and outputs (they're
* zeroed with inputs' sequence_number set to FFFFFFFF) */
struct bitcoin_tx *bitcoin_tx(const tal_t *ctx, varint_t input_count,

6
daemon/peer.c
View file

@ -1105,7 +1105,7 @@ const struct bitcoin_tx *bitcoin_close(struct peer *peer)
/* Create a bitcoin spend tx (to spend our commit's outputs) */
const struct bitcoin_tx *bitcoin_spend_ours(struct peer *peer)
{
u8 *redeemscript, *linear;
u8 *redeemscript;
const struct bitcoin_tx *commit = peer->us.commit->tx;
struct bitcoin_signature sig;
struct bitcoin_tx *tx;
@ -1146,10 +1146,8 @@ const struct bitcoin_tx *bitcoin_spend_ours(struct peer *peer)
/* Now, calculate the fee, given length. */
/* FIXME: Dynamic fees! */
linear = linearize_tx(peer, tx);
fee = fee_by_feerate(tal_count(linear),
fee = fee_by_feerate(measure_tx_len(tx),
peer->dstate->config.closing_fee_rate);
tal_free(linear);
/* FIXME: Fail gracefully in these cases (not worth collecting) */
if (fee > tx->output[0].amount