Skip to content

[yAudit-9] Remove Unused immutable. #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
naddison36 merged 1 commit into from
Dec 1, 2025
Merged

[yAudit-9] Remove Unused immutable. #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions script/deploy/mainnet/011_DeployEtherFiARMScript.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
3 changes: 1 addition & 2 deletions script/deploy/mainnet/012_UpgradeEtherFiARMScript.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
6 changes: 1 addition & 5 deletions src/contracts/EtherFiARM.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
}
Expand Down
1 change: 0 additions & 1 deletion src/contracts/utils/Addresses.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
11 changes: 1 addition & 10 deletions test/fork/EtherFiARM/shared/Shared.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand All @@ -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.
Expand Down
Loading