fix: rebase

Author: 0xrajath

script/releases/v1.10.0-rewards-v2.2/1-deployRewardsCoordinatorImpl.s.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.8.12;
 
 import {EOADeployer} from "zeus-templates/templates/EOADeployer.sol";
 import "../Env.sol";
+import "../TestUtils.sol";
 
 /**
  * @title DeployRewardsCoordinatorImpl
@@ -13,6 +14,7 @@ import "../Env.sol";
  */
 contract DeployRewardsCoordinatorImpl is EOADeployer {
     using Env for *;
+    using TestUtils for *;
 
     /// forgefmt: disable-next-item
     function _runAsEOA() internal override {
@@ -38,8 +40,7 @@ contract DeployRewardsCoordinatorImpl is EOADeployer {
                         MAX_REWARDS_DURATION: Env.MAX_REWARDS_DURATION(),
                         MAX_RETROACTIVE_LENGTH: Env.MAX_RETROACTIVE_LENGTH(),
                         MAX_FUTURE_LENGTH: 63072000, // 730 days (2 years)
-                        GENESIS_REWARDS_TIMESTAMP: Env.GENESIS_REWARDS_TIMESTAMP(),
-                        version: Env.deployVersion()
+                        GENESIS_REWARDS_TIMESTAMP: Env.GENESIS_REWARDS_TIMESTAMP()
                     })
                 )
             )
@@ -63,14 +64,13 @@ contract DeployRewardsCoordinatorImpl is EOADeployer {
         _validateProxyAdmin();
         _validateImplConstructor();
         _validateImplInitialized();
-        _validateVersion();
         _validateNewFunctionality();
         _validateStorageLayout();
     }
 
     /// @dev Validate that the new RewardsCoordinator impl address is distinct from the current one
     function _validateNewImplAddress() internal view {
-        address currentImpl = Env._getProxyImpl(address(Env.proxy.rewardsCoordinator()));
+        address currentImpl = TestUtils._getProxyImpl(address(Env.proxy.rewardsCoordinator()));
         address newImpl = address(Env.impl.rewardsCoordinator());
 
         assertFalse(currentImpl == newImpl, "RewardsCoordinator impl should be different from current implementation");
@@ -81,20 +81,15 @@ contract DeployRewardsCoordinatorImpl is EOADeployer {
         address pa = Env.proxyAdmin();
 
         assertTrue(
-            Env._getProxyAdmin(address(Env.proxy.rewardsCoordinator())) == pa, "RewardsCoordinator proxyAdmin incorrect"
+            TestUtils._getProxyAdmin(address(Env.proxy.rewardsCoordinator())) == pa, "RewardsCoordinator proxyAdmin incorrect"
         );
     }
 
     /// @dev Validate the immutables set in the new RewardsCoordinator implementation constructor
     function _validateImplConstructor() internal view {
         RewardsCoordinator rewardsCoordinatorImpl = Env.impl.rewardsCoordinator();
 
-        // Validate version
-        assertEq(
-            keccak256(bytes(rewardsCoordinatorImpl.version())),
-            keccak256(bytes(Env.deployVersion())),
-            "RewardsCoordinator impl version mismatch"
-        );
+        // Note: version() function has been removed in this upgrade
 
         // Validate core dependencies
         assertTrue(
@@ -152,14 +147,6 @@ contract DeployRewardsCoordinatorImpl is EOADeployer {
         );
     }
 
-    /// @dev Validate the version is correctly set
-    function _validateVersion() internal view {
-        assertEq(
-            keccak256(bytes(Env.impl.rewardsCoordinator().version())),
-            keccak256(bytes(Env.deployVersion())),
-            "RewardsCoordinator version should match deploy version"
-        );
-    }
 
     /// @dev Validate new Rewards v2.2 functionality
     function _validateNewFunctionality() internal view {

script/releases/v1.10.0-rewards-v2.2/2-queueRewardsCoordinatorUpgrade.s.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.8.12;
 
 import {DeployRewardsCoordinatorImpl} from "./1-deployRewardsCoordinatorImpl.s.sol";
 import "../Env.sol";
+import "../TestUtils.sol";
 
 import {MultisigBuilder} from "zeus-templates/templates/MultisigBuilder.sol";
 import {MultisigCall, Encode} from "zeus-templates/utils/Encode.sol";
@@ -20,6 +21,7 @@ import {TimelockController} from "@openzeppelin/contracts/governance/TimelockCon
 contract QueueRewardsCoordinatorUpgrade is MultisigBuilder, DeployRewardsCoordinatorImpl {
     using Env for *;
     using Encode for *;
+    using TestUtils for *;
 
     function _runAsMultisig() internal virtual override prank(Env.opsMultisig()) {
         if (!(Env.isSourceChain() && Env._strEq(Env.envVersion(), "1.9.0"))) {
@@ -103,7 +105,7 @@ contract QueueRewardsCoordinatorUpgrade is MultisigBuilder, DeployRewardsCoordin
         RewardsCoordinator rewardsCoordinator = Env.proxy.rewardsCoordinator();
 
         // Validate current implementation is different from new implementation
-        address currentImpl = Env._getProxyImpl(address(rewardsCoordinator));
+        address currentImpl = TestUtils._getProxyImpl(address(rewardsCoordinator));
         address newImpl = address(Env.impl.rewardsCoordinator());
         assertTrue(currentImpl != newImpl, "Current and new implementations should be different");
 

script/releases/v1.10.0-rewards-v2.2/3-executeRewardsCoordinatorUpgrade.s.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.12;
 
 import "../Env.sol";
+import "../TestUtils.sol";
 import {QueueRewardsCoordinatorUpgrade} from "./2-queueRewardsCoordinatorUpgrade.s.sol";
 import {Encode} from "zeus-templates/utils/Encode.sol";
 
@@ -16,6 +17,7 @@ import {Encode} from "zeus-templates/utils/Encode.sol";
 contract ExecuteRewardsCoordinatorUpgrade is QueueRewardsCoordinatorUpgrade {
     using Env for *;
     using Encode for *;
+    using TestUtils for *;
 
     function _runAsMultisig() internal override prank(Env.protocolCouncilMultisig()) {
         if (!(Env.isSourceChain() && Env._strEq(Env.envVersion(), "1.9.0"))) {
@@ -79,7 +81,7 @@ contract ExecuteRewardsCoordinatorUpgrade is QueueRewardsCoordinatorUpgrade {
 
     /// @dev Validate that the RewardsCoordinator proxy now points to the new implementation
     function _validateUpgradeComplete() internal view {
-        address currentImpl = Env._getProxyImpl(address(Env.proxy.rewardsCoordinator()));
+        address currentImpl = TestUtils._getProxyImpl(address(Env.proxy.rewardsCoordinator()));
         address expectedImpl = address(Env.impl.rewardsCoordinator());
 
         assertTrue(currentImpl == expectedImpl, "RewardsCoordinator proxy should point to new implementation");
@@ -89,12 +91,7 @@ contract ExecuteRewardsCoordinatorUpgrade is QueueRewardsCoordinatorUpgrade {
     function _validateProxyConstructor() internal view {
         RewardsCoordinator rewardsCoordinator = Env.proxy.rewardsCoordinator();
 
-        // Validate version
-        assertEq(
-            keccak256(bytes(rewardsCoordinator.version())),
-            keccak256(bytes(Env.deployVersion())),
-            "RewardsCoordinator version mismatch"
-        );
+        // Note: version() function has been removed in this upgrade
 
         // Validate core dependencies
         assertTrue(