[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 <[email protected]>

Author: clement-ux

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/interfaces/IVault.sol

@@ -49,8 +49,6 @@ interface IVault {
 
     function governor() external view returns (address);
 
-    function ADMIN_IMPLEMENTATION() external view returns (address);
-
     // VaultAdmin.sol
     function setVaultBuffer(uint256 _vaultBuffer) external;
 
@@ -167,8 +165,6 @@ interface IVault {
 
     function initialize(address) external;
 
-    function setAdminImpl(address) external;
-
     function addWithdrawalQueueLiquidity() external;
 
     function requestWithdrawal(uint256 _amount)

contracts/contracts/mocks/MockOETHVault.sol

@@ -1,14 +1,14 @@
 // 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);
     }
 

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()

contracts/contracts/mocks/MockVault.sol

@@ -1,16 +1,16 @@
 // 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 "../utils/Helpers.sol";
 
-contract MockVault is VaultCore {
+contract MockVault is VaultAdmin {
     using StableMath for uint256;
 
     uint256 storedTotalValue;
 
-    constructor(address _asset) VaultCore(_asset) {}
+    constructor(address _asset) VaultAdmin(_asset) {}
 
     function setTotalValue(uint256 _value) public {
         storedTotalValue = _value;
@@ -39,8 +39,4 @@ contract MockVault is VaultCore {
             return 0;
         }
     }
-
-    function setMaxSupplyDiff(uint256 _maxSupplyDiff) external onlyGovernor {
-        maxSupplyDiff = _maxSupplyDiff;
-    }
 }

…s/contracts/vault/OETHBaseVaultAdmin.sol …tracts/contracts/vault/OETHBaseVault.solcontracts/contracts/vault/OETHBaseVaultAdmin.sol renamed to contracts/contracts/vault/OETHBaseVault.sol contracts/contracts/vault/OETHBaseVaultAdmin.sol renamed to contracts/contracts/vault/OETHBaseVault.sol

@@ -7,6 +7,6 @@ import { VaultAdmin } from "./VaultAdmin.sol";
  * @title OETH Base VaultAdmin Contract
  * @author Origin Protocol Inc
  */
-contract OETHBaseVaultAdmin is VaultAdmin {
+contract OETHBaseVault is VaultAdmin {
     constructor(address _weth) VaultAdmin(_weth) {}
 }

contracts/contracts/vault/OETHBaseVaultCore.sol

@@ -1,16 +1,16 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import { VaultCore } from "./VaultCore.sol";
+import { VaultAdmin } from "./VaultAdmin.sol";
 
 /**
- * @title OETH Plume VaultCore Contract
+ * @title OETH Plume VaultAdmin Contract
  * @author Origin Protocol Inc
  */
-contract OETHPlumeVaultCore is VaultCore {
-    constructor(address _weth) VaultCore(_weth) {}
+contract OETHPlumeVault is VaultAdmin {
+    constructor(address _weth) VaultAdmin(_weth) {}
 
-    // @inheritdoc VaultCore
+    // @inheritdoc VaultAdmin
     function _mint(
         address,
         uint256 _amount,

…s/contracts/vault/OETHPlumeVaultCore.sol …racts/contracts/vault/OETHPlumeVault.solcontracts/contracts/vault/OETHPlumeVaultCore.sol renamed to contracts/contracts/vault/OETHPlumeVault.sol contracts/contracts/vault/OETHPlumeVaultCore.sol renamed to contracts/contracts/vault/OETHPlumeVault.sol

@@ -7,6 +7,6 @@ import { VaultAdmin } from "./VaultAdmin.sol";
  * @title OETH VaultAdmin Contract
  * @author Origin Protocol Inc
  */
-contract OETHVaultAdmin is VaultAdmin {
+contract OETHVault is VaultAdmin {
     constructor(address _weth) VaultAdmin(_weth) {}
 }