fix: compile

Layr-Labs · Oct 17, 2024 · 861b7c8 · 861b7c8
1 parent 153d625
commit 861b7c8
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 19 deletions.
diff --git a/script/deploy/holesky/Preprod_Upgrade_bEIGEN_and_EIGEN.s.sol b/script/deploy/holesky/Preprod_Upgrade_bEIGEN_and_EIGEN.s.sol
@@ -61,11 +61,11 @@ contract Preprod_Upgrade_bEIGEN_and_EIGEN is Script, Test {
         // Perform upgrade
         vm.startBroadcast();
         EIGEN_ProxyAdmin.upgrade(
-                TransparentUpgradeableProxy(payable(address(bEIGEN_proxy))),
+                ITransparentUpgradeableProxy(payable(address(bEIGEN_proxy))),
                 address(bEIGEN_implementation)
             );
         EIGEN_ProxyAdmin.upgrade(
-                TransparentUpgradeableProxy(payable(address(EIGEN_proxy))),
+                ITransparentUpgradeableProxy(payable(address(EIGEN_proxy))),
                 address(EIGEN_implementation)
             );
         vm.stopBroadcast();
@@ -77,11 +77,11 @@ contract Preprod_Upgrade_bEIGEN_and_EIGEN is Script, Test {
 
     function checkUpgradeCorrectness() public {
         cheats.startPrank(address(proxyAdminOwner));
-        require(EIGEN_ProxyAdmin.getProxyImplementation(TransparentUpgradeableProxy(payable(address(EIGEN_proxy)))) == address(EIGEN_implementation),
+        require(EIGEN_ProxyAdmin.getProxyImplementation(ITransparentUpgradeableProxy(payable(address(EIGEN_proxy)))) == address(EIGEN_implementation),
             "implementation set incorrectly");
         require(EIGEN_proxy.bEIGEN() == bEIGEN_addressBefore,
             "bEIGEN address changed unexpectedly");
-        require(EIGEN_ProxyAdmin.getProxyImplementation(TransparentUpgradeableProxy(payable(address(bEIGEN_proxy)))) == address(bEIGEN_implementation),
+        require(EIGEN_ProxyAdmin.getProxyImplementation(ITransparentUpgradeableProxy(payable(address(bEIGEN_proxy)))) == address(bEIGEN_implementation),
             "implementation set incorrectly");
         require(bEIGEN_proxy.EIGEN() == EIGEN_addressBefore,
             "EIGEN address changed unexpectedly");

diff --git a/script/deploy/holesky/bEIGEN_and_EIGEN_upgrade.s.sol b/script/deploy/holesky/bEIGEN_and_EIGEN_upgrade.s.sol
@@ -70,18 +70,18 @@ contract bEIGEN_and_EIGEN_upgrade is Script, Test {
     function simulatePerformingUpgrade() public {
         cheats.startPrank(opsMultisig);
         // Upgrade contracts
-        token_ProxyAdmin.upgrade(TransparentUpgradeableProxy(payable(address(EIGEN_proxy))), address(EIGEN_implementation));
-        token_ProxyAdmin.upgrade(TransparentUpgradeableProxy(payable(address(bEIGEN_proxy))), address(bEIGEN_implementation));
+        token_ProxyAdmin.upgrade(ITransparentUpgradeableProxy(payable(address(EIGEN_proxy))), address(EIGEN_implementation));
+        token_ProxyAdmin.upgrade(ITransparentUpgradeableProxy(payable(address(bEIGEN_proxy))), address(bEIGEN_implementation));
         cheats.stopPrank();
     }
 
     function checkUpgradeCorrectness() public {
         vm.startPrank(opsMultisig);
-        require(token_ProxyAdmin.getProxyImplementation(TransparentUpgradeableProxy(payable(address(EIGEN_proxy)))) == address(EIGEN_implementation),
+        require(token_ProxyAdmin.getProxyImplementation(ITransparentUpgradeableProxy(payable(address(EIGEN_proxy)))) == address(EIGEN_implementation),
             "implementation set incorrectly");
         require(EIGEN_proxy.bEIGEN() == bEIGEN_addressBefore,
             "bEIGEN address changed unexpectedly");
-        require(token_ProxyAdmin.getProxyImplementation(TransparentUpgradeableProxy(payable(address(bEIGEN_proxy)))) == address(bEIGEN_implementation),
+        require(token_ProxyAdmin.getProxyImplementation(ITransparentUpgradeableProxy(payable(address(bEIGEN_proxy)))) == address(bEIGEN_implementation),
             "implementation set incorrectly");
         require(bEIGEN_proxy.EIGEN() == EIGEN_addressBefore,
             "EIGEN address changed unexpectedly");

diff --git a/script/deploy/mainnet/EIGEN_upgrade.s.sol b/script/deploy/mainnet/EIGEN_upgrade.s.sol
@@ -97,7 +97,7 @@ contract EIGEN_upgrade is Script, Test {
 
     function checkUpgradeCorrectness() public {
         vm.prank(address(EIGEN_TimelockController));
-        require(EIGEN_ProxyAdmin.getProxyImplementation(TransparentUpgradeableProxy(payable(address(EIGEN_proxy)))) == address(EIGEN_implementation),
+        require(EIGEN_ProxyAdmin.getProxyImplementation(ITransparentUpgradeableProxy(payable(address(EIGEN_proxy)))) == address(EIGEN_implementation),
             "implementation set incorrectly");
         require(EIGEN_proxy.bEIGEN() == bEIGEN_addressBefore,
             "bEIGEN address changed unexpectedly");

diff --git a/script/deploy/mainnet/bEIGEN_upgrade.s.sol b/script/deploy/mainnet/bEIGEN_upgrade.s.sol
@@ -96,7 +96,7 @@ contract bEIGEN_upgrade is Script, Test {
 
     function checkUpgradeCorrectness() public {
         vm.prank(address(bEIGEN_TimelockController));
-        require(bEIGEN_ProxyAdmin.getProxyImplementation(TransparentUpgradeableProxy(payable(address(bEIGEN_proxy)))) == address(bEIGEN_implementation),
+        require(bEIGEN_ProxyAdmin.getProxyImplementation(ITransparentUpgradeableProxy(payable(address(bEIGEN_proxy)))) == address(bEIGEN_implementation),
             "implementation set incorrectly");
         require(bEIGEN_proxy.EIGEN() == EIGEN_addressBefore,
             "EIGEN address changed unexpectedly");

diff --git a/src/contracts/interfaces/IStrategyManager.sol b/src/contracts/interfaces/IStrategyManager.sol
@@ -188,17 +188,11 @@ interface IStrategyManager {
      * @notice Returns bool for whether or not `strategy` enables credit transfers. i.e enabling
      * depositIntoStrategyWithSignature calls or queueing withdrawals to a different address than the staker.
      */
-<<<<<<< HEAD
     function thirdPartyTransfersForbidden(IStrategy strategy) external view returns (bool);
 
     /**
      * @notice Getter function for the current EIP-712 domain separator for this contract.
      * @dev The domain separator will change in the event of a fork that changes the ChainID.
      */
     function domainSeparator() external view returns (bytes32);
-=======
-    function thirdPartyTransfersForbidden(
-        IStrategy strategy
-    ) external view returns (bool);
->>>>>>> db2ccda5 (feat: storage report (#753))
 }
diff --git a/src/test/token/EigenTransferRestrictions.t.sol b/src/test/token/EigenTransferRestrictions.t.sol
@@ -3,9 +3,9 @@ pragma solidity ^0.8.27;
 
 import "forge-std/Test.sol";
 
-import "@openzeppelin-v4.9.0/contracts/proxy/transparent/ProxyAdmin.sol";
-import "@openzeppelin-v4.9.0/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
-import "@openzeppelin-v4.9.0/contracts/token/ERC20/presets/ERC20PresetFixedSupply.sol";
+import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
+import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
+import "@openzeppelin/contracts/token/ERC20/presets/ERC20PresetFixedSupply.sol";
 import "../harnesses/EigenHarness.sol";
 
 contract EigenTransferRestrictionsTest is Test {