Merged
Conversation
shahthepro
requested review from
clement-ux,
naddison36 and
sparrowDom
as code owners
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## clement/simplify-ousd #2790 +/- ##
========================================================
Coverage ? 33.54%
========================================================
Files ? 124
Lines ? 5455
Branches ? 1443
========================================================
Hits ? 1830
Misses ? 3624
Partials ? 1 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
shahthepro
added a commit
that referenced
this pull request
Feb 10, 2026
* Refactor OETHVaultCore and VaultCore to simplify asset handling and remove WETH dependencies * Add constructors to MockVault and MockVaultCoreInstantRebase for initialization * Refactor OETHVaultCore and VaultCore to implement async withdrawal functionality * Refactor OETHVaultCore and VaultCore to remove unused functions and simplify total value calculations * Remove unused addWithdrawalQueueLiquidity function from OETHVaultCore and clean up comments in VaultCore * Refactor OETHVaultCore and VaultCore to remove unused imports and functions, simplifying the codebase. * Remove unused pricing functions and related imports in VaultCore to simplify the codebase. * Update constructor parameter in OETHVaultCore to use _weth for clarity * Add OUSDVaultCore contract and implement redeem functionality with access control * Refactor OETHVaultAdmin and VaultAdmin contracts to simplify code and improve clarity by removing deprecated functions and updating asset handling methods. * Refactor vault admin contracts to remove constructors and simplify initialization by using address(0) for backing asset. * Refactor vault contracts to enforce backing asset restrictions and remove deprecated asset handling * Refactor VaultAdmin and VaultStorage contracts to simplify default strategy handling for backing asset * Refactor AbstractHarvester and related contracts to integrate oracle address, simplifying price retrieval and enhancing clarity * Revert changes on Harvester * remove old code * Refactor vault admin contracts to include backing asset address in constructors for improved clarity and functionality * Refactor OETH Vault tests to simplify strategy handling and improve error messages * adjust decimal logic in VaultStorage * wip fix test * Refactor scaling logic in VaultCore to use scaleBy function for improved clarity and consistency * Refactor Compound strategy tests to simplify logic and improve clarity by removing unused variables and consolidating test cases * Refactor Vault tests to simplify logic by removing unused variables and consolidating test cases * Refactor Vault tests to simplify code by removing unused variables and consolidating test cases * Refactor Vault redeem tests to simplify logic by removing unused variables and consolidating test cases * fix buyback fixture * Refactor Reborner contract and tests to use USDC instead of USDS, update mint and redeem amounts for consistency * Refactor compoundingStakingSSVStrategyFixture to simplify default strategy setting * Refactor Convex strategy tests to use USDC instead of USDS and simplify asset handling * Refactor MockVaultCoreInstantRebase constructor to accept backing asset address, update test fixtures to use USDC instead of USDS, and simplify Dripper and VaultValueChecker tests by removing unused variables and consolidating logic. * fix remaining unit test * fix base setup * fix sonic setup * Add slither-disable comments for reentrancy checks in mint functions * Remove collateral swaps test file to streamline testing suite * Add OUSDVaultAdmin contract and deployment script for OUSD Vault upgrade * fix vault fork test * prettier * fix more fork tests * lint * fix more tests * fix sonic fork test * lint + prettier * skip plume test * fix sonic fork test * fix sonic fork test * remove .only * remove old fix * fix decimal conversion * refactor: change contracts to abstract for VaultAdmin, VaultCore, VaultInitializer, and VaultStorage * fix test * WIP add async withdraw test for OUSD * Add lot of test for async withdraw * adjust comment * refactor: remove setDripper function from IVault interface * fix: update redeem function to use correct amount parameter * feat: add deprecated weth asset index to OETHVaultCore contract * increase ousd vault upgrade number * fix: add slither disable comment for constable-states in OETHVaultCore contract * fix: correct drip duration initialization in VaultInitializer contract * feat: deprecate calculateRedeemOutputs and introduce calculateRedeemOutput in VaultCore contract * refactor: rename backingAsset to asset across contracts for consistency * refactor: change visibility of deprecated asset-related mappings to private * fix: improve error message for unsupported asset decimals in VaultStorage constructor * fix: update error message for unsupported asset in minting process * refactor: update comments to clarify AMO strategy references in mint and redeem functions * refactor: standardize terminology by replacing 'backing asset' with 'asset' in contracts and tests * refactor: simplify redeem output calculation by removing deprecated function * refactor: streamline redeem output calculation by consolidating return values * refactor: improve clarity in comments regarding AMO strategy in mint and redeem functions * refactor: mark isSupportedAsset function as deprecated * [Vault] Simplify `mint()` (#2735) * refactor: remove deprecated asset structure and related mappings from VaultStorage * refactor: remove deprecated mint function parameters and related tests * refactor: remove unused parameters from _mint and mint functions * refactor: remove unnecessary blank lines in test files * refactor: change internal mappings to private for better encapsulation * Clement/simplify ousd get rid of old stuff (#2736) * refactor: remove deprecated asset structure and related mappings from VaultStorage * refactor: remove deprecated mint function parameters and related tests * refactor: remove unused parameters from _mint and mint functions * refactor: remove unnecessary blank lines in test files * refactor: change internal mappings to private for better encapsulation * refactor: simplify asset mappings by changing from mapping to single uint256 * [Vault] Remove `redeem()` and simplify inheritance. (#2737) * Remove redeem functionality and related events from vault contracts * Refactor vault contracts to inherit from VaultCore, removing deprecated OETHVaultCore references and relocating legacy code for consistency. * Fix tests after redeem has been removed (#2738) * 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 * Remove unused gap variable from OUSDVaultCore contract --------- Co-authored-by: Nick Addison <nick@addisonbrown.com.au> * Removed Beacon consolidation fork tests * Add OETH vault upgrade deployment script with governance proposal * Remove deprecated redeem tests from OETH vault and bridge helper test files * lint * Add vault upgrade deployment script and skip deprecated tests in bridge helper * prettier * Add deployment script for OSonic vault upgrade with governance actions * Refactor OETH and OSonic VaultAdmin contracts to inherit from VaultAdmin * New gov prop of deploy script 163 * Simplify withdrawal amount calculations in VaultCore contract * fix bug * [Vault] Merge VaultAdmin and VaultCore (#2743) * Refactor vault contracts to remove deprecated implementations and simplify admin structure * Refactor vault contracts to unify admin structure and simplify deployment scripts * move zapper to dedicated folder * Refactor vault upgrade scripts to unify implementation names and simplify deployment actions * Updated hot deploy with new Vault contracts * Update Vault contract diagrams * Add OSVault contract and update deployment script references --------- Co-authored-by: Nicholas Addison <nick@addisonbrown.com.au> * Removed commented out IOracle lines from Harvester * Changed the OUSD default strategy to the Morpho OUSD v2 strategy * Rename OSonicVault to OSVault in deployment script * Refactor rebase and withdrawal queue liquidity calls in VaultAdmin contract * Add slither disable comments for reentrancy checks in VaultAdmin contract * Removed dependency on OracleRouter from the OUSD and SuperOETH Vaults * Bumped the deploy script numbers * prevent removal of strategies that still have balance after the withdrawal (#2767) * [OUSD-16] Miscellaneous General Comments (#2788) * replace interface to fetch decimals * add comment * add link to readme * removed TODO * rename oUSD to oToken * add function for reverse compatibility and mark deprecated * rename * refactor: update setRebaseRateMax function to clarify APR parameters and improve documentation (#2785) * Remove constant MAX_PRICE_STALENESS from BridgedWOETHStrategy contract (#2784) * remove unused _totalValueInVault function to simplify VaultCore contract (#2779) * [OUSD-13] `removeStrategy()` Does Not Reset Mint Whitelist Flag. (#2778) * Reset mintWhiteList flag when removing strategy. * Add test to reset mint whitelist flag when removing a strategy * [OUSD-11] Missing Zero Amount Validation In `requestWithdrawal()`. (#2777) * Add validation for withdrawal amount in requestWithdrawal function * Fail to allow withdrawal of zero amount in requestWithdrawal function * Add asset support check in approveStrategy function (#2776) * Fix Vault tests (#2790) * Fix base unit tests * Fix Ehereum unit tests * Remove redundant fork tests * fix approval * Fix CI --------- Co-authored-by: Nick Addison <nick@addisonbrown.com.au> Co-authored-by: Domen Grabec <grabec@gmail.com> Co-authored-by: Shah <10547529+shahthepro@users.noreply.github.com>
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
2 participants
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.
Related to PR #2714