fix(ctb): kontrol snapshots (#10557)

* fix(ctb): snapshots

* ci: fix snapshot check command to also consider kontrol

* ctb: Disable the LivenessModule after ownership is transferred to
fallback owner

ctb: Use deactivated flag

ctb: Update snapshots

* ctb: Update LM deactivation
Co-authored-by: Matt Solomon <matt@mattsolomon.dev>

---------
Co-authored-by: Maurelian <maurelian@protonmail.ch>
Co-authored-by: Maurelian <john@oplabs.co>

packages/contracts-bedrock/scripts/checks/check-snapshots.sh

@@ -5,9 +5,9 @@ set -euo pipefail
 # Generate the snapshots
 pnpm snapshots
 
-# Check if the generated snapshots are different from the committed snapshots
-if git diff --exit-code snapshots > /dev/null; then
-  [ -z "$(git ls-files --others --exclude-standard snapshots)" ] || exit 1
+# Check if the generated `snapshots` or `test/kontrol` files are different from the committed versions
+if git diff --exit-code snapshots test/kontrol > /dev/null; then
+  [ -z "$(git ls-files --others --exclude-standard snapshots test/kontrol)" ] || exit 1
 else
   exit 1
 fi

packages/contracts-bedrock/semver-lock.json

@@ -112,8 +112,8 @@
     "sourceCodeHash": "0xea3872d8f196ae3c863363dfa4b57803cb2a24b0c100244d8f861891e901e03f"
   },
   "src/Safe/LivenessModule.sol": {
-    "initCodeHash": "0xdf37345a47e176266f0ece4c624c7e9c2bd81661675f53cf07706dc44dafad27",
-    "sourceCodeHash": "0xdf17b5a6c068b2cf8fd24383066f0cc8e4ab0002f2470476beae594ca86879f3"
+    "initCodeHash": "0xde144889fe7d98dbf300a98f5331edd535086a4af8ae6d88ca190c7f4c754a2d",
+    "sourceCodeHash": "0x3ff4a3f21202478935412d47fd5ef7f94a170402ddc50e5c062013ce5544c83f"
   },
   "src/cannon/MIPS.sol": {
     "initCodeHash": "0xa5d36fc67170ad87322f358f612695f642757bbf5280800d5d878da21402579a",

packages/contracts-bedrock/snapshots/abi/LivenessModule.json

@@ -125,6 +125,19 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "ownershipTransferredToFallback",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [
       {

packages/contracts-bedrock/snapshots/storageLayout/LivenessModule.json

-[]
+[
\ No newline at end of file
+  {
+    "bytes": "1",
+    "label": "ownershipTransferredToFallback",
+    "offset": 0,
+    "slot": "0",
+    "type": "bool"
+  }
+]
\ No newline at end of file

packages/contracts-bedrock/src/Safe/LivenessModule.sol

@@ -23,6 +23,9 @@ contract LivenessModule is ISemver {
     /// @notice Emitted when the fallback owner takes ownership
     event OwnershipTransferredToFallback();
 
+    /// @notice Flag to indicate if the module has been deactivated
+    bool public ownershipTransferredToFallback;
+
     /// @notice The Safe contract instance
     Safe internal immutable SAFE;
 
@@ -51,7 +54,7 @@ contract LivenessModule is ISemver {
 
     /// @notice Semantic version.
     /// @custom:semver 1.1.0
-    string public constant version = "1.1.0";
+    string public constant version = "1.2.0";
 
     // Constructor to initialize the Safe and baseModule instances
     constructor(
@@ -131,11 +134,16 @@ contract LivenessModule is ISemver {
     /// @param _ownersToRemove The owners to remove
     function removeOwners(address[] memory _previousOwners, address[] memory _ownersToRemove) external {
         require(_previousOwners.length == _ownersToRemove.length, "LivenessModule: arrays must be the same length");
+        address[] memory currentOwners = SAFE.getOwners();
+        require(
+            !ownershipTransferredToFallback,
+            "LivenessModule: The safe has been shutdown, the LivenessModule and LivenessGuard should be removed or replaced."
+        );
 
         // Initialize the ownersCount count to the current number of owners, so that we can track the number of
         // owners in the Safe after each removal. The Safe will revert if an owner cannot be removed, so it is safe
         // keep a local count of the number of owners this way.
-        uint256 ownersCount = SAFE.getOwners().length;
+        uint256 ownersCount = currentOwners.length;
         for (uint256 i = 0; i < _previousOwners.length; i++) {
             // Validate that the owner can be removed, which means that either:
             //   1. the ownersCount is now less than MIN_OWNERS, in which case all owners should be removed regardless
@@ -196,6 +204,9 @@ contract LivenessModule is ISemver {
         if (!success) {
             revert OwnerRemovalFailed(string(returnData));
         }
+
+        // Deactivate the module to prevent unintended behavior after the fallback owner has taken ownership.
+        ownershipTransferredToFallback = true;
         emit OwnershipTransferredToFallback();
     }
 

packages/contracts-bedrock/test/Safe/LivenessModule.t.sol

@@ -115,6 +115,7 @@ contract LivenessModule_Getters_Test is LivenessModule_TestInit {
         assertEq(livenessModule.thresholdPercentage(), THRESHOLD_PERCENTAGE);
         assertEq(safeInstance.safe.getThreshold(), livenessModule.getRequiredThreshold(safeInstance.owners.length));
         assertEq(livenessModule.fallbackOwner(), fallbackOwner);
+        assertFalse(livenessModule.ownershipTransferredToFallback());
     }
 }
 
@@ -400,6 +401,13 @@ contract LivenessModule_RemoveOwners_Test is LivenessModule_TestInit {
         assertEq(safeInstance.safe.getOwners().length, 1);
         assertEq(safeInstance.safe.getOwners()[0], fallbackOwner);
         assertEq(safeInstance.safe.getThreshold(), 1);
+
+        // Ensure that the LivenessModule's removeOwners function is now disabled
+        assertTrue(livenessModule.ownershipTransferredToFallback());
+        vm.expectRevert(
+            "LivenessModule: The safe has been shutdown, the LivenessModule and LivenessGuard should be removed or replaced."
+        );
+        livenessModule.removeOwners(prevOwners, ownersToRemove);
     }
 }
 
@@ -546,6 +554,12 @@ contract LivenessModule_RemoveOwnersFuzz_Test is LivenessModule_TestInit {
                 assertEq(safeInstance.safe.getOwners().length, 1);
                 assertEq(safeInstance.safe.getOwners()[0], fallbackOwner);
                 assertEq(safeInstance.safe.getThreshold(), 1);
+                // Ensure that the LivenessModule's removeOwners function is now disabled
+                assertTrue(livenessModule.ownershipTransferredToFallback());
+                vm.expectRevert(
+                    "LivenessModule: The safe has been shutdown, the LivenessModule and LivenessGuard should be removed or replaced."
+                );
+                livenessModule.removeOwners(prevOwners, ownersToRemove);
             } else {
                 // For both of the incorrect behaviors, we need to calculate the number of owners to remove to
                 // trigger that behavior. We initialize that value here then set it in the if statements below.

packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummary.sol

@@ -12,27 +12,27 @@ contract DeploymentSummary is DeploymentSummaryCode {
     address private constant VM_ADDRESS = address(uint160(uint256(keccak256("hevm cheat code"))));
     Vm private constant vm = Vm(VM_ADDRESS);
 
-    address internal constant addressManagerAddress = 0x50EEf481cae4250d252Ae577A09bF514f224C6C4;
+    address internal constant addressManagerAddress = 0xBb2180ebd78ce97360503434eD37fcf4a1Df61c3;
     address internal constant l1CrossDomainMessengerAddress = 0xf3E6CBcbF1AE12Fc13Bc8B14FA8A67CbE147fD99;
-    address internal constant l1CrossDomainMessengerProxyAddress = 0xc7B87b2b892EA5C3CfF47168881FE168C00377FB;
+    address internal constant l1CrossDomainMessengerProxyAddress = 0x20A42a5a785622c6Ba2576B2D6e924aA82BFA11D;
     address internal constant l1ERC721BridgeAddress = 0x44637A4292E0CD2B17A55d5F6B2F05AFcAcD0586;
-    address internal constant l1ERC721BridgeProxyAddress = 0xD31598c909d9C935a9e35bA70d9a3DD47d4D5865;
+    address internal constant l1ERC721BridgeProxyAddress = 0xDeF3bca8c80064589E6787477FFa7Dd616B5574F;
     address internal constant l1StandardBridgeAddress = 0x04c50B398Cd4182428E79f7186b7C919cF17e86F;
-    address internal constant l1StandardBridgeProxyAddress = 0xDeF3bca8c80064589E6787477FFa7Dd616B5574F;
+    address internal constant l1StandardBridgeProxyAddress = 0x0c8b5822b6e02CDa722174F19A1439A7495a3fA6;
     address internal constant l2OutputOracleAddress = 0x19652082F846171168Daf378C4fD3ee85a0D4A60;
-    address internal constant l2OutputOracleProxyAddress = 0x0c8b5822b6e02CDa722174F19A1439A7495a3fA6;
+    address internal constant l2OutputOracleProxyAddress = 0x8B71b41D4dBEb2b6821d44692d3fACAAf77480Bb;
     address internal constant optimismPortalAddress = 0xFc9AD479AC641888D36EE5Dc265bcD3ecceBDc58;
-    address internal constant optimismPortalProxyAddress = 0x1c23A6d89F95ef3148BCDA8E242cAb145bf9c0E4;
+    address internal constant optimismPortalProxyAddress = 0x978e3286EB805934215a88694d80b09aDed68D90;
     address internal constant protocolVersionsAddress = 0xfbfD64a6C0257F613feFCe050Aa30ecC3E3d7C3F;
-    address internal constant protocolVersionsProxyAddress = 0x4C52a6277b1B84121b3072C0c92b6Be0b7CC10F1;
-    address internal constant proxyAdminAddress = 0x62c20Aa1e0272312BC100b4e23B4DC1Ed96dD7D1;
-    address internal constant safeProxyFactoryAddress = 0xA8452Ec99ce0C64f20701dB7dD3abDb607c00496;
-    address internal constant safeSingletonAddress = 0xBb2180ebd78ce97360503434eD37fcf4a1Df61c3;
+    address internal constant protocolVersionsProxyAddress = 0x416C42991d05b31E9A6dC209e91AD22b79D87Ae6;
+    address internal constant proxyAdminAddress = 0xDB8cFf278adCCF9E9b5da745B44E754fC4EE3C76;
+    address internal constant safeProxyFactoryAddress = 0x34A1D3fff3958843C43aD80F30b94c510645C316;
+    address internal constant safeSingletonAddress = 0x90193C961A926261B756D1E5bb255e67ff9498A1;
     address internal constant superchainConfigAddress = 0x068E44eB31e111028c41598E4535be7468674D0A;
-    address internal constant superchainConfigProxyAddress = 0x4f559F30f5eB88D635FDe1548C4267DB8FaB0351;
+    address internal constant superchainConfigProxyAddress = 0xDEb1E9a6Be7Baf84208BB6E10aC9F9bbE1D70809;
     address internal constant systemConfigAddress = 0x19E90dC1Fb905f20BB3A7eC537B5B812d5FFA682;
-    address internal constant systemConfigProxyAddress = 0x20A42a5a785622c6Ba2576B2D6e924aA82BFA11D;
-    address internal constant systemOwnerSafeAddress = 0x96544c43aBcEe1c7FC04914953Bf0330e21a3c7d;
+    address internal constant systemConfigProxyAddress = 0x1c23A6d89F95ef3148BCDA8E242cAb145bf9c0E4;
+    address internal constant systemOwnerSafeAddress = 0x7d039be7F9b5190147621b02e82B250e1D748e02;
 
     function recreateDeployment() public {
         bytes32 slot;
@@ -44,7 +44,7 @@ contract DeploymentSummary is DeploymentSummaryCode {
         vm.store(safeSingletonAddress, slot, value);
         vm.etch(systemOwnerSafeAddress, systemOwnerSafeCode);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
-        value = hex"000000000000000000000000bb2180ebd78ce97360503434ed37fcf4a1df61c3";
+        value = hex"00000000000000000000000090193c961a926261b756d1e5bb255e67ff9498a1";
         vm.store(systemOwnerSafeAddress, slot, value);
         slot = hex"e90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0";
         value = hex"0000000000000000000000001804c8ab1f12e6bbf3894d4083f33e07309d1f38";
@@ -70,14 +70,14 @@ contract DeploymentSummary is DeploymentSummaryCode {
         value = hex"0000000000000000000000001804c8ab1f12e6bbf3894d4083f33e07309d1f38";
         vm.store(proxyAdminAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000003";
-        value = hex"00000000000000000000000050eef481cae4250d252ae577a09bf514f224c6c4";
+        value = hex"000000000000000000000000bb2180ebd78ce97360503434ed37fcf4a1df61c3";
         vm.store(proxyAdminAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
-        value = hex"00000000000000000000000096544c43abcee1c7fc04914953bf0330e21a3c7d";
+        value = hex"0000000000000000000000007d039be7f9b5190147621b02e82b250e1d748e02";
         vm.store(proxyAdminAddress, slot, value);
         vm.etch(superchainConfigProxyAddress, superchainConfigProxyCode);
         slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(superchainConfigProxyAddress, slot, value);
         vm.etch(superchainConfigAddress, superchainConfigCode);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
@@ -109,7 +109,7 @@ contract DeploymentSummary is DeploymentSummaryCode {
         vm.store(superchainConfigProxyAddress, slot, value);
         vm.etch(protocolVersionsProxyAddress, protocolVersionsProxyCode);
         slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(protocolVersionsProxyAddress, slot, value);
         vm.etch(protocolVersionsAddress, protocolVersionsCode);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
@@ -140,7 +140,7 @@ contract DeploymentSummary is DeploymentSummaryCode {
         value = hex"0000000000000000000000000000000000000000000000000000000000000101";
         vm.store(protocolVersionsProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(protocolVersionsProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
         value = hex"0000000000000000000000009965507d1a55bcc2695c58ba16fb37d819b0a4dc";
@@ -150,33 +150,33 @@ contract DeploymentSummary is DeploymentSummaryCode {
         vm.store(protocolVersionsProxyAddress, slot, value);
         vm.etch(optimismPortalProxyAddress, optimismPortalProxyCode);
         slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(optimismPortalProxyAddress, slot, value);
         vm.etch(l2OutputOracleProxyAddress, l2OutputOracleProxyCode);
         slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(l2OutputOracleProxyAddress, slot, value);
         vm.etch(systemConfigProxyAddress, systemConfigProxyCode);
         slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(systemConfigProxyAddress, slot, value);
         vm.etch(l1StandardBridgeProxyAddress, l1StandardBridgeProxyCode);
         slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(l1StandardBridgeProxyAddress, slot, value);
         vm.etch(l1CrossDomainMessengerProxyAddress, l1CrossDomainMessengerProxyCode);
-        slot = hex"f6cecbacbfeb99e6ab0f02c22fd8a103f8837deb80af03d481ac5bc8d5475f58";
-        value = hex"00000000000000000000000050eef481cae4250d252ae577a09bf514f224c6c4";
+        slot = hex"540cf4e2f45b866b44f44bde51e109474016dc46a0670fbe1684ad8eaf90fdc3";
+        value = hex"000000000000000000000000bb2180ebd78ce97360503434ed37fcf4a1df61c3";
         vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
-        slot = hex"ceb2ac3d439ba35adb9a3f2ba6c37d15a264e79156ee79334f5d4c00090812d2";
+        slot = hex"4505be7acf20898edfef2b5289635349881ad9bf4b57316a74e81e2abec2be52";
         value = hex"4f564d5f4c3143726f7373446f6d61696e4d657373656e676572000000000034";
         vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
         vm.etch(l1ERC721BridgeProxyAddress, l1ERC721BridgeProxyCode);
         slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(l1ERC721BridgeProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(addressManagerAddress, slot, value);
         vm.etch(optimismPortalAddress, optimismPortalCode);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
@@ -290,7 +290,7 @@ contract DeploymentSummary is DeploymentSummaryCode {
         value = hex"0000000000000000000000000000000000000000000000000000000000000101";
         vm.store(systemConfigProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(systemConfigProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
         value = hex"0000000000000000000000009965507d1a55bcc2695c58ba16fb37d819b0a4dc";
@@ -314,16 +314,16 @@ contract DeploymentSummary is DeploymentSummaryCode {
         value = hex"000000000000000000000000ff00000000000000000000000000000000000000";
         vm.store(systemConfigProxyAddress, slot, value);
         slot = hex"383f291819e6d54073bc9a648251d97421076bdd101933c0c022219ce9580636";
-        value = hex"000000000000000000000000c7b87b2b892ea5c3cff47168881fe168c00377fb";
+        value = hex"00000000000000000000000020a42a5a785622c6ba2576b2d6e924aa82bfa11d";
         vm.store(systemConfigProxyAddress, slot, value);
         slot = hex"46adcbebc6be8ce551740c29c47c8798210f23f7f4086c41752944352568d5a7";
-        value = hex"000000000000000000000000d31598c909d9c935a9e35ba70d9a3dd47d4d5865";
+        value = hex"000000000000000000000000def3bca8c80064589e6787477ffa7dd616b5574f";
         vm.store(systemConfigProxyAddress, slot, value);
         slot = hex"9904ba90dde5696cda05c9e0dab5cbaa0fea005ace4d11218a02ac668dad6376";
-        value = hex"000000000000000000000000def3bca8c80064589e6787477ffa7dd616b5574f";
+        value = hex"0000000000000000000000000c8b5822b6e02cda722174f19a1439a7495a3fa6";
         vm.store(systemConfigProxyAddress, slot, value);
         slot = hex"4b6c74f9e688cb39801f2112c14a8c57232a3fc5202e1444126d4bce86eb19ac";
-        value = hex"0000000000000000000000001c23a6d89f95ef3148bcda8e242cab145bf9c0e4";
+        value = hex"000000000000000000000000978e3286eb805934215a88694d80b09aded68d90";
         vm.store(systemConfigProxyAddress, slot, value);
         slot = hex"a11ee3ab75b40e88a0105e935d17cd36c8faee0138320d776c411291bdbbb19f";
         value = hex"0000000000000000000000000000000000000000000000000000000000000001";
@@ -337,7 +337,7 @@ contract DeploymentSummary is DeploymentSummaryCode {
         slot = hex"0000000000000000000000000000000000000000000000000000000000000005";
         value = hex"0000000000000000000000000000000000000000000000000000000000000004";
         vm.store(systemOwnerSafeAddress, slot, value);
-        slot = hex"191cda7b5a8219e0cc3bb6c2b45be830e3ba520f78e119446a476c4147fcc284";
+        slot = hex"a8f0d50211ac8ff1a40793a899dff3ced4762e0466f69b0078ab7b00d037835c";
         value = hex"0000000000000000000000000000000000000000000000000000000000000001";
         vm.store(proxyAdminAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000005";
@@ -353,13 +353,13 @@ contract DeploymentSummary is DeploymentSummaryCode {
         value = hex"0000000000000000000000000000000000000000000000000000000000000101";
         vm.store(l1StandardBridgeProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000032";
-        value = hex"0000000000000000000000004f559f30f5eb88d635fde1548c4267db8fab0351";
+        value = hex"000000000000000000000000deb1e9a6be7baf84208bb6e10ac9f9bbe1d70809";
         vm.store(l1StandardBridgeProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
-        value = hex"00000000000000000000000020a42a5a785622c6ba2576b2d6e924aa82bfa11d";
+        value = hex"0000000000000000000000001c23a6d89f95ef3148bcda8e242cab145bf9c0e4";
         vm.store(l1StandardBridgeProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000003";
-        value = hex"000000000000000000000000c7b87b2b892ea5c3cff47168881fe168c00377fb";
+        value = hex"00000000000000000000000020a42a5a785622c6ba2576b2d6e924aa82bfa11d";
         vm.store(l1StandardBridgeProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000004";
         value = hex"0000000000000000000000004200000000000000000000000000000000000010";
@@ -380,10 +380,10 @@ contract DeploymentSummary is DeploymentSummaryCode {
         value = hex"0000000000000000000000000000000000000000000000000000000000000101";
         vm.store(l1ERC721BridgeProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000032";
-        value = hex"0000000000000000000000004f559f30f5eb88d635fde1548c4267db8fab0351";
+        value = hex"000000000000000000000000deb1e9a6be7baf84208bb6e10ac9f9bbe1d70809";
         vm.store(l1ERC721BridgeProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000001";
-        value = hex"000000000000000000000000c7b87b2b892ea5c3cff47168881fe168c00377fb";
+        value = hex"00000000000000000000000020a42a5a785622c6ba2576b2d6e924aa82bfa11d";
         vm.store(l1ERC721BridgeProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000002";
         value = hex"0000000000000000000000004200000000000000000000000000000000000014";
@@ -394,13 +394,13 @@ contract DeploymentSummary is DeploymentSummaryCode {
         slot = hex"0000000000000000000000000000000000000000000000000000000000000005";
         value = hex"0000000000000000000000000000000000000000000000000000000000000007";
         vm.store(systemOwnerSafeAddress, slot, value);
-        slot = hex"f6cecbacbfeb99e6ab0f02c22fd8a103f8837deb80af03d481ac5bc8d5475f58";
+        slot = hex"540cf4e2f45b866b44f44bde51e109474016dc46a0670fbe1684ad8eaf90fdc3";
         value = hex"0000000000000000000000000000000000000000000000000000000000000002";
         vm.store(proxyAdminAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000005";
         value = hex"0000000000000000000000000000000000000000000000000000000000000008";
         vm.store(systemOwnerSafeAddress, slot, value);
-        slot = hex"63c92109b91ecf3318ee316da9fdb1378fd8d900f912b2029945ff91daa463bf";
+        slot = hex"17eb2365d570ef4d1cc4abe9e522ed8632b11233db9c15f3c2c8aa32407b981b";
         value = hex"4f564d5f4c3143726f7373446f6d61696e4d657373656e676572000000000034";
         vm.store(proxyAdminAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000005";
@@ -416,13 +416,13 @@ contract DeploymentSummary is DeploymentSummaryCode {
         value = hex"0000000000000000000001010000000000000000000000000000000000000000";
         vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
         slot = hex"00000000000000000000000000000000000000000000000000000000000000fb";
-        value = hex"0000000000000000000000004f559f30f5eb88d635fde1548c4267db8fab0351";
+        value = hex"000000000000000000000000deb1e9a6be7baf84208bb6e10ac9f9bbe1d70809";
         vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
         slot = hex"00000000000000000000000000000000000000000000000000000000000000fc";
-        value = hex"0000000000000000000000001c23a6d89f95ef3148bcda8e242cab145bf9c0e4";
+        value = hex"000000000000000000000000978e3286eb805934215a88694d80b09aded68d90";
         vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
         slot = hex"00000000000000000000000000000000000000000000000000000000000000fd";
-        value = hex"00000000000000000000000020a42a5a785622c6ba2576b2d6e924aa82bfa11d";
+        value = hex"0000000000000000000000001c23a6d89f95ef3148bcda8e242cab145bf9c0e4";
         vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
         slot = hex"00000000000000000000000000000000000000000000000000000000000000cc";
         value = hex"000000000000000000000000000000000000000000000000000000000000dead";
@@ -446,13 +446,13 @@ contract DeploymentSummary is DeploymentSummaryCode {
         value = hex"0000000000000000000000000000000000000000000000000000000000000101";
         vm.store(optimismPortalProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000036";
-        value = hex"0000000000000000000000000c8b5822b6e02cda722174f19a1439a7495a3fa6";
+        value = hex"0000000000000000000000008b71b41d4dbeb2b6821d44692d3facaaf77480bb";
         vm.store(optimismPortalProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000037";
-        value = hex"00000000000000000000000020a42a5a785622c6ba2576b2d6e924aa82bfa11d";
+        value = hex"0000000000000000000000001c23a6d89f95ef3148bcda8e242cab145bf9c0e4";
         vm.store(optimismPortalProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000035";
-        value = hex"00000000000000000000004f559f30f5eb88d635fde1548c4267db8fab035100";
+        value = hex"0000000000000000000000deb1e9a6be7baf84208bb6e10ac9f9bbe1d7080900";
         vm.store(optimismPortalProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000032";
         value = hex"000000000000000000000000000000000000000000000000000000000000dead";

packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummaryFaultProofs.sol

@@ -12,35 +12,35 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
     address private constant VM_ADDRESS = address(uint160(uint256(keccak256("hevm cheat code"))));
     Vm private constant vm = Vm(VM_ADDRESS);
 
-    address internal constant addressManagerAddress = 0x50EEf481cae4250d252Ae577A09bF514f224C6C4;
-    address internal constant anchorStateRegistryAddress = 0x71f44B7281dFCd25D9a36798E1872F82942DD763;
-    address internal constant anchorStateRegistryProxyAddress = 0x20A42a5a785622c6Ba2576B2D6e924aA82BFA11D;
+    address internal constant addressManagerAddress = 0xBb2180ebd78ce97360503434eD37fcf4a1Df61c3;
+    address internal constant anchorStateRegistryAddress = 0xF74482139D1564B826994875cF6632eB5b134b25;
+    address internal constant anchorStateRegistryProxyAddress = 0x1c23A6d89F95ef3148BCDA8E242cAb145bf9c0E4;
     address internal constant delayedWETHAddress = 0x49BBFf1629824A1e7993Ab5c17AFa45D24AB28c9;
-    address internal constant delayedWETHProxyAddress = 0xDeF3bca8c80064589E6787477FFa7Dd616B5574F;
+    address internal constant delayedWETHProxyAddress = 0x0c8b5822b6e02CDa722174F19A1439A7495a3fA6;
     address internal constant disputeGameFactoryAddress = 0x20B168142354Cee65a32f6D8cf3033E592299765;
-    address internal constant disputeGameFactoryProxyAddress = 0x0c8b5822b6e02CDa722174F19A1439A7495a3fA6;
+    address internal constant disputeGameFactoryProxyAddress = 0x8B71b41D4dBEb2b6821d44692d3fACAAf77480Bb;
     address internal constant l1CrossDomainMessengerAddress = 0xf3E6CBcbF1AE12Fc13Bc8B14FA8A67CbE147fD99;
-    address internal constant l1CrossDomainMessengerProxyAddress = 0x5207CfA0166E8de0FCdFd78B4d17b68587bE306d;
+    address internal constant l1CrossDomainMessengerProxyAddress = 0xc7B87b2b892EA5C3CfF47168881FE168C00377FB;
     address internal constant l1ERC721BridgeAddress = 0x44637A4292E0CD2B17A55d5F6B2F05AFcAcD0586;
-    address internal constant l1ERC721BridgeProxyAddress = 0x39Af23E00F1e662025aA01b0cEdA19542B78DF99;
+    address internal constant l1ERC721BridgeProxyAddress = 0xD31598c909d9C935a9e35bA70d9a3DD47d4D5865;
     address internal constant l1StandardBridgeAddress = 0x04c50B398Cd4182428E79f7186b7C919cF17e86F;
-    address internal constant l1StandardBridgeProxyAddress = 0xD31598c909d9C935a9e35bA70d9a3DD47d4D5865;
+    address internal constant l1StandardBridgeProxyAddress = 0xDeF3bca8c80064589E6787477FFa7Dd616B5574F;
     address internal constant mipsAddress = 0xF698388BFCDbd3f9f2F13ebC3E01471B3cc7cE83;
     address internal constant optimismPortal2Address = 0xfcbb237388CaF5b08175C9927a37aB6450acd535;
-    address internal constant optimismPortalProxyAddress = 0x1c23A6d89F95ef3148BCDA8E242cAb145bf9c0E4;
+    address internal constant optimismPortalProxyAddress = 0x978e3286EB805934215a88694d80b09aDed68D90;
     address internal constant preimageOracleAddress = 0x3bd7E801E51d48c5d94Ea68e8B801DFFC275De75;
     address internal constant protocolVersionsAddress = 0xfbfD64a6C0257F613feFCe050Aa30ecC3E3d7C3F;
-    address internal constant protocolVersionsProxyAddress = 0x4C52a6277b1B84121b3072C0c92b6Be0b7CC10F1;
-    address internal constant proxyAdminAddress = 0x62c20Aa1e0272312BC100b4e23B4DC1Ed96dD7D1;
-    address internal constant safeProxyFactoryAddress = 0xA8452Ec99ce0C64f20701dB7dD3abDb607c00496;
-    address internal constant safeSingletonAddress = 0xBb2180ebd78ce97360503434eD37fcf4a1Df61c3;
+    address internal constant protocolVersionsProxyAddress = 0x416C42991d05b31E9A6dC209e91AD22b79D87Ae6;
+    address internal constant proxyAdminAddress = 0xDB8cFf278adCCF9E9b5da745B44E754fC4EE3C76;
+    address internal constant safeProxyFactoryAddress = 0x34A1D3fff3958843C43aD80F30b94c510645C316;
+    address internal constant safeSingletonAddress = 0x90193C961A926261B756D1E5bb255e67ff9498A1;
     address internal constant superchainConfigAddress = 0x068E44eB31e111028c41598E4535be7468674D0A;
-    address internal constant superchainConfigProxyAddress = 0x4f559F30f5eB88D635FDe1548C4267DB8FaB0351;
+    address internal constant superchainConfigProxyAddress = 0xDEb1E9a6Be7Baf84208BB6E10aC9F9bbE1D70809;
     address internal constant systemConfigAddress = 0x19E90dC1Fb905f20BB3A7eC537B5B812d5FFA682;
-    address internal constant systemConfigProxyAddress = 0xc7B87b2b892EA5C3CfF47168881FE168C00377FB;
-    address internal constant systemOwnerSafeAddress = 0x96544c43aBcEe1c7FC04914953Bf0330e21a3c7d;
-    address internal constant acc27Address = 0x2abb7CBB720020ee3C9ecf3915D14B6d1886A577;
-    address internal constant acc28Address = 0x91752891a019Fb365Df0F99Fa468Bf19F91C2Ac0;
+    address internal constant systemConfigProxyAddress = 0x20A42a5a785622c6Ba2576B2D6e924aA82BFA11D;
+    address internal constant systemOwnerSafeAddress = 0x7d039be7F9b5190147621b02e82B250e1D748e02;
+    address internal constant acc27Address = 0x12e721c390F5728200a26BBEf206A5F4F7E991f3;
+    address internal constant acc28Address = 0x2abb7CBB720020ee3C9ecf3915D14B6d1886A577;
 
     function recreateDeployment() public {
         bytes32 slot;
@@ -52,7 +52,7 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
         vm.store(safeSingletonAddress, slot, value);
         vm.etch(systemOwnerSafeAddress, systemOwnerSafeCode);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
-        value = hex"000000000000000000000000bb2180ebd78ce97360503434ed37fcf4a1df61c3";
+        value = hex"00000000000000000000000090193c961a926261b756d1e5bb255e67ff9498a1";
         vm.store(systemOwnerSafeAddress, slot, value);
         slot = hex"e90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0";
         value = hex"0000000000000000000000001804c8ab1f12e6bbf3894d4083f33e07309d1f38";
@@ -78,14 +78,14 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
         value = hex"0000000000000000000000001804c8ab1f12e6bbf3894d4083f33e07309d1f38";
         vm.store(proxyAdminAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000003";
-        value = hex"00000000000000000000000050eef481cae4250d252ae577a09bf514f224c6c4";
+        value = hex"000000000000000000000000bb2180ebd78ce97360503434ed37fcf4a1df61c3";
         vm.store(proxyAdminAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
-        value = hex"00000000000000000000000096544c43abcee1c7fc04914953bf0330e21a3c7d";
+        value = hex"0000000000000000000000007d039be7f9b5190147621b02e82b250e1d748e02";
         vm.store(proxyAdminAddress, slot, value);
         vm.etch(superchainConfigProxyAddress, superchainConfigProxyCode);
         slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(superchainConfigProxyAddress, slot, value);
         vm.etch(superchainConfigAddress, superchainConfigCode);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
@@ -117,7 +117,7 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
         vm.store(superchainConfigProxyAddress, slot, value);
         vm.etch(protocolVersionsProxyAddress, protocolVersionsProxyCode);
         slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(protocolVersionsProxyAddress, slot, value);
         vm.etch(protocolVersionsAddress, protocolVersionsCode);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
@@ -148,7 +148,7 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
         value = hex"0000000000000000000000000000000000000000000000000000000000000101";
         vm.store(protocolVersionsProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(protocolVersionsProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
         value = hex"0000000000000000000000009965507d1a55bcc2695c58ba16fb37d819b0a4dc";
@@ -158,41 +158,41 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
         vm.store(protocolVersionsProxyAddress, slot, value);
         vm.etch(optimismPortalProxyAddress, optimismPortalProxyCode);
         slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(optimismPortalProxyAddress, slot, value);
         vm.etch(disputeGameFactoryProxyAddress, disputeGameFactoryProxyCode);
         slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(disputeGameFactoryProxyAddress, slot, value);
         vm.etch(anchorStateRegistryProxyAddress, anchorStateRegistryProxyCode);
         slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(anchorStateRegistryProxyAddress, slot, value);
         vm.etch(delayedWETHProxyAddress, delayedWETHProxyCode);
         slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(delayedWETHProxyAddress, slot, value);
         vm.etch(systemConfigProxyAddress, systemConfigProxyCode);
         slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(systemConfigProxyAddress, slot, value);
         vm.etch(l1StandardBridgeProxyAddress, l1StandardBridgeProxyCode);
         slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(l1StandardBridgeProxyAddress, slot, value);
         vm.etch(l1CrossDomainMessengerProxyAddress, l1CrossDomainMessengerProxyCode);
-        slot = hex"67ba7d8bdda390f76c7887f0749c8ddd97a5488c0685a6600f6146d45a37e9e3";
-        value = hex"00000000000000000000000050eef481cae4250d252ae577a09bf514f224c6c4";
+        slot = hex"f6cecbacbfeb99e6ab0f02c22fd8a103f8837deb80af03d481ac5bc8d5475f58";
+        value = hex"000000000000000000000000bb2180ebd78ce97360503434ed37fcf4a1df61c3";
         vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
-        slot = hex"d99a7cb5c85ff45a31aa0b5f37f50c1e3e0ba7b502eb0a97c078a396df6e5fc4";
+        slot = hex"ceb2ac3d439ba35adb9a3f2ba6c37d15a264e79156ee79334f5d4c00090812d2";
         value = hex"4f564d5f4c3143726f7373446f6d61696e4d657373656e676572000000000034";
         vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
         vm.etch(l1ERC721BridgeProxyAddress, l1ERC721BridgeProxyCode);
         slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(l1ERC721BridgeProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(addressManagerAddress, slot, value);
         vm.etch(optimismPortal2Address, optimismPortal2Code);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
@@ -382,7 +382,7 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
         value = hex"0000000000000000000000000000000000000000000000000000000000000101";
         vm.store(systemConfigProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(systemConfigProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
         value = hex"0000000000000000000000009965507d1a55bcc2695c58ba16fb37d819b0a4dc";
@@ -406,19 +406,19 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
         value = hex"000000000000000000000000ff00000000000000000000000000000000000000";
         vm.store(systemConfigProxyAddress, slot, value);
         slot = hex"383f291819e6d54073bc9a648251d97421076bdd101933c0c022219ce9580636";
-        value = hex"0000000000000000000000005207cfa0166e8de0fcdfd78b4d17b68587be306d";
+        value = hex"000000000000000000000000c7b87b2b892ea5c3cff47168881fe168c00377fb";
         vm.store(systemConfigProxyAddress, slot, value);
         slot = hex"46adcbebc6be8ce551740c29c47c8798210f23f7f4086c41752944352568d5a7";
-        value = hex"00000000000000000000000039af23e00f1e662025aa01b0ceda19542b78df99";
+        value = hex"000000000000000000000000d31598c909d9c935a9e35ba70d9a3dd47d4d5865";
         vm.store(systemConfigProxyAddress, slot, value);
         slot = hex"9904ba90dde5696cda05c9e0dab5cbaa0fea005ace4d11218a02ac668dad6376";
-        value = hex"000000000000000000000000d31598c909d9c935a9e35ba70d9a3dd47d4d5865";
+        value = hex"000000000000000000000000def3bca8c80064589e6787477ffa7dd616b5574f";
         vm.store(systemConfigProxyAddress, slot, value);
         slot = hex"52322a25d9f59ea17656545543306b7aef62bc0cc53a0e65ccfa0c75b97aa906";
-        value = hex"0000000000000000000000000c8b5822b6e02cda722174f19a1439a7495a3fa6";
+        value = hex"0000000000000000000000008b71b41d4dbeb2b6821d44692d3facaaf77480bb";
         vm.store(systemConfigProxyAddress, slot, value);
         slot = hex"4b6c74f9e688cb39801f2112c14a8c57232a3fc5202e1444126d4bce86eb19ac";
-        value = hex"0000000000000000000000001c23a6d89f95ef3148bcda8e242cab145bf9c0e4";
+        value = hex"000000000000000000000000978e3286eb805934215a88694d80b09aded68d90";
         vm.store(systemConfigProxyAddress, slot, value);
         slot = hex"a11ee3ab75b40e88a0105e935d17cd36c8faee0138320d776c411291bdbbb19f";
         value = hex"0000000000000000000000000000000000000000000000000000000000000001";
@@ -432,7 +432,7 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
         slot = hex"0000000000000000000000000000000000000000000000000000000000000005";
         value = hex"0000000000000000000000000000000000000000000000000000000000000004";
         vm.store(systemOwnerSafeAddress, slot, value);
-        slot = hex"9ab6929e7d0104b9744ecf48c9c83f65e34bb9eb80c70a88b6b8885e3bf62b15";
+        slot = hex"191cda7b5a8219e0cc3bb6c2b45be830e3ba520f78e119446a476c4147fcc284";
         value = hex"0000000000000000000000000000000000000000000000000000000000000001";
         vm.store(proxyAdminAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000005";
@@ -448,13 +448,13 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
         value = hex"0000000000000000000000000000000000000000000000000000000000000101";
         vm.store(l1StandardBridgeProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000032";
-        value = hex"0000000000000000000000004f559f30f5eb88d635fde1548c4267db8fab0351";
+        value = hex"000000000000000000000000deb1e9a6be7baf84208bb6e10ac9f9bbe1d70809";
         vm.store(l1StandardBridgeProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
-        value = hex"000000000000000000000000c7b87b2b892ea5c3cff47168881fe168c00377fb";
+        value = hex"00000000000000000000000020a42a5a785622c6ba2576b2d6e924aa82bfa11d";
         vm.store(l1StandardBridgeProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000003";
-        value = hex"0000000000000000000000005207cfa0166e8de0fcdfd78b4d17b68587be306d";
+        value = hex"000000000000000000000000c7b87b2b892ea5c3cff47168881fe168c00377fb";
         vm.store(l1StandardBridgeProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000004";
         value = hex"0000000000000000000000004200000000000000000000000000000000000010";
@@ -475,10 +475,10 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
         value = hex"0000000000000000000000000000000000000000000000000000000000000101";
         vm.store(l1ERC721BridgeProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000032";
-        value = hex"0000000000000000000000004f559f30f5eb88d635fde1548c4267db8fab0351";
+        value = hex"000000000000000000000000deb1e9a6be7baf84208bb6e10ac9f9bbe1d70809";
         vm.store(l1ERC721BridgeProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000001";
-        value = hex"0000000000000000000000005207cfa0166e8de0fcdfd78b4d17b68587be306d";
+        value = hex"000000000000000000000000c7b87b2b892ea5c3cff47168881fe168c00377fb";
         vm.store(l1ERC721BridgeProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000002";
         value = hex"0000000000000000000000004200000000000000000000000000000000000014";
@@ -489,13 +489,13 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
         slot = hex"0000000000000000000000000000000000000000000000000000000000000005";
         value = hex"0000000000000000000000000000000000000000000000000000000000000007";
         vm.store(systemOwnerSafeAddress, slot, value);
-        slot = hex"67ba7d8bdda390f76c7887f0749c8ddd97a5488c0685a6600f6146d45a37e9e3";
+        slot = hex"f6cecbacbfeb99e6ab0f02c22fd8a103f8837deb80af03d481ac5bc8d5475f58";
         value = hex"0000000000000000000000000000000000000000000000000000000000000002";
         vm.store(proxyAdminAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000005";
         value = hex"0000000000000000000000000000000000000000000000000000000000000008";
         vm.store(systemOwnerSafeAddress, slot, value);
-        slot = hex"d5dc64acc11f1f6863a0fcd1f905ec35afa9f95985626daaa4d59a538a25a7a8";
+        slot = hex"63c92109b91ecf3318ee316da9fdb1378fd8d900f912b2029945ff91daa463bf";
         value = hex"4f564d5f4c3143726f7373446f6d61696e4d657373656e676572000000000034";
         vm.store(proxyAdminAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000005";
@@ -511,13 +511,13 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
         value = hex"0000000000000000000001010000000000000000000000000000000000000000";
         vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
         slot = hex"00000000000000000000000000000000000000000000000000000000000000fb";
-        value = hex"0000000000000000000000004f559f30f5eb88d635fde1548c4267db8fab0351";
+        value = hex"000000000000000000000000deb1e9a6be7baf84208bb6e10ac9f9bbe1d70809";
         vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
         slot = hex"00000000000000000000000000000000000000000000000000000000000000fc";
-        value = hex"0000000000000000000000001c23a6d89f95ef3148bcda8e242cab145bf9c0e4";
+        value = hex"000000000000000000000000978e3286eb805934215a88694d80b09aded68d90";
         vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
         slot = hex"00000000000000000000000000000000000000000000000000000000000000fd";
-        value = hex"000000000000000000000000c7b87b2b892ea5c3cff47168881fe168c00377fb";
+        value = hex"00000000000000000000000020a42a5a785622c6ba2576b2d6e924aa82bfa11d";
         vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
         slot = hex"00000000000000000000000000000000000000000000000000000000000000cc";
         value = hex"000000000000000000000000000000000000000000000000000000000000dead";
@@ -541,7 +541,7 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
         value = hex"0000000000000000000000000000000000000000000000000000000000000101";
         vm.store(disputeGameFactoryProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(disputeGameFactoryProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
         value = hex"0000000000000000000000001804c8ab1f12e6bbf3894d4083f33e07309d1f38";
@@ -562,13 +562,13 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
         value = hex"0000000000000000000000000000000000000000000000000000000000000101";
         vm.store(delayedWETHProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
-        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
+        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
         vm.store(delayedWETHProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
         value = hex"0000000000000000000000001804c8ab1f12e6bbf3894d4083f33e07309d1f38";
         vm.store(delayedWETHProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000068";
-        value = hex"0000000000000000000000004f559f30f5eb88d635fde1548c4267db8fab0351";
+        value = hex"000000000000000000000000deb1e9a6be7baf84208bb6e10ac9f9bbe1d70809";
         vm.store(delayedWETHProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
         value = hex"0000000000000000000000000000000000000000000000000000000000000001";
@@ -577,7 +577,7 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
         value = hex"000000000000000000000000000000000000000000000000000000000000000c";
         vm.store(systemOwnerSafeAddress, slot, value);
         slot = hex"360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc";
-        value = hex"00000000000000000000000071f44b7281dfcd25d9a36798e1872f82942dd763";
+        value = hex"000000000000000000000000f74482139d1564b826994875cf6632eb5b134b25";
         vm.store(anchorStateRegistryProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
         value = hex"0000000000000000000000000000000000000000000000000000000000000001";
@@ -613,13 +613,13 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
         value = hex"0000000000000000000000000000000000000000000000000000000000000101";
         vm.store(optimismPortalProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000038";
-        value = hex"0000000000000000000000000c8b5822b6e02cda722174f19a1439a7495a3fa6";
+        value = hex"0000000000000000000000008b71b41d4dbeb2b6821d44692d3facaaf77480bb";
         vm.store(optimismPortalProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000037";
-        value = hex"000000000000000000000000c7b87b2b892ea5c3cff47168881fe168c00377fb";
+        value = hex"00000000000000000000000020a42a5a785622c6ba2576b2d6e924aa82bfa11d";
         vm.store(optimismPortalProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000035";
-        value = hex"00000000000000000000004f559f30f5eb88d635fde1548c4267db8fab035100";
+        value = hex"0000000000000000000000deb1e9a6be7baf84208bb6e10ac9f9bbe1d7080900";
         vm.store(optimismPortalProxyAddress, slot, value);
         slot = hex"0000000000000000000000000000000000000000000000000000000000000032";
         value = hex"000000000000000000000000000000000000000000000000000000000000dead";
@@ -635,11 +635,11 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
         vm.store(optimismPortalProxyAddress, slot, value);
         vm.etch(acc27Address, acc27Code);
         slot = hex"ffdfc1249c027f9191656349feb0761381bb32c9f557e01f419fd08754bf5a1b";
-        value = hex"0000000000000000000000002abb7cbb720020ee3c9ecf3915d14b6d1886a577";
+        value = hex"00000000000000000000000012e721c390f5728200a26bbef206a5f4f7e991f3";
         vm.store(disputeGameFactoryProxyAddress, slot, value);
         vm.etch(acc28Address, acc28Code);
         slot = hex"4d5a9bd2e41301728d41c8e705190becb4e74abe869f75bdb405b63716a35f9e";
-        value = hex"00000000000000000000000091752891a019fb365df0f99fa468bf19f91c2ac0";
+        value = hex"0000000000000000000000002abb7cbb720020ee3c9ecf3915d14b6d1886a577";
         vm.store(disputeGameFactoryProxyAddress, slot, value);
     }
 }