mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-01 17:47:30 +01:00
Code Issues Projects Releases Wiki Activity

bitcoin/tx: insist input amounts all be populated across the wire.

Browse source 
If you need to send a tx where you don't know this info, send a tx_parts.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2020-05-26 13:09:40 +09:30
parent 1e889eeaf7
commit 0b3040b9a6
1 changed files with 2 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
bitcoin/tx.c
View file

@ -603,8 +603,6 @@ struct bitcoin_tx *fromwire_bitcoin_tx(const tal_t *ctx,
const u8 **cursor, size_t *max) const u8 **cursor, size_t *max)
{ {
struct bitcoin_tx *tx; struct bitcoin_tx *tx;
u16 input_amts_len;
size_t i;
tx = pull_bitcoin_tx(ctx, cursor, max); tx = pull_bitcoin_tx(ctx, cursor, max);
if (!tx) if (!tx)
@ -614,16 +612,7 @@ struct bitcoin_tx *fromwire_bitcoin_tx(const tal_t *ctx,
tal_free(tx->psbt); tal_free(tx->psbt);
tx->psbt = fromwire_psbt(tx, cursor, max); tx->psbt = fromwire_psbt(tx, cursor, max);
input_amts_len = fromwire_u16(cursor, max); for (size_t i = 0; i < tal_count(tx->input_amounts); i++) {
/* They must give us none or all */
if (input_amts_len != 0
&& input_amts_len != tal_count(tx->input_amounts)) {
tal_free(tx);
return fromwire_fail(cursor, max);
}
for (i = 0; i < input_amts_len; i++) {
struct amount_sat sat; struct amount_sat sat;
sat = fromwire_amount_sat(cursor, max); sat = fromwire_amount_sat(cursor, max);
tx->input_amounts[i] = tx->input_amounts[i] =
@ -640,26 +629,12 @@ void towire_bitcoin_txid(u8 **pptr, const struct bitcoin_txid *txid)
void towire_bitcoin_tx(u8 **pptr, const struct bitcoin_tx *tx) void towire_bitcoin_tx(u8 **pptr, const struct bitcoin_tx *tx)
{ {
size_t i;
u8 *lin = linearize_tx(tmpctx, tx); u8 *lin = linearize_tx(tmpctx, tx);
towire_u8_array(pptr, lin, tal_count(lin)); towire_u8_array(pptr, lin, tal_count(lin));
towire_psbt(pptr, tx->psbt); towire_psbt(pptr, tx->psbt);
/* We only want to 'save' the amounts if every amount for (size_t i = 0; i < tal_count(tx->input_amounts); i++)
* has been populated */
for (i = 0; i < tal_count(tx->input_amounts); i++) {
if (!tx->input_amounts[i]) {
towire_u16(pptr, 0);
return;
}
}
/* Otherwise, we include the input amount set */
towire_u16(pptr, tal_count(tx->input_amounts));
for (i = 0; i < tal_count(tx->input_amounts); i++) {
assert(tx->input_amounts[i]);
towire_amount_sat(pptr, *tx->input_amounts[i]); towire_amount_sat(pptr, *tx->input_amounts[i]);
}
} }
struct bitcoin_tx_output *fromwire_bitcoin_tx_output(const tal_t *ctx, struct bitcoin_tx_output *fromwire_bitcoin_tx_output(const tal_t *ctx,