From 8c5de60b39936456d056b19433fa660286c1df9e Mon Sep 17 00:00:00 2001 From: "clandestine.eth" <96172957+0xClandestine@users.noreply.github.com> Date: Wed, 7 Aug 2024 12:38:45 -0400 Subject: [PATCH] fix: compile warnings --- .../holesky/Deploy_Preprod_RewardsCoordinator.s.sol | 2 +- .../holesky/Deploy_Test_RewardsCoordinator.s.sol | 2 +- script/deploy/holesky/M2_Deploy_From_Scratch.s.sol | 2 +- script/deploy/holesky/M2_Deploy_Preprod.s.sol | 2 +- script/deploy/mainnet/M2_Mainnet_Upgrade.s.sol | 4 ++-- script/deploy/mainnet/v0.3.0-mainnet-rewards.s.sol | 2 +- script/utils/ExistingDeploymentParser.sol | 3 ++- src/contracts/core/RewardsCoordinator.sol | 4 +++- src/contracts/strategies/StrategyBase.sol | 7 ++----- src/test/integration/IntegrationDeployer.t.sol | 10 +++++++--- src/test/integration/tests/Upgrade_Setup.t.sol | 8 ++++---- src/test/unit/AVSDirectoryUnit.t.sol | 4 ++++ src/test/unit/DelegationUnit.t.sol | 2 +- src/test/unit/RewardsCoordinatorUnit.t.sol | 4 ++-- 14 files changed, 32 insertions(+), 24 deletions(-) diff --git a/script/deploy/holesky/Deploy_Preprod_RewardsCoordinator.s.sol b/script/deploy/holesky/Deploy_Preprod_RewardsCoordinator.s.sol index fa077f934..c395c2f5f 100644 --- a/script/deploy/holesky/Deploy_Preprod_RewardsCoordinator.s.sol +++ b/script/deploy/holesky/Deploy_Preprod_RewardsCoordinator.s.sol @@ -45,7 +45,7 @@ contract Deploy_Preprod_RewardsCoordinator is Deploy_Test_RewardsCoordinator { // Sanity Checks _verifyContractPointers(); _verifyImplementations(); - _verifyContractsInitialized(); + _verifyContractsInitialized(true); _verifyInitializationParams(); logAndOutputContractAddresses("script/output/holesky/Deploy_RewardsCoordinator_Preprod.holesky.config.json"); diff --git a/script/deploy/holesky/Deploy_Test_RewardsCoordinator.s.sol b/script/deploy/holesky/Deploy_Test_RewardsCoordinator.s.sol index 480123d70..11bb5f61c 100644 --- a/script/deploy/holesky/Deploy_Test_RewardsCoordinator.s.sol +++ b/script/deploy/holesky/Deploy_Test_RewardsCoordinator.s.sol @@ -32,7 +32,7 @@ contract Deploy_Test_RewardsCoordinator is ExistingDeploymentParser { // Sanity Checks _verifyContractPointers(); _verifyImplementations(); - _verifyContractsInitialized(); + _verifyContractsInitialized(true); _verifyInitializationParams(); logAndOutputContractAddresses("script/output/holesky/Deploy_RewardsCoordinator.holesky.config.json"); diff --git a/script/deploy/holesky/M2_Deploy_From_Scratch.s.sol b/script/deploy/holesky/M2_Deploy_From_Scratch.s.sol index 1e7e371ea..c495cf650 100644 --- a/script/deploy/holesky/M2_Deploy_From_Scratch.s.sol +++ b/script/deploy/holesky/M2_Deploy_From_Scratch.s.sol @@ -26,7 +26,7 @@ contract M2_Deploy_Holesky_From_Scratch is ExistingDeploymentParser { // Sanity Checks _verifyContractPointers(); _verifyImplementations(); - _verifyContractsInitialized(); + _verifyContractsInitialized(true); _verifyInitializationParams(); logAndOutputContractAddresses("script/output/holesky/M2_deploy_from_scratch.holesky.config.json"); diff --git a/script/deploy/holesky/M2_Deploy_Preprod.s.sol b/script/deploy/holesky/M2_Deploy_Preprod.s.sol index 8dde5dde7..f5c0562f9 100644 --- a/script/deploy/holesky/M2_Deploy_Preprod.s.sol +++ b/script/deploy/holesky/M2_Deploy_Preprod.s.sol @@ -42,7 +42,7 @@ contract M2_Deploy_Holesky_Preprod is M2_Deploy_Holesky_From_Scratch { // Sanity Checks _verifyContractPointers(); _verifyImplementations(); - _verifyContractsInitialized(); + _verifyContractsInitialized(true); _verifyInitializationParams(); // override to check contract.owner() is EOAowner instead logAndOutputContractAddresses("script/output/holesky/M2_deploy_preprod.holesky.config.json"); diff --git a/script/deploy/mainnet/M2_Mainnet_Upgrade.s.sol b/script/deploy/mainnet/M2_Mainnet_Upgrade.s.sol index c69bbe108..dbd5eec4d 100644 --- a/script/deploy/mainnet/M2_Mainnet_Upgrade.s.sol +++ b/script/deploy/mainnet/M2_Mainnet_Upgrade.s.sol @@ -34,7 +34,7 @@ contract M2_Mainnet_Upgrade is ExistingDeploymentParser { // Sanity Checks _verifyContractPointers(); _verifyImplementations(); - _verifyContractsInitialized(); + _verifyContractsInitialized(true); _verifyInitializationParams(); logAndOutputContractAddresses("script/output/mainnet/M2_mainnet_upgrade.output.json"); @@ -278,7 +278,7 @@ contract Queue_M2_Upgrade is M2_Mainnet_Upgrade, TimelockEncoding { // Check correctness after upgrade _verifyContractPointers(); _verifyImplementations(); - _verifyContractsInitialized(); + _verifyContractsInitialized(true); _verifyInitializationParams(); _postUpgradeChecks(); } diff --git a/script/deploy/mainnet/v0.3.0-mainnet-rewards.s.sol b/script/deploy/mainnet/v0.3.0-mainnet-rewards.s.sol index 1fe59bed4..947402fa9 100644 --- a/script/deploy/mainnet/v0.3.0-mainnet-rewards.s.sol +++ b/script/deploy/mainnet/v0.3.0-mainnet-rewards.s.sol @@ -36,7 +36,7 @@ contract MainnetRewardsCoordinatorDeploy is ExistingDeploymentParser { // Sanity Checks _verifyContractPointers(); _verifyImplementations(); - _verifyContractsInitialized(); + _verifyContractsInitialized(true); _verifyInitializationParams(); logAndOutputContractAddresses("script/output/mainnet/v0.3.0-mainnet-rewards.output.json"); diff --git a/script/utils/ExistingDeploymentParser.sol b/script/utils/ExistingDeploymentParser.sol index 23f24557b..c06bebaa7 100644 --- a/script/utils/ExistingDeploymentParser.sol +++ b/script/utils/ExistingDeploymentParser.sol @@ -439,8 +439,9 @@ contract ExistingDeploymentParser is Script, Test { /** * @notice Verify initialization of Transparent Upgradeable Proxies. Also check * initialization params if this is the first deployment. + * @dev isInitialDeployment True if this is the first deployment of contracts from scratch */ - function _verifyContractsInitialized() internal virtual { + function _verifyContractsInitialized(bool /** isInitialDeployment **/) internal virtual { // AVSDirectory vm.expectRevert(bytes("Initializable: contract is already initialized")); avsDirectory.initialize(address(0), eigenLayerPauserReg, AVS_DIRECTORY_INIT_PAUSED_STATUS); diff --git a/src/contracts/core/RewardsCoordinator.sol b/src/contracts/core/RewardsCoordinator.sol index d23330e0a..ff5d624df 100644 --- a/src/contracts/core/RewardsCoordinator.sol +++ b/src/contracts/core/RewardsCoordinator.sol @@ -540,7 +540,7 @@ contract RewardsCoordinator is /// @notice the commission for a specific operator for a specific avs /// NOTE: Currently unused and simply returns the globalOperatorCommissionBips value but will be used in future release - function operatorCommissionBips(address operator, address avs) external view returns (uint16) { + function operatorCommissionBips(address /** operator **/, address /** avs **/) external view returns (uint16) { return globalOperatorCommissionBips; } @@ -566,6 +566,8 @@ contract RewardsCoordinator is return root; } } + // Silence compiler warning. + return DistributionRoot(bytes32(0), 0, 0, false); } /// @notice loop through distribution roots from reverse and return hash diff --git a/src/contracts/strategies/StrategyBase.sol b/src/contracts/strategies/StrategyBase.sol index a4fab630a..616298a7f 100644 --- a/src/contracts/strategies/StrategyBase.sol +++ b/src/contracts/strategies/StrategyBase.sol @@ -183,19 +183,16 @@ contract StrategyBase is Initializable, Pausable, IStrategy { /** * @notice Called in the external `deposit` function, before any logic is executed. Expected to be overridden if strategies want such logic. * @param token The token being deposited - * @param amount The amount of `token` being deposited */ - function _beforeDeposit(IERC20 token, uint256 amount) internal virtual { + function _beforeDeposit(IERC20 token, uint256 /** amount **/) internal virtual { require(token == underlyingToken, "StrategyBase.deposit: Can only deposit underlyingToken"); } /** * @notice Called in the external `withdraw` function, before any logic is executed. Expected to be overridden if strategies want such logic. - * @param recipient The address that will receive the withdrawn tokens * @param token The token being withdrawn - * @param amountShares The amount of shares being withdrawn */ - function _beforeWithdrawal(address recipient, IERC20 token, uint256 amountShares) internal virtual { + function _beforeWithdrawal(address /** recipient **/, IERC20 token, uint256 /** amountShares **/) internal virtual { require(token == underlyingToken, "StrategyBase.withdraw: Can only withdraw the strategy token"); } diff --git a/src/test/integration/IntegrationDeployer.t.sol b/src/test/integration/IntegrationDeployer.t.sol index 8181a3ee7..1b7352745 100644 --- a/src/test/integration/IntegrationDeployer.t.sol +++ b/src/test/integration/IntegrationDeployer.t.sol @@ -699,17 +699,21 @@ abstract contract IntegrationDeployer is ExistingDeploymentParser { // ethPOSDeposit = new ETHPOSDepositMock(); // eigenPodImplementation = new EigenPod( // ethPOSDeposit, + // eigenPodImplementation.delayedWithdrawalRouter(), // eigenPodImplementation.eigenPodManager(), + // eigenPodImplementation.MAX_RESTAKED_BALANCE_GWEI_PER_VALIDATOR(), // 0 // ); - // // Create time machine and mock beacon chain + // // Create time machine and set block timestamp forward so we can create EigenPod proofs in the past // timeMachine = new TimeMachine(); - // beaconChain = new BeaconChainMock(eigenPodManager, GENESIS_TIME_MAINNET); + // beaconChainOracle = new BeaconChainOracleMock(); + // // Create mock beacon chain / proof gen interface + // beaconChain = new BeaconChainMock(timeMachine, beaconChainOracle, eigenPodManager); // cheats.startPrank(executorMultisig); // eigenPodBeacon.upgradeTo(address(eigenPodImplementation)); + // eigenPodManager.updateBeaconChainOracle(beaconChainOracle); // cheats.stopPrank(); - } else { revert("_deployOrFetchContracts: unimplemented forkType"); } diff --git a/src/test/integration/tests/Upgrade_Setup.t.sol b/src/test/integration/tests/Upgrade_Setup.t.sol index cbfb4eb45..fa7677633 100644 --- a/src/test/integration/tests/Upgrade_Setup.t.sol +++ b/src/test/integration/tests/Upgrade_Setup.t.sol @@ -18,7 +18,7 @@ contract IntegrationMainnetFork_UpgradeSetup is IntegrationCheckUtils { // // // 1. Check proper state pre-upgrade // // _verifyContractPointers(); // // _verifyImplementations(); - // // _verifyContractsInitialized({isInitialDeployment: true}); + // // _verifyContractsInitialized(true); // // _verifyInitializationParams(); // // 2. Upgrade mainnet contracts @@ -28,7 +28,7 @@ contract IntegrationMainnetFork_UpgradeSetup is IntegrationCheckUtils { // // 2. Verify upgrade setup // _verifyContractPointers(); // _verifyImplementations(); - // _verifyContractsInitialized({isInitialDeployment: true}); + // _verifyContractsInitialized(true); // _verifyInitializationParams(); // } @@ -45,7 +45,7 @@ contract IntegrationMainnetFork_UpgradeSetup is IntegrationCheckUtils { // // // 1. Check proper state pre-upgrade // // _verifyContractPointers(); // // _verifyImplementations(); - // // _verifyContractsInitialized({isInitialDeployment: true}); + // // _verifyContractsInitialized(true); // // _verifyInitializationParams(); // // 2. Upgrade holesky contracts @@ -55,7 +55,7 @@ contract IntegrationMainnetFork_UpgradeSetup is IntegrationCheckUtils { // // 3. Verify upgrade setup // _verifyContractPointers(); // _verifyImplementations(); - // _verifyContractsInitialized({isInitialDeployment: true}); + // _verifyContractsInitialized(true); // _verifyInitializationParams(); // } diff --git a/src/test/unit/AVSDirectoryUnit.t.sol b/src/test/unit/AVSDirectoryUnit.t.sol index 6fd70891f..667adc557 100644 --- a/src/test/unit/AVSDirectoryUnit.t.sol +++ b/src/test/unit/AVSDirectoryUnit.t.sol @@ -321,6 +321,10 @@ contract AVSDirectoryUnitTests_operatorAVSRegisterationStatus is AVSDirectoryUni assertFalse(delegationManager.isOperator(operator), "bad test setup"); _registerOperatorWithBaseDetails(operator); + // uint256 expiry = type(uint256).max; + // ISignatureUtils.SignatureWithSaltAndExpiry memory operatorSignature = + // _getOperatorSignature(delegationSignerPrivateKey, operator, defaultAVS, salt, expiry); + cheats.startPrank(operator); avsDirectory.cancelSalt(salt); diff --git a/src/test/unit/DelegationUnit.t.sol b/src/test/unit/DelegationUnit.t.sol index 79bf46daf..aa9312395 100644 --- a/src/test/unit/DelegationUnit.t.sol +++ b/src/test/unit/DelegationUnit.t.sol @@ -3167,7 +3167,7 @@ contract DelegationManagerUnitTests_completeQueuedWithdrawal is DelegationManage ( IDelegationManager.Withdrawal memory withdrawal, IERC20[] memory tokens, - // bytes32 withdrawalRoot + ) = _setUpCompleteQueuedWithdrawalBeaconStrat({ staker: defaultStaker, withdrawer: defaultStaker, diff --git a/src/test/unit/RewardsCoordinatorUnit.t.sol b/src/test/unit/RewardsCoordinatorUnit.t.sol index 0e3d32df2..c23498a82 100644 --- a/src/test/unit/RewardsCoordinatorUnit.t.sol +++ b/src/test/unit/RewardsCoordinatorUnit.t.sol @@ -1656,7 +1656,7 @@ contract RewardsCoordinatorUnitTests_processClaim is RewardsCoordinatorUnitTests function testFuzz_processClaim_Revert_WhenRootDisabled( bool setClaimerFor, address claimerFor, - bytes32 merkleRoot + bytes32 root ) public filterFuzzedAddressInputs(claimerFor) { // if setClaimerFor is true, set the earners claimer to the fuzzed address address claimer; @@ -1670,7 +1670,7 @@ contract RewardsCoordinatorUnitTests_processClaim is RewardsCoordinatorUnitTests // Submit a root and disable it cheats.startPrank(rewardsUpdater); - rewardsCoordinator.submitRoot(merkleRoot, 1); + rewardsCoordinator.submitRoot(root, 1); uint32 rootIndex = 0; IRewardsCoordinator.DistributionRoot memory distributionRoot = rewardsCoordinator.getDistributionRootAtIndex(rootIndex); rewardsCoordinator.disableRoot(rootIndex);