[Vault] Simplify VaultCore.

contracts/contracts/harvest/AbstractHarvester.sol

@@ -198,7 +198,7 @@ abstract contract AbstractHarvester is Governable {
 
         // Revert if feed does not exist
         // slither-disable-next-line unused-return
-        IOracle(IVault(vaultAddress).priceProvider()).price(_tokenAddress);
+        // IOracle(IVault(vaultAddress).priceProvider()).price(_tokenAddress);
 
         IERC20 token = IERC20(_tokenAddress);
         // if changing token swap provider cancel existing allowance
@@ -443,10 +443,12 @@ abstract contract AbstractHarvester is Governable {
         _harvest(_strategyAddr);
         IStrategy strategy = IStrategy(_strategyAddr);
         address[] memory rewardTokens = strategy.getRewardTokenAddresses();
-        IOracle priceProvider = IOracle(IVault(vaultAddress).priceProvider());
+        //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,29 @@ 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 +41,7 @@ interface IVault {
         uint256 _amount
     );
     event WithdrawalClaimable(uint256 _claimable, uint256 _newClaimable);
+    event WithdrawalClaimDelayUpdated(uint256 _newDelay);
 
     // Governable.sol
     function transferGovernance(address _newGovernor) external;
@@ -62,10 +53,6 @@ interface IVault {
     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);
@@ -98,28 +85,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 +107,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,14 +140,6 @@ 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);
@@ -191,48 +151,24 @@ interface IVault {
 
     function getAssetCount() external view returns (uint256);
 
-    function getAssetConfig(address _asset)
-        external
-        view
-        returns (VaultStorage.Asset memory config);
-
     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);
 
     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 backingAsset() 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 +193,6 @@ interface IVault {
         view
         returns (VaultStorage.WithdrawalRequest memory);
 
-    // OETHb specific functions
     function addStrategyToMintWhitelist(address strategyAddr) external;
 
     function removeStrategyFromMintWhitelist(address strategyAddr) external;
@@ -285,5 +220,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/MockOETHVault.sol

@@ -13,13 +13,6 @@ contract MockOETHVault is OETHVaultCore {
     }
 
     function supportAsset(address asset) external {
-        assets[asset] = Asset({
-            isSupported: true,
-            unitConversion: UnitConversion(0),
-            decimals: 18,
-            allowedOracleSlippageBps: 0
-        });
-
-        allAssets.push(asset);
+        require(asset == backingAsset, "Only backingAsset supported");
     }
 }

contracts/contracts/mocks/MockOETHVaultAdmin.sol

@@ -19,6 +19,6 @@ contract MockOETHVaultAdmin is OETHVaultAdmin {
     }
 
     function wethAvailable() external view returns (uint256) {
-        return _wethAvailable();
+        return _backingAssetAvailable();
     }
 }

contracts/contracts/mocks/MockRebornMinter.sol

@@ -97,15 +97,15 @@ 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..");
     }
 
     function redeem() public {
         log("We are attempting to redeem..");
         address vault = sanctum.vault();
-        IVault(vault).redeem(1e18, 1e18);
+        IVault(vault).redeem(1e18, 0);
         log("We are now redeeming..");
     }
 

contracts/contracts/mocks/MockVault.sol

@@ -3,14 +3,15 @@ pragma solidity ^0.8.0;
 
 import { VaultCore } from "../vault/VaultCore.sol";
 import { StableMath } from "../utils/StableMath.sol";
-import { VaultInitializer } from "../vault/VaultInitializer.sol";
 import "../utils/Helpers.sol";
 
 contract MockVault is VaultCore {
     using StableMath for uint256;
 
     uint256 storedTotalValue;
 
+    constructor(address _backingAsset) VaultCore(_backingAsset) {}
+
     function setTotalValue(uint256 _value) public {
         storedTotalValue = _value;
     }
@@ -31,7 +32,7 @@ contract MockVault is VaultCore {
     {
         // Avoids rounding errors by returning the total value
         // in a single currency
-        if (allAssets[0] == _asset) {
+        if (backingAsset == _asset) {
             uint256 decimals = Helpers.getDecimals(_asset);
             return storedTotalValue.scaleBy(decimals, 18);
         } else {

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 _backingAsset) VaultCore(_backingAsset) {}
+
     function _nextYield(uint256 supply, uint256 vaultValue)
         internal
         view

contracts/contracts/strategies/BridgedWOETHStrategy.sol

@@ -21,6 +21,7 @@ contract BridgedWOETHStrategy is InitializableAbstractStrategy {
     IWETH9 public immutable weth;
     IERC20 public immutable bridgedWOETH;
     IERC20 public immutable oethb;
+    IOracle public immutable oracle;
 
     uint256 public constant MAX_PRICE_STALENESS = 2 days;
 
@@ -31,11 +32,13 @@ contract BridgedWOETHStrategy is InitializableAbstractStrategy {
         BaseStrategyConfig memory _stratConfig,
         address _weth,
         address _bridgedWOETH,
-        address _oethb
+        address _oethb,
+        address _oracle
     ) InitializableAbstractStrategy(_stratConfig) {
         weth = IWETH9(_weth);
         bridgedWOETH = IERC20(_bridgedWOETH);
         oethb = IERC20(_oethb);
+        oracle = IOracle(_oracle);
     }
 
     function initialize(uint128 _maxPriceDiffBps)
@@ -100,8 +103,7 @@ contract BridgedWOETHStrategy is InitializableAbstractStrategy {
      */
     function _updateWOETHOraclePrice() internal returns (uint256) {
         // WETH price per unit of bridged wOETH
-        uint256 oraclePrice = IOracle(IVault(vaultAddress).priceProvider())
-            .price(address(bridgedWOETH));
+        uint256 oraclePrice = oracle.price(address(bridgedWOETH));
 
         // 1 wOETH > 1 WETH, always
         require(oraclePrice > 1 ether, "Invalid wOETH value");