[mainnet] Prepare for Mainnet planned pause (#141)

* Update Makefile for ingesting signatures and private key via predefined CLI envvars * Update .env and scripts for tx simulation
base · Mar 19, 2024 · 779d79e · 779d79e
1 parent cb4d553
commit 779d79e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/mainnet/2024-03-05-pause-unpause-test/.env b/mainnet/2024-03-05-pause-unpause-test/.env
@@ -1,5 +1,5 @@
 OP_COMMIT=10b06fb49861053999a89533d846ee5c2ccb33e1
-BASE_CONTRACTS_COMMIT=fe492be3478134b2305c207a12b153eca04148c0
+BASE_CONTRACTS_COMMIT=56d8f40b48795663fa88366d762161af5a1ba5d5
 
 OPTIMISM_PORTAL_PROXY=0x49048044D57e1C92A77f79988d21Fa8fAF74E97e
 GUARDIAN=0x14536667Cd30e52C0b458BaACcB9faDA7046E056
diff --git a/mainnet/2024-03-05-pause-unpause-test/Makefile b/mainnet/2024-03-05-pause-unpause-test/Makefile
@@ -15,27 +15,27 @@ endif
 # Pause OptimismPortal Commands
 
 .PHONY: pause-portal-sign
-pause-portal-sign: deps
+pause-portal-sign:
 	$(GOPATH)/bin/eip712sign --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" -- \
 	forge script --rpc-url $(L1_RPC_URL) PausePortal --sig "sign()"
 
 .PHONY: pause-portal-run
-pause-portal-run: deps
-	forge script --rpc-url $(L1_RPC_URL) \
-	PausePortal --sig "run(bytes)" $(SIGNATURES) \
-	--ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" \
+pause-portal-run:
+	@forge script --rpc-url $(L1_RPC_URL) \
+	PausePortal --sig "run(bytes)" $(PAUSE_SIGNATURES) \
+	--private-key $(EXECUTOR_PRIVATE_KEY) \
 	--broadcast
 
 # Unpause OptimismPortal Commands
 
 .PHONY: unpause-portal-sign
-unpause-portal-sign: deps
+unpause-portal-sign:
 	$(GOPATH)/bin/eip712sign --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" -- \
 	forge script --rpc-url $(L1_RPC_URL) UnpausePortal --sig "sign()"
 
 .PHONY: unpause-portal-run
-unpause-portal-run: deps
-	forge script --rpc-url $(L1_RPC_URL) \
-	UnpausePortal --sig "run(bytes)" $(SIGNATURES) \
-	--ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" \
+unpause-portal-run:
+	@forge script --rpc-url $(L1_RPC_URL) \
+	UnpausePortal --sig "run(bytes)" $(UNPAUSE_SIGNATURES) \
+	--private-key $(EXECUTOR_PRIVATE_KEY) \
 	--broadcast
diff --git a/mainnet/2024-03-05-pause-unpause-test/script/PausePortal.s.sol b/mainnet/2024-03-05-pause-unpause-test/script/PausePortal.s.sol
@@ -30,4 +30,8 @@ contract PausePortal is MultisigBuilder {
     function _ownerSafe() internal override view returns (address) {
         return GUARDIAN;
     }
+
+    function _addOverrides(address _safe) internal override pure returns (SimulationStateOverride memory) {
+        return overrideSafeThresholdAndOwner(_safe, DEFAULT_SENDER);
+    }
 }
diff --git a/mainnet/2024-03-05-pause-unpause-test/script/UnpausePortal.s.sol b/mainnet/2024-03-05-pause-unpause-test/script/UnpausePortal.s.sol
@@ -30,4 +30,15 @@ contract UnpausePortal is MultisigBuilder {
     function _ownerSafe() internal override view returns (address) {
         return GUARDIAN;
     }
+
+    function _addOverrides(address _safe) internal override pure returns (SimulationStateOverride memory) {
+        return overrideSafeThresholdAndOwner(_safe, DEFAULT_SENDER);
+    }
+
+    function _getNonce(IGnosisSafe safe) internal override view returns (uint256 nonce) {
+        uint256 _nonce = safe.nonce();
+        console.log("Safe current nonce:", _nonce);
+        console.log("Incrememnting by 1 to account for planned `Update` tx");
+        return _nonce+1;
+    }
 }