Call redeem_sub_vaults_assets only if needed#717
Open
cyc60 wants to merge 3 commits into
Open
Conversation
Signed-off-by: cyc60 <avsysoev60@gmail.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR aims to avoid unnecessary on-chain redeemSubVaultsAssets calls by skipping meta-vault redemption when the computed sub-vault redemption order is empty.
Changes:
- Add an early return in
_try_redeem_meta_vault()when the computed redemption order is empty (no sub-vault redemption needed). - Update
_build_meta_vault_redeem_order()to return an empty order whencalculateSubVaultsRedemptions()returns no redemptions, and extend tests for empty/nested scenarios. - Move exit-queue processing in
process()to run only after a successful redemption transaction.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
src/commands/internal/process_redeemer.py |
Skips meta-vault redemption on empty redeem order; adjusts when exit-queue processing is triggered. |
src/commands/tests/test_internal/test_process_redeemer.py |
Adds/updates unit tests to cover empty redeem order and nested meta-vault redemption-order building. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Signed-off-by: cyc60 <avsysoev60@gmail.com>
Signed-off-by: cyc60 <avsysoev60@gmail.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+177
to
+191
| """Run one redemption iteration and always process the exit queue at the end. | ||
|
|
||
| The exit-queue call must happen on every iteration (including early-return | ||
| paths such as below-threshold queued assets, zero nonce, no positions, or | ||
| no eligible positions). Using ``try/finally`` ensures that any early | ||
| ``return`` inside ``_redeem_os_token_positions`` still runs the exit-queue | ||
| step, while exceptions are propagated to the caller as before. | ||
| """ | ||
| try: | ||
| await _redeem_os_token_positions(min_queued_assets=min_queued_assets) | ||
| finally: | ||
| # Re-fetch block number after redemption processing | ||
| # to ensure we read the latest on-chain state. | ||
| block_number = await execution_client.eth.block_number | ||
| await _process_exit_queue(block_number) |
Comment on lines
+181
to
+193
| no eligible positions). Using ``try/finally`` ensures that any early | ||
| ``return`` inside ``_redeem_os_token_positions`` still runs the exit-queue | ||
| step, while exceptions are propagated to the caller as before. | ||
| """ | ||
| try: | ||
| await _redeem_os_token_positions(min_queued_assets=min_queued_assets) | ||
| finally: | ||
| # Re-fetch block number after redemption processing | ||
| # to ensure we read the latest on-chain state. | ||
| block_number = await execution_client.eth.block_number | ||
| await _process_exit_queue(block_number) | ||
|
|
||
|
|
Comment on lines
+453
to
+461
| if not redeem_order: | ||
| # No sub-vault redemption is needed for this meta-vault: the on-chain | ||
| # calculator reported that withdrawable assets already cover the target. | ||
| logger.info( | ||
| 'No sub-vault redemption needed for meta-vault %s. ' | ||
| 'Proceeding with current withdrawable assets.', | ||
| vault_address, | ||
| ) | ||
| return current_withdrawable |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.