From e51dff6581fbe5296500d78c0c56b2f69cc15074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <clemmoller@gmail.com>
Date: Mon, 1 Dec 2025 11:41:01 +0100
Subject: [PATCH] Remove references to the Redemption Manager

---
 script/deploy/mainnet/011_DeployEtherFiARMScript.sol  |  3 +--
 script/deploy/mainnet/012_UpgradeEtherFiARMScript.sol |  3 +--
 src/contracts/EtherFiARM.sol                          |  6 +-----
 src/contracts/utils/Addresses.sol                     |  1 -
 test/fork/EtherFiARM/shared/Shared.sol                | 11 +----------
 5 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/script/deploy/mainnet/011_DeployEtherFiARMScript.sol b/script/deploy/mainnet/011_DeployEtherFiARMScript.sol
index 294391d4..38e0a81a 100644
--- a/script/deploy/mainnet/011_DeployEtherFiARMScript.sol
+++ b/script/deploy/mainnet/011_DeployEtherFiARMScript.sol
@@ -70,8 +70,7 @@ contract DeployEtherFiARMScript is AbstractDeployScript {
             claimDelay,
             1e7, // minSharesToRedeem
             1e18, // allocateThreshold
-            Mainnet.ETHERFI_WITHDRAWAL_NFT,
-            Mainnet.ETHERFI_REDEMPTION_MANAGER
+            Mainnet.ETHERFI_WITHDRAWAL_NFT
         );
         _recordDeploy("ETHER_FI_ARM_IMPL", address(etherFiARMImpl));
 
diff --git a/script/deploy/mainnet/012_UpgradeEtherFiARMScript.sol b/script/deploy/mainnet/012_UpgradeEtherFiARMScript.sol
index 5fa660f8..eb832819 100644
--- a/script/deploy/mainnet/012_UpgradeEtherFiARMScript.sol
+++ b/script/deploy/mainnet/012_UpgradeEtherFiARMScript.sol
@@ -39,8 +39,7 @@ contract UpgradeEtherFiARMScript is AbstractDeployScript {
             claimDelay,
             1e7, // minSharesToRedeem
             1e18, // allocateThreshold
-            Mainnet.ETHERFI_WITHDRAWAL_NFT,
-            Mainnet.ETHERFI_REDEMPTION_MANAGER
+            Mainnet.ETHERFI_WITHDRAWAL_NFT
         );
         _recordDeploy("ETHERFI_ARM_IMPL", address(etherFiARMImpl));
 
diff --git a/src/contracts/EtherFiARM.sol b/src/contracts/EtherFiARM.sol
index 737c0657..db4a326e 100644
--- a/src/contracts/EtherFiARM.sol
+++ b/src/contracts/EtherFiARM.sol
@@ -24,8 +24,6 @@ contract EtherFiARM is Initializable, AbstractARM, IERC721Receiver {
     IEETHWithdrawal public immutable etherfiWithdrawalQueue;
     /// @notice The address of the EtherFi Withdrawal NFT contract
     IEETHWithdrawalNFT public immutable etherfiWithdrawalNFT;
-    /// @notice The address of the EtherFi Redemption Manager contract
-    IEETHRedemptionManager public immutable etherfiRedemptionManager;
 
     /// @notice The amount of eETH in the EtherFi Withdrawal Queue
     uint256 public etherfiWithdrawalQueueAmount;
@@ -50,14 +48,12 @@ contract EtherFiARM is Initializable, AbstractARM, IERC721Receiver {
         uint256 _claimDelay,
         uint256 _minSharesToRedeem,
         int256 _allocateThreshold,
-        address _etherfiWithdrawalNFT,
-        address _etherfiRedemptionManager
+        address _etherfiWithdrawalNFT
     ) AbstractARM(_weth, _eeth, _weth, _claimDelay, _minSharesToRedeem, _allocateThreshold) {
         eeth = IERC20(_eeth);
         weth = IWETH(_weth);
         etherfiWithdrawalQueue = IEETHWithdrawal(_etherfiWithdrawalQueue);
         etherfiWithdrawalNFT = IEETHWithdrawalNFT(_etherfiWithdrawalNFT);
-        etherfiRedemptionManager = IEETHRedemptionManager(_etherfiRedemptionManager);
 
         _disableInitializers();
     }
diff --git a/src/contracts/utils/Addresses.sol b/src/contracts/utils/Addresses.sol
index 215e97df..4887b986 100644
--- a/src/contracts/utils/Addresses.sol
+++ b/src/contracts/utils/Addresses.sol
@@ -51,7 +51,6 @@ library Mainnet {
     address public constant ETHERFI_WITHDRAWAL = 0x308861A430be4cce5502d0A12724771Fc6DaF216;
     address public constant ETHERFI_LIQUIDITY_POOL = 0x308861A430be4cce5502d0A12724771Fc6DaF216;
     address public constant ETHERFI_WITHDRAWAL_NFT = 0x7d5706f6ef3F89B3951E23e557CDFBC3239D4E2c;
-    address public constant ETHERFI_REDEMPTION_MANAGER = 0xDadEf1fFBFeaAB4f68A9fD181395F68b4e4E7Ae0;
 
     // Morpho Market
     address public constant MORPHO_MARKET_MEVCAPITAL = 0x9a8bC3B04b7f3D87cfC09ba407dCED575f2d61D8;
diff --git a/test/fork/EtherFiARM/shared/Shared.sol b/test/fork/EtherFiARM/shared/Shared.sol
index a7742032..39246fa6 100644
--- a/test/fork/EtherFiARM/shared/Shared.sol
+++ b/test/fork/EtherFiARM/shared/Shared.sol
@@ -14,7 +14,6 @@ import {IERC20, IEETHWithdrawalNFT, IEETHRedemptionManager} from "contracts/Inte
 
 abstract contract Fork_Shared_Test is Base_Test_ {
     IEETHWithdrawalNFT public etherfiWithdrawalNFT;
-    IEETHRedemptionManager public etherfiRedemptionManager;
 
     //////////////////////////////////////////////////////
     /// --- SETUP
@@ -55,7 +54,6 @@ abstract contract Fork_Shared_Test is Base_Test_ {
         weth = IERC20(resolver.resolve("WETH"));
         weeth = IERC20(resolver.resolve("WEETH"));
         etherfiWithdrawalNFT = IEETHWithdrawalNFT(Mainnet.ETHERFI_WITHDRAWAL_NFT);
-        etherfiRedemptionManager = IEETHRedemptionManager(Mainnet.ETHERFI_REDEMPTION_MANAGER);
     }
 
     function _generateAddresses() internal {
@@ -78,14 +76,7 @@ abstract contract Fork_Shared_Test is Base_Test_ {
         // --- Deploy EtherFiARM implementation ---
         // Deploy EtherFiARM implementation.
         EtherFiARM etherfiImpl = new EtherFiARM(
-            address(eeth),
-            address(weth),
-            Mainnet.ETHERFI_WITHDRAWAL,
-            10 minutes,
-            0,
-            0,
-            Mainnet.ETHERFI_WITHDRAWAL_NFT,
-            Mainnet.ETHERFI_REDEMPTION_MANAGER
+            address(eeth), address(weth), Mainnet.ETHERFI_WITHDRAWAL, 10 minutes, 0, 0, Mainnet.ETHERFI_WITHDRAWAL_NFT
         );
 
         // Deployer will need WETH to initialize the ARM.