get tests passing

Layr-Labs · Nov 14, 2024 · 3254767 · 3254767
1 parent e881b02
commit 3254767
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/lib/zeus-templates b/lib/zeus-templates
diff --git a/script/releases/EigenLabsUpgrade.s.sol b/script/releases/EigenLabsUpgrade.s.sol
@@ -37,7 +37,7 @@ library EigenLabsUpgrade {
     function _proxyAdmin(
         ZeusScript self
     ) internal view returns (address) {
-        return self.zAddress("ProxyAdmin");
+        return self.zDeployedContract("ProxyAdmin");
     }
 
     function _eigenPodManagerProxy(
@@ -61,18 +61,18 @@ library EigenLabsUpgrade {
     function _multiSendCallOnly(
         ZeusScript self
     ) internal view returns (address) {
-        return self.zAddress("MultiSendCallOnly");
+        return self.zAddress("multiSendCallOnly");
     }
 
     function _timelock(
         ZeusScript self
     ) internal view returns (address) {
-        return self.zAddress("Timelock");
+        return self.zAddress("timelock");
     }
 
     function _executorMultisig(
         ZeusScript self
     ) internal view returns (address) {
-        return self.zAddress("ExecutorMultisig");
+        return self.zAddress("executorMultisig");
     }
 }
diff --git a/script/releases/v0.1.0-rewardsv2/1-eoa.s.sol b/script/releases/v0.1.0-rewardsv2/1-eoa.s.sol
@@ -17,8 +17,8 @@ contract Deploy is EOADeployer {
 
         address newRewardsCoordinator = address(
             new RewardsCoordinator(
-                IDelegationManager(zDeployedContract("DelegationManager")),
-                StrategyManager(zDeployedContract("StrategyManager")),
+                IDelegationManager(zDeployedContract("DelegationManager_Proxy")),
+                StrategyManager(zDeployedContract("StrategyManager_Proxy")),
                 zUint32("REWARDS_COORDINATOR_CALCULATION_INTERVAL_SECONDS"),
                 zUint32("REWARDS_COORDINATOR_MAX_REWARDS_DURATION"),
                 zUint32("REWARDS_COORDINATOR_MAX_RETROACTIVE_LENGTH"),
@@ -35,5 +35,6 @@ contract Deploy is EOADeployer {
 
     function zeusTest() public override {
         // TODO: write zeus test.
+        _deploy();
     }
 }
diff --git a/script/releases/v0.1.0-rewardsv2/2-multisig.s.sol b/script/releases/v0.1.0-rewardsv2/2-multisig.s.sol
@@ -25,14 +25,14 @@ contract Queue is MultisigBuilder {
             to: this._proxyAdmin(),
             data: abi.encodeWithSelector(
                 ProxyAdmin.upgradeAndCall.selector,
-                zDeployedContract("REWARDS_COORDINATOR_PROXY"),
-                zDeployedContract("REWARDS_COORDINATOR_IMPLEMENTATION"),
+                zDeployedContract("RewardsCoordinator_Proxy"),
+                zDeployedContract("RewardsCoordinator_Impl"),
                 abi.encodeWithSelector(
                     RewardsCoordinator.initialize.selector,
                     this._executorMultisig(),
                     this._pauserRegistry(),
                     zUint64("REWARDS_COORDINATOR_INIT_PAUSED_STATUS"),
-                    zDeployedContract("REWARDS_COORDINATOR_UPDATER"),
+                    zAddress("REWARDS_COORDINATOR_UPDATER"),
                     zUint64("REWARDS_COORDINATOR_ACTIVATION_DELAY"),
                     rewardsCoordinatorSplitBips
                 )
@@ -67,5 +67,6 @@ contract Queue is MultisigBuilder {
 
     function zeusTest() virtual public override {
         // TODO: write zeus test.
+        _execute();
     }
 }
diff --git a/script/releases/v0.1.0-rewardsv2/3-multisig.s.sol b/script/releases/v0.1.0-rewardsv2/3-multisig.s.sol
@@ -32,5 +32,6 @@ contract Execute is Queue {
 
     function zeusTest() public override {
         // TODO: write zeus test.
+        _execute();
     }
 }
diff --git a/script/releases/v0.1.0-rewardsv2/upgrade.json b/script/releases/v0.1.0-rewardsv2/upgrade.json
@@ -1,5 +1,5 @@
 {
     "name": "rewards-v2",
     "from": "^0.0.1",
-    "to": "0.1.0"
+    "to": "0.0.1"
 }