Delete channel alias scids when quotes expire #1710
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ffranr
reviewed
Aug 6, 2025
Comment on lines
+889
to
+944
| // Start the main event loop in a separate go routine. | ||
| h.Wg.Add(1) | ||
| go func() { | ||
| defer h.Wg.Done() |
Contributor
There was a problem hiding this comment.
we could use h.ContextGuard.Goroutine here (and above if you like)
Member
There was a problem hiding this comment.
TIL go1.25.0 apparently also adds a WaitGroup.Go method for handling the Add(1)/Done pattern.
Member
Author
|
Need to bump configured go version to |
GeorgeTsagk
force-pushed
the
delete-expired-scids
branch
2 times, most recently
from
5a74347 to
08f114e
Compare
Pull Request Test Coverage Report for Build 16778492979Details
💛 - Coveralls |
Member
Author
|
For the LiT tests I'll have to make a PR that bumps all versions that are included with this PR |
jtobin
reviewed
Oct 1, 2025
Member
jtobin
left a comment
jtobin
left a comment
There was a problem hiding this comment.
I think this all looks perfectly reasonable. Needs some rebasing, and still seems to be blocked on lightninglabs/lndclient#236. Will take another pass when it's about ready to go.
GeorgeTsagk
force-pushed
the
delete-expired-scids
branch
from
08f114e to
3afa23d
Compare
jtobin
approved these changes
Oct 7, 2025
Member
jtobin
left a comment
jtobin
left a comment
There was a problem hiding this comment.
This LGTM. I take it the LiT tests should be updated after this one is merged?
Member
Author
It's a dep bump issue, I believe currently the dependency is bumped in the feature bits itest PR, but maybe worth separating as we don't know when that is getting merged. |
Refactor the function by introducing an internal helper to improve readability.
Refactor MacaroonWhitelist to handle public universe proof courier permissions independently. This clarifies the logic and avoids coupling courier access with other universe server permissions.
Remove the defaultMacaroonWhitelist map and inline its entries directly into the conditional logic within MacaroonWhitelist. This ensures that access to previously always-available endpoints is now governed by explicit user configuration (read/write/courier), improving permission control and aligning with expected access restrictions.
Separate the mint anchor transaction fee rate calculation from fundGenesisPsbt into anchorTxFeeRate. This refactor is part of a broader effort to simplify calling fundGenesisPsbt from unit tests.
Extract the wallet funding call into a closure that is passed as an argument. This prepares fundGenesisPsbt to become a standalone function, making it easier to call in unit tests.
Pass the pending batch and chain params into fundGenesisPsbt and convert it into a standalone function rather than a method on ChainPlanter. This change makes it easier to call fundGenesisPsbt from unit tests.
The batch key was only used for logging. This commit moves the log messages outside fundGenesisPsbt, simplifying the function for better code health.
The mock helper FundGenesisTx now returns the index of the change output. It also dynamically computes the index of the change output it adds. These enhancements will be useful when handling packets with supply pre-commitment outputs.
The funding routine now uses the refactored fundGenesisPsbt function, introduced in a previous commit. Which adds test coverage for the batch funding logic. An optional argument is also added to allow skipping funding.
RandSeedlingMintingBatch retires.
Refactored GetBlockTimestamp to call GetBlockHeaderByHeight and return an optional error type. Removed the timestamp-to-block-height cache, as it did not handle re-orgs correctly. This prepares the codebase for a more comprehensive caching mechanism to be added in a follow-up commit.
Introduce a reusable cache that stores full headers keyed by height and hash. Tracks confirmation depth and treats shallow entries as unsettled (return miss). Detects conflicts at a height and invalidates shallower headers on reorg. Size and random purge fraction are configurable (default 100k entries, 10 percent). Not yet used by LndRpcChainBridge.
…whitelist Improve `MacaroonWhitelist` Structure and Permission Granularity
Adds a block header cache to LndRpcChainBridge, which indirectly improves performance of methods like GetBlockTimestamp by avoiding repeated block header fetches.
Refactor `fundGenesisPsbt` and enhance test helpers for coverage
lndservices: add reorg aware block header cache; use in ChainBridge
GeorgeTsagk
force-pushed
the
delete-expired-scids
branch
from
3afa23d to
c3f3e7a
Compare
We use the new LND RPC endpoint that looks up the base scid for an alias, in order to use it to delete the mapping shortly after. In addition we break the order handler main loop into it's go routine, which was previously never really running as it followed the HTLC interceptor setup which was a blocking call.
GeorgeTsagk
force-pushed
the
delete-expired-scids
branch
from
c3f3e7a to
e3a9299
Compare
Member
Author
|
Rebased on |
ffranr
reviewed
Oct 28, 2025
Comment on lines
+1131
to
+1132
| // Delete the local entry of this policy. | ||
| h.policies.Delete(scid) |
Contributor
There was a problem hiding this comment.
not a big deal in this case but: slightly better if we delete from the local cache last; otherwise, we might lose our reference to the resource? the cleanup routine could appear to be working from tapd's POV (few log messages without re-attempt), but in reality the cleanup could be failing.
|
@GeorgeTsagk, remember to re-request review from reviewers when ready |
darioAnongba
force-pushed
the
0-8-0-staging
branch
from
2b3ac4f to
035a840
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Previously when we'd garbage collect quotes we'd only delete the quote entry locally on tapd. What we didn't do is clear the state that was produced in LND, which keeps track of alias scid -> base scid mappings to facilitate routing.
We use the new method
XFindBaseLocalChanAliasto retrieve the base scid that corresponds to our quotes, and then we call LND to delete the alias.Depends on:
lightningnetwork/lnd#10133
lightninglabs/lndclient#236