[Vault] Remove redeem() and simplify inheritance.
#2737
Merged
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
…ed OETHVaultCore references and relocating legacy code for consistency.
* Remove calculateRedeemOutputs view function from Vault * Removed redeem, fund and yield Hardhat task * FIxed unit tests * Fixed fork tests * Fix Base fork tests * Fixed Base Curve AMO fork tests * Removed redeemFeeBps from Sonic fork tests * Fix Base and Sonic unit tests * Prettier * Remove hardhat fund from node script * Fix OUSD AMO fork tests * Fix AMO fork tests
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## clement/simplify-ousd #2737 +/- ##
=========================================================
+ Coverage 34.20% 35.69% +1.49%
=========================================================
Files 128 128
Lines 5514 5471 -43
Branches 1460 1443 -17
=========================================================
+ Hits 1886 1953 +67
+ Misses 3627 3517 -110
Partials 1 1 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
naddison36
requested review from
naddison36,
shahthepro and
sparrowDom
as code owners
naddison36
approved these changes
Jan 8, 2026
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
This PR aims:
redeem()feature fromVaultCore.soland related contracts.XXXVaultCorecontractRemove
redeem()feature.redeem()function, now all redeem will be async redeem._redeem()implementation on all relatedVaultCorecontract.calculateRedeemOutputsredeemFeeBpsvariable, as not used anymore.RedeemFeeUpdatedevent andsetRedeemFeeBps().MAX_INTonVaultCore.solas not used anymore.Simplify
VaultCoreinheritance.Because we are simplifying
VaultCore.solcontract, it is now time to simplify inheritance across allVaultCore.soland avoid nested and inheritance. AllVaultContractwill no directly inherit fromVaultContract.soland nothing else.But there in
OETHVaultCore.solthis variable_deprecated_wethAssetIndex. So all contract that are currently inheriting fromOETHVaultCore.sol, should conserve this variable at the correct slot.For the sake of simplicity, we can move
_deprecated_wethAssetIndexin theVaultStorage.sol. This is not an issue for:_deprecated_wethAssetIndex)._deprecated_wethAssetIndex)._deprecated_wethAssetIndex)._deprecated_wethAssetIndex).OETHVaultCore.sol, becauseOSonicVaultCore,OETHBaseVaultCore,OETHPlumeVaultCoredon't have any storage variable.Let's double check with a storage check: