Skip to content

Commit 779d79e

Browse files
[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
1 parent cb4d553 commit 779d79e

File tree

4 files changed

+26
-11
lines changed

4 files changed

+26
-11
lines changed
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
OP_COMMIT=10b06fb49861053999a89533d846ee5c2ccb33e1
2-
BASE_CONTRACTS_COMMIT=fe492be3478134b2305c207a12b153eca04148c0
2+
BASE_CONTRACTS_COMMIT=56d8f40b48795663fa88366d762161af5a1ba5d5
33

44
OPTIMISM_PORTAL_PROXY=0x49048044D57e1C92A77f79988d21Fa8fAF74E97e
55
GUARDIAN=0x14536667Cd30e52C0b458BaACcB9faDA7046E056

mainnet/2024-03-05-pause-unpause-test/Makefile

+10-10
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,27 @@ endif
1515
# Pause OptimismPortal Commands
1616

1717
.PHONY: pause-portal-sign
18-
pause-portal-sign: deps
18+
pause-portal-sign:
1919
$(GOPATH)/bin/eip712sign --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" -- \
2020
forge script --rpc-url $(L1_RPC_URL) PausePortal --sig "sign()"
2121

2222
.PHONY: pause-portal-run
23-
pause-portal-run: deps
24-
forge script --rpc-url $(L1_RPC_URL) \
25-
PausePortal --sig "run(bytes)" $(SIGNATURES) \
26-
--ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" \
23+
pause-portal-run:
24+
@forge script --rpc-url $(L1_RPC_URL) \
25+
PausePortal --sig "run(bytes)" $(PAUSE_SIGNATURES) \
26+
--private-key $(EXECUTOR_PRIVATE_KEY) \
2727
--broadcast
2828

2929
# Unpause OptimismPortal Commands
3030

3131
.PHONY: unpause-portal-sign
32-
unpause-portal-sign: deps
32+
unpause-portal-sign:
3333
$(GOPATH)/bin/eip712sign --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" -- \
3434
forge script --rpc-url $(L1_RPC_URL) UnpausePortal --sig "sign()"
3535

3636
.PHONY: unpause-portal-run
37-
unpause-portal-run: deps
38-
forge script --rpc-url $(L1_RPC_URL) \
39-
UnpausePortal --sig "run(bytes)" $(SIGNATURES) \
40-
--ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" \
37+
unpause-portal-run:
38+
@forge script --rpc-url $(L1_RPC_URL) \
39+
UnpausePortal --sig "run(bytes)" $(UNPAUSE_SIGNATURES) \
40+
--private-key $(EXECUTOR_PRIVATE_KEY) \
4141
--broadcast

mainnet/2024-03-05-pause-unpause-test/script/PausePortal.s.sol

+4
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,8 @@ contract PausePortal is MultisigBuilder {
3030
function _ownerSafe() internal override view returns (address) {
3131
return GUARDIAN;
3232
}
33+
34+
function _addOverrides(address _safe) internal override pure returns (SimulationStateOverride memory) {
35+
return overrideSafeThresholdAndOwner(_safe, DEFAULT_SENDER);
36+
}
3337
}

mainnet/2024-03-05-pause-unpause-test/script/UnpausePortal.s.sol

+11
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,15 @@ contract UnpausePortal is MultisigBuilder {
3030
function _ownerSafe() internal override view returns (address) {
3131
return GUARDIAN;
3232
}
33+
34+
function _addOverrides(address _safe) internal override pure returns (SimulationStateOverride memory) {
35+
return overrideSafeThresholdAndOwner(_safe, DEFAULT_SENDER);
36+
}
37+
38+
function _getNonce(IGnosisSafe safe) internal override view returns (uint256 nonce) {
39+
uint256 _nonce = safe.nonce();
40+
console.log("Safe current nonce:", _nonce);
41+
console.log("Incrememnting by 1 to account for planned `Update` tx");
42+
return _nonce+1;
43+
}
3344
}

0 commit comments

Comments
 (0)