vincenzopalazzo
/
rgb-cln
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

onchaind: fix resolution detection of complex outputs. 

We shouldn't set out->resolved until we've actually resolved it.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2019-07-05 14:27:01 +09:30
parent 6deed77d88
commit e746e9c202
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
onchaind/onchaind.c
View File

@ -612,8 +612,6 @@ static bool resolved_by_proposal(struct tracked_output *out,
if (!out->proposal->tx) if (!out->proposal->tx)
return false; return false;
out->resolved = tal(out, struct resolution);
/* Our proposal can change as feerates change. Input /* Our proposal can change as feerates change. Input
* comparison (ignoring signatures) works pretty well. * comparison (ignoring signatures) works pretty well.
* *
@ -628,6 +626,7 @@ static bool resolved_by_proposal(struct tracked_output *out,
return false; return false;
} }
out->resolved = tal(out, struct resolution);
bitcoin_txid(tx, &out->resolved->txid); bitcoin_txid(tx, &out->resolved->txid);
status_trace("Resolved %s/%s by our proposal %s (%s)", status_trace("Resolved %s/%s by our proposal %s (%s)",
tx_type_name(out->tx_type), tx_type_name(out->tx_type),