Develop -> Master

.changeset/brave-garlics-sniff.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/l2geth': patch
+---
+
+Add the gas estimation block tag to `eth_estimateGas` to be RPC compliant

.changeset/fifty-badgers-behave.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/contracts-periphery': patch
+---
+
+Fixes import paths in the contracts-periphery package

.changeset/forty-radios-teach.md

@@ -0,0 +1,6 @@
+---
+'@eth-optimism/foundry': patch
+'@eth-optimism/ci-builder': patch
+---
+
+Upgrade foundry to support consistent storage layouts

.changeset/mighty-eagles-remember.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/core-utils': minor
+---
+
+Removes ethers as a dependency in favor of individual ethers sub-packages

.changeset/tall-fans-cover.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/contracts': patch
+---
+
+Significantly reduces contracts package bundle size

.changeset/wild-feet-listen.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/hardhat-node': patch
+---
+
+Fixes CI to properly release the hardhat-node

.circleci/config.yml

@@ -221,7 +221,7 @@ jobs:
           name: Check if we should run
           command: |
             shopt -s inherit_errexit
-            CHANGED=$(check-changed "op-(batcher|bindings|e2e|node|proposer)")
+            CHANGED=$(check-changed "op-(batcher|bindings|e2e|node|proposer|chain-ops)")
             if [[ "$CHANGED" = "FALSE" ]]; then
               circleci step halt
             fi
@@ -255,6 +255,11 @@ jobs:
           command: |
             golangci-lint run -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell ./...
           working_directory: op-service
+      - run:
+          name: lint op-chain-ops
+          command: |
+            golangci-lint run -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell ./...
+          working_directory: op-chain-ops
       - run:
           name: prep results dir
           command: mkdir -p /test-results
@@ -283,6 +288,11 @@ jobs:
           command: |
             gotestsum --junitfile /test-results/op-service.xml -- -coverpkg=github.com/ethereum-optimism/optimism/... -coverprofile=coverage.out -covermode=atomic ./...
           working_directory: op-service
+      - run:
+          name: test op-chain-ops
+          command: |
+            gotestsum --junitfile /test-results/op-chain-ops.xml -- -coverpkg=github.com/ethereum-optimism/optimism/... -coverprofile=coverage.out -covermode=atomic ./...
+          working_directory: op-chain-ops
       - store_test_results:
           path: /test-results
       - run:
@@ -400,7 +410,7 @@ jobs:
             fi
       - run:
           name: Lint
-          command: golangci-lint run -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell ./...
+          command: golangci-lint run -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell,errorlint -e "errors.As" -e "errors.Is" ./...
           working_directory: <<parameters.working_directory>>
       - store_test_results:
           path: /test-results
@@ -497,19 +507,6 @@ jobs:
           name: Bring up the stack
           command: |
             make devnet-up
-      - run:
-          name: Check L2 Config
-          command: npx hardhat check-l2-config --network devnetL1
-          working_directory: packages/contracts-bedrock
-      - run:
-          name: Do a deposit
-          command: |
-            timeout 5m npx hardhat deposit \
-                --to 0xB79f76EF2c5F0286176833E7B2eEe103b1CC3244  \
-                --amount-eth 1 \
-                --private-key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 \
-                --network devnetL1
-          working_directory: packages/contracts-bedrock
       - run:
           name: Deposit ERC20 through the bridge
           command: timeout 5m npx hardhat deposit-erc20 --network devnetL1
@@ -631,7 +628,7 @@ jobs:
             -sim=<<parameters.sim>> \
             -sim.loglevel=5 \
             -docker.pull=true \
-            -client=go-ethereum,op-geth_optimism-history,op-proposer_<<parameters.version>>,op-batcher_<<parameters.version>>,op-node_<<parameters.version>>,op-contracts_<<parameters.version>> |& tee /tmp/hive.log
+            -client=go-ethereum,op-geth_optimism-history,op-proposer_<<parameters.version>>,op-batcher_<<parameters.version>>,op-node_<<parameters.version>> |& tee /tmp/hive.log
       - run:
           command: |
             tar -cvf /tmp/workspace.tgz -C /home/circleci/project /home/circleci/project/workspace
@@ -809,6 +806,17 @@ workflows:
             - gcr
           requires:
             - contracts-bedrock-tests
+      - docker-publish:
+          name: contract-artifacts-bedrock-publish-dev
+          docker_file: ops/docker/Dockerfile.packages
+          docker_tags: us-central1-docker.pkg.dev/bedrock-goerli-development/images/contract-artifacts-bedrock:<<pipeline.git.revision>>
+          target: contract-artifacts-bedrock
+          docker_context: .
+          repo: us-central1-docker.pkg.dev
+          context:
+            - gcr
+          requires:
+            - contracts-bedrock-tests
       - hive-test:
           name: hive-test-rpc
           version: <<pipeline.git.revision>>
@@ -836,126 +844,3 @@ workflows:
             - op-batcher-publish-dev
             - op-proposer-publish-dev
             - deployer-bedrock-publish-dev
-
-
-  nightly:
-    triggers:
-      - schedule:
-          cron: "0 10 * * *"
-          filters:
-            branches:
-              only:
-                - develop
-    jobs:
-      - yarn-monorepo
-      - docker-publish:
-          name: l2geth-release
-          docker_file: l2geth/Dockerfile
-          docker_tags: ethereumoptimism/l2geth:nightly
-          docker_context: .
-          context:
-            - optimism
-      - docker-publish:
-          name: gas-oracle-release
-          docker_file: gas-oracle/Dockerfile
-          docker_tags: ethereumoptimism/gas-oracle:nightly
-          docker_context: .
-          context:
-            - optimism
-      - docker-publish:
-          name: hardhat-node-release
-          docker_file: ops/docker/hardhat/Dockerfile
-          docker_tags: ethereumoptimism/hardhat-node:nightly
-          docker_context: ops/docker/hardhat
-          context:
-            - optimism
-      - docker-publish:
-          name: proxyd-release
-          docker_file: proxyd/Dockerfile
-          docker_tags: ethereumoptimism/proxyd:nightly
-          docker_context: .
-          context:
-            - optimism
-      - docker-publish:
-          name: l2geth-exporter-release
-          docker_file: l2geth-exporter/Dockerfile
-          docker_tags: ethereumoptimism/l2geth-exporter:nightly
-          docker_context: .
-          context:
-            - optimism
-      - docker-publish:
-          name: op-exporter-release
-          docker_file: op-exporter/Dockerfile
-          docker_tags: ethereumoptimism/op-exporter:nightly
-          docker_context: .
-          context:
-            - optimism
-      - docker-publish:
-          name: fault-detector-release
-          docker_file: ops/docker/Dockerfile.packages
-          docker_tags: ethereumoptimism/fault-detector:nightly
-          docker_context: .
-          target: fault-detector
-          context:
-            - optimism
-      - docker-publish:
-          name: drippie-mon-release
-          docker_file: ops/docker/Dockerfile.packages
-          docker_tags: ethereumoptimism/drippie-mon:nightly
-          docker_context: .
-          target: drippie-mon
-          context:
-            - optimism
-      - docker-publish:
-          name: message-relayer-release
-          docker_file: ops/docker/Dockerfile.packages
-          docker_tags: ethereumoptimism/message-relayer:nightly
-          docker_context: .
-          target: message-relayer
-          context:
-            - optimism
-      - docker-publish:
-          name: data-transport-layer-release
-          docker_file: ops/docker/Dockerfile.packages
-          docker_tags: ethereumoptimism/data-transport-layer:nightly
-          docker_context: .
-          target: data-transport-layer
-          context:
-            - optimism
-      - docker-publish:
-          name: integration-tests-release
-          docker_file: ops/docker/Dockerfile.packages
-          docker_tags: ethereumoptimism/integration-tests:nightly
-          docker_context: .
-          target: integration-tests
-          context:
-            - optimism
-      - docker-publish:
-          name: replica-healthcheck-release
-          docker_file: ops/docker/Dockerfile.packages
-          docker_tags: ethereumoptimism/replica-healthcheck:nightly
-          docker_context: .
-          target: replica-healthcheck
-          context:
-            - optimism
-      - docker-publish:
-          name: batch-submitter-service-release
-          docker_file: batch-submitter/Dockerfile
-          docker_tags: ethereumoptimism/batch-submitter-service:nightly
-          docker_context: .
-          context:
-            - optimism
-      - docker-publish:
-          name: indexer-release
-          docker_file: indexer/Dockerfile
-          docker_tags: ethereumoptimism/indexer:nightly
-          docker_context: .
-          context:
-            - optimism
-      - docker-publish:
-          name: teleportr-release
-          docker_file: teleportr/Dockerfile
-          docker_tags: ethereumoptimism/teleportr:nightly
-          docker_context: .
-          context:
-            - optimism

.github/workflows/release.yml

@@ -134,7 +134,7 @@ jobs:
   hardhat-node:
     name: Publish Hardhat Node ${{ needs.release.outputs.hardhat-node }}
     needs: release
-    if: needs.release.hardhat-node != ''
+    if: needs.release.outputs.hardhat-node != ''
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

.github/workflows/sync-tests.yml

@@ -61,7 +61,7 @@ jobs:
         if: failure()
         uses: jwalton/gh-docker-logs@v1
         with:
-          images: 'ethereumoptimism/hardhat,ethereumoptimism/deployer,ethereumoptimism/data-transport-layer,ethereumoptimism/l2geth,ethereumoptimism/message-relayer,ethereumoptimism/batch-submitter,ethereumoptimism/l2geth'
+          images: 'ethereumoptimism/hardhat-node,ethereumoptimism/deployer,ethereumoptimism/data-transport-layer,ethereumoptimism/l2geth,ethereumoptimism/message-relayer,ethereumoptimism/batch-submitter,ethereumoptimism/l2geth'
           dest: './logs'
 
       - name: Tar logs

CONTRIBUTING.md

@@ -7,7 +7,7 @@ There are plenty of ways to contribute, in particular we appreciate support in t
 - Reporting issues. For security issues see [Security policy](https://github.com/ethereum-optimism/.github/blob/master/SECURITY.md).
 - Fixing and responding to existing issues. You can start off with those tagged ["good first issue"](https://github.com/ethereum-optimism/optimism/contribute) which are meant as introductory issues for external contributors.
 - Improving the [community site](https://community.optimism.io/)[documentation](https://github.com/ethereum-optimism/community-hub) and [tutorials](https://github.com/ethereum-optimism/optimism-tutorial).
-- Become an "Optimizer" and answer questions in the [Optimism Discord](https://discord.com/invite/jrnFEvq).
+- Become an "Optimizer" and answer questions in the [Optimism Discord](https://discord.optimism.io).
 - Get involved in the protocol design process by proposing changes or new features or write parts of the spec yourself in the [optimistic-specs repo](https://github.com/ethereum-optimism/optimistic-specs).
 
 Note that we have a [Code of Conduct](https://github.com/ethereum-optimism/.github/blob/master/CODE_OF_CONDUCT.md), please follow it in all your interactions with the project.

Makefile

@@ -44,14 +44,15 @@ mod-tidy:
 	# Below GOPRIVATE line allows mod-tidy to be run immediately after
 	# releasing new versions. This bypasses the Go modules proxy, which
 	# can take a while to index new versions.
-	# 
+	#
 	# See https://proxy.golang.org/ for more info.
 	export GOPRIVATE="github.com/ethereum-optimism" && \
 	cd ./op-service && go mod tidy && cd .. && \
 	cd ./op-node && go mod tidy && cd .. && \
 	cd ./op-proposer && go mod tidy && cd ..  && \
 	cd ./op-batcher && go mod tidy && cd ..  && \
 	cd ./op-bindings && go mod tidy && cd ..  && \
+	cd ./op-chain-ops && go mod tidy && cd ..  && \
 	cd ./op-e2e && go mod tidy && cd ..
 .PHONY: mod-tidy
 
@@ -108,27 +109,5 @@ clean-node-modules:
 
 
 tag-bedrock-go-modules:
-	@if [ -z "$(VERSION)" ]; then \
-		echo "You must specify a version."; \
-		exit 0; \
-	fi
-
-	@FIRST_CHAR=$(shell printf '%s' "$(VERSION)" | cut -c1); \
-	if [ "$$FIRST_CHAR" != "v" ]; then \
-		echo "Tag must start with v."; \
-		exit 0; \
-	fi
-
-	git tag "op-proposer/$(VERSION)"
-	git tag "op-node/$(VERSION)"
-	git tag "op-e2e/$(VERSION)"
-	git tag "op-bindings/$(VERSION)"
-	git tag "op-batcher/$(VERSION)"
-	git tag "op-service/$(VERSION)"
-	git push $(BEDROCK_TAGS_REMOTE) "op-proposer/$(VERSION)"
-	git push $(BEDROCK_TAGS_REMOTE) "op-node/$(VERSION)"
-	git push $(BEDROCK_TAGS_REMOTE) "op-e2e/$(VERSION)"
-	git push $(BEDROCK_TAGS_REMOTE) "op-bindings/$(VERSION)"
-	git push $(BEDROCK_TAGS_REMOTE) "op-batcher/$(VERSION)"
-	git push $(BEDROCK_TAGS_REMOTE) "op-service/$(VERSION)"
-
+	./ops/scripts/tag-bedrock-go-modules.sh $(BEDROCK_TAGS_REMOTE) $(VERSION)
+.PHONY: tag-bedrock-go-modules

batch-submitter/drivers/sequencer/encoding.go

@@ -68,10 +68,10 @@ func (c BatchContext) MarkerBatchType() BatchType {
 
 // Write encodes the BatchContext into a 16-byte stream using the following
 // encoding:
-//  - num_sequenced_txs:        3 bytes
-//  - num_subsequent_queue_txs: 3 bytes
-//  - timestamp:                5 bytes
-//  - block_number:             5 bytes
+//   - num_sequenced_txs:        3 bytes
+//   - num_subsequent_queue_txs: 3 bytes
+//   - timestamp:                5 bytes
+//   - block_number:             5 bytes
 //
 // Note that writing to a bytes.Buffer cannot
 // error, so errors are ignored here
@@ -85,10 +85,10 @@ func (c *BatchContext) Write(w *bytes.Buffer) {
 // Read decodes the BatchContext from the passed reader. If fewer than 16-bytes
 // remain, an error is returned. Otherwise the first 16-bytes will be read using
 // the expected encoding:
-//  - num_sequenced_txs:        3 bytes
-//  - num_subsequent_queue_txs: 3 bytes
-//  - timestamp:                5 bytes
-//  - block_number:             5 bytes
+//   - num_sequenced_txs:        3 bytes
+//   - num_subsequent_queue_txs: 3 bytes
+//   - timestamp:                5 bytes
+//   - block_number:             5 bytes
 func (c *BatchContext) Read(r io.Reader) error {
 	if err := readUint64(r, &c.NumSequencedTxs, 3); err != nil {
 		return err
@@ -188,13 +188,13 @@ type AppendSequencerBatchParams struct {
 }
 
 // Write encodes the AppendSequencerBatchParams using the following format:
-//  - should_start_at_element:        5 bytes
-//  - total_elements_to_append:       3 bytes
-//  - num_contexts:                   3 bytes
-//    - num_contexts * batch_context: num_contexts * 16 bytes
-//  - [num txs omitted]
-//    - tx_len:                       3 bytes
-//    - tx_bytes:                     tx_len bytes
+//   - should_start_at_element:        5 bytes
+//   - total_elements_to_append:       3 bytes
+//   - num_contexts:                   3 bytes
+//   - num_contexts * batch_context: num_contexts * 16 bytes
+//   - [num txs omitted]
+//   - tx_len:                       3 bytes
+//   - tx_bytes:                     tx_len bytes
 //
 // Typed batches include a dummy context as the first context
 // where the timestamp is 0. The blocknumber is interpreted
@@ -288,13 +288,13 @@ func (p *AppendSequencerBatchParams) Serialize(
 // stream does not terminate cleanly with an EOF while reading a tx_len, this
 // method will return an error. Otherwise, the stream will be parsed according
 // to the following format:
-//  - should_start_at_element:        5 bytes
-//  - total_elements_to_append:       3 bytes
-//  - num_contexts:                   3 bytes
-//    - num_contexts * batch_context: num_contexts * 16 bytes
-//  - [num txs omitted]
-//    - tx_len:                       3 bytes
-//    - tx_bytes:                     tx_len bytes
+//   - should_start_at_element:        5 bytes
+//   - total_elements_to_append:       3 bytes
+//   - num_contexts:                   3 bytes
+//   - num_contexts * batch_context: num_contexts * 16 bytes
+//   - [num txs omitted]
+//   - tx_len:                       3 bytes
+//   - tx_bytes:                     tx_len bytes
 func (p *AppendSequencerBatchParams) Read(r io.Reader) error {
 	if err := readUint64(r, &p.ShouldStartAtElement, 5); err != nil {
 		return err