aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 07:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

wally: Migrate main daemon to use wally transactions

Browse Source 
Signed-off-by: Christian Decker <decker.christian@gmail.com>
This commit is contained in:
Christian Decker
2019-03-25 11:35:56 +01:00
committed by Rusty Russell
parent c39963b8b7
commit d651ce6f3b
13 changed files with 73 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lightningd/onchain_control.c
View File

@@ -157,7 +157,7 @@ static void watch_tx_and_outputs(struct channel *channel,
txw = watch_tx(channel->owner, ld->topology, channel, tx,
onchain_tx_watched);
for (size_t i = 0; i < tal_count(tx->output); i++)
for (size_t i = 0; i < tx->wtx->num_outputs; i++)
watch_txo(txw, ld->topology, channel, &txid, i,
onchain_txo_watched);
}
@@ -450,9 +450,10 @@ enum watch_result onchaind_funding_spent(struct channel *channel,
if (!feerate) {
/* We have at least one data point: the last tx's feerate. */
struct amount_sat fee = channel->funding;
for (size_t i = 0; i < tal_count(channel->last_tx->output); i++)
for (size_t i = 0; i < channel->last_tx->wtx->num_outputs; i++)
if (!amount_sat_sub(&fee, fee,
channel->last_tx->output[i].amount)) {
bitcoin_tx_output_get_amount(
channel->last_tx, i))) {
log_broken(channel->log, "Could not get fee"
" funding %s tx %s",
type_to_string(tmpctx,