Updates

yieldnest · Oct 17, 2024 · 883e344 · 883e344
1 parent 6f725e2
commit 883e344
Show file tree

Hide file tree

Showing 19 changed files with 492 additions and 656 deletions.
diff --git a/script/Contracts.sol b/script/Contracts.sol
@@ -1,6 +1,14 @@
 // SPDX-License-Identifier: BSD-3-Clause
 pragma solidity ^0.8.24;
 
+contract MainnetContracts {
+    address public constant WETH = 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2;
+    address public constant STETH = 0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84;
+    address public constant METH = 0xd5F7838F5C461fefF7FE49ea5ebaF7728bB0ADfa;
+    address public constant OETH = 0x856c4Efb76C1D1AE02e20CEB03A2A6a08b0b8dC3;
+    address public constant RETH = 0xae78736Cd615f374D3085123A210448E74Fc6393;
+}
+
 contract ChapelContracts {
     address public constant ACTORS = 0xbA02225f0fdB684c80ad1e829FC31f048c416Ce6;
     address public constant VAULT_FACTORY = 0x964C6d4050e052D627b8234CAD9CdF0981E40EB3;

diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol
diff --git a/src/Common.sol b/src/Common.sol
@@ -5,27 +5,27 @@ import {AccessControlUpgradeable} from
     "lib/openzeppelin-contracts-upgradeable/contracts/access/AccessControlUpgradeable.sol";
 import {Address} from "lib/openzeppelin-contracts/contracts/utils/Address.sol";
 import {ERC20} from "lib/openzeppelin-contracts/contracts/token/ERC20/ERC20.sol";
-import {ERC4626Upgradeable} from
-    "lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/extensions/ERC4626Upgradeable.sol";
-import {ERC20PermitUpgradeable} from "lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/extensions/ERC20PermitUpgradeable.sol";
+import {ERC20PermitUpgradeable} from
+    "lib/openzeppelin-contracts-upgradeable/contracts/token/ERC20/extensions/ERC20PermitUpgradeable.sol";
+import {ETHRateProvider} from "src/module/ETHRateProvider.sol";
 import {IAccessControl} from "lib/openzeppelin-contracts/contracts/access/IAccessControl.sol";
 import {IERC20} from "lib/openzeppelin-contracts/contracts/interfaces/IERC20.sol";
-import {IERC4626} from "lib/openzeppelin-contracts/contracts/interfaces/IERC4626.sol";
-import {IERC20Permit} from "lib/openzeppelin-contract/contracts/interfaces/IERC20Permit.sol";
+import {IERC20Metadata} from "lib/openzeppelin-contracts/contracts/interfaces/IERC20Metadata.sol";
+import {IERC20Permit} from "lib/openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Permit.sol";
 import {IStakeManager} from "lib/synclub-contracts/contracts/interfaces/IStakeManager.sol";
+import {IRateProvider} from "src/interface/IRateProvider.sol";
+import {IVault} from "src/interface/IVault.sol";
 import {Math} from "lib/openzeppelin-contracts/contracts/utils/math/Math.sol";
 import {ProxyAdmin} from "lib/openzeppelin-contracts/contracts/proxy/transparent/ProxyAdmin.sol";
 import {ReentrancyGuardUpgradeable} from
     "lib/openzeppelin-contracts-upgradeable/contracts/utils/ReentrancyGuardUpgradeable.sol";
 import {SafeERC20} from "lib/openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
-import {StorageSlot} from "lib/openzeppelin-contracts/contracts/utils/StorageSlot.sol";
 import {TimelockController} from "lib/openzeppelin-contracts/contracts/governance/TimelockController.sol";
 import {TimelockControllerUpgradeable} from
     "lib/openzeppelin-contracts-upgradeable/contracts/governance/TimelockControllerUpgradeable.sol";
 import {TransparentUpgradeableProxy} from
     "lib/openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 
 import {Storage} from "src/Storage.sol";
-import {Module} from "src/Module.sol";
 
 contract Common {}
diff --git a/src/ETHRateProvider.sol b/src/ETHRateProvider.sol
@@ -0,0 +1 @@
+
diff --git a/src/Module.sol b/src/Module.sol
diff --git a/src/Storage.sol b/src/Storage.sol
@@ -1,18 +1,16 @@
 // SPDX-License-Identifier: BSD-3-Clause
 pragma solidity ^0.8.24;
 
-import {IVault} from "src/Common.sol";
+import {IVault} from "src/interface/IVault.sol";
 
 library Storage {
-
     bytes32 private constant VAULT_STORAGE_POSITION = keccak256("yieldnest.storage.vault");
     bytes32 private constant ASSET_STORAGE_POSITION = keccak256("yieldnest.storage.asset");
     bytes32 private constant STRAT_STORAGE_POSITION = keccak256("yieldnest.storage.strat");
-
-    bytes32 private constant ERC20_STORAGE_POSITION = keccak256(
-        abi.encode(uint256(keccak256("openzeppelin.storage.ERC20")) - 1)
-    ) & ~bytes32(uint256(0xff)); 
-
+
+    bytes32 private constant ERC20_STORAGE_POSITION =
+        keccak256(abi.encode(uint256(keccak256("openzeppelin.storage.ERC20")) - 1)) & ~bytes32(uint256(0xff));
+
     function _getVaultStorage() internal pure returns (IVault.VaultStorage storage $) {
         assembly {
             $.slot := VAULT_STORAGE_POSITION
@@ -25,7 +23,7 @@ library Storage {
         }
     }
 
-    function _getStrategyStorage() internal pure returns (StrategyStorage storage $) {
+    function _getStrategyStorage() internal pure returns (IVault.StrategyStorage storage $) {
         assembly {
             $.slot := STRAT_STORAGE_POSITION
         }
@@ -36,4 +34,4 @@ library Storage {
             $.slot := ERC20_STORAGE_POSITION
         }
     }
-}
+}