add support for mnenomic offset

EspressoSystems · Jul 11, 2024 · 3deae0e · 3deae0e
1 parent fe05b8d
commit 3deae0e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/contracts/script/README.md b/contracts/script/README.md
@@ -197,8 +197,8 @@ forge script contracts/script/LightClient.s.sol:DeployLightClientContractScript
 To Upgrade
 
 ```bash
-forge script contracts/script/UpgradeLightClient.s.sol:UpgradeLightClientScript $admin $mostRecentlyDeployedProxy \
---sig 'run(address, address)' \
+forge script contracts/script/UpgradeLightClient.s.sol:UpgradeLightClientScript $offset $mostRecentlyDeployedProxy \
+--sig 'run(uint32, address)' \
 --ffi \
 --rpc-url https://ethereum-sepolia.publicnode.com \
 --broadcast --legacy

diff --git a/contracts/script/UpgradeLightClient.s.sol b/contracts/script/UpgradeLightClient.s.sol
@@ -11,9 +11,12 @@ contract UpgradeLightClientScript is Script {
     /// @param mostRecentlyDeployedProxy address of deployed proxy
     /// @return address of the proxy
     /// TODO get the most recent deployment from the devops tooling
-    function run(address mostRecentlyDeployedProxy) external returns (address) {
+    function run(uint32 seedPhraseOffset, address mostRecentlyDeployedProxy)
+        external
+        returns (address)
+    {
         string memory seedPhrase = vm.envString("MNEMONIC");
-        (address admin,) = deriveRememberKey(seedPhrase, 0);
+        (address admin,) = deriveRememberKey(seedPhrase, seedPhraseOffset);
         vm.startBroadcast(admin);
         address proxy = upgradeLightClient(mostRecentlyDeployedProxy, address(new LCV2()));
         return proxy;

diff --git a/contracts/test/LightClientUpgrade.t.sol b/contracts/test/LightClientUpgrade.t.sol
@@ -46,7 +46,7 @@ contract LightClientUpgradeTest is Test {
         // Upgrade LightClient and check that the genesis state is not changed and that the new
         // field
         // of the upgraded contract is set to 0
-        lcV2Proxy = LCV2(upgrader.run(proxy));
+        lcV2Proxy = LCV2(upgrader.run(0, proxy));
 
         assertEq(lcV2Proxy.newField(), 0);
         assertEq(lcV2Proxy.blocksPerEpoch(), 10);
@@ -75,7 +75,7 @@ contract LightClientUpgradeTest is Test {
         assertEq(patch, 0);
 
         //upgrade box
-        lcV2Proxy = LCV2(upgrader.run(proxy));
+        lcV2Proxy = LCV2(upgrader.run(0, proxy));
         assertEq(address(lcV2Proxy), address(lcV1Proxy));
         (uint8 majorV2, uint8 minorV2, uint8 patchV2) = lcV2Proxy.getVersion();
         assertEq(majorV2, 2);
@@ -89,6 +89,6 @@ contract LightClientUpgradeTest is Test {
         //attempted upgrade as attacker will revert
         vm.prank(attacker);
         vm.expectRevert();
-        lcV2Proxy = LCV2(upgrader.run(address(proxy)));
+        lcV2Proxy = LCV2(upgrader.run(0, address(proxy)));
     }
 }