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

elements: Fix transaction handling for elements transactions

Browse Source 
Skipping coinbase transactions and ensuring that the transaction is serialized
correctly when sending it onwards.

Signed-off-by: Christian Decker <decker.christian@gmail.com>
This commit is contained in:
Christian Decker 2019-04-13 19:14:07 +02:00 committed by Rusty Russell
parent 436da7f231
commit 639713b547
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bitcoin/tx.c
View File

@ -97,6 +97,9 @@ const u8 *bitcoin_tx_output_get_script(const tal_t *ctx,
u8 *res;
assert(outnum < tx->wtx->num_outputs);
output = &tx->wtx->outputs[outnum];
if (output->features & WALLY_TX_IS_COINBASE)
return NULL;
res = tal_arr(ctx, u8, output->script_len);
memcpy(res, output->script, output->script_len);
return res;
@ -220,7 +223,10 @@ static void push_tx(const struct bitcoin_tx *tx,
if (bip144 && uses_witness(tx))
flag |= WALLY_TX_FLAG_USE_WITNESS;
res = wally_tx_get_length(tx->wtx, flag, &len);
if (is_elements)
flag |= WALLY_TX_FLAG_USE_ELEMENTS;
res = wally_tx_get_length(tx->wtx, flag & WALLY_TX_FLAG_USE_WITNESS, &len);
assert(res == WALLY_OK);
serialized = tal_arr(tmpctx, u8, len);

3
lightningd/chaintopology.c
View File

@ -654,6 +654,9 @@ static void topo_add_utxos(struct chain_topology *topo, struct block *b)
for (size_t i = 0; i < tal_count(b->full_txs); i++) {
const struct bitcoin_tx *tx = b->full_txs[i];
for (size_t j = 0; j < tx->wtx->num_outputs; j++) {
if (tx->wtx->outputs[j].features & WALLY_TX_IS_COINBASE)
continue;
const u8 *script = bitcoin_tx_output_get_script(tmpctx, tx, j);
struct amount_sat amt = bitcoin_tx_output_get_amount(tx, j);

3
wallet/txfilter.c
View File

@ -103,6 +103,9 @@ bool txfilter_match(const struct txfilter *filter, const struct bitcoin_tx *tx)
for (size_t i = 0; i < tx->wtx->num_outputs; i++) {
const u8 *oscript = bitcoin_tx_output_get_script(tmpctx, tx, i);
if (!oscript)
continue;
if (scriptpubkeyset_get(&filter->scriptpubkeyset, oscript))
return true;
}

8
wallet/wallet.c
View File

@ -1498,11 +1498,13 @@ int wallet_extract_owned_outputs(struct wallet *w, const struct bitcoin_tx *tx,
struct utxo *utxo;
u32 index;
bool is_p2sh;
const u8 *script = bitcoin_tx_output_get_script(tmpctx, tx, output);
const u8 *script;
script = bitcoin_tx_output_get_script(tmpctx, tx, output);
if (!script)
continue;
if (!wallet_can_spend(w, script, &index,
&is_p2sh))
if (!wallet_can_spend(w, script, &index, &is_p2sh))
continue;
utxo = tal(w, struct utxo);