Improve the performace of LeaseOutput
#8961
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Important Review skippedAuto reviews are limited to specific labels. Labels to auto review (1)
Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (invoked as PR comments)
Additionally, you can add CodeRabbit Configuration File (
|
yyforyongyu
force-pushed
the
fix-leaseoutput
branch
from
c77e7de
to
4cbc82a
Compare
guggero
requested changes
Aug 5, 2024
yyforyongyu
force-pushed
the
fix-leaseoutput
branch
from
4cbc82a
to
4bd04b1
Compare
yyforyongyu
force-pushed
the
fix-leaseoutput
branch
from
4bd04b1
to
e741a62
Compare
guggero
reviewed
Aug 9, 2024
This commit replaces the usage of `FetchInputInfo` with `FetchOutpointInfo` and `FetchDerivationInfo` to remove unncessary fetching of the derivation path.
yyforyongyu
force-pushed
the
fix-leaseoutput
branch
from
e741a62
to
31dc2b2
Compare
This method is no longer used. In addition, the `Derivation` field on the `Utxo` is also removed to avoid nil dereference.
This commit prepares the following commit where we change the `LeaseOutput` to be more efficient.
This commit removes the call toe `ListLeasedOutputs` in `LeaseOutput` - the returned info from `ListLeasedOutputs` can easily be accessed via `FetchInputInfo` and this info is only used at one callsite. `ListLeasedOutputs` then becomes unnecessary here, plus it's very slow and needs to be refactored in `btcwallet` instead.
This check has already been done when mining blocks.
yyforyongyu
force-pushed
the
fix-leaseoutput
branch
from
31dc2b2
to
363e529
Compare
Roasbeef
approved these changes
Aug 21, 2024
| @@ -154,7 +154,7 @@ func (r *RPCKeyRing) SendOutputs(inputs fn.Set[wire.OutPoint], | |||
| // watch-only wallet if it can map this outpoint into a coin we | |||
| // own. If not, then we can't continue because our wallet state | |||
| // is out of sync. | |||
| info, err := r.WalletController.FetchInputInfo( | |||
| info, err := r.WalletController.FetchOutpointInfo( | |||
There was a problem hiding this comment.
Makes sense, FetchInputInfo ends up calling FetchOutpointInfo under the covers: https://github.com/btcsuite/btcwallet/blob/6ecae9c12fde8ed4db9e3c88241a8aeabff37724/wallet/utxos.go#L112-L123
| } | ||
|
|
||
| lockedBalance += utxoInfo.Value | ||
| lockedBalance += btcutil.Amount(leasedOutput.Value) |
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.
There's a wrapper built around
btcwallet.LeaseOutputinlnwallet, which additionally callsListLeasedOutputsto fetch the script and value info, which is rarely used and can be replaced with other queries when needed. More importantly thisListLeasedOutputsis very slow (detailed in btcsuite/btcwallet#943), so we remove this call.Once removed, we gained roughly 30s back in this test,
On this branch
On master,
Fix #8809.