ci: bump ci builder `0.50.0` (#11334)

* ci: bump ci builder `0.50.0` Bumps the `ci-builder` image with an updated version of foundry. Foundry update: https://github.com/ethereum-optimism/optimism/pull/11325 Docker build: https://app.circleci.com/pipelines/github/ethereum-optimism/optimism/60263/workflows/154fd94a-4029-4e2f-8bce-4ea4c6d25897 * contracts-bedrock: fix tests after new foundry version * contracts-bedrock: comment why skip * test: better comments * gas-snapshot: regenerate * snapshots: update * snapshots: update * fix(ctb): Align expected ptr in `Bytes.slice` test An update to `forge-std` causes `bound` to set the free memory pointer at an unaligned offset. This commit updates the test such that the expected pointer is correctly aligned, without an assumption on the starting ptr's alignment. --------- Co-authored-by: clabby <ben@clab.by>

ci: bump ci builder `0.50.0` (#11334)
* ci: bump ci builder `0.50.0` Bumps the `ci-builder` image with an updated version of foundry. Foundry update: https://github.com/ethereum-optimism/optimism/pull/11325 Docker build: https://app.circleci.com/pipelines/github/ethereum-optimism/optimism/60263/workflows/154fd94a-4029-4e2f-8bce-4ea4c6d25897 * contracts-bedrock: fix tests after new foundry version * contracts-bedrock: comment why skip * test: better comments * gas-snapshot: regenerate * snapshots: update * snapshots: update * fix(ctb): Align expected ptr in `Bytes.slice` test An update to `forge-std` causes `bound` to set the free memory pointer at an unaligned offset. This commit updates the test such that the expected pointer is correctly aligned, without an assumption on the starting ptr's alignment. --------- Co-authored-by: clabby <ben@clab.by>
9dc125a9 · Mark Tyneway · GitHub · 0ab3e7ab · 9dc125a9 · 9dc125a9
Commit 9dc125a9 authored Aug 05, 2024 by Mark Tyneway Committed by GitHub Aug 05, 2024
9 changed files
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 parameters:
  ci_builder_image:
    type: string
-    default: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:v0.49.0
+    default: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:v0.50.0
  ci_builder_rust_image:
    type: string
    default: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder-rust:latest

--- a/packages/contracts-bedrock/.gas-snapshot
+++ b/packages/contracts-bedrock/.gas-snapshot
-GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 369380)
+GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 369356)
-GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2967520)
+GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2967496)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 561992)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 564483)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4074035)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4076526)
 GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 466947)
 GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3512629)
 GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 72624)

--- a/packages/contracts-bedrock/snapshots/state-diff/Kontrol-31337.json
+++ b/packages/contracts-bedrock/snapshots/state-diff/Kontrol-31337.json
--- a/packages/contracts-bedrock/test/L1/ResourceMetering.t.sol
+++ b/packages/contracts-bedrock/test/L1/ResourceMetering.t.sol
@@ -281,7 +281,13 @@ contract ArtifactResourceMetering_Test is Test {
    /// @dev Generates a CSV file. No more than the L1 block gas limit should
    ///      be supplied to the `meter` function to avoid long execution time.
+    ///      This test is skipped because there is no need to run it every time.
+    ///      It generates a CSV file on disk that can be used to analyze the
+    ///      gas usage and cost of the `ResourceMetering` contract. The next time
+    ///      that the gas usage needs to be analyzed, the skip may be removed.
    function test_meter_generateArtifact_succeeds() external {
+        vm.skip({ skipTest: true });
        vm.writeLine(
            outfile,
            "prevBaseFee,prevBoughtGas,prevBlockNumDiff,l1BaseFee,requestedGas,gasConsumed,ethPrice,usdCost,success"

--- a/packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummary.sol
+++ b/packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummary.sol
@@ -12,40 +12,40 @@ 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 = 0xBb2180ebd78ce97360503434eD37fcf4a1Df61c3;
+    address internal constant addressManagerAddress = 0x50EEf481cae4250d252Ae577A09bF514f224C6C4;
-    address internal constant anchorStateRegistryAddress = 0x610C37dd344e47D7848Da075a90128472140e80f;
+    address internal constant anchorStateRegistryAddress = 0xE2a80256d1dAFe06683F231F8e9561639Aa0e9b9;
-    address internal constant anchorStateRegistryProxyAddress = 0x39Af23E00F1e662025aA01b0cEdA19542B78DF99;
+    address internal constant anchorStateRegistryProxyAddress = 0xd6EAF4c146261653EE059077B78ED088Add54309;
    address internal constant delayedWETHAddress = 0x49BBFf1629824A1e7993Ab5c17AFa45D24AB28c9;
-    address internal constant delayedWETHProxyAddress = 0x5207CfA0166E8de0FCdFd78B4d17b68587bE306d;
+    address internal constant delayedWETHProxyAddress = 0xEF179756ea6525AFade217cA5aB0b1b5CfE0fd92;
    address internal constant disputeGameFactoryAddress = 0x20B168142354Cee65a32f6D8cf3033E592299765;
-    address internal constant disputeGameFactoryProxyAddress = 0xc7B87b2b892EA5C3CfF47168881FE168C00377FB;
+    address internal constant disputeGameFactoryProxyAddress = 0x5207CfA0166E8de0FCdFd78B4d17b68587bE306d;
    address internal constant l1CrossDomainMessengerAddress = 0x094e6508ba9d9bf1ce421fff3dE06aE56e67901b;
-    address internal constant l1CrossDomainMessengerProxyAddress = 0x0c8b5822b6e02CDa722174F19A1439A7495a3fA6;
+    address internal constant l1CrossDomainMessengerProxyAddress = 0xDeF3bca8c80064589E6787477FFa7Dd616B5574F;
    address internal constant l1ERC721BridgeAddress = 0x5C4F5e749A61a9503c4AAE8a9393e89609a0e804;
-    address internal constant l1ERC721BridgeProxyAddress = 0xDeF3bca8c80064589E6787477FFa7Dd616B5574F;
+    address internal constant l1ERC721BridgeProxyAddress = 0xD31598c909d9C935a9e35bA70d9a3DD47d4D5865;
    address internal constant l1StandardBridgeAddress = 0xb7900B27Be8f0E0fF65d1C3A4671e1220437dd2b;
-    address internal constant l1StandardBridgeProxyAddress = 0x1c23A6d89F95ef3148BCDA8E242cAb145bf9c0E4;
+    address internal constant l1StandardBridgeProxyAddress = 0x20A42a5a785622c6Ba2576B2D6e924aA82BFA11D;
    address internal constant l2OutputOracleAddress = 0x19652082F846171168Daf378C4fD3ee85a0D4A60;
-    address internal constant l2OutputOracleProxyAddress = 0xD31598c909d9C935a9e35bA70d9a3DD47d4D5865;
+    address internal constant l2OutputOracleProxyAddress = 0x39Af23E00F1e662025aA01b0cEdA19542B78DF99;
    address internal constant mipsAddress = 0xB3A0348310a0ff78E5FbDB7f14BB7d3e02d40773;
    address internal constant optimismMintableERC20FactoryAddress = 0x39Aea2Dd53f2d01c15877aCc2791af6BDD7aD567;
-    address internal constant optimismMintableERC20FactoryProxyAddress = 0x20A42a5a785622c6Ba2576B2D6e924aA82BFA11D;
+    address internal constant optimismMintableERC20FactoryProxyAddress = 0xc7B87b2b892EA5C3CfF47168881FE168C00377FB;
    address internal constant optimismPortalAddress = 0xbdD90485FCbcac869D5b5752179815a3103d8131;
    address internal constant optimismPortal2Address = 0x542e5F5d3934b6A8A8B4219cbc99D3D87a7137E1;
-    address internal constant optimismPortalProxyAddress = 0x978e3286EB805934215a88694d80b09aDed68D90;
+    address internal constant optimismPortalProxyAddress = 0x1c23A6d89F95ef3148BCDA8E242cAb145bf9c0E4;
    address internal constant preimageOracleAddress = 0x3bd7E801E51d48c5d94Ea68e8B801DFFC275De75;
    address internal constant protocolVersionsAddress = 0xfbfD64a6C0257F613feFCe050Aa30ecC3E3d7C3F;
-    address internal constant protocolVersionsProxyAddress = 0x416C42991d05b31E9A6dC209e91AD22b79D87Ae6;
+    address internal constant protocolVersionsProxyAddress = 0x4C52a6277b1B84121b3072C0c92b6Be0b7CC10F1;
-    address internal constant proxyAdminAddress = 0xDB8cFf278adCCF9E9b5da745B44E754fC4EE3C76;
+    address internal constant proxyAdminAddress = 0x62c20Aa1e0272312BC100b4e23B4DC1Ed96dD7D1;
-    address internal constant safeProxyFactoryAddress = 0x34A1D3fff3958843C43aD80F30b94c510645C316;
+    address internal constant safeProxyFactoryAddress = 0xA8452Ec99ce0C64f20701dB7dD3abDb607c00496;
-    address internal constant safeSingletonAddress = 0x90193C961A926261B756D1E5bb255e67ff9498A1;
+    address internal constant safeSingletonAddress = 0xBb2180ebd78ce97360503434eD37fcf4a1Df61c3;
    address internal constant superchainConfigAddress = 0x068E44eB31e111028c41598E4535be7468674D0A;
-    address internal constant superchainConfigProxyAddress = 0xDEb1E9a6Be7Baf84208BB6E10aC9F9bbE1D70809;
+    address internal constant superchainConfigProxyAddress = 0x4f559F30f5eB88D635FDe1548C4267DB8FaB0351;
    address internal constant systemConfigAddress = 0x67866A5052E5302aaD08e9f352331fd8622eB6DC;
-    address internal constant systemConfigProxyAddress = 0x8B71b41D4dBEb2b6821d44692d3fACAAf77480Bb;
+    address internal constant systemConfigProxyAddress = 0x0c8b5822b6e02CDa722174F19A1439A7495a3fA6;
-    address internal constant systemOwnerSafeAddress = 0x7EA964E5D864b95f6D7d2BD04dA897F6e31084b3;
+    address internal constant systemOwnerSafeAddress = 0x7C0c8a15773ED7B50E7c738D1aF4c5e3a2b210BD;
-    address internal constant acc32Address = 0xcE8C32b1493DB37767fAF988dEC9E80089f4f33c;
+    address internal constant acc32Address = 0x357A483a8923686E7fA454Ee93bbc11aFB114743;
-    address internal constant acc33Address = 0x357A483a8923686E7fA454Ee93bbc11aFB114743;
+    address internal constant acc33Address = 0xb6b1579AA54e2F61e621a40d5F2704D717B3544F;
    function recreateDeployment() public {
        bytes32 slot;
@@ -57,7 +57,7 @@ contract DeploymentSummary is DeploymentSummaryCode {
        vm.store(safeSingletonAddress, slot, value);
        vm.etch(systemOwnerSafeAddress, systemOwnerSafeCode);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
-        value = hex"00000000000000000000000090193c961a926261b756d1e5bb255e67ff9498a1";
+        value = hex"000000000000000000000000bb2180ebd78ce97360503434ed37fcf4a1df61c3";
        vm.store(systemOwnerSafeAddress, slot, value);
        slot = hex"e90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0";
        value = hex"0000000000000000000000001804c8ab1f12e6bbf3894d4083f33e07309d1f38";
@@ -83,14 +83,14 @@ contract DeploymentSummary is DeploymentSummaryCode {
        value = hex"0000000000000000000000001804c8ab1f12e6bbf3894d4083f33e07309d1f38";
        vm.store(proxyAdminAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000003";
-        value = hex"000000000000000000000000bb2180ebd78ce97360503434ed37fcf4a1df61c3";
+        value = hex"00000000000000000000000050eef481cae4250d252ae577a09bf514f224c6c4";
        vm.store(proxyAdminAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
-        value = hex"0000000000000000000000007ea964e5d864b95f6d7d2bd04da897f6e31084b3";
+        value = hex"0000000000000000000000007c0c8a15773ed7b50e7c738d1af4c5e3a2b210bd";
        vm.store(proxyAdminAddress, slot, value);
        vm.etch(superchainConfigProxyAddress, superchainConfigProxyCode);
        slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(superchainConfigProxyAddress, slot, value);
        vm.etch(superchainConfigAddress, superchainConfigCode);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
@@ -122,7 +122,7 @@ contract DeploymentSummary is DeploymentSummaryCode {
        vm.store(superchainConfigProxyAddress, slot, value);
        vm.etch(protocolVersionsProxyAddress, protocolVersionsProxyCode);
        slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(protocolVersionsProxyAddress, slot, value);
        vm.etch(protocolVersionsAddress, protocolVersionsCode);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
@@ -153,7 +153,7 @@ contract DeploymentSummary is DeploymentSummaryCode {
        value = hex"0000000000000000000000000000000000000000000000000000000000000101";
        vm.store(protocolVersionsProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(protocolVersionsProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
        value = hex"0000000000000000000000009965507d1a55bcc2695c58ba16fb37d819b0a4dc";
@@ -163,49 +163,49 @@ contract DeploymentSummary is DeploymentSummaryCode {
        vm.store(protocolVersionsProxyAddress, slot, value);
        vm.etch(optimismPortalProxyAddress, optimismPortalProxyCode);
        slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(optimismPortalProxyAddress, slot, value);
        vm.etch(systemConfigProxyAddress, systemConfigProxyCode);
        slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(systemConfigProxyAddress, slot, value);
        vm.etch(l1StandardBridgeProxyAddress, l1StandardBridgeProxyCode);
        slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(l1StandardBridgeProxyAddress, slot, value);
        vm.etch(l1CrossDomainMessengerProxyAddress, l1CrossDomainMessengerProxyCode);
-        slot = hex"a8f0d50211ac8ff1a40793a899dff3ced4762e0466f69b0078ab7b00d037835c";
+        slot = hex"191cda7b5a8219e0cc3bb6c2b45be830e3ba520f78e119446a476c4147fcc284";
-        value = hex"000000000000000000000000bb2180ebd78ce97360503434ed37fcf4a1df61c3";
+        value = hex"00000000000000000000000050eef481cae4250d252ae577a09bf514f224c6c4";
        vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
-        slot = hex"eae32376463217751b8fa4dea8c38ab253664fa3605de6d85d2e790aa970f2b8";
+        slot = hex"6822ddba83a78589c753bb747cf4919773ec1d36eeb0bb2a09d64b6d87adda0b";
        value = hex"4f564d5f4c3143726f7373446f6d61696e4d657373656e676572000000000034";
        vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
        vm.etch(optimismMintableERC20FactoryProxyAddress, optimismMintableERC20FactoryProxyCode);
        slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(optimismMintableERC20FactoryProxyAddress, slot, value);
        vm.etch(l1ERC721BridgeProxyAddress, l1ERC721BridgeProxyCode);
        slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(l1ERC721BridgeProxyAddress, slot, value);
        vm.etch(disputeGameFactoryProxyAddress, disputeGameFactoryProxyCode);
        slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(disputeGameFactoryProxyAddress, slot, value);
        vm.etch(l2OutputOracleProxyAddress, l2OutputOracleProxyCode);
        slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(l2OutputOracleProxyAddress, slot, value);
        vm.etch(delayedWETHProxyAddress, delayedWETHProxyCode);
        slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(delayedWETHProxyAddress, slot, value);
        vm.etch(anchorStateRegistryProxyAddress, anchorStateRegistryProxyCode);
        slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(anchorStateRegistryProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(addressManagerAddress, slot, value);
        vm.etch(l1CrossDomainMessengerAddress, l1CrossDomainMessengerCode);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
@@ -440,13 +440,13 @@ contract DeploymentSummary is DeploymentSummaryCode {
        value = hex"0000000000000000000000000000000000000000000000000000000000000101";
        vm.store(optimismPortalProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000036";
-        value = hex"000000000000000000000000d31598c909d9c935a9e35ba70d9a3dd47d4d5865";
+        value = hex"00000000000000000000000039af23e00f1e662025aa01b0ceda19542b78df99";
        vm.store(optimismPortalProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000037";
-        value = hex"0000000000000000000000008b71b41d4dbeb2b6821d44692d3facaaf77480bb";
+        value = hex"0000000000000000000000000c8b5822b6e02cda722174f19a1439a7495a3fa6";
        vm.store(optimismPortalProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000035";
-        value = hex"0000000000000000000000deb1e9a6be7baf84208bb6e10ac9f9bbe1d7080900";
+        value = hex"00000000000000000000004f559f30f5eb88d635fde1548c4267db8fab035100";
        vm.store(optimismPortalProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000032";
        value = hex"000000000000000000000000000000000000000000000000000000000000dead";
@@ -470,7 +470,7 @@ contract DeploymentSummary is DeploymentSummaryCode {
        value = hex"0000000000000000000000000000000000000000000000000000000000000101";
        vm.store(systemConfigProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(systemConfigProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
        value = hex"0000000000000000000000009965507d1a55bcc2695c58ba16fb37d819b0a4dc";
@@ -494,22 +494,22 @@ contract DeploymentSummary is DeploymentSummaryCode {
        value = hex"000000000000000000000000ff00000000000000000000000000000000000000";
        vm.store(systemConfigProxyAddress, slot, value);
        slot = hex"383f291819e6d54073bc9a648251d97421076bdd101933c0c022219ce9580636";
-        value = hex"0000000000000000000000000c8b5822b6e02cda722174f19a1439a7495a3fa6";
+        value = hex"000000000000000000000000def3bca8c80064589e6787477ffa7dd616b5574f";
        vm.store(systemConfigProxyAddress, slot, value);
        slot = hex"46adcbebc6be8ce551740c29c47c8798210f23f7f4086c41752944352568d5a7";
-        value = hex"000000000000000000000000def3bca8c80064589e6787477ffa7dd616b5574f";
+        value = hex"000000000000000000000000d31598c909d9c935a9e35ba70d9a3dd47d4d5865";
        vm.store(systemConfigProxyAddress, slot, value);
        slot = hex"9904ba90dde5696cda05c9e0dab5cbaa0fea005ace4d11218a02ac668dad6376";
-        value = hex"0000000000000000000000001c23a6d89f95ef3148bcda8e242cab145bf9c0e4";
+        value = hex"00000000000000000000000020a42a5a785622c6ba2576b2d6e924aa82bfa11d";
        vm.store(systemConfigProxyAddress, slot, value);
        slot = hex"52322a25d9f59ea17656545543306b7aef62bc0cc53a0e65ccfa0c75b97aa906";
-        value = hex"000000000000000000000000c7b87b2b892ea5c3cff47168881fe168c00377fb";
+        value = hex"0000000000000000000000005207cfa0166e8de0fcdfd78b4d17b68587be306d";
        vm.store(systemConfigProxyAddress, slot, value);
        slot = hex"4b6c74f9e688cb39801f2112c14a8c57232a3fc5202e1444126d4bce86eb19ac";
-        value = hex"000000000000000000000000978e3286eb805934215a88694d80b09aded68d90";
+        value = hex"0000000000000000000000001c23a6d89f95ef3148bcda8e242cab145bf9c0e4";
        vm.store(systemConfigProxyAddress, slot, value);
        slot = hex"a04c5bb938ca6fc46d95553abf0a76345ce3e722a30bf4f74928b8e7d852320c";
-        value = hex"00000000000000000000000020a42a5a785622c6ba2576b2d6e924aa82bfa11d";
+        value = hex"000000000000000000000000c7b87b2b892ea5c3cff47168881fe168c00377fb";
        vm.store(systemConfigProxyAddress, slot, value);
        slot = hex"a11ee3ab75b40e88a0105e935d17cd36c8faee0138320d776c411291bdbbb19f";
        value = hex"0000000000000000000000000000000000000000000000000000000000000001";
@@ -523,7 +523,7 @@ contract DeploymentSummary is DeploymentSummaryCode {
        slot = hex"0000000000000000000000000000000000000000000000000000000000000005";
        value = hex"0000000000000000000000000000000000000000000000000000000000000005";
        vm.store(systemOwnerSafeAddress, slot, value);
-        slot = hex"727598a658f6983be3a9f29beef55aaee89ef8a176baeeacbe7edf5ff94a781b";
+        slot = hex"540cf4e2f45b866b44f44bde51e109474016dc46a0670fbe1684ad8eaf90fdc3";
        value = hex"0000000000000000000000000000000000000000000000000000000000000001";
        vm.store(proxyAdminAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000005";
@@ -539,13 +539,13 @@ contract DeploymentSummary is DeploymentSummaryCode {
        value = hex"0000000000000000000000000000000000000000000000000000000000000101";
        vm.store(l1StandardBridgeProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000032";
-        value = hex"000000000000000000000000deb1e9a6be7baf84208bb6e10ac9f9bbe1d70809";
+        value = hex"0000000000000000000000004f559f30f5eb88d635fde1548c4267db8fab0351";
        vm.store(l1StandardBridgeProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
-        value = hex"0000000000000000000000008b71b41d4dbeb2b6821d44692d3facaaf77480bb";
+        value = hex"0000000000000000000000000c8b5822b6e02cda722174f19a1439a7495a3fa6";
        vm.store(l1StandardBridgeProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000003";
-        value = hex"0000000000000000000000000c8b5822b6e02cda722174f19a1439a7495a3fa6";
+        value = hex"000000000000000000000000def3bca8c80064589e6787477ffa7dd616b5574f";
        vm.store(l1StandardBridgeProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000004";
        value = hex"0000000000000000000000004200000000000000000000000000000000000010";
@@ -566,10 +566,10 @@ contract DeploymentSummary is DeploymentSummaryCode {
        value = hex"0000000000000000000000000000000000000000000000000000000000000101";
        vm.store(l1ERC721BridgeProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000032";
-        value = hex"000000000000000000000000deb1e9a6be7baf84208bb6e10ac9f9bbe1d70809";
+        value = hex"0000000000000000000000004f559f30f5eb88d635fde1548c4267db8fab0351";
        vm.store(l1ERC721BridgeProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000001";
-        value = hex"0000000000000000000000000c8b5822b6e02cda722174f19a1439a7495a3fa6";
+        value = hex"000000000000000000000000def3bca8c80064589e6787477ffa7dd616b5574f";
        vm.store(l1ERC721BridgeProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000002";
        value = hex"0000000000000000000000004200000000000000000000000000000000000014";
@@ -590,7 +590,7 @@ contract DeploymentSummary is DeploymentSummaryCode {
        value = hex"0000000000000000000000000000000000000000000000000000000000000101";
        vm.store(optimismMintableERC20FactoryProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000001";
-        value = hex"0000000000000000000000001c23a6d89f95ef3148bcda8e242cab145bf9c0e4";
+        value = hex"00000000000000000000000020a42a5a785622c6ba2576b2d6e924aa82bfa11d";
        vm.store(optimismMintableERC20FactoryProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
        value = hex"0000000000000000000000000000000000000000000000000000000000000001";
@@ -598,13 +598,13 @@ contract DeploymentSummary is DeploymentSummaryCode {
        slot = hex"0000000000000000000000000000000000000000000000000000000000000005";
        value = hex"0000000000000000000000000000000000000000000000000000000000000009";
        vm.store(systemOwnerSafeAddress, slot, value);
-        slot = hex"a8f0d50211ac8ff1a40793a899dff3ced4762e0466f69b0078ab7b00d037835c";
+        slot = hex"191cda7b5a8219e0cc3bb6c2b45be830e3ba520f78e119446a476c4147fcc284";
        value = hex"0000000000000000000000000000000000000000000000000000000000000002";
        vm.store(proxyAdminAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000005";
        value = hex"000000000000000000000000000000000000000000000000000000000000000a";
        vm.store(systemOwnerSafeAddress, slot, value);
-        slot = hex"7cda2d9a7dd1a58982b7fac9315bdc1ed8c92aeb9c22cd8555aaa54972f01ccb";
+        slot = hex"89a8cb4d9b6f179480a9e676431122d6ba6a5fb2aa9462528e7e48e497a5c045";
        value = hex"4f564d5f4c3143726f7373446f6d61696e4d657373656e676572000000000034";
        vm.store(proxyAdminAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000005";
@@ -620,13 +620,13 @@ contract DeploymentSummary is DeploymentSummaryCode {
        value = hex"0000000000000000000001010000000000000000000000000000000000000000";
        vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
        slot = hex"00000000000000000000000000000000000000000000000000000000000000fb";
-        value = hex"000000000000000000000000deb1e9a6be7baf84208bb6e10ac9f9bbe1d70809";
+        value = hex"0000000000000000000000004f559f30f5eb88d635fde1548c4267db8fab0351";
        vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
        slot = hex"00000000000000000000000000000000000000000000000000000000000000fc";
-        value = hex"000000000000000000000000978e3286eb805934215a88694d80b09aded68d90";
+        value = hex"0000000000000000000000001c23a6d89f95ef3148bcda8e242cab145bf9c0e4";
        vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
        slot = hex"00000000000000000000000000000000000000000000000000000000000000fd";
-        value = hex"0000000000000000000000008b71b41d4dbeb2b6821d44692d3facaaf77480bb";
+        value = hex"0000000000000000000000000c8b5822b6e02cda722174f19a1439a7495a3fa6";
        vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
        slot = hex"00000000000000000000000000000000000000000000000000000000000000cc";
        value = hex"000000000000000000000000000000000000000000000000000000000000dead";
@@ -686,7 +686,7 @@ contract DeploymentSummary is DeploymentSummaryCode {
        value = hex"0000000000000000000000000000000000000000000000000000000000000101";
        vm.store(disputeGameFactoryProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(disputeGameFactoryProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
        value = hex"0000000000000000000000001804c8ab1f12e6bbf3894d4083f33e07309d1f38";
@@ -707,13 +707,13 @@ contract DeploymentSummary is DeploymentSummaryCode {
        value = hex"0000000000000000000000000000000000000000000000000000000000000101";
        vm.store(delayedWETHProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(delayedWETHProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
        value = hex"0000000000000000000000001804c8ab1f12e6bbf3894d4083f33e07309d1f38";
        vm.store(delayedWETHProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000068";
-        value = hex"000000000000000000000000deb1e9a6be7baf84208bb6e10ac9f9bbe1d70809";
+        value = hex"0000000000000000000000004f559f30f5eb88d635fde1548c4267db8fab0351";
        vm.store(delayedWETHProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
        value = hex"0000000000000000000000000000000000000000000000000000000000000001";
@@ -722,7 +722,7 @@ contract DeploymentSummary is DeploymentSummaryCode {
        value = hex"000000000000000000000000000000000000000000000000000000000000000f";
        vm.store(systemOwnerSafeAddress, slot, value);
        slot = hex"360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc";
-        value = hex"000000000000000000000000610c37dd344e47d7848da075a90128472140e80f";
+        value = hex"000000000000000000000000e2a80256d1dafe06683f231f8e9561639aa0e9b9";
        vm.store(anchorStateRegistryProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
        value = hex"0000000000000000000000000000000000000000000000000000000000000001";
@@ -750,17 +750,17 @@ contract DeploymentSummary is DeploymentSummaryCode {
        vm.store(anchorStateRegistryProxyAddress, slot, value);
        vm.etch(acc32Address, acc32Code);
        slot = hex"ffdfc1249c027f9191656349feb0761381bb32c9f557e01f419fd08754bf5a1b";
-        value = hex"000000000000000000000000ce8c32b1493db37767faf988dec9e80089f4f33c";
+        value = hex"000000000000000000000000357a483a8923686e7fa454ee93bbc11afb114743";
        vm.store(disputeGameFactoryProxyAddress, slot, value);
        vm.etch(acc33Address, acc33Code);
        slot = hex"4d5a9bd2e41301728d41c8e705190becb4e74abe869f75bdb405b63716a35f9e";
-        value = hex"000000000000000000000000357a483a8923686e7fa454ee93bbc11afb114743";
+        value = hex"000000000000000000000000b6b1579aa54e2f61e621a40d5f2704d717b3544f";
        vm.store(disputeGameFactoryProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
-        value = hex"0000000000000000000000007ea964e5d864b95f6d7d2bd04da897f6e31084b3";
+        value = hex"0000000000000000000000007c0c8a15773ed7b50e7c738d1af4c5e3a2b210bd";
        vm.store(disputeGameFactoryProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
-        value = hex"0000000000000000000000007ea964e5d864b95f6d7d2bd04da897f6e31084b3";
+        value = hex"0000000000000000000000007c0c8a15773ed7b50e7c738d1af4c5e3a2b210bd";
        vm.store(delayedWETHProxyAddress, slot, value);
    }
 }
--- a/packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummaryCode.sol
+++ b/packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummaryCode.sol
--- a/packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummaryFaultProofs.sol
+++ b/packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummaryFaultProofs.sol
@@ -12,40 +12,40 @@ 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 = 0xBb2180ebd78ce97360503434eD37fcf4a1Df61c3;
+    address internal constant addressManagerAddress = 0x50EEf481cae4250d252Ae577A09bF514f224C6C4;
-    address internal constant anchorStateRegistryAddress = 0x610C37dd344e47D7848Da075a90128472140e80f;
+    address internal constant anchorStateRegistryAddress = 0xE2a80256d1dAFe06683F231F8e9561639Aa0e9b9;
-    address internal constant anchorStateRegistryProxyAddress = 0x39Af23E00F1e662025aA01b0cEdA19542B78DF99;
+    address internal constant anchorStateRegistryProxyAddress = 0xd6EAF4c146261653EE059077B78ED088Add54309;
    address internal constant delayedWETHAddress = 0x49BBFf1629824A1e7993Ab5c17AFa45D24AB28c9;
-    address internal constant delayedWETHProxyAddress = 0x5207CfA0166E8de0FCdFd78B4d17b68587bE306d;
+    address internal constant delayedWETHProxyAddress = 0xEF179756ea6525AFade217cA5aB0b1b5CfE0fd92;
    address internal constant disputeGameFactoryAddress = 0x20B168142354Cee65a32f6D8cf3033E592299765;
-    address internal constant disputeGameFactoryProxyAddress = 0xc7B87b2b892EA5C3CfF47168881FE168C00377FB;
+    address internal constant disputeGameFactoryProxyAddress = 0x5207CfA0166E8de0FCdFd78B4d17b68587bE306d;
    address internal constant l1CrossDomainMessengerAddress = 0x094e6508ba9d9bf1ce421fff3dE06aE56e67901b;
-    address internal constant l1CrossDomainMessengerProxyAddress = 0x0c8b5822b6e02CDa722174F19A1439A7495a3fA6;
+    address internal constant l1CrossDomainMessengerProxyAddress = 0xDeF3bca8c80064589E6787477FFa7Dd616B5574F;
    address internal constant l1ERC721BridgeAddress = 0x5C4F5e749A61a9503c4AAE8a9393e89609a0e804;
-    address internal constant l1ERC721BridgeProxyAddress = 0xDeF3bca8c80064589E6787477FFa7Dd616B5574F;
+    address internal constant l1ERC721BridgeProxyAddress = 0xD31598c909d9C935a9e35bA70d9a3DD47d4D5865;
    address internal constant l1StandardBridgeAddress = 0xb7900B27Be8f0E0fF65d1C3A4671e1220437dd2b;
-    address internal constant l1StandardBridgeProxyAddress = 0x1c23A6d89F95ef3148BCDA8E242cAb145bf9c0E4;
+    address internal constant l1StandardBridgeProxyAddress = 0x20A42a5a785622c6Ba2576B2D6e924aA82BFA11D;
    address internal constant l2OutputOracleAddress = 0x19652082F846171168Daf378C4fD3ee85a0D4A60;
-    address internal constant l2OutputOracleProxyAddress = 0xD31598c909d9C935a9e35bA70d9a3DD47d4D5865;
+    address internal constant l2OutputOracleProxyAddress = 0x39Af23E00F1e662025aA01b0cEdA19542B78DF99;
    address internal constant mipsAddress = 0xB3A0348310a0ff78E5FbDB7f14BB7d3e02d40773;
    address internal constant optimismMintableERC20FactoryAddress = 0x39Aea2Dd53f2d01c15877aCc2791af6BDD7aD567;
-    address internal constant optimismMintableERC20FactoryProxyAddress = 0x20A42a5a785622c6Ba2576B2D6e924aA82BFA11D;
+    address internal constant optimismMintableERC20FactoryProxyAddress = 0xc7B87b2b892EA5C3CfF47168881FE168C00377FB;
    address internal constant optimismPortalAddress = 0xbdD90485FCbcac869D5b5752179815a3103d8131;
    address internal constant optimismPortal2Address = 0x542e5F5d3934b6A8A8B4219cbc99D3D87a7137E1;
-    address internal constant optimismPortalProxyAddress = 0x978e3286EB805934215a88694d80b09aDed68D90;
+    address internal constant optimismPortalProxyAddress = 0x1c23A6d89F95ef3148BCDA8E242cAb145bf9c0E4;
    address internal constant preimageOracleAddress = 0x3bd7E801E51d48c5d94Ea68e8B801DFFC275De75;
    address internal constant protocolVersionsAddress = 0xfbfD64a6C0257F613feFCe050Aa30ecC3E3d7C3F;
-    address internal constant protocolVersionsProxyAddress = 0x416C42991d05b31E9A6dC209e91AD22b79D87Ae6;
+    address internal constant protocolVersionsProxyAddress = 0x4C52a6277b1B84121b3072C0c92b6Be0b7CC10F1;
-    address internal constant proxyAdminAddress = 0xDB8cFf278adCCF9E9b5da745B44E754fC4EE3C76;
+    address internal constant proxyAdminAddress = 0x62c20Aa1e0272312BC100b4e23B4DC1Ed96dD7D1;
-    address internal constant safeProxyFactoryAddress = 0x34A1D3fff3958843C43aD80F30b94c510645C316;
+    address internal constant safeProxyFactoryAddress = 0xA8452Ec99ce0C64f20701dB7dD3abDb607c00496;
-    address internal constant safeSingletonAddress = 0x90193C961A926261B756D1E5bb255e67ff9498A1;
+    address internal constant safeSingletonAddress = 0xBb2180ebd78ce97360503434eD37fcf4a1Df61c3;
    address internal constant superchainConfigAddress = 0x068E44eB31e111028c41598E4535be7468674D0A;
-    address internal constant superchainConfigProxyAddress = 0xDEb1E9a6Be7Baf84208BB6E10aC9F9bbE1D70809;
+    address internal constant superchainConfigProxyAddress = 0x4f559F30f5eB88D635FDe1548C4267DB8FaB0351;
    address internal constant systemConfigAddress = 0x67866A5052E5302aaD08e9f352331fd8622eB6DC;
-    address internal constant systemConfigProxyAddress = 0x8B71b41D4dBEb2b6821d44692d3fACAAf77480Bb;
+    address internal constant systemConfigProxyAddress = 0x0c8b5822b6e02CDa722174F19A1439A7495a3fA6;
-    address internal constant systemOwnerSafeAddress = 0x7EA964E5D864b95f6D7d2BD04dA897F6e31084b3;
+    address internal constant systemOwnerSafeAddress = 0x7C0c8a15773ED7B50E7c738D1aF4c5e3a2b210BD;
-    address internal constant acc32Address = 0xcE8C32b1493DB37767fAF988dEC9E80089f4f33c;
+    address internal constant acc32Address = 0x357A483a8923686E7fA454Ee93bbc11aFB114743;
-    address internal constant acc33Address = 0x357A483a8923686E7fA454Ee93bbc11aFB114743;
+    address internal constant acc33Address = 0xb6b1579AA54e2F61e621a40d5F2704D717B3544F;
    function recreateDeployment() public {
        bytes32 slot;
@@ -57,7 +57,7 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
        vm.store(safeSingletonAddress, slot, value);
        vm.etch(systemOwnerSafeAddress, systemOwnerSafeCode);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
-        value = hex"00000000000000000000000090193c961a926261b756d1e5bb255e67ff9498a1";
+        value = hex"000000000000000000000000bb2180ebd78ce97360503434ed37fcf4a1df61c3";
        vm.store(systemOwnerSafeAddress, slot, value);
        slot = hex"e90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0";
        value = hex"0000000000000000000000001804c8ab1f12e6bbf3894d4083f33e07309d1f38";
@@ -83,14 +83,14 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
        value = hex"0000000000000000000000001804c8ab1f12e6bbf3894d4083f33e07309d1f38";
        vm.store(proxyAdminAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000003";
-        value = hex"000000000000000000000000bb2180ebd78ce97360503434ed37fcf4a1df61c3";
+        value = hex"00000000000000000000000050eef481cae4250d252ae577a09bf514f224c6c4";
        vm.store(proxyAdminAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
-        value = hex"0000000000000000000000007ea964e5d864b95f6d7d2bd04da897f6e31084b3";
+        value = hex"0000000000000000000000007c0c8a15773ed7b50e7c738d1af4c5e3a2b210bd";
        vm.store(proxyAdminAddress, slot, value);
        vm.etch(superchainConfigProxyAddress, superchainConfigProxyCode);
        slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(superchainConfigProxyAddress, slot, value);
        vm.etch(superchainConfigAddress, superchainConfigCode);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
@@ -122,7 +122,7 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
        vm.store(superchainConfigProxyAddress, slot, value);
        vm.etch(protocolVersionsProxyAddress, protocolVersionsProxyCode);
        slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(protocolVersionsProxyAddress, slot, value);
        vm.etch(protocolVersionsAddress, protocolVersionsCode);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
@@ -153,7 +153,7 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
        value = hex"0000000000000000000000000000000000000000000000000000000000000101";
        vm.store(protocolVersionsProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(protocolVersionsProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
        value = hex"0000000000000000000000009965507d1a55bcc2695c58ba16fb37d819b0a4dc";
@@ -163,49 +163,49 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
        vm.store(protocolVersionsProxyAddress, slot, value);
        vm.etch(optimismPortalProxyAddress, optimismPortalProxyCode);
        slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(optimismPortalProxyAddress, slot, value);
        vm.etch(systemConfigProxyAddress, systemConfigProxyCode);
        slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(systemConfigProxyAddress, slot, value);
        vm.etch(l1StandardBridgeProxyAddress, l1StandardBridgeProxyCode);
        slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(l1StandardBridgeProxyAddress, slot, value);
        vm.etch(l1CrossDomainMessengerProxyAddress, l1CrossDomainMessengerProxyCode);
-        slot = hex"a8f0d50211ac8ff1a40793a899dff3ced4762e0466f69b0078ab7b00d037835c";
+        slot = hex"191cda7b5a8219e0cc3bb6c2b45be830e3ba520f78e119446a476c4147fcc284";
-        value = hex"000000000000000000000000bb2180ebd78ce97360503434ed37fcf4a1df61c3";
+        value = hex"00000000000000000000000050eef481cae4250d252ae577a09bf514f224c6c4";
        vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
-        slot = hex"eae32376463217751b8fa4dea8c38ab253664fa3605de6d85d2e790aa970f2b8";
+        slot = hex"6822ddba83a78589c753bb747cf4919773ec1d36eeb0bb2a09d64b6d87adda0b";
        value = hex"4f564d5f4c3143726f7373446f6d61696e4d657373656e676572000000000034";
        vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
        vm.etch(optimismMintableERC20FactoryProxyAddress, optimismMintableERC20FactoryProxyCode);
        slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(optimismMintableERC20FactoryProxyAddress, slot, value);
        vm.etch(l1ERC721BridgeProxyAddress, l1ERC721BridgeProxyCode);
        slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(l1ERC721BridgeProxyAddress, slot, value);
        vm.etch(disputeGameFactoryProxyAddress, disputeGameFactoryProxyCode);
        slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(disputeGameFactoryProxyAddress, slot, value);
        vm.etch(l2OutputOracleProxyAddress, l2OutputOracleProxyCode);
        slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(l2OutputOracleProxyAddress, slot, value);
        vm.etch(delayedWETHProxyAddress, delayedWETHProxyCode);
        slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(delayedWETHProxyAddress, slot, value);
        vm.etch(anchorStateRegistryProxyAddress, anchorStateRegistryProxyCode);
        slot = hex"b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(anchorStateRegistryProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(addressManagerAddress, slot, value);
        vm.etch(l1CrossDomainMessengerAddress, l1CrossDomainMessengerCode);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
@@ -440,13 +440,13 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
        value = hex"0000000000000000000000000000000000000000000000000000000000000101";
        vm.store(optimismPortalProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000038";
-        value = hex"000000000000000000000000c7b87b2b892ea5c3cff47168881fe168c00377fb";
+        value = hex"0000000000000000000000005207cfa0166e8de0fcdfd78b4d17b68587be306d";
        vm.store(optimismPortalProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000037";
-        value = hex"0000000000000000000000008b71b41d4dbeb2b6821d44692d3facaaf77480bb";
+        value = hex"0000000000000000000000000c8b5822b6e02cda722174f19a1439a7495a3fa6";
        vm.store(optimismPortalProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000035";
-        value = hex"0000000000000000000000deb1e9a6be7baf84208bb6e10ac9f9bbe1d7080900";
+        value = hex"00000000000000000000004f559f30f5eb88d635fde1548c4267db8fab035100";
        vm.store(optimismPortalProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000032";
        value = hex"000000000000000000000000000000000000000000000000000000000000dead";
@@ -473,7 +473,7 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
        value = hex"0000000000000000000000000000000000000000000000000000000000000101";
        vm.store(systemConfigProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(systemConfigProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
        value = hex"0000000000000000000000009965507d1a55bcc2695c58ba16fb37d819b0a4dc";
@@ -497,22 +497,22 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
        value = hex"000000000000000000000000ff00000000000000000000000000000000000000";
        vm.store(systemConfigProxyAddress, slot, value);
        slot = hex"383f291819e6d54073bc9a648251d97421076bdd101933c0c022219ce9580636";
-        value = hex"0000000000000000000000000c8b5822b6e02cda722174f19a1439a7495a3fa6";
+        value = hex"000000000000000000000000def3bca8c80064589e6787477ffa7dd616b5574f";
        vm.store(systemConfigProxyAddress, slot, value);
        slot = hex"46adcbebc6be8ce551740c29c47c8798210f23f7f4086c41752944352568d5a7";
-        value = hex"000000000000000000000000def3bca8c80064589e6787477ffa7dd616b5574f";
+        value = hex"000000000000000000000000d31598c909d9c935a9e35ba70d9a3dd47d4d5865";
        vm.store(systemConfigProxyAddress, slot, value);
        slot = hex"9904ba90dde5696cda05c9e0dab5cbaa0fea005ace4d11218a02ac668dad6376";
-        value = hex"0000000000000000000000001c23a6d89f95ef3148bcda8e242cab145bf9c0e4";
+        value = hex"00000000000000000000000020a42a5a785622c6ba2576b2d6e924aa82bfa11d";
        vm.store(systemConfigProxyAddress, slot, value);
        slot = hex"52322a25d9f59ea17656545543306b7aef62bc0cc53a0e65ccfa0c75b97aa906";
-        value = hex"000000000000000000000000c7b87b2b892ea5c3cff47168881fe168c00377fb";
+        value = hex"0000000000000000000000005207cfa0166e8de0fcdfd78b4d17b68587be306d";
        vm.store(systemConfigProxyAddress, slot, value);
        slot = hex"4b6c74f9e688cb39801f2112c14a8c57232a3fc5202e1444126d4bce86eb19ac";
-        value = hex"000000000000000000000000978e3286eb805934215a88694d80b09aded68d90";
+        value = hex"0000000000000000000000001c23a6d89f95ef3148bcda8e242cab145bf9c0e4";
        vm.store(systemConfigProxyAddress, slot, value);
        slot = hex"a04c5bb938ca6fc46d95553abf0a76345ce3e722a30bf4f74928b8e7d852320c";
-        value = hex"00000000000000000000000020a42a5a785622c6ba2576b2d6e924aa82bfa11d";
+        value = hex"000000000000000000000000c7b87b2b892ea5c3cff47168881fe168c00377fb";
        vm.store(systemConfigProxyAddress, slot, value);
        slot = hex"a11ee3ab75b40e88a0105e935d17cd36c8faee0138320d776c411291bdbbb19f";
        value = hex"0000000000000000000000000000000000000000000000000000000000000001";
@@ -526,7 +526,7 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
        slot = hex"0000000000000000000000000000000000000000000000000000000000000005";
        value = hex"0000000000000000000000000000000000000000000000000000000000000005";
        vm.store(systemOwnerSafeAddress, slot, value);
-        slot = hex"727598a658f6983be3a9f29beef55aaee89ef8a176baeeacbe7edf5ff94a781b";
+        slot = hex"540cf4e2f45b866b44f44bde51e109474016dc46a0670fbe1684ad8eaf90fdc3";
        value = hex"0000000000000000000000000000000000000000000000000000000000000001";
        vm.store(proxyAdminAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000005";
@@ -542,13 +542,13 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
        value = hex"0000000000000000000000000000000000000000000000000000000000000101";
        vm.store(l1StandardBridgeProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000032";
-        value = hex"000000000000000000000000deb1e9a6be7baf84208bb6e10ac9f9bbe1d70809";
+        value = hex"0000000000000000000000004f559f30f5eb88d635fde1548c4267db8fab0351";
        vm.store(l1StandardBridgeProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
-        value = hex"0000000000000000000000008b71b41d4dbeb2b6821d44692d3facaaf77480bb";
+        value = hex"0000000000000000000000000c8b5822b6e02cda722174f19a1439a7495a3fa6";
        vm.store(l1StandardBridgeProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000003";
-        value = hex"0000000000000000000000000c8b5822b6e02cda722174f19a1439a7495a3fa6";
+        value = hex"000000000000000000000000def3bca8c80064589e6787477ffa7dd616b5574f";
        vm.store(l1StandardBridgeProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000004";
        value = hex"0000000000000000000000004200000000000000000000000000000000000010";
@@ -569,10 +569,10 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
        value = hex"0000000000000000000000000000000000000000000000000000000000000101";
        vm.store(l1ERC721BridgeProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000032";
-        value = hex"000000000000000000000000deb1e9a6be7baf84208bb6e10ac9f9bbe1d70809";
+        value = hex"0000000000000000000000004f559f30f5eb88d635fde1548c4267db8fab0351";
        vm.store(l1ERC721BridgeProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000001";
-        value = hex"0000000000000000000000000c8b5822b6e02cda722174f19a1439a7495a3fa6";
+        value = hex"000000000000000000000000def3bca8c80064589e6787477ffa7dd616b5574f";
        vm.store(l1ERC721BridgeProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000002";
        value = hex"0000000000000000000000004200000000000000000000000000000000000014";
@@ -593,7 +593,7 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
        value = hex"0000000000000000000000000000000000000000000000000000000000000101";
        vm.store(optimismMintableERC20FactoryProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000001";
-        value = hex"0000000000000000000000001c23a6d89f95ef3148bcda8e242cab145bf9c0e4";
+        value = hex"00000000000000000000000020a42a5a785622c6ba2576b2d6e924aa82bfa11d";
        vm.store(optimismMintableERC20FactoryProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
        value = hex"0000000000000000000000000000000000000000000000000000000000000001";
@@ -601,13 +601,13 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
        slot = hex"0000000000000000000000000000000000000000000000000000000000000005";
        value = hex"0000000000000000000000000000000000000000000000000000000000000009";
        vm.store(systemOwnerSafeAddress, slot, value);
-        slot = hex"a8f0d50211ac8ff1a40793a899dff3ced4762e0466f69b0078ab7b00d037835c";
+        slot = hex"191cda7b5a8219e0cc3bb6c2b45be830e3ba520f78e119446a476c4147fcc284";
        value = hex"0000000000000000000000000000000000000000000000000000000000000002";
        vm.store(proxyAdminAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000005";
        value = hex"000000000000000000000000000000000000000000000000000000000000000a";
        vm.store(systemOwnerSafeAddress, slot, value);
-        slot = hex"7cda2d9a7dd1a58982b7fac9315bdc1ed8c92aeb9c22cd8555aaa54972f01ccb";
+        slot = hex"89a8cb4d9b6f179480a9e676431122d6ba6a5fb2aa9462528e7e48e497a5c045";
        value = hex"4f564d5f4c3143726f7373446f6d61696e4d657373656e676572000000000034";
        vm.store(proxyAdminAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000005";
@@ -623,13 +623,13 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
        value = hex"0000000000000000000001010000000000000000000000000000000000000000";
        vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
        slot = hex"00000000000000000000000000000000000000000000000000000000000000fb";
-        value = hex"000000000000000000000000deb1e9a6be7baf84208bb6e10ac9f9bbe1d70809";
+        value = hex"0000000000000000000000004f559f30f5eb88d635fde1548c4267db8fab0351";
        vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
        slot = hex"00000000000000000000000000000000000000000000000000000000000000fc";
-        value = hex"000000000000000000000000978e3286eb805934215a88694d80b09aded68d90";
+        value = hex"0000000000000000000000001c23a6d89f95ef3148bcda8e242cab145bf9c0e4";
        vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
        slot = hex"00000000000000000000000000000000000000000000000000000000000000fd";
-        value = hex"0000000000000000000000008b71b41d4dbeb2b6821d44692d3facaaf77480bb";
+        value = hex"0000000000000000000000000c8b5822b6e02cda722174f19a1439a7495a3fa6";
        vm.store(l1CrossDomainMessengerProxyAddress, slot, value);
        slot = hex"00000000000000000000000000000000000000000000000000000000000000cc";
        value = hex"000000000000000000000000000000000000000000000000000000000000dead";
@@ -689,7 +689,7 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
        value = hex"0000000000000000000000000000000000000000000000000000000000000101";
        vm.store(disputeGameFactoryProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(disputeGameFactoryProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
        value = hex"0000000000000000000000001804c8ab1f12e6bbf3894d4083f33e07309d1f38";
@@ -710,13 +710,13 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
        value = hex"0000000000000000000000000000000000000000000000000000000000000101";
        vm.store(delayedWETHProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
-        value = hex"000000000000000000000000db8cff278adccf9e9b5da745b44e754fc4ee3c76";
+        value = hex"00000000000000000000000062c20aa1e0272312bc100b4e23b4dc1ed96dd7d1";
        vm.store(delayedWETHProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
        value = hex"0000000000000000000000001804c8ab1f12e6bbf3894d4083f33e07309d1f38";
        vm.store(delayedWETHProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000068";
-        value = hex"000000000000000000000000deb1e9a6be7baf84208bb6e10ac9f9bbe1d70809";
+        value = hex"0000000000000000000000004f559f30f5eb88d635fde1548c4267db8fab0351";
        vm.store(delayedWETHProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
        value = hex"0000000000000000000000000000000000000000000000000000000000000001";
@@ -725,7 +725,7 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
        value = hex"000000000000000000000000000000000000000000000000000000000000000f";
        vm.store(systemOwnerSafeAddress, slot, value);
        slot = hex"360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc";
-        value = hex"000000000000000000000000610c37dd344e47d7848da075a90128472140e80f";
+        value = hex"000000000000000000000000e2a80256d1dafe06683f231f8e9561639aa0e9b9";
        vm.store(anchorStateRegistryProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000000";
        value = hex"0000000000000000000000000000000000000000000000000000000000000001";
@@ -753,17 +753,17 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
        vm.store(anchorStateRegistryProxyAddress, slot, value);
        vm.etch(acc32Address, acc32Code);
        slot = hex"ffdfc1249c027f9191656349feb0761381bb32c9f557e01f419fd08754bf5a1b";
-        value = hex"000000000000000000000000ce8c32b1493db37767faf988dec9e80089f4f33c";
+        value = hex"000000000000000000000000357a483a8923686e7fa454ee93bbc11afb114743";
        vm.store(disputeGameFactoryProxyAddress, slot, value);
        vm.etch(acc33Address, acc33Code);
        slot = hex"4d5a9bd2e41301728d41c8e705190becb4e74abe869f75bdb405b63716a35f9e";
-        value = hex"000000000000000000000000357a483a8923686e7fa454ee93bbc11afb114743";
+        value = hex"000000000000000000000000b6b1579aa54e2f61e621a40d5f2704d717b3544f";
        vm.store(disputeGameFactoryProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
-        value = hex"0000000000000000000000007ea964e5d864b95f6d7d2bd04da897f6e31084b3";
+        value = hex"0000000000000000000000007c0c8a15773ed7b50e7c738d1af4c5e3a2b210bd";
        vm.store(disputeGameFactoryProxyAddress, slot, value);
        slot = hex"0000000000000000000000000000000000000000000000000000000000000033";
-        value = hex"0000000000000000000000007ea964e5d864b95f6d7d2bd04da897f6e31084b3";
+        value = hex"0000000000000000000000007c0c8a15773ed7b50e7c738d1af4c5e3a2b210bd";
        vm.store(delayedWETHProxyAddress, slot, value);
    }
 }
--- a/packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummaryFaultProofsCode.sol
+++ b/packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummaryFaultProofsCode.sol
--- a/packages/contracts-bedrock/test/libraries/Bytes.t.sol
+++ b/packages/contracts-bedrock/test/libraries/Bytes.t.sol
@@ -67,19 +67,23 @@ contract Bytes_slice_Test is Test {
    /// @notice Tests that the `slice` function correctly updates the free memory pointer depending
    ///         on the length of the slice.
+    ///         The calls to `bound` are to reduce the number of times that `assume` is triggered.
    function testFuzz_slice_memorySafety_succeeds(bytes memory _input, uint256 _start, uint256 _length) public {
+        vm.assume(_input.length > 0);
        // The start should never be more than the length of the input bytes array - 1
-        vm.assume(_start < _input.length);
+        _start = bound(_start, 0, _input.length - 1);
        // The length should never be more than the length of the input bytes array - the starting
        // slice index.
-        vm.assume(_length <= _input.length - _start);
+        _length = bound(_length, 0, _input.length - _start);
        // Grab the free memory pointer before the slice operation
        uint64 initPtr;
        assembly {
            initPtr := mload(0x40)
        }
-        uint64 expectedPtr = uint64(initPtr + 0x20 + ((_length + 0x1f) & ~uint256(0x1f)));
+        uint64 expectedPtr = uint64((initPtr + 0x20 + _length + 0x1f) & ~uint256(0x1f));
        // Ensure that all memory outside of the expected range is safe.
        vm.expectSafeMemory(initPtr, expectedPtr);
@@ -107,7 +111,7 @@ contract Bytes_slice_Test is Test {
            // Note that we use a slightly less efficient, but equivalent method of rounding
            // up `_length` to the next multiple of 32 than is used in the `slice` function.
            // This is to diff test the method used in `slice`.
-            uint64 _expectedPtr = uint64(initPtr + 0x20 + (((_length + 0x1F) >> 5) << 5));
+            uint64 _expectedPtr = uint64(((initPtr + 0x20 + _length + 0x1F) >> 5) << 5);
            assertEq(finalPtr, _expectedPtr);
            // Sanity check for equivalence of the rounding methods.
@@ -144,11 +148,15 @@ contract Bytes_slice_TestFail is Test {
    /// @notice Tests that, when given a start index `n` that is greater than
    ///         `type(uint256).max - n`, the `slice` function reverts.
+    ///         The calls to `bound` are to reduce the number of times that `assume` is triggered.
    function testFuzz_slice_rangeOverflows_reverts(bytes memory _input, uint256 _start, uint256 _length) public {
        // Ensure that `_length` is a realistic length of a slice. This is to make sure
        // we revert on the correct require statement.
+        _length = bound(_length, 0, _input.length == 0 ? 0 : _input.length - 1);
        vm.assume(_length < _input.length);
        // Ensure that `_start` will overflow if `_length` is added to it.
+        _start = bound(_start, type(uint256).max - _length, type(uint256).max);
        vm.assume(_start > type(uint256).max - _length);
        vm.expectRevert("slice_overflow");