Fix eclair-cli "compact" mode #2990
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
"compact" mode (-s option) was broken after changes in how we manage short channel ids.
t-bast
reviewed
Jan 29, 2025
| @@ -155,7 +155,7 @@ jq_filter='if type=="object" and .error != null then .error else .'; | |||
|
|
|||
| # apply special jq filter if we are in "short" output mode -- only for specific commands such as 'channels' | |||
| if [ "$short" = true ]; then | |||
| jq_channel_filter="{ nodeId, shortChannelId: .data.shortIds.real.realScid, channelId, state, commitments: (.data.commitments.active | map({balanceSat: (try (.localCommit.spec.toLocal / 1000 | floor) catch null), capacitySat: .fundingTx.amountSatoshis, fundingTxIndex: .fundingTxIndex, channelPoint: .fundingTx.outPoint})) }"; | |||
| jq_channel_filter="{ nodeId, shortChannelId: .data.shortIds.real, channelId, state, commitments: (.data.commitments.active | map({balanceSat: (try (.localCommit.spec.toLocal / 1000 | floor) catch null), capacitySat: .fundingTx.amountSatoshis, fundingTxIndex: .fundingTxIndex, channelPoint: .fundingTx.outPoint})) }"; | |||
There was a problem hiding this comment.
I think there are other parts that don't work, .fundingTx doesn't exit? Shouldn't it be:
Suggested change
| jq_channel_filter="{ nodeId, shortChannelId: .data.shortIds.real, channelId, state, commitments: (.data.commitments.active | map({balanceSat: (try (.localCommit.spec.toLocal / 1000 | floor) catch null), capacitySat: .fundingTx.amountSatoshis, fundingTxIndex: .fundingTxIndex, channelPoint: .fundingTx.outPoint})) }"; | |
| jq_channel_filter="{ nodeId, shortChannelId: .data.shortIds.real, channelId, state, commitments: (.data.commitments.active | map({balanceSat: (try (.localCommit.spec.toLocal / 1000 | floor) catch null), capacitySat: .capacity, fundingTxIndex: .fundingTxIndex, channelPoint: .commitInput.outPoint})) }"; |
There was a problem hiding this comment.
And to make it work after #2968, we can extract the scid "directly" from the data, we'll need to look at the optional ChannelAnnouncement (not sure if mapping on an Option works in bash?).
There was a problem hiding this comment.
Ok, I was missing the custom serializer for Commitment in JsonSerializers that adds the fundingTx field.
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.
"compact" mode (-s option) needs to be updated after #2969