[Vault] Simplify VaultCore. #2714

clement-ux · 2025-12-09T17:14:29Z

Description

This pull request introduces significant refactoring and cleanup to the Vault interface and related contracts, with a focus on removing price provider and swapper logic, simplifying asset and strategy management, and updating mock contracts to match the new interfaces. These changes streamline the codebase, deprecate unused or redundant functionality, and improve clarity and maintainability.

Vault Interface Refactoring

Removed all price provider and swapper-related events and functions from the IVault interface, including setPriceProvider, priceProvider, swap logic, and associated configuration and events. Deprecated several functions and added new ones for strategy management and asset handling. [1] [2] [3] [4] [5] [6] [7]
Replaced asset-specific strategy functions with simplified versions: setDefaultStrategy/defaultStrategy instead of per-asset strategies, and removed asset configuration queries. [1] [2]

Removal of Price Provider Logic

Commented out or removed all uses of priceProvider in AbstractHarvester, MockEvilReentrantContract, and BridgedWOETHStrategy, replacing them with direct oracle references or dummy values for test compatibility. [1] [2] [3] [4] [5] [6] [7] [8]

Asset and Strategy Handling Updates

Updated asset support and strategy functions in mock vaults and related contracts to align with the new interface, including changes to asset tracking and initialization. [1] [2] [3] [4]
Modified minting logic in OETHPlumeVaultCore and MockRebornMinter to use the new asset and amount parameters and removed unnecessary minimum checks. [1] [2] [3]

Deprecation and Cleanup

Removed the unused OETHVault.sol contract and other deprecated logic, further simplifying the codebase and removing references to outdated functionality.

Constructor and Initialization Updates

Updated constructors in mock contracts and strategies to match the new interface requirements, including passing assets and oracles directly. [1] [2] [3]

These changes collectively modernize the Vault architecture, improve testability, and remove legacy code paths.

Code Change Checklist

To be completed before internal review begins:

The contract code is complete
Executable deployment file
Fork tests that test after the deployment file runs
Unit tests *if needed
The owner has done a full checklist review of the code + tests

Internal review:

Two approvals by internal reviewers

Deploy checklist

Two reviewers complete the following checklist:

- [ ] All deployed contracts are listed in the deploy PR's description
- [ ] Deployed contract's verified code (and all dependencies) match the code in master
- [ ] Contract constructors have correct arguments
- [ ] The transactions that interacted with the newly deployed contract match the deploy script.
- [ ] Governance proposal matches the deploy script
- [ ] Smoke tests pass after fork test execution of the governance proposal

…emove WETH dependencies

…ialization

…nctionality

…implify total value calculations

… and clean up comments in VaultCore

…ctions, simplifying the codebase.

…implify the codebase.

…cess control

… improve clarity by removing deprecated functions and updating asset handling methods.

…itialization by using address(0) for backing asset.

…move deprecated asset handling

…rategy handling for backing asset

…address, simplifying price retrieval and enhancing clarity

…nstructors for improved clarity and functionality

…rror messages

…ved clarity and consistency

…y by removing unused variables and consolidating test cases

…nd consolidating test cases

…d consolidating test cases

…ables and consolidating test cases

…ate mint and redeem amounts for consistency

…ategy setting

…fy asset handling

…et address, update test fixtures to use USDC instead of USDS, and simplify Dripper and VaultValueChecker tests by removing unused variables and consolidating logic.

* 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: 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

* 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>

pandadefi · 2026-01-08T11:17:38Z

contracts/contracts/harvest/AbstractHarvester.sol

        IStrategy strategy = IStrategy(_strategyAddr);
        address[] memory rewardTokens = strategy.getRewardTokenAddresses();
-        IOracle priceProvider = IOracle(IVault(vaultAddress).priceProvider());
+        //IOracle priceProvider = IOracle(IVault(vaultAddress).priceProvider());


Why not delete the code instead of commenting it? You will always be able to find it back with the git history.

Removed in commit 71f9057

… files

…ge helper

…deem-fee

pandadefi · 2026-01-12T13:14:10Z

contracts/contracts/vault/VaultInitializer.sol

-        // Start with drip duration disabled
-        dripDuration = 1;
+        // Start with drip duration: 7 days
+        dripDuration = 604800;


Probably never going to be used since no new vault is scheduled

What do you mean by the vault is scheduled?
We are now using the dripDuration in all the Vaults

…deem-fee

* 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>

naddison36

Looks good

contracts/contracts/vault/OSonicVaultAdmin.sol

naddison36 · 2026-01-13T00:13:17Z

contracts/contracts/vault/VaultInitializer.sol

-        // Start with drip duration disabled
-        dripDuration = 1;
+        // Start with drip duration: 7 days
+        dripDuration = 604800;


What do you mean by the vault is scheduled?
We are now using the dripDuration in all the Vaults

naddison36 · 2026-01-13T00:59:44Z

contracts/contracts/harvest/AbstractHarvester.sol

        IStrategy strategy = IStrategy(_strategyAddr);
        address[] memory rewardTokens = strategy.getRewardTokenAddresses();
-        IOracle priceProvider = IOracle(IVault(vaultAddress).priceProvider());
+        //IOracle priceProvider = IOracle(IVault(vaultAddress).priceProvider());


Removed in commit 71f9057

naddison36 · 2026-01-13T01:02:20Z

contracts/contracts/vault/VaultAdmin.sol

        );
-        require(_assets.length == _amounts.length, "Parameter length mismatch");
+        require(
+            _assets.length == 1 &&


Since we removed the redeem function we also removed the calculateRedeemOutputs

…o clement/simplify-ousd

naddison36 · 2026-01-13T06:04:35Z

contracts/contracts/vault/OSonicVault.sol

+ * @title Origin Sonic VaultAdmin contract on Sonic
+ * @author Origin Protocol Inc
+ */
+contract OSonicVault is VaultAdmin {


Is this now replaced by OSVault?

clement-ux added 30 commits December 9, 2025 16:38

Refactor OETHVaultCore and VaultCore to simplify asset handling and r…

cf1e4c6

…emove WETH dependencies

Add constructors to MockVault and MockVaultCoreInstantRebase for init…

cdf5ee8

…ialization

Refactor OETHVaultCore and VaultCore to implement async withdrawal fu…

17ef9fb

…nctionality

Refactor OETHVaultCore and VaultCore to remove unused functions and s…

7c38699

…implify total value calculations

Remove unused addWithdrawalQueueLiquidity function from OETHVaultCore…

be6a697

… and clean up comments in VaultCore

Refactor OETHVaultCore and VaultCore to remove unused imports and fun…

f49fa28

…ctions, simplifying the codebase.

Remove unused pricing functions and related imports in VaultCore to s…

9d58bde

…implify the codebase.

Update constructor parameter in OETHVaultCore to use _weth for clarity

d480ca9

Add OUSDVaultCore contract and implement redeem functionality with ac…

311fa8b

…cess control

Refactor OETHVaultAdmin and VaultAdmin contracts to simplify code and…

aedd14f

… improve clarity by removing deprecated functions and updating asset handling methods.

Refactor vault admin contracts to remove constructors and simplify in…

4a2a265

…itialization by using address(0) for backing asset.

Refactor vault contracts to enforce backing asset restrictions and re…

87bf396

…move deprecated asset handling

Refactor VaultAdmin and VaultStorage contracts to simplify default st…

2c41717

…rategy handling for backing asset

Refactor AbstractHarvester and related contracts to integrate oracle …

f520e69

…address, simplifying price retrieval and enhancing clarity

Revert changes on Harvester

3dd4788

remove old code

16ab03b

Refactor vault admin contracts to include backing asset address in co…

3833da5

…nstructors for improved clarity and functionality

Refactor OETH Vault tests to simplify strategy handling and improve e…

0cd238a

…rror messages

adjust decimal logic in VaultStorage

2fce2d5

wip fix test

0d931d4

Refactor scaling logic in VaultCore to use scaleBy function for impro…

3d864d1

…ved clarity and consistency

Refactor Compound strategy tests to simplify logic and improve clarit…

b7b2445

…y by removing unused variables and consolidating test cases

Refactor Vault tests to simplify logic by removing unused variables a…

9705708

…nd consolidating test cases

Refactor Vault tests to simplify code by removing unused variables an…

ceb6f82

…d consolidating test cases

Refactor Vault redeem tests to simplify logic by removing unused vari…

e2bb9e0

…ables and consolidating test cases

fix buyback fixture

c7ce0f2

Refactor Reborner contract and tests to use USDC instead of USDS, upd…

f9fbe28

…ate mint and redeem amounts for consistency

Refactor compoundingStakingSSVStrategyFixture to simplify default str…

377f32e

…ategy setting

Refactor Convex strategy tests to use USDC instead of USDS and simpli…

33c7e9a

…fy asset handling

Refactor MockVaultCoreInstantRebase constructor to accept backing ass…

e336f3e

…et address, update test fixtures to use USDC instead of USDS, and simplify Dripper and VaultValueChecker tests by removing unused variables and consolidating logic.

clement-ux and others added 9 commits January 7, 2026 11:11

refactor: mark isSupportedAsset function as deprecated

d6e5f7d

Merge branch 'master' into clement/simplify-ousd

cf0d427

Merge branch 'master' into clement/simplify-ousd

d936abd

Merge remote-tracking branch 'origin/master' into clement/simplify-ousd

7a6b95d

Removed Beacon consolidation fork tests

198b7f5

Add OETH vault upgrade deployment script with governance proposal

0bdbc08

pandadefi reviewed Jan 8, 2026

View reviewed changes

clement-ux and others added 8 commits January 8, 2026 12:37

Remove deprecated redeem tests from OETH vault and bridge helper test…

115655b

… files

lint

f9a9420

Add vault upgrade deployment script and skip deprecated tests in brid…

8211332

…ge helper

prettier

60a2127

Add deployment script for OSonic vault upgrade with governance actions

536b0ac

Refactor OETH and OSonic VaultAdmin contracts to inherit from VaultAdmin

8b073b8

New gov prop of deploy script 163

e9ee43c

Merge remote-tracking branch 'origin/master' into nicka/deploy-163-re…

777b43b

…deem-fee

pandadefi reviewed Jan 12, 2026

View reviewed changes

clement-ux and others added 6 commits January 12, 2026 15:01

Simplify withdrawal amount calculations in VaultCore contract

a9f3295

Merge branch 'master' into clement/simplify-ousd

a306e08

fix bug

8d40e03

Merge remote-tracking branch 'origin/master' into nicka/deploy-163-re…

15b5534

…deem-fee

Removed commented out IOracle lines from Harvester

71f9057

naddison36 previously approved these changes Jan 13, 2026

View reviewed changes

naddison36 added 2 commits January 13, 2026 12:16

Merge remote-tracking branch 'origin/nicka/deploy-163-redeem-fee' int…

33a0b74

…o clement/simplify-ousd

Changed the OUSD default strategy to the Morpho OUSD v2 strategy

81f1ed2

naddison36 dismissed their stale review via 81f1ed2 January 13, 2026 01:20

naddison36 reviewed Jan 13, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[Vault] Simplify VaultCore. #2714

[Vault] Simplify VaultCore. #2714

Uh oh!

clement-ux commented Dec 9, 2025 •

edited

Loading

Uh oh!

pandadefi Jan 8, 2026 •

edited

Loading

Uh oh!

naddison36 Jan 13, 2026

Uh oh!

pandadefi Jan 12, 2026

Uh oh!

naddison36 Jan 13, 2026

Uh oh!

naddison36 left a comment

Uh oh!

Uh oh!

naddison36 Jan 13, 2026

Uh oh!

naddison36 Jan 13, 2026

Uh oh!

naddison36 Jan 13, 2026

Uh oh!

naddison36 Jan 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

[Vault] Simplify VaultCore. #2714

Are you sure you want to change the base?

[Vault] Simplify VaultCore. #2714

Uh oh!

Conversation

clement-ux commented Dec 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Vault Interface Refactoring

Removal of Price Provider Logic

Asset and Strategy Handling Updates

Deprecation and Cleanup

Constructor and Initialization Updates

Code Change Checklist

Deploy checklist

Uh oh!

pandadefi Jan 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

naddison36 Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

pandadefi Jan 12, 2026

Choose a reason for hiding this comment

Uh oh!

naddison36 Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

naddison36 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

naddison36 Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

naddison36 Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

naddison36 Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

naddison36 Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

clement-ux commented Dec 9, 2025 •

edited

Loading

pandadefi Jan 8, 2026 •

edited

Loading