close: Print multiple txs; Fixes #6467 #7466
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42b6d65
to
2c3d916
Compare
niftynei
reviewed
Jul 15, 2024
lightningd/closing_control.c
Outdated
| struct json_stream *result = json_stream_success(cc->cmd); | ||
| const struct bitcoin_tx *close_tx = close_txs[tal_count(close_txs) - 1]; | ||
|
|
||
| json_add_tx(result, "tx", close_tx); | ||
| if (!invalid_last_tx(close_tx)) { | ||
| struct bitcoin_txid txid; | ||
| bitcoin_txid(close_tx, &txid); | ||
| json_add_txid(result, "txid", &txid); |
There was a problem hiding this comment.
nit: deprecate the txid field, in favor of just using the txids field in the future.
There was a problem hiding this comment.
I deprecated txid and tx
There was a problem hiding this comment.
ah ok, missed it the first time! seems like the deprecation feature stuff got updated, very cool.
|
|
||
| json_array_start(result, "txids"); | ||
| for (int i = 0; i < tal_count(close_txs); i++) { | ||
| if (invalid_last_tx(close_txs[i])) { |
There was a problem hiding this comment.
Man this is an old bugfix (v0.7.0)
|
the test failure is from one of the new fetchinvoice/offers tests |
2c3d916
to
778aae8
Compare
niftynei
reviewed
Jul 22, 2024
Changelog-Changed: `close` now outputs txs & txids of all closing transactions (splice candidates can cause there to be multiple).
|
Rebased, but also deprecated properly, see the second commit.
You'll note this broke tests, too. This is important; if we break an API we should absolutely feel the pain ourselves! |
778aae8
to
94705ed
Compare
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Deprecated: `close` `tx` and `txid` field (use `txs` and `txids`) Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
94705ed
to
9bbada6
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closenow outputs txs & txids of all closing transactions (splice candidates can cause there to be multiple).