[Vault] Simplify VaultCore.

contracts/README.md

@@ -125,11 +125,10 @@ You can enable the "hot deploy" mode when doing fork testing development. The mo
 To enable Hot Deploys set the HOT_DEPLOY variable in the contracts/.env file. Enable various modes using comma separated flags to direct which contracts need source updated (in the node runtime):
 
 - strategy -> strategy contract associated to fixture
-- vaultCore -> vaultCore or oethVaultCore depending on the nature of the fixture
-- vaultAdmin -> vaultAdmin or oethVaultAdmin depending on the nature of the fixture
+- vault -> OUSDVault or OETHVault depending on the nature of the fixture
 - harvester -> harvester or oethHarvester (not yet supported)
 
-example: HOT_DEPLOY=strategy,vaultCore,vaultAdmin,harvester
+example: HOT_DEPLOY=strategy,vault,harvester
 
 #### Supporting new fixtures / contracts
 

contracts/contracts/harvest/AbstractHarvester.sol

@@ -198,7 +198,6 @@ abstract contract AbstractHarvester is Governable {
 
         // Revert if feed does not exist
         // slither-disable-next-line unused-return
-        IOracle(IVault(vaultAddress).priceProvider()).price(_tokenAddress);
 
         IERC20 token = IERC20(_tokenAddress);
         // if changing token swap provider cancel existing allowance
@@ -443,10 +442,11 @@ abstract contract AbstractHarvester is Governable {
         _harvest(_strategyAddr);
         IStrategy strategy = IStrategy(_strategyAddr);
         address[] memory rewardTokens = strategy.getRewardTokenAddresses();
-        IOracle priceProvider = IOracle(IVault(vaultAddress).priceProvider());
         uint256 len = rewardTokens.length;
         for (uint256 i = 0; i < len; ++i) {
-            _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)));
         }
     }
 

contracts/contracts/interfaces/IVault.sol

@@ -6,39 +6,28 @@ import { VaultStorage } from "../vault/VaultStorage.sol";
 interface IVault {
     // slither-disable-start constable-states
 
-    event AssetSupported(address _asset);
-    event AssetDefaultStrategyUpdated(address _asset, address _strategy);
     event AssetAllocated(address _asset, address _strategy, uint256 _amount);
     event StrategyApproved(address _addr);
     event StrategyRemoved(address _addr);
     event Mint(address _addr, uint256 _value);
     event Redeem(address _addr, uint256 _value);
     event CapitalPaused();
     event CapitalUnpaused();
+    event DefaultStrategyUpdated(address _strategy);
     event RebasePaused();
     event RebaseUnpaused();
     event VaultBufferUpdated(uint256 _vaultBuffer);
-    event RedeemFeeUpdated(uint256 _redeemFeeBps);
-    event PriceProviderUpdated(address _priceProvider);
     event AllocateThresholdUpdated(uint256 _threshold);
     event RebaseThresholdUpdated(uint256 _threshold);
     event StrategistUpdated(address _address);
     event MaxSupplyDiffChanged(uint256 maxSupplyDiff);
     event YieldDistribution(address _to, uint256 _yield, uint256 _fee);
     event TrusteeFeeBpsChanged(uint256 _basis);
     event TrusteeAddressChanged(address _address);
-    event SwapperChanged(address _address);
-    event SwapAllowedUndervalueChanged(uint256 _basis);
-    event SwapSlippageChanged(address _asset, uint256 _basis);
-    event Swapped(
-        address indexed _fromAsset,
-        address indexed _toAsset,
-        uint256 _fromAssetAmount,
-        uint256 _toAssetAmount
-    );
     event StrategyAddedToMintWhitelist(address indexed strategy);
     event StrategyRemovedFromMintWhitelist(address indexed strategy);
-    event DripperChanged(address indexed _dripper);
+    event RebasePerSecondMaxChanged(uint256 rebaseRatePerSecond);
+    event DripDurationChanged(uint256 dripDuration);
     event WithdrawalRequested(
         address indexed _withdrawer,
         uint256 indexed _requestId,
@@ -51,6 +40,7 @@ interface IVault {
         uint256 _amount
     );
     event WithdrawalClaimable(uint256 _claimable, uint256 _newClaimable);
+    event WithdrawalClaimDelayUpdated(uint256 _newDelay);
 
     // Governable.sol
     function transferGovernance(address _newGovernor) external;
@@ -59,17 +49,7 @@ interface IVault {
 
     function governor() external view returns (address);
 
-    function ADMIN_IMPLEMENTATION() external view returns (address);
-
     // VaultAdmin.sol
-    function setPriceProvider(address _priceProvider) external;
-
-    function priceProvider() external view returns (address);
-
-    function setRedeemFeeBps(uint256 _redeemFeeBps) external;
-
-    function redeemFeeBps() external view returns (uint256);
-
     function setVaultBuffer(uint256 _vaultBuffer) external;
 
     function vaultBuffer() external view returns (uint256);
@@ -98,28 +78,13 @@ interface IVault {
 
     function trusteeFeeBps() external view returns (uint256);
 
-    function ousdMetaStrategy() external view returns (address);
-
-    function setSwapper(address _swapperAddr) external;
-
-    function setSwapAllowedUndervalue(uint16 _percentageBps) external;
-
-    function setOracleSlippage(address _asset, uint16 _allowedOracleSlippageBps)
-        external;
-
-    function supportAsset(address _asset, uint8 _unitConversion) external;
-
     function approveStrategy(address _addr) external;
 
     function removeStrategy(address _addr) external;
 
-    function setAssetDefaultStrategy(address _asset, address _strategy)
-        external;
+    function setDefaultStrategy(address _strategy) external;
 
-    function assetDefaultStrategies(address _asset)
-        external
-        view
-        returns (address);
+    function defaultStrategy() external view returns (address);
 
     function pauseRebase() external;
 
@@ -135,10 +100,6 @@ interface IVault {
 
     function transferToken(address _asset, uint256 _amount) external;
 
-    function priceUnitMint(address asset) external view returns (uint256);
-
-    function priceUnitRedeem(address asset) external view returns (uint256);
-
     function withdrawAllFromStrategy(address _strategyAddr) external;
 
     function withdrawAllFromStrategies() external;
@@ -172,67 +133,38 @@ interface IVault {
 
     function rebase() external;
 
-    function swapCollateral(
-        address fromAsset,
-        address toAsset,
-        uint256 fromAssetAmount,
-        uint256 minToAssetAmount,
-        bytes calldata data
-    ) external returns (uint256 toAssetAmount);
-
     function totalValue() external view returns (uint256 value);
 
     function checkBalance(address _asset) external view returns (uint256);
 
+    /// @notice Deprecated: use calculateRedeemOutput
     function calculateRedeemOutputs(uint256 _amount)
         external
         view
         returns (uint256[] memory);
 
-    function getAssetCount() external view returns (uint256);
-
-    function getAssetConfig(address _asset)
+    function calculateRedeemOutput(uint256 _amount)
         external
         view
-        returns (VaultStorage.Asset memory config);
+        returns (uint256);
+
+    function getAssetCount() external view returns (uint256);
 
     function getAllAssets() external view returns (address[] memory);
 
     function getStrategyCount() external view returns (uint256);
 
-    function swapper() external view returns (address);
-
-    function allowedSwapUndervalue() external view returns (uint256);
-
     function getAllStrategies() external view returns (address[] memory);
 
+    /// @notice Deprecated.
     function isSupportedAsset(address _asset) external view returns (bool);
 
-    function netOusdMintForStrategyThreshold() external view returns (uint256);
-
-    function setOusdMetaStrategy(address _ousdMetaStrategy) external;
-
-    function setNetOusdMintForStrategyThreshold(uint256 _threshold) external;
-
-    function netOusdMintedForStrategy() external view returns (int256);
-
-    function setDripper(address _dripper) external;
-
     function dripper() external view returns (address);
 
-    function weth() external view returns (address);
-
-    function cacheWETHAssetIndex() external;
-
-    function wethAssetIndex() external view returns (uint256);
+    function asset() external view returns (address);
 
-    function initialize(address, address) external;
+    function initialize(address) external;
 
-    function setAdminImpl(address) external;
-
-    function removeAsset(address _asset) external;
-
-    // These are OETH specific functions
     function addWithdrawalQueueLiquidity() external;
 
     function requestWithdrawal(uint256 _amount)
@@ -257,7 +189,6 @@ interface IVault {
         view
         returns (VaultStorage.WithdrawalRequest memory);
 
-    // OETHb specific functions
     function addStrategyToMintWhitelist(address strategyAddr) external;
 
     function removeStrategyFromMintWhitelist(address strategyAddr) external;
@@ -285,5 +216,7 @@ interface IVault {
 
     function previewYield() external view returns (uint256 yield);
 
+    function weth() external view returns (address);
+
     // slither-disable-end constable-states
 }

contracts/contracts/mocks/MockEvilReentrantContract.sol

@@ -19,6 +19,7 @@ contract MockEvilReentrantContract {
     IVault public immutable oethVault;
     address public immutable poolAddress;
     bytes32 public immutable balancerPoolId;
+    address public immutable priceProvider;
 
     constructor(
         address _balancerVault,
@@ -37,7 +38,6 @@ contract MockEvilReentrantContract {
     }
 
     function doEvilStuff() public {
-        address priceProvider = oethVault.priceProvider();
         uint256 rethPrice = IOracle(priceProvider).price(address(reth));
 
         // 1. Join pool
@@ -99,9 +99,6 @@ contract MockEvilReentrantContract {
         virtual
         returns (uint256 bptExpected)
     {
-        // Get the oracle from the OETH Vault
-        address priceProvider = oethVault.priceProvider();
-
         for (uint256 i = 0; i < _assets.length; ++i) {
             uint256 strategyAssetMarketPrice = IOracle(priceProvider).price(
                 _assets[i]

contracts/contracts/mocks/MockNonRebasing.sol

@@ -47,7 +47,7 @@ contract MockNonRebasing {
     }
 
     function redeemOusd(address _vaultContract, uint256 _amount) public {
-        IVault(_vaultContract).redeem(_amount, 0);
+        IVault(_vaultContract).requestWithdrawal(_amount);
     }
 
     function approveFor(

contracts/contracts/mocks/MockOETHVault.sol

@@ -1,25 +1,18 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import { OETHVaultCore } from "../vault/OETHVaultCore.sol";
+import { OETHVault } from "../vault/OETHVault.sol";
 import { StableMath } from "../utils/StableMath.sol";
 import "../utils/Helpers.sol";
 
-contract MockOETHVault is OETHVaultCore {
+contract MockOETHVault is OETHVault {
     using StableMath for uint256;
 
-    constructor(address _weth) OETHVaultCore(_weth) {
+    constructor(address _weth) OETHVault(_weth) {
         _setGovernor(msg.sender);
     }
 
     function supportAsset(address asset) external {
-        assets[asset] = Asset({
-            isSupported: true,
-            unitConversion: UnitConversion(0),
-            decimals: 18,
-            allowedOracleSlippageBps: 0
-        });
-
-        allAssets.push(asset);
+        require(asset == asset, "Only asset supported");
     }
 }

contracts/contracts/mocks/MockOETHVaultAdmin.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import { OETHVaultAdmin } from "../vault/OETHVaultAdmin.sol";
+import { OETHVault } from "../vault/OETHVault.sol";
 
-contract MockOETHVaultAdmin is OETHVaultAdmin {
-    constructor(address _weth) OETHVaultAdmin(_weth) {}
+contract MockOETHVault is OETHVault {
+    constructor(address _weth) OETHVault(_weth) {}
 
     // fetches the WETH amount in outstanding withdrawals
     function outstandingWithdrawalsAmount()
@@ -19,6 +19,6 @@ contract MockOETHVaultAdmin is OETHVaultAdmin {
     }
 
     function wethAvailable() external view returns (uint256) {
-        return _wethAvailable();
+        return _assetAvailable();
     }
 }

contracts/contracts/mocks/MockRebornMinter.sol

@@ -97,8 +97,8 @@ contract Reborner {
         log("We are attempting to mint..");
         address asset = sanctum.asset();
         address vault = sanctum.vault();
-        IERC20(asset).approve(vault, 1e18);
-        IVault(vault).mint(asset, 1e18, 0);
+        IERC20(asset).approve(vault, 1e6);
+        IVault(vault).mint(asset, 1e6, 0);
         log("We are now minting..");
     }
 

contracts/contracts/mocks/MockVault.sol

@@ -1,16 +1,17 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import { VaultCore } from "../vault/VaultCore.sol";
+import { VaultAdmin } from "../vault/VaultAdmin.sol";
 import { StableMath } from "../utils/StableMath.sol";
-import { VaultInitializer } from "../vault/VaultInitializer.sol";
 import "../utils/Helpers.sol";
 
-contract MockVault is VaultCore {
+contract MockVault is VaultAdmin {
     using StableMath for uint256;
 
     uint256 storedTotalValue;
 
+    constructor(address _asset) VaultAdmin(_asset) {}
+
     function setTotalValue(uint256 _value) public {
         storedTotalValue = _value;
     }
@@ -31,15 +32,11 @@ contract MockVault is VaultCore {
     {
         // Avoids rounding errors by returning the total value
         // in a single currency
-        if (allAssets[0] == _asset) {
+        if (asset == _asset) {
             uint256 decimals = Helpers.getDecimals(_asset);
             return storedTotalValue.scaleBy(decimals, 18);
         } else {
             return 0;
         }
     }
-
-    function setMaxSupplyDiff(uint256 _maxSupplyDiff) external onlyGovernor {
-        maxSupplyDiff = _maxSupplyDiff;
-    }
 }

contracts/contracts/mocks/MockVaultCoreInstantRebase.sol

@@ -4,6 +4,8 @@ pragma solidity ^0.8.0;
 import { VaultCore } from "../vault/VaultCore.sol";
 
 contract MockVaultCoreInstantRebase is VaultCore {
+    constructor(address _asset) VaultCore(_asset) {}
+
     function _nextYield(uint256 supply, uint256 vaultValue)
         internal
         view