Merge branch 'develop' into dependabot/go_modules/indexer/golang.org/x/net-0.7.0

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2.1
 
 orbs:
   go: circleci/go@1.5.0
-  gcp-cli: circleci/gcp-cli@2.4.1
+  gcp-cli: circleci/gcp-cli@3.0.1
 commands:
   gcp-oidc-authenticate:
     description: "Authenticate with GCP using a CircleCI OIDC token."
@@ -189,8 +189,22 @@ jobs:
             DOCKER_TAGS=$(echo -ne <<parameters.docker_tags>> | sed "s/,/\n/g" | sed "s/[^a-zA-Z0-9\n]/-/g" | sed -e "s|^|${IMAGE_BASE}:|")
             echo -ne $DOCKER_TAGS | tr ' ' '\n' | xargs -L1 docker push
 
-  docker-tag-op-stack-release:
+  docker-release:
+    environment:
+      DOCKER_BUILDKIT: 1
     parameters:
+      docker_name:
+        description: Docker image name
+        type: string
+      docker_tags:
+        description: Docker image tags as csv
+        type: string
+      docker_file:
+        description: Path to Dockerfile
+        type: string
+      docker_context:
+        description: Docker build context
+        type: string
       registry:
         description: Docker registry
         type: string
@@ -199,17 +213,36 @@ jobs:
         description: Docker repo
         type: string
         default: "oplabs-tools-artifacts/images"
-    docker:
-      - image: cimg/python:3.7
-    resource_class: small
+    machine:
+      image: ubuntu-2204:2022.07.1
+      resource_class: xlarge
     steps:
       - gcp-cli/install
       - gcp-oidc-authenticate
       - checkout
       - run:
-          name: Tag
+          name: Build
+          command: |
+            IMAGE_BASE="<<parameters.registry>>/<<parameters.repo>>/<<parameters.docker_name>>"
+            DOCKER_TAGS=$(echo -ne <<parameters.docker_tags>> | sed "s/,/\n/g" | sed "s/[^a-zA-Z0-9\n]/-/g" | sed -e "s|^|-t ${IMAGE_BASE}:|")
+            docker build \
+            $(echo -ne $DOCKER_TAGS | tr '\n' ' ') \
+            -f <<parameters.docker_file>> \
+            --build-arg VERSION=$CIRCLE_TAG \
+            <<parameters.docker_context>>
+      - run:
+          name: Configure Docker
           command: |
             gcloud auth configure-docker <<parameters.registry>>
+      - run:
+          name: Publish
+          command: |
+            IMAGE_BASE="<<parameters.registry>>/<<parameters.repo>>/<<parameters.docker_name>>"
+            DOCKER_TAGS=$(echo -ne <<parameters.docker_tags>> | sed "s/,/\n/g" | sed "s/[^a-zA-Z0-9\n]/-/g" | sed -e "s|^|${IMAGE_BASE}:|")
+            echo -ne $DOCKER_TAGS | tr ' ' '\n' | xargs -L1 docker push
+      - run:
+          name: Tag
+          command: |
             ./ops/scripts/ci-docker-tag-op-stack-release.sh <<parameters.registry>>/<<parameters.repo>> $CIRCLE_TAG $CIRCLE_SHA1
 
   contracts-bedrock-tests:
@@ -1117,113 +1150,70 @@ workflows:
             - op-proposer-docker-build
   release:
     jobs:
-      - docker-build:
-          name: op-node-docker-build
+      - hold:
+          type: approval
           filters:
             tags:
               only: /^op-[a-z0-9\-]*\/v.*/
             branches:
               ignore: /.*/
-          docker_file: op-node/Dockerfile
-          docker_name: op-node
-          docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>
-          docker_context: .
-      - docker-publish:
-          name: op-node-docker-publish
+      - docker-release:
+          name: op-node-docker-release
           filters:
             tags:
-              only: /^op-[a-z0-9\-]*\/v.*/
+              only: /^op-node\/v.*/
             branches:
               ignore: /.*/
+          docker_file: op-node/Dockerfile
           docker_name: op-node
           docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>
+          docker_context: .
           context:
-            - oplabs-gcr
+            - oplabs-gcr-release
           requires:
-            - op-node-docker-build
-      - docker-build:
-          name: op-batcher-docker-build
+            - hold
+      - docker-release:
+          name: op-batcher-docker-release
           filters:
             tags:
-              only: /^op-[a-z0-9\-]*\/v.*/
+              only: /^op-batcher\/v.*/
             branches:
               ignore: /.*/
           docker_file: op-batcher/Dockerfile
           docker_name: op-batcher
           docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>
           docker_context: .
-      - docker-publish:
-          name: op-batcher-docker-publish
-          filters:
-            tags:
-              only: /^op-[a-z0-9\-]*\/v.*/
-            branches:
-              ignore: /.*/
-          docker_name: op-batcher
-          docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>
           context:
-            - oplabs-gcr
+            - oplabs-gcr-release
           requires:
-            - op-batcher-docker-build
-      - docker-build:
-          name: op-proposer-docker-build
+            - hold
+      - docker-release:
+          name: op-proposer-docker-release
           filters:
             tags:
-              only: /^op-[a-z0-9\-]*\/v.*/
+              only: /^op-proposer\/v.*/
             branches:
               ignore: /.*/
           docker_file: op-proposer/Dockerfile
           docker_name: op-proposer
           docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>
           docker_context: .
-      - docker-publish:
-          name: op-proposer-docker-publish
-          filters:
-            tags:
-              only: /^op-[a-z0-9\-]*\/v.*/
-            branches:
-              ignore: /.*/
-          docker_name: op-proposer
-          docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>
           context:
-            - oplabs-gcr
+            - oplabs-gcr-release
           requires:
-            - op-proposer-docker-build
+            - hold
       - docker-build:
-          name: op-migrate-docker-build
+          name: op-migrate-docker-release
           filters:
             tags:
-              only: /^op-[a-z0-9\-]*\/v.*/
+              only: /^op-migrate\/v.*/
             branches:
               ignore: /.*/
           docker_file: op-chain-ops/Dockerfile
           docker_name: op-migrate
           docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>
           docker_context: .
-      - docker-publish:
-          name: op-migrate-docker-publish
-          filters:
-            tags:
-              only: /^op-[a-z0-9\-]*\/v.*/
-            branches:
-              ignore: /.*/
-          docker_name: op-migrate
-          docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>
-          context:
-            - oplabs-gcr
-          requires:
-            - op-migrate-docker-build
-      - docker-tag-op-stack-release:
-          name: docker-tag-op-stack-release
-          filters:
-            tags:
-              only: /^op-[a-z0-9\-]*\/v.*/
-            branches:
-              ignore: /.*/
-          requires:
-            - op-node-docker-publish
-            - op-proposer-docker-publish
-            - op-batcher-docker-publish
-            - op-migrate-docker-publish
           context:
             - oplabs-gcr-release
+          requires:
+            - hold
\ No newline at end of file

.editorconfig

@@ -15,3 +15,7 @@ indent_size = 4
 [*.go]
 indent_size = 4
 indent_style = tab
+
+[Makefile]
+indent_size = 2
+indent_style = tab

README.md

+
 <div align="center">
   <br />
   <br />

op-batcher/Dockerfile

 FROM golang:1.18.0-alpine3.15 as builder
 
+ARG VERSION=v0.0.0
+
 RUN apk add --no-cache make gcc musl-dev linux-headers git jq bash
 
 # build op-batcher with the shared go.mod & go.sum files
@@ -15,7 +17,7 @@ COPY ./.git /app/.git
 
 WORKDIR /app/op-batcher
 
-RUN make op-batcher
+RUN make op-batcher VERSION="$VERSION"
 
 FROM alpine:3.15
 

op-bindings/Makefile

@@ -34,6 +34,7 @@ bindings: l1block-bindings \
 
 version:
 	forge --version
+	abigen --version
 
 compile:
 	cd ../packages/contracts-bedrock/ && \

op-chain-ops/genesis/config.go

@@ -414,9 +414,7 @@ func NewL2StorageConfig(config *DeployConfig, block *types.Block) (state.Storage
 	}
 	storage["L2CrossDomainMessenger"] = state.StorageValues{
 		"_initialized":     1,
-		"_owner":           config.ProxyAdminOwner,
 		"_initializing":    false,
-		"_paused":          false,
 		"xDomainMsgSender": "0x000000000000000000000000000000000000dEaD",
 		"msgNonce":         0,
 	}

op-chain-ops/genesis/layer_one.go

@@ -141,10 +141,7 @@ func BuildL1DeveloperGenesis(config *DeployConfig) (*core.Genesis, error) {
 	if err != nil {
 		return nil, err
 	}
-	data, err = l1XDMABI.Pack(
-		"initialize",
-		config.FinalSystemOwner,
-	)
+	data, err = l1XDMABI.Pack("initialize")
 	if err != nil {
 		return nil, fmt.Errorf("cannot abi encode initialize for L1CrossDomainMessenger: %w", err)
 	}

op-node/Dockerfile

 FROM golang:1.18.0-alpine3.15 as builder
 
+ARG VERSION=v0.0.0
+
 RUN apk add --no-cache make gcc musl-dev linux-headers git jq bash
 
 # build op-node with the shared go.mod & go.sum files
@@ -13,7 +15,7 @@ COPY ./.git /app/.git
 
 WORKDIR /app/op-node
 
-RUN make op-node
+RUN make op-node VERSION="$VERSION"
 
 FROM alpine:3.15
 

op-proposer/Dockerfile

 FROM golang:1.18.0-alpine3.15 as builder
 
+ARG VERSION=v0.0.0
+
 RUN apk add --no-cache make gcc musl-dev linux-headers git jq bash
 
 # build op-proposer with the shared go.mod & go.sum files
@@ -14,7 +16,7 @@ COPY ./.git /app/.git
 
 WORKDIR /app/op-proposer
 
-RUN make op-proposer
+RUN make op-proposer VERSION="$VERSION"
 
 FROM alpine:3.15
 

ops/scripts/ci-docker-tag-op-stack-release.sh

@@ -35,5 +35,11 @@ fi
 echo "Tagging $SOURCE_IMAGE_TAG with '$IMAGE_TAG'"
 gcloud container images add-tag -q "$SOURCE_IMAGE_TAG" "$TARGET_IMAGE_TAG"
 
+# Do not tag with latest if the release is a release candidate.
+if [[ "$IMAGE_TAG" == *"rc"* ]]; then
+  echo "Not tagging with 'latest' because the release is a release candidate."
+  exit 0
+fi
+
 echo "Tagging $SOURCE_IMAGE_TAG with 'latest'"
 gcloud container images add-tag -q "$SOURCE_IMAGE_TAG" "$TARGET_IMAGE_TAG_LATEST"

packages/contracts-bedrock/.storage-layout

@@ -11,11 +11,11 @@
 | spacer_0_0_20          | address                  | 0    | 0      | 20    | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
 | _initialized           | uint8                    | 0    | 20     | 1     | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
 | _initializing          | bool                     | 0    | 21     | 1     | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
-| __gap                  | uint256[50]              | 1    | 0      | 1600  | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
-| _owner                 | address                  | 51   | 0      | 20    | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
-| __gap                  | uint256[49]              | 52   | 0      | 1568  | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
-| _paused                | bool                     | 101  | 0      | 1     | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
-| __gap                  | uint256[49]              | 102  | 0      | 1568  | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
+| spacer_1_0_1600        | uint256[50]              | 1    | 0      | 1600  | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
+| spacer_51_0_20         | address                  | 51   | 0      | 20    | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
+| spacer_52_0_1568       | uint256[49]              | 52   | 0      | 1568  | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
+| spacer_101_0_1         | bool                     | 101  | 0      | 1     | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
+| spacer_102_0_1568      | uint256[49]              | 102  | 0      | 1568  | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
 | spacer_151_0_32        | uint256                  | 151  | 0      | 32    | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
 | __gap_reentrancy_guard | uint256[49]              | 152  | 0      | 1568  | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
 | spacer_201_0_32        | mapping(bytes32 => bool) | 201  | 0      | 32    | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
@@ -121,11 +121,11 @@
 | spacer_0_0_20          | address                  | 0    | 0      | 20    | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
 | _initialized           | uint8                    | 0    | 20     | 1     | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
 | _initializing          | bool                     | 0    | 21     | 1     | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
-| __gap                  | uint256[50]              | 1    | 0      | 1600  | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
-| _owner                 | address                  | 51   | 0      | 20    | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
-| __gap                  | uint256[49]              | 52   | 0      | 1568  | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
-| _paused                | bool                     | 101  | 0      | 1     | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
-| __gap                  | uint256[49]              | 102  | 0      | 1568  | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
+| spacer_1_0_1600        | uint256[50]              | 1    | 0      | 1600  | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
+| spacer_51_0_20         | address                  | 51   | 0      | 20    | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
+| spacer_52_0_1568       | uint256[49]              | 52   | 0      | 1568  | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
+| spacer_101_0_1         | bool                     | 101  | 0      | 1     | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
+| spacer_102_0_1568      | uint256[49]              | 102  | 0      | 1568  | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
 | spacer_151_0_32        | uint256                  | 151  | 0      | 32    | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
 | __gap_reentrancy_guard | uint256[49]              | 152  | 0      | 1568  | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
 | spacer_201_0_32        | mapping(bytes32 => bool) | 201  | 0      | 32    | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |

packages/contracts-bedrock/contracts/L1/L1CrossDomainMessenger.sol

@@ -29,17 +29,14 @@ contract L1CrossDomainMessenger is CrossDomainMessenger, Semver {
         CrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER)
     {
         PORTAL = _portal;
-        initialize(address(0));
+        initialize();
     }
 
     /**
      * @notice Initializer.
-     *
-     * @param _owner Address of the initial owner of this contract.
      */
-    function initialize(address _owner) public initializer {
+    function initialize() public initializer {
         __CrossDomainMessenger_init();
-        _transferOwnership(_owner);
     }
 
     /**

packages/contracts-bedrock/contracts/deployment/SystemDictator.sol

@@ -335,7 +335,7 @@ contract SystemDictator is OwnableUpgradeable {
         // Try to initialize the L1CrossDomainMessenger, only fail if it's already been initialized.
         try
             L1CrossDomainMessenger(config.proxyAddressConfig.l1CrossDomainMessengerProxy)
-                .initialize(address(this))
+                .initialize()
         {
             // L1CrossDomainMessenger is the one annoying edge case difference between existing
             // networks and fresh networks because in existing networks it'll already be
@@ -375,27 +375,12 @@ contract SystemDictator is OwnableUpgradeable {
             payable(config.proxyAddressConfig.l1ERC721BridgeProxy),
             address(config.implementationAddressConfig.l1ERC721BridgeImpl)
         );
-
-        // Pause the L1CrossDomainMessenger, chance to check that everything is OK.
-        L1CrossDomainMessenger(config.proxyAddressConfig.l1CrossDomainMessengerProxy).pause();
-    }
-
-    /**
-     * @notice Unpauses the system at which point the system should be fully operational.
-     */
-    function step6() external onlyOwner step(6) {
-        // Unpause the L1CrossDomainMessenger.
-        L1CrossDomainMessenger(config.proxyAddressConfig.l1CrossDomainMessengerProxy).unpause();
     }
 
     /**
      * @notice Tranfers admin ownership to the final owner.
      */
     function finalize() external onlyOwner {
-        // Transfer ownership of the L1CrossDomainMessenger to the final owner.
-        L1CrossDomainMessenger(config.proxyAddressConfig.l1CrossDomainMessengerProxy)
-            .transferOwnership(config.globalConfig.finalOwner);
-
         // Transfer ownership of the ProxyAdmin to the final owner.
         config.globalConfig.proxyAdmin.transferOwnership(config.globalConfig.finalOwner);
 

packages/contracts-bedrock/contracts/test/CommonTest.t.sol

@@ -254,7 +254,7 @@ contract Messenger_Initializer is L2OutputOracle_Initializer {
             "OVM_L1CrossDomainMessenger"
         );
         L1Messenger = L1CrossDomainMessenger(address(proxy));
-        L1Messenger.initialize(alice);
+        L1Messenger.initialize();
 
         vm.etch(
             Predeploys.L2_CROSS_DOMAIN_MESSENGER,

packages/contracts-bedrock/contracts/test/L1CrossDomainMessenger.t.sol

@@ -25,42 +25,6 @@ contract L1CrossDomainMessenger_Test is Messenger_Initializer {
     // Storage slot of the l2Sender
     uint256 constant senderSlotIndex = 50;
 
-    function setUp() public override {
-        super.setUp();
-    }
-
-    // pause: should pause the contract when called by the current owner
-    function test_pause_succeeds() external {
-        vm.prank(alice);
-        L1Messenger.pause();
-        assert(L1Messenger.paused());
-    }
-
-    // pause: should not pause the contract when called by account other than the owner
-    function test_pause_callerIsNotOwner_reverts() external {
-        vm.expectRevert("Ownable: caller is not the owner");
-        vm.prank(address(0xABBA));
-        L1Messenger.pause();
-    }
-
-    // unpause: should unpause the contract when called by the current owner
-    function test_unpause_succeeds() external {
-        vm.prank(alice);
-        L1Messenger.pause();
-        assert(L1Messenger.paused());
-
-        vm.prank(alice);
-        L1Messenger.unpause();
-        assert(!L1Messenger.paused());
-    }
-
-    // unpause: should not unpause the contract when called by account other than the owner
-    function test_unpause_callerIsNotOwner_reverts() external {
-        vm.expectRevert("Ownable: caller is not the owner");
-        vm.prank(address(0xABBA));
-        L1Messenger.unpause();
-    }
-
     // the version is encoded in the nonce
     function test_messageVersion_succeeds() external {
         (, uint16 version) = Encoding.decodeVersionedNonce(L1Messenger.messageNonce());
@@ -274,15 +238,6 @@ contract L1CrossDomainMessenger_Test is Messenger_Initializer {
         L1Messenger.xDomainMessageSender();
     }
 
-    // relayMessage: should revert if paused
-    function test_relayMessage_paused_reverts() external {
-        vm.prank(L1Messenger.owner());
-        L1Messenger.pause();
-
-        vm.expectRevert("Pausable: paused");
-        L1Messenger.relayMessage(0, address(0), address(0), 0, 0, hex"");
-    }
-
     // relayMessage: should send a successful call to the target contract after the first message
     // fails and ETH gets stuck, but the second message succeeds
     function test_relayMessage_retryAfterFailure_succeeds() external {

packages/contracts-bedrock/contracts/test/L2CrossDomainMessenger.t.sol

@@ -16,21 +16,6 @@ contract L2CrossDomainMessenger_Test is Messenger_Initializer {
     // Receiver address for testing
     address recipient = address(0xabbaacdc);
 
-    function setUp() public override {
-        super.setUp();
-    }
-
-    function test_pause_succeeds() external {
-        L2Messenger.pause();
-        assert(L2Messenger.paused());
-    }
-
-    function test_pause_notOwner_reverts() external {
-        vm.expectRevert("Ownable: caller is not the owner");
-        vm.prank(address(0xABBA));
-        L2Messenger.pause();
-    }
-
     function test_messageVersion_succeeds() external {
         (, uint16 version) = Encoding.decodeVersionedNonce(L2Messenger.messageNonce());
         assertEq(version, L2Messenger.MESSAGE_VERSION());
@@ -191,15 +176,6 @@ contract L2CrossDomainMessenger_Test is Messenger_Initializer {
         L2Messenger.xDomainMessageSender();
     }
 
-    // relayMessage: should revert if paused
-    function test_relayMessage_paused_reverts() external {
-        vm.prank(L2Messenger.owner());
-        L2Messenger.pause();
-
-        vm.expectRevert("Pausable: paused");
-        L2Messenger.relayMessage(0, address(0), address(0), 0, 0, hex"");
-    }
-
     // relayMessage: should send a successful call to the target contract after the first message
     // fails and ETH gets stuck, but the second message succeeds
     function test_relayMessage_retry_succeeds() external {

packages/contracts-bedrock/contracts/universal/CrossDomainMessenger.sol

 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import {
-    OwnableUpgradeable
-} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
-import {
-    PausableUpgradeable
-} from "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
+import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import { SafeCall } from "../libraries/SafeCall.sol";
 import { Hashing } from "../libraries/Hashing.sol";
 import { Encoding } from "../libraries/Encoding.sol";
@@ -14,12 +9,12 @@ import { Constants } from "../libraries/Constants.sol";
 
 /**
  * @custom:legacy
- * @title CrossDomainMessengerLegacySpacer
+ * @title CrossDomainMessengerLegacySpacer0
  * @notice Contract only exists to add a spacer to the CrossDomainMessenger where the
  *         libAddressManager variable used to exist. Must be the first contract in the inheritance
- *         tree of the CrossDomainMessenger
+ *         tree of the CrossDomainMessenger.
  */
-contract CrossDomainMessengerLegacySpacer {
+contract CrossDomainMessengerLegacySpacer0 {
     /**
      * @custom:legacy
      * @custom:spacer libAddressManager
@@ -28,6 +23,83 @@ contract CrossDomainMessengerLegacySpacer {
     address private spacer_0_0_20;
 }
 
+/**
+ * @custom:legacy
+ * @title CrossDomainMessengerLegacySpacer1
+ * @notice Contract only exists to add a spacer to the CrossDomainMessenger where the
+ *         PausableUpgradable and OwnableUpgradeable variables used to exist. Must be
+ *         the third contract in the inheritance tree of the CrossDomainMessenger.
+ */
+contract CrossDomainMessengerLegacySpacer1 {
+    /**
+     * @custom:legacy
+     * @custom:spacer __gap
+     * @notice Spacer for backwards compatibility. Comes from OpenZeppelin
+     *         ContextUpgradable via OwnableUpgradeable.
+     *
+     */
+    uint256[50] private spacer_1_0_1600;
+
+    /**
+     * @custom:legacy
+     * @custom:spacer _owner
+     * @notice Spacer for backwards compatibility.
+     *         Come from OpenZeppelin OwnableUpgradeable.
+     */
+    address private spacer_51_0_20;
+
+    /**
+     * @custom:legacy
+     * @custom:spacer __gap
+     * @notice Spacer for backwards compatibility. Comes from OpenZeppelin
+     *         ContextUpgradable via PausableUpgradable.
+     */
+    uint256[49] private spacer_52_0_1568;
+
+    /**
+     * @custom:legacy
+     * @custom:spacer _paused
+     * @notice Spacer for backwards compatibility. Comes from OpenZeppelin
+     *         PausableUpgradable.
+     */
+    bool private spacer_101_0_1;
+
+    /**
+     * @custom:legacy
+     * @custom:spacer __gap
+     * @notice Spacer for backwards compatibility. Comes from OpenZeppelin
+     *         PausableUpgradable.
+     */
+    uint256[49] private spacer_102_0_1568;
+
+    /**
+     * @custom:legacy
+     * @custom:spacer ReentrancyGuardUpgradeable's `_status` field.
+     * @notice Spacer for backwards compatibility
+     */
+    uint256 private spacer_151_0_32;
+
+    /**
+     * @custom:spacer ReentrancyGuardUpgradeable
+     * @notice Spacer for backwards compatibility
+     */
+    uint256[49] private __gap_reentrancy_guard;
+
+    /**
+     * @custom:legacy
+     * @custom:spacer blockedMessages
+     * @notice Spacer for backwards compatibility.
+     */
+    mapping(bytes32 => bool) private spacer_201_0_32;
+
+    /**
+     * @custom:legacy
+     * @custom:spacer relayedMessages
+     * @notice Spacer for backwards compatibility.
+     */
+    mapping(bytes32 => bool) private spacer_202_0_32;
+}
+
 /**
  * @custom:upgradeable
  * @title CrossDomainMessenger
@@ -36,11 +108,13 @@ contract CrossDomainMessengerLegacySpacer {
  *         needs to be extended slightly to provide low-level message passing functionality on each
  *         chain it's deployed on. Currently only designed for message passing between two paired
  *         chains and does not support one-to-many interactions.
+ *
+ *         Any changes to this contract MUST result in a semver bump for contracts that inherit it.
  */
 abstract contract CrossDomainMessenger is
-    CrossDomainMessengerLegacySpacer,
-    OwnableUpgradeable,
-    PausableUpgradeable
+    CrossDomainMessengerLegacySpacer0,
+    Initializable,
+    CrossDomainMessengerLegacySpacer1
 {
     /**
      * @notice Current message version identifier.
@@ -82,32 +156,6 @@ abstract contract CrossDomainMessenger is
      */
     address public immutable OTHER_MESSENGER;
 
-    /**
-     * @custom:spacer ReentrancyGuardUpgradeable's `_status` field.
-     * @notice Spacer for backwards compatibility
-     */
-    uint256 private spacer_151_0_32;
-
-    /**
-     * @custom:spacer ReentrancyGuardUpgradeable
-     * @notice Spacer for backwards compatibility
-     */
-    uint256[49] private __gap_reentrancy_guard;
-
-    /**
-     * @custom:legacy
-     * @custom:spacer blockedMessages
-     * @notice Spacer for backwards compatibility.
-     */
-    mapping(bytes32 => bool) private spacer_201_0_32;
-
-    /**
-     * @custom:legacy
-     * @custom:spacer relayedMessages
-     * @notice Spacer for backwards compatibility.
-     */
-    mapping(bytes32 => bool) private spacer_202_0_32;
-
     /**
      * @notice Mapping of message hashes to boolean receipt values. Note that a message will only
      *         be present in this mapping if it has successfully been relayed on this chain, and
@@ -196,22 +244,6 @@ abstract contract CrossDomainMessenger is
         OTHER_MESSENGER = _otherMessenger;
     }
 
-    /**
-     * @notice Allows the owner of this contract to temporarily pause message relaying. Backup
-     *         security mechanism just in case. Owner should be the same as the upgrade wallet to
-     *         maintain the security model of the system as a whole.
-     */
-    function pause() external onlyOwner {
-        _pause();
-    }
-
-    /**
-     * @notice Allows the owner of this contract to resume message relaying once paused.
-     */
-    function unpause() external onlyOwner {
-        _unpause();
-    }
-
     /**
      * @notice Sends a message to some target address on the other chain. Note that if the call
      *         always reverts, then the message will be unrelayable, and any ETH sent will be
@@ -273,7 +305,7 @@ abstract contract CrossDomainMessenger is
         uint256 _value,
         uint256 _minGasLimit,
         bytes calldata _message
-    ) external payable whenNotPaused {
+    ) external payable {
         (, uint16 version) = Encoding.decodeVersionedNonce(_nonce);
         require(
             version < 2,
@@ -423,9 +455,6 @@ abstract contract CrossDomainMessenger is
     // solhint-disable-next-line func-name-mixedcase
     function __CrossDomainMessenger_init() internal onlyInitializing {
         xDomainMsgSender = Constants.DEFAULT_L2_SENDER;
-        __Context_init_unchained();
-        __Ownable_init_unchained();
-        __Pausable_init_unchained();
     }
 
     /**

packages/contracts-bedrock/deploy/010-L1CrossDomainMessengerImpl.ts

-import { ethers } from 'ethers'
 import { DeployFunction } from 'hardhat-deploy/dist/types'
 
 import {
@@ -23,11 +22,6 @@ const deployFn: DeployFunction = async (hre) => {
         'PORTAL',
         OptimismPortalProxy.address
       )
-      await assertContractVariable(
-        contract,
-        'owner',
-        ethers.constants.AddressZero
-      )
     },
   })
 }

packages/contracts-bedrock/deploy/021-SystemDictatorSteps-2.ts

@@ -204,16 +204,15 @@ const deployFn: DeployFunction = async (hre) => {
     )
   }
 
-  // Step 5 initializes all contracts and pauses the new L1CrossDomainMessenger.
+  // Step 5 initializes all contracts.
   await doStep({
     isLiveDeployer,
     SystemDictator,
     step: 5,
     message: `
-      Step 5 will initialize all Bedrock contracts but will leave the new L1CrossDomainMessenger
-      paused. After this step is executed, users will be able to deposit and withdraw assets via
-      the OptimismPortal but not via the L1CrossDomainMessenger. The Proposer will also be able to
-      submit L2 outputs to the L2OutputOracle.
+      Step 5 will initialize all Bedrock contracts. After this step is executed, the OptimismPortal
+      will be open for deposits but withdrawals will be paused if deploying a production network.
+      The Proposer will also be able to submit L2 outputs to the L2OutputOracle.
     `,
     checks: async () => {
       // Check L2OutputOracle was initialized properly.
@@ -253,18 +252,12 @@ const deployFn: DeployFunction = async (hre) => {
       }
 
       // Check L1CrossDomainMessenger was initialized properly.
-      await assertContractVariable(L1CrossDomainMessenger, 'paused', true)
       try {
         await L1CrossDomainMessenger.xDomainMessageSender()
         assert(false, `L1CrossDomainMessenger was not initialized properly`)
       } catch (err) {
         // Expected.
       }
-      await assertContractVariable(
-        L1CrossDomainMessenger,
-        'owner',
-        SystemDictator.address
-      )
 
       // Check L1StandardBridge was initialized properly.
       await assertContractVariable(
@@ -292,6 +285,7 @@ const deployFn: DeployFunction = async (hre) => {
     },
   })
 
+  // Step 6 unpauses the OptimismPortal.
   if (await isStep(SystemDictator, 6)) {
     console.log(`
       Unpause the OptimismPortal. The GUARDIAN account should be used. In practice
@@ -319,29 +313,13 @@ const deployFn: DeployFunction = async (hre) => {
       30000,
       1000
     )
-  }
 
-  // Step 6 unpauses the new L1CrossDomainMessenger.
-  await doStep({
-    isLiveDeployer,
-    SystemDictator,
-    step: 6,
-    message: `
-      Step 6 will unpause the new L1CrossDomainMessenger. After this step is executed, users will
-      be able to deposit and withdraw assets via the L1CrossDomainMessenger and the system will be
-      fully operational.
-    `,
-    checks: async () => {
-      await assertContractVariable(L1CrossDomainMessenger, 'paused', false)
-    },
-  })
+    await assertContractVariable(OptimismPortal, 'paused', false)
 
-  // At the end we finalize the upgrade.
-  if (await isStep(SystemDictator, 7)) {
     console.log(`
       You must now finalize the upgrade by calling finalize() on the SystemDictator. This will
-      transfer ownership of the ProxyAdmin and the L1CrossDomainMessenger to the final system owner
-      as specified in the deployment configuration.
+      transfer ownership of the ProxyAdmin to the final system owner as specified in the deployment
+      configuration.
     `)
 
     if (isLiveDeployer) {
@@ -363,11 +341,6 @@ const deployFn: DeployFunction = async (hre) => {
       1000
     )
 
-    await assertContractVariable(
-      L1CrossDomainMessenger,
-      'owner',
-      hre.deployConfig.finalSystemOwner
-    )
     await assertContractVariable(
       ProxyAdmin,
       'owner',

packages/contracts-bedrock/layout-lock.json

@@ -5,6 +5,31 @@
       "offset": 0,
       "length": 20
     },
+    "spacer_1_0_1600": {
+      "slot": 1,
+      "offset": 0,
+      "length": 1600
+    },
+    "spacer_51_0_20": {
+      "slot": 51,
+      "offset": 0,
+      "length": 20
+    },
+    "spacer_52_0_1568": {
+      "slot": 52,
+      "offset": 0,
+      "length": 1568
+    },
+    "spacer_101_0_1": {
+      "slot": 101,
+      "offset": 0,
+      "length": 1
+    },
+    "spacer_102_0_1568": {
+      "slot": 102,
+      "offset": 0,
+      "length": 1568
+    },
     "spacer_151_0_32": {
       "slot": 151,
       "offset": 0,
@@ -27,6 +52,31 @@
       "offset": 0,
       "length": 20
     },
+    "spacer_1_0_1600": {
+      "slot": 1,
+      "offset": 0,
+      "length": 1600
+    },
+    "spacer_51_0_20": {
+      "slot": 51,
+      "offset": 0,
+      "length": 20
+    },
+    "spacer_52_0_1568": {
+      "slot": 52,
+      "offset": 0,
+      "length": 1568
+    },
+    "spacer_101_0_1": {
+      "slot": 101,
+      "offset": 0,
+      "length": 1
+    },
+    "spacer_102_0_1568": {
+      "slot": 102,
+      "offset": 0,
+      "length": 1568
+    },
     "spacer_151_0_32": {
       "slot": 151,
       "offset": 0,

packages/contracts-bedrock/tasks/check-l2.ts

@@ -269,10 +269,6 @@ const check = {
     await checkProxy(hre, 'L2CrossDomainMessenger', signer.provider)
     await assertProxy(hre, 'L2CrossDomainMessenger', signer.provider)
 
-    const owner = await L2CrossDomainMessenger.owner()
-    assert(owner !== hre.ethers.constants.AddressZero)
-    yell(`  - owner: ${owner}`)
-
     const MESSAGE_VERSION = await L2CrossDomainMessenger.MESSAGE_VERSION()
     console.log(`  - MESSAGE_VERSION: ${MESSAGE_VERSION}`)
     const MIN_GAS_CALLDATA_OVERHEAD =

packages/contracts-bedrock/tasks/validate-spacers.ts

 import { task } from 'hardhat/config'
+import { parseFullyQualifiedName } from 'hardhat/utils/contract-names'
+import { HardhatRuntimeEnvironment } from 'hardhat/types'
 
 import layoutLock from '../layout-lock.json'
 
+// Artifacts that should be skipped when inspecting their storage layout
+const skipped = {
+  // Both of these are skipped because they are meant to be inherited
+  // by the CrossDomainMessenger. It is the CrossDomainMessenger that
+  // should be inspected, not these contracts.
+  CrossDomainMessengerLegacySpacer0: true,
+  CrossDomainMessengerLegacySpacer1: true,
+}
+
 /**
  * Parses out variable info from the variable structure in standard compiler json output.
  *
@@ -28,8 +39,25 @@ const parseVariableInfo = (
     variableLength = variable.type.match(/uint([0-9]+)/)?.[1]
   } else if (variable.type.startsWith('t_address')) {
     variableLength = 20
+  } else if (variable.type.startsWith('t_bool')) {
+    variableLength = 1
+  } else if (variable.type.startsWith('t_array')) {
+    // Figure out the size of the type inside of the array
+    // and then multiply that by the length of the array.
+    // This does not support recursion multiple times for simplicity
+    const type = variable.type.match(/^t_array\((\w+)\)/)?.[1]
+    const info = parseVariableInfo({
+      label: variable.label,
+      offset: variable.offset,
+      slot: variable.slot,
+      type,
+    })
+    const size = variable.type.match(/^t_array\(\w+\)([0-9]+)/)?.[1]
+    variableLength = info.length * parseInt(size, 10)
   } else {
-    throw new Error('unsupported type, add it to the script')
+    throw new Error(
+      `${variable.label}: unsupported type ${variable.type}, add it to the script`
+    )
   }
 
   return {
@@ -43,31 +71,50 @@ const parseVariableInfo = (
 task(
   'validate-spacers',
   'validates that spacer variables are in the correct positions'
-).setAction(async (args, hre) => {
+).setAction(async ({}, hre: HardhatRuntimeEnvironment) => {
   const accounted: string[] = []
 
   const names = await hre.artifacts.getAllFullyQualifiedNames()
-  for (const name of names) {
+  for (const fqn of names) {
     // Script is remarkably slow because of getBuildInfo, so better to skip test files since they
     // don't matter for this check.
-    if (name.includes('.t.sol')) {
+    if (fqn.includes('.t.sol')) {
+      continue
+    }
+
+    console.log(`Processing ${fqn}`)
+    const parsed = parseFullyQualifiedName(fqn)
+    const contractName = parsed.contractName
+
+    if (skipped[contractName] === true) {
+      console.log(`Skipping ${contractName} because it is marked as skippable`)
       continue
     }
 
     // Some files may not have buildInfo (certain libraries). We can safely skip these because we
     // make sure that everything is accounted for anyway.
-    const buildInfo = await hre.artifacts.getBuildInfo(name)
+    const buildInfo = await hre.artifacts.getBuildInfo(fqn)
     if (buildInfo === undefined) {
-      console.log(`Skipping ${name} because it has no buildInfo`)
+      console.log(`Skipping ${fqn} because it has no buildInfo`)
       continue
     }
 
-    for (const source of Object.values(buildInfo.output.contracts)) {
-      for (const [contractName, contract] of Object.entries(source)) {
+    const sources = buildInfo.output.contracts
+    for (const [sourceName, source] of Object.entries(sources)) {
+      // The source file may have our contract
+      if (sourceName.includes(parsed.sourceName)) {
+        const contract = source[contractName]
+        if (!contract) {
+          console.log(`Skipping ${contractName} as its not found in the source`)
+          continue
+        }
         const storageLayout = (contract as any).storageLayout
+        if (!storageLayout) {
+          continue
+        }
 
-        // Check that the layout lock is respected.
         if (layoutLock[contractName]) {
+          console.log(`Processing layout lock for ${contractName}`)
           const removed = Object.entries(layoutLock[contractName]).filter(
             ([key, val]: any) => {
               const storage = storageLayout?.storage || []
@@ -80,6 +127,7 @@ task(
 
                 // Make sure the variable matches **exactly**.
                 const variableInfo = parseVariableInfo(item)
+
                 return (
                   variableInfo.name === key &&
                   variableInfo.offset === val.offset &&
@@ -95,11 +143,10 @@ task(
               `variable(s) removed from ${contractName}: ${removed.join(', ')}`
             )
           }
-
+          console.log(`Valid layout lock for ${contractName}`)
           accounted.push(contractName)
         }
 
-        // Check that the positions have not changed.
         for (const variable of storageLayout?.storage || []) {
           if (variable.label.startsWith('spacer_')) {
             const [, slot, offset, length] = variable.label.split('_')
@@ -125,6 +172,8 @@ task(
                 `${contractName} ${variable.label} is ${variableInfo.length} bytes long but should be ${length}`
               )
             }
+
+            console.log(`${contractName}.${variable.label} is valid`)
           }
         }
       }

proxyd/go.mod

@@ -58,7 +58,7 @@ require (
 	github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70 // indirect
-	golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 // indirect
+	golang.org/x/sys v0.1.0 // indirect
 	golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
 	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect

proxyd/go.sum

@@ -683,8 +683,8 @@ golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng=
-golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

specs/messengers.md

@@ -27,20 +27,35 @@ upgrade.
 The `L2CrossDomainMessenger` is a predeploy contract located at
 `0x4200000000000000000000000000000000000007`.
 
+The base `CrossDomainMessenger` interface is:
+
 ```solidity
 interface CrossDomainMessenger {
     event FailedRelayedMessage(bytes32 indexed msgHash);
     event RelayedMessage(bytes32 indexed msgHash);
     event SentMessage(address indexed target, address sender, bytes message, uint256 messageNonce, uint256 gasLimit);
-
-    function MESSAGE_VERSION() view external returns (uint16);
-    function messageNonce() view external returns (uint256);
-    function otherMessenger() view external returns (address);
-    function failedMessages(bytes32) view external returns (bool);
-    function relayMessage(uint256 _nonce, address _sender, address _target, uint256 _value, uint256 _minGasLimit, bytes memory _message) payable external;
-    function sendMessage(address _target, bytes memory _message, uint32 _minGasLimit) payable external;
-    function successfulMessages(bytes32) view external returns (bool);
-    function xDomainMessageSender() view external returns (address);
+    event SentMessageExtension1(address indexed sender, uint256 value);
+
+    function MESSAGE_VERSION() external view returns (uint16);
+    function MIN_GAS_CALLDATA_OVERHEAD() external view returns (uint64);
+    function MIN_GAS_CONSTANT_OVERHEAD() external view returns (uint64);
+    function MIN_GAS_DYNAMIC_OVERHEAD_DENOMINATOR() external view returns (uint64);
+    function MIN_GAS_DYNAMIC_OVERHEAD_NUMERATOR() external view returns (uint64);
+    function OTHER_MESSENGER() external view returns (address);
+    function baseGas(bytes memory _message, uint32 _minGasLimit) external pure returns (uint64);
+    function failedMessages(bytes32) external view returns (bool);
+    function messageNonce() external view returns (uint256);
+    function relayMessage(
+        uint256 _nonce,
+        address _sender,
+        address _target,
+        uint256 _value,
+        uint256 _minGasLimit,
+        bytes memory _message
+    ) external payable;
+    function sendMessage(address _target, bytes memory _message, uint32 _minGasLimit) external payable;
+    function successfulMessages(bytes32) external view returns (bool);
+    function xDomainMessageSender() external view returns (address);
 }
 ```
 
@@ -56,9 +71,10 @@ The user experience when sending from L1 to L2 is a bit different than when
 sending a transaction from L2 to L1. When going into L2 from L1, the user does
 not need to call `relayMessage` on L2 themselves. The user pays for L2 gas on L1
 and the transaction is automatically pulled into L2 where it is executed on L2.
-When going from L2 into L1, the user must call `relayMessage` on the
-`L1CrossDomainMessenger` to finalize the withdrawal. This function can only
-be called after the finalization window has passed.
+When going from L2 into L1, the user proves their withdrawal on OptimismPortal,
+then waits for the finalization window to pass, and then finalizes the withdrawal
+on the OptimismPortal, which calls `relayMessage` on the
+`L1CrossDomainMessenger` to finalize the withdrawal.
 
 ## Upgradability