From ce7ae412f6895562d08af110ab50f1517b9ecfca Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@oplabs.co>
Date: Fri, 7 Feb 2025 11:38:58 +1000
Subject: [PATCH] Review feedback

---
 tasks/sep/030-revert-mt-cannon/.env          |  2 --
 tasks/sep/030-revert-mt-cannon/README.md     |  8 ++++-
 tasks/sep/030-revert-mt-cannon/VALIDATION.md | 38 ++++----------------
 3 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/tasks/sep/030-revert-mt-cannon/.env b/tasks/sep/030-revert-mt-cannon/.env
index a7cc355dc..a03e5bcb6 100644
--- a/tasks/sep/030-revert-mt-cannon/.env
+++ b/tasks/sep/030-revert-mt-cannon/.env
@@ -4,6 +4,4 @@ FOUNDATION_SAFE=0xDEe57160aAfCF04c34C887B5962D0a69676d3C8B
 SAFE_NONCE=""
 L1_CHAIN_NAME="sepolia"
 L2_CHAIN_NAME="op"
-SYSTEM_CONFIG="0x034edD2A225f7f429A63E0f1D2084B9E0A93b538"
 OWNER_SAFE="0x1Eb2fFc903729a0F03966B917003800b145F56E2"
-PROXY_ADMIN="0x189aBAAaa82DfC015A588A7dbaD6F13b1D3485Bc"
diff --git a/tasks/sep/030-revert-mt-cannon/README.md b/tasks/sep/030-revert-mt-cannon/README.md
index f31709eb7..31635a56f 100644
--- a/tasks/sep/030-revert-mt-cannon/README.md
+++ b/tasks/sep/030-revert-mt-cannon/README.md
@@ -1,6 +1,6 @@
 # ProxyAdminOwner - Set Dispute Game Implementation
 
-Status: DRAFT, NOT READY TO SIGN
+Status: READY TO SIGN
 
 ## Objective
 
@@ -15,3 +15,9 @@ This switches sepolia back to singlethreaded cannon, undoing the upgrade to cann
 ### State Validations
 
 Please see the instructions for [validation](./VALIDATION.md).
+
+## Simulation
+
+Please see the "Simulating and Verifying the Transaction" instructions in [NESTED.md](../../../NESTED.md).
+When simulating, ensure the logs say `Using script /your/path/to/superchain-ops/tasks/sep/030-revert-mt-cannon/NestedSignFromJson.s.sol`.
+This ensures all safety checks are run. If the default `NestedSignFromJson.s.sol` script is shown (without the full path), something is wrong and the safety checks will not run.
diff --git a/tasks/sep/030-revert-mt-cannon/VALIDATION.md b/tasks/sep/030-revert-mt-cannon/VALIDATION.md
index 5cb819340..a7d874d8d 100644
--- a/tasks/sep/030-revert-mt-cannon/VALIDATION.md
+++ b/tasks/sep/030-revert-mt-cannon/VALIDATION.md
@@ -18,27 +18,17 @@ This task is executed by the nested 2/2 `ProxyAdminOwner` Safe. Refer to the
 for the expected state overrides and changes.
 
 The `approvedHashes` mapping **key** of the `ProxyAdminOwner` that should change during the simulation is
-- Council simulation: `0x7a680028073e956784e910c02dd0a0936604b29cd9f9c71c9d8e568533821e16`
-- Foundation simulation: `0xd30a77d4a810ba7768ba1bd52de1cbb869f7b641c57132e46544f044cd7e839a`
-
-calculated as explained in the nested validation doc:
-```sh
-cast index address 0xf64bc17485f0B4Ea5F06A96514182FC4cB561977 8 # council
-# 0x56362ae34e37f50105bd722d564a267a69bbc15ede4cb7136e81afd747b41c4d
-cast index bytes32 0x7b390cc232cd3a45f1100c184953b4e6a6556fe2af978d76b577a87a65345254 0x56362ae34e37f50105bd722d564a267a69bbc15ede4cb7136e81afd747b41c4d
-# 0x7a680028073e956784e910c02dd0a0936604b29cd9f9c71c9d8e568533821e16
-```
+- Council simulation: `0xe8f8aa2e65c85624906005cf8077cbc632900bd87fdfb6023df637b4fddfffe3`
+- Foundation simulation: `0x0d550ba923712ad13c224c6566f757fbc09207dd05fec85aebd7a66e56e27bd5`
 
-```sh
-cast index address 0xDEe57160aAfCF04c34C887B5962D0a69676d3C8B 8 # foundation
-# 0xc18fefc0a6b81265cf06017c3f1f91c040dc3227321d73c608cfbcf1c5253e5c
-cast index bytes32 0x7b390cc232cd3a45f1100c184953b4e6a6556fe2af978d76b577a87a65345254 0xc18fefc0a6b81265cf06017c3f1f91c040dc3227321d73c608cfbcf1c5253e5c
-# 0xd30a77d4a810ba7768ba1bd52de1cbb869f7b641c57132e46544f044cd7e839a
-```
+calculated as explained in the nested validation doc.
+
+Additionally, the nonces [will increment by one](../../../NESTED-VALIDATION.md#nonce-increments).
 
 ## State Changes
 
-Note: The changes listed below do not include safe nonce updates or liveness guard related changes.
+Note: The changes listed below do not include safe nonce updates or liveness guard related changes. Refer to the
+[generic nested Safe execution validation document](../../../NESTED-VALIDATION.md)
 
 ### `0x05F9613aDB30026FFd634f38e5C4dFd30a197Fa1` (`DisputeGameFactoryProxy`)
 
@@ -54,20 +44,6 @@ Note: The changes listed below do not include safe nonce updates or liveness gua
   **Meaning**: Updates the implementation for game type 1. Verify that the new implementation is set using
   `cast call 0x05F9613aDB30026FFd634f38e5C4dFd30a197Fa1 "gameImpls(uint32)(address)" 1`.
 
-### `0x1Eb2fFc903729a0F03966B917003800b145F56E2` (`ProxyAdminOwner`)
-
-* **Key**: `0x0000000000000000000000000000000000000000000000000000000000000005`
-* **Before**: `0x0000000000000000000000000000000000000000000000000000000000000017`
-* **After**: `0x0000000000000000000000000000000000000000000000000000000000000018`
-* **Meaning**: Nonce increments by 1
-
-and
-
-* **Key**: In the [`approvedHashes` section](#nested-safe-state-overrides-and-changes)
-* **Before**: `0x0000000000000000000000000000000000000000000000000000000000000000`
-* **After**: `0x0000000000000000000000000000000000000000000000000000000000000001`
-* **Meaning**: approvedHashes update. See above.
-
 ## Verifying Dispute Games
 
 The old and new dispute game contracts can be compared with https://gist.github.com/ajsutton/28be852a36d9d19af16f7c870b267873