From f53a07a388e2dce0b8b1e87826cc79badba71013 Mon Sep 17 00:00:00 2001 From: Benjamin Date: Tue, 10 Sep 2024 10:43:42 +0200 Subject: [PATCH] remove bad code --- .../script/DeployFWRHolesky.s.sol | 2 +- .../script/DeployPufferVaultV3.s.sol | 2 - mainnet-contracts/script/DeployerHelper.s.sol | 60 ------------------- 3 files changed, 1 insertion(+), 63 deletions(-) diff --git a/mainnet-contracts/script/DeployFWRHolesky.s.sol b/mainnet-contracts/script/DeployFWRHolesky.s.sol index 5bf358b..c8fe740 100644 --- a/mainnet-contracts/script/DeployFWRHolesky.s.sol +++ b/mainnet-contracts/script/DeployFWRHolesky.s.sol @@ -62,7 +62,7 @@ contract DeployFWRHolesky is DeployerHelper { IStETH(_getStETH()), IWETH(_getWETH()), ILidoWithdrawalQueue(_getLidoWithdrawalQueue()), - IStrategy(_getEigenLayerNativeETHStrategy()), + IStrategy(_getStETHStrategy()), IEigenLayer(_getEigenLayerStrategyManager()), IPufferOracle(_getPufferOracle()), IDelegationManager(_getEigenDelegationManager()) diff --git a/mainnet-contracts/script/DeployPufferVaultV3.s.sol b/mainnet-contracts/script/DeployPufferVaultV3.s.sol index 2e14f1c..0a4322c 100644 --- a/mainnet-contracts/script/DeployPufferVaultV3.s.sol +++ b/mainnet-contracts/script/DeployPufferVaultV3.s.sol @@ -13,8 +13,6 @@ import { IStrategy } from "src/interface/EigenLayer/IStrategy.sol"; import { IEigenLayer } from "src/interface/EigenLayer/IEigenLayer.sol"; import { IPufferOracle } from "src/interface/IPufferOracle.sol"; import { IDelegationManager } from "src/interface/EigenLayer/IDelegationManager.sol"; -import { UUPSUpgradeable } from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol"; -import { AccessManager } from "@openzeppelin/contracts/access/manager/AccessManager.sol"; /** * @title DeployPufferVaultV3 diff --git a/mainnet-contracts/script/DeployerHelper.s.sol b/mainnet-contracts/script/DeployerHelper.s.sol index 1b32b82..1fdf071 100644 --- a/mainnet-contracts/script/DeployerHelper.s.sol +++ b/mainnet-contracts/script/DeployerHelper.s.sol @@ -275,66 +275,6 @@ abstract contract DeployerHelper is Script { revert("lido withdrawal queue not available for this chain"); } - function _getStETH() internal view returns (address) { - if (block.chainid == mainnet) { - return 0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84; - } else if (block.chainid == holesky) { - return 0x3F1c547b21f65e10480dE3ad8E19fAAC46C95034; - } - - revert("stETH not available for this chain"); - } - - function _getEigenLayerNativeETHStrategy() internal view returns (address) { - if (block.chainid == mainnet) { - return 0x93c4b944D05dfe6df7645A86cd2206016c51564D; - } else if (block.chainid == holesky) { - return 0x7D704507b76571a51d9caE8AdDAbBFd0ba0e63d3; - } - - revert("beacon strategy not available for this chain"); - } - - function _getEigenLayerStrategyManager() internal view returns (address) { - if (block.chainid == mainnet) { - return 0x858646372CC42E1A627fcE94aa7A7033e7CF075A; - } else if (block.chainid == holesky) { - return 0xdfB5f6CE42aAA7830E94ECFCcAd411beF4d4D5b6; - } - - revert("strategy manager not available for this chain"); - } - - function _getPufferOracle() internal view returns (address) { - if (block.chainid == mainnet) { - return 0x0BE2aE0edbeBb517541DF217EF0074FC9a9e994f; - } else if (block.chainid == holesky) { - return 0x8e043ed3F06720615685D4978770Cd5C8fe90fe3; - } - - revert("puffer oracle not available for this chain"); - } - - function _getEigenDelegationManager() internal view returns (address) { - if (block.chainid == mainnet) { - return 0x39053D51B77DC0d36036Fc1fCc8Cb819df8Ef37A; - } else if (block.chainid == holesky) { - return 0xA44151489861Fe9e3055d95adC98FbD462B948e7; - } - - revert("eigen delegation manager not available for this chain"); - } - - function _getLidoWithdrawalQueue() internal view returns (address) { - if (block.chainid == mainnet) { - return 0x889edC2eDab5f40e902b864aD4d7AdE8E412F9B1; - } else if (block.chainid == holesky) { - return 0xc7cc160b58F8Bb0baC94b80847E2CF2800565C50; - } - - revert("lido withdrawal queue not available for this chain"); - } - function _getAccessManager() internal view returns (address) { if (block.chainid == base) { // https://basescan.org/address/0x6f62c8647b7cD3830F21BF0741BAD6f4b838Cb37