Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[mainnet] Prepare for Mainnet planned pause #141

Merged
merged 2 commits into from
Mar 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mainnet/2024-03-05-pause-unpause-test/.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
OP_COMMIT=10b06fb49861053999a89533d846ee5c2ccb33e1
BASE_CONTRACTS_COMMIT=fe492be3478134b2305c207a12b153eca04148c0
BASE_CONTRACTS_COMMIT=56d8f40b48795663fa88366d762161af5a1ba5d5

OPTIMISM_PORTAL_PROXY=0x49048044D57e1C92A77f79988d21Fa8fAF74E97e
GUARDIAN=0x14536667Cd30e52C0b458BaACcB9faDA7046E056
20 changes: 10 additions & 10 deletions mainnet/2024-03-05-pause-unpause-test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
11 changes: 11 additions & 0 deletions mainnet/2024-03-05-pause-unpause-test/script/UnpausePortal.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}