Skip to content

Use BDK events in update_payment_store - #658

Merged
tnull merged 5 commits into
lightningdevkit:mainfrom
Camillarhi:payment-store-events-sync
Jan 27, 2026
Merged

Use BDK events in update_payment_store#658
tnull merged 5 commits into
lightningdevkit:mainfrom
Camillarhi:payment-store-events-sync

Conversation

@Camillarhi

@CamillarhiCamillarhi commented Oct 9, 2025•
edited
Loading

Copy link
Copy Markdown
Contributor

This PR updates update_payment_store to use BDK 2.2’s WalletEvent stream during sync instead of iterating over the full list of wallet transactions every time. The new event-based approach reduces redundant work and ensures the payment store stays in sync with only the changes that actually occurred.

It also sets up the foundation for RBF support in #628 with WalletEvent::TxReplaced. Since #628 depends on this event handling, this PR should be merged first.

This PR will also address #452

@ldk-reviews-bot

ldk-reviews-bot commented Oct 9, 2025•
edited
Loading

Copy link
Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@tnulltnull mentioned this pull request Oct 10, 2025
Closed
@Camillarhi
Camillarhiforce-pushed the payment-store-events-sync branch 9 times, most recently from 75ff700 to d3f7855CompareOctober 15, 2025 20:32
@Camillarhi
Camillarhi marked this pull request as ready for review October 15, 2025 20:35
@ldk-reviews-bot

ldk-reviews-bot commented Oct 18, 2025

Copy link
Copy Markdown

🔔 1st Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

ldk-reviews-bot commented Oct 20, 2025

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

ldk-reviews-bot commented Oct 22, 2025

Copy link
Copy Markdown

🔔 3rd Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

ldk-reviews-bot commented Oct 25, 2025

Copy link
Copy Markdown

🔔 4th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

ldk-reviews-bot commented Oct 27, 2025

Copy link
Copy Markdown

🔔 5th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

ldk-reviews-bot commented Oct 29, 2025

Copy link
Copy Markdown

🔔 6th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

tnull
tnull reviewed Oct 29, 2025
View reviewed changes

@tnulltnull left a comment •
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excuse the delay here!

Unfortunately I don't think we can make the move until we get corresponding functionality for all chain sources, i.e., also for bitcoind/apply_block. Will raise that with the BDK folks to make some progress.

I now opened bitcoindevkit/bdk_wallet#336 to add the missing APIs we need. In the meantime we can see to get this as close to being mergeable as possible.

Comment threadsrc/wallet/mod.rs Outdated
})?;

self.update_payment_store(&mut *locked_wallet).map_err(|e| {
let events_vec: Vec<WalletEvent> = events.into_iter().collect();

@tnulltnullOct 29, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this re-allocation is necessary?

@CamillarhiCamillarhiOct 29, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I have removed the re-allocation

Comment threadsrc/wallet/mod.rs Outdated
@@ -723,7 +943,7 @@ impl Listen for Wallet {

match locked_wallet.apply_block(block, height) {

@tnulltnullOct 29, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh, seems there is no corresponding apply_block_events method. I think we need that before actually moving forward here. Will raise it with the BDK folks.

@CamillarhiCamillarhiOct 29, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright

@CamillarhiCamillarhiNov 6, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw that the PR on BDK wallet has been merged and added to the next release milestone. This will be updated as soon as there is a new release on BDK wallet

Comment threadsrc/wallet/mod.rs Outdated
}

self.payment_store
.list_filter(|p| {

@tnulltnullOct 29, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, ugh, that's already slow right now, but will be prohibitively slow when we don't keep our entire payment store in-memory. I think we can't get around adding another persisted lookup table that tracks RBF-Txid to original-Txid.

@CamillarhiCamillarhiOct 29, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is true, if we have another table, the lookup will be faster and the original Txid can be updated when the RBF-Txid for example, has a confirmed event from BDK

@CamillarhiCamillarhiNov 6, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tnull, I created a new persisted ReplacedTransactionStore that maintains lookups from any txid in an RBF chain to its associated payment. Store entries are automatically cleaned up when any transaction in the chain confirms. This keeps lookups fast even with large payment histories.

@tnulltnullNov 6, 2025•
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tnull, I created a new persisted ReplacedTransactionStore that maintains lookups from any txid in an RBF chain to its associated payment. Store entries are automatically cleaned up when any transaction in the chain confirms. This keeps lookups fast even with large payment histories.

Huh, why do we need a whole other module/store for this? Let's just use a HashMap<Txid, Txid> and be done with it? Or do we need all that additionally tracked data somehow?

I guess we could use a DataStore implementation for this, but I don't quite see why we need to track ConfirmationStatus and latest_update_timestamp?

@CamillarhiCamillarhiNov 6, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, why do we need a whole other module/store for this? Let's just use a HashMap<Txid, Txid> and be done with it? Or do we need all that additionally tracked data somehow?

Yes, we need to track this data for faster lookup of replaced transaction IDs instead of a full iteration

I guess we could use a DataStore implementation for this, but I don't quite see why we need to track ConfirmationStatus and latest_update_timestamp?

You are right about the ConfirmationStatus and latest_update_timestamp, they were part of my original design, and as I proceeded with my implementation, I decided to clean the store instead upon confirmation of any of the transactions. I will go ahead and remove them. I also used a DataStore implementation for this.

@Camillarhi
Camillarhiforce-pushed the payment-store-events-sync branch from d3f7855 to a2c8a55CompareOctober 29, 2025 16:08
@Camillarhi
Camillarhi requested a review from tnullNovember 6, 2025 02:34
@Camillarhi
Camillarhiforce-pushed the payment-store-events-sync branch 2 times, most recently from ecaae51 to 8609d97CompareNovember 6, 2025 10:58
@ldk-reviews-bot

ldk-reviews-bot commented Nov 8, 2025

Copy link
Copy Markdown

🔔 1st Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

ldk-reviews-bot commented Nov 10, 2025

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

ldk-reviews-bot commented Nov 12, 2025

Copy link
Copy Markdown

🔔 3rd Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

ldk-reviews-bot commented Nov 15, 2025

Copy link
Copy Markdown

🔔 4th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

ldk-reviews-bot commented Nov 17, 2025

Copy link
Copy Markdown

🔔 5th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

ldk-reviews-bot commented Nov 19, 2025

Copy link
Copy Markdown

🔔 6th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@tnull
tnull removed their request for review January 13, 2026 11:36
@Camillarhi
Camillarhiforce-pushed the payment-store-events-sync branch 5 times, most recently from 862c5a7 to a677335CompareJanuary 13, 2026 14:42
@Camillarhi
Camillarhi requested a review from tnullJanuary 13, 2026 14:50
@ldk-reviews-bot

ldk-reviews-bot commented Jan 15, 2026

Copy link
Copy Markdown

🔔 1st Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

ldk-reviews-bot commented Jan 17, 2026

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

ldk-reviews-bot commented Jan 19, 2026

Copy link
Copy Markdown

🔔 3rd Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

ldk-reviews-bot commented Jan 21, 2026

Copy link
Copy Markdown

🔔 4th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

ldk-reviews-bot commented Jan 24, 2026

Copy link
Copy Markdown

🔔 5th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

ldk-reviews-bot commented Jan 26, 2026

Copy link
Copy Markdown

🔔 6th Reminder

Hey @tnull! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

tnull
tnull reviewed Jan 26, 2026
View reviewed changes

@tnulltnull left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excuse the delay here once more. I was about to just land this and address my comments myself in a follow-up, however, it seems this needs a rebase by now. Would also be great to at least avoid the churn of first adding the replaced_txids field to then remove it in a later commit.

Comment threadsrc/builder.rs Outdated
Comment threadsrc/payment/store.rs Outdated
Comment threadsrc/payment/pending_payment_store.rs Outdated
@Camillarhi
Camillarhiforce-pushed the payment-store-events-sync branch 2 times, most recently from 00b7edc to 76000dfCompareJanuary 26, 2026 12:45
@Camillarhi
Camillarhiforce-pushed the payment-store-events-sync branch from 76000df to 70288e6CompareJanuary 26, 2026 13:19
@Camillarhi
Add PendingPaymentStore to track pending payments and replaced txids
17f80ba
Track pending payments with their replaced/conflicting transaction IDs
in a separate store. Pending payments are created here on WalletEvent::TxUnconfirmed,
then removed once they reach ANTI_REORG_DELAY confirmations. This avoids
scanning the entire payment store and enables efficient cleanup.
@Camillarhi
Use BDK events in update_payment_store instead of scanning all tran…
9f02ec0
…sactions
Replace the full transaction list scan in `update_payment_store` with
handling of BDK's `WalletEvent` stream during sync. This leverages the
new events in BDK 2.2, reduces redundant work, and prepares the
foundation for reliable RBF/CPFP tracking via `WalletEvent::TxReplaced`
@Camillarhi
Camillarhiforce-pushed the payment-store-events-sync branch from 70288e6 to 9f02ec0CompareJanuary 26, 2026 13:59
@Camillarhi
Camillarhi requested a review from tnullJanuary 26, 2026 14:03
@tnulltnull mentioned this pull request Jan 27, 2026
Closed
7 tasks
tnull
tnull approved these changes Jan 27, 2026
View reviewed changes

@tnulltnull left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the rebase, I'm going ahead landing this. I opened #770 to track some follow-ups I'd like to address before the next 0.8 release (for simplicity will likely just pick them up myself).

@tnull
tnull merged commit ba16c92 into lightningdevkit:mainJan 27, 2026
17 of 18 checks passed
@tnulltnull mentioned this pull request Jan 27, 2026
Closed
5 tasks
This was referenced Jun 12, 2026
Closed
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tnulltnulltnull approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Camillarhi@ldk-reviews-bot@tnull
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Use BDK events in `update_payment_store` by Camillarhi · Pull Request #658 · lightningdevkit/ldk-node · GitHub
Skip to content
Use BDK events in update_payment_store - #658
Merged
tnull merged 5 commits into
lightningdevkit:mainfrom 
Camillarhi:payment-store-events-sync
Jan 27, 2026
Merged
Use BDK events in update_payment_store#658
tnull merged 5 commits into
lightningdevkit:mainfrom 
Camillarhi:payment-store-events-sync
Conversation
@Camillarhi
@CamillarhiCamillarhi
commented
Oct 9, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR updates update_payment_store to use BDK 2.2’s WalletEvent stream during sync instead of iterating over the full list of wallet transactions every time. The new event-based approach reduces redundant work and ensures the payment store stays in sync with only the changes that actually occurred.
It also sets up the foundation for RBF support in #628 with WalletEvent::TxReplaced. Since #628 depends on this event handling, this PR should be merged first.
This PR will also address #452
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 9, 2025•

edited

Loading

Copy link


Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!

I'll wait for their review and will help manage the review process.

Once they submit their review, I'll check if a second reviewer would be helpful.
@tnulltnull
mentioned this pull request
Oct 10, 2025
 Closed

@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
9 times, most recently
from
75ff700 to
d3f7855CompareOctober 15, 2025 20:32
@Camillarhi
Camillarhi
marked this pull request as ready for review
October 15, 2025 20:35
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 18, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 20, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 22, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 25, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 27, 2025

Copy link


Copy Markdown

🔔 5th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 29, 2025

Copy link


Copy Markdown

🔔 6th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
tnull
tnull
reviewed
Oct 29, 2025
View reviewed changes
@tnulltnull
left a comment
•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excuse the delay here!
Unfortunately I don't think we can make the move until we get corresponding functionality for all chain sources, i.e., also for bitcoind/apply_block. Will raise that with the BDK folks to make some progress.
I now opened bitcoindevkit/bdk_wallet#336 to add the missing APIs we need. In the meantime we can see to get this as close to being mergeable as possible.
Comment threadsrc/wallet/mod.rs
Outdated

 })?;

 self.update_payment_store(&mut *locked_wallet).map_err(|e| {
 let events_vec: Vec<WalletEvent> = events.into_iter().collect();
@tnulltnullOct 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this re-allocation is necessary?
@CamillarhiCamillarhiOct 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I have removed the re-allocation
Comment threadsrc/wallet/mod.rs
Outdated

@@ -723,7 +943,7 @@ impl Listen for Wallet {

 match locked_wallet.apply_block(block, height) {
@tnulltnullOct 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh, seems there is no corresponding apply_block_events method. I think we need that before actually moving forward here. Will raise it with the BDK folks.
@CamillarhiCamillarhiOct 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright
@CamillarhiCamillarhiNov 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw that the PR on BDK wallet has been merged and added to the next release milestone. This will be updated as soon as there is a new release on BDK wallet
Comment threadsrc/wallet/mod.rs
Outdated

 }

 self.payment_store
 .list_filter(|p| {
@tnulltnullOct 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, ugh, that's already slow right now, but will be prohibitively slow when we don't keep our entire payment store in-memory. I think we can't get around adding another persisted lookup table that tracks RBF-Txid to original-Txid.
@CamillarhiCamillarhiOct 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is true, if we have another table, the lookup will be faster and the original Txid can be updated when the RBF-Txid for example, has a confirmed event from BDK
@CamillarhiCamillarhiNov 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tnull, I created a new persisted ReplacedTransactionStore that maintains lookups from any txid in an RBF chain to its associated payment. Store entries are automatically cleaned up when any transaction in the chain confirms. This keeps lookups fast even with large payment histories.
@tnulltnullNov 6, 2025•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tnull, I created a new persisted ReplacedTransactionStore that maintains lookups from any txid in an RBF chain to its associated payment. Store entries are automatically cleaned up when any transaction in the chain confirms. This keeps lookups fast even with large payment histories.
Huh, why do we need a whole other module/store for this? Let's just use a HashMap<Txid, Txid> and be done with it? Or do we need all that additionally tracked data somehow?
I guess we could use a DataStore implementation for this, but I don't quite see why we need to track ConfirmationStatus and latest_update_timestamp?
@CamillarhiCamillarhiNov 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, why do we need a whole other module/store for this? Let's just use a HashMap<Txid, Txid> and be done with it? Or do we need all that additionally tracked data somehow?
Yes, we need to track this data for faster lookup of replaced transaction IDs instead of a full iteration
I guess we could use a DataStore implementation for this, but I don't quite see why we need to track ConfirmationStatus and latest_update_timestamp?
You are right about the ConfirmationStatus  and latest_update_timestamp, they were part of my original design, and as I proceeded with my implementation, I decided to clean the store instead upon confirmation of any of the transactions. I will go ahead and remove them. I also used a DataStore implementation for this.
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
from
d3f7855 to
a2c8a55CompareOctober 29, 2025 16:08
@Camillarhi
Camillarhi
requested a review
from tnullNovember 6, 2025 02:34
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
2 times, most recently
from
ecaae51 to
8609d97CompareNovember 6, 2025 10:58
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 8, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 10, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 12, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 15, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 17, 2025

Copy link


Copy Markdown

🔔 5th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 19, 2025

Copy link


Copy Markdown

🔔 6th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@tnull
tnull
removed their request for review
January 13, 2026 11:36
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
5 times, most recently
from
862c5a7 to
a677335CompareJanuary 13, 2026 14:42
@Camillarhi
Camillarhi
requested a review
from tnullJanuary 13, 2026 14:50
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 15, 2026

Copy link


Copy Markdown

🔔 1st Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 17, 2026

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 19, 2026

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 21, 2026

Copy link


Copy Markdown

🔔 4th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 24, 2026

Copy link


Copy Markdown

🔔 5th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 26, 2026

Copy link


Copy Markdown

🔔 6th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
tnull
tnull
reviewed
Jan 26, 2026
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excuse the delay here once more. I was about to just land this and address my comments myself in a follow-up, however, it seems this needs a rebase by now. Would also be great to at least avoid the churn of first adding the replaced_txids field to then remove it in a later commit.
Comment threadsrc/builder.rs
Outdated

Comment threadsrc/payment/store.rs
Outdated

Comment threadsrc/payment/pending_payment_store.rs
Outdated

@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
2 times, most recently
from
00b7edc to
76000dfCompareJanuary 26, 2026 12:45
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
from
76000df to
70288e6CompareJanuary 26, 2026 13:19
@Camillarhi
Add PendingPaymentStore to track pending payments and replaced txids
17f80ba
Track pending payments with their replaced/conflicting transaction IDs
in a separate store. Pending payments are created here on WalletEvent::TxUnconfirmed,
then removed once they reach ANTI_REORG_DELAY confirmations. This avoids
scanning the entire payment store and enables efficient cleanup.
@Camillarhi
Use BDK events in update_payment_store instead of scanning all tran…
9f02ec0
…sactions
Replace the full transaction list scan in `update_payment_store` with
handling of BDK's `WalletEvent` stream during sync. This leverages the
new events in BDK 2.2, reduces redundant work, and prepares the
foundation for reliable RBF/CPFP tracking via `WalletEvent::TxReplaced`
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
from
70288e6 to
9f02ec0CompareJanuary 26, 2026 13:59
@Camillarhi
Camillarhi
requested a review
from tnullJanuary 26, 2026 14:03
@tnulltnull
mentioned this pull request
Jan 27, 2026

Closed

7 tasks
tnull
tnull
approved these changes
Jan 27, 2026
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the rebase, I'm going ahead landing this. I opened #770 to track some follow-ups I'd like to address before the next 0.8 release (for simplicity will likely just pick them up myself).
@tnull
tnull
merged commit ba16c92
into
lightningdevkit:mainJan 27, 2026

17 of 18 checks passed

@tnulltnull
mentioned this pull request
Jan 27, 2026

Closed

5 tasks

This was referenced Jun 12, 2026

Closed

 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@Camillarhi@ldk-reviews-bot@tnull

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Use BDK events in `update_payment_store` by Camillarhi · Pull Request #658 · lightningdevkit/ldk-node · GitHub
Skip to content
Use BDK events in update_payment_store - #658
Merged
tnull merged 5 commits into
lightningdevkit:mainfrom 
Camillarhi:payment-store-events-sync
Jan 27, 2026
Merged
Use BDK events in update_payment_store#658
tnull merged 5 commits into
lightningdevkit:mainfrom 
Camillarhi:payment-store-events-sync
Conversation
@Camillarhi
@CamillarhiCamillarhi
commented
Oct 9, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR updates update_payment_store to use BDK 2.2’s WalletEvent stream during sync instead of iterating over the full list of wallet transactions every time. The new event-based approach reduces redundant work and ensures the payment store stays in sync with only the changes that actually occurred.
It also sets up the foundation for RBF support in #628 with WalletEvent::TxReplaced. Since #628 depends on this event handling, this PR should be merged first.
This PR will also address #452
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 9, 2025•

edited

Loading

Copy link


Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!

I'll wait for their review and will help manage the review process.

Once they submit their review, I'll check if a second reviewer would be helpful.
@tnulltnull
mentioned this pull request
Oct 10, 2025
 Closed

@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
9 times, most recently
from
75ff700 to
d3f7855CompareOctober 15, 2025 20:32
@Camillarhi
Camillarhi
marked this pull request as ready for review
October 15, 2025 20:35
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 18, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 20, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 22, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 25, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 27, 2025

Copy link


Copy Markdown

🔔 5th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 29, 2025

Copy link


Copy Markdown

🔔 6th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
tnull
tnull
reviewed
Oct 29, 2025
View reviewed changes
@tnulltnull
left a comment
•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excuse the delay here!
Unfortunately I don't think we can make the move until we get corresponding functionality for all chain sources, i.e., also for bitcoind/apply_block. Will raise that with the BDK folks to make some progress.
I now opened bitcoindevkit/bdk_wallet#336 to add the missing APIs we need. In the meantime we can see to get this as close to being mergeable as possible.
Comment threadsrc/wallet/mod.rs
Outdated

 })?;

 self.update_payment_store(&mut *locked_wallet).map_err(|e| {
 let events_vec: Vec<WalletEvent> = events.into_iter().collect();
@tnulltnullOct 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this re-allocation is necessary?
@CamillarhiCamillarhiOct 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I have removed the re-allocation
Comment threadsrc/wallet/mod.rs
Outdated

@@ -723,7 +943,7 @@ impl Listen for Wallet {

 match locked_wallet.apply_block(block, height) {
@tnulltnullOct 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh, seems there is no corresponding apply_block_events method. I think we need that before actually moving forward here. Will raise it with the BDK folks.
@CamillarhiCamillarhiOct 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright
@CamillarhiCamillarhiNov 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw that the PR on BDK wallet has been merged and added to the next release milestone. This will be updated as soon as there is a new release on BDK wallet
Comment threadsrc/wallet/mod.rs
Outdated

 }

 self.payment_store
 .list_filter(|p| {
@tnulltnullOct 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, ugh, that's already slow right now, but will be prohibitively slow when we don't keep our entire payment store in-memory. I think we can't get around adding another persisted lookup table that tracks RBF-Txid to original-Txid.
@CamillarhiCamillarhiOct 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is true, if we have another table, the lookup will be faster and the original Txid can be updated when the RBF-Txid for example, has a confirmed event from BDK
@CamillarhiCamillarhiNov 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tnull, I created a new persisted ReplacedTransactionStore that maintains lookups from any txid in an RBF chain to its associated payment. Store entries are automatically cleaned up when any transaction in the chain confirms. This keeps lookups fast even with large payment histories.
@tnulltnullNov 6, 2025•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tnull, I created a new persisted ReplacedTransactionStore that maintains lookups from any txid in an RBF chain to its associated payment. Store entries are automatically cleaned up when any transaction in the chain confirms. This keeps lookups fast even with large payment histories.
Huh, why do we need a whole other module/store for this? Let's just use a HashMap<Txid, Txid> and be done with it? Or do we need all that additionally tracked data somehow?
I guess we could use a DataStore implementation for this, but I don't quite see why we need to track ConfirmationStatus and latest_update_timestamp?
@CamillarhiCamillarhiNov 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, why do we need a whole other module/store for this? Let's just use a HashMap<Txid, Txid> and be done with it? Or do we need all that additionally tracked data somehow?
Yes, we need to track this data for faster lookup of replaced transaction IDs instead of a full iteration
I guess we could use a DataStore implementation for this, but I don't quite see why we need to track ConfirmationStatus and latest_update_timestamp?
You are right about the ConfirmationStatus  and latest_update_timestamp, they were part of my original design, and as I proceeded with my implementation, I decided to clean the store instead upon confirmation of any of the transactions. I will go ahead and remove them. I also used a DataStore implementation for this.
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
from
d3f7855 to
a2c8a55CompareOctober 29, 2025 16:08
@Camillarhi
Camillarhi
requested a review
from tnullNovember 6, 2025 02:34
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
2 times, most recently
from
ecaae51 to
8609d97CompareNovember 6, 2025 10:58
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 8, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 10, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 12, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 15, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 17, 2025

Copy link


Copy Markdown

🔔 5th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 19, 2025

Copy link


Copy Markdown

🔔 6th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@tnull
tnull
removed their request for review
January 13, 2026 11:36
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
5 times, most recently
from
862c5a7 to
a677335CompareJanuary 13, 2026 14:42
@Camillarhi
Camillarhi
requested a review
from tnullJanuary 13, 2026 14:50
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 15, 2026

Copy link


Copy Markdown

🔔 1st Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 17, 2026

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 19, 2026

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 21, 2026

Copy link


Copy Markdown

🔔 4th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 24, 2026

Copy link


Copy Markdown

🔔 5th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 26, 2026

Copy link


Copy Markdown

🔔 6th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
tnull
tnull
reviewed
Jan 26, 2026
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excuse the delay here once more. I was about to just land this and address my comments myself in a follow-up, however, it seems this needs a rebase by now. Would also be great to at least avoid the churn of first adding the replaced_txids field to then remove it in a later commit.
Comment threadsrc/builder.rs
Outdated

Comment threadsrc/payment/store.rs
Outdated

Comment threadsrc/payment/pending_payment_store.rs
Outdated

@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
2 times, most recently
from
00b7edc to
76000dfCompareJanuary 26, 2026 12:45
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
from
76000df to
70288e6CompareJanuary 26, 2026 13:19
@Camillarhi
Add PendingPaymentStore to track pending payments and replaced txids
17f80ba
Track pending payments with their replaced/conflicting transaction IDs
in a separate store. Pending payments are created here on WalletEvent::TxUnconfirmed,
then removed once they reach ANTI_REORG_DELAY confirmations. This avoids
scanning the entire payment store and enables efficient cleanup.
@Camillarhi
Use BDK events in update_payment_store instead of scanning all tran…
9f02ec0
…sactions
Replace the full transaction list scan in `update_payment_store` with
handling of BDK's `WalletEvent` stream during sync. This leverages the
new events in BDK 2.2, reduces redundant work, and prepares the
foundation for reliable RBF/CPFP tracking via `WalletEvent::TxReplaced`
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
from
70288e6 to
9f02ec0CompareJanuary 26, 2026 13:59
@Camillarhi
Camillarhi
requested a review
from tnullJanuary 26, 2026 14:03
@tnulltnull
mentioned this pull request
Jan 27, 2026

Closed

7 tasks
tnull
tnull
approved these changes
Jan 27, 2026
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the rebase, I'm going ahead landing this. I opened #770 to track some follow-ups I'd like to address before the next 0.8 release (for simplicity will likely just pick them up myself).
@tnull
tnull
merged commit ba16c92
into
lightningdevkit:mainJan 27, 2026

17 of 18 checks passed

@tnulltnull
mentioned this pull request
Jan 27, 2026

Closed

5 tasks

This was referenced Jun 12, 2026

Closed

 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@Camillarhi@ldk-reviews-bot@tnull

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Use BDK events in `update_payment_store` by Camillarhi · Pull Request #658 · lightningdevkit/ldk-node · GitHub
Skip to content
Use BDK events in update_payment_store - #658
Merged
tnull merged 5 commits into
lightningdevkit:mainfrom 
Camillarhi:payment-store-events-sync
Jan 27, 2026
Merged
Use BDK events in update_payment_store#658
tnull merged 5 commits into
lightningdevkit:mainfrom 
Camillarhi:payment-store-events-sync
Conversation
@Camillarhi
@CamillarhiCamillarhi
commented
Oct 9, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR updates update_payment_store to use BDK 2.2’s WalletEvent stream during sync instead of iterating over the full list of wallet transactions every time. The new event-based approach reduces redundant work and ensures the payment store stays in sync with only the changes that actually occurred.
It also sets up the foundation for RBF support in #628 with WalletEvent::TxReplaced. Since #628 depends on this event handling, this PR should be merged first.
This PR will also address #452
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 9, 2025•

edited

Loading

Copy link


Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!

I'll wait for their review and will help manage the review process.

Once they submit their review, I'll check if a second reviewer would be helpful.
@tnulltnull
mentioned this pull request
Oct 10, 2025
 Closed

@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
9 times, most recently
from
75ff700 to
d3f7855CompareOctober 15, 2025 20:32
@Camillarhi
Camillarhi
marked this pull request as ready for review
October 15, 2025 20:35
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 18, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 20, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 22, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 25, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 27, 2025

Copy link


Copy Markdown

🔔 5th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 29, 2025

Copy link


Copy Markdown

🔔 6th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
tnull
tnull
reviewed
Oct 29, 2025
View reviewed changes
@tnulltnull
left a comment
•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excuse the delay here!
Unfortunately I don't think we can make the move until we get corresponding functionality for all chain sources, i.e., also for bitcoind/apply_block. Will raise that with the BDK folks to make some progress.
I now opened bitcoindevkit/bdk_wallet#336 to add the missing APIs we need. In the meantime we can see to get this as close to being mergeable as possible.
Comment threadsrc/wallet/mod.rs
Outdated

 })?;

 self.update_payment_store(&mut *locked_wallet).map_err(|e| {
 let events_vec: Vec<WalletEvent> = events.into_iter().collect();
@tnulltnullOct 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this re-allocation is necessary?
@CamillarhiCamillarhiOct 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I have removed the re-allocation
Comment threadsrc/wallet/mod.rs
Outdated

@@ -723,7 +943,7 @@ impl Listen for Wallet {

 match locked_wallet.apply_block(block, height) {
@tnulltnullOct 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh, seems there is no corresponding apply_block_events method. I think we need that before actually moving forward here. Will raise it with the BDK folks.
@CamillarhiCamillarhiOct 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright
@CamillarhiCamillarhiNov 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw that the PR on BDK wallet has been merged and added to the next release milestone. This will be updated as soon as there is a new release on BDK wallet
Comment threadsrc/wallet/mod.rs
Outdated

 }

 self.payment_store
 .list_filter(|p| {
@tnulltnullOct 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, ugh, that's already slow right now, but will be prohibitively slow when we don't keep our entire payment store in-memory. I think we can't get around adding another persisted lookup table that tracks RBF-Txid to original-Txid.
@CamillarhiCamillarhiOct 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is true, if we have another table, the lookup will be faster and the original Txid can be updated when the RBF-Txid for example, has a confirmed event from BDK
@CamillarhiCamillarhiNov 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tnull, I created a new persisted ReplacedTransactionStore that maintains lookups from any txid in an RBF chain to its associated payment. Store entries are automatically cleaned up when any transaction in the chain confirms. This keeps lookups fast even with large payment histories.
@tnulltnullNov 6, 2025•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tnull, I created a new persisted ReplacedTransactionStore that maintains lookups from any txid in an RBF chain to its associated payment. Store entries are automatically cleaned up when any transaction in the chain confirms. This keeps lookups fast even with large payment histories.
Huh, why do we need a whole other module/store for this? Let's just use a HashMap<Txid, Txid> and be done with it? Or do we need all that additionally tracked data somehow?
I guess we could use a DataStore implementation for this, but I don't quite see why we need to track ConfirmationStatus and latest_update_timestamp?
@CamillarhiCamillarhiNov 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, why do we need a whole other module/store for this? Let's just use a HashMap<Txid, Txid> and be done with it? Or do we need all that additionally tracked data somehow?
Yes, we need to track this data for faster lookup of replaced transaction IDs instead of a full iteration
I guess we could use a DataStore implementation for this, but I don't quite see why we need to track ConfirmationStatus and latest_update_timestamp?
You are right about the ConfirmationStatus  and latest_update_timestamp, they were part of my original design, and as I proceeded with my implementation, I decided to clean the store instead upon confirmation of any of the transactions. I will go ahead and remove them. I also used a DataStore implementation for this.
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
from
d3f7855 to
a2c8a55CompareOctober 29, 2025 16:08
@Camillarhi
Camillarhi
requested a review
from tnullNovember 6, 2025 02:34
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
2 times, most recently
from
ecaae51 to
8609d97CompareNovember 6, 2025 10:58
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 8, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 10, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 12, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 15, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 17, 2025

Copy link


Copy Markdown

🔔 5th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 19, 2025

Copy link


Copy Markdown

🔔 6th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@tnull
tnull
removed their request for review
January 13, 2026 11:36
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
5 times, most recently
from
862c5a7 to
a677335CompareJanuary 13, 2026 14:42
@Camillarhi
Camillarhi
requested a review
from tnullJanuary 13, 2026 14:50
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 15, 2026

Copy link


Copy Markdown

🔔 1st Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 17, 2026

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 19, 2026

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 21, 2026

Copy link


Copy Markdown

🔔 4th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 24, 2026

Copy link


Copy Markdown

🔔 5th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 26, 2026

Copy link


Copy Markdown

🔔 6th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
tnull
tnull
reviewed
Jan 26, 2026
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excuse the delay here once more. I was about to just land this and address my comments myself in a follow-up, however, it seems this needs a rebase by now. Would also be great to at least avoid the churn of first adding the replaced_txids field to then remove it in a later commit.
Comment threadsrc/builder.rs
Outdated

Comment threadsrc/payment/store.rs
Outdated

Comment threadsrc/payment/pending_payment_store.rs
Outdated

@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
2 times, most recently
from
00b7edc to
76000dfCompareJanuary 26, 2026 12:45
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
from
76000df to
70288e6CompareJanuary 26, 2026 13:19
@Camillarhi
Add PendingPaymentStore to track pending payments and replaced txids
17f80ba
Track pending payments with their replaced/conflicting transaction IDs
in a separate store. Pending payments are created here on WalletEvent::TxUnconfirmed,
then removed once they reach ANTI_REORG_DELAY confirmations. This avoids
scanning the entire payment store and enables efficient cleanup.
@Camillarhi
Use BDK events in update_payment_store instead of scanning all tran…
9f02ec0
…sactions
Replace the full transaction list scan in `update_payment_store` with
handling of BDK's `WalletEvent` stream during sync. This leverages the
new events in BDK 2.2, reduces redundant work, and prepares the
foundation for reliable RBF/CPFP tracking via `WalletEvent::TxReplaced`
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
from
70288e6 to
9f02ec0CompareJanuary 26, 2026 13:59
@Camillarhi
Camillarhi
requested a review
from tnullJanuary 26, 2026 14:03
@tnulltnull
mentioned this pull request
Jan 27, 2026

Closed

7 tasks
tnull
tnull
approved these changes
Jan 27, 2026
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the rebase, I'm going ahead landing this. I opened #770 to track some follow-ups I'd like to address before the next 0.8 release (for simplicity will likely just pick them up myself).
@tnull
tnull
merged commit ba16c92
into
lightningdevkit:mainJan 27, 2026

17 of 18 checks passed

@tnulltnull
mentioned this pull request
Jan 27, 2026

Closed

5 tasks

This was referenced Jun 12, 2026

Closed

 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@Camillarhi@ldk-reviews-bot@tnull

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Use BDK events in `update_payment_store` by Camillarhi · Pull Request #658 · lightningdevkit/ldk-node · GitHub
Skip to content
Use BDK events in update_payment_store - #658
Merged
tnull merged 5 commits into
lightningdevkit:mainfrom 
Camillarhi:payment-store-events-sync
Jan 27, 2026
Merged
Use BDK events in update_payment_store#658
tnull merged 5 commits into
lightningdevkit:mainfrom 
Camillarhi:payment-store-events-sync
Conversation
@Camillarhi
@CamillarhiCamillarhi
commented
Oct 9, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR updates update_payment_store to use BDK 2.2’s WalletEvent stream during sync instead of iterating over the full list of wallet transactions every time. The new event-based approach reduces redundant work and ensures the payment store stays in sync with only the changes that actually occurred.
It also sets up the foundation for RBF support in #628 with WalletEvent::TxReplaced. Since #628 depends on this event handling, this PR should be merged first.
This PR will also address #452
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 9, 2025•

edited

Loading

Copy link


Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!

I'll wait for their review and will help manage the review process.

Once they submit their review, I'll check if a second reviewer would be helpful.
@tnulltnull
mentioned this pull request
Oct 10, 2025
 Closed

@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
9 times, most recently
from
75ff700 to
d3f7855CompareOctober 15, 2025 20:32
@Camillarhi
Camillarhi
marked this pull request as ready for review
October 15, 2025 20:35
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 18, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 20, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 22, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 25, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 27, 2025

Copy link


Copy Markdown

🔔 5th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 29, 2025

Copy link


Copy Markdown

🔔 6th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
tnull
tnull
reviewed
Oct 29, 2025
View reviewed changes
@tnulltnull
left a comment
•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excuse the delay here!
Unfortunately I don't think we can make the move until we get corresponding functionality for all chain sources, i.e., also for bitcoind/apply_block. Will raise that with the BDK folks to make some progress.
I now opened bitcoindevkit/bdk_wallet#336 to add the missing APIs we need. In the meantime we can see to get this as close to being mergeable as possible.
Comment threadsrc/wallet/mod.rs
Outdated

 })?;

 self.update_payment_store(&mut *locked_wallet).map_err(|e| {
 let events_vec: Vec<WalletEvent> = events.into_iter().collect();
@tnulltnullOct 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this re-allocation is necessary?
@CamillarhiCamillarhiOct 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I have removed the re-allocation
Comment threadsrc/wallet/mod.rs
Outdated

@@ -723,7 +943,7 @@ impl Listen for Wallet {

 match locked_wallet.apply_block(block, height) {
@tnulltnullOct 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh, seems there is no corresponding apply_block_events method. I think we need that before actually moving forward here. Will raise it with the BDK folks.
@CamillarhiCamillarhiOct 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright
@CamillarhiCamillarhiNov 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw that the PR on BDK wallet has been merged and added to the next release milestone. This will be updated as soon as there is a new release on BDK wallet
Comment threadsrc/wallet/mod.rs
Outdated

 }

 self.payment_store
 .list_filter(|p| {
@tnulltnullOct 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, ugh, that's already slow right now, but will be prohibitively slow when we don't keep our entire payment store in-memory. I think we can't get around adding another persisted lookup table that tracks RBF-Txid to original-Txid.
@CamillarhiCamillarhiOct 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is true, if we have another table, the lookup will be faster and the original Txid can be updated when the RBF-Txid for example, has a confirmed event from BDK
@CamillarhiCamillarhiNov 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tnull, I created a new persisted ReplacedTransactionStore that maintains lookups from any txid in an RBF chain to its associated payment. Store entries are automatically cleaned up when any transaction in the chain confirms. This keeps lookups fast even with large payment histories.
@tnulltnullNov 6, 2025•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tnull, I created a new persisted ReplacedTransactionStore that maintains lookups from any txid in an RBF chain to its associated payment. Store entries are automatically cleaned up when any transaction in the chain confirms. This keeps lookups fast even with large payment histories.
Huh, why do we need a whole other module/store for this? Let's just use a HashMap<Txid, Txid> and be done with it? Or do we need all that additionally tracked data somehow?
I guess we could use a DataStore implementation for this, but I don't quite see why we need to track ConfirmationStatus and latest_update_timestamp?
@CamillarhiCamillarhiNov 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, why do we need a whole other module/store for this? Let's just use a HashMap<Txid, Txid> and be done with it? Or do we need all that additionally tracked data somehow?
Yes, we need to track this data for faster lookup of replaced transaction IDs instead of a full iteration
I guess we could use a DataStore implementation for this, but I don't quite see why we need to track ConfirmationStatus and latest_update_timestamp?
You are right about the ConfirmationStatus  and latest_update_timestamp, they were part of my original design, and as I proceeded with my implementation, I decided to clean the store instead upon confirmation of any of the transactions. I will go ahead and remove them. I also used a DataStore implementation for this.
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
from
d3f7855 to
a2c8a55CompareOctober 29, 2025 16:08
@Camillarhi
Camillarhi
requested a review
from tnullNovember 6, 2025 02:34
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
2 times, most recently
from
ecaae51 to
8609d97CompareNovember 6, 2025 10:58
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 8, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 10, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 12, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 15, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 17, 2025

Copy link


Copy Markdown

🔔 5th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 19, 2025

Copy link


Copy Markdown

🔔 6th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@tnull
tnull
removed their request for review
January 13, 2026 11:36
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
5 times, most recently
from
862c5a7 to
a677335CompareJanuary 13, 2026 14:42
@Camillarhi
Camillarhi
requested a review
from tnullJanuary 13, 2026 14:50
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 15, 2026

Copy link


Copy Markdown

🔔 1st Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 17, 2026

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 19, 2026

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 21, 2026

Copy link


Copy Markdown

🔔 4th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 24, 2026

Copy link


Copy Markdown

🔔 5th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 26, 2026

Copy link


Copy Markdown

🔔 6th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
tnull
tnull
reviewed
Jan 26, 2026
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excuse the delay here once more. I was about to just land this and address my comments myself in a follow-up, however, it seems this needs a rebase by now. Would also be great to at least avoid the churn of first adding the replaced_txids field to then remove it in a later commit.
Comment threadsrc/builder.rs
Outdated

Comment threadsrc/payment/store.rs
Outdated

Comment threadsrc/payment/pending_payment_store.rs
Outdated

@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
2 times, most recently
from
00b7edc to
76000dfCompareJanuary 26, 2026 12:45
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
from
76000df to
70288e6CompareJanuary 26, 2026 13:19
@Camillarhi
Add PendingPaymentStore to track pending payments and replaced txids
17f80ba
Track pending payments with their replaced/conflicting transaction IDs
in a separate store. Pending payments are created here on WalletEvent::TxUnconfirmed,
then removed once they reach ANTI_REORG_DELAY confirmations. This avoids
scanning the entire payment store and enables efficient cleanup.
@Camillarhi
Use BDK events in update_payment_store instead of scanning all tran…
9f02ec0
…sactions
Replace the full transaction list scan in `update_payment_store` with
handling of BDK's `WalletEvent` stream during sync. This leverages the
new events in BDK 2.2, reduces redundant work, and prepares the
foundation for reliable RBF/CPFP tracking via `WalletEvent::TxReplaced`
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
from
70288e6 to
9f02ec0CompareJanuary 26, 2026 13:59
@Camillarhi
Camillarhi
requested a review
from tnullJanuary 26, 2026 14:03
@tnulltnull
mentioned this pull request
Jan 27, 2026

Closed

7 tasks
tnull
tnull
approved these changes
Jan 27, 2026
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the rebase, I'm going ahead landing this. I opened #770 to track some follow-ups I'd like to address before the next 0.8 release (for simplicity will likely just pick them up myself).
@tnull
tnull
merged commit ba16c92
into
lightningdevkit:mainJan 27, 2026

17 of 18 checks passed

@tnulltnull
mentioned this pull request
Jan 27, 2026

Closed

5 tasks

This was referenced Jun 12, 2026

Closed

 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@Camillarhi@ldk-reviews-bot@tnull

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Use BDK events in `update_payment_store` by Camillarhi · Pull Request #658 · lightningdevkit/ldk-node · GitHub
Skip to content
Use BDK events in update_payment_store - #658
Merged
tnull merged 5 commits into
lightningdevkit:mainfrom 
Camillarhi:payment-store-events-sync
Jan 27, 2026
Merged
Use BDK events in update_payment_store#658
tnull merged 5 commits into
lightningdevkit:mainfrom 
Camillarhi:payment-store-events-sync
Conversation
@Camillarhi
@CamillarhiCamillarhi
commented
Oct 9, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR updates update_payment_store to use BDK 2.2’s WalletEvent stream during sync instead of iterating over the full list of wallet transactions every time. The new event-based approach reduces redundant work and ensures the payment store stays in sync with only the changes that actually occurred.
It also sets up the foundation for RBF support in #628 with WalletEvent::TxReplaced. Since #628 depends on this event handling, this PR should be merged first.
This PR will also address #452
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 9, 2025•

edited

Loading

Copy link


Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!

I'll wait for their review and will help manage the review process.

Once they submit their review, I'll check if a second reviewer would be helpful.
@tnulltnull
mentioned this pull request
Oct 10, 2025
 Closed

@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
9 times, most recently
from
75ff700 to
d3f7855CompareOctober 15, 2025 20:32
@Camillarhi
Camillarhi
marked this pull request as ready for review
October 15, 2025 20:35
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 18, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 20, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 22, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 25, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 27, 2025

Copy link


Copy Markdown

🔔 5th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 29, 2025

Copy link


Copy Markdown

🔔 6th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
tnull
tnull
reviewed
Oct 29, 2025
View reviewed changes
@tnulltnull
left a comment
•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excuse the delay here!
Unfortunately I don't think we can make the move until we get corresponding functionality for all chain sources, i.e., also for bitcoind/apply_block. Will raise that with the BDK folks to make some progress.
I now opened bitcoindevkit/bdk_wallet#336 to add the missing APIs we need. In the meantime we can see to get this as close to being mergeable as possible.
Comment threadsrc/wallet/mod.rs
Outdated

 })?;

 self.update_payment_store(&mut *locked_wallet).map_err(|e| {
 let events_vec: Vec<WalletEvent> = events.into_iter().collect();
@tnulltnullOct 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this re-allocation is necessary?
@CamillarhiCamillarhiOct 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I have removed the re-allocation
Comment threadsrc/wallet/mod.rs
Outdated

@@ -723,7 +943,7 @@ impl Listen for Wallet {

 match locked_wallet.apply_block(block, height) {
@tnulltnullOct 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh, seems there is no corresponding apply_block_events method. I think we need that before actually moving forward here. Will raise it with the BDK folks.
@CamillarhiCamillarhiOct 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright
@CamillarhiCamillarhiNov 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw that the PR on BDK wallet has been merged and added to the next release milestone. This will be updated as soon as there is a new release on BDK wallet
Comment threadsrc/wallet/mod.rs
Outdated

 }

 self.payment_store
 .list_filter(|p| {
@tnulltnullOct 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, ugh, that's already slow right now, but will be prohibitively slow when we don't keep our entire payment store in-memory. I think we can't get around adding another persisted lookup table that tracks RBF-Txid to original-Txid.
@CamillarhiCamillarhiOct 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is true, if we have another table, the lookup will be faster and the original Txid can be updated when the RBF-Txid for example, has a confirmed event from BDK
@CamillarhiCamillarhiNov 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tnull, I created a new persisted ReplacedTransactionStore that maintains lookups from any txid in an RBF chain to its associated payment. Store entries are automatically cleaned up when any transaction in the chain confirms. This keeps lookups fast even with large payment histories.
@tnulltnullNov 6, 2025•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tnull, I created a new persisted ReplacedTransactionStore that maintains lookups from any txid in an RBF chain to its associated payment. Store entries are automatically cleaned up when any transaction in the chain confirms. This keeps lookups fast even with large payment histories.
Huh, why do we need a whole other module/store for this? Let's just use a HashMap<Txid, Txid> and be done with it? Or do we need all that additionally tracked data somehow?
I guess we could use a DataStore implementation for this, but I don't quite see why we need to track ConfirmationStatus and latest_update_timestamp?
@CamillarhiCamillarhiNov 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, why do we need a whole other module/store for this? Let's just use a HashMap<Txid, Txid> and be done with it? Or do we need all that additionally tracked data somehow?
Yes, we need to track this data for faster lookup of replaced transaction IDs instead of a full iteration
I guess we could use a DataStore implementation for this, but I don't quite see why we need to track ConfirmationStatus and latest_update_timestamp?
You are right about the ConfirmationStatus  and latest_update_timestamp, they were part of my original design, and as I proceeded with my implementation, I decided to clean the store instead upon confirmation of any of the transactions. I will go ahead and remove them. I also used a DataStore implementation for this.
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
from
d3f7855 to
a2c8a55CompareOctober 29, 2025 16:08
@Camillarhi
Camillarhi
requested a review
from tnullNovember 6, 2025 02:34
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
2 times, most recently
from
ecaae51 to
8609d97CompareNovember 6, 2025 10:58
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 8, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 10, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 12, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 15, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 17, 2025

Copy link


Copy Markdown

🔔 5th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 19, 2025

Copy link


Copy Markdown

🔔 6th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@tnull
tnull
removed their request for review
January 13, 2026 11:36
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
5 times, most recently
from
862c5a7 to
a677335CompareJanuary 13, 2026 14:42
@Camillarhi
Camillarhi
requested a review
from tnullJanuary 13, 2026 14:50
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 15, 2026

Copy link


Copy Markdown

🔔 1st Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 17, 2026

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 19, 2026

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 21, 2026

Copy link


Copy Markdown

🔔 4th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 24, 2026

Copy link


Copy Markdown

🔔 5th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 26, 2026

Copy link


Copy Markdown

🔔 6th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
tnull
tnull
reviewed
Jan 26, 2026
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excuse the delay here once more. I was about to just land this and address my comments myself in a follow-up, however, it seems this needs a rebase by now. Would also be great to at least avoid the churn of first adding the replaced_txids field to then remove it in a later commit.
Comment threadsrc/builder.rs
Outdated

Comment threadsrc/payment/store.rs
Outdated

Comment threadsrc/payment/pending_payment_store.rs
Outdated

@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
2 times, most recently
from
00b7edc to
76000dfCompareJanuary 26, 2026 12:45
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
from
76000df to
70288e6CompareJanuary 26, 2026 13:19
@Camillarhi
Add PendingPaymentStore to track pending payments and replaced txids
17f80ba
Track pending payments with their replaced/conflicting transaction IDs
in a separate store. Pending payments are created here on WalletEvent::TxUnconfirmed,
then removed once they reach ANTI_REORG_DELAY confirmations. This avoids
scanning the entire payment store and enables efficient cleanup.
@Camillarhi
Use BDK events in update_payment_store instead of scanning all tran…
9f02ec0
…sactions
Replace the full transaction list scan in `update_payment_store` with
handling of BDK's `WalletEvent` stream during sync. This leverages the
new events in BDK 2.2, reduces redundant work, and prepares the
foundation for reliable RBF/CPFP tracking via `WalletEvent::TxReplaced`
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
from
70288e6 to
9f02ec0CompareJanuary 26, 2026 13:59
@Camillarhi
Camillarhi
requested a review
from tnullJanuary 26, 2026 14:03
@tnulltnull
mentioned this pull request
Jan 27, 2026

Closed

7 tasks
tnull
tnull
approved these changes
Jan 27, 2026
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the rebase, I'm going ahead landing this. I opened #770 to track some follow-ups I'd like to address before the next 0.8 release (for simplicity will likely just pick them up myself).
@tnull
tnull
merged commit ba16c92
into
lightningdevkit:mainJan 27, 2026

17 of 18 checks passed

@tnulltnull
mentioned this pull request
Jan 27, 2026

Closed

5 tasks

This was referenced Jun 12, 2026

Closed

 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@Camillarhi@ldk-reviews-bot@tnull

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
Use BDK events in `update_payment_store` by Camillarhi · Pull Request #658 · lightningdevkit/ldk-node · GitHub
Skip to content
Use BDK events in update_payment_store - #658
Merged
tnull merged 5 commits into
lightningdevkit:mainfrom 
Camillarhi:payment-store-events-sync
Jan 27, 2026
Merged
Use BDK events in update_payment_store#658
tnull merged 5 commits into
lightningdevkit:mainfrom 
Camillarhi:payment-store-events-sync
Conversation
@Camillarhi
@CamillarhiCamillarhi
commented
Oct 9, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR updates update_payment_store to use BDK 2.2’s WalletEvent stream during sync instead of iterating over the full list of wallet transactions every time. The new event-based approach reduces redundant work and ensures the payment store stays in sync with only the changes that actually occurred.
It also sets up the foundation for RBF support in #628 with WalletEvent::TxReplaced. Since #628 depends on this event handling, this PR should be merged first.
This PR will also address #452
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 9, 2025•

edited

Loading

Copy link


Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!

I'll wait for their review and will help manage the review process.

Once they submit their review, I'll check if a second reviewer would be helpful.
@tnulltnull
mentioned this pull request
Oct 10, 2025
 Closed

@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
9 times, most recently
from
75ff700 to
d3f7855CompareOctober 15, 2025 20:32
@Camillarhi
Camillarhi
marked this pull request as ready for review
October 15, 2025 20:35
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 18, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 20, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 22, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 25, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 27, 2025

Copy link


Copy Markdown

🔔 5th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Oct 29, 2025

Copy link


Copy Markdown

🔔 6th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
tnull
tnull
reviewed
Oct 29, 2025
View reviewed changes
@tnulltnull
left a comment
•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excuse the delay here!
Unfortunately I don't think we can make the move until we get corresponding functionality for all chain sources, i.e., also for bitcoind/apply_block. Will raise that with the BDK folks to make some progress.
I now opened bitcoindevkit/bdk_wallet#336 to add the missing APIs we need. In the meantime we can see to get this as close to being mergeable as possible.
Comment threadsrc/wallet/mod.rs
Outdated

 })?;

 self.update_payment_store(&mut *locked_wallet).map_err(|e| {
 let events_vec: Vec<WalletEvent> = events.into_iter().collect();
@tnulltnullOct 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this re-allocation is necessary?
@CamillarhiCamillarhiOct 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I have removed the re-allocation
Comment threadsrc/wallet/mod.rs
Outdated

@@ -723,7 +943,7 @@ impl Listen for Wallet {

 match locked_wallet.apply_block(block, height) {
@tnulltnullOct 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh, seems there is no corresponding apply_block_events method. I think we need that before actually moving forward here. Will raise it with the BDK folks.
@CamillarhiCamillarhiOct 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright
@CamillarhiCamillarhiNov 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw that the PR on BDK wallet has been merged and added to the next release milestone. This will be updated as soon as there is a new release on BDK wallet
Comment threadsrc/wallet/mod.rs
Outdated

 }

 self.payment_store
 .list_filter(|p| {
@tnulltnullOct 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, ugh, that's already slow right now, but will be prohibitively slow when we don't keep our entire payment store in-memory. I think we can't get around adding another persisted lookup table that tracks RBF-Txid to original-Txid.
@CamillarhiCamillarhiOct 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is true, if we have another table, the lookup will be faster and the original Txid can be updated when the RBF-Txid for example, has a confirmed event from BDK
@CamillarhiCamillarhiNov 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tnull, I created a new persisted ReplacedTransactionStore that maintains lookups from any txid in an RBF chain to its associated payment. Store entries are automatically cleaned up when any transaction in the chain confirms. This keeps lookups fast even with large payment histories.
@tnulltnullNov 6, 2025•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tnull, I created a new persisted ReplacedTransactionStore that maintains lookups from any txid in an RBF chain to its associated payment. Store entries are automatically cleaned up when any transaction in the chain confirms. This keeps lookups fast even with large payment histories.
Huh, why do we need a whole other module/store for this? Let's just use a HashMap<Txid, Txid> and be done with it? Or do we need all that additionally tracked data somehow?
I guess we could use a DataStore implementation for this, but I don't quite see why we need to track ConfirmationStatus and latest_update_timestamp?
@CamillarhiCamillarhiNov 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, why do we need a whole other module/store for this? Let's just use a HashMap<Txid, Txid> and be done with it? Or do we need all that additionally tracked data somehow?
Yes, we need to track this data for faster lookup of replaced transaction IDs instead of a full iteration
I guess we could use a DataStore implementation for this, but I don't quite see why we need to track ConfirmationStatus and latest_update_timestamp?
You are right about the ConfirmationStatus  and latest_update_timestamp, they were part of my original design, and as I proceeded with my implementation, I decided to clean the store instead upon confirmation of any of the transactions. I will go ahead and remove them. I also used a DataStore implementation for this.
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
from
d3f7855 to
a2c8a55CompareOctober 29, 2025 16:08
@Camillarhi
Camillarhi
requested a review
from tnullNovember 6, 2025 02:34
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
2 times, most recently
from
ecaae51 to
8609d97CompareNovember 6, 2025 10:58
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 8, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 10, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 12, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 15, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 17, 2025

Copy link


Copy Markdown

🔔 5th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Nov 19, 2025

Copy link


Copy Markdown

🔔 6th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@tnull
tnull
removed their request for review
January 13, 2026 11:36
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
5 times, most recently
from
862c5a7 to
a677335CompareJanuary 13, 2026 14:42
@Camillarhi
Camillarhi
requested a review
from tnullJanuary 13, 2026 14:50
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 15, 2026

Copy link


Copy Markdown

🔔 1st Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 17, 2026

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 19, 2026

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 21, 2026

Copy link


Copy Markdown

🔔 4th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 24, 2026

Copy link


Copy Markdown

🔔 5th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jan 26, 2026

Copy link


Copy Markdown

🔔 6th Reminder
Hey @tnull! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
tnull
tnull
reviewed
Jan 26, 2026
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excuse the delay here once more. I was about to just land this and address my comments myself in a follow-up, however, it seems this needs a rebase by now. Would also be great to at least avoid the churn of first adding the replaced_txids field to then remove it in a later commit.
Comment threadsrc/builder.rs
Outdated

Comment threadsrc/payment/store.rs
Outdated

Comment threadsrc/payment/pending_payment_store.rs
Outdated

@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
2 times, most recently
from
00b7edc to
76000dfCompareJanuary 26, 2026 12:45
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
from
76000df to
70288e6CompareJanuary 26, 2026 13:19
@Camillarhi
Add PendingPaymentStore to track pending payments and replaced txids
17f80ba
Track pending payments with their replaced/conflicting transaction IDs
in a separate store. Pending payments are created here on WalletEvent::TxUnconfirmed,
then removed once they reach ANTI_REORG_DELAY confirmations. This avoids
scanning the entire payment store and enables efficient cleanup.
@Camillarhi
Use BDK events in update_payment_store instead of scanning all tran…
9f02ec0
…sactions
Replace the full transaction list scan in `update_payment_store` with
handling of BDK's `WalletEvent` stream during sync. This leverages the
new events in BDK 2.2, reduces redundant work, and prepares the
foundation for reliable RBF/CPFP tracking via `WalletEvent::TxReplaced`
@Camillarhi
Camillarhiforce-pushed
the
payment-store-events-sync
branch
from
70288e6 to
9f02ec0CompareJanuary 26, 2026 13:59
@Camillarhi
Camillarhi
requested a review
from tnullJanuary 26, 2026 14:03
@tnulltnull
mentioned this pull request
Jan 27, 2026

Closed

7 tasks
tnull
tnull
approved these changes
Jan 27, 2026
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the rebase, I'm going ahead landing this. I opened #770 to track some follow-ups I'd like to address before the next 0.8 release (for simplicity will likely just pick them up myself).
@tnull
tnull
merged commit ba16c92
into
lightningdevkit:mainJan 27, 2026

17 of 18 checks passed

@tnulltnull
mentioned this pull request
Jan 27, 2026

Closed

5 tasks

This was referenced Jun 12, 2026

Closed

 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@Camillarhi@ldk-reviews-bot@tnull