Include counterpart_node_id in TransactionType#4393
Merged
TheBlueMatt merged 3 commits intolightningdevkit:mainfrom Feb 6, 2026
Merged
Include counterpart_node_id in TransactionType#4393TheBlueMatt merged 3 commits intolightningdevkit:mainfrom
counterpart_node_id in TransactionType#4393TheBlueMatt merged 3 commits intolightningdevkit:mainfrom
Conversation
|
👋 Thanks for assigning @wpaulino as a reviewer! |
tnull
commented
Feb 6, 2026
| if let Some(channel_id) = output_info.channel_id { | ||
| if !channel_ids.contains(&channel_id) { | ||
| channel_ids.push(channel_id); | ||
| if let (Some(counterparty_node_id), Some(channel_id)) = |
Contributor
Author
There was a problem hiding this comment.
Want to point out that this will result in an empty channels for already-tracked entries on upgrade. We'll need to see how to handle that case downstream I guess. Technically we'd need to make the tracking an Option<PublicKey> but that's just odd.
This adds an optional `counterparty_node_id` field to the `SpendableOutputs` event, providing users with information about which channel counterparty the spendable outputs belong to. The field uses TLV type 3 (odd) for backwards compatibility, meaning older versions will safely ignore it during deserialization. When reading events serialized by older LDK versions, this field will be `None`. Co-Authored-By: HAL 9000 Signed-off-by: Elias Rohrer <dev@tnull.de>
This adds an optional `counterparty_node_id` field to `TrackedSpendableOutput` and updates the `track_spendable_outputs` method signatures on both `OutputSweeper` and `OutputSweeperSync` to accept this new parameter. The field uses TLV type 3 (odd) for backwards compatibility. When reading outputs tracked with LDK 0.2 and prior, this field will be `None`. Co-Authored-By: HAL 9000 Signed-off-by: Elias Rohrer <dev@tnull.de>
This adds `counterparty_node_id` tracking to all `TransactionType` variants, enabling downstream users to identify the channel counterparty associated with each broadcast transaction. For single-channel variants (`CooperativeClose`, `UnilateralClose`, `AnchorBump`, `Claim`, `Splice`), the counterparty is stored directly. For multi-channel variants (`Funding`, `Sweep`), the type now uses `Vec<(PublicKey, ChannelId)>` to pair each channel with its counterparty. The `OnchainTxHandler` now stores `counterparty_node_id` and provides a `set_counterparty_node_id` method for initialization during deserialization of older data. Co-Authored-By: HAL 9000 Signed-off-by: Elias Rohrer <dev@tnull.de>
tnull
force-pushed
the
2026-02-include-counterparty-node-id
branch
from
ad4cc6c to
56f12c8
Compare
TheBlueMatt
approved these changes
Feb 6, 2026
| .list_channels() | ||
| .into_iter() | ||
| .any(|cd| cd.channel_id == ch_id && cd.is_channel_ready); | ||
| .find(|cd| cd.channel_id == ch_id && cd.is_channel_ready); |
Collaborator
There was a problem hiding this comment.
might make sense to filter by UCID here as well. Technically channel id isn't unique for 0confs even if is_channel_ready.
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #4393 +/- ##
==========================================
- Coverage 86.04% 86.02% -0.02%
==========================================
Files 156 156
Lines 103002 103046 +44
Branches 103002 103046 +44
==========================================
+ Hits 88627 88646 +19
- Misses 11865 11888 +23
- Partials 2510 2512 +2
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Closes #4391
In #4353 we added a
TransactionTypethat also indicated theChannelIds associated with the broadcasted transaction. However, as pointed out there,ChannelIds might are always just guranteed to be unique on a per-counterparty basis.Therefore, we here track the
counterparty_node_idside-by-side with theChannelId, which notably also requires to track it as part ofEvent::SpendableOutputs and inOutputSweeper.