Merge pull request #1928 from ethereum-optimism/develop

Develop -> Master Release PR

.changeset/clever-ducks-rescue.md

----
-'@eth-optimism/proxyd': minor
----
-
-Various proxyd fixes

.changeset/olive-pots-camp.md

+---
+'@eth-optimism/l2geth': patch
+---
+
+expose ErrNonceTooHigh from miner

.circleci/config.yml

+version: 2.1
+commands:
+  build-dockerfile:
+    parameters:
+      image-name:
+        description: Image name
+        type: string
+      target:
+        description: Dockerfile target
+        type: string
+        default: ""
+      dockerfile:
+        description: Dockerfile to use
+        type: string
+    steps:
+      - checkout
+      - setup_remote_docker:
+          version: 19.03.13
+      - run:
+          name: Build
+          command: |
+            echo -n "$STACKMAN_REPO_AUTH" | docker login -u _json_key --password-stdin https://us-east4-docker.pkg.dev
+            docker build -t "$STACKMAN_REPO/<<parameters.image-name>>:nightly" -f <<parameters.dockerfile>> <<#parameters.target>>--target <<parameters.target>><</parameters.target>> .
+            docker push "$STACKMAN_REPO/<<parameters.image-name>>:nightly"
+jobs:
+  build-dtl:
+    docker:
+      - image: cimg/base:2021.04
+    steps:
+      - build-dockerfile:
+          image-name: data-transport-layer
+          target: data-transport-layer
+          dockerfile: ./ops/docker/Dockerfile.packages
+  build-batch-submitter:
+    docker:
+      - image: cimg/base:2021.04
+    steps:
+      - build-dockerfile:
+          image-name: batch-submitter
+          target: batch-submitter
+          dockerfile: ./ops/docker/Dockerfile.packages
+  build-deployer:
+    docker:
+      - image: cimg/base:2021.04
+    steps:
+      - build-dockerfile:
+          image-name: deployer
+          target: deployer
+          dockerfile: ./ops/docker/Dockerfile.packages
+  build-l2geth:
+    docker:
+      - image: cimg/base:2021.04
+    steps:
+      - build-dockerfile:
+          image-name: l2geth
+          dockerfile: ./ops/docker/Dockerfile.geth
+  build-gas-oracle:
+    docker:
+      - image: cimg/base:2021.04
+    steps:
+      - build-dockerfile:
+          image-name: gas-oracle
+          dockerfile: ./ops/docker/Dockerfile.gas-oracle
+
+
+workflows:
+  nightly:
+    triggers:
+      - schedule:
+          cron: "0 0 * * * "
+          filters:
+            branches:
+              only:
+                - develop
+    jobs:
+      - build-dtl:
+          context: optimism
+      - build-batch-submitter:
+          context: optimism
+      - build-deployer:
+          context: optimism
+      - build-l2geth:
+          context: optimism
+      - build-gas-oracle:
+          context: optimism
\ No newline at end of file

go/proxyd/CHANGELOG.md

 # @eth-optimism/proxyd
 
+## 3.4.0
+
+### Minor Changes
+
+- 4b56ed84: Various proxyd fixes
+
 ## 3.3.0
 
 ### Minor Changes

go/proxyd/cmd/proxyd/main.go

 package main
 
 import (
+	"os"
+
 	"github.com/BurntSushi/toml"
 	"github.com/ethereum-optimism/optimism/go/proxyd"
 	"github.com/ethereum/go-ethereum/log"
-	"os"
 )
 
 var (
@@ -19,7 +20,7 @@ func main() {
 	log.Root().SetHandler(
 		log.LvlFilterHandler(
 			log.LvlInfo,
-			log.StreamHandler(os.Stdout, log.TerminalFormat(true)),
+			log.StreamHandler(os.Stdout, log.JSONFormat()),
 		),
 	)
 

go/proxyd/package.json

 {
   "name": "@eth-optimism/proxyd",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "private": true,
   "dependencies": {}
 }

l2geth/miner/worker.go

@@ -884,13 +884,8 @@ func (w *worker) commitTransactionsWithError(txs *types.TransactionsByPriceAndNo
 		// Return specific execution errors directly to the user to
 		// avoid returning the generic ErrCannotCommitTxnErr. It is safe
 		// to return the error directly since l2geth only processes at
-		// most one transaction per block. Currently, we map
-		// ErrNonceTooHigh to ErrNonceTooLow to match the behavior of
-		// the mempool, but this mapping will be removed at a later
-		// point once we decided to expose ErrNonceTooHigh to users.
-		if err == core.ErrNonceTooHigh {
-			return core.ErrNonceTooLow
-		} else if err != nil {
+		// most one transaction per block.
+		if err != nil {
 			return err
 		}
 	}