[Vault] Simplify VaultCore. #2714

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

Description

This pull request makes substantial changes to the IVault interface and related contracts, primarily to simplify asset and strategy management, remove unused or deprecated functionality, and update how price oracles are referenced. The changes affect core vault logic, mock contracts, strategies, and event emissions. The most important changes are grouped by theme below.

Vault Interface Simplification and Refactoring

Removed numerous functions and events from IVault, including asset-specific strategy management, swapper/oracle slippage controls, and price provider references, to streamline the interface. This includes the removal of priceProvider, setPriceProvider, swap-related functions, and asset-specific strategy functions. [1] [2] [3] [4] [5] [6] [7]
Added or renamed functions and events to centralize strategy management, such as setDefaultStrategy, defaultStrategy, and DefaultStrategyUpdated. [1] [2]
Changed the vault initialization function to take only a single address (the backing asset), and added backingAsset() as a public view function.
Moved weth() to the end of the interface and ensured it is still accessible.

Oracle and Price Provider Handling

Removed direct references to the price provider/oracle from the vault and strategies, instead passing the oracle address explicitly where needed (e.g., in BridgedWOETHStrategy and mocks). [1] [2] [3] [4] [5] [6] [7] [8]
Updated mocks and strategies to use the new oracle reference pattern, removing reliance on IVault.priceProvider(). [1] [2] [3] [4] [5] [6]

Asset and Strategy Management

Replaced per-asset strategy management with a single default strategy, and removed functions/events related to asset-level strategies and configuration. [1] [2] [3]
Updated mock vaults and admin contracts to use backingAsset instead of asset arrays or indices, and simplified asset support logic. [1] [2] [3] [4] [5]

Miscellaneous Updates

Updated test and mock contracts to align with the new mint/redeem logic and asset handling.
Removed the now-empty OETHVault contract.

These changes significantly modernize and simplify the vault and strategy interfaces, improve clarity, and reduce unused code, paving the way for easier maintenance and future upgrades.

These changes help reduce contract complexity, remove unused features, and prepare the codebase for future upgrades.

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.

…ltInitializer, and VaultStorage

sparrowDom

Posting intermittent review comments

sparrowDom · 2025-12-29T10:59:11Z

contracts/contracts/harvest/AbstractHarvester.sol

-            _swap(rewardTokens[i], _rewardTo, priceProvider);
+            // This harvester contract is not used anymore. Keeping the code
+            // for passing test deployment. Safe to use address(0x1) as oracle.
+            _swap(rewardTokens[i], _rewardTo, IOracle(address(0x1)));


Have we decided to keep the functionality to allow for the protocol to swap the reward token? Afaik we handle most of the reward tokens via a multisig contract these days.

I guess the question is why do we still need this _doSwap implementation?

AbstractHarvester is not used anymore, but in order to keep the PR simple I didn't deleted the file.
I agree this is something we shouldn't keep _doSwap and preferably remove AbstractHarvester contract.

contracts/contracts/interfaces/IVault.sol

sparrowDom · 2025-12-29T11:07:34Z

contracts/contracts/interfaces/IVault.sol

-
    function totalValue() external view returns (uint256 value);

    function checkBalance(address _asset) external view returns (uint256);


Can't comment on an item 1 line below. Are we keeping the calculateRedeemOutputs for backward compatibility?

I think so yes. However it could lighten the code if we can remove it, and I'm in favor of it.
I created this doc where I'm not sure if we should/could get rid of some part of the code: https://www.notion.so/originprotocol/Can-we-get-rid-of-it-2c484d46f53c8024a9eec3b6260ef8f4?source=copy_link

contracts/contracts/interfaces/IVault.sol

sparrowDom · 2025-12-29T12:48:16Z

contracts/contracts/interfaces/IVault.sol

-
-    function netOusdMintedForStrategy() external view returns (int256);
-
    function setDripper(address _dripper) external;


I think we can remove these 2 dripper functions as well

Only setDripper can be removed, dripper is used in OETHBaseHarvester.
Changed in this commit: b61e10e

sparrowDom · 2025-12-29T13:17:50Z

contracts/contracts/vault/VaultAdmin.sol

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


What is the reason that assets and amounts remain arrays?

I created this doc where I'm not sure if we should/could get rid of some part of the code: https://www.notion.so/originprotocol/Can-we-get-rid-of-it-2c484d46f53c8024a9eec3b6260ef8f4?source=copy_link. But I'm in favor of simplification here.

sparrowDom · 2025-12-29T13:41:45Z

contracts/contracts/vault/OETHVaultCore.sol

-    using StableMath for uint256;
-
-    address public immutable weth;
-    uint256 public wethAssetIndex;


We should deprecate this to not mess up the storage slot order.

No need for weth as this is an immutable.
Really really nice catch for wethAssetIndex!! Fixed in this commit: 39bbbfb.

sparrowDom · 2025-12-29T13:44:14Z

contracts/contracts/vault/OSonicVaultAdmin.sol

 * @title Origin Sonic VaultAdmin contract on Sonic
 * @author Origin Protocol Inc
 */
 contract OSonicVaultAdmin is OETHVaultAdmin {


do we need this contract?

I'm not sure I get it.
OSonicVaultAdmin is deployed at this address and still used in prod, so I would say yes.

sparrowDom · 2025-12-29T13:44:57Z

contracts/contracts/vault/OUSDVaultAdmin.sol

+ * @title OUSD VaultAdmin Contract
+ * @author Origin Protocol Inc
+ */
+contract OUSDVaultAdmin is VaultAdmin {


is there a reason we have a separate OUSDVaultAdmin contract?

Yes, to have a clear distinction between what is a commun basis VaultAdmin and VaultCore, and what is product itself, like OUSDVaultAdmin, OETHVaultAdmin. This is to avoid unclear naming, like in the current situation, VaultCore represent OUSD vault, while OETH vault is named OETHVault.

To enforce this, I marked VaultCore and VaultAdmin as abstract.

contracts/contracts/vault/OUSDVaultCore.sol

…e contract

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 added 19 commits December 17, 2025 12:01

Add OUSDVaultAdmin contract and deployment script for OUSD Vault upgrade

c5796c2

fix vault fork test

1db6636

prettier

5c75d06

fix more fork tests

d8ca994

lint

5c5af35

fix more tests

510b8ad

fix sonic fork test

d99f2e2

lint + prettier

3560f0d

skip plume test

a6709b6

fix sonic fork test

8613c72

fix sonic fork test

8f28790

remove .only

2238a92

remove old fix

10e9644

fix decimal conversion

cd7b9bd

refactor: change contracts to abstract for VaultAdmin, VaultCore, Vau…

db1c4bf

…ltInitializer, and VaultStorage

fix test

e4d7c73

WIP add async withdraw test for OUSD

94b81f5

Add lot of test for async withdraw

e72adab

adjust comment

38a00fa

clement-ux marked this pull request as ready for review December 19, 2025 10:56

clement-ux requested review from naddison36, shahthepro and sparrowDom as code owners December 19, 2025 10:56

sparrowDom reviewed Dec 29, 2025

View reviewed changes

clement-ux added 6 commits January 2, 2026 12:21

refactor: remove setDripper function from IVault interface

b61e10e

fix: update redeem function to use correct amount parameter

09131ae

feat: add deprecated weth asset index to OETHVaultCore contract

39bbbfb

Merge branch 'master' into clement/simplify-ousd

1b40aca

increase ousd vault upgrade number

ebe97cd

fix: add slither disable comment for constable-states in OETHVaultCor…

94d39ed

…e contract


		function totalValue() external view returns (uint256 value);

		function checkBalance(address _asset) external view returns (uint256);


		function netOusdMintedForStrategy() external view returns (int256);

		function setDripper(address _dripper) external;

[Vault] Simplify VaultCore. #2714

Are you sure you want to change the base?

[Vault] Simplify VaultCore. #2714

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 Simplification and Refactoring

Oracle and Price Provider Handling

Asset and Strategy Management

Miscellaneous Updates

Code Change Checklist

Deploy checklist

Uh oh!

sparrowDom left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

clement-ux commented Dec 9, 2025 •

edited

Loading