Merge pull request #2348 from ethereum-optimism/develop

Develop -> Master

.changeset/blue-carrots-vanish.md

+---
+'@eth-optimism/teleportr': patch
+---
+
+Add SuggestGasTipCap fallback

.changeset/cuddly-hotels-tell.md

+---
+'@eth-optimism/data-transport-layer': patch
+---
+
+Removes the unused L1DataTransportClient and its dependencies

.changeset/fresh-dots-hear.md

+---
+'@eth-optimism/batch-submitter-service': patch
+'@eth-optimism/gas-oracle': patch
+'@eth-optimism/integration-tests': patch
+'@eth-optimism/l2geth': patch
+'@eth-optimism/hardhat-node': patch
+'@eth-optimism/contracts': patch
+'@eth-optimism/data-transport-layer': patch
+'@eth-optimism/message-relayer': patch
+---
+
+Refactored Dockerfiles

.changeset/good-knives-add.md

+---
+'@eth-optimism/common-ts': patch
+---
+
+Update log lines for service shutdown

.changeset/great-llamas-watch.md

+---
+'@eth-optimism/indexer': patch
+---
+
+Indexer: initial release

.changeset/healthy-rings-fix.md

+---
+'@eth-optimism/replica-healthcheck': patch
+---
+
+Fixes a bug in the replica-healthcheck dockerfile

.changeset/lazy-years-call.md

+---
+'@eth-optimism/indexer': patch
+---
+
+Bump `go-ethereum` to `v1.10.16`

.changeset/lucky-cameras-grin.md

+---
+'@eth-optimism/batch-submitter-service': patch
+'@eth-optimism/teleportr': patch
+---
+
+Count reverted transactions in failed_submissions

.changeset/mighty-sloths-float.md

+---
+'@eth-optimism/teleportr': patch
+---
+
+Add teleportr API server

.changeset/ninety-kids-deny.md

+---
+'@eth-optimism/teleportr': patch
+---
+
+Bump `go-ethereum` to `v1.10.16`

.changeset/old-weeks-study.md

+---
+'@eth-optimism/data-transport-layer': patch
+---
+
+dtl: Support basic authentication for RPC endpoints

.changeset/real-seals-return.md

+---
+'@eth-optimism/batch-submitter-service': patch
+---
+
+Add Min/MaxStateRootElements configuration

.changeset/selfish-paws-reply.md

+---
+'@eth-optimism/common-ts': patch
+---
+
+Update metric names to include proper snake_case for strings that include "L1" or "L2"

.changeset/serious-needles-rush.md

+---
+'@eth-optimism/common-ts': patch
+'@eth-optimism/message-relayer': patch
+'@eth-optimism/replica-healthcheck': patch
+---
+
+Have BaseServiceV2 add spaces to environment variable names

.changeset/silent-pillows-lay.md

+---
+'@eth-optimism/batch-submitter-service': patch
+'@eth-optimism/l2geth': patch
+---
+
+l2geth: Sync from Backend Queue

.changeset/slimy-walls-appear.md

+---
+'@eth-optimism/sdk': patch
+---
+
+Comment out non-functional getMessagesByAddress function

.changeset/small-deers-shout.md

+---
+'@eth-optimism/teleportr': patch
+---
+
+Restructure Deposit and CompletedTeleport to use struct embeddings

.changeset/stale-ladybugs-smell.md

+---
+'@eth-optimism/batch-submitter-service': patch
+---
+
+Enforce min/max tx size on plaintext batch encoding

.changeset/tame-schools-switch.md

+---
+'@eth-optimism/teleportr': patch
+---
+
+Add LoadInTeleport method to database

.changeset/three-roses-remember.md

+---
+'@eth-optimism/teleportr': patch
+---
+
+Add btree index on deposit.txn_hash and deposit.address

.github/workflows/indexer.yml

+name: indexer unit tests
+
+on:
+  push:
+    paths:
+      - 'go/indexer/**'
+    branches:
+      - 'master'
+      - 'develop'
+      - '*rc'
+      - 'release/*'
+  pull_request:
+    branches:
+      - '*'
+  workflow_dispatch:
+
+defaults:
+  run:
+    working-directory: './go/indexer'
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Install Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.16.x
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Install
+        run: make
+
+      - name: Test
+        run: make test

.github/workflows/publish-canary.yml

@@ -24,9 +24,10 @@ jobs:
       hardhat-node: ${{ steps.packages.outputs.hardhat-node }}
       canary-docker-tag: ${{ steps.docker-image-name.outputs.canary-docker-tag }}
       proxyd: ${{ steps.packages.outputs.proxyd }}
-      op-exporter : ${{ steps.packages.outputs.op-exporter }}
-      l2geth-exporter : ${{ steps.packages.outputs.l2geth-exporter }}
-      batch-submitter-service : ${{ steps.packages.outputs.batch-submitter-service }}
+      op-exporter: ${{ steps.packages.outputs.op-exporter }}
+      l2geth-exporter: ${{ steps.packages.outputs.l2geth-exporter }}
+      batch-submitter-service: ${{ steps.packages.outputs.batch-submitter-service }}
+      indexer: ${{ steps.packages.outputs.indexer }}
 
     steps:
       - name: Check out source code
@@ -438,3 +439,40 @@ jobs:
           file: ./ops/docker/Dockerfile.batch-submitter-service
           push: true
           tags: ethereumoptimism/batch-submitter-service:${{ needs.canary-publish.outputs.batch-submitter-service }}
+
+  indexer:
+    name: Publish indexer Version ${{ needs.canary-publish.outputs.canary-docker-tag }}
+    needs: canary-publish
+    if: needs.canary-publish.outputs.indexer != ''
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_SECRET }}
+
+      - name: Set build args
+        id: build_args
+        run: |
+          echo ::set-output name=GITDATE::"$(date +%d-%m-%Y)"
+          echo ::set-output name=GITVERSION::$(jq -r .version ./go/indexer/package.json)
+          echo ::set-output name=GITCOMMIT::"$GITHUB_SHA"
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./ops/docker/Dockerfile.indexer
+          push: true
+          tags: ethereumoptimism/batch-submitter-service:${{ needs.canary-publish.outputs.indexer }}
+          build-args: |
+            GITDATE=${{ steps.build_args.outputs.GITDATE }}
+            GITCOMMIT=${{ steps.build_args.outputs.GITCOMMIT }}
+            GITVERSION=${{ steps.build_args.outputs.GITVERSION }}

.github/workflows/release.yml

@@ -19,9 +19,10 @@ jobs:
       replica-healthcheck: ${{ steps.packages.outputs.replica-healthcheck }}
       proxyd: ${{ steps.packages.outputs.proxyd }}
       hardhat-node: ${{ steps.packages.outputs.hardhat-node }}
-      op-exporter : ${{ steps.packages.outputs.op-exporter }}
-      l2geth-exporter : ${{ steps.packages.outputs.l2geth-exporter }}
-      batch-submitter-service : ${{ steps.packages.outputs.batch-submitter-service }}
+      op-exporter: ${{ steps.packages.outputs.op-exporter }}
+      l2geth-exporter: ${{ steps.packages.outputs.l2geth-exporter }}
+      batch-submitter-service: ${{ steps.packages.outputs.batch-submitter-service }}
+      indexer: ${{ steps.packages.outputs.indexer }}
 
     steps:
       - name: Checkout Repo
@@ -416,3 +417,40 @@ jobs:
           file: ./ops/docker/Dockerfile.batch-submitter-service
           push: true
           tags: ethereumoptimism/batch-submitter-service:${{ needs.release.outputs.batch-submitter-service }},ethereumoptimism/batch-submitter-service:latest
+
+  indexer:
+    name: Publish Indexer Version ${{ needs.release.outputs.indexer }}
+    needs: release
+    if: needs.release.outputs.indexer != ''
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_SECRET }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Set build args
+        id: build_args
+        run: |
+          echo ::set-output name=GITDATE::"$(date +%d-%m-%Y)"
+          echo ::set-output name=GITVERSION::$(jq -r .version ./go/indexer/package.json)
+          echo ::set-output name=GITCOMMIT::"$GITHUB_SHA"
+
+      - name: Publish Indexer
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./ops/docker/Dockerfile.indexer
+          push: true
+          tags: ethereumoptimism/indexer:${{ needs.release.outputs.indexer }},ethereumoptimism/indexer:latest
+          build-args: |
+            GITDATE=${{ steps.build_args.outputs.GITDATE }}
+            GITCOMMIT=${{ steps.build_args.outputs.GITCOMMIT }}
+            GITVERSION=${{ steps.build_args.outputs.GITVERSION }}

CONTRIBUTING.md

@@ -138,6 +138,8 @@ docker-compose build
 docker-compose up
 ```
 
+**If a node process exits with exit code: 137** you may need to increase the default memory limit of docker containers
+
 Finally, **if you're running into weird problems and nothing seems to be working**, run:
 
 ```bash

README.md

@@ -74,7 +74,7 @@ Our update process takes the form of a PR merging the `develop` branch into the
 ### The `develop` branch
 
 Our primary development branch is [`develop`](https://github.com/ethereum-optimism/optimism/tree/develop/).
-`develop` contains the most up-to-date software that remains backwards compatible with our latest experimental [network deployments](https://community.optimism.io/docs/developers/networks.html).
+`develop` contains the most up-to-date software that remains backwards compatible with our latest experimental [network deployments](https://community.optimism.io/docs/useful-tools/networks/).
 If you're making a backwards compatible change, please direct your pull request towards `develop`.
 
 **Changes to contracts within `packages/contracts/contracts` are usually NOT considered backwards compatible and SHOULD be made against a release candidate branch**.

go/batch-submitter/batch_submitter.go

@@ -148,15 +148,16 @@ func Main(gitVersion string) func(ctx *cli.Context) error {
 
 		if cfg.RunStateBatchSubmitter {
 			batchStateDriver, err := proposer.NewDriver(proposer.Config{
-				Name:        "Proposer",
-				L1Client:    l1Client,
-				L2Client:    l2Client,
-				BlockOffset: cfg.BlockOffset,
-				MaxTxSize:   cfg.MaxL1TxSize,
-				SCCAddr:     sccAddress,
-				CTCAddr:     ctcAddress,
-				ChainID:     chainID,
-				PrivKey:     proposerPrivKey,
+				Name:                 "Proposer",
+				L1Client:             l1Client,
+				L2Client:             l2Client,
+				BlockOffset:          cfg.BlockOffset,
+				MinStateRootElements: cfg.MinStateRootElements,
+				MaxStateRootElements: cfg.MaxStateRootElements,
+				SCCAddr:              sccAddress,
+				CTCAddr:              ctcAddress,
+				ChainID:              chainID,
+				PrivKey:              proposerPrivKey,
 			})
 			if err != nil {
 				return err

go/batch-submitter/config.go

@@ -74,14 +74,18 @@ type Config struct {
 	// by the batch submitter.
 	MaxL1TxSize uint64
 
+	// MinStateRootElements is the minimum number of state root elements that
+	// can be submitted in single proposer batch.
+	MinStateRootElements uint64
+
+	// MaxStateRootElements is the maximum number of state root elements that
+	// can be submitted in single proposer batch.
+	MaxStateRootElements uint64
+
 	// MaxTxBatchCount is the maximum number of L2 transactions that can ever be
 	// in a batch.
 	MaxTxBatchCount uint64
 
-	// MaxStateBatchCount is the maximum number of L2 state roots that can ever
-	// be in a batch.
-	MaxStateBatchCount uint64
-
 	// MaxBatchSubmissionTime is the maximum amount of time that we will
 	// wait before submitting an under-sized batch.
 	MaxBatchSubmissionTime time.Duration
@@ -199,6 +203,8 @@ func NewConfig(ctx *cli.Context) (Config, error) {
 		SCCAddress:                ctx.GlobalString(flags.SCCAddressFlag.Name),
 		MinL1TxSize:               ctx.GlobalUint64(flags.MinL1TxSizeFlag.Name),
 		MaxL1TxSize:               ctx.GlobalUint64(flags.MaxL1TxSizeFlag.Name),
+		MinStateRootElements:      ctx.GlobalUint64(flags.MinStateRootElementsFlag.Name),
+		MaxStateRootElements:      ctx.GlobalUint64(flags.MinStateRootElementsFlag.Name),
 		MaxBatchSubmissionTime:    ctx.GlobalDuration(flags.MaxBatchSubmissionTimeFlag.Name),
 		PollInterval:              ctx.GlobalDuration(flags.PollIntervalFlag.Name),
 		NumConfirmations:          ctx.GlobalUint64(flags.NumConfirmationsFlag.Name),

go/batch-submitter/drivers/proposer/driver.go

@@ -28,15 +28,16 @@ const stateRootSize = 32
 var bigOne = new(big.Int).SetUint64(1) //nolint:unused
 
 type Config struct {
-	Name        string
-	L1Client    *ethclient.Client
-	L2Client    *l2ethclient.Client
-	BlockOffset uint64
-	MaxTxSize   uint64
-	SCCAddr     common.Address
-	CTCAddr     common.Address
-	ChainID     *big.Int
-	PrivKey     *ecdsa.PrivateKey
+	Name                 string
+	L1Client             *ethclient.Client
+	L2Client             *l2ethclient.Client
+	BlockOffset          uint64
+	MaxStateRootElements uint64
+	MinStateRootElements uint64
+	SCCAddr              common.Address
+	CTCAddr              common.Address
+	ChainID              *big.Int
+	PrivKey              *ecdsa.PrivateKey
 }
 
 type Driver struct {
@@ -165,13 +166,10 @@ func (d *Driver) CraftBatchTx(
 	log.Info(name+" crafting batch tx", "start", start, "end", end,
 		"nonce", nonce)
 
-	var (
-		stateRoots         [][stateRootSize]byte
-		totalStateRootSize uint64
-	)
+	var stateRoots [][stateRootSize]byte
 	for i := new(big.Int).Set(start); i.Cmp(end) < 0; i.Add(i, bigOne) {
 		// Consume state roots until reach our maximum tx size.
-		if totalStateRootSize+stateRootSize > d.cfg.MaxTxSize {
+		if uint64(len(stateRoots)) > d.cfg.MaxStateRootElements {
 			break
 		}
 
@@ -180,10 +178,18 @@ func (d *Driver) CraftBatchTx(
 			return nil, err
 		}
 
-		totalStateRootSize += stateRootSize
 		stateRoots = append(stateRoots, block.Root())
 	}
 
+	// Abort if we don't have enough state roots to meet our minimum
+	// requirement.
+	if uint64(len(stateRoots)) < d.cfg.MinStateRootElements {
+		log.Info(name+" number of state roots  below minimum",
+			"num_state_roots", len(stateRoots),
+			"min_state_roots", d.cfg.MinStateRootElements)
+		return nil, nil
+	}
+
 	d.metrics.NumElementsPerBatch().Observe(float64(len(stateRoots)))
 
 	log.Info(name+" batch constructed", "num_state_roots", len(stateRoots))

go/batch-submitter/drivers/sequencer/batch.go

@@ -78,7 +78,6 @@ func GenSequencerBatchParams(
 	shouldStartAtElement uint64,
 	blockOffset uint64,
 	batch []BatchElement,
-	batchType BatchType,
 ) (*AppendSequencerBatchParams, error) {
 
 	var (
@@ -189,6 +188,5 @@ func GenSequencerBatchParams(
 		TotalElementsToAppend: uint64(len(batch)),
 		Contexts:              contexts,
 		Txs:                   txs,
-		Type:                  batchType,
 	}, nil
 }

go/batch-submitter/drivers/sequencer/driver.go

@@ -199,39 +199,57 @@ func (d *Driver) CraftBatchTx(
 	var pruneCount int
 	for {
 		batchParams, err := GenSequencerBatchParams(
-			shouldStartAt, d.cfg.BlockOffset, batchElements, d.cfg.BatchType,
+			shouldStartAt, d.cfg.BlockOffset, batchElements,
 		)
 		if err != nil {
 			return nil, err
 		}
 
-		batchArguments, err := batchParams.Serialize()
+		// Use plaintext encoding to enforce size constraints.
+		plaintextBatchArguments, err := batchParams.Serialize(BatchTypeLegacy)
 		if err != nil {
 			return nil, err
 		}
 
 		appendSequencerBatchID := d.ctcABI.Methods[appendSequencerBatchMethodName].ID
-		batchCallData := append(appendSequencerBatchID, batchArguments...)
+		plaintextCalldata := append(appendSequencerBatchID, plaintextBatchArguments...)
 
-		// Continue pruning until calldata size is less than configured max.
-		calldataSize := uint64(len(batchCallData))
-		if calldataSize > d.cfg.MaxTxSize {
+		// Continue pruning until plaintext calldata size is less than
+		// configured max.
+		plaintextCalldataSize := uint64(len(plaintextCalldata))
+		if plaintextCalldataSize > d.cfg.MaxTxSize {
 			oldLen := len(batchElements)
 			newBatchElementsLen := (oldLen * 9) / 10
 			batchElements = batchElements[:newBatchElementsLen]
-			log.Info(name+" pruned batch", "old_num_txs", oldLen, "new_num_txs", newBatchElementsLen)
+			log.Info(name+" pruned batch",
+				"plaintext_size", plaintextCalldataSize,
+				"max_tx_size", d.cfg.MaxTxSize,
+				"old_num_txs", oldLen,
+				"new_num_txs", newBatchElementsLen)
 			pruneCount++
 			continue
-		} else if calldataSize < d.cfg.MinTxSize {
+		} else if plaintextCalldataSize < d.cfg.MinTxSize {
 			log.Info(name+" batch tx size below minimum",
-				"size", calldataSize, "min_tx_size", d.cfg.MinTxSize)
+				"plaintext_size", plaintextCalldataSize,
+				"min_tx_size", d.cfg.MinTxSize,
+				"num_txs", len(batchElements))
 			return nil, nil
 		}
 
 		d.metrics.NumElementsPerBatch().Observe(float64(len(batchElements)))
 		d.metrics.BatchPruneCount.Set(float64(pruneCount))
 
-		log.Info(name+" batch constructed", "num_txs", len(batchElements), "length", len(batchCallData))
+		// Finally, encode the batch using the configured batch type.
+		var calldata = plaintextCalldata
+		if d.cfg.BatchType != BatchTypeLegacy {
+			batchArguments, err := batchParams.Serialize(d.cfg.BatchType)
+			if err != nil {
+				return nil, err
+			}
+			calldata = append(appendSequencerBatchID, batchArguments...)
+		}
+
+		log.Info(name+" batch constructed", "num_txs", len(batchElements), "length", len(calldata))
 
 		opts, err := bind.NewKeyedTransactorWithChainID(
 			d.cfg.PrivKey, d.cfg.ChainID,
@@ -243,7 +261,7 @@ func (d *Driver) CraftBatchTx(
 		opts.Nonce = nonce
 		opts.NoSend = true
 
-		tx, err := d.rawCtcContract.RawTransact(opts, batchCallData)
+		tx, err := d.rawCtcContract.RawTransact(opts, calldata)
 		switch {
 		case err == nil:
 			return tx, nil
@@ -258,7 +276,7 @@ func (d *Driver) CraftBatchTx(
 			log.Warn(d.cfg.Name + " eth_maxPriorityFeePerGas is unsupported " +
 				"by current backend, using fallback gasTipCap")
 			opts.GasTipCap = drivers.FallbackGasTipCap
-			return d.rawCtcContract.RawTransact(opts, batchCallData)
+			return d.rawCtcContract.RawTransact(opts, calldata)
 
 		default:
 			return nil, err

go/batch-submitter/drivers/sequencer/encoding.go

@@ -47,6 +47,25 @@ type BatchContext struct {
 	BlockNumber uint64 `json:"block_number"`
 }
 
+// IsMarkerContext returns true if the BatchContext is a marker context used to
+// specify the encoding format. This is only valid if called on the first
+// BatchContext in the calldata.
+func (c BatchContext) IsMarkerContext() bool {
+	return c.Timestamp == 0
+}
+
+// MarkerBatchType returns the BatchType specified by a marker BatchContext.
+// The return value is only valid if called on the first BatchContext in the
+// calldata and IsMarkerContext returns true.
+func (c BatchContext) MarkerBatchType() BatchType {
+	switch c.BlockNumber {
+	case 0:
+		return BatchTypeZlib
+	default:
+		return BatchTypeLegacy
+	}
+}
+
 // Write encodes the BatchContext into a 16-byte stream using the following
 // encoding:
 //  - num_sequenced_txs:        3 bytes
@@ -83,13 +102,34 @@ func (c *BatchContext) Read(r io.Reader) error {
 	return readUint64(r, &c.BlockNumber, 5)
 }
 
-// BatchType represents the type of batch being
-// submitted. When the first context in the batch
-// has a timestamp of 0, the blocknumber is interpreted
-// as an enum that represets the type
+// BatchType represents the type of batch being submitted. When the first
+// context in the batch has a timestamp of 0, the blocknumber is interpreted as
+// an enum that represets the type.
 type BatchType int8
 
-// Implements the Stringer interface for BatchType
+const (
+	// BatchTypeLegacy represets the legacy batch type.
+	BatchTypeLegacy BatchType = -1
+
+	// BatchTypeZlib represents a batch type where the transaction data is
+	// compressed using zlib.
+	BatchTypeZlib BatchType = 0
+)
+
+// BatchTypeFromString returns the BatchType enum based on a human readable
+// string.
+func BatchTypeFromString(s string) BatchType {
+	switch s {
+	case "zlib", "ZLIB":
+		return BatchTypeZlib
+	case "legacy", "LEGACY":
+		return BatchTypeLegacy
+	default:
+		return BatchTypeLegacy
+	}
+}
+
+// String implements the Stringer interface for BatchType.
 func (b BatchType) String() string {
 	switch b {
 	case BatchTypeLegacy:
@@ -101,27 +141,26 @@ func (b BatchType) String() string {
 	}
 }
 
-// BatchTypeFromString returns the BatchType
-// enum based on a human readable string
-func BatchTypeFromString(s string) BatchType {
-	switch s {
-	case "zlib", "ZLIB":
-		return BatchTypeZlib
-	case "legacy", "LEGACY":
-		return BatchTypeLegacy
+// MarkerContext returns the marker context, if any, for the given batch type.
+func (b BatchType) MarkerContext() *BatchContext {
+	switch b {
+
+	// No marker context for legacy encoding.
+	case BatchTypeLegacy:
+		return nil
+
+	// Zlib marker context sets block number equal to zero.
+	case BatchTypeZlib:
+		return &BatchContext{
+			Timestamp:   0,
+			BlockNumber: 0,
+		}
+
 	default:
-		return BatchTypeLegacy
+		return nil
 	}
 }
 
-const (
-	// BatchTypeLegacy represets the legacy batch type
-	BatchTypeLegacy BatchType = -1
-	// BatchTypeZlib represents a batch type where the
-	// transaction data is compressed using zlib
-	BatchTypeZlib BatchType = 0
-)
-
 // AppendSequencerBatchParams holds the raw data required to submit a batch of
 // L2 txs to L1 CTC contract. Rather than encoding the objects using the
 // standard ABI encoding, a custom encoding is and provided in the call data to
@@ -146,9 +185,6 @@ type AppendSequencerBatchParams struct {
 	// Txs contains all sequencer txs that will be recorded in the L1 CTC
 	// contract.
 	Txs []*CachedTx
-
-	// The type of the batch
-	Type BatchType
 }
 
 // Write encodes the AppendSequencerBatchParams using the following format:
@@ -173,7 +209,11 @@ type AppendSequencerBatchParams struct {
 //
 // Note that writing to a bytes.Buffer cannot
 // error, so errors are ignored here
-func (p *AppendSequencerBatchParams) Write(w *bytes.Buffer) error {
+func (p *AppendSequencerBatchParams) Write(
+	w *bytes.Buffer,
+	batchType BatchType,
+) error {
+
 	_ = writeUint64(w, p.ShouldStartAtElement, 5)
 	_ = writeUint64(w, p.TotalElementsToAppend, 3)
 
@@ -190,10 +230,10 @@ func (p *AppendSequencerBatchParams) Write(w *bytes.Buffer) error {
 	// copy the contexts as to not malleate the struct
 	// when it is a typed batch
 	contexts := make([]BatchContext, 0, len(p.Contexts)+1)
-	if p.Type == BatchTypeZlib {
-		// All zero values for the single batch context
-		// is desired here as blocknumber 0 means it is a zlib batch
-		contexts = append(contexts, BatchContext{})
+	// Add the marker context, if any, for non-legacy encodings.
+	markerContext := batchType.MarkerContext()
+	if markerContext != nil {
+		contexts = append(contexts, *markerContext)
 	}
 	contexts = append(contexts, p.Contexts...)
 
@@ -203,7 +243,7 @@ func (p *AppendSequencerBatchParams) Write(w *bytes.Buffer) error {
 		context.Write(w)
 	}
 
-	switch p.Type {
+	switch batchType {
 	case BatchTypeLegacy:
 		// Write each length-prefixed tx.
 		for _, tx := range p.Txs {
@@ -225,7 +265,7 @@ func (p *AppendSequencerBatchParams) Write(w *bytes.Buffer) error {
 		}
 
 	default:
-		return fmt.Errorf("Unknown batch type: %s", p.Type)
+		return fmt.Errorf("Unknown batch type: %s", batchType)
 	}
 
 	return nil
@@ -233,9 +273,12 @@ func (p *AppendSequencerBatchParams) Write(w *bytes.Buffer) error {
 
 // Serialize performs the same encoding as Write, but returns the resulting
 // bytes slice.
-func (p *AppendSequencerBatchParams) Serialize() ([]byte, error) {
+func (p *AppendSequencerBatchParams) Serialize(
+	batchType BatchType,
+) ([]byte, error) {
+
 	var buf bytes.Buffer
-	if err := p.Write(&buf); err != nil {
+	if err := p.Write(&buf, batchType); err != nil {
 		return nil, err
 	}
 	return buf.Bytes(), nil
@@ -266,6 +309,9 @@ func (p *AppendSequencerBatchParams) Read(r io.Reader) error {
 		return err
 	}
 
+	// Assume that it is a legacy batch at first, this will be overwrritten if
+	// we detect a marker context.
+	var batchType = BatchTypeLegacy
 	// Ensure that contexts is never nil
 	p.Contexts = make([]BatchContext, 0)
 	for i := uint64(0); i < numContexts; i++ {
@@ -274,30 +320,33 @@ func (p *AppendSequencerBatchParams) Read(r io.Reader) error {
 			return err
 		}
 
+		if i == 0 && batchContext.IsMarkerContext() {
+			batchType = batchContext.MarkerBatchType()
+			continue
+		}
+
 		p.Contexts = append(p.Contexts, batchContext)
 	}
 
-	// Assume that it is a legacy batch at first
-	p.Type = BatchTypeLegacy
-
-	// Handle backwards compatible batch types
-	if len(p.Contexts) > 0 && p.Contexts[0].Timestamp == 0 {
-		switch p.Contexts[0].BlockNumber {
-		case 0:
-			// zlib compressed transaction data
-			p.Type = BatchTypeZlib
-			// remove the first dummy context
-			p.Contexts = p.Contexts[1:]
-			numContexts--
-
-			zr, err := zlib.NewReader(r)
-			if err != nil {
-				return err
-			}
-			defer zr.Close()
+	// Define a closure to clean up the reader used by the specified encoding.
+	var closeReader func() error
+	switch batchType {
+
+	// The legacy serialization does not require clsing, so we instatiate a
+	// dummy closure.
+	case BatchTypeLegacy:
+		closeReader = func() error { return nil }
 
-			r = bufio.NewReader(zr)
+	// The zlib serialization requires decompression before reading the
+	// plaintext bytes, and also requires proper cleanup.
+	case BatchTypeZlib:
+		zr, err := zlib.NewReader(r)
+		if err != nil {
+			return err
 		}
+		closeReader = zr.Close
+
+		r = bufio.NewReader(zr)
 	}
 
 	// Deserialize any transactions. Since the number of txs is ommitted
@@ -315,7 +364,7 @@ func (p *AppendSequencerBatchParams) Read(r io.Reader) error {
 			if len(p.Txs) == 0 && len(p.Contexts) != 0 {
 				return ErrMalformedBatch
 			}
-			return nil
+			return closeReader()
 		} else if err != nil {
 			return err
 		}
@@ -327,7 +376,6 @@ func (p *AppendSequencerBatchParams) Read(r io.Reader) error {
 
 		p.Txs = append(p.Txs, NewCachedTx(tx))
 	}
-
 }
 
 // writeUint64 writes a the bottom `n` bytes of `val` to `w`.

go/batch-submitter/drivers/sequencer/encoding_test.go

@@ -119,7 +119,6 @@ func testAppendSequencerBatchParamsEncodeDecode(
 		TotalElementsToAppend: test.TotalElementsToAppend,
 		Contexts:              test.Contexts,
 		Txs:                   nil,
-		Type:                  sequencer.BatchTypeLegacy,
 	}
 
 	// Decode the batch from the test string.
@@ -133,7 +132,6 @@ func testAppendSequencerBatchParamsEncodeDecode(
 	} else {
 		require.Nil(t, err)
 	}
-	require.Equal(t, params.Type, sequencer.BatchTypeLegacy)
 
 	// Assert that the decoded params match the expected params. The
 	// transactions are compared serparetly (via hash), since the internal
@@ -149,7 +147,7 @@ func testAppendSequencerBatchParamsEncodeDecode(
 
 	// Finally, encode the decoded object and assert it matches the original
 	// hex string.
-	paramsBytes, err := params.Serialize()
+	paramsBytes, err := params.Serialize(sequencer.BatchTypeLegacy)
 
 	// Return early when testing error cases, no need to reserialize again
 	if test.Error {
@@ -161,17 +159,14 @@ func testAppendSequencerBatchParamsEncodeDecode(
 	require.Equal(t, test.HexEncoding, hex.EncodeToString(paramsBytes))
 
 	// Serialize the batches in compressed form
-	params.Type = sequencer.BatchTypeZlib
-	compressedParamsBytes, err := params.Serialize()
+	compressedParamsBytes, err := params.Serialize(sequencer.BatchTypeZlib)
 	require.Nil(t, err)
 
 	// Deserialize the compressed batch
 	var paramsCompressed sequencer.AppendSequencerBatchParams
 	err = paramsCompressed.Read(bytes.NewReader(compressedParamsBytes))
 	require.Nil(t, err)
-	require.Equal(t, paramsCompressed.Type, sequencer.BatchTypeZlib)
 
-	expParams.Type = sequencer.BatchTypeZlib
 	decompressedTxs := paramsCompressed.Txs
 	paramsCompressed.Txs = nil
 
@@ -189,3 +184,71 @@ func compareTxs(t *testing.T, a []*l2types.Transaction, b []*sequencer.CachedTx)
 		require.Equal(t, txA.Hash(), b[i].Tx().Hash())
 	}
 }
+
+// TestMarkerContext asserts that each batch type returns the correct marker
+// context.
+func TestMarkerContext(t *testing.T) {
+	batchTypes := []sequencer.BatchType{
+		sequencer.BatchTypeLegacy,
+		sequencer.BatchTypeZlib,
+	}
+
+	for _, batchType := range batchTypes {
+		t.Run(batchType.String(), func(t *testing.T) {
+			markerContext := batchType.MarkerContext()
+			if batchType == sequencer.BatchTypeLegacy {
+				require.Nil(t, markerContext)
+			} else {
+				require.NotNil(t, markerContext)
+
+				// All marker contexts MUST have a zero timestamp.
+				require.Equal(t, uint64(0), markerContext.Timestamp)
+
+				// Currently all other fields besides block number are defined
+				// as zero.
+				require.Equal(t, uint64(0), markerContext.NumSequencedTxs)
+				require.Equal(t, uint64(0), markerContext.NumSubsequentQueueTxs)
+
+				// Assert that the block number for each batch type is set to
+				// the correct constant.
+				switch batchType {
+				case sequencer.BatchTypeZlib:
+					require.Equal(t, uint64(0), markerContext.BlockNumber)
+				default:
+					t.Fatalf("unknown batch type")
+				}
+
+				// Ensure MarkerBatchType produces the expected BatchType.
+				require.Equal(t, batchType, markerContext.MarkerBatchType())
+			}
+		})
+	}
+}
+
+// TestIsMarkerContext asserts that IsMarkerContext returns true iff the
+// timestamp is zero.
+func TestIsMarkerContext(t *testing.T) {
+	batchContext := sequencer.BatchContext{
+		NumSequencedTxs:       1,
+		NumSubsequentQueueTxs: 2,
+		Timestamp:             3,
+		BlockNumber:           4,
+	}
+	require.False(t, batchContext.IsMarkerContext())
+
+	batchContext = sequencer.BatchContext{
+		NumSequencedTxs:       0,
+		NumSubsequentQueueTxs: 0,
+		Timestamp:             3,
+		BlockNumber:           0,
+	}
+	require.False(t, batchContext.IsMarkerContext())
+
+	batchContext = sequencer.BatchContext{
+		NumSequencedTxs:       1,
+		NumSubsequentQueueTxs: 2,
+		Timestamp:             0,
+		BlockNumber:           4,
+	}
+	require.True(t, batchContext.IsMarkerContext())
+}

go/batch-submitter/flags/flags.go

@@ -66,6 +66,20 @@ var (
 		Required: true,
 		EnvVar:   prefixEnvVar("MAX_L1_TX_SIZE"),
 	}
+	MinStateRootElementsFlag = cli.Uint64Flag{
+		Name: "min-state-root-elements",
+		Usage: "Minimum number of elements required to submit a state " +
+			"root batch",
+		Required: true,
+		EnvVar:   prefixEnvVar("MIN_STATE_ROOT_ELEMENTS"),
+	}
+	MaxStateRootElementsFlag = cli.Uint64Flag{
+		Name: "max-state-root-elements",
+		Usage: "Maximum number of elements required to submit a state " +
+			"root batch",
+		Required: true,
+		EnvVar:   prefixEnvVar("MAX_STATE_ROOT_ELEMENTS"),
+	}
 	MaxBatchSubmissionTimeFlag = cli.DurationFlag{
 		Name: "max-batch-submission-time",
 		Usage: "Maximum amount of time that we will wait before " +
@@ -240,6 +254,8 @@ var requiredFlags = []cli.Flag{
 	SCCAddressFlag,
 	MinL1TxSizeFlag,
 	MaxL1TxSizeFlag,
+	MinStateRootElementsFlag,
+	MaxStateRootElementsFlag,
 	MaxBatchSubmissionTimeFlag,
 	PollIntervalFlag,
 	NumConfirmationsFlag,

go/batch-submitter/go.sum

@@ -8,14 +8,50 @@ cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTj
 cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
 cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
 cloud.google.com/go v0.51.0/go.mod h1:hWtGJ6gnXH+KgDv+V0zFGDvpi07n3z8ZNj3T1RW0Gcw=
+cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
+cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
+cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
+cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
+cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
+cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
+cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
+cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
+cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
+cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
+cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
+cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
+cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY=
+cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM=
+cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY=
+cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ=
+cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI=
+cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
+cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
+cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
+cloud.google.com/go v0.100.1/go.mod h1:fs4QogzfH5n2pBXBP9vRiU+eCny7lD2vmFZy79Iuw1U=
+cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
+cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
+cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
+cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
+cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
 cloud.google.com/go/bigtable v1.2.0/go.mod h1:JcVAOl45lrTmQfLj7T6TxyMzIN/3FGGcFm+2xVAli2o=
+cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
+cloud.google.com/go/iam v0.1.0/go.mod h1:vcUNEa0pEm0qRVpmWepWaFMIAI8/hjB9mO8rNCJtF6c=
+cloud.google.com/go/kms v1.1.0/go.mod h1:WdbppnCDMDpOvoYBMn1+gNmOeEoZYqAv+HeuKARGCXI=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
+cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
+cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
+cloud.google.com/go/pubsub v1.18.0/go.mod h1:Vg6zS1lnXBFiQuHMntX4Id4mKIdsVRjKED4nCVMdMJ8=
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
+cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
+cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
+cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
@@ -57,6 +93,7 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5
 github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8=
 github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VTxUBvSJ3s3eHAg65PNgrsn5BtqCRPdmyXh6rAfdxN0=
 github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847 h1:rtI0fD4oG/8eVokGVPYJEW1F88p1ZNgXiEIs9thEE4A=
 github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ=
@@ -104,6 +141,10 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudflare/cloudflare-go v0.14.0/go.mod h1:EnwdgGMaFOruiPZRFSgn+TsQ3hQ7C/YWzIGLeu5c304=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
 github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ=
 github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q=
@@ -166,7 +207,13 @@ github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaB
 github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
 github.com/elastic/gosigar v0.8.1-0.20180330100440-37f05ff46ffa h1:XKAhUk/dtp+CV0VO6mhG2V7jA9vbcGcnYF/Ay9NjZrY=
 github.com/elastic/gosigar v0.8.1-0.20180330100440-37f05ff46ffa/go.mod h1:cdorVVzy1fhmEqmtgqkoE3bYtCfSCkVyjTyCIo22xvs=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
 github.com/ethereum/go-ethereum v1.10.12/go.mod h1:W3yfrFyL9C1pHcwY5hmRHVDaorTiQxhYBkKyu5mEDHw=
@@ -199,6 +246,7 @@ github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0 h1:wDJmvq38kDhkVxi50ni9ykkdUr1PKgqKOoi01fa0Mdk=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
@@ -228,20 +276,34 @@ github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgR
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
+github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
+github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
@@ -256,21 +318,44 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
+github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.5 h1:kxhtnfFVi+rYdOALN0B3k9UT86zVJKfBimRaciULW4I=
 github.com/google/uuid v1.1.5/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
+github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -278,6 +363,7 @@ github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0U
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc=
 github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE=
 github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0=
 github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
@@ -295,6 +381,7 @@ github.com/huin/goupnp v1.0.2 h1:RfGLP+h3mvisuWEyybxNq5Eft3NWhHLPeUN72kpKZoI=
 github.com/huin/goupnp v1.0.2/go.mod h1:0dxJBVBHqTMjIUMkESDTNgOOx/Mw5wYIfyFmdzSamkM=
 github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/influxdata/flux v0.65.1/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7mYlOw2LqY=
@@ -479,6 +566,7 @@ github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1
 github.com/rjeczalik/notify v0.9.1 h1:CLCKso/QK1snAlnhNR/CNvNiFU2saUtjV0bx3EwNeCE=
 github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho=
 github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
 github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
@@ -521,6 +609,7 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
@@ -556,10 +645,19 @@ github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmv
 github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
 github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
 github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
+github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
+go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
@@ -590,6 +688,9 @@ golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm0
 golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
 golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
+golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
@@ -601,12 +702,20 @@ golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHl
 golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
+golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -624,18 +733,36 @@ golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d h1:20cMwl2fHAzkJMEA+8J4JgqBQcQGzbisXo31MIeenXI=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
@@ -644,6 +771,17 @@ golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4Iltr
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -651,6 +789,7 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
@@ -674,6 +813,7 @@ golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -681,27 +821,59 @@ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912 h1:uCLL3g5wH2xjxVREVuAbP9JM5PPKjRbXKRa6IBjkzmU=
+golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 h1:XDXtA5hveEEV8JB2l7nhMTp3t3cHp9ZpwcdjqyEWLlo=
+golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/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=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -712,9 +884,11 @@ golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE=
 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 h1:GZokNIeuVkl3aZHJchRrr13WCsols02MLUcz1U9is6M=
+golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -741,10 +915,39 @@ golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200108203644-89082a384178/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
+golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
+golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
+golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -763,11 +966,39 @@ google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEn
 google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
+google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
+google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
+google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
+google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
+google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
+google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
+google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo=
+google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4=
+google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw=
+google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU=
+google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k=
+google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
+google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
+google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI=
+google.golang.org/api v0.58.0/go.mod h1:cAbP2FsxoGVNwtgNAmmn3y5G1TWAiVYRmg4yku3lv+E=
+google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I=
+google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo=
+google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -782,19 +1013,99 @@ google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvx
 google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20200108215221-bd8f9a0ef82f/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
+google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
+google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A=
+google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
+google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
+google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
+google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
+google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
+google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w=
+google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211018162055-cf77aa76bad2/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
+google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
+google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
+google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
+google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.26.0-rc.1 h1:7QnIQpGRHE5RnLKnESfDoxm2dTapTZua5a0kS0A+VXQ=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -834,6 +1145,10 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
+rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

go/bss-core/drivers/clear_pending_tx_test.go

@@ -231,6 +231,7 @@ func TestClearPendingTxClearingTxConfirms(t *testing.T) {
 			return &types.Receipt{
 				TxHash:      txHash,
 				BlockNumber: big.NewInt(int64(testBlockNumber)),
+				Status:      types.ReceiptStatusSuccessful,
 			}, nil
 		},
 	})
@@ -296,6 +297,7 @@ func TestClearPendingTxMultipleConfs(t *testing.T) {
 			return &types.Receipt{
 				TxHash:      txHash,
 				BlockNumber: big.NewInt(int64(testBlockNumber)),
+				Status:      types.ReceiptStatusSuccessful,
 			}, nil
 		},
 	}, numConfs)

go/bss-core/service.go

@@ -215,6 +215,18 @@ func (s *Service) eventLoop() {
 			receipt, err := s.txMgr.Send(
 				s.ctx, updateGasPrice, s.cfg.Driver.SendTransaction,
 			)
+
+			// Record the confirmation time and gas used if we receive a
+			// receipt, as this indicates the transaction confirmed. We record
+			// these metrics here as the transaction may have reverted, and will
+			// abort below.
+			if receipt != nil {
+				batchConfirmationTime := time.Since(batchConfirmationStart) /
+					time.Millisecond
+				s.metrics.BatchConfirmationTimeMs().Set(float64(batchConfirmationTime))
+				s.metrics.SubmissionGasUsedWei().Set(float64(receipt.GasUsed))
+			}
+
 			if err != nil {
 				log.Error(name+" unable to publish batch tx",
 					"err", err)
@@ -225,11 +237,7 @@ func (s *Service) eventLoop() {
 			// The transaction was successfully submitted.
 			log.Info(name+" batch tx successfully published",
 				"tx_hash", receipt.TxHash)
-			batchConfirmationTime := time.Since(batchConfirmationStart) /
-				time.Millisecond
-			s.metrics.BatchConfirmationTimeMs().Set(float64(batchConfirmationTime))
 			s.metrics.BatchesSubmitted().Inc()
-			s.metrics.SubmissionGasUsedWei().Set(float64(receipt.GasUsed))
 			s.metrics.SubmissionTimestamp().Set(float64(time.Now().UnixNano() / 1e6))
 
 		case err := <-s.ctx.Done():

go/bss-core/txmgr/txmgr.go

@@ -2,6 +2,7 @@ package txmgr
 
 import (
 	"context"
+	"errors"
 	"math/big"
 	"strings"
 	"sync"
@@ -12,6 +13,9 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 )
 
+// ErrReverted signals that a mined transaction reverted.
+var ErrReverted = errors.New("transaction reverted")
+
 // UpdateGasPriceSendTxFunc defines a function signature for publishing a
 // desired tx with a specific gas price. Implementations of this signature
 // should also return promptly when the context is canceled.
@@ -225,6 +229,9 @@ func (m *SimpleTxManager) Send(
 
 		// The transaction has confirmed.
 		case receipt := <-receiptChan:
+			if receipt.Status == types.ReceiptStatusFailed {
+				return receipt, ErrReverted
+			}
 			return receipt, nil
 		}
 	}
@@ -288,7 +295,10 @@ func waitMined(
 			// tipHeight. The equation is rewritten in this form to avoid
 			// underflows.
 			if txHeight+numConfirmations <= tipHeight+1 {
-				log.Info("Transaction confirmed", "txHash", txHash)
+				reverted := receipt.Status == types.ReceiptStatusFailed
+				log.Info("Transaction confirmed",
+					"txHash", txHash,
+					"reverted", reverted)
 				return receipt, nil
 			}
 

go/bss-core/txmgr/txmgr_test.go

@@ -98,6 +98,7 @@ func (g *gasPricer) sample() (*big.Int, *big.Int) {
 type minedTxInfo struct {
 	gasFeeCap   *big.Int
 	blockNumber uint64
+	reverted    bool
 }
 
 // mockBackend implements txmgr.ReceiptSource that tracks mined transactions
@@ -123,6 +124,20 @@ func newMockBackend() *mockBackend {
 // TransactionReceipt with a matching txHash will result in a non-nil receipt.
 // If a nil txHash is supplied this has the effect of mining an empty block.
 func (b *mockBackend) mine(txHash *common.Hash, gasFeeCap *big.Int) {
+	b.mineWithStatus(txHash, gasFeeCap, false)
+}
+
+// mineWithStatus records a (txHash, gasFeeCap) pair as confirmed, but also
+// includes the option to specify whether or not the transaction reverted.
+// Subsequent calls to TransactionReceipt with a matching txHash will result in
+// a non-nil receipt. If a nil txHash is supplied this has the effect of mining
+// an empty block.
+func (b *mockBackend) mineWithStatus(
+	txHash *common.Hash,
+	gasFeeCap *big.Int,
+	revert bool,
+) {
+
 	b.mu.Lock()
 	defer b.mu.Unlock()
 
@@ -131,6 +146,7 @@ func (b *mockBackend) mine(txHash *common.Hash, gasFeeCap *big.Int) {
 		b.minedTxs[*txHash] = minedTxInfo{
 			gasFeeCap:   gasFeeCap,
 			blockNumber: b.blockHeight,
+			reverted:    revert,
 		}
 	}
 }
@@ -160,12 +176,18 @@ func (b *mockBackend) TransactionReceipt(
 		return nil, nil
 	}
 
+	var status = types.ReceiptStatusSuccessful
+	if txInfo.reverted {
+		status = types.ReceiptStatusFailed
+	}
+
 	// Return the gas fee cap for the transaction in the GasUsed field so that
 	// we can assert the proper tx confirmed in our tests.
 	return &types.Receipt{
 		TxHash:      txHash,
 		GasUsed:     txInfo.gasFeeCap.Uint64(),
 		BlockNumber: big.NewInt(int64(txInfo.blockNumber)),
+		Status:      status,
 	}, nil
 }
 
@@ -201,6 +223,39 @@ func TestTxMgrConfirmAtMinGasPrice(t *testing.T) {
 	require.Equal(t, gasPricer.expGasFeeCap().Uint64(), receipt.GasUsed)
 }
 
+// TestTxMgrFailsForRevertedTxn asserts that Send returns ErrReverted if the
+// confirmed transaction reverts during execution, and returns the resulting
+// receipt.
+func TestTxMgrFailsForRevertedTxn(t *testing.T) {
+	t.Parallel()
+
+	h := newTestHarness()
+
+	gasPricer := newGasPricer(1)
+
+	updateGasPrice := func(ctx context.Context) (*types.Transaction, error) {
+		gasTipCap, gasFeeCap := gasPricer.sample()
+		return types.NewTx(&types.DynamicFeeTx{
+			GasTipCap: gasTipCap,
+			GasFeeCap: gasFeeCap,
+		}), nil
+	}
+
+	sendTx := func(ctx context.Context, tx *types.Transaction) error {
+		if gasPricer.shouldMine(tx.GasFeeCap()) {
+			txHash := tx.Hash()
+			h.backend.mineWithStatus(&txHash, tx.GasFeeCap(), true)
+		}
+		return nil
+	}
+
+	ctx := context.Background()
+	receipt, err := h.mgr.Send(ctx, updateGasPrice, sendTx)
+	require.Equal(t, txmgr.ErrReverted, err)
+	require.NotNil(t, receipt)
+	require.Equal(t, gasPricer.expGasFeeCap().Uint64(), receipt.GasUsed)
+}
+
 // TestTxMgrNeverConfirmCancel asserts that a Send can be canceled even if no
 // transaction is mined. This is done to ensure the the tx mgr can properly
 // abort on shutdown, even if a txn is in the process of being published.
@@ -519,6 +574,7 @@ func (b *failingBackend) TransactionReceipt(
 	return &types.Receipt{
 		TxHash:      txHash,
 		BlockNumber: big.NewInt(1),
+		Status:      types.ReceiptStatusSuccessful,
 	}, nil
 }
 

go/indexer/go.mod

@@ -4,7 +4,7 @@ go 1.17
 
 require (
 	github.com/ethereum-optimism/optimism/l2geth v0.0.0-20220104205740-f39387287484
-	github.com/ethereum/go-ethereum v1.10.14
+	github.com/ethereum/go-ethereum v1.10.16
 	github.com/getsentry/sentry-go v0.12.0
 	github.com/google/uuid v1.3.0
 	github.com/gorilla/mux v1.8.0
@@ -24,7 +24,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.1.1 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea // indirect
+	github.com/deckarep/golang-set v1.8.0 // indirect
 	github.com/edsrzf/mmap-go v1.0.0 // indirect
 	github.com/elastic/gosigar v0.8.1-0.20180330100440-37f05ff46ffa // indirect
 	github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect
@@ -35,8 +35,8 @@ require (
 	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
 	github.com/huin/goupnp v1.0.2 // indirect
-	github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458 // indirect
-	github.com/karalabe/usb v0.0.0-20211005121534-4c5740d64559 // indirect
+	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
+	github.com/karalabe/usb v0.0.2 // indirect
 	github.com/mattn/go-runewidth v0.0.9 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect

go/indexer/go.sum

@@ -115,8 +115,9 @@ github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea h1:j4317fAZh7X6GqbFowYdYdI0L9bwxL07jyPZIdepyZ0=
 github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ=
+github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4=
+github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo=
 github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218=
 github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M=
 github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw=
@@ -143,8 +144,8 @@ github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHj
 github.com/ethereum-optimism/optimism/l2geth v0.0.0-20220104205740-f39387287484 h1:HbNZa+JqIBEWgTmqUY6/iHNNKWVycVFSQ9BJitYIy6U=
 github.com/ethereum-optimism/optimism/l2geth v0.0.0-20220104205740-f39387287484/go.mod h1:Tiv7YftnDjuhq2ktkynxSujAASpUxZP+E0RRPjQD3z0=
 github.com/ethereum/go-ethereum v1.10.12/go.mod h1:W3yfrFyL9C1pHcwY5hmRHVDaorTiQxhYBkKyu5mEDHw=
-github.com/ethereum/go-ethereum v1.10.14 h1:EJ/ucQzFlgKgwblIwU8R6ABnZ9kgUnIG2+Q1tiSrt4M=
-github.com/ethereum/go-ethereum v1.10.14/go.mod h1:W3yfrFyL9C1pHcwY5hmRHVDaorTiQxhYBkKyu5mEDHw=
+github.com/ethereum/go-ethereum v1.10.16 h1:3oPrumn0bCW/idjcxMn5YYVCdK7VzJYIvwGZUGLEaoc=
+github.com/ethereum/go-ethereum v1.10.16/go.mod h1:Anj6cxczl+AHy63o4X9O8yWNHuN5wMpfb8MAnHkWn7Y=
 github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
@@ -250,6 +251,7 @@ github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc=
+github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc=
 github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE=
 github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0=
 github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
@@ -285,8 +287,9 @@ github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/
 github.com/iris-contrib/jade v1.1.3/go.mod h1:H/geBymxJhShH5kecoiOCSssPX7QWYH7UaeZTSWddIk=
 github.com/iris-contrib/pongo2 v0.0.1/go.mod h1:Ssh+00+3GAZqSQb30AvBRNxBx7rf0GqwkjqxNd0u65g=
 github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw=
-github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458 h1:6OvNmYgJyexcZ3pYbTI9jWx5tHo1Dee/tWbLMfPe2TA=
 github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
+github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
+github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jarcoal/httpmock v1.0.8/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik=
 github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU=
 github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
@@ -304,8 +307,9 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
 github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
 github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F6iIOGgxJ5npU/IUOhOhqlVrGjyIZc8/MagT0=
 github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
-github.com/karalabe/usb v0.0.0-20211005121534-4c5740d64559 h1:0VWDXPNE0brOek1Q8bLfzKkvOzwbQE/snjGojlCr8CY=
 github.com/karalabe/usb v0.0.0-20211005121534-4c5740d64559/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU=
+github.com/karalabe/usb v0.0.2 h1:M6QQBNxF+CQ8OFvxrT90BA0qBOXymndZnk5q235mFc4=
+github.com/karalabe/usb v0.0.2/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU=
 github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8=
 github.com/kataras/iris/v12 v12.1.8/go.mod h1:LMYy4VlP67TQ3Zgriz8RE2h2kMZV2SgMYbq3UhfoFmE=
 github.com/kataras/neffos v0.0.14/go.mod h1:8lqADm8PnbeFfL7CLXh1WHw53dG27MC3pgi2R1rmoTE=

go/teleportr/Makefile

@@ -13,8 +13,12 @@ DISBURSER_ARTIFACT := ../../packages/contracts/artifacts/contracts/L2/teleportr/
 teleportr:
 	env GO111MODULE=on go build -v $(LDFLAGS) ./cmd/teleportr
 
+teleportr-api:
+	env GO111MODULE=on go build -v $(LDFLAGS) ./cmd/teleportr-api
+
 clean:
 	rm teleportr
+	rm api
 
 test:
 	go test -v ./...
@@ -48,6 +52,7 @@ bindings-disburser:
 
 .PHONY: \
 	teleportr \
+	teleportr-api \
 	bindings \
 	bindings-deposit \
 	bindings-disburser \

go/teleportr/api/metrics.go

+package api
+
+import (
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+)
+
+const TeleportrAPINamespace = "teleportr_api"
+
+var (
+	rpcRequestsTotal = promauto.NewCounter(prometheus.CounterOpts{
+		Namespace: TeleportrAPINamespace,
+		Name:      "rpc_requests_total",
+		Help:      "Count of total client RPC requests.",
+	})
+	httpResponseCodesTotal = promauto.NewCounterVec(prometheus.CounterOpts{
+		Namespace: TeleportrAPINamespace,
+		Name:      "http_response_codes_total",
+		Help:      "Count of total HTTP response codes.",
+	}, []string{
+		"status_code",
+	})
+	httpRequestDurationSumm = promauto.NewSummary(prometheus.SummaryOpts{
+		Namespace:  TeleportrAPINamespace,
+		Name:       "http_request_duration_seconds",
+		Help:       "Summary of HTTP request durations, in seconds.",
+		Objectives: map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.95: 0.005, 0.99: 0.001},
+	})
+	databaseErrorsTotal = promauto.NewCounterVec(prometheus.CounterOpts{
+		Namespace: TeleportrAPINamespace,
+		Name:      "database_errors_total",
+		Help:      "Count of total database failures.",
+	}, []string{
+		"method",
+	})
+	rpcErrorsTotal = promauto.NewCounterVec(prometheus.CounterOpts{
+		Namespace: TeleportrAPINamespace,
+		Name:      "rpc_errors_total",
+		Help:      "Count of total L1 rpc failures.",
+	}, []string{
+		"method",
+	})
+)

go/teleportr/api/server.go

+package api
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"math/big"
+	"net"
+	"net/http"
+	"os"
+	"os/signal"
+	"strconv"
+	"sync"
+	"syscall"
+	"time"
+
+	bsscore "github.com/ethereum-optimism/optimism/go/bss-core"
+	"github.com/ethereum-optimism/optimism/go/bss-core/dial"
+	"github.com/ethereum-optimism/optimism/go/bss-core/drivers"
+	"github.com/ethereum-optimism/optimism/go/bss-core/txmgr"
+	"github.com/ethereum-optimism/optimism/go/teleportr/bindings/deposit"
+	"github.com/ethereum-optimism/optimism/go/teleportr/db"
+	"github.com/ethereum-optimism/optimism/go/teleportr/flags"
+	"github.com/ethereum/go-ethereum"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/google/uuid"
+	"github.com/gorilla/mux"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/rs/cors"
+	"github.com/urfave/cli"
+)
+
+type ContextKey string
+
+const (
+	ContextKeyReqID ContextKey = "req_id"
+)
+
+func Main(gitVersion string) func(*cli.Context) error {
+	return func(cliCtx *cli.Context) error {
+		cfg, err := NewConfig(cliCtx)
+		if err != nil {
+			return err
+		}
+
+		ctx, cancel := context.WithCancel(context.Background())
+		defer cancel()
+
+		depositAddr, err := bsscore.ParseAddress(cfg.DepositAddress)
+		if err != nil {
+			return err
+		}
+
+		l1Client, err := dial.L1EthClientWithTimeout(
+			ctx, cfg.L1EthRpc, cfg.DisableHTTP2,
+		)
+		if err != nil {
+			return err
+		}
+		defer l1Client.Close()
+
+		depositContract, err := deposit.NewTeleportrDeposit(
+			depositAddr, l1Client,
+		)
+		if err != nil {
+			return err
+		}
+
+		// TODO(conner): make read-only
+		database, err := db.Open(db.Config{
+			Host:      cfg.PostgresHost,
+			Port:      uint16(cfg.PostgresPort),
+			User:      cfg.PostgresUser,
+			Password:  cfg.PostgresPassword,
+			DBName:    cfg.PostgresDBName,
+			EnableSSL: cfg.PostgresEnableSSL,
+		})
+		if err != nil {
+			return err
+		}
+		defer database.Close()
+
+		server := NewServer(
+			ctx,
+			l1Client,
+			database,
+			depositAddr,
+			depositContract,
+			cfg.NumConfirmations,
+		)
+
+		var wg sync.WaitGroup
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			_ = server.ListenAndServe(cfg.Hostname, cfg.Port)
+		}()
+
+		interruptChannel := make(chan os.Signal, 1)
+		signal.Notify(interruptChannel, []os.Signal{
+			os.Interrupt,
+			os.Kill,
+			syscall.SIGTERM,
+			syscall.SIGQUIT,
+		}...)
+
+		select {
+		case <-interruptChannel:
+			_ = server.httpServer.Shutdown(ctx)
+			time.AfterFunc(defaultTimeout, func() {
+				cancel()
+				_ = server.httpServer.Close()
+			})
+			wg.Wait()
+		case <-ctx.Done():
+		}
+
+		return nil
+	}
+}
+
+type Config struct {
+	Hostname          string
+	Port              uint16
+	L1EthRpc          string
+	DepositAddress    string
+	NumConfirmations  uint64
+	PostgresHost      string
+	PostgresPort      uint16
+	PostgresUser      string
+	PostgresPassword  string
+	PostgresDBName    string
+	PostgresEnableSSL bool
+	DisableHTTP2      bool
+}
+
+func NewConfig(ctx *cli.Context) (Config, error) {
+	return Config{
+		Hostname:          ctx.GlobalString(flags.APIHostnameFlag.Name),
+		Port:              uint16(ctx.GlobalUint64(flags.APIPortFlag.Name)),
+		L1EthRpc:          ctx.GlobalString(flags.APIL1EthRpcFlag.Name),
+		DepositAddress:    ctx.GlobalString(flags.APIDepositAddressFlag.Name),
+		NumConfirmations:  ctx.GlobalUint64(flags.APINumConfirmationsFlag.Name),
+		PostgresHost:      ctx.GlobalString(flags.APIPostgresHostFlag.Name),
+		PostgresPort:      uint16(ctx.GlobalUint64(flags.APIPostgresPortFlag.Name)),
+		PostgresUser:      ctx.GlobalString(flags.APIPostgresUserFlag.Name),
+		PostgresPassword:  ctx.GlobalString(flags.APIPostgresPasswordFlag.Name),
+		PostgresDBName:    ctx.GlobalString(flags.APIPostgresDBNameFlag.Name),
+		PostgresEnableSSL: ctx.GlobalBool(flags.APIPostgresEnableSSLFlag.Name),
+	}, nil
+}
+
+const (
+	ContentTypeHeader = "Content-Type"
+	ContentTypeJSON   = "application/json"
+
+	defaultTimeout = 10 * time.Second
+)
+
+type Server struct {
+	ctx              context.Context
+	l1Client         *ethclient.Client
+	database         *db.Database
+	depositAddr      common.Address
+	depositContract  *deposit.TeleportrDeposit
+	numConfirmations uint64
+
+	httpServer *http.Server
+}
+
+func NewServer(
+	ctx context.Context,
+	l1Client *ethclient.Client,
+	database *db.Database,
+	depositAddr common.Address,
+	depositContract *deposit.TeleportrDeposit,
+	numConfirmations uint64,
+) *Server {
+
+	if numConfirmations == 0 {
+		panic("NumConfirmations cannot be zero")
+	}
+
+	return &Server{
+		ctx:              ctx,
+		l1Client:         l1Client,
+		database:         database,
+		depositAddr:      depositAddr,
+		depositContract:  depositContract,
+		numConfirmations: numConfirmations,
+	}
+}
+
+func (s *Server) ListenAndServe(host string, port uint16) error {
+	handler := mux.NewRouter()
+	handler.HandleFunc("/healthz", HandleHealthz).Methods("GET")
+	handler.HandleFunc(
+		"/status",
+		instrumentedErrorHandler(s.HandleStatus),
+	).Methods("GET")
+	handler.HandleFunc(
+		"/estimate/{addr:0x[0-9a-fA-F]{40}}/{amount:[0-9]{1,80}}",
+		instrumentedErrorHandler(s.HandleEstimate),
+	).Methods("GET")
+	handler.HandleFunc(
+		"/track/{txhash:0x[0-9a-fA-F]{64}}",
+		instrumentedErrorHandler(s.HandleTrack),
+	).Methods("GET")
+	handler.HandleFunc(
+		"/history/{addr:0x[0-9a-fA-F]{40}}",
+		instrumentedErrorHandler(s.HandleHistory),
+	).Methods("GET")
+	c := cors.New(cors.Options{
+		AllowedOrigins: []string{"*"},
+	})
+	addr := fmt.Sprintf("%s:%d", host, port)
+	s.httpServer = &http.Server{
+		Handler: c.Handler(handler),
+		Addr:    addr,
+		BaseContext: func(_ net.Listener) context.Context {
+			return s.ctx
+		},
+	}
+	log.Info("Starting HTTP server", "addr", addr)
+	return s.httpServer.ListenAndServe()
+}
+
+func HandleHealthz(w http.ResponseWriter, r *http.Request) {
+	_, _ = w.Write([]byte("OK"))
+}
+
+type StatusResponse struct {
+	CurrentBalanceWei   string `json:"current_balance_wei"`
+	MaximumBalanceWei   string `json:"maximum_balance_wei"`
+	MinDepositAmountWei string `json:"min_deposit_amount_wei"`
+	MaxDepositAmountWei string `json:"max_deposit_amount_wei"`
+	IsAvailable         bool   `json:"is_available"`
+}
+
+func (s *Server) HandleStatus(
+	ctx context.Context,
+	w http.ResponseWriter,
+	r *http.Request,
+) error {
+
+	maxBalance, err := s.depositContract.MaxBalance(&bind.CallOpts{
+		Context: ctx,
+	})
+	if err != nil {
+		rpcErrorsTotal.WithLabelValues("max_balance").Inc()
+		return err
+	}
+
+	minDepositAmount, err := s.depositContract.MinDepositAmount(&bind.CallOpts{
+		Context: ctx,
+	})
+	if err != nil {
+		rpcErrorsTotal.WithLabelValues("min_deposit_amount").Inc()
+		return err
+	}
+
+	maxDepositAmount, err := s.depositContract.MaxDepositAmount(&bind.CallOpts{
+		Context: ctx,
+	})
+	if err != nil {
+		rpcErrorsTotal.WithLabelValues("max_deposit_amount").Inc()
+		return err
+	}
+
+	curBalance, err := s.l1Client.BalanceAt(ctx, s.depositAddr, nil)
+	if err != nil {
+		rpcErrorsTotal.WithLabelValues("balance_at").Inc()
+		return err
+	}
+
+	balanceAfterMaxDeposit := new(big.Int).Add(
+		curBalance, maxDepositAmount,
+	)
+	isAvailable := maxBalance.Cmp(balanceAfterMaxDeposit) >= 0
+
+	resp := StatusResponse{
+		CurrentBalanceWei:   curBalance.String(),
+		MaximumBalanceWei:   maxBalance.String(),
+		MinDepositAmountWei: minDepositAmount.String(),
+		MaxDepositAmountWei: maxDepositAmount.String(),
+		IsAvailable:         isAvailable,
+	}
+
+	jsonResp, err := json.Marshal(resp)
+	if err != nil {
+		return err
+	}
+
+	w.Header().Set(ContentTypeHeader, ContentTypeJSON)
+	_, err = w.Write(jsonResp)
+	return err
+}
+
+type EstimateResponse struct {
+	BaseFee     string `json:"base_fee"`
+	GasTipCap   string `json:"gas_tip_cap"`
+	GasFeeCap   string `json:"gas_fee_cap"`
+	GasEstimate string `json:"gas_estimate"`
+}
+
+func (s *Server) HandleEstimate(
+	ctx context.Context,
+	w http.ResponseWriter,
+	r *http.Request,
+) error {
+
+	vars := mux.Vars(r)
+	addressStr, ok := vars["addr"]
+	if !ok {
+		return StatusError{
+			Err:  errors.New("missing address parameter"),
+			Code: http.StatusBadRequest,
+		}
+	}
+	address, err := bsscore.ParseAddress(addressStr)
+	if err != nil {
+		return StatusError{
+			Err:  err,
+			Code: http.StatusBadRequest,
+		}
+	}
+
+	amountStr, ok := vars["amount"]
+	if !ok {
+		return StatusError{
+			Err:  errors.New("missing amount parameter"),
+			Code: http.StatusBadRequest,
+		}
+	}
+	amount, ok := new(big.Int).SetString(amountStr, 10)
+	if !ok {
+		return StatusError{
+			Err:  errors.New("unable to parse amount"),
+			Code: http.StatusBadRequest,
+		}
+	}
+
+	gasTipCap, err := s.l1Client.SuggestGasTipCap(ctx)
+	if err != nil {
+		rpcErrorsTotal.WithLabelValues("suggest_gas_tip_cap").Inc()
+		// If the request failed because the backend does not support
+		// eth_maxPriorityFeePerGas, fallback to using the default constant.
+		// Currently Alchemy is the only backend provider that exposes this
+		// method, so in the event their API is unreachable we can fallback to a
+		// degraded mode of operation. This also applies to our test
+		// environments, as hardhat doesn't support the query either.
+		if !drivers.IsMaxPriorityFeePerGasNotFoundError(err) {
+			return err
+		}
+		gasTipCap = drivers.FallbackGasTipCap
+	}
+
+	header, err := s.l1Client.HeaderByNumber(ctx, nil)
+	if err != nil {
+		rpcErrorsTotal.WithLabelValues("header_by_number").Inc()
+		return err
+	}
+
+	gasFeeCap := txmgr.CalcGasFeeCap(header.BaseFee, gasTipCap)
+
+	gasUsed, err := s.l1Client.EstimateGas(ctx, ethereum.CallMsg{
+		From:      address,
+		To:        &s.depositAddr,
+		Gas:       0,
+		GasFeeCap: gasFeeCap,
+		GasTipCap: gasTipCap,
+		Value:     amount,
+		Data:      nil,
+	})
+	if err != nil {
+		rpcErrorsTotal.WithLabelValues("estimate_gas").Inc()
+		return err
+	}
+
+	resp := EstimateResponse{
+		BaseFee:     header.BaseFee.String(),
+		GasTipCap:   gasTipCap.String(),
+		GasFeeCap:   gasFeeCap.String(),
+		GasEstimate: new(big.Int).SetUint64(gasUsed).String(),
+	}
+
+	jsonResp, err := json.Marshal(resp)
+	if err != nil {
+		return err
+	}
+
+	w.Header().Set(ContentTypeHeader, ContentTypeJSON)
+	_, err = w.Write(jsonResp)
+	return err
+}
+
+type RPCTeleport struct {
+	ID             string           `json:"id"`
+	Address        string           `json:"address"`
+	AmountWei      string           `json:"amount_wei"`
+	TxHash         string           `json:"tx_hash"`
+	BlockNumber    string           `json:"block_number"`
+	BlockTimestamp string           `json:"block_timestamp_unix"`
+	Disbursement   *RPCDisbursement `json:"disbursement"`
+}
+
+func makeRPCTeleport(teleport *db.Teleport) RPCTeleport {
+	rpcTeleport := RPCTeleport{
+		ID:             strconv.FormatUint(teleport.ID, 10),
+		Address:        teleport.Address.String(),
+		AmountWei:      teleport.Amount.String(),
+		TxHash:         teleport.Deposit.TxnHash.String(),
+		BlockNumber:    strconv.FormatUint(teleport.Deposit.BlockNumber, 10),
+		BlockTimestamp: strconv.FormatInt(teleport.Deposit.BlockTimestamp.Unix(), 10),
+	}
+	if teleport.Disbursement != nil {
+		rpcTeleport.Disbursement = &RPCDisbursement{
+			TxHash:         teleport.Disbursement.TxnHash.String(),
+			BlockNumber:    strconv.FormatUint(teleport.Disbursement.BlockNumber, 10),
+			BlockTimestamp: strconv.FormatInt(teleport.Disbursement.BlockTimestamp.Unix(), 10),
+			Success:        teleport.Disbursement.Success,
+		}
+	}
+	return rpcTeleport
+}
+
+type RPCDisbursement struct {
+	TxHash         string `json:"tx_hash"`
+	BlockNumber    string `json:"block_number"`
+	BlockTimestamp string `json:"block_timestamp_unix"`
+	Success        bool   `json:"success"`
+}
+
+type TrackResponse struct {
+	CurrentBlockNumber     string      `json:"current_block_number"`
+	ConfirmationsRequired  string      `json:"confirmations_required"`
+	ConfirmationsRemaining string      `json:"confirmations_remaining"`
+	Teleport               RPCTeleport `json:"teleport"`
+}
+
+func (s *Server) HandleTrack(
+	ctx context.Context,
+	w http.ResponseWriter,
+	r *http.Request,
+) error {
+
+	vars := mux.Vars(r)
+	txHashStr, ok := vars["txhash"]
+	if !ok {
+		return StatusError{
+			Err:  errors.New("missing txhash parameter"),
+			Code: http.StatusBadRequest,
+		}
+	}
+	txHash := common.HexToHash(txHashStr)
+
+	blockNumber, err := s.l1Client.BlockNumber(ctx)
+	if err != nil {
+		rpcErrorsTotal.WithLabelValues("block_number").Inc()
+		return err
+	}
+
+	teleport, err := s.database.LoadTeleportByDepositHash(txHash)
+	if err != nil {
+		databaseErrorsTotal.WithLabelValues("load_teleport_by_deposit_hash").Inc()
+		return err
+	}
+
+	if teleport == nil {
+		return StatusError{
+			Code: http.StatusNotFound,
+		}
+	}
+
+	var confsRemaining uint64
+	if teleport.Deposit.BlockNumber+s.numConfirmations > blockNumber+1 {
+		confsRemaining = blockNumber + 1 -
+			(teleport.Deposit.BlockNumber + s.numConfirmations)
+	}
+
+	resp := TrackResponse{
+		CurrentBlockNumber:     strconv.FormatUint(blockNumber, 10),
+		ConfirmationsRequired:  strconv.FormatUint(s.numConfirmations, 10),
+		ConfirmationsRemaining: strconv.FormatUint(confsRemaining, 10),
+		Teleport:               makeRPCTeleport(teleport),
+	}
+
+	jsonResp, err := json.Marshal(resp)
+	if err != nil {
+		return err
+	}
+
+	w.Header().Set(ContentTypeHeader, ContentTypeJSON)
+	_, err = w.Write(jsonResp)
+	return err
+}
+
+type HistoryResponse struct {
+	Teleports []RPCTeleport `json:"teleports"`
+}
+
+func (s *Server) HandleHistory(
+	ctx context.Context,
+	w http.ResponseWriter,
+	r *http.Request,
+) error {
+
+	vars := mux.Vars(r)
+	addrStr, ok := vars["addr"]
+	if !ok {
+		return StatusError{
+			Err:  errors.New("missing addr parameter"),
+			Code: http.StatusBadRequest,
+		}
+	}
+	addr := common.HexToAddress(addrStr)
+
+	teleports, err := s.database.LoadTeleportsByAddress(addr)
+	if err != nil {
+		databaseErrorsTotal.WithLabelValues("load_teleports_by_address").Inc()
+		return err
+	}
+
+	rpcTeleports := make([]RPCTeleport, 0, len(teleports))
+	for _, teleport := range teleports {
+		rpcTeleports = append(rpcTeleports, makeRPCTeleport(&teleport))
+	}
+
+	resp := HistoryResponse{
+		Teleports: rpcTeleports,
+	}
+
+	jsonResp, err := json.Marshal(resp)
+	if err != nil {
+		return err
+	}
+
+	w.Header().Set(ContentTypeHeader, ContentTypeJSON)
+	_, err = w.Write(jsonResp)
+	return err
+}
+
+type Error interface {
+	error
+	Status() int
+}
+
+type StatusError struct {
+	Code int
+	Err  error
+}
+
+func (se StatusError) Error() string {
+	if se.Err != nil {
+		msg := se.Err.Error()
+		if msg != "" {
+			return msg
+		}
+	}
+	return http.StatusText(se.Code)
+}
+
+func (se StatusError) Status() int {
+	return se.Code
+}
+
+func instrumentedErrorHandler(
+	h func(context.Context, http.ResponseWriter, *http.Request) error,
+) func(http.ResponseWriter, *http.Request) {
+	return func(w http.ResponseWriter, r *http.Request) {
+		rpcRequestsTotal.Inc()
+
+		ctx, cancel := populateContext(w, r)
+		defer cancel()
+
+		reqID := GetReqID(ctx)
+
+		log.Info("HTTP request",
+			"req_id", reqID,
+			"path", r.URL.Path,
+			"user_agent", r.UserAgent())
+
+		respTimer := prometheus.NewTimer(httpRequestDurationSumm)
+		err := h(ctx, w, r)
+		elapsed := respTimer.ObserveDuration()
+
+		var statusCode int
+		switch e := err.(type) {
+		case nil:
+			statusCode = 200
+			log.Info("HTTP success",
+				"req_id", reqID,
+				"elapsed", elapsed)
+
+		case Error:
+			statusCode = e.Status()
+			log.Warn("HTTP error",
+				"req_id", reqID,
+				"elapsed", elapsed,
+				"status", statusCode,
+				"err", e.Error())
+			http.Error(w, e.Error(), statusCode)
+
+		default:
+			statusCode = http.StatusInternalServerError
+			log.Warn("HTTP internal error",
+				"req_id", reqID,
+				"elapsed", elapsed,
+				"status", statusCode,
+				"err", err)
+			http.Error(w, http.StatusText(statusCode), statusCode)
+		}
+
+		httpResponseCodesTotal.WithLabelValues(strconv.Itoa(statusCode)).Inc()
+	}
+}
+
+func populateContext(
+	w http.ResponseWriter,
+	r *http.Request,
+) (context.Context, func()) {
+
+	ctx := context.WithValue(r.Context(), ContextKeyReqID, uuid.NewString())
+	return context.WithTimeout(ctx, defaultTimeout)
+}
+
+func GetReqID(ctx context.Context) string {
+	if reqID, ok := ctx.Value(ContextKeyReqID).(string); ok {
+		return reqID
+	}
+	return ""
+}

go/teleportr/cmd/teleportr-api/main.go

+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/urfave/cli"
+
+	"github.com/ethereum-optimism/optimism/go/teleportr/api"
+	"github.com/ethereum-optimism/optimism/go/teleportr/flags"
+)
+
+var (
+	GitVersion = ""
+	GitCommit  = ""
+	GitDate    = ""
+)
+
+func main() {
+	// Set up logger with a default INFO level in case we fail to parse flags.
+	// Otherwise the final critical log won't show what the parsing error was.
+	log.Root().SetHandler(
+		log.LvlFilterHandler(
+			log.LvlInfo,
+			log.StreamHandler(os.Stdout, log.TerminalFormat(true)),
+		),
+	)
+
+	app := cli.NewApp()
+	app.Flags = flags.APIFlags
+	app.Version = fmt.Sprintf("%s-%s-%s", GitVersion, GitCommit, GitDate)
+	app.Name = "teleportr-api"
+	app.Usage = "Teleportr API server"
+	app.Description = "API serving teleportr data"
+
+	app.Action = api.Main(GitVersion)
+	err := app.Run(os.Args)
+	if err != nil {
+		log.Crit("Application failed", "message", err)
+	}
+}

go/teleportr/db/db.go

@@ -21,17 +21,6 @@ var (
 	ErrUnknownDeposit = errors.New("unknown deposit")
 )
 
-// Deposit represents an event emitted from the TeleportrDeposit contract on L1,
-// along with additional info about the tx that generated the event.
-type Deposit struct {
-	ID             uint64
-	TxnHash        common.Hash
-	BlockNumber    uint64
-	BlockTimestamp time.Time
-	Address        common.Address
-	Amount         *big.Int
-}
-
 // ConfirmationInfo holds metadata about a tx on either the L1 or L2 chain.
 type ConfirmationInfo struct {
 	TxnHash        common.Hash
@@ -39,15 +28,28 @@ type ConfirmationInfo struct {
 	BlockTimestamp time.Time
 }
 
-// CompletedTeleport represents an L1 deposit that has been disbursed on L2. The
-// struct also hold info about the L1 and L2 txns involved.
-type CompletedTeleport struct {
-	ID           uint64
-	Address      common.Address
-	Amount       *big.Int
-	Success      bool
-	Deposit      ConfirmationInfo
-	Disbursement ConfirmationInfo
+// Deposit represents an event emitted from the TeleportrDeposit contract on L1,
+// along with additional info about the tx that generated the event.
+type Deposit struct {
+	ID      uint64
+	Address common.Address
+	Amount  *big.Int
+
+	ConfirmationInfo
+}
+
+type Disbursement struct {
+	Success bool
+
+	ConfirmationInfo
+}
+
+// Teleport represents the combination of an L1 deposit and its disbursement on
+// L2. Disburment will be nil if the L2 disbursement has not occurred.
+type Teleport struct {
+	Deposit
+
+	Disbursement *Disbursement
 }
 
 const createDepositsTable = `
@@ -61,6 +63,14 @@ CREATE TABLE IF NOT EXISTS deposits (
 );
 `
 
+const createDepositTxnHashIndex = `
+CREATE INDEX ON deposits (txn_hash)
+`
+
+const createDepositAddressIndex = `
+CREATE INDEX ON deposits (address)
+`
+
 const createDisbursementsTable = `
 CREATE TABLE IF NOT EXISTS disbursements (
 	id INT8 NOT NULL PRIMARY KEY REFERENCES deposits(id),
@@ -89,6 +99,8 @@ CREATE TABLE IF NOT EXISTS pending_txs (
 
 var migrations = []string{
 	createDepositsTable,
+	createDepositTxnHashIndex,
+	createDepositAddressIndex,
 	createDisbursementsTable,
 	lastProcessedBlockTable,
 	pendingTxTable,
@@ -135,7 +147,7 @@ func (c Config) WithoutDB() string {
 // sslMode retuns "enabled" if EnableSSL is true, otherwise returns "disabled".
 func (c Config) sslMode() string {
 	if c.EnableSSL {
-		return "enable"
+		return "require"
 	}
 	return "disable"
 }
@@ -371,6 +383,69 @@ func (d *Database) UpsertDisbursement(
 	return nil
 }
 
+const loadTeleportByDepositHashQuery = `
+SELECT
+dep.id, dep.address, dep.amount, dis.success,
+dep.txn_hash, dep.block_number, dep.block_timestamp,
+dis.txn_hash, dis.block_number, dis.block_timestamp
+FROM deposits AS dep
+LEFT JOIN disbursements AS dis
+ON dep.id = dis.id AND dep.txn_hash = $1
+LIMIT 1
+`
+
+func (d *Database) LoadTeleportByDepositHash(
+	txHash common.Hash,
+) (*Teleport, error) {
+
+	row := d.conn.QueryRow(loadTeleportByDepositHashQuery, txHash.String())
+	teleport, err := scanTeleport(row)
+	if err == sql.ErrNoRows {
+		return nil, nil
+	} else if err != nil {
+		return nil, err
+	}
+
+	return &teleport, nil
+}
+
+const loadTeleportsByAddressQuery = `
+SELECT
+dep.id, dep.address, dep.amount, dis.success,
+dep.txn_hash, dep.block_number, dep.block_timestamp,
+dis.txn_hash, dis.block_number, dis.block_timestamp
+FROM deposits AS dep
+LEFT JOIN disbursements AS dis
+ON dep.id = dis.id AND dep.address = $1
+ORDER BY dep.block_timestamp DESC, dep.id DESC
+LIMIT 100
+`
+
+func (d *Database) LoadTeleportsByAddress(
+	addr common.Address,
+) ([]Teleport, error) {
+
+	rows, err := d.conn.Query(loadTeleportsByAddressQuery, addr.String())
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	var teleports []Teleport
+	for rows.Next() {
+		teleport, err := scanTeleport(rows)
+		if err != nil {
+			return nil, err
+		}
+		teleports = append(teleports, teleport)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+
+	return teleports, nil
+}
+
 const completedTeleportsQuery = `
 SELECT
 dep.id, dep.address, dep.amount, dis.success,
@@ -383,46 +458,19 @@ ORDER BY id DESC
 
 // CompletedTeleports returns the set of all deposits that have also been
 // disbursed.
-func (d *Database) CompletedTeleports() ([]CompletedTeleport, error) {
+func (d *Database) CompletedTeleports() ([]Teleport, error) {
 	rows, err := d.conn.Query(completedTeleportsQuery)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
 
-	var teleports []CompletedTeleport
+	var teleports []Teleport
 	for rows.Next() {
-		var teleport CompletedTeleport
-		var addressStr string
-		var amountStr string
-		var depTxnHashStr string
-		var disTxnHashStr string
-		err = rows.Scan(
-			&teleport.ID,
-			&addressStr,
-			&amountStr,
-			&teleport.Success,
-			&depTxnHashStr,
-			&teleport.Deposit.BlockNumber,
-			&teleport.Deposit.BlockTimestamp,
-			&disTxnHashStr,
-			&teleport.Disbursement.BlockNumber,
-			&teleport.Disbursement.BlockTimestamp,
-		)
+		teleport, err := scanTeleport(rows)
 		if err != nil {
 			return nil, err
 		}
-		amount, ok := new(big.Int).SetString(amountStr, 10)
-		if !ok {
-			return nil, fmt.Errorf("unable to parse amount %v", amount)
-		}
-		teleport.Address = common.HexToAddress(addressStr)
-		teleport.Amount = amount
-		teleport.Deposit.TxnHash = common.HexToHash(depTxnHashStr)
-		teleport.Deposit.BlockTimestamp = teleport.Deposit.BlockTimestamp.Local()
-		teleport.Disbursement.TxnHash = common.HexToHash(disTxnHashStr)
-		teleport.Disbursement.BlockTimestamp = teleport.Disbursement.BlockTimestamp.Local()
-
 		teleports = append(teleports, teleport)
 	}
 	if err := rows.Err(); err != nil {
@@ -432,6 +480,63 @@ func (d *Database) CompletedTeleports() ([]CompletedTeleport, error) {
 	return teleports, nil
 }
 
+type Scanner interface {
+	Scan(...interface{}) error
+}
+
+func scanTeleport(scanner Scanner) (Teleport, error) {
+	var teleport Teleport
+	var addressStr string
+	var amountStr string
+	var depTxnHashStr string
+	var disTxnHashStr *string
+	var disBlockNumber *uint64
+	var disBlockTimestamp *time.Time
+	var success *bool
+	err := scanner.Scan(
+		&teleport.ID,
+		&addressStr,
+		&amountStr,
+		&success,
+		&depTxnHashStr,
+		&teleport.Deposit.BlockNumber,
+		&teleport.Deposit.BlockTimestamp,
+		&disTxnHashStr,
+		&disBlockNumber,
+		&disBlockTimestamp,
+	)
+	if err != nil {
+		return Teleport{}, err
+	}
+
+	amount, ok := new(big.Int).SetString(amountStr, 10)
+	if !ok {
+		return Teleport{}, fmt.Errorf("unable to parse amount %v", amount)
+	}
+	teleport.Address = common.HexToAddress(addressStr)
+	teleport.Amount = amount
+	teleport.Deposit.TxnHash = common.HexToHash(depTxnHashStr)
+	teleport.Deposit.BlockTimestamp = teleport.Deposit.BlockTimestamp.Local()
+
+	hasDisbursement := success != nil &&
+		disTxnHashStr != nil &&
+		disBlockNumber != nil &&
+		disBlockTimestamp != nil
+
+	if hasDisbursement {
+		teleport.Disbursement = &Disbursement{
+			ConfirmationInfo: ConfirmationInfo{
+				TxnHash:        common.HexToHash(*disTxnHashStr),
+				BlockNumber:    *disBlockNumber,
+				BlockTimestamp: disBlockTimestamp.Local(),
+			},
+			Success: *success,
+		}
+	}
+
+	return teleport, nil
+}
+
 // PendingTx encapsulates the metadata stored about published disbursement txs.
 type PendingTx struct {
 	// Txhash is the tx hash of the disbursement tx.

go/teleportr/db/db_test.go

@@ -91,12 +91,14 @@ func TestUpsertDeposits(t *testing.T) {
 	defer d.Close()
 
 	deposit1 := db.Deposit{
-		ID:             1,
-		TxnHash:        common.HexToHash("0xff01"),
-		BlockNumber:    1,
-		BlockTimestamp: testTimestamp,
-		Address:        common.HexToAddress("0xaa01"),
-		Amount:         big.NewInt(1),
+		ID:      1,
+		Address: common.HexToAddress("0xaa01"),
+		Amount:  big.NewInt(1),
+		ConfirmationInfo: db.ConfirmationInfo{
+			TxnHash:        common.HexToHash("0xff01"),
+			BlockNumber:    1,
+			BlockTimestamp: testTimestamp,
+		},
 	}
 
 	err := d.UpsertDeposits([]db.Deposit{deposit1}, 0)
@@ -107,12 +109,14 @@ func TestUpsertDeposits(t *testing.T) {
 	require.Equal(t, deposits, []db.Deposit{deposit1})
 
 	deposit2 := db.Deposit{
-		ID:             1,
-		TxnHash:        common.HexToHash("0xff02"),
-		BlockNumber:    2,
-		BlockTimestamp: testTimestamp,
-		Address:        common.HexToAddress("0xaa02"),
-		Amount:         big.NewInt(2),
+		ID:      1,
+		Address: common.HexToAddress("0xaa02"),
+		Amount:  big.NewInt(2),
+		ConfirmationInfo: db.ConfirmationInfo{
+			TxnHash:        common.HexToHash("0xff02"),
+			BlockNumber:    2,
+			BlockTimestamp: testTimestamp,
+		},
 	}
 
 	err = d.UpsertDeposits([]db.Deposit{deposit2}, 0)
@@ -160,12 +164,14 @@ func TestUpsertDepositsRecordsLastProcessedBlock(t *testing.T) {
 
 	// Insert real deposit in block 3 with last processed at 4.
 	deposit := db.Deposit{
-		ID:             0,
-		TxnHash:        common.HexToHash("0xff03"),
-		BlockNumber:    3,
-		BlockTimestamp: testTimestamp,
-		Address:        common.HexToAddress("0xaa03"),
-		Amount:         big.NewInt(3),
+		ID:      0,
+		Address: common.HexToAddress("0xaa03"),
+		Amount:  big.NewInt(3),
+		ConfirmationInfo: db.ConfirmationInfo{
+			TxnHash:        common.HexToHash("0xff03"),
+			BlockNumber:    3,
+			BlockTimestamp: testTimestamp,
+		},
 	}
 	err = d.UpsertDeposits([]db.Deposit{deposit}, 4)
 	require.Nil(t, err)
@@ -190,28 +196,34 @@ func TestConfirmedDeposits(t *testing.T) {
 	require.Equal(t, int(0), len(deposits))
 
 	deposit1 := db.Deposit{
-		ID:             1,
-		TxnHash:        common.HexToHash("0xff01"),
-		BlockNumber:    1,
-		BlockTimestamp: testTimestamp,
-		Address:        common.HexToAddress("0xaa01"),
-		Amount:         big.NewInt(1),
+		ID:      1,
+		Address: common.HexToAddress("0xaa01"),
+		Amount:  big.NewInt(1),
+		ConfirmationInfo: db.ConfirmationInfo{
+			TxnHash:        common.HexToHash("0xff01"),
+			BlockNumber:    1,
+			BlockTimestamp: testTimestamp,
+		},
 	}
 	deposit2 := db.Deposit{
-		ID:             2,
-		TxnHash:        common.HexToHash("0xff21"),
-		BlockNumber:    2,
-		BlockTimestamp: testTimestamp,
-		Address:        common.HexToAddress("0xaa21"),
-		Amount:         big.NewInt(2),
+		ID:      2,
+		Address: common.HexToAddress("0xaa21"),
+		Amount:  big.NewInt(2),
+		ConfirmationInfo: db.ConfirmationInfo{
+			TxnHash:        common.HexToHash("0xff21"),
+			BlockNumber:    2,
+			BlockTimestamp: testTimestamp,
+		},
 	}
 	deposit3 := db.Deposit{
-		ID:             3,
-		TxnHash:        common.HexToHash("0xff22"),
-		BlockNumber:    2,
-		BlockTimestamp: testTimestamp,
-		Address:        common.HexToAddress("0xaa22"),
-		Amount:         big.NewInt(2),
+		ID:      3,
+		Address: common.HexToAddress("0xaa22"),
+		Amount:  big.NewInt(2),
+		ConfirmationInfo: db.ConfirmationInfo{
+			TxnHash:        common.HexToHash("0xff22"),
+			BlockNumber:    2,
+			BlockTimestamp: testTimestamp,
+		},
 	}
 
 	err = d.UpsertDeposits([]db.Deposit{
@@ -269,12 +281,14 @@ func TestUpsertDisbursement(t *testing.T) {
 	// Now, insert a real deposit that we will disburse.
 	err = d.UpsertDeposits([]db.Deposit{
 		{
-			ID:             1,
-			TxnHash:        depTxnHash,
-			BlockNumber:    depBlockNumber,
-			BlockTimestamp: testTimestamp,
-			Address:        address,
-			Amount:         amount,
+			ID:      1,
+			Address: address,
+			Amount:  amount,
+			ConfirmationInfo: db.ConfirmationInfo{
+				TxnHash:        depTxnHash,
+				BlockNumber:    depBlockNumber,
+				BlockTimestamp: testTimestamp,
+			},
 		},
 	}, 0)
 	require.Nil(t, err)
@@ -287,21 +301,25 @@ func TestUpsertDisbursement(t *testing.T) {
 	)
 	require.Nil(t, err)
 
-	expTeleports := []db.CompletedTeleport{
+	expTeleports := []db.Teleport{
 		{
-			ID:      1,
-			Address: address,
-			Amount:  amount,
-			Success: false,
-			Deposit: db.ConfirmationInfo{
-				TxnHash:        depTxnHash,
-				BlockNumber:    depBlockNumber,
-				BlockTimestamp: testTimestamp,
+			Deposit: db.Deposit{
+				ID:      1,
+				Address: address,
+				Amount:  amount,
+				ConfirmationInfo: db.ConfirmationInfo{
+					TxnHash:        depTxnHash,
+					BlockNumber:    depBlockNumber,
+					BlockTimestamp: testTimestamp,
+				},
 			},
-			Disbursement: db.ConfirmationInfo{
-				TxnHash:        tempDisTxnHash,
-				BlockNumber:    tempDisBlockNumber,
-				BlockTimestamp: testTimestamp,
+			Disbursement: &db.Disbursement{
+				Success: false,
+				ConfirmationInfo: db.ConfirmationInfo{
+					TxnHash:        tempDisTxnHash,
+					BlockNumber:    tempDisBlockNumber,
+					BlockTimestamp: testTimestamp,
+				},
 			},
 		},
 	}
@@ -316,21 +334,25 @@ func TestUpsertDisbursement(t *testing.T) {
 	err = d.UpsertDisbursement(1, disTxnHash, disBlockNumber, testTimestamp, true)
 	require.Nil(t, err)
 
-	expTeleports = []db.CompletedTeleport{
+	expTeleports = []db.Teleport{
 		{
-			ID:      1,
-			Address: address,
-			Amount:  amount,
-			Success: true,
-			Deposit: db.ConfirmationInfo{
-				TxnHash:        depTxnHash,
-				BlockNumber:    depBlockNumber,
-				BlockTimestamp: testTimestamp,
+			Deposit: db.Deposit{
+				ID:      1,
+				Address: address,
+				Amount:  amount,
+				ConfirmationInfo: db.ConfirmationInfo{
+					TxnHash:        depTxnHash,
+					BlockNumber:    depBlockNumber,
+					BlockTimestamp: testTimestamp,
+				},
 			},
-			Disbursement: db.ConfirmationInfo{
-				TxnHash:        disTxnHash,
-				BlockNumber:    disBlockNumber,
-				BlockTimestamp: testTimestamp,
+			Disbursement: &db.Disbursement{
+				Success: true,
+				ConfirmationInfo: db.ConfirmationInfo{
+					TxnHash:        disTxnHash,
+					BlockNumber:    disBlockNumber,
+					BlockTimestamp: testTimestamp,
+				},
 			},
 		},
 	}
@@ -473,3 +495,78 @@ func TestDeletePendingTx(t *testing.T) {
 	require.Nil(t, err)
 	require.Nil(t, pendingTxs)
 }
+
+// TestLoadTeleports asserts that LoadTeleportByDepositHash and
+// LoadTeleportsByAddress are able to query for a spcific deposit in various
+// stages through the teleport process.
+func TestLoadTeleports(t *testing.T) {
+	t.Parallel()
+
+	d := newDatabase(t)
+	defer d.Close()
+
+	address := common.HexToAddress("0x01")
+	amount := big.NewInt(1000)
+	depTxnHash := common.HexToHash("0x0d01")
+	depBlockNumber := uint64(1)
+	disTxnHash := common.HexToHash("0x0e01")
+	disBlockNumber := uint64(2)
+
+	// Insert deposit.
+	deposit1 := db.Deposit{
+		ID:      1,
+		Address: address,
+		Amount:  amount,
+		ConfirmationInfo: db.ConfirmationInfo{
+			TxnHash:        depTxnHash,
+			BlockNumber:    depBlockNumber,
+			BlockTimestamp: testTimestamp,
+		},
+	}
+
+	err := d.UpsertDeposits([]db.Deposit{deposit1}, 0)
+	require.Nil(t, err)
+
+	// The same, undisbursed teleport should be retruned by hash and address.
+	expTeleport := db.Teleport{
+		Deposit:      deposit1,
+		Disbursement: nil,
+	}
+
+	teleport, err := d.LoadTeleportByDepositHash(depTxnHash)
+	require.Nil(t, err)
+	require.NotNil(t, teleport)
+	require.Equal(t, expTeleport, *teleport)
+
+	teleports, err := d.LoadTeleportsByAddress(address)
+	require.Nil(t, err)
+	require.Equal(t, []db.Teleport{expTeleport}, teleports)
+
+	// Insert a disbursement for the above deposit.
+	err = d.UpsertDisbursement(
+		1, disTxnHash, disBlockNumber, testTimestamp, true,
+	)
+	require.Nil(t, err)
+
+	// The now-complete teleport should be returned from both queries.
+	expTeleport = db.Teleport{
+		Deposit: deposit1,
+		Disbursement: &db.Disbursement{
+			Success: true,
+			ConfirmationInfo: db.ConfirmationInfo{
+				TxnHash:        disTxnHash,
+				BlockNumber:    disBlockNumber,
+				BlockTimestamp: testTimestamp,
+			},
+		},
+	}
+
+	teleport, err = d.LoadTeleportByDepositHash(depTxnHash)
+	require.Nil(t, err)
+	require.NotNil(t, teleport)
+	require.Equal(t, expTeleport, *teleport)
+
+	teleports, err = d.LoadTeleportsByAddress(address)
+	require.Nil(t, err)
+	require.Equal(t, []db.Teleport{expTeleport}, teleports)
+}

go/teleportr/drivers/disburser/driver.go

@@ -509,12 +509,14 @@ func (d *Driver) ingestDeposits(
 			}
 
 			deposits = append(deposits, db.Deposit{
-				ID:             event.DepositId.Uint64(),
-				TxnHash:        event.Raw.TxHash,
-				BlockNumber:    event.Raw.BlockNumber,
-				BlockTimestamp: time.Unix(int64(header.Time), 0),
-				Address:        event.Emitter,
-				Amount:         event.Amount,
+				ID:      event.DepositId.Uint64(),
+				Address: event.Emitter,
+				Amount:  event.Amount,
+				ConfirmationInfo: db.ConfirmationInfo{
+					TxnHash:        event.Raw.TxHash,
+					BlockNumber:    event.Raw.BlockNumber,
+					BlockTimestamp: time.Unix(int64(header.Time), 0),
+				},
 			})
 		}
 		err = events.Error()

go/teleportr/flags/api_flags.go

+package flags
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/urfave/cli"
+)
+
+func prefixAPIEnvVar(name string) string {
+	return fmt.Sprintf("TELEPORTR_API_%s", strings.ToUpper(name))
+}
+
+var (
+	APIHostnameFlag = cli.StringFlag{
+		Name:     "hostname",
+		Usage:    "The hostname of the API server",
+		Required: true,
+		EnvVar:   prefixAPIEnvVar("HOSTNAME"),
+	}
+	APIPortFlag = cli.StringFlag{
+		Name:     "port",
+		Usage:    "The hostname of the API server",
+		Required: true,
+		EnvVar:   prefixAPIEnvVar("PORT"),
+	}
+	APIL1EthRpcFlag = cli.StringFlag{
+		Name:     "l1-eth-rpc",
+		Usage:    "The endpoint for the L1 ETH provider",
+		Required: true,
+		EnvVar:   prefixAPIEnvVar("L1_ETH_RPC"),
+	}
+	APIDepositAddressFlag = cli.StringFlag{
+		Name:     "deposit-address",
+		Usage:    "Address of the TeleportrDeposit contract",
+		Required: true,
+		EnvVar:   prefixAPIEnvVar("DEPOSIT_ADDRESS"),
+	}
+	APINumConfirmationsFlag = cli.StringFlag{
+		Name: "num-confirmations",
+		Usage: "Number of confirmations required until deposits are " +
+			"considered confirmed",
+		Required: true,
+		EnvVar:   prefixAPIEnvVar("NUM_CONFIRMATIONS"),
+	}
+	APIPostgresHostFlag = cli.StringFlag{
+		Name:     "postgres-host",
+		Usage:    "Host of the teleportr postgres instance",
+		Required: true,
+		EnvVar:   prefixAPIEnvVar("POSTGRES_HOST"),
+	}
+	APIPostgresPortFlag = cli.Uint64Flag{
+		Name:     "postgres-port",
+		Usage:    "Port of the teleportr postgres instance",
+		Required: true,
+		EnvVar:   prefixAPIEnvVar("POSTGRES_PORT"),
+	}
+	APIPostgresUserFlag = cli.StringFlag{
+		Name:     "postgres-user",
+		Usage:    "Username of the teleportr postgres instance",
+		Required: true,
+		EnvVar:   prefixAPIEnvVar("POSTGRES_USER"),
+	}
+	APIPostgresPasswordFlag = cli.StringFlag{
+		Name:     "postgres-password",
+		Usage:    "Password of the teleportr postgres instance",
+		Required: true,
+		EnvVar:   prefixAPIEnvVar("POSTGRES_PASSWORD"),
+	}
+	APIPostgresDBNameFlag = cli.StringFlag{
+		Name:     "postgres-db-name",
+		Usage:    "Database name of the teleportr postgres instance",
+		Required: true,
+		EnvVar:   prefixAPIEnvVar("POSTGRES_DB_NAME"),
+	}
+	APIPostgresEnableSSLFlag = cli.BoolFlag{
+		Name: "postgres-enable-ssl",
+		Usage: "Whether or not to enable SSL on connections to " +
+			"teleportr postgres instance",
+		Required: true,
+		EnvVar:   prefixAPIEnvVar("POSTGRES_ENABLE_SSL"),
+	}
+)
+
+var APIFlags = []cli.Flag{
+	APIHostnameFlag,
+	APIPortFlag,
+	APIL1EthRpcFlag,
+	APIDepositAddressFlag,
+	APINumConfirmationsFlag,
+	APIPostgresHostFlag,
+	APIPostgresPortFlag,
+	APIPostgresUserFlag,
+	APIPostgresPasswordFlag,
+	APIPostgresDBNameFlag,
+	APIPostgresEnableSSLFlag,
+}

go/teleportr/go.mod

@@ -4,9 +4,12 @@ go 1.17
 
 require (
 	github.com/ethereum-optimism/optimism/go/bss-core v0.0.0-20220218171106-67a0414d7606
-	github.com/ethereum/go-ethereum v1.10.15
+	github.com/ethereum/go-ethereum v1.10.16
 	github.com/google/uuid v1.3.0
+	github.com/gorilla/mux v1.8.0
 	github.com/lib/pq v1.10.4
+	github.com/prometheus/client_golang v1.11.0
+	github.com/rs/cors v1.7.0
 	github.com/stretchr/testify v1.7.0
 	github.com/urfave/cli v1.22.5
 )
@@ -19,7 +22,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.1.1 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea // indirect
+	github.com/deckarep/golang-set v1.8.0 // indirect
 	github.com/decred/base58 v1.0.3 // indirect
 	github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect
 	github.com/decred/dcrd/crypto/ripemd160 v1.0.1 // indirect
@@ -39,7 +42,6 @@ require (
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_golang v1.11.0 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.26.0 // indirect
 	github.com/prometheus/procfs v0.6.0 // indirect

go/teleportr/go.sum

@@ -118,8 +118,9 @@ github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea h1:j4317fAZh7X6GqbFowYdYdI0L9bwxL07jyPZIdepyZ0=
 github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ=
+github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4=
+github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo=
 github.com/decred/base58 v1.0.3 h1:KGZuh8d1WEMIrK0leQRM47W85KqCAdl2N+uagbctdDI=
 github.com/decred/base58 v1.0.3/go.mod h1:pXP9cXCfM2sFLb2viz2FNIdeMWmZDBKG3ZBYbiSM78E=
 github.com/decred/dcrd/chaincfg/chainhash v1.0.2 h1:rt5Vlq/jM3ZawwiacWjPa+smINyLRN07EO0cNBV6DGU=
@@ -163,8 +164,8 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
 github.com/ethereum/go-ethereum v1.10.12/go.mod h1:W3yfrFyL9C1pHcwY5hmRHVDaorTiQxhYBkKyu5mEDHw=
-github.com/ethereum/go-ethereum v1.10.15 h1:E9o0kMbD8HXhp7g6UwIwntY05WTDheCGziMhegcBsQw=
-github.com/ethereum/go-ethereum v1.10.15/go.mod h1:W3yfrFyL9C1pHcwY5hmRHVDaorTiQxhYBkKyu5mEDHw=
+github.com/ethereum/go-ethereum v1.10.16 h1:3oPrumn0bCW/idjcxMn5YYVCdK7VzJYIvwGZUGLEaoc=
+github.com/ethereum/go-ethereum v1.10.16/go.mod h1:Anj6cxczl+AHy63o4X9O8yWNHuN5wMpfb8MAnHkWn7Y=
 github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
@@ -265,11 +266,13 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc=
+github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc=
 github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE=
 github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0=
 github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
@@ -305,8 +308,9 @@ github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/
 github.com/iris-contrib/jade v1.1.3/go.mod h1:H/geBymxJhShH5kecoiOCSssPX7QWYH7UaeZTSWddIk=
 github.com/iris-contrib/pongo2 v0.0.1/go.mod h1:Ssh+00+3GAZqSQb30AvBRNxBx7rf0GqwkjqxNd0u65g=
 github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw=
-github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458 h1:6OvNmYgJyexcZ3pYbTI9jWx5tHo1Dee/tWbLMfPe2TA=
 github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
+github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
+github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU=
 github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
@@ -328,6 +332,7 @@ github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E
 github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F6iIOGgxJ5npU/IUOhOhqlVrGjyIZc8/MagT0=
 github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
 github.com/karalabe/usb v0.0.0-20211005121534-4c5740d64559/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU=
+github.com/karalabe/usb v0.0.2/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU=
 github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8=
 github.com/kataras/iris/v12 v12.1.8/go.mod h1:LMYy4VlP67TQ3Zgriz8RE2h2kMZV2SgMYbq3UhfoFmE=
 github.com/kataras/neffos v0.0.14/go.mod h1:8lqADm8PnbeFfL7CLXh1WHw53dG27MC3pgi2R1rmoTE=

infra/op-replica/README.md

+# op-replica infra
+
+Deployment examples and resources for running an Optimism replica.
+
+[./envs](./envs) contains working example environmenatal files to configure a replica for different networks.
+
+[./scripts](./scripts/) contains helper scripts to prepare or verify an environment.
+
+[./docker-compose](./docker-compose/) provides working docker-compose example deployments
+
+[./kustomize](./kustomize/) has kubernetes base overlays and network examples

infra/op-replica/docker-compose/README.md

+# Running a Network Node
+
+This project lets you set up a local replica of the Optimistic Ethereum chain (either the main one or the Kovan testnet). [New
+transactions are submitted either to the sequencer outside of Ethereum or to the Canonical Transaction Chain on
+L1](https://research.paradigm.xyz/optimism#data-availability-batches). To submit transactions via a replica, set
+`SEQUENCER_CLIENT_HTTP` to a sequencer URL.
+
+## Architecture
+
+You need two components to replicate Optimistic Ethereum:
+
+- `data-transport-layer`, which retrieves and indexes blocks from L1. To access L1 you need an Ethereum Layer 1 provider, such as
+  [Infura](https://infura.io/).
+
+- `l2geth`, which provides an Ethereum node where you applications can connect and run API calls.
+
+## Resource requirements
+
+The `data-transport-layer` should run with 1 CPU and 256Mb of memory.
+
+The `l2geth` process should run with 1 or 2 CPUs and between 4 and 8Gb of memory.
+
+With this configuration a synchronization from block 0 to current height is expect to take about 8 hours.
+
+## Software Packages
+
+These packages are required to run the replica:
+
+1. [Docker](https://www.docker.com/)
+1. [Docker compose](https://docs.docker.com/compose/install/)
+
+## Configuration
+
+To configure the project, clone this repository and copy either `default-kovan.env` or `default-mainnet.env` file to `.env`.
+
+Review the `SHARED_ENV_PATH` configurations, no changes are required, but depending on the use case, you may need copy these examples to a new directory and make your changes.
+
+!! Update DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT to a valid endpoint !!
+
+### Settings
+
+Change any other settings required for your environment
+
+| Variable                 | Purpose                                                  | Default
+| ------------------------ | -------------------------------------------------------- | -----------
+| COMPOSE_FILE             | The yml files to use with docker-compose                 | replica.yml:replica-shared.yml
+| ETH_NETWORK              | Ethereum Layer1 and Layer2 network (mainnet,kovan)       | kovan (change to `mainnet` for the production network)
+| DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT | An endpoint for the L1 network, either kovan or mainnet.
+| DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT | Optimistic endpoint, such as https://kovan.optimism.io or https://mainnet.optimism.io
+| REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER | The L2 endpoint to check the replica against | (typically the same as the DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT)
+| SEQUENCER_CLIENT_HTTP | The L2 sequencer to forward tx to  | (typically the same as the DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT)
+| SHARED_ENV_PATH          | Path to a directory containing env files                 | [a directory under ./kustomize/replica/envs](https://github.com/optimisticben/op-replica/tree/main/kustomize/replica/envs)
+| GCMODE                   | Whether to run l2geth as an `archive` or `full` node     | archive
+| L2GETH_IMAGE_TAG         | L2geth version                                           | 0.5.8 (see below)
+| DTL_IMAGE_TAG            | Data transport layer version                             | latest (see below)
+| HC_IMAGE_TAG             | Health check version                                     | latest (see below)
+| L2GETH_HTTP_PORT         | Port number for the l2geth RPC endpoint                  | 9991
+| L2GETH_WS_PORT           | Port number for the l2geth WebSockets endpoint           | 9992
+| DTL_PORT                 | Port number for the DTL endpoint, for troubleshooting    | 7878
+| GETH_INIT_SCRIPT         | The script name to run when initializing l2geth          | A file under kustomize/replica/bases/configmaps/
+
+### Docker Image Versions
+
+We recommend using the latest versions of both docker images. Find them as GitHub tags
+[here](https://github.com/ethereum-optimism/optimism/tags) and as published Docker images linked in the badges:
+
+| Package                                                                                                                         | Docker                                                                                                                                                                                                              |
+| ------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [`@eth-optimism/l2geth`](https://github.com/ethereum-optimism/optimism/tree/master/l2geth)                                      | [![Docker Image Version (latest by date)](https://img.shields.io/docker/v/ethereumoptimism/l2geth)](https://hub.docker.com/r/ethereumoptimism/l2geth/tags?page=1&ordering=last_updated)                             |
+| [`@eth-optimism/data-transport-layer`](https://github.com/ethereum-optimism/optimism/tree/master/packages/data-transport-layer) | [![Docker Image Version (latest by date)](https://img.shields.io/docker/v/ethereumoptimism/data-transport-layer)](https://hub.docker.com/r/ethereumoptimism/data-transport-layer/tags?page=1&ordering=last_updated) |
+| [`@eth-optimism/replica-healthcheck`](https://github.com/ethereum-optimism/optimism/tree/master/packages/replica-healthcheck) | [![Docker Image Version (latest by date)](https://img.shields.io/docker/v/ethereumoptimism/replica-healthcheck)](https://hub.docker.com/r/ethereumoptimism/replica-healthcheck/tags?page=1&ordering=last_updated) |
+
+
+## Usage
+
+
+| Action | Command |
+| - | - |
+| Start the replica (after which you can access it at `http://localhost:L2GETH_HTTP_PORT` | `docker-compose up -d` |
+| Get the logs for `l2geth` | `docker-compose logs -f l2geth-replica` |
+| Get the logs for `data-transport-layer` | `docker-compose logs -f data-transport-layer` |
+| Stop the replica | `docker-compose down` |
+
+
+## Sync Check
+ 
+There is a sync check container. It fails at startup because at that point the replica is not running yet. It exposes metrics on port 3000, which you could pick up with a Prometheus. You can view its status with this command:
+
+```sh
+docker-compose logs -f replica-healthcheck
+```
+
+## Registration
+
+[Register here](https://groups.google.com/a/optimism.io/g/optimism-announce) to get announcements, such as notifications of when you're supposed to update your replica.

infra/op-replica/docker-compose/contrib/traefik-haproxy/README.md

+# Overview
+
+These files allow you to expose the l2geth RPC/WS ports to the Internet, TLS-encrypted,
+via a traefik reverse proxy and Let's Encrypt Certs.
+
+Instructions for the CloudFlare and AWS options are kept up-to-date at https://eth-docker.net/docs/Usage/ReverseProxy
+
+Please open issues for this contribution in the fork at https://github.com/CryptoManufaktur-io/op-replica
+
+## Usage
+
+The `.env` in the main project directory needs to contain traefik-specific variables. Make a backup copy with
+`cp .env .env.bak`, then bring in the `default.env` from this directory: `cp contrib/traefik-haproxy/default.env .env`.
+Adjust replica variables to match what they were and add either `contrib/traefik-haproxy/traefik-cf.yml` or 
+`contrib/traefik-haproxy/traefik-aws.yml` to `COMPOSE_FILE`.
+
+Then edit traefik-specific variables for CloudFlare or AWS as per above-linked instructions.
+
+Alternatively, if you have traefik running in its own stack, you can add `contrib/traefik-haproxy/ext-network.yml`
+and adjust it for the network traefik runs in.
+
+The haproxy files are examples taken from a docker swarm mode installation. They should work
+with minor modifications in k8s via kompose or Portainer.
+
+`optimism-haproxy.cfg` is the configuration file for haproxy, adjust the host and domain names you'll
+use in there
+
+`haproxy-docker-sample.yml` is an example docker-compose style deployment in docker swarm.
+
+For example, you may have two replicas called `optimism-a.example.com` and `optimism-b.example.com`.
+Both are configured in their `traefik.env` to respond to `optimism-lb.example.com`. Haproxy has
+a local alias `optimism-lb.example.com` and will forward traffic to a and b servers, which know to respond
+to the `optimism-lb` hostname.
+
+`check-ecsync-optimism.sh` is an external check script to take a server out of rotation when it is not
+in sync. It relies on the sequencer-health metrics being available via traefik, and assumes that
+servers have `-a`, `-b`, `-c` etc suffixes. The maximum slot distance and name of the healthcheck host
+without suffix are configured in the script.

infra/op-replica/docker-compose/contrib/traefik-haproxy/check-ecsync-optimism.sh

+#!/bin/sh
+MAX_LAG=2
+# Assumes that servers are labeled -a, -b, -c etc and contain their domain name, and that corresponding
+# sequencer health hosts exist
+HEALTH_HOST=optimismhealth
+
+__domain=$(echo -n $HAPROXY_SERVER_NAME | cut -d '.' -f2-)
+__host=$(echo -n $HAPROXY_SERVER_NAME | cut -d '.' -f1)
+__dashcount=$(echo -n $__host | grep -o "-" | wc -w)
+__suffix=$(echo -n $__host | cut -d '-' -f$(($__dashcount+1)))
+
+__sequencerheight=$(curl -s -m2 -N -L "$HEALTH_HOST-$__suffix.$__domain/metrics" | grep  ^replica_health_sequencer_height | cut -d' ' -f2)
+__replicaheight=$(curl -s -m2 -N -L "$HEALTH_HOST-$__suffix.$__domain/metrics" | grep ^replica_health_height | cut -d' ' -f2)
+if [ -z "$__sequencerheight" -o -z "$__replicaheight" ]; then
+  exit 1
+fi
+__distance=$(expr $__sequencerheight - $__replicaheight)
+if [ $__distance -le $MAX_LAG ]; then
+  exit 0
+else
+  exit 1
+fi
+

infra/op-replica/docker-compose/contrib/traefik-haproxy/default-kovan.env

+COMPOSE_FILE=replica.yml:replica-shared.yml:replica-toml.yml
+ETH_NETWORK=kovan
+DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT=WONT_WORK_UNLESS_YOU_PROVIDE_A_VALID_ETHEREUM_L1_ENDPOINT
+DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT=https://kovan.optimism.io
+REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER=https://kovan.optimism.io
+SEQUENCER_CLIENT_HTTP=https://kovan.optimism.io
+SHARED_ENV_PATH=../envs/kovan
+GCMODE=archive
+L2GETH_IMAGE_TAG=0.5.12
+DTL_IMAGE_TAG=
+HC_IMAGE_TAG=
+L2GETH_HTTP_PORT=9991
+L2GETH_WS_PORT=9992
+DTL_PORT=7878
+GETH_INIT_SCRIPT=check-for-chaindata-berlin.sh
+
+RESTART=unless-stopped
+
+# Secure web proxy - advanced use, please see instructions at https://eth-docker.net/docs/Usage/ReverseProxy
+DOMAIN=example.com
+ACME_EMAIL=user@example.com
+CF_EMAIL=user@example.com
+CF_API_TOKEN=SECRETTOKEN
+AWS_PROFILE=myprofile
+AWS_HOSTED_ZONE_ID=myzoneid
+L2GETH_HOST=optimism
+L2GETH_LB=optimism-lb
+L2GETH_WS_HOST=optimismws
+L2GETH_WS_LB=optimismws-lb
+L2GETH_HEALTH_HOST=optimismhealth
+DDNS_SUBDOMAIN=
+DDNS_PROXY=false
+
+TRAEFIK_WEB_PORT=443
+TRAEFIK_WEB_HTTP_PORT=80

infra/op-replica/docker-compose/contrib/traefik-haproxy/default-mainnet.env

+COMPOSE_FILE=replica.yml:replica-shared.yml:replica-toml.yml
+ETH_NETWORK=mainnet
+DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT=WONT_WORK_UNLESS_YOU_PROVIDE_A_VALID_ETHEREUM_L1_ENDPOINT
+DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT=https://mainnet.optimism.io
+REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER=https://mainnet.optimism.io
+SEQUENCER_CLIENT_HTTP=https://mainnet.optimism.io
+SHARED_ENV_PATH=../envs/mainnet
+GCMODE=archive
+L2GETH_IMAGE_TAG=0.5.12
+DTL_IMAGE_TAG=
+HC_IMAGE_TAG=
+L2GETH_HTTP_PORT=9991
+L2GETH_WS_PORT=9992
+DTL_PORT=7878
+GETH_INIT_SCRIPT=check-for-chaindata-berlin.sh
+
+RESTART=unless-stopped
+
+# Secure web proxy - advanced use, please see instructions at https://eth-docker.net/docs/Usage/ReverseProxy
+DOMAIN=example.com
+ACME_EMAIL=user@example.com
+CF_EMAIL=user@example.com
+CF_API_TOKEN=SECRETTOKEN
+AWS_PROFILE=myprofile
+AWS_HOSTED_ZONE_ID=myzoneid
+L2GETH_HOST=optimism
+L2GETH_LB=optimism-lb
+L2GETH_WS_HOST=optimismws
+L2GETH_WS_LB=optimismws-lb
+L2GETH_HEALTH_HOST=optimismhealth
+DDNS_SUBDOMAIN=
+DDNS_PROXY=false
+
+TRAEFIK_WEB_PORT=443
+TRAEFIK_WEB_HTTP_PORT=80

infra/op-replica/docker-compose/contrib/traefik-haproxy/ext-network.yml

+version: "3.4"
+
+networks:
+  default:
+    external:
+      name: traefik_default
+services:
+  l2geth-replica:
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.l2geth.service=l2geth
+      - traefik.http.routers.l2geth.entrypoints=websecure
+      - traefik.http.routers.l2geth.rule=Host(`${L2GETH_HOST}.${DOMAIN}`)
+      - traefik.http.routers.l2geth.tls.certresolver=letsencrypt
+      - traefik.http.routers.l2gethlb.service=l2geth
+      - traefik.http.routers.l2gethlb.entrypoints=websecure
+      - traefik.http.routers.l2gethlb.rule=Host(`${L2GETH_LB}.${DOMAIN}`)
+      - traefik.http.routers.l2gethlb.tls.certresolver=letsencrypt
+      - traefik.http.services.l2geth.loadbalancer.server.port=8545
+      - traefik.http.routers.l2gethws.service=l2gethws
+      - traefik.http.routers.l2gethws.entrypoints=websecure
+      - traefik.http.routers.l2gethws.rule=Host(`${L2GETH_WS_HOST}.${DOMAIN}`)
+      - traefik.http.routers.l2gethws.tls.certresolver=letsencrypt
+      - traefik.http.routers.l2gethwslb.service=l2gethws
+      - traefik.http.routers.l2gethwslb.entrypoints=websecure
+      - traefik.http.routers.l2gethwslb.rule=Host(`${L2GETH_WS_LB}.${DOMAIN}`)
+      - traefik.http.routers.l2gethwslb.tls.certresolver=letsencrypt
+      - traefik.http.services.l2gethws.loadbalancer.server.port=8546
+  replica-healthcheck:
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.l2gethhealth.service=l2gethhealth
+      - traefik.http.routers.l2gethhealth.entrypoints=websecure
+      - traefik.http.routers.l2gethhealth.rule=Host(`${L2GETH_HEALTH_HOST}.${DOMAIN}`)
+      - traefik.http.routers.l2gethhealth.tls.certresolver=letsencrypt
+      - traefik.http.services.l2gethhealth.loadbalancer.server.port=3000

infra/op-replica/docker-compose/contrib/traefik-haproxy/haproxy-docker-sample.yml

+version: "3.4"
+x-logging: &logging
+  logging:
+    driver: json-file
+    options:
+      max-size: 20m
+      max-file: "3"
+
+services:
+  optimism-haproxy:
+    image: haproxy:latest
+    user: root
+    entrypoint: ["/bin/sh", "-c"]
+    command:
+      - |
+        apt-get update
+        apt-get install --no-install-recommends -y curl jq bc ca-certificates
+        exec haproxy -f /usr/local/etc/haproxy/haproxy.cfg
+    networks:
+      default:
+        aliases:
+          - optimismws-lb.example.com
+          - optimism-lb.example.com
+    configs:
+      - source: optimism-haproxy.cfg
+        target: /usr/local/etc/haproxy/haproxy.cfg
+      - source: check-ecsync-optimism.sh
+        target: /var/lib/haproxy/check-ecsync.sh
+        mode: 0555
+    deploy:
+      mode: replicated
+      replicas: 2
+      placement:
+        constraints: ["node.role == worker"]
+    <<: *logging
+
+configs:
+  optimism-haproxy.cfg:
+    external: true
+  check-ecsync-optimism.sh:
+    external: true

infra/op-replica/docker-compose/contrib/traefik-haproxy/optimism-haproxy.cfg

+#---------------------------------------------------------------------
+# Global settings
+#---------------------------------------------------------------------
+global
+    log                 stdout format raw local0
+    maxconn             20000
+    user                haproxy
+    group               haproxy
+    ssl-default-server-options force-tlsv12
+    ssl-default-bind-options force-tlsv12
+    ca-base             /etc/ssl/certs
+    external-check
+    insecure-fork-wanted
+
+#---------------------------------------------------------------------
+# common defaults that all the 'listen' and 'backend' sections will
+# use if not designated in their block
+#---------------------------------------------------------------------
+defaults
+    mode                 tcp
+    option               tcplog
+    log                  global
+    option               dontlognull
+    timeout client       5m
+
+#---------------------------------------------------------------------
+# dedicated stats page
+#---------------------------------------------------------------------
+listen stats
+    mode http
+    bind :22222
+    stats enable
+    stats uri            /haproxy?stats
+    stats realm          Haproxy\ Statistics
+    stats auth           admin:YOURPW
+    stats refresh        30s
+
+#---------------------------------------------------------------------
+# main frontend which proxys to the backends
+#---------------------------------------------------------------------
+frontend main_https_listen
+    bind                *:443
+    tcp-request inspect-delay 5s
+    tcp-request content accept if { req_ssl_hello_type 1 }
+
+#---------------------------------------------------------------------
+# Common HAProxy nodes configuration
+#---------------------------------------------------------------------
+
+# -------------------------------
+# ACLs
+# -------------------------------
+
+acl acl_ec           req.ssl_sni -i optimism-lb.example.com
+acl acl_ecws         req.ssl_sni -i optimismws-lb.example.com
+
+# -------------------------------
+# Conditions
+# -------------------------------
+
+use_backend backend_ec if acl_ec
+use_backend backend_ecws if acl_ecws
+
+#---------------------------------------------------------------------
+# Backends
+#---------------------------------------------------------------------
+
+# RPC execution client
+backend backend_ec
+    description Optimism L2Geth
+    default-server init-addr libc no-tls-tickets check inter 10000 on-marked-down shutdown-sessions
+    timeout connect 5s
+    timeout server 30s
+    retries      2
+    balance first
+    option external-check
+    external-check path "/usr/bin:/bin"
+    external-check command /var/lib/haproxy/check-ecsync.sh
+    server optimism-a.example.com optimism-a.example.com:443
+    server optimism-b.example.com optimism-b.example.com:443 backup
+
+# WebSockets execution client
+backend backend_ecws
+    description Optimism L2Geth WebSockets
+    default-server init-addr libc no-tls-tickets check inter 10000 on-marked-down shutdown-sessions
+    timeout connect 5s
+    timeout server 30s
+    timeout tunnel 3600s
+    retries      2
+    balance first
+    option external-check
+    external-check path "/usr/bin:/bin"
+    external-check command /var/lib/haproxy/check-ecsync.sh
+    server optimism-a.example.com optimismws-a.example.com:443
+    server optimism-b.example.com optimismws-b.example.com:443 backup
+

infra/op-replica/docker-compose/contrib/traefik-haproxy/traefik-aws.yml

+version: "3.4"
+x-logging: &logging
+  logging:
+    driver: json-file
+    options:
+      max-size: 10m
+      max-file: "3"
+
+services:
+  traefik:
+    image: traefik-aws
+    build:
+      context: ./contrib/traefik-haproxy/traefik
+    restart: ${RESTART}
+    command:
+#      - --log.level=DEBUG
+#      - --accesslog=true
+#      - --accesslog.format=json
+#      - --accesslog.fields.defaultmode=keep
+#      - --accesslog.fields.headers.defaultmode=keep
+#      - --certificatesResolvers.letsencrypt.acme.caServer=https://acme-staging-v02.api.letsencrypt.org/directory
+      - --providers.docker=true
+      - --providers.docker.exposedbydefault=false
+      - --certificatesresolvers.letsencrypt.acme.dnschallenge=true
+      - --certificatesresolvers.letsencrypt.acme.dnschallenge.provider=route53
+      - --certificatesresolvers.letsencrypt.acme.email=${ACME_EMAIL}
+      - --certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json
+      - --entrypoints.web.address=:${TRAEFIK_WEB_HTTP_PORT}
+      - --entrypoints.web.http.redirections.entrypoint.to=websecure
+      - --entrypoints.web.http.redirections.entrypoint.scheme=https
+      - --entrypoints.websecure.address=:${TRAEFIK_WEB_PORT}
+    ports:
+      - ${TRAEFIK_WEB_PORT}:${TRAEFIK_WEB_PORT}/tcp
+      - ${TRAEFIK_WEB_HTTP_PORT}:${TRAEFIK_WEB_HTTP_PORT}/tcp
+    environment:
+      - AWS_PROFILE=${AWS_PROFILE}
+      - AWS_HOSTED_ZONE_ID=${AWS_HOSTED_ZONE_ID}
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - certs:/letsencrypt
+      - ~/.aws:/root/.aws:ro
+      - /etc/localtime:/etc/localtime:ro
+    <<: *logging
+  l2geth-replica:
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.l2geth.service=l2geth
+      - traefik.http.routers.l2geth.entrypoints=websecure
+      - traefik.http.routers.l2geth.rule=Host(`${L2GETH_HOST}.${DOMAIN}`)
+      - traefik.http.routers.l2geth.tls.certresolver=letsencrypt
+      - traefik.http.routers.l2gethlb.service=l2geth
+      - traefik.http.routers.l2gethlb.entrypoints=websecure
+      - traefik.http.routers.l2gethlb.rule=Host(`${L2GETH_LB}.${DOMAIN}`)
+      - traefik.http.routers.l2gethlb.tls.certresolver=letsencrypt
+      - traefik.http.services.l2geth.loadbalancer.server.port=8545
+      - traefik.http.routers.l2gethws.service=l2gethws
+      - traefik.http.routers.l2gethws.entrypoints=websecure
+      - traefik.http.routers.l2gethws.rule=Host(`${L2GETH_WS_HOST}.${DOMAIN}`)
+      - traefik.http.routers.l2gethws.tls.certresolver=letsencrypt
+      - traefik.http.routers.l2gethwslb.service=l2gethws
+      - traefik.http.routers.l2gethwslb.entrypoints=websecure
+      - traefik.http.routers.l2gethwslb.rule=Host(`${L2GETH_WS_LB}.${DOMAIN}`)
+      - traefik.http.routers.l2gethwslb.tls.certresolver=letsencrypt
+      - traefik.http.services.l2gethws.loadbalancer.server.port=8546
+  replica-healthcheck:
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.l2gethhealth.service=l2gethhealth
+      - traefik.http.routers.l2gethhealth.entrypoints=websecure
+      - traefik.http.routers.l2gethhealth.rule=Host(`${L2GETH_HEALTH_HOST}.${DOMAIN}`)
+      - traefik.http.routers.l2gethhealth.tls.certresolver=letsencrypt
+      - traefik.http.services.l2gethhealth.loadbalancer.server.port=3000
+volumes:
+  certs:

infra/op-replica/docker-compose/contrib/traefik-haproxy/traefik-cf.yml

+version: "3.4"
+x-logging: &logging
+  logging:
+    driver: json-file
+    options:
+      max-size: 10m
+      max-file: "3"
+
+services:
+  traefik:
+    image: traefik:latest
+    restart: ${RESTART}
+    command:
+#      - --log.level=DEBUG
+#      - --accesslog=true
+#      - --accesslog.format=json
+#      - --accesslog.fields.defaultmode=keep
+#      - --accesslog.fields.headers.defaultmode=keep
+#      - --certificatesResolvers.letsencrypt.acme.caServer=https://acme-staging-v02.api.letsencrypt.org/directory
+      - --providers.docker=true
+      - --providers.docker.exposedbydefault=false
+      - --certificatesresolvers.letsencrypt.acme.dnschallenge=true
+      - --certificatesresolvers.letsencrypt.acme.dnschallenge.provider=cloudflare
+      - --certificatesresolvers.letsencrypt.acme.email=${ACME_EMAIL}
+      - --certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json
+      - --entrypoints.web.address=:${TRAEFIK_WEB_HTTP_PORT}
+      - --entrypoints.web.http.redirections.entrypoint.to=websecure
+      - --entrypoints.web.http.redirections.entrypoint.scheme=https
+      - --entrypoints.websecure.address=:${TRAEFIK_WEB_PORT}
+    ports:
+      - ${TRAEFIK_WEB_PORT}:${TRAEFIK_WEB_PORT}/tcp
+      - ${TRAEFIK_WEB_HTTP_PORT}:${TRAEFIK_WEB_HTTP_PORT}/tcp
+    environment:
+      - CLOUDFLARE_EMAIL=${CF_EMAIL}
+      - CLOUDFLARE_DNS_API_TOKEN=${CF_API_TOKEN}
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - certs:/letsencrypt
+      - /etc/localtime:/etc/localtime:ro
+    <<: *logging
+    depends_on:
+      - cf-ddns
+  cf-ddns:
+    image: oznu/cloudflare-ddns:latest
+    restart: ${RESTART}
+    environment:
+      - API_KEY=${CF_API_TOKEN}
+      - ZONE=${DOMAIN}
+      - SUBDOMAIN=${DDNS_SUBDOMAIN}
+      - PROXIED=${DDNS_PROXY}
+    volumes:
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    <<: *logging
+  l2geth-replica:
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.l2geth.service=l2geth
+      - traefik.http.routers.l2geth.entrypoints=websecure
+      - traefik.http.routers.l2geth.rule=Host(`${L2GETH_HOST}.${DOMAIN}`)
+      - traefik.http.routers.l2geth.tls.certresolver=letsencrypt
+      - traefik.http.routers.l2gethlb.service=l2geth
+      - traefik.http.routers.l2gethlb.entrypoints=websecure
+      - traefik.http.routers.l2gethlb.rule=Host(`${L2GETH_LB}.${DOMAIN}`)
+      - traefik.http.routers.l2gethlb.tls.certresolver=letsencrypt
+      - traefik.http.services.l2geth.loadbalancer.server.port=8545
+      - traefik.http.routers.l2gethws.service=l2gethws
+      - traefik.http.routers.l2gethws.entrypoints=websecure
+      - traefik.http.routers.l2gethws.rule=Host(`${L2GETH_WS_HOST}.${DOMAIN}`)
+      - traefik.http.routers.l2gethws.tls.certresolver=letsencrypt
+      - traefik.http.routers.l2gethwslb.service=l2gethws
+      - traefik.http.routers.l2gethwslb.entrypoints=websecure
+      - traefik.http.routers.l2gethwslb.rule=Host(`${L2GETH_WS_LB}.${DOMAIN}`)
+      - traefik.http.routers.l2gethwslb.tls.certresolver=letsencrypt
+      - traefik.http.services.l2gethws.loadbalancer.server.port=8546
+  replica-healthcheck:
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.l2gethhealth.service=l2gethhealth
+      - traefik.http.routers.l2gethhealth.entrypoints=websecure
+      - traefik.http.routers.l2gethhealth.rule=Host(`${L2GETH_HEALTH_HOST}.${DOMAIN}`)
+      - traefik.http.routers.l2gethhealth.tls.certresolver=letsencrypt
+      - traefik.http.services.l2gethhealth.loadbalancer.server.port=3000
+volumes:
+  certs:

infra/op-replica/docker-compose/contrib/traefik-haproxy/traefik/Dockerfile

+# Add AWS CLI to traefik image
+
+FROM traefik:latest
+
+RUN apk add --no-cache \
+        python3 \
+        py3-pip \
+    && pip3 install --upgrade pip \
+    && pip3 install \
+        awscli \
+	tzdata \
+    && rm -rf /var/cache/apk/*

infra/op-replica/docker-compose/default-kovan.env

+COMPOSE_PROJECT_NAME=op-replica
+COMPOSE_FILE=replica.yml:replica-shared.yml:replica-toml.yml
+ETH_NETWORK=kovan
+DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT=WONT_WORK_UNLESS_YOU_PROVIDE_A_VALID_ETHEREUM_L1_ENDPOINT
+DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT=https://kovan.optimism.io
+REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER=https://kovan.optimism.io
+SEQUENCER_CLIENT_HTTP=https://kovan.optimism.io
+SHARED_ENV_PATH=../envs/kovan
+GCMODE=archive
+L2GETH_IMAGE_TAG=0.5.13
+DTL_IMAGE_TAG=0.5.20
+HC_IMAGE_TAG=
+L2GETH_HTTP_PORT=9991
+L2GETH_WS_PORT=9992
+DTL_PORT=7878
+GETH_INIT_SCRIPT=check-for-chaindata-berlin.sh
+
+RESTART=unless-stopped

infra/op-replica/docker-compose/default-mainnet.env

+COMPOSE_PROJECT_NAME=op-replica
+COMPOSE_FILE=replica.yml:replica-shared.yml:replica-toml.yml
+ETH_NETWORK=mainnet
+DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT=WONT_WORK_UNLESS_YOU_PROVIDE_A_VALID_ETHEREUM_L1_ENDPOINT
+DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT=https://mainnet.optimism.io
+REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER=https://mainnet.optimism.io
+SEQUENCER_CLIENT_HTTP=https://mainnet.optimism.io
+SHARED_ENV_PATH=../envs/mainnet
+GCMODE=archive
+L2GETH_IMAGE_TAG=0.5.12
+DTL_IMAGE_TAG=0.5.20
+HC_IMAGE_TAG=
+L2GETH_HTTP_PORT=9991
+L2GETH_WS_PORT=9992
+DTL_PORT=7878
+GETH_INIT_SCRIPT=check-for-chaindata-berlin.sh
+
+RESTART=unless-stopped

infra/op-replica/docker-compose/replica-shared.yml

+version: "3.4"
+
+services:
+  l2geth-replica:
+    ports:
+      - ${L2GETH_HTTP_PORT:-9991}:8545
+      - ${L2GETH_WS_PORT:-9992}:8546
+  data-transport-layer:
+    ports:
+      - ${DTL_PORT:-7878}:7878

infra/op-replica/docker-compose/replica-toml.yml

+---
+version: "3.4"
+services:
+  l2geth-replica:
+    entrypoint:
+      - /bin/sh
+      - -c
+      - "/scripts/$GETH_INIT_SCRIPT && /scripts/l2geth-replica-start.sh --config /scripts/l2geth.toml"

infra/op-replica/docker-compose/replica.yml

+---
+version: "3.4"
+x-logging: &logging
+  logging:
+    driver: json-file
+    options:
+      max-size: 10m
+      max-file: "3"
+
+services:
+  data-transport-layer:
+    image: ethereumoptimism/data-transport-layer:${DTL_IMAGE_TAG:-latest}
+    restart: ${RESTART}
+    env_file:
+      - ${SHARED_ENV_PATH}/data-transport-layer.env
+      - .env
+    volumes:
+      - dtl:/db
+    <<: *logging
+  l2geth-replica:
+    image: ethereumoptimism/l2geth:${L2GETH_IMAGE_TAG:-latest}
+    restart: ${RESTART}
+    stop_grace_period: 3m
+    entrypoint:
+      - /bin/sh
+      - -c
+      #- "sleep infinity"
+      - "/scripts/$GETH_INIT_SCRIPT && /scripts/l2geth-replica-start.sh"
+    env_file:
+      - ${SHARED_ENV_PATH}/l2geth-replica.env
+      - .env
+    volumes:
+      - geth:/geth
+      - ../scripts/:/scripts/
+    <<: *logging
+  replica-healthcheck:
+    image: ethereumoptimism/replica-healthcheck:${HC_IMAGE_TAG:-latest}
+    restart: ${RESTART}
+    env_file:
+      - ${SHARED_ENV_PATH}/replica-healthcheck.env
+      - .env
+    volumes:
+      - ../scripts/:/scripts/
+    <<: *logging
+volumes:
+  dtl:
+  geth:

infra/op-replica/envs/kovan-gen4/data-transport-layer.env

+DATA_TRANSPORT_LAYER__ADDRESS_MANAGER=0x3AD1eeD551d26335caD030911C15d008abBe9825
+DATA_TRANSPORT_LAYER__CONFIRMATIONS=12
+DATA_TRANSPORT_LAYER__DANGEROUSLY_CATCH_ALL_ERRORS=true
+DATA_TRANSPORT_LAYER__DB_PATH=/db
+DATA_TRANSPORT_LAYER__DEFAULT_BACKEND=l2
+DATA_TRANSPORT_LAYER__ENABLE_METRICS=true
+DATA_TRANSPORT_LAYER__ETH_NETWORK_NAME=kovan
+DATA_TRANSPORT_LAYER__L1_GAS_PRICE_BACKEND=l2
+DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT=http://failover-proxy.default:8000
+DATA_TRANSPORT_LAYER__L2_CHAIN_ID=69
+DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT=http://sequencer.default:8545
+DATA_TRANSPORT_LAYER__LOGS_PER_POLLING_INTERVAL=2000
+DATA_TRANSPORT_LAYER__NODE_ENV=production
+DATA_TRANSPORT_LAYER__POLLING_INTERVAL=500
+DATA_TRANSPORT_LAYER__SENTRY_TRACE_RATE=0.05
+DATA_TRANSPORT_LAYER__SERVER_HOSTNAME=0.0.0.0
+DATA_TRANSPORT_LAYER__SERVER_PORT=7878
+DATA_TRANSPORT_LAYER__SYNC_FROM_L1=false
+DATA_TRANSPORT_LAYER__SYNC_FROM_L2=true
+DATA_TRANSPORT_LAYER__TRANSACTIONS_PER_POLLING_INTERVAL=1000
+DEPLOYER_HTTP=
+L1_NODE_WEB3_URL=http://failover-proxy.default:8000

infra/op-replica/envs/kovan-gen4/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+configMapGenerator:
+  - name: data-transport-layer
+    envs:
+      - ./data-transport-layer.env
+  - name: l2geth-replica
+    envs:
+      - ./l2geth-replica.env
+  - name: replica-healthcheck
+    envs:
+      - ./replica-healthcheck.env

infra/op-replica/envs/kovan-gen4/l2geth-replica.env

+CHAIN_ID=69
+DATADIR=/geth
+DEV=true
+NETWORK_ID=69
+NO_DISCOVER=true
+NO_USB=true
+GASPRICE=0
+GCMODE=archive
+ETH1_CTC_DEPLOYMENT_HEIGHT=25502591
+ETH1_L1_FEE_WALLET_ADDRESS=0x18394B52d3Cb931dfA76F63251919D051953413d
+ETH1_L1_CROSS_DOMAIN_MESSENGER_ADDRESS=0x4361d0F75A0186C05f971c566dC6bEa5957483fD
+ETH1_L1_ETH_GATEWAY_ADDRESS=
+ETH1_L1_STANDARD_BRIDGE_ADDRESS=0x22F24361D548e5FaAfb36d1437839f080363982B
+ETH1_SYNC_SERVICE_ENABLE=true
+ROLLUP_ADDRESS_MANAGER_OWNER_ADDRESS=0x18394b52d3cb931dfa76f63251919d051953413d
+ROLLUP_STATE_DUMP_PATH=https://storage.googleapis.com/optimism/kovan/v0.4.0-rc0.json
+ROLLUP_BACKEND=l2
+ROLLUP_CLIENT_HTTP=http://data-transport-layer:7878
+ROLLUP_DISABLE_TRANSFERS=false
+ROLLUP_ENABLE_L2_GAS_POLLING=false
+ROLLUP_ENABLE_ARBITRARY_CONTRACT_DEPLOYMENT=true
+ROLLUP_GAS_PRICE_ORACLE_OWNER_ADDRESS=0x18394B52d3Cb931dfA76F63251919D051953413d
+ROLLUP_MAX_CALLDATA_SIZE=40000
+ROLLUP_POLL_INTERVAL_FLAG=3s
+ROLLUP_SYNC_SERVICE_ENABLE=true
+ROLLUP_TIMESTAMP_REFRESH=3m
+ROLLUP_VERIFIER_ENABLE=true
+RPC_ADDR=0.0.0.0
+RPC_API=eth,rollup,net,web3,debug
+RPC_CORS_DOMAIN=*
+RPC_ENABLE=true
+RPC_PORT=8545
+RPC_VHOSTS=*
+TARGET_GAS_LIMIT=11000000
+USING_OVM=true
+WS_ADDR=0.0.0.0
+WS_API=eth,rollup,net,web3,debug
+WS_ORIGINS=*
+WS=true

infra/op-replica/envs/kovan-gen4/replica-healthcheck.env

+REPLICA_HEALTHCHECK__ETH_NETWORK=kovan
+REPLICA_HEALTHCHECK__L2GETH_IMAGE_TAG=0.4.9
+REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER=http://sequencer.default:8545
+REPLICA_HEALTHCHECK__ETH_REPLICA_RPC_PROVIDER=http://l2geth-replica:8545
\ No newline at end of file

infra/op-replica/envs/kovan-gen5-berlin/check-for-chaindata.sh

+#!/bin/sh
+set -exu
+
+GETH_DATA_DIR=/geth
+GETH_CHAINDATA_DIR=$GETH_DATA_DIR/geth/chaindata
+GETH_KEYSTORE_DIR=$GETH_DATA_DIR/keystore
+if [ ! -d "$GETH_KEYSTORE_DIR" ]; then
+    echo "$GETH_KEYSTORE_DIR missing, running account import"
+    echo -n "$BLOCK_SIGNER_PRIVATE_KEY_PASSWORD" > "$GETH_DATA_DIR"/password
+    echo -n "$BLOCK_SIGNER_PRIVATE_KEY" > "$GETH_DATA_DIR"/block-signer-key
+    geth account import \
+        --datadir="$GETH_DATA_DIR" \
+        --password="$GETH_DATA_DIR"/password \
+        "$GETH_DATA_DIR"/block-signer-key
+    echo "get account import complete"
+fi
+if [ ! -d "$GETH_CHAINDATA_DIR" ]; then
+    echo "$GETH_CHAINDATA_DIR missing, running init"
+    geth init --datadir="$GETH_DATA_DIR" "$L2GETH_GENESIS_URL" "$L2GETH_GENESIS_HASH"
+    echo "geth init complete"
+else
+    echo "$GETH_CHAINDATA_DIR exists, checking for hardfork."
+    echo "Chain config:"
+    geth dump-chain-cfg --datadir="$GETH_DATA_DIR"
+    if geth dump-chain-cfg --datadir="$GETH_DATA_DIR" | grep -q "\"berlinBlock\": $L2GETH_BERLIN_ACTIVATION_HEIGHT"; then
+        echo "Hardfork already activated."
+    else
+        echo "Hardfork not activated, running init."
+        geth init --datadir="$GETH_DATA_DIR" "$L2GETH_GENESIS_URL" "$L2GETH_GENESIS_HASH"
+        echo "geth hardfork activation complete"
+    fi
+fi
\ No newline at end of file

infra/op-replica/envs/kovan-gen5-berlin/data-transport-layer.env

+DATA_TRANSPORT_LAYER__ADDRESS_MANAGER=0x100Dd3b414Df5BbA2B542864fF94aF8024aFdf3a
+DATA_TRANSPORT_LAYER__CONFIRMATIONS=12
+DATA_TRANSPORT_LAYER__DANGEROUSLY_CATCH_ALL_ERRORS=true
+DATA_TRANSPORT_LAYER__DB_PATH=/db
+DATA_TRANSPORT_LAYER__DEFAULT_BACKEND=l2
+DATA_TRANSPORT_LAYER__ENABLE_METRICS=true
+DATA_TRANSPORT_LAYER__ETH_NETWORK_NAME=kovan
+DATA_TRANSPORT_LAYER__L1_GAS_PRICE_BACKEND=l2
+DATA_TRANSPORT_LAYER__L1_START_HEIGHT=27989623
+DATA_TRANSPORT_LAYER__L2_CHAIN_ID=69
+DATA_TRANSPORT_LAYER__LOGS_PER_POLLING_INTERVAL=2000
+DATA_TRANSPORT_LAYER__NODE_ENV=production
+DATA_TRANSPORT_LAYER__POLLING_INTERVAL=500
+DATA_TRANSPORT_LAYER__SENTRY_TRACE_RATE=0.05
+DATA_TRANSPORT_LAYER__SERVER_HOSTNAME=0.0.0.0
+DATA_TRANSPORT_LAYER__SERVER_PORT=7878
+DATA_TRANSPORT_LAYER__SYNC_FROM_L1=false
+DATA_TRANSPORT_LAYER__SYNC_FROM_L2=true
+DATA_TRANSPORT_LAYER__TRANSACTIONS_PER_POLLING_INTERVAL=1000

infra/op-replica/envs/kovan-gen5-berlin/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+configMapGenerator:
+  - name: data-transport-layer
+    envs:
+      - ./data-transport-layer.env
+  - name: l2geth-replica
+    envs:
+      - ./l2geth-replica.env
+  - name: replica-healthcheck
+    envs:
+      - ./replica-healthcheck.env
+  - name: geth-scripts
+    files:
+      - ./check-for-chaindata.sh
\ No newline at end of file

infra/op-replica/envs/kovan-gen5-berlin/l2geth-replica.env

+CHAIN_ID=69
+DATADIR=/geth
+NETWORK_ID=69
+NO_DISCOVER=true
+NO_USB=true
+GASPRICE=0
+GCMODE=archive
+BLOCK_SIGNER_ADDRESS=0x00000398232E2064F896018496b4b44b3D62751F
+BLOCK_SIGNER_PRIVATE_KEY=6587ae678cf4fc9a33000cdbf9f35226b71dcc6a4684a31203241f9bcfd55d27
+BLOCK_SIGNER_PRIVATE_KEY_PASSWORD=pwd
+ETH1_CTC_DEPLOYMENT_HEIGHT=27989623
+ETH1_L1_FEE_WALLET_ADDRESS=0x18394B52d3Cb931dfA76F63251919D051953413d
+ETH1_L1_CROSS_DOMAIN_MESSENGER_ADDRESS=0x4361d0F75A0186C05f971c566dC6bEa5957483fD
+ETH1_L1_STANDARD_BRIDGE_ADDRESS=0x22F24361D548e5FaAfb36d1437839f080363982B
+ETH1_SYNC_SERVICE_ENABLE=true
+L2GETH_GENESIS_URL=https://storage.googleapis.com/optimism/kovan/kovan-berlin-genesis.json
+L2GETH_GENESIS_HASH=0xaed938bc5dee7eb703658d4bec1f3e28f8b92bd9c032b2be779186eafc2b5a2a
+L2GETH_BERLIN_ACTIVATION_HEIGHT=1138900
+ROLLUP_ADDRESS_MANAGER_OWNER_ADDRESS=0x100Dd3b414Df5BbA2B542864fF94aF8024aFdf3a
+ROLLUP_BACKEND=l2
+ROLLUP_CLIENT_HTTP=http://data-transport-layer:7878
+ROLLUP_DISABLE_TRANSFERS=false
+ROLLUP_ENABLE_L2_GAS_POLLING=false
+ROLLUP_GAS_PRICE_ORACLE_OWNER_ADDRESS=0x18394B52d3Cb931dfA76F63251919D051953413d
+ROLLUP_MAX_CALLDATA_SIZE=40000
+ROLLUP_POLL_INTERVAL_FLAG=3s
+ROLLUP_SYNC_SERVICE_ENABLE=true
+ROLLUP_TIMESTAMP_REFRESH=3m
+ROLLUP_VERIFIER_ENABLE=true
+RPC_ADDR=0.0.0.0
+RPC_API=eth,rollup,net,web3,debug
+RPC_CORS_DOMAIN=*
+RPC_ENABLE=true
+RPC_PORT=8545
+RPC_VHOSTS=*
+SEQUENCER_CLIENT_HTTP=https://kovan.optimism.io
+TARGET_GAS_LIMIT=15000000
+USING_OVM=true
+WS_ADDR=0.0.0.0
+WS_API=eth,rollup,net,web3,debug
+WS_ORIGINS=*
+WS=true

infra/op-replica/envs/kovan-gen5-berlin/replica-healthcheck.env

+REPLICA_HEALTHCHECK__ETH_NETWORK=kovan
+REPLICA_HEALTHCHECK__L2GETH_IMAGE_TAG=0.4.9
+REPLICA_HEALTHCHECK__ETH_REPLICA_RPC_PROVIDER=http://l2geth-replica:8545
\ No newline at end of file

infra/op-replica/envs/kovan-gen5-rc6/data-transport-layer.env

+DATA_TRANSPORT_LAYER__ADDRESS_MANAGER=0x100Dd3b414Df5BbA2B542864fF94aF8024aFdf3a
+DATA_TRANSPORT_LAYER__CONFIRMATIONS=12
+DATA_TRANSPORT_LAYER__DANGEROUSLY_CATCH_ALL_ERRORS=true
+DATA_TRANSPORT_LAYER__DB_PATH=/db
+DATA_TRANSPORT_LAYER__DEFAULT_BACKEND=l2
+DATA_TRANSPORT_LAYER__ENABLE_METRICS=true
+DATA_TRANSPORT_LAYER__ETH_NETWORK_NAME=kovan
+DATA_TRANSPORT_LAYER__L1_GAS_PRICE_BACKEND=l2
+DATA_TRANSPORT_LAYER__L1_START_HEIGHT=27989623
+DATA_TRANSPORT_LAYER__L2_CHAIN_ID=69
+DATA_TRANSPORT_LAYER__LOGS_PER_POLLING_INTERVAL=2000
+DATA_TRANSPORT_LAYER__NODE_ENV=production
+DATA_TRANSPORT_LAYER__POLLING_INTERVAL=500
+DATA_TRANSPORT_LAYER__SENTRY_TRACE_RATE=0.05
+DATA_TRANSPORT_LAYER__SERVER_HOSTNAME=0.0.0.0
+DATA_TRANSPORT_LAYER__SERVER_PORT=7878
+DATA_TRANSPORT_LAYER__SYNC_FROM_L1=false
+DATA_TRANSPORT_LAYER__SYNC_FROM_L2=true
+DATA_TRANSPORT_LAYER__TRANSACTIONS_PER_POLLING_INTERVAL=1000
+DEPLOYER_HTTP=

infra/op-replica/envs/kovan-gen5-rc6/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+configMapGenerator:
+  - name: data-transport-layer
+    envs:
+      - ./data-transport-layer.env
+  - name: l2geth-replica
+    envs:
+      - ./l2geth-replica.env
+  - name: replica-healthcheck
+    envs:
+      - ./replica-healthcheck.env

infra/op-replica/envs/kovan-gen5-rc6/l2geth-replica.env

+CHAIN_ID=69
+DATADIR=/geth
+NETWORK_ID=69
+NO_DISCOVER=true
+NO_USB=true
+GASPRICE=0
+GCMODE=archive
+BLOCK_SIGNER_ADDRESS=0x00000398232E2064F896018496b4b44b3D62751F
+BLOCK_SIGNER_PRIVATE_KEY=6587ae678cf4fc9a33000cdbf9f35226b71dcc6a4684a31203241f9bcfd55d27
+BLOCK_SIGNER_PRIVATE_KEY_PASSWORD=pwd
+ETH1_CTC_DEPLOYMENT_HEIGHT=27989623
+ETH1_L1_FEE_WALLET_ADDRESS=0x18394B52d3Cb931dfA76F63251919D051953413d
+ETH1_L1_CROSS_DOMAIN_MESSENGER_ADDRESS=0x4361d0F75A0186C05f971c566dC6bEa5957483fD
+ETH1_L1_STANDARD_BRIDGE_ADDRESS=0x22F24361D548e5FaAfb36d1437839f080363982B
+ETH1_SYNC_SERVICE_ENABLE=true
+L2GETH_GENESIS_URL=https://storage.googleapis.com/optimism/kovan/v0.5.0-rc2.json
+L2GETH_GENESIS_URL_SHA256SUM=17bc1ef020273bcaaa21b05666f912ebf330c0e99a7963b9e5ed61d649043fbd
+ROLLUP_ADDRESS_MANAGER_OWNER_ADDRESS=0x100Dd3b414Df5BbA2B542864fF94aF8024aFdf3a
+ROLLUP_BACKEND=l2
+ROLLUP_CLIENT_HTTP=http://data-transport-layer:7878
+ROLLUP_DISABLE_TRANSFERS=false
+ROLLUP_ENABLE_L2_GAS_POLLING=false
+ROLLUP_GAS_PRICE_ORACLE_OWNER_ADDRESS=0x18394B52d3Cb931dfA76F63251919D051953413d
+ROLLUP_MAX_CALLDATA_SIZE=40000
+ROLLUP_POLL_INTERVAL_FLAG=3s
+ROLLUP_SYNC_SERVICE_ENABLE=true
+ROLLUP_TIMESTAMP_REFRESH=3m
+ROLLUP_VERIFIER_ENABLE=true
+RPC_ADDR=0.0.0.0
+RPC_API=eth,rollup,net,web3,debug
+RPC_CORS_DOMAIN=*
+RPC_ENABLE=true
+RPC_PORT=8545
+RPC_VHOSTS=*
+TARGET_GAS_LIMIT=15000000
+USING_OVM=true
+WS_ADDR=0.0.0.0
+WS_API=eth,rollup,net,web3,debug
+WS_ORIGINS=*
+WS=true

infra/op-replica/envs/kovan-gen5-rc6/replica-healthcheck.env

+REPLICA_HEALTHCHECK__ETH_NETWORK=kovan
+REPLICA_HEALTHCHECK__L2GETH_IMAGE_TAG=0.4.9
+REPLICA_HEALTHCHECK__ETH_REPLICA_RPC_PROVIDER=http://l2geth-replica:8545
\ No newline at end of file

infra/op-replica/envs/kovan-gen5/data-transport-layer.env

+DATA_TRANSPORT_LAYER__ADDRESS_MANAGER=0x100Dd3b414Df5BbA2B542864fF94aF8024aFdf3a
+DATA_TRANSPORT_LAYER__CONFIRMATIONS=12
+DATA_TRANSPORT_LAYER__DANGEROUSLY_CATCH_ALL_ERRORS=true
+DATA_TRANSPORT_LAYER__DB_PATH=/db
+DATA_TRANSPORT_LAYER__DEFAULT_BACKEND=l2
+DATA_TRANSPORT_LAYER__ENABLE_METRICS=true
+DATA_TRANSPORT_LAYER__ETH_NETWORK_NAME=kovan
+DATA_TRANSPORT_LAYER__L1_GAS_PRICE_BACKEND=l2
+DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT=http://failover-proxy.default:8000
+DATA_TRANSPORT_LAYER__L2_CHAIN_ID=69
+DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT=http://sequencer.default:8545
+DATA_TRANSPORT_LAYER__LOGS_PER_POLLING_INTERVAL=2000
+DATA_TRANSPORT_LAYER__NODE_ENV=production
+DATA_TRANSPORT_LAYER__POLLING_INTERVAL=500
+DATA_TRANSPORT_LAYER__SENTRY_TRACE_RATE=0.05
+DATA_TRANSPORT_LAYER__SERVER_HOSTNAME=0.0.0.0
+DATA_TRANSPORT_LAYER__SERVER_PORT=7878
+DATA_TRANSPORT_LAYER__SYNC_FROM_L1=false
+DATA_TRANSPORT_LAYER__SYNC_FROM_L2=true
+DATA_TRANSPORT_LAYER__TRANSACTIONS_PER_POLLING_INTERVAL=1000
+DEPLOYER_HTTP=
+L1_NODE_WEB3_URL=http://failover-proxy.default:8000

infra/op-replica/envs/kovan-gen5/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+configMapGenerator:
+  - name: data-transport-layer
+    envs:
+      - ./data-transport-layer.env
+  - name: l2geth-replica
+    envs:
+      - ./l2geth-replica.env
+  - name: replica-healthcheck
+    envs:
+      - ./replica-healthcheck.env

infra/op-replica/envs/kovan-gen5/l2geth-replica.env

+CHAIN_ID=69
+DATADIR=/geth
+NETWORK_ID=69
+NO_DISCOVER=true
+NO_USB=true
+GASPRICE=0
+GCMODE=archive
+BLOCK_SIGNER_ADDRESS=0x27770a9694e4B4b1E130Ab91Bc327C36855f612E
+BLOCK_SIGNER_PRIVATE_KEY=da5deb73dbc9dea2e3916929daaf079f75232d32a2cf37ff8b1f7140ef3fd9db
+BLOCK_SIGNER_PRIVATE_KEY_PASSWORD=pwd
+ETH1_CTC_DEPLOYMENT_HEIGHT=27989623
+ETH1_L1_FEE_WALLET_ADDRESS=0x18394B52d3Cb931dfA76F63251919D051953413d
+ETH1_L1_CROSS_DOMAIN_MESSENGER_ADDRESS=0x4361d0F75A0186C05f971c566dC6bEa5957483fD
+ETH1_L1_STANDARD_BRIDGE_ADDRESS=0x22F24361D548e5FaAfb36d1437839f080363982B
+ETH1_SYNC_SERVICE_ENABLE=true
+L2GETH_GENESIS_URL=https://storage.googleapis.com/optimism/kovan/v0.5.0-rc2.json
+L2GETH_GENESIS_URL_SHA256SUM=17bc1ef020273bcaaa21b05666f912ebf330c0e99a7963b9e5ed61d649043fbd
+ROLLUP_ADDRESS_MANAGER_OWNER_ADDRESS=0x18394B52d3Cb931dfA76F63251919D051953413d
+ROLLUP_BACKEND=l2
+ROLLUP_CLIENT_HTTP=http://data-transport-layer:7878
+ROLLUP_DISABLE_TRANSFERS=false
+ROLLUP_ENABLE_L2_GAS_POLLING=false
+ROLLUP_ENABLE_ARBITRARY_CONTRACT_DEPLOYMENT=true
+ROLLUP_GAS_PRICE_ORACLE_OWNER_ADDRESS=0x18394B52d3Cb931dfA76F63251919D051953413d
+ROLLUP_MAX_CALLDATA_SIZE=40000
+ROLLUP_POLL_INTERVAL_FLAG=3s
+ROLLUP_SYNC_SERVICE_ENABLE=true
+ROLLUP_TIMESTAMP_REFRESH=3m
+ROLLUP_VERIFIER_ENABLE=true
+RPC_ADDR=0.0.0.0
+RPC_API=eth,rollup,net,web3,debug
+RPC_CORS_DOMAIN=*
+RPC_ENABLE=true
+RPC_PORT=8545
+RPC_VHOSTS=*
+TARGET_GAS_LIMIT=15000000
+USING_OVM=true
+WS_ADDR=0.0.0.0
+WS_API=eth,rollup,net,web3,debug
+WS_ORIGINS=*
+WS=true

infra/op-replica/envs/kovan-gen5/replica-healthcheck.env

+REPLICA_HEALTHCHECK__ETH_NETWORK=kovan
+REPLICA_HEALTHCHECK__L2GETH_IMAGE_TAG=prerelease-0.5.0-rc-7-ee217ce
+REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER=http://sequencer.default:8545
+REPLICA_HEALTHCHECK__ETH_REPLICA_RPC_PROVIDER=http://l2geth-replica:8545

infra/op-replica/envs/kovan/data-transport-layer.env

+DATA_TRANSPORT_LAYER__ADDRESS_MANAGER=0x100Dd3b414Df5BbA2B542864fF94aF8024aFdf3a
+DATA_TRANSPORT_LAYER__CONFIRMATIONS=12
+DATA_TRANSPORT_LAYER__DANGEROUSLY_CATCH_ALL_ERRORS=true
+DATA_TRANSPORT_LAYER__DB_PATH=/db
+DATA_TRANSPORT_LAYER__DEFAULT_BACKEND=l2
+DATA_TRANSPORT_LAYER__ENABLE_METRICS=true
+DATA_TRANSPORT_LAYER__ETH_NETWORK_NAME=kovan
+DATA_TRANSPORT_LAYER__L1_GAS_PRICE_BACKEND=l2
+DATA_TRANSPORT_LAYER__L1_START_HEIGHT=27989623
+DATA_TRANSPORT_LAYER__L2_CHAIN_ID=69
+DATA_TRANSPORT_LAYER__LOGS_PER_POLLING_INTERVAL=2000
+DATA_TRANSPORT_LAYER__NODE_ENV=production
+DATA_TRANSPORT_LAYER__POLLING_INTERVAL=500
+DATA_TRANSPORT_LAYER__SENTRY_TRACE_RATE=0.05
+DATA_TRANSPORT_LAYER__SERVER_HOSTNAME=0.0.0.0
+DATA_TRANSPORT_LAYER__SERVER_PORT=7878
+DATA_TRANSPORT_LAYER__SYNC_FROM_L1=false
+DATA_TRANSPORT_LAYER__SYNC_FROM_L2=true
+DATA_TRANSPORT_LAYER__TRANSACTIONS_PER_POLLING_INTERVAL=1000
+DEPLOYER_HTTP=

infra/op-replica/envs/kovan/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+configMapGenerator:
+  - name: data-transport-layer
+    envs:
+      - ./data-transport-layer.env
+  - name: l2geth-replica
+    envs:
+      - ./l2geth-replica.env
+  - name: replica-healthcheck
+    envs:
+      - ./replica-healthcheck.env

infra/op-replica/envs/kovan/l2geth-replica.env

+CHAIN_ID=69
+DATADIR=/geth
+NETWORK_ID=69
+NO_DISCOVER=true
+NO_USB=true
+GASPRICE=0
+GCMODE=archive
+BLOCK_SIGNER_ADDRESS=0x00000398232E2064F896018496b4b44b3D62751F
+BLOCK_SIGNER_PRIVATE_KEY=6587ae678cf4fc9a33000cdbf9f35226b71dcc6a4684a31203241f9bcfd55d27
+BLOCK_SIGNER_PRIVATE_KEY_PASSWORD=pwd
+ETH1_CTC_DEPLOYMENT_HEIGHT=27989623
+ETH1_SYNC_SERVICE_ENABLE=true
+L2GETH_GENESIS_URL=https://storage.googleapis.com/optimism/kovan/kovan-berlin-genesis.json
+L2GETH_GENESIS_HASH=0xaed938bc5dee7eb703658d4bec1f3e28f8b92bd9c032b2be779186eafc2b5a2a
+L2GETH_BERLIN_ACTIVATION_HEIGHT=1138900
+ROLLUP_BACKEND=l2
+ROLLUP_CLIENT_HTTP=http://data-transport-layer:7878
+ROLLUP_MAX_CALLDATA_SIZE=40000
+ROLLUP_POLL_INTERVAL_FLAG=3s
+ROLLUP_SYNC_SERVICE_ENABLE=true
+ROLLUP_TIMESTAMP_REFRESH=3m
+ROLLUP_VERIFIER_ENABLE=true
+RPC_ADDR=0.0.0.0
+RPC_API=eth,rollup,net,web3,debug
+RPC_CORS_DOMAIN=*
+RPC_ENABLE=true
+RPC_PORT=8545
+RPC_VHOSTS=*
+TARGET_GAS_LIMIT=15000000
+USING_OVM=true
+WS_ADDR=0.0.0.0
+WS_API=eth,rollup,net,web3,debug
+WS_ORIGINS=*
+WS=true
+IPC_DISABLE=true

infra/op-replica/envs/kovan/replica-healthcheck.env

+REPLICA_HEALTHCHECK__ETH_NETWORK=kovan
+REPLICA_HEALTHCHECK__L2GETH_IMAGE_TAG=0.4.9
+REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER=http://sequencer.default:8545
+REPLICA_HEALTHCHECK__ETH_REPLICA_RPC_PROVIDER=http://l2geth-replica:8545
\ No newline at end of file

infra/op-replica/envs/mainnet-gen5-berlin/check-for-chaindata.sh

+#!/bin/sh
+set -exu
+
+GETH_DATA_DIR=/geth
+GETH_CHAINDATA_DIR=$GETH_DATA_DIR/geth/chaindata
+GETH_KEYSTORE_DIR=$GETH_DATA_DIR/keystore
+if [ ! -d "$GETH_KEYSTORE_DIR" ]; then
+    echo "$GETH_KEYSTORE_DIR missing, running account import"
+    echo -n "$BLOCK_SIGNER_PRIVATE_KEY_PASSWORD" > "$GETH_DATA_DIR"/password
+    echo -n "$BLOCK_SIGNER_PRIVATE_KEY" > "$GETH_DATA_DIR"/block-signer-key
+    geth account import \
+        --datadir="$GETH_DATA_DIR" \
+        --password="$GETH_DATA_DIR"/password \
+        "$GETH_DATA_DIR"/block-signer-key
+    echo "get account import complete"
+fi
+if [ ! -d "$GETH_CHAINDATA_DIR" ]; then
+    echo "$GETH_CHAINDATA_DIR missing, running init"
+    geth init --datadir="$GETH_DATA_DIR" "$L2GETH_GENESIS_URL" "$L2GETH_GENESIS_HASH"
+    echo "geth init complete"
+else
+    echo "$GETH_CHAINDATA_DIR exists, checking for hardfork."
+    echo "Chain config:"
+    geth dump-chain-cfg --datadir="$GETH_DATA_DIR"
+    if geth dump-chain-cfg --datadir="$GETH_DATA_DIR" | grep -q "\"berlinBlock\": $L2GETH_BERLIN_ACTIVATION_HEIGHT"; then
+        echo "Hardfork already activated."
+    else
+        echo "Hardfork not activated, running init."
+        geth init --datadir="$GETH_DATA_DIR" "$L2GETH_GENESIS_URL" "$L2GETH_GENESIS_HASH"
+        echo "geth hardfork activation complete"
+    fi
+fi
\ No newline at end of file

infra/op-replica/envs/mainnet-gen5-berlin/data-transport-layer.env

+DATA_TRANSPORT_LAYER__ADDRESS_MANAGER=0xdE1FCfB0851916CA5101820A69b13a4E276bd81F
+DATA_TRANSPORT_LAYER__CONFIRMATIONS=12
+DATA_TRANSPORT_LAYER__DANGEROUSLY_CATCH_ALL_ERRORS=true
+DATA_TRANSPORT_LAYER__DB_PATH=/db
+DATA_TRANSPORT_LAYER__DEFAULT_BACKEND=l2
+DATA_TRANSPORT_LAYER__ENABLE_METRICS=true
+DATA_TRANSPORT_LAYER__ETH_NETWORK_NAME=mainnet
+DATA_TRANSPORT_LAYER__L1_GAS_PRICE_BACKEND=l2
+DATA_TRANSPORT_LAYER__L1_START_HEIGHT=13596466
+DATA_TRANSPORT_LAYER__L2_CHAIN_ID=10
+DATA_TRANSPORT_LAYER__LOGS_PER_POLLING_INTERVAL=2000
+DATA_TRANSPORT_LAYER__NODE_ENV=production
+DATA_TRANSPORT_LAYER__POLLING_INTERVAL=500
+DATA_TRANSPORT_LAYER__SENTRY_TRACE_RATE=0.05
+DATA_TRANSPORT_LAYER__SERVER_HOSTNAME=0.0.0.0
+DATA_TRANSPORT_LAYER__SERVER_PORT=7878
+DATA_TRANSPORT_LAYER__SYNC_FROM_L1=false
+DATA_TRANSPORT_LAYER__SYNC_FROM_L2=true
+DATA_TRANSPORT_LAYER__TRANSACTIONS_PER_POLLING_INTERVAL=1000
+L1_NODE_WEB3_URL=http://failover-proxyd.default:8080

infra/op-replica/envs/mainnet-gen5-berlin/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+configMapGenerator:
+  - name: data-transport-layer
+    envs:
+      - ./data-transport-layer.env
+  - name: l2geth-replica
+    envs:
+      - ./l2geth-replica.env
+  - name: replica-healthcheck
+    envs:
+      - ./replica-healthcheck.env
+  - name: geth-scripts
+    files:
+      - ./check-for-chaindata.sh
\ No newline at end of file

infra/op-replica/envs/mainnet-gen5-berlin/l2geth-replica.env

+CHAIN_ID=10
+DATADIR=/geth
+NETWORK_ID=10
+NO_DISCOVER=true
+NO_USB=true
+GASPRICE=0
+GCMODE=archive
+BLOCK_SIGNER_ADDRESS=0x00000398232E2064F896018496b4b44b3D62751F
+BLOCK_SIGNER_PRIVATE_KEY=6587ae678cf4fc9a33000cdbf9f35226b71dcc6a4684a31203241f9bcfd55d27
+BLOCK_SIGNER_PRIVATE_KEY_PASSWORD=pwd
+ETH1_CTC_DEPLOYMENT_HEIGHT=13596466
+ETH1_L1_FEE_WALLET_ADDRESS=0x391716d440c151c42cdf1c95c1d83a5427bca52c
+ETH1_L1_CROSS_DOMAIN_MESSENGER_ADDRESS=0x25ace71c97B33Cc4729CF772ae268934F7ab5fA1
+ETH1_L1_STANDARD_BRIDGE_ADDRESS=0x99C9fc46f92E8a1c0deC1b1747d010903E884bE1
+ETH1_SYNC_SERVICE_ENABLE=true
+L2GETH_GENESIS_URL=https://storage.googleapis.com/optimism/mainnet/genesis-berlin.json
+L2GETH_GENESIS_HASH=0x106b0a3247ca54714381b1109e82cc6b7e32fd79ae56fbcc2e7b1541122f84ea
+L2GETH_BERLIN_ACTIVATION_HEIGHT=3950000
+ROLLUP_ADDRESS_MANAGER_OWNER_ADDRESS=0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A
+ROLLUP_BACKEND=l2
+ROLLUP_CLIENT_HTTP=http://data-transport-layer:7878
+ROLLUP_DISABLE_TRANSFERS=false
+ROLLUP_ENABLE_L2_GAS_POLLING=false
+ROLLUP_GAS_PRICE_ORACLE_OWNER_ADDRESS=0x7107142636C85c549690b1Aca12Bdb8052d26Ae6
+ROLLUP_MAX_CALLDATA_SIZE=40000
+ROLLUP_POLL_INTERVAL_FLAG=1s
+ROLLUP_SYNC_SERVICE_ENABLE=true
+ROLLUP_TIMESTAMP_REFRESH=5m
+ROLLUP_VERIFIER_ENABLE=true
+RPC_ADDR=0.0.0.0
+RPC_API=eth,rollup,net,web3,debug
+RPC_CORS_DOMAIN=*
+RPC_ENABLE=true
+RPC_PORT=8545
+RPC_VHOSTS=*
+TARGET_GAS_LIMIT=15000000
+USING_OVM=true
+WS_ADDR=0.0.0.0
+WS_API=eth,rollup,net,web3,debug
+WS_ORIGINS=*
+WS=true

infra/op-replica/envs/mainnet-gen5-berlin/replica-healthcheck.env

+REPLICA_HEALTHCHECK__ETH_NETWORK=mainnet
+REPLICA_HEALTHCHECK__L2GETH_IMAGE_TAG=0.5.11
+REPLICA_HEALTHCHECK__ETH_REPLICA_RPC_PROVIDER=http://l2geth-replica:8545
\ No newline at end of file

infra/op-replica/envs/mainnet-gen5-l1-berlin/check-for-chaindata.sh

+#!/bin/sh
+set -exu
+
+GETH_DATA_DIR=/geth
+GETH_CHAINDATA_DIR=$GETH_DATA_DIR/geth/chaindata
+GETH_KEYSTORE_DIR=$GETH_DATA_DIR/keystore
+if [ ! -d "$GETH_KEYSTORE_DIR" ]; then
+    echo "$GETH_KEYSTORE_DIR missing, running account import"
+    echo -n "$BLOCK_SIGNER_PRIVATE_KEY_PASSWORD" > "$GETH_DATA_DIR"/password
+    echo -n "$BLOCK_SIGNER_PRIVATE_KEY" > "$GETH_DATA_DIR"/block-signer-key
+    geth account import \
+        --datadir="$GETH_DATA_DIR" \
+        --password="$GETH_DATA_DIR"/password \
+        "$GETH_DATA_DIR"/block-signer-key
+    echo "get account import complete"
+fi
+if [ ! -d "$GETH_CHAINDATA_DIR" ]; then
+    echo "$GETH_CHAINDATA_DIR missing, running init"
+    geth init --datadir="$GETH_DATA_DIR" "$L2GETH_GENESIS_URL" "$L2GETH_GENESIS_HASH"
+    echo "geth init complete"
+else
+    echo "$GETH_CHAINDATA_DIR exists, checking for hardfork."
+    echo "Chain config:"
+    geth dump-chain-cfg --datadir="$GETH_DATA_DIR"
+    if geth dump-chain-cfg --datadir="$GETH_DATA_DIR" | grep -q "\"berlinBlock\": $L2GETH_BERLIN_ACTIVATION_HEIGHT"; then
+        echo "Hardfork already activated."
+    else
+        echo "Hardfork not activated, running init."
+        geth init --datadir="$GETH_DATA_DIR" "$L2GETH_GENESIS_URL" "$L2GETH_GENESIS_HASH"
+        echo "geth hardfork activation complete"
+    fi
+fi
\ No newline at end of file

infra/op-replica/envs/mainnet-gen5-l1-berlin/data-transport-layer.env

+DATA_TRANSPORT_LAYER__ADDRESS_MANAGER=0xdE1FCfB0851916CA5101820A69b13a4E276bd81F
+DATA_TRANSPORT_LAYER__CONFIRMATIONS=12
+DATA_TRANSPORT_LAYER__DANGEROUSLY_CATCH_ALL_ERRORS=true
+DATA_TRANSPORT_LAYER__DB_PATH=/db
+DATA_TRANSPORT_LAYER__DEFAULT_BACKEND=l1
+DATA_TRANSPORT_LAYER__ENABLE_METRICS=true
+DATA_TRANSPORT_LAYER__ETH_NETWORK_NAME=mainnet
+DATA_TRANSPORT_LAYER__L1_GAS_PRICE_BACKEND=l1
+DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT=http://failover-proxyd.default:8080
+DATA_TRANSPORT_LAYER__L1_START_HEIGHT=13596466
+DATA_TRANSPORT_LAYER__L2_CHAIN_ID=10
+DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT=http://sequencer.default:8545
+DATA_TRANSPORT_LAYER__LOGS_PER_POLLING_INTERVAL=2000
+DATA_TRANSPORT_LAYER__NODE_ENV=production
+DATA_TRANSPORT_LAYER__POLLING_INTERVAL=500
+DATA_TRANSPORT_LAYER__SENTRY_TRACE_RATE=0.05
+DATA_TRANSPORT_LAYER__SERVER_HOSTNAME=0.0.0.0
+DATA_TRANSPORT_LAYER__SERVER_PORT=7878
+DATA_TRANSPORT_LAYER__SYNC_FROM_L1=true
+DATA_TRANSPORT_LAYER__SYNC_FROM_L2=false
+DATA_TRANSPORT_LAYER__TRANSACTIONS_PER_POLLING_INTERVAL=1000
+L1_NODE_WEB3_URL=http://failover-proxyd.default:8080

infra/op-replica/envs/mainnet-gen5-l1-berlin/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+configMapGenerator:
+  - name: data-transport-layer
+    envs:
+      - ./data-transport-layer.env
+  - name: l2geth-replica
+    envs:
+      - ./l2geth-replica.env
+  - name: replica-healthcheck
+    envs:
+      - ./replica-healthcheck.env
+  - name: geth-scripts
+    files:
+      - ./check-for-chaindata.sh
\ No newline at end of file

infra/op-replica/envs/mainnet-gen5-l1-berlin/l2geth-replica.env

+CHAIN_ID=10
+DATADIR=/geth
+NETWORK_ID=10
+NO_DISCOVER=true
+NO_USB=true
+GASPRICE=0
+GCMODE=archive
+BLOCK_SIGNER_ADDRESS=0x00000398232E2064F896018496b4b44b3D62751F
+BLOCK_SIGNER_PRIVATE_KEY=6587ae678cf4fc9a33000cdbf9f35226b71dcc6a4684a31203241f9bcfd55d27
+BLOCK_SIGNER_PRIVATE_KEY_PASSWORD=pwd
+ETH1_CTC_DEPLOYMENT_HEIGHT=13596466
+ETH1_L1_FEE_WALLET_ADDRESS=0x391716d440c151c42cdf1c95c1d83a5427bca52c
+ETH1_L1_CROSS_DOMAIN_MESSENGER_ADDRESS=0x25ace71c97B33Cc4729CF772ae268934F7ab5fA1
+ETH1_L1_STANDARD_BRIDGE_ADDRESS=0x99C9fc46f92E8a1c0deC1b1747d010903E884bE1
+ETH1_SYNC_SERVICE_ENABLE=true
+L2GETH_GENESIS_URL=https://storage.googleapis.com/optimism/mainnet/genesis-berlin.json
+L2GETH_GENESIS_HASH=0x106b0a3247ca54714381b1109e82cc6b7e32fd79ae56fbcc2e7b1541122f84ea
+L2GETH_BERLIN_ACTIVATION_HEIGHT=3950000
+ROLLUP_ADDRESS_MANAGER_OWNER_ADDRESS=0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A
+ROLLUP_BACKEND=l1
+ROLLUP_CLIENT_HTTP=http://data-transport-layer:7878
+ROLLUP_DISABLE_TRANSFERS=false
+ROLLUP_ENABLE_L2_GAS_POLLING=false
+ROLLUP_GAS_PRICE_ORACLE_OWNER_ADDRESS=0x7107142636C85c549690b1Aca12Bdb8052d26Ae6
+ROLLUP_MAX_CALLDATA_SIZE=40000
+ROLLUP_POLL_INTERVAL_FLAG=1s
+ROLLUP_SYNC_SERVICE_ENABLE=true
+ROLLUP_TIMESTAMP_REFRESH=5m
+ROLLUP_VERIFIER_ENABLE=true
+RPC_ADDR=0.0.0.0
+RPC_API=eth,rollup,net,web3,debug
+RPC_CORS_DOMAIN=*
+RPC_ENABLE=true
+RPC_PORT=8545
+RPC_VHOSTS=*
+TARGET_GAS_LIMIT=15000000
+USING_OVM=true
+WS_ADDR=0.0.0.0
+WS_API=eth,rollup,net,web3,debug
+WS_ORIGINS=*
+WS=true

infra/op-replica/envs/mainnet-gen5-l1-berlin/replica-healthcheck.env

+REPLICA_HEALTHCHECK__ETH_NETWORK=mainnet
+REPLICA_HEALTHCHECK__L2GETH_IMAGE_TAG=0.5.13
+REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER=http://sequencer.default:8545
+REPLICA_HEALTHCHECK__ETH_REPLICA_RPC_PROVIDER=http://l2geth-replica:8545
\ No newline at end of file

infra/op-replica/envs/mainnet-gen5-l1/data-transport-layer.env

+DATA_TRANSPORT_LAYER__ADDRESS_MANAGER=0xdE1FCfB0851916CA5101820A69b13a4E276bd81F
+DATA_TRANSPORT_LAYER__CONFIRMATIONS=12
+DATA_TRANSPORT_LAYER__DANGEROUSLY_CATCH_ALL_ERRORS=true
+DATA_TRANSPORT_LAYER__DB_PATH=/db
+DATA_TRANSPORT_LAYER__DEFAULT_BACKEND=l1
+DATA_TRANSPORT_LAYER__ENABLE_METRICS=true
+DATA_TRANSPORT_LAYER__ETH_NETWORK_NAME=mainnet
+DATA_TRANSPORT_LAYER__L1_GAS_PRICE_BACKEND=l1
+DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT=http://failover-proxyd.default:8080
+DATA_TRANSPORT_LAYER__L1_START_HEIGHT=13596466
+DATA_TRANSPORT_LAYER__L2_CHAIN_ID=10
+DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT=http://sequencer.default:8545
+DATA_TRANSPORT_LAYER__LOGS_PER_POLLING_INTERVAL=2000
+DATA_TRANSPORT_LAYER__NODE_ENV=production
+DATA_TRANSPORT_LAYER__POLLING_INTERVAL=500
+DATA_TRANSPORT_LAYER__SENTRY_TRACE_RATE=0.05
+DATA_TRANSPORT_LAYER__SERVER_HOSTNAME=0.0.0.0
+DATA_TRANSPORT_LAYER__SERVER_PORT=7878
+DATA_TRANSPORT_LAYER__SYNC_FROM_L1=true
+DATA_TRANSPORT_LAYER__SYNC_FROM_L2=false
+DATA_TRANSPORT_LAYER__TRANSACTIONS_PER_POLLING_INTERVAL=1000
+DEPLOYER_HTTP=
+L1_NODE_WEB3_URL=http://failover-proxyd.default:8080

infra/op-replica/envs/mainnet-gen5-l1/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+configMapGenerator:
+  - name: data-transport-layer
+    envs:
+      - ./data-transport-layer.env
+  - name: l2geth-replica
+    envs:
+      - ./l2geth-replica.env
+  - name: replica-healthcheck
+    envs:
+      - ./replica-healthcheck.env

infra/op-replica/envs/mainnet-gen5-l1/l2geth-replica.env

+CHAIN_ID=10
+DATADIR=/geth
+NETWORK_ID=10
+NO_DISCOVER=true
+NO_USB=true
+GASPRICE=0
+GCMODE=archive
+BLOCK_SIGNER_ADDRESS=0x00000398232E2064F896018496b4b44b3D62751F
+BLOCK_SIGNER_PRIVATE_KEY=6587ae678cf4fc9a33000cdbf9f35226b71dcc6a4684a31203241f9bcfd55d27
+BLOCK_SIGNER_PRIVATE_KEY_PASSWORD=pwd
+ETH1_CTC_DEPLOYMENT_HEIGHT=13596466
+ETH1_L1_FEE_WALLET_ADDRESS=0x391716d440c151c42cdf1c95c1d83a5427bca52c
+ETH1_L1_CROSS_DOMAIN_MESSENGER_ADDRESS=0x25ace71c97B33Cc4729CF772ae268934F7ab5fA1
+ETH1_L1_STANDARD_BRIDGE_ADDRESS=0x99C9fc46f92E8a1c0deC1b1747d010903E884bE1
+ETH1_SYNC_SERVICE_ENABLE=true
+L2GETH_GENESIS_URL=https://storage.googleapis.com/optimism/mainnet/genesis-v0.5.0.json
+L2GETH_GENESIS_URL_SHA256SUM=361ff81fff4cc71e5f0bf43b0b982f5cfd08d068f730b9a61516fe1fa8fd914a
+ROLLUP_ADDRESS_MANAGER_OWNER_ADDRESS=0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A
+ROLLUP_BACKEND=l1
+ROLLUP_CLIENT_HTTP=http://data-transport-layer:7878
+ROLLUP_DISABLE_TRANSFERS=false
+ROLLUP_ENABLE_L2_GAS_POLLING=false
+ROLLUP_GAS_PRICE_ORACLE_OWNER_ADDRESS=0x7107142636C85c549690b1Aca12Bdb8052d26Ae6
+ROLLUP_MAX_CALLDATA_SIZE=40000
+ROLLUP_POLL_INTERVAL_FLAG=1s
+ROLLUP_SYNC_SERVICE_ENABLE=true
+ROLLUP_TIMESTAMP_REFRESH=5m
+ROLLUP_VERIFIER_ENABLE=true
+RPC_ADDR=0.0.0.0
+RPC_API=eth,rollup,net,web3,debug
+RPC_CORS_DOMAIN=*
+RPC_ENABLE=true
+RPC_PORT=8545
+RPC_VHOSTS=*
+TARGET_GAS_LIMIT=15000000
+USING_OVM=true
+WS_ADDR=0.0.0.0
+WS_API=eth,rollup,net,web3,debug
+WS_ORIGINS=*
+WS=true

infra/op-replica/envs/mainnet-gen5-l1/replica-healthcheck.env

+REPLICA_HEALTHCHECK__ETH_NETWORK=mainnet
+REPLICA_HEALTHCHECK__L2GETH_IMAGE_TAG=0.5.0-rc3
+REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER=http://sequencer.default:8545
+REPLICA_HEALTHCHECK__ETH_REPLICA_RPC_PROVIDER=http://l2geth-replica:8545
\ No newline at end of file

infra/op-replica/envs/mainnet-gen5-staging-1/data-transport-layer.env

+DATA_TRANSPORT_LAYER__ADDRESS_MANAGER=0xdE1FCfB0851916CA5101820A69b13a4E276bd81F
+DATA_TRANSPORT_LAYER__CONFIRMATIONS=12
+DATA_TRANSPORT_LAYER__DANGEROUSLY_CATCH_ALL_ERRORS=true
+DATA_TRANSPORT_LAYER__DB_PATH=/db
+DATA_TRANSPORT_LAYER__DEFAULT_BACKEND=l2
+DATA_TRANSPORT_LAYER__ENABLE_METRICS=true
+DATA_TRANSPORT_LAYER__ETH_NETWORK_NAME=mainnet
+DATA_TRANSPORT_LAYER__L1_GAS_PRICE_BACKEND=l2
+DATA_TRANSPORT_LAYER__L2_CHAIN_ID=66666
+DATA_TRANSPORT_LAYER__LOGS_PER_POLLING_INTERVAL=2000
+DATA_TRANSPORT_LAYER__NODE_ENV=production
+DATA_TRANSPORT_LAYER__POLLING_INTERVAL=500
+DATA_TRANSPORT_LAYER__SENTRY_TRACE_RATE=0.05
+DATA_TRANSPORT_LAYER__SERVER_HOSTNAME=0.0.0.0
+DATA_TRANSPORT_LAYER__SERVER_PORT=7878
+DATA_TRANSPORT_LAYER__SYNC_FROM_L1=false
+DATA_TRANSPORT_LAYER__SYNC_FROM_L2=true
+DATA_TRANSPORT_LAYER__TRANSACTIONS_PER_POLLING_INTERVAL=1000
+DEPLOYER_HTTP=

infra/op-replica/envs/mainnet-gen5-staging-1/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+configMapGenerator:
+  - name: data-transport-layer
+    envs:
+      - ./data-transport-layer.env
+  - name: l2geth-replica
+    envs:
+      - ./l2geth-replica.env
+  - name: replica-healthcheck
+    envs:
+      - ./replica-healthcheck.env

infra/op-replica/envs/mainnet-gen5-staging-1/l2geth-replica.env

+BLOCK_SIGNER_PRIVATE_KEY=da5deb73dbc9dea2e3916929daaf079f75232d32a2cf37ff8b1f7140ef3fd9db
+BLOCK_SIGNER_ADDRESS=0x27770a9694e4B4b1E130Ab91Bc327C36855f612E
+BLOCK_SIGNER_PRIVATE_KEY_PASSWORD=pwd
+CHAIN_ID=66666
+DATADIR=/geth
+NETWORK_ID=66666
+NO_DISCOVER=true
+NO_USB=true
+GASPRICE=0
+GCMODE=archive
+ETH1_CTC_DEPLOYMENT_HEIGHT=13462029
+ETH1_L1_FEE_WALLET_ADDRESS=0x391716d440c151c42cdf1c95c1d83a5427bca52c
+ETH1_L1_CROSS_DOMAIN_MESSENGER_ADDRESS=0x25ace71c97B33Cc4729CF772ae268934F7ab5fA1
+ETH1_L1_ETH_GATEWAY_ADDRESS=0xe681F80966a8b1fFadECf8068bD6F99034791c95
+ETH1_L1_STANDARD_BRIDGE_ADDRESS=0x99C9fc46f92E8a1c0deC1b1747d010903E884bE1
+ETH1_SYNC_SERVICE_ENABLE=true
+L2GETH_GENESIS_URL=https://storage.googleapis.com/optimism/mainnet-trial/geth-init-input-v0.5.0-rc3.json
+L2GETH_GENESIS_URL_SHA256SUM=75d0df222d96e19c9f8f4aae478a05e34b793848eae23ab98cb40f3afd57dfef
+ROLLUP_ADDRESS_MANAGER_OWNER_ADDRESS=0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A
+ROLLUP_BACKEND=l2
+ROLLUP_CLIENT_HTTP=http://data-transport-layer:7878
+ROLLUP_DISABLE_TRANSFERS=false
+ROLLUP_ENABLE_L2_GAS_POLLING=false
+ROLLUP_GAS_PRICE_ORACLE_OWNER_ADDRESS=0x84f70449f90300997840eCb0918873745Ede7aE6
+ROLLUP_MAX_CALLDATA_SIZE=40000
+ROLLUP_POLL_INTERVAL_FLAG=1s
+ROLLUP_SYNC_SERVICE_ENABLE=true
+ROLLUP_TIMESTAMP_REFRESH=5m
+ROLLUP_VERIFIER_ENABLE=true
+RPC_ADDR=0.0.0.0
+RPC_API=eth,rollup,net,web3,debug
+RPC_CORS_DOMAIN=*
+RPC_ENABLE=true
+RPC_PORT=8545
+RPC_VHOSTS=*
+TARGET_GAS_LIMIT=11000000
+USING_OVM=true
+WS_ADDR=0.0.0.0
+WS_API=eth,rollup,net,web3,debug
+WS_ORIGINS=*
+WS=true

infra/op-replica/envs/mainnet-gen5-staging-1/replica-healthcheck.env

+REPLICA_HEALTHCHECK__ETH_NETWORK=mainnet
+REPLICA_HEALTHCHECK__L2GETH_IMAGE_TAG=0.4.8
+REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER=http://sequencer.default:8545
+REPLICA_HEALTHCHECK__ETH_REPLICA_RPC_PROVIDER=http://l2geth-replica:8545
\ No newline at end of file

infra/op-replica/envs/mainnet-gen5/check-for-chaindata.sh

+#!/bin/sh
+set -eou
+
+echo running "${0}"
+if [ -z "$DATADIR" ]; then
+    echo "Must pass DATADIR"
+    exit 1
+fi
+if [ -z "$BLOCK_SIGNER_PRIVATE_KEY" ]; then
+    echo "Must pass BLOCK_SIGNER_PRIVATE_KEY"
+    exit 1
+fi
+if [ -z "$BLOCK_SIGNER_PRIVATE_KEY_PASSWORD" ]; then
+    echo "Must pass BLOCK_SIGNER_PRIVATE_KEY_PASSWORD"
+    exit 1
+fi
+if [ -z "$L2GETH_GENESIS_URL" ]; then
+    echo "Must pass L2GETH_GENESIS_URL"
+    exit 1
+fi
+if [ -z "$L2GETH_GENESIS_URL_SHA256SUM" ]; then
+    echo "Must pass L2GETH_GENESIS_URL_SHA256SUM"
+    exit 1
+fi
+# Check for an existing chaindata folder.
+# If it exists, assume it's correct and skip geth init step
+GETH_CHAINDATA_DIR=$DATADIR/geth/chaindata
+
+if [ -d "$GETH_CHAINDATA_DIR" ]; then
+    echo "$GETH_CHAINDATA_DIR existing, skipping geth init"
+else
+    echo "$GETH_CHAINDATA_DIR missing, running geth init"
+    echo "Retrieving genesis file $L2GETH_GENESIS_URL"
+    TEMP_DIR=$(mktemp -d)
+    wget -O "$TEMP_DIR"/genesis.json "$L2GETH_GENESIS_URL"
+    GENESIS_SHA256SUM=$(sha256sum "$TEMP_DIR"/genesis.json | awk '{print $1}')
+    if [ "$GENESIS_SHA256SUM" != "$L2GETH_GENESIS_URL_SHA256SUM" ];then
+        echo GENESIS_SHA256SUM: "$GENESIS_SHA256SUM" != L2GETH_GENESIS_URL_SHA256SUM: "$L2GETH_GENESIS_URL_SHA256SUM"
+        exit 1
+    fi
+    echo checksums match
+    echo GENESIS_SHA256SUM: "$GENESIS_SHA256SUM" == L2GETH_GENESIS_URL_SHA256SUM: "$L2GETH_GENESIS_URL_SHA256SUM"
+    geth init \
+        --datadir=/"$DATADIR" \
+        "$TEMP_DIR"/genesis.json
+    echo geth init complete
+fi
+
+# Check for an existing keystore folder.
+# If it exists, assume it's correct and skip geth acount import step
+GETH_KEYSTORE_DIR=$DATADIR/keystore
+mkdir -p "$GETH_KEYSTORE_DIR"
+GETH_KEYSTORE_KEYS=$(find "$GETH_KEYSTORE_DIR" -type f)
+
+if [ ! -z "$GETH_KEYSTORE_KEYS" ]; then
+    echo "$GETH_KEYSTORE_KEYS exist, skipping account import if any keys are present"
+else
+    echo "$GETH_KEYSTORE_DIR missing, running account import"
+    echo -n "$BLOCK_SIGNER_PRIVATE_KEY_PASSWORD" > "$DATADIR"/password
+    echo -n "$BLOCK_SIGNER_PRIVATE_KEY" > "$DATADIR"/block-signer-key
+    geth account import \
+        --datadir=/"$DATADIR" \
+        --password "$DATADIR"/password \
+        "$DATADIR"/block-signer-key
+fi
+
+echo "l2geth setup complete"

infra/op-replica/envs/mainnet-gen5/data-transport-layer.env

+DATA_TRANSPORT_LAYER__ADDRESS_MANAGER=0xdE1FCfB0851916CA5101820A69b13a4E276bd81F
+DATA_TRANSPORT_LAYER__CONFIRMATIONS=12
+DATA_TRANSPORT_LAYER__DANGEROUSLY_CATCH_ALL_ERRORS=true
+DATA_TRANSPORT_LAYER__DB_PATH=/db
+DATA_TRANSPORT_LAYER__DEFAULT_BACKEND=l2
+DATA_TRANSPORT_LAYER__ENABLE_METRICS=true
+DATA_TRANSPORT_LAYER__ETH_NETWORK_NAME=mainnet
+DATA_TRANSPORT_LAYER__L1_GAS_PRICE_BACKEND=l2
+DATA_TRANSPORT_LAYER__L1_START_HEIGHT=13596466
+DATA_TRANSPORT_LAYER__L2_CHAIN_ID=10
+DATA_TRANSPORT_LAYER__LOGS_PER_POLLING_INTERVAL=2000
+DATA_TRANSPORT_LAYER__NODE_ENV=production
+DATA_TRANSPORT_LAYER__POLLING_INTERVAL=500
+DATA_TRANSPORT_LAYER__SENTRY_TRACE_RATE=0.05
+DATA_TRANSPORT_LAYER__SERVER_HOSTNAME=0.0.0.0
+DATA_TRANSPORT_LAYER__SERVER_PORT=7878
+DATA_TRANSPORT_LAYER__SYNC_FROM_L1=false
+DATA_TRANSPORT_LAYER__SYNC_FROM_L2=true
+DATA_TRANSPORT_LAYER__TRANSACTIONS_PER_POLLING_INTERVAL=1000
+DEPLOYER_HTTP=
+L1_NODE_WEB3_URL=http://failover-proxyd.default:8080

infra/op-replica/envs/mainnet-gen5/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+configMapGenerator:
+  - name: data-transport-layer
+    envs:
+      - ./data-transport-layer.env
+  - name: l2geth-replica
+    envs:
+      - ./l2geth-replica.env
+  - name: replica-healthcheck
+    envs:
+      - ./replica-healthcheck.env
+  - name: geth-scripts
+    files:
+      - ./check-for-chaindata.sh
\ No newline at end of file

infra/op-replica/envs/mainnet-gen5/l2geth-replica.env

+CHAIN_ID=10
+DATADIR=/geth
+NETWORK_ID=10
+NO_DISCOVER=true
+NO_USB=true
+GASPRICE=0
+GCMODE=archive
+BLOCK_SIGNER_ADDRESS=0x00000398232E2064F896018496b4b44b3D62751F
+BLOCK_SIGNER_PRIVATE_KEY=6587ae678cf4fc9a33000cdbf9f35226b71dcc6a4684a31203241f9bcfd55d27
+BLOCK_SIGNER_PRIVATE_KEY_PASSWORD=pwd
+ETH1_CTC_DEPLOYMENT_HEIGHT=13596466
+ETH1_L1_FEE_WALLET_ADDRESS=0x391716d440c151c42cdf1c95c1d83a5427bca52c
+ETH1_L1_CROSS_DOMAIN_MESSENGER_ADDRESS=0x25ace71c97B33Cc4729CF772ae268934F7ab5fA1
+ETH1_L1_STANDARD_BRIDGE_ADDRESS=0x99C9fc46f92E8a1c0deC1b1747d010903E884bE1
+ETH1_SYNC_SERVICE_ENABLE=true
+L2GETH_GENESIS_URL=https://storage.googleapis.com/optimism/mainnet/genesis-v0.5.0.json
+L2GETH_GENESIS_URL_SHA256SUM=361ff81fff4cc71e5f0bf43b0b982f5cfd08d068f730b9a61516fe1fa8fd914a
+ROLLUP_ADDRESS_MANAGER_OWNER_ADDRESS=0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A
+ROLLUP_BACKEND=l2
+ROLLUP_CLIENT_HTTP=http://data-transport-layer:7878
+ROLLUP_DISABLE_TRANSFERS=false
+ROLLUP_ENABLE_L2_GAS_POLLING=false
+ROLLUP_GAS_PRICE_ORACLE_OWNER_ADDRESS=0x7107142636C85c549690b1Aca12Bdb8052d26Ae6
+ROLLUP_MAX_CALLDATA_SIZE=40000
+ROLLUP_POLL_INTERVAL_FLAG=1s
+ROLLUP_SYNC_SERVICE_ENABLE=true
+ROLLUP_TIMESTAMP_REFRESH=5m
+ROLLUP_VERIFIER_ENABLE=true
+RPC_ADDR=0.0.0.0
+RPC_API=eth,rollup,net,web3,debug
+RPC_CORS_DOMAIN=*
+RPC_ENABLE=true
+RPC_PORT=8545
+RPC_VHOSTS=*
+TARGET_GAS_LIMIT=15000000
+USING_OVM=true
+WS_ADDR=0.0.0.0
+WS_API=eth,rollup,net,web3,debug
+WS_ORIGINS=*
+WS=true

infra/op-replica/envs/mainnet-gen5/replica-healthcheck.env

+REPLICA_HEALTHCHECK__ETH_NETWORK=mainnet
+REPLICA_HEALTHCHECK__L2GETH_IMAGE_TAG=0.5.0-rc3
+REPLICA_HEALTHCHECK__ETH_REPLICA_RPC_PROVIDER=http://l2geth-replica:8545
\ No newline at end of file

infra/op-replica/envs/mainnet-l1/data-transport-layer.env

+DATA_TRANSPORT_LAYER__ADDRESS_MANAGER=0xdE1FCfB0851916CA5101820A69b13a4E276bd81F
+DATA_TRANSPORT_LAYER__CONFIRMATIONS=12
+DATA_TRANSPORT_LAYER__DANGEROUSLY_CATCH_ALL_ERRORS=true
+DATA_TRANSPORT_LAYER__DB_PATH=/db
+DATA_TRANSPORT_LAYER__DEFAULT_BACKEND=l1
+DATA_TRANSPORT_LAYER__ENABLE_METRICS=true
+DATA_TRANSPORT_LAYER__ETH_NETWORK_NAME=mainnet
+DATA_TRANSPORT_LAYER__L1_GAS_PRICE_BACKEND=l1
+DATA_TRANSPORT_LAYER__L2_CHAIN_ID=10
+DATA_TRANSPORT_LAYER__LOGS_PER_POLLING_INTERVAL=2000
+DATA_TRANSPORT_LAYER__NODE_ENV=production
+DATA_TRANSPORT_LAYER__POLLING_INTERVAL=500
+DATA_TRANSPORT_LAYER__SENTRY_TRACE_RATE=0.05
+DATA_TRANSPORT_LAYER__SERVER_HOSTNAME=0.0.0.0
+DATA_TRANSPORT_LAYER__SERVER_PORT=7878
+DATA_TRANSPORT_LAYER__SYNC_FROM_L1=true
+DATA_TRANSPORT_LAYER__SYNC_FROM_L2=false
+DATA_TRANSPORT_LAYER__L1_START_HEIGHT=13596466
+DATA_TRANSPORT_LAYER__TRANSACTIONS_PER_POLLING_INTERVAL=1000
+DEPLOYER_HTTP=

infra/op-replica/envs/mainnet-l1/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+configMapGenerator:
+  - name: data-transport-layer
+    envs:
+      - ./data-transport-layer.env
+  - name: l2geth-replica
+    envs:
+      - ./l2geth-replica.env
+  - name: replica-healthcheck
+    envs:
+      - ./replica-healthcheck.env

infra/op-replica/envs/mainnet-l1/l2geth-replica.env

+CHAIN_ID=10
+DATADIR=/geth
+NETWORK_ID=10
+NO_DISCOVER=true
+NO_USB=true
+GASPRICE=0
+GCMODE=archive
+BLOCK_SIGNER_ADDRESS=0x00000398232E2064F896018496b4b44b3D62751F
+BLOCK_SIGNER_PRIVATE_KEY=6587ae678cf4fc9a33000cdbf9f35226b71dcc6a4684a31203241f9bcfd55d27
+BLOCK_SIGNER_PRIVATE_KEY_PASSWORD=pwd
+ETH1_CTC_DEPLOYMENT_HEIGHT=13596466
+ETH1_L1_FEE_WALLET_ADDRESS=0x391716d440c151c42cdf1c95c1d83a5427bca52c
+ETH1_L1_CROSS_DOMAIN_MESSENGER_ADDRESS=0x25ace71c97B33Cc4729CF772ae268934F7ab5fA1
+ETH1_L1_STANDARD_BRIDGE_ADDRESS=0x99C9fc46f92E8a1c0deC1b1747d010903E884bE1
+ETH1_SYNC_SERVICE_ENABLE=true
+L2GETH_GENESIS_URL=https://storage.googleapis.com/optimism/mainnet/genesis-v0.5.0.json
+L2GETH_GENESIS_URL_SHA256SUM=361ff81fff4cc71e5f0bf43b0b982f5cfd08d068f730b9a61516fe1fa8fd914a
+ROLLUP_ADDRESS_MANAGER_OWNER_ADDRESS=0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A
+ROLLUP_BACKEND=l1
+ROLLUP_CLIENT_HTTP=http://data-transport-layer:7878
+ROLLUP_DISABLE_TRANSFERS=false
+ROLLUP_ENABLE_L2_GAS_POLLING=false
+ROLLUP_GAS_PRICE_ORACLE_OWNER_ADDRESS=0x648E3e8101BFaB7bf5997Bd007Fb473786019159
+ROLLUP_MAX_CALLDATA_SIZE=40000
+ROLLUP_POLL_INTERVAL_FLAG=1s
+ROLLUP_SYNC_SERVICE_ENABLE=true
+ROLLUP_TIMESTAMP_REFRESH=5m
+ROLLUP_VERIFIER_ENABLE=true
+RPC_ADDR=0.0.0.0
+RPC_API=eth,rollup,net,web3,debug
+RPC_CORS_DOMAIN=*
+RPC_ENABLE=true
+RPC_PORT=8545
+RPC_VHOSTS=*
+TARGET_GAS_LIMIT=15000000
+USING_OVM=true
+WS_ADDR=0.0.0.0
+WS_API=eth,rollup,net,web3,debug
+WS_ORIGINS=*
+WS=true

infra/op-replica/envs/mainnet-l1/replica-healthcheck.env

+REPLICA_HEALTHCHECK__ETH_NETWORK=mainnet
+REPLICA_HEALTHCHECK__L2GETH_IMAGE_TAG=0.4.8
+REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER=http://sequencer.default:8545
+REPLICA_HEALTHCHECK__ETH_REPLICA_RPC_PROVIDER=http://l2geth-replica:8545
\ No newline at end of file

infra/op-replica/envs/mainnet-staging-1/data-transport-layer.env

+DATA_TRANSPORT_LAYER__ADDRESS_MANAGER=0xdE1FCfB0851916CA5101820A69b13a4E276bd81F
+DATA_TRANSPORT_LAYER__CONFIRMATIONS=12
+DATA_TRANSPORT_LAYER__DANGEROUSLY_CATCH_ALL_ERRORS=true
+DATA_TRANSPORT_LAYER__DB_PATH=/db
+DATA_TRANSPORT_LAYER__DEFAULT_BACKEND=l2
+DATA_TRANSPORT_LAYER__ENABLE_METRICS=true
+DATA_TRANSPORT_LAYER__ETH_NETWORK_NAME=mainnet
+DATA_TRANSPORT_LAYER__L1_GAS_PRICE_BACKEND=l2
+DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT=http://hardhat-fork.hardhat-fork-mainnet-13462000:8545
+DATA_TRANSPORT_LAYER__L2_CHAIN_ID=66666
+DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT=http://sequencer.default:8545
+DATA_TRANSPORT_LAYER__LOGS_PER_POLLING_INTERVAL=2000
+DATA_TRANSPORT_LAYER__NODE_ENV=production
+DATA_TRANSPORT_LAYER__POLLING_INTERVAL=500
+DATA_TRANSPORT_LAYER__SENTRY_TRACE_RATE=0.05
+DATA_TRANSPORT_LAYER__SERVER_HOSTNAME=0.0.0.0
+DATA_TRANSPORT_LAYER__SERVER_PORT=7878
+DATA_TRANSPORT_LAYER__SYNC_FROM_L1=false
+DATA_TRANSPORT_LAYER__SYNC_FROM_L2=true
+DATA_TRANSPORT_LAYER__TRANSACTIONS_PER_POLLING_INTERVAL=1000
+DEPLOYER_HTTP=
+L1_NODE_WEB3_URL=http://hardhat-fork.hardhat-fork-mainnet-13462000:8545

infra/op-replica/envs/mainnet-staging-1/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+configMapGenerator:
+  - name: data-transport-layer
+    envs:
+      - ./data-transport-layer.env
+  - name: l2geth-replica
+    envs:
+      - ./l2geth-replica.env
+  - name: replica-healthcheck
+    envs:
+      - ./replica-healthcheck.env

infra/op-replica/envs/mainnet-staging-1/l2geth-replica.env

+CHAIN_ID=66666
+DATADIR=/geth
+NETWORK_ID=66666
+NO_DISCOVER=true
+NO_USB=true
+GASPRICE=0
+GCMODE=archive
+BLOCK_SIGNER_ADDRESS=0x27770a9694e4B4b1E130Ab91Bc327C36855f612E
+BLOCK_SIGNER_PRIVATE_KEY=da5deb73dbc9dea2e3916929daaf079f75232d32a2cf37ff8b1f7140ef3fd9db
+BLOCK_SIGNER_PRIVATE_KEY_PASSWORD=pwd
+ETH1_CTC_DEPLOYMENT_HEIGHT=13462029
+ETH1_L1_FEE_WALLET_ADDRESS=0x391716d440c151c42cdf1c95c1d83a5427bca52c
+ETH1_L1_CROSS_DOMAIN_MESSENGER_ADDRESS=0x25ace71c97B33Cc4729CF772ae268934F7ab5fA1
+ETH1_L1_STANDARD_BRIDGE_ADDRESS=0x99C9fc46f92E8a1c0deC1b1747d010903E884bE1
+ETH1_SYNC_SERVICE_ENABLE=true
+L2GETH_GENESIS_URL=https://storage.googleapis.com/optimism/mainnet-trial/geth-init-input-v0.5.0-rc3.json
+ROLLUP_ADDRESS_MANAGER_OWNER_ADDRESS=0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A
+ROLLUP_BACKEND=l2
+ROLLUP_CLIENT_HTTP=http://data-transport-layer:7878
+ROLLUP_DISABLE_TRANSFERS=false
+ROLLUP_ENABLE_L2_GAS_POLLING=false
+ROLLUP_GAS_PRICE_ORACLE_OWNER_ADDRESS=0x84f70449f90300997840eCb0918873745Ede7aE6
+ROLLUP_MAX_CALLDATA_SIZE=40000
+ROLLUP_POLL_INTERVAL_FLAG=1s
+ROLLUP_SYNC_SERVICE_ENABLE=true
+ROLLUP_TIMESTAMP_REFRESH=5m
+ROLLUP_VERIFIER_ENABLE=true
+RPC_ADDR=0.0.0.0
+RPC_API=eth,rollup,net,web3,debug
+RPC_CORS_DOMAIN=*
+RPC_ENABLE=true
+RPC_PORT=8545
+RPC_VHOSTS=*
+TARGET_GAS_LIMIT=11000000
+USING_OVM=true
+WS_ADDR=0.0.0.0
+WS_API=eth,rollup,net,web3,debug
+WS_ORIGINS=*
+WS=true

infra/op-replica/envs/mainnet-staging-1/replica-healthcheck.env

+REPLICA_HEALTHCHECK__ETH_NETWORK=mainnet
+REPLICA_HEALTHCHECK__L2GETH_IMAGE_TAG=0.5.0-rc3
+REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER=http://sequencer.default:8545
+REPLICA_HEALTHCHECK__ETH_REPLICA_RPC_PROVIDER=http://l2geth-replica:8545
\ No newline at end of file

infra/op-replica/envs/mainnet-staging-2/data-transport-layer.env

+DATA_TRANSPORT_LAYER__ADDRESS_MANAGER=0xdE1FCfB0851916CA5101820A69b13a4E276bd81F
+DATA_TRANSPORT_LAYER__CONFIRMATIONS=12
+DATA_TRANSPORT_LAYER__DANGEROUSLY_CATCH_ALL_ERRORS=true
+DATA_TRANSPORT_LAYER__DB_PATH=/db
+DATA_TRANSPORT_LAYER__DEFAULT_BACKEND=l2
+DATA_TRANSPORT_LAYER__ENABLE_METRICS=true
+DATA_TRANSPORT_LAYER__ETH_NETWORK_NAME=mainnet
+DATA_TRANSPORT_LAYER__L1_GAS_PRICE_BACKEND=l2
+DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT=http://hardhat-fork.mainnet-staging2-l1-13558000:8545
+DATA_TRANSPORT_LAYER__L2_CHAIN_ID=77777
+DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT=http://sequencer.default:8545
+DATA_TRANSPORT_LAYER__LOGS_PER_POLLING_INTERVAL=2000
+DATA_TRANSPORT_LAYER__NODE_ENV=production
+DATA_TRANSPORT_LAYER__POLLING_INTERVAL=500
+DATA_TRANSPORT_LAYER__SENTRY_TRACE_RATE=0.05
+DATA_TRANSPORT_LAYER__SERVER_HOSTNAME=0.0.0.0
+DATA_TRANSPORT_LAYER__SERVER_PORT=7878
+DATA_TRANSPORT_LAYER__SYNC_FROM_L1=false
+DATA_TRANSPORT_LAYER__SYNC_FROM_L2=true
+DATA_TRANSPORT_LAYER__TRANSACTIONS_PER_POLLING_INTERVAL=1000
+DEPLOYER_HTTP=
+L1_NODE_WEB3_URL=http://hardhat-fork.mainnet-staging2-l1-13558000:8545

infra/op-replica/envs/mainnet-staging-2/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+configMapGenerator:
+  - name: data-transport-layer
+    envs:
+      - ./data-transport-layer.env
+  - name: l2geth-replica
+    envs:
+      - ./l2geth-replica.env
+  - name: replica-healthcheck
+    envs:
+      - ./replica-healthcheck.env

infra/op-replica/envs/mainnet-staging-2/l2geth-replica.env

+CHAIN_ID=77777
+DATADIR=/geth
+NETWORK_ID=77777
+NO_DISCOVER=true
+NO_USB=true
+GASPRICE=0
+GCMODE=archive
+BLOCK_SIGNER_ADDRESS=0x27770a9694e4B4b1E130Ab91Bc327C36855f612E
+BLOCK_SIGNER_PRIVATE_KEY=da5deb73dbc9dea2e3916929daaf079f75232d32a2cf37ff8b1f7140ef3fd9db
+BLOCK_SIGNER_PRIVATE_KEY_PASSWORD=pwd
+ETH1_CTC_DEPLOYMENT_HEIGHT=13558005
+ETH1_L1_FEE_WALLET_ADDRESS=0xB79f76EF2c5F0286176833E7B2eEe103b1CC3244
+ETH1_L1_CROSS_DOMAIN_MESSENGER_ADDRESS=0x25ace71c97B33Cc4729CF772ae268934F7ab5fA1
+ETH1_L1_STANDARD_BRIDGE_ADDRESS=0x99C9fc46f92E8a1c0deC1b1747d010903E884bE1
+ETH1_SYNC_SERVICE_ENABLE=true
+L2GETH_GENESIS_URL=https://storage.googleapis.com/optimism/mainnet-trial-2/v0.5.0-rc3.json
+ROLLUP_ADDRESS_MANAGER_OWNER_ADDRESS=0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A
+ROLLUP_BACKEND=l2
+ROLLUP_CLIENT_HTTP=http://data-transport-layer:7878
+ROLLUP_DISABLE_TRANSFERS=false
+ROLLUP_ENABLE_L2_GAS_POLLING=false
+ROLLUP_GAS_PRICE_ORACLE_OWNER_ADDRESS=0x84f70449f90300997840eCb0918873745Ede7aE6
+ROLLUP_MAX_CALLDATA_SIZE=40000
+ROLLUP_POLL_INTERVAL_FLAG=1s
+ROLLUP_SYNC_SERVICE_ENABLE=true
+ROLLUP_TIMESTAMP_REFRESH=5m
+ROLLUP_VERIFIER_ENABLE=true
+RPC_ADDR=0.0.0.0
+RPC_API=eth,rollup,net,web3,debug
+RPC_CORS_DOMAIN=*
+RPC_ENABLE=true
+RPC_PORT=8545
+RPC_VHOSTS=*
+TARGET_GAS_LIMIT=15000000
+USING_OVM=true
+WS_ADDR=0.0.0.0
+WS_API=eth,rollup,net,web3,debug
+WS_ORIGINS=*
+WS=true

infra/op-replica/envs/mainnet-staging-2/replica-healthcheck.env

+REPLICA_HEALTHCHECK__ETH_NETWORK=mainnet
+REPLICA_HEALTHCHECK__L2GETH_IMAGE_TAG=0.5.0-rc3
+REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER=http://sequencer.default:8545
+REPLICA_HEALTHCHECK__ETH_REPLICA_RPC_PROVIDER=http://l2geth-replica:8545
\ No newline at end of file

infra/op-replica/envs/mainnet/data-transport-layer.env

+DATA_TRANSPORT_LAYER__ADDRESS_MANAGER=0xdE1FCfB0851916CA5101820A69b13a4E276bd81F
+DATA_TRANSPORT_LAYER__CONFIRMATIONS=12
+DATA_TRANSPORT_LAYER__DANGEROUSLY_CATCH_ALL_ERRORS=true
+DATA_TRANSPORT_LAYER__DB_PATH=/db
+DATA_TRANSPORT_LAYER__DEFAULT_BACKEND=l2
+DATA_TRANSPORT_LAYER__ENABLE_METRICS=true
+DATA_TRANSPORT_LAYER__ETH_NETWORK_NAME=mainnet
+DATA_TRANSPORT_LAYER__L1_GAS_PRICE_BACKEND=l2
+DATA_TRANSPORT_LAYER__L2_CHAIN_ID=10
+DATA_TRANSPORT_LAYER__LOGS_PER_POLLING_INTERVAL=2000
+DATA_TRANSPORT_LAYER__NODE_ENV=production
+DATA_TRANSPORT_LAYER__POLLING_INTERVAL=500
+DATA_TRANSPORT_LAYER__SENTRY_TRACE_RATE=0.05
+DATA_TRANSPORT_LAYER__SERVER_HOSTNAME=0.0.0.0
+DATA_TRANSPORT_LAYER__SERVER_PORT=7878
+DATA_TRANSPORT_LAYER__SYNC_FROM_L1=false
+DATA_TRANSPORT_LAYER__SYNC_FROM_L2=true
+DATA_TRANSPORT_LAYER__TRANSACTIONS_PER_POLLING_INTERVAL=1000
+DEPLOYER_HTTP=

infra/op-replica/envs/mainnet/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+configMapGenerator:
+  - name: data-transport-layer
+    envs:
+      - ./data-transport-layer.env
+  - name: l2geth-replica
+    envs:
+      - ./l2geth-replica.env
+  - name: replica-healthcheck
+    envs:
+      - ./replica-healthcheck.env

infra/op-replica/envs/mainnet/l2geth-replica.env

+CHAIN_ID=10
+DATADIR=/geth
+NETWORK_ID=10
+NO_DISCOVER=true
+NO_USB=true
+GASPRICE=0
+GCMODE=archive
+BLOCK_SIGNER_ADDRESS=0x00000398232E2064F896018496b4b44b3D62751F
+BLOCK_SIGNER_PRIVATE_KEY=6587ae678cf4fc9a33000cdbf9f35226b71dcc6a4684a31203241f9bcfd55d27
+BLOCK_SIGNER_PRIVATE_KEY_PASSWORD=pwd
+ETH1_CTC_DEPLOYMENT_HEIGHT=13596466
+ETH1_L1_FEE_WALLET_ADDRESS=0x391716d440c151c42cdf1c95c1d83a5427bca52c
+ETH1_L1_CROSS_DOMAIN_MESSENGER_ADDRESS=0x25ace71c97B33Cc4729CF772ae268934F7ab5fA1
+ETH1_L1_STANDARD_BRIDGE_ADDRESS=0x99C9fc46f92E8a1c0deC1b1747d010903E884bE1
+ETH1_SYNC_SERVICE_ENABLE=true
+L2GETH_GENESIS_URL=https://storage.googleapis.com/optimism/mainnet/genesis-berlin.json
+L2GETH_GENESIS_HASH=0x106b0a3247ca54714381b1109e82cc6b7e32fd79ae56fbcc2e7b1541122f84ea
+L2GETH_BERLIN_ACTIVATION_HEIGHT=3950000
+ROLLUP_ADDRESS_MANAGER_OWNER_ADDRESS=0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A
+ROLLUP_BACKEND=l2
+ROLLUP_CLIENT_HTTP=http://data-transport-layer:7878
+ROLLUP_DISABLE_TRANSFERS=false
+ROLLUP_ENABLE_L2_GAS_POLLING=false
+ROLLUP_GAS_PRICE_ORACLE_OWNER_ADDRESS=0x648E3e8101BFaB7bf5997Bd007Fb473786019159
+ROLLUP_MAX_CALLDATA_SIZE=40000
+ROLLUP_POLL_INTERVAL_FLAG=1s
+ROLLUP_SYNC_SERVICE_ENABLE=true
+ROLLUP_TIMESTAMP_REFRESH=5m
+ROLLUP_VERIFIER_ENABLE=true
+RPC_ADDR=0.0.0.0
+RPC_API=eth,rollup,net,web3,debug
+RPC_CORS_DOMAIN=*
+RPC_ENABLE=true
+RPC_PORT=8545
+RPC_VHOSTS=*
+TARGET_GAS_LIMIT=15000000
+USING_OVM=true
+WS_ADDR=0.0.0.0
+WS_API=eth,rollup,net,web3,debug
+WS_ORIGINS=*
+WS=true

infra/op-replica/envs/mainnet/replica-healthcheck.env

+REPLICA_HEALTHCHECK__ETH_NETWORK=mainnet
+REPLICA_HEALTHCHECK__L2GETH_IMAGE_TAG=0.4.8
+REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER=http://sequencer.default:8545
+REPLICA_HEALTHCHECK__ETH_REPLICA_RPC_PROVIDER=http://l2geth-replica:8545
\ No newline at end of file

infra/op-replica/kustomize/README-kovan-replica-deploy.md

+# kovan-replica-deploy
+
+## Prerequisites
+
+- `kubectl` **Minimum version v1.20** [Install notes](https://kubernetes.io/docs/tasks/tools/install-kubectl-linux/#install-kubectl-on-linux)
+- `kind` from a recent [kind release](https://github.com/kubernetes-sigs/kind/releases)
+- Docker
+
+## Create a cluster
+
+```
+kind create cluster --name kovan-replica
+```
+
+## Create the target namespace
+
+```
+kubectl create ns kovan-replica
+```
+
+## Diff and Apply
+
+```
+kubectl diff -k kustomize/replica/overlays/kind-kovan-replica/
+kubectl apply -k kustomize/replica/overlays/kind-kovan-replica/
+```
+## Watch the pods start
+
+```
+kubectl -n kovan-replica get pods -w
+```
+
+### Watch the logs
+```
+kubectl -n kovan-replica logs -f l2geth-replica-0
+```
+
+### Check the replica status
+```
+kubectl logs -f -l app=replica-healthcheck
+```

infra/op-replica/kustomize/README-kovan-replica.md

+# kovan-replica
+
+This README covers the features used in the [kovan replica overlay](./overlays/kovan-replica-0-4-3/kustomization.yaml)
+
+The first 2 lines are required to be a valid kustomzation target and describe how the file will be processed.
+
+```
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+```
+---
+
+The next line is a global namespace setting. This namespace will apply to, and override, the namespace on **all** generated resources.
+
+This makes it very safe as you know the namespace affected by a deployment! But, can't always be used if you need to deploy to multiple namespaces. In that case the namespace can be applied by a referenced kustomization.
+
+```
+namespace: kovan-replica-0-4-3
+```
+---
+
+Next we list the base resources we want to include in this overlay. Since we don't need all the components, we'll select the relevant directories.
+
+```
+resources:
+  - ../../bases/data-transport-layer
+  - ../../bases/l2geth-replica
+  - ../../bases/configmaps
+  - ../../bases/servicemonitors
+  - ../../bases/replica-healthcheck
+```
+
+In addition to the base resources, we also need to create some specific to this overlay.
+
+```
+ - ./l2geth-volume.yaml
+```
+
+Kustomize will add these overlay resources to the build output.
+
+----
+
+The next feature is a `configMapGenerator`. A generator will collect the data from the files (in this case environmental files) and create a configMap with the contents.
+
+**Generators also apply a hash to the configMap** to track changes! You don't have to worry too much about this as the process is automatic and kustomize updates the resources that reference the configMap with the hashed name.
+
+```
+configMapGenerator:
+ - name: data-transport-layer
+   envs:
+     - replica-data-transport-layer.env
+ - name: l2geth-replica
+   envs:
+     - replica-l2geth.env
+```
+
+This is nice because the files can stay in their native format and allows CI to check files for validity. For example you can run `shellcheck` on scripts that get included in configMaps.
+
+---
+
+Next are the image replacements. You can simply identify a target image you want to replace, provide a new image name and tag. Anywhere that image is found, it's replaced with the overlay setting.
+
+```
+images:
+ - name: ethereumoptimism/data-transport-layer
+   newName: ethereumoptimism/data-transport-layer
+   newTag: 0.4.3
+ - name: ethereumoptimism/l2geth
+   newName: ethereumoptimism/l2geth
+   newTag: 0.4.3
+```
+
+---
+
+Now we start patching the resources. If you just want to override something, the `patchesStrategicMerge` feature is pretty simple. In the patch file you define the path to the values you want to replace
+
+(kustomization.yaml)
+```
+patchesStrategicMerge:
+ - patch-l2geth-resources.yaml
+```
+(patch-l2geth-resources.yaml)
+```
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+ name: l2geth-replica
+spec:
+ template:
+   spec:
+     containers:
+       - name: l2geth-replica
+         resources:
+           limits:
+             memory: 6Gi
+           requests:
+             memory: 6Gi
+```
+
+In this way we can easily update keys with brand new settings.
+
+But, this method will not work if you want to add or replace a list item.
+
+In these cases we define a target for the patch and a definition of the modification.
+
+(kustomization.yaml)
+```
+patches:
+ - path: patch-l2geth-volumes.yaml
+   target:
+     group: apps
+     version: v1
+     kind: StatefulSet
+     name: l2geth-replica
+```
+(patch-l2geth-volumes.yaml)
+```
+- op: replace
+ path: /spec/template/spec/volumes/2
+ value:
+   name: l2geth-replica-data
+   persistentVolumeClaim:
+     claimName: l2geth-replica-data
+```
+
+This patch acts on the StatefuleSet `l2geth-replica` and replaces the 3rd volume with a `persistentVolumeClaim`.
+
+We define the `persistentVolumeClaim` as a local resource in `l2geth-volume.yaml`

infra/op-replica/kustomize/README.md

+# Kustomize kubernetes deployments
+
+[Kustomize](https://kustomize.io/) is a way to build custom kubernetes manifests in a template-free way.
+
+This directory describes how to build and deploy Optimistic Ethereum software to a kubernetes cluster.
+
+## Prerequisits
+
+- `kubectl` **Minimum version v1.20** [Install notes](https://kubernetes.io/docs/tasks/tools/install-kubectl-linux/#install-kubectl-on-linux)
+- a kubernetes cluster
+
+## Structure
+
+The kustomization starts from a folder in `./bases`. Directories under `bases` should describe components in their most generic form. It is possible to deploy directly from a `bases` directory if no resource modification is needed.
+
+The other folders are "overlays", or configuration that will modify resources defined in `bases`.
+
+## Kustomizing with a new overlay
+
+Kustomize build resources based on `kustomization.yaml` files.
+
+To create a new overlay, create a new directory with a new `kustomization.yaml` file that refers to the base resources to target.
+
+Add any global modifers, the base resources to target and any modifications. **A valid base target is any directory with a `kustomization.yaml` file**.
+
+See a detailed description of a kovan replica [here](./README-kovan-replica.md)
+
+## Building
+
+`kustomize` can be run in 2 different way, with the built in `kubectl` flag or using the stand alone binary. **The binary should be used for this repository** as the `kubectl` releases are lagging on the `envs` feature.
+
+Using kubectl with the `-k` flag and a target directory will build and diff or apply the generated manifests.
+
+```
+kubectl diff -k ./bases/configmaps/
+kubectl apply -k ./bases/configmaps/
+```
+
+Using a `kustomize` binary release, we simplay build the manifests and pipe them to `kubectl` on STDIN.
+
+```
+kustomize build ./bases/configmaps/ | kubectl diff -f -
+kustomize build ./bases/configmaps/ | kubectl apply -f -
+```
+
+## Example deployment
+
+See [./README-kovan-replica-deploy.md](README-kovan-replica-deploy.md)

infra/op-replica/kustomize/bases/data-transport-layer/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - statefulset.yaml
+  - service.yaml
+commonLabels:
+  app: data-transport-layer

infra/op-replica/kustomize/bases/data-transport-layer/service.yaml

+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: data-transport-layer
+spec:
+  ports:
+    - name: http
+      port: 7878
+      protocol: TCP
+      targetPort: 7878
+  selector:
+    app: data-transport-layer
+  type: ClusterIP

infra/op-replica/kustomize/bases/data-transport-layer/statefulset.yaml

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: data-transport-layer
+spec:
+  replicas: 1
+  serviceName: data-transport-layer
+  template:
+    spec:
+      terminationGracePeriodSeconds: 10
+      restartPolicy: Always
+      initContainers:
+      - name: wait-for-l1
+        image: nicolaka/netshoot
+        command: ['bash', '-c', '/script/wait/wait-for-l1.sh']
+        volumeMounts:
+          - name: wait-scripts
+            mountPath: /script/wait
+        envFrom:
+          - configMapRef:
+              name: data-transport-layer
+          # - configMapRef:
+          #     name: data-transport-layer-incluster
+      containers:
+      - name: data-transport-layer
+        image: ethereumoptimism/data-transport-layer
+        imagePullPolicy: Always
+        envFrom:
+          - configMapRef:
+              name: data-transport-layer
+          # - configMapRef:
+          #     name: data-transport-layer-incluster
+        ports:
+          - containerPort: 7878
+            protocol: TCP
+        volumeMounts:
+          - name: liveliness-script
+            mountPath: /script/liveliness
+          - name: data-transport-layer
+            mountPath: /db
+        livenessProbe:
+          exec:
+            command:
+              - /script/liveliness/test.sh
+              - data-transport-layer.js
+          initialDelaySeconds: 15
+          periodSeconds: 10
+        resources: {}
+      volumes:
+        - name: data-transport-layer
+          emptyDir: {}
+        - name: liveliness-script
+          configMap:
+            name: liveliness-script
+            defaultMode: 0777
+        - name: wait-scripts
+          configMap:
+            name: wait-scripts
+            defaultMode: 0777

infra/op-replica/kustomize/bases/eth-watcher/deployment.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: eth-watcher
+  labels:
+    app: eth-watcher
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: eth-watcher
+    spec:
+      serviceAccountName: replica-operator
+      containers:
+        - name: eth-watcher
+          image: ethereumoptimism/eth-watcher
+          command:
+            - eth-watcher
+          env:
+            - name: GETH_URL
+              value: http://l2geth-replica:8545
+            - name: STOP_HEIGHT
+              value: "1561000"
+            - name: NAMESPACE
+              value: kovan-replica-0-4-14
+          resources:
+            limits:
+              memory: 256Mi
+              cpu: 512m
+            requests:
+              memory: 128Mi
+              cpu: 256m

infra/op-replica/kustomize/bases/eth-watcher/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ./deployment.yaml
+  - ./serviceaccount.yaml

infra/op-replica/kustomize/bases/eth-watcher/serviceaccount.yaml

+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: replica-operator
+---
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: replica-operator
+rules:
+  - apiGroups: ["apps"]
+    resources: ["statefulsets"]
+    verbs: ["get","list","watch","create","update","patch","delete"]
+  - apiGroups: ["apps"]
+    resources: ["statefulsets/scale"]
+    verbs: ["get","list","watch","create","update","patch"]
+  - apiGroups: [""]
+    resources: ["pods"]
+    verbs: ["get", "list", "exec"]
+---
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: replica-operator
+roleRef:
+  apiGroup: ""
+  name: replica-operator
+  kind: Role
+subjects:
+  - apiGroup: ""
+    kind: ServiceAccount
+    name: replica-operator
\ No newline at end of file

infra/op-replica/kustomize/bases/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ./batch-submitter
+  - ./data-transport-layer
+  - ./failover-proxy
+  - ./sequencer
+  - ./configmaps

infra/op-replica/kustomize/bases/l2geth-replica/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - statefulset.yaml
+  - service.yaml
+commonLabels:
+  app: l2geth-replica

infra/op-replica/kustomize/bases/l2geth-replica/service.yaml

+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: l2geth-replica
+spec:
+  selector:
+    app: l2geth-replica
+  type: ClusterIP
+  ports:
+    - name: rpc
+      port: 8545
+    - name: websocket
+      port: 8546
\ No newline at end of file

infra/op-replica/kustomize/bases/l2geth-replica/statefulset.yaml

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: l2geth-replica
+spec:
+  replicas: 1
+  serviceName: l2geth-replica
+  template:
+    spec:
+      terminationGracePeriodSeconds: 10
+      restartPolicy: Always
+      initContainers:
+        - name: geth-init
+          image: ethereumoptimism/l2geth
+          command:
+            - sh
+            - -c
+            - /geth-scripts/check-for-chaindata.sh
+          envFrom:
+            - configMapRef:
+                name: l2geth-replica
+          volumeMounts:
+            - name: geth-scripts
+              mountPath: /geth-scripts
+            - name: l2geth-replica-data
+              mountPath: /geth
+        - name: wait-for-dtl
+          image: nicolaka/netshoot
+          command: ['bash', '-c', '/script/wait/wait-for-dtl.sh']
+          envFrom:
+            - configMapRef:
+                name: l2geth-replica
+          volumeMounts:
+          - name: wait-scripts
+            mountPath: /script/wait
+      containers:
+      - name: l2geth-replica
+        image: ethereumoptimism/l2geth
+        command:
+          - geth
+          - --datadir=$(DATADIR)
+          - --password=$(DATADIR)/password
+          - --allow-insecure-unlock
+          - --unlock=$(BLOCK_SIGNER_ADDRESS)
+          - --mine
+          - --miner.etherbase=$(BLOCK_SIGNER_ADDRESS)
+          - --metrics
+          - --metrics.influxdb
+          - --metrics.influxdb.endpoint=http://influxdb.monitoring:8086
+          - --metrics.influxdb.database=$(NAMESPACE)
+        imagePullPolicy: IfNotPresent
+        ports:
+          - containerPort: 8545
+            protocol: TCP
+          - containerPort: 8546
+            protocol: TCP
+        resources: {}
+        env:
+          - name: NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
+        envFrom:
+          - configMapRef:
+              name: l2geth-replica
+        volumeMounts:
+          - name: liveliness-script
+            mountPath: /script/liveliness
+          - name: l2geth-replica-data
+            mountPath: /geth
+          - name: l2geth-config
+            mountPath: /l2geth-config
+        livenessProbe:
+          exec:
+            command:
+              - /script/liveliness/test.sh
+              - geth
+          initialDelaySeconds: 15
+          periodSeconds: 10
+      volumes:
+        - name: l2geth-replica-data
+          emptyDir: {}
+        - name: liveliness-script
+          configMap:
+            name: liveliness-script
+            defaultMode: 0777
+        - name: wait-scripts
+          configMap:
+            name: wait-scripts
+            defaultMode: 0777
+        - name: geth-scripts
+          configMap:
+            name: geth-scripts
+            defaultMode: 0777
+        - name: l2geth-config
+          configMap:
+            name: l2geth-config

infra/op-replica/kustomize/bases/replica-healthcheck/deployment.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: replica-healthcheck
+spec:
+  replicas: 1
+  template:
+    spec:
+      containers:
+        - name: replica-healthcheck
+          image: ethereumoptimism/replica-healthcheck
+          envFrom:
+            - configMapRef:
+                name: replica-healthcheck
+          ports:
+            - containerPort: 3000
+              name: metrics
+          resources:
+            limits:
+              memory: 256Mi
+              cpu: 512m
+            requests:
+              memory: 128Mi
+              cpu: 256m

infra/op-replica/kustomize/bases/replica-healthcheck/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - deployment.yaml
+commonLabels:
+  app: replica-healthcheck
\ No newline at end of file

infra/op-replica/kustomize/bases/servicemonitors/data-transport-layer.yaml

+---
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: data-transport-layer
+  labels:
+    app: data-transport-layer
+spec:
+  endpoints:
+    - port: http
+  selector:
+    matchLabels:
+      app: data-transport-layer
+  targetLabels:
+    - sync_source
\ No newline at end of file

infra/op-replica/kustomize/bases/servicemonitors/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ./data-transport-layer.yaml
+  - ./replica-healthcheck.yaml
\ No newline at end of file

infra/op-replica/kustomize/bases/servicemonitors/replica-healthcheck.yaml

+---
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: replica-healthcheck
+spec:
+  selector:
+    matchLabels:
+      app: replica-healthcheck
+      provider: internal
+  podMetricsEndpoints:
+    - port: metrics
+  podTargetLabels:
+    - network
+    - provider
+    - sync_source
\ No newline at end of file

infra/op-replica/kustomize/overlays/kind-kovan-replica/envs/data-transport-layer.env

+DATA_TRANSPORT_LAYER__ADDRESS_MANAGER=0x100Dd3b414Df5BbA2B542864fF94aF8024aFdf3a
+DATA_TRANSPORT_LAYER__CONFIRMATIONS=12
+DATA_TRANSPORT_LAYER__DANGEROUSLY_CATCH_ALL_ERRORS=true
+DATA_TRANSPORT_LAYER__DB_PATH=/db
+DATA_TRANSPORT_LAYER__DEFAULT_BACKEND=l2
+DATA_TRANSPORT_LAYER__ENABLE_METRICS=true
+DATA_TRANSPORT_LAYER__ETH_NETWORK_NAME=kovan
+DATA_TRANSPORT_LAYER__L1_GAS_PRICE_BACKEND=l2
+DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT=https://black-still-surf.kovan.quiknode.pro/5b5c461c3ec09dfa1aed3b9ac4c35516f1bb3d1e/
+DATA_TRANSPORT_LAYER__L2_CHAIN_ID=69
+DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT=https://kovan-sequencer.optimism.io
+DATA_TRANSPORT_LAYER__LOGS_PER_POLLING_INTERVAL=2000
+DATA_TRANSPORT_LAYER__NODE_ENV=production
+DATA_TRANSPORT_LAYER__POLLING_INTERVAL=500
+DATA_TRANSPORT_LAYER__SENTRY_TRACE_RATE=0.05
+DATA_TRANSPORT_LAYER__SERVER_HOSTNAME=0.0.0.0
+DATA_TRANSPORT_LAYER__SERVER_PORT=7878
+DATA_TRANSPORT_LAYER__SYNC_FROM_L1=false
+DATA_TRANSPORT_LAYER__SYNC_FROM_L2=true
+DATA_TRANSPORT_LAYER__TRANSACTIONS_PER_POLLING_INTERVAL=1000
+DEPLOYER_HTTP=
+L1_NODE_WEB3_URL=https://black-still-surf.kovan.quiknode.pro/5b5c461c3ec09dfa1aed3b9ac4c35516f1bb3d1e/

infra/op-replica/kustomize/overlays/kind-kovan-replica/envs/l2geth.env

+CHAIN_ID=69
+DATADIR=/geth
+DEV=true
+NETWORK_ID=69
+NO_DISCOVER=true
+NO_USB=true
+GASPRICE=0
+GCMODE=archive
+IPC_DISABLE=true
+ETH1_CTC_DEPLOYMENT_HEIGHT=25502591
+ETH1_L1_FEE_WALLET_ADDRESS=0x18394B52d3Cb931dfA76F63251919D051953413d
+ETH1_L1_CROSS_DOMAIN_MESSENGER_ADDRESS=0x4361d0F75A0186C05f971c566dC6bEa5957483fD
+ETH1_L1_ETH_GATEWAY_ADDRESS=
+ETH1_L1_STANDARD_BRIDGE_ADDRESS=0x22F24361D548e5FaAfb36d1437839f080363982B
+ETH1_SYNC_SERVICE_ENABLE=true
+ROLLUP_ADDRESS_MANAGER_OWNER_ADDRESS=0x18394b52d3cb931dfa76f63251919d051953413d
+ROLLUP_STATE_DUMP_PATH=https://storage.googleapis.com/optimism/kovan/v0.4.0-rc0.json
+ROLLUP_BACKEND=l2
+ROLLUP_CLIENT_HTTP=http://data-transport-layer:7878
+ROLLUP_DISABLE_TRANSFERS=false
+ROLLUP_ENABLE_L2_GAS_POLLING=false
+ROLLUP_GAS_PRICE_ORACLE_OWNER_ADDRESS=0x18394B52d3Cb931dfA76F63251919D051953413d
+ROLLUP_MAX_CALLDATA_SIZE=40000
+ROLLUP_POLL_INTERVAL_FLAG=3s
+ROLLUP_SYNC_SERVICE_ENABLE=true
+ROLLUP_TIMESTAMP_REFRESH=3m
+ROLLUP_VERIFIER_ENABLE=true
+RPC_ADDR=0.0.0.0
+RPC_API=eth,rollup,net,web3,debug
+RPC_CORS_DOMAIN=*
+RPC_ENABLE=true
+RPC_PORT=8545
+RPC_VHOSTS=*
+TARGET_GAS_LIMIT=11000000
+USING_OVM=true
+WS_ADDR=0.0.0.0
+WS_API=eth,rollup,net,web3,debug
+WS_ORIGINS=*
+WS=true

infra/op-replica/kustomize/overlays/kind-kovan-replica/envs/replica-healthcheck.env

+ETH_NETWORK=kovan
+ETH_NETWORK_RPC_PROVIDER=https://kovan-sequencer.optimism.io
+ETH_REPLICA_RPC_PROVIDER=http://l2geth-replica:8545
\ No newline at end of file

infra/op-replica/kustomize/overlays/kind-kovan-replica/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: kovan-replica
+
+bases:
+  - ../../bases/data-transport-layer
+  - ../../bases/l2geth-replica
+  - ../../bases/configmaps
+  - ../../bases/replica-healthcheck
+
+configMapGenerator:
+  - name: data-transport-layer
+    envs:
+      - ./envs/data-transport-layer.env
+  - name: l2geth-replica
+    envs:
+      - ./envs/l2geth.env
+  - name: replica-healthcheck
+    envs:
+      - ./envs/replica-healthcheck.env
+
+images:
+  - name: ethereumoptimism/data-transport-layer
+    newName: ethereumoptimism/data-transport-layer
+    newTag: 0.4.2
+  - name: ethereumoptimism/l2geth
+    newName: ethereumoptimism/l2geth
+    newTag: 0.4.6
+  - name: ethereumoptimism/replica-healthcheck
+    newName: optimisticben/replica-healthcheck@sha256
+    newTag: 3e8cc21f556ef8d06c0c781bb88a4f06ca0905194641becab6f302e442164140
+
+patchesStrategicMerge:
+  - ./patches/dtl-remove-init.yaml

infra/op-replica/kustomize/overlays/kind-kovan-replica/patches/dtl-remove-init.yaml

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: data-transport-layer
+spec:
+  template:
+    spec:
+      initContainers:
+

infra/op-replica/kustomize/overlays/kovan-replica-0-5-13/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: kovan-replica-0-5-13
+commonLabels:
+  network: kovan
+  provider: internal
+
+bases:
+  - ../../../envs/kovan-gen5-berlin
+  - ../../../scripts
+
+resources:
+  - ../../bases/data-transport-layer
+  - ../../bases/l2geth-replica
+  - ../../bases/servicemonitors
+  - ../../bases/replica-healthcheck
+  - ./l2geth-volume.yaml
+
+images:
+  - name: ethereumoptimism/data-transport-layer
+    newName: ethereumoptimism/data-transport-layer
+    newTag: 0.5.18
+  - name: ethereumoptimism/l2geth
+    newName: ethereumoptimism/l2geth
+    newTag: 0.5.13
+  - name: ethereumoptimism/replica-healthcheck
+    newName: ethereumoptimism/replica-healthcheck
+    newTag: 0.3.3
+
+patchesStrategicMerge:
+  - ./patches/dtl-endpoints.yaml
+  - ./patches/l2geth-resources.yaml
+  - ./patches/replica-healthcheck.yaml
+
+patches:
+  - path: ./patches/l2geth-volume.yaml
+    target:
+      group: apps
+      version: v1
+      kind: StatefulSet
+      name: l2geth-replica
\ No newline at end of file

infra/op-replica/kustomize/overlays/kovan-replica-0-5-13/l2geth-volume.yaml

+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: l2geth-replica-data
+spec:
+  storageClassName: premium-rwo
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 500Gi

infra/op-replica/kustomize/overlays/kovan-replica-0-5-13/patches/dtl-endpoints.yaml

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: data-transport-layer
+spec:
+  template:
+    spec:
+      initContainers:
+        - name: wait-for-l1
+          env:
+            - name: L1_NODE_WEB3_URL
+              value: http://failover-proxyd.default:8080
+      containers:
+        - name: data-transport-layer
+          resources:
+            limits:
+              cpu: "2"
+              memory: 4Gi
+            requests:
+              cpu: "1"
+              memory: 1Gi
+          env:
+            - name: DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT
+              value: http://failover-proxyd.default:8080
+            - name: DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT
+              value: http://sequencer.default:8545
+            - name: L1_NODE_WEB3_URL
+              value: http://failover-proxyd.default:8080
\ No newline at end of file

infra/op-replica/kustomize/overlays/kovan-replica-0-5-13/patches/l2geth-resources.yaml

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: l2geth-replica
+spec:
+  template:
+    spec:
+      containers:
+        - name: l2geth-replica
+          env:
+            - name: IPC_DISABLE
+              value: "false"
+          resources:
+            limits:
+              cpu: "4"
+              memory: 12Gi
+            requests:
+              cpu: "2"
+              memory: 8Gi

infra/op-replica/kustomize/overlays/kovan-replica-0-5-13/patches/l2geth-volume.yaml

+- op: replace
+  path: /spec/template/spec/volumes/0
+  value:
+    name: l2geth-replica-data
+    persistentVolumeClaim:
+      claimName: l2geth-replica-data

infra/op-replica/kustomize/overlays/kovan-replica-0-5-13/patches/replica-healthcheck.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: replica-healthcheck
+spec:
+  template:
+    spec:
+      containers:
+        - name: replica-healthcheck
+          env:
+            - name: REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER
+              value: http://sequencer.default:8545

infra/op-replica/kustomize/overlays/kovan-replica-0-5-9-berlin/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: kovan-replica-0-5-9-berlin
+commonLabels:
+  network: kovan
+  provider: internal
+
+bases:
+  - ../../../envs/kovan-gen5-berlin
+  - ../../../scripts
+
+resources:
+  - ../../bases/data-transport-layer
+  - ../../bases/l2geth-replica
+  - ../../bases/servicemonitors
+  - ../../bases/replica-healthcheck
+  - ./l2geth-volume.yaml
+
+images:
+  - name: ethereumoptimism/data-transport-layer
+    newName: ethereumoptimism/data-transport-layer
+    newTag: 0.5.10
+  - name: ethereumoptimism/l2geth
+    newName: ethereumoptimism/l2geth
+    newTag: 0.5.9
+  - name: ethereumoptimism/replica-healthcheck
+    newName: ethereumoptimism/replica-healthcheck
+    newTag: 0.3.3
+
+patchesStrategicMerge:
+  - ./patches/dtl-endpoints.yaml
+  - ./patches/l2geth-resources.yaml
+  - ./patches/replica-healthcheck.yaml
+
+patches:
+  - path: ./patches/l2geth-volume.yaml
+    target:
+      group: apps
+      version: v1
+      kind: StatefulSet
+      name: l2geth-replica
\ No newline at end of file

infra/op-replica/kustomize/overlays/kovan-replica-0-5-9-berlin/l2geth-volume.yaml

+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: l2geth-replica-data
+spec:
+  storageClassName: premium-rwo
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 500Gi

infra/op-replica/kustomize/overlays/kovan-replica-0-5-9-berlin/patches/dtl-endpoints.yaml

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: data-transport-layer
+spec:
+  template:
+    spec:
+      initContainers:
+        - name: wait-for-l1
+          env:
+            - name: L1_NODE_WEB3_URL
+              value: http://failover-proxyd.default:8080
+      containers:
+        - name: data-transport-layer
+          resources:
+            limits:
+              cpu: "2"
+              memory: 4Gi
+            requests:
+              cpu: "1"
+              memory: 1Gi
+          env:
+            - name: DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT
+              value: http://failover-proxyd.default:8080
+            - name: DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT
+              value: http://sequencer.default:8545
+            - name: L1_NODE_WEB3_URL
+              value: http://failover-proxyd.default:8080
\ No newline at end of file

infra/op-replica/kustomize/overlays/kovan-replica-0-5-9-berlin/patches/l2geth-resources.yaml

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: l2geth-replica
+spec:
+  template:
+    spec:
+      containers:
+        - name: l2geth-replica
+          env:
+            - name: IPC_DISABLE
+              value: "false"
+          resources:
+            limits:
+              cpu: "4"
+              memory: 12Gi
+            requests:
+              cpu: "2"
+              memory: 8Gi

infra/op-replica/kustomize/overlays/kovan-replica-0-5-9-berlin/patches/l2geth-volume.yaml

+- op: replace
+  path: /spec/template/spec/volumes/0
+  value:
+    name: l2geth-replica-data
+    persistentVolumeClaim:
+      claimName: l2geth-replica-data

infra/op-replica/kustomize/overlays/kovan-replica-0-5-9-berlin/patches/replica-healthcheck.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: replica-healthcheck
+spec:
+  template:
+    spec:
+      containers:
+        - name: replica-healthcheck
+          env:
+            - name: REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER
+              value: http://sequencer.default:8545

infra/op-replica/kustomize/overlays/mainnet-replica-0-5-11-berlin/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: mainnet-replica-0-5-11-berlin
+commonLabels:
+  network: mainnet
+  provider: internal
+
+bases:
+  - ../../../envs/mainnet-gen5-berlin
+  - ../../../scripts
+
+resources:
+  - ../../bases/data-transport-layer
+  - ../../bases/l2geth-replica
+  - ../../bases/servicemonitors
+  - ../../bases/replica-healthcheck
+  - ./volumes.yaml
+
+images:
+  - name: ethereumoptimism/data-transport-layer
+    newName: ethereumoptimism/data-transport-layer
+    newTag: 0.5.13
+  - name: ethereumoptimism/l2geth
+    newName: ethereumoptimism/l2geth
+    newTag: 0.5.11
+  - name: ethereumoptimism/replica-healthcheck
+    newName: ethereumoptimism/replica-healthcheck
+    newTag: 0.3.6
+
+patchesStrategicMerge:
+  - ./patches/dtl.yaml
+  - ./patches/l2geth.yaml
+  - ./patches/replica-healthcheck.yaml
+
+patches:
+  - path: ./patches/l2geth-volume.yaml
+    target:
+      group: apps
+      version: v1
+      kind: StatefulSet
+      name: l2geth-replica
+  - path: ./patches/dtl-volume.yaml
+    target:
+      group: apps
+      version: v1
+      kind: StatefulSet
+      name: data-transport-layer
\ No newline at end of file

infra/op-replica/kustomize/overlays/mainnet-replica-0-5-11-berlin/patches/dtl-volume.yaml

+---
+- op: replace
+  path: /spec/template/spec/volumes/0
+  value:
+    name: data-transport-layer
+    persistentVolumeClaim:
+      claimName: data-transport-layer-data

infra/op-replica/kustomize/overlays/mainnet-replica-0-5-11-berlin/patches/dtl.yaml

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: data-transport-layer
+spec:
+  template:
+    spec:
+      initContainers:
+        - name: wait-for-l1
+          env:
+            - name: L1_NODE_WEB3_URL
+              value: http://failover-proxyd.default:8080
+      containers:
+        - name: data-transport-layer
+          resources:
+            limits:
+              cpu: "2"
+              memory: 4Gi
+            requests:
+              cpu: "1"
+              memory: 1Gi
+          env:
+            - name: DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT
+              value: http://failover-proxyd.default:8080
+            - name: DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT
+              value: http://sequencer.default:8545
+            - name: L1_NODE_WEB3_URL
+              value: http://failover-proxyd.default:8080
\ No newline at end of file

infra/op-replica/kustomize/overlays/mainnet-replica-0-5-11-berlin/patches/l2geth-volume.yaml

+---
+- op: replace
+  path: /spec/template/spec/volumes/0
+  value:
+    name: l2geth-replica-data
+    persistentVolumeClaim:
+      claimName: l2geth-replica-data

infra/op-replica/kustomize/overlays/mainnet-replica-0-5-11-berlin/patches/l2geth.yaml

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: l2geth-replica
+spec:
+  template:
+    spec:
+      containers:
+        - name: l2geth-replica
+          env:
+            - name: IPC_DISABLE
+              value: "false"
+          resources:
+            limits:
+              cpu: "4"
+              memory: 12Gi
+            requests:
+              cpu: "2"
+              memory: 8Gi

infra/op-replica/kustomize/overlays/mainnet-replica-0-5-11-berlin/patches/replica-healthcheck.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: replica-healthcheck
+spec:
+  template:
+    spec:
+      containers:
+        - name: replica-healthcheck
+          env:
+            - name: REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER
+              value: http://sequencer.default:8545

infra/op-replica/kustomize/overlays/mainnet-replica-0-5-11-berlin/volumes.yaml

+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: l2geth-replica-data
+spec:
+  storageClassName: premium-rwo
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 500Gi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: data-transport-layer-data
+spec:
+  storageClassName: premium-rwo
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 10Gi

infra/op-replica/kustomize/overlays/mainnet-replica-0-5-13/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: mainnet-replica-0-5-13
+commonLabels:
+  network: mainnet
+  provider: internal
+
+bases:
+  - ../../../envs/mainnet-gen5-berlin
+  - ../../../scripts
+
+resources:
+  - ../../bases/data-transport-layer
+  - ../../bases/l2geth-replica
+  - ../../bases/servicemonitors
+  - ../../bases/replica-healthcheck
+  - ./volumes.yaml
+
+images:
+  - name: ethereumoptimism/data-transport-layer
+    newName: ethereumoptimism/data-transport-layer
+    newTag: 0.5.20
+  - name: ethereumoptimism/l2geth
+    newName: ethereumoptimism/l2geth
+    newTag: 0.5.13
+  - name: ethereumoptimism/replica-healthcheck
+    newName: ethereumoptimism/replica-healthcheck
+    newTag: 0.3.6
+
+patchesStrategicMerge:
+  - ./patches/dtl.yaml
+  - ./patches/l2geth.yaml
+  - ./patches/replica-healthcheck.yaml
+
+patches:
+  - path: ./patches/l2geth-volume.yaml
+    target:
+      group: apps
+      version: v1
+      kind: StatefulSet
+      name: l2geth-replica
+  - path: ./patches/dtl-volume.yaml
+    target:
+      group: apps
+      version: v1
+      kind: StatefulSet
+      name: data-transport-layer
\ No newline at end of file

infra/op-replica/kustomize/overlays/mainnet-replica-0-5-13/patches/dtl-volume.yaml

+---
+- op: replace
+  path: /spec/template/spec/volumes/0
+  value:
+    name: data-transport-layer
+    persistentVolumeClaim:
+      claimName: data-transport-layer-data

infra/op-replica/kustomize/overlays/mainnet-replica-0-5-13/patches/dtl.yaml

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: data-transport-layer
+spec:
+  template:
+    spec:
+      initContainers:
+        - name: wait-for-l1
+          env:
+            - name: L1_NODE_WEB3_URL
+              value: http://failover-proxyd.default:8080
+      containers:
+        - name: data-transport-layer
+          resources:
+            limits:
+              cpu: "2"
+              memory: 4Gi
+            requests:
+              cpu: "1"
+              memory: 1Gi
+          env:
+            - name: DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT
+              value: http://failover-proxyd.default:8080
+            - name: DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT
+              value: http://sequencer.default:8545
+            - name: L1_NODE_WEB3_URL
+              value: http://failover-proxyd.default:8080
\ No newline at end of file

infra/op-replica/kustomize/overlays/mainnet-replica-0-5-13/patches/l2geth-volume.yaml

+---
+- op: replace
+  path: /spec/template/spec/volumes/0
+  value:
+    name: l2geth-replica-data
+    persistentVolumeClaim:
+      claimName: l2geth-replica-data

infra/op-replica/kustomize/overlays/mainnet-replica-0-5-13/patches/l2geth.yaml

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: l2geth-replica
+spec:
+  template:
+    spec:
+      containers:
+        - name: l2geth-replica
+          env:
+            - name: IPC_DISABLE
+              value: "false"
+          resources:
+            limits:
+              cpu: "4"
+              memory: 12Gi
+            requests:
+              cpu: "2"
+              memory: 8Gi

infra/op-replica/kustomize/overlays/mainnet-replica-0-5-13/patches/replica-healthcheck.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: replica-healthcheck
+spec:
+  template:
+    spec:
+      containers:
+        - name: replica-healthcheck
+          env:
+            - name: REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER
+              value: http://sequencer.default:8545

infra/op-replica/kustomize/overlays/mainnet-replica-0-5-13/volumes.yaml

+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: l2geth-replica-data
+spec:
+  storageClassName: premium-rwo
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 500Gi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: data-transport-layer-data
+spec:
+  storageClassName: premium-rwo
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 10Gi

infra/op-replica/kustomize/overlays/mainnet-replica-l1-0-5-13/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: mainnet-replica-l1-0-5-13
+commonLabels:
+  network: mainnet
+  provider: internal
+  sync_source: l1
+
+bases:
+  - ../../../envs/mainnet-gen5-l1-berlin/
+  - ../../../scripts
+
+resources:
+  - ../../bases/data-transport-layer
+  - ../../bases/l2geth-replica
+  - ../../bases/servicemonitors
+  - ../../bases/replica-healthcheck
+  - ./volumes.yaml
+
+images:
+  - name: ethereumoptimism/data-transport-layer
+    newName: ethereumoptimism/data-transport-layer
+    newTag: 0.5.20
+  - name: ethereumoptimism/l2geth
+    newName: ethereumoptimism/l2geth
+    newTag: 0.5.13
+  - name: ethereumoptimism/replica-healthcheck
+    newName: ethereumoptimism/replica-healthcheck
+    newTag: 0.3.3
+
+patchesStrategicMerge:
+  - ./patches/dtl.yaml
+  - ./patches/l2geth.yaml
+  - ./patches/replica-healthcheck.yaml
+
+patches:
+  - path: ./patches/l2geth-volume.yaml
+    target:
+      group: apps
+      version: v1
+      kind: StatefulSet
+      name: l2geth-replica
+  - path: ./patches/dtl-volume.yaml
+    target:
+      group: apps
+      version: v1
+      kind: StatefulSet
+      name: data-transport-layer
\ No newline at end of file

infra/op-replica/kustomize/overlays/mainnet-replica-l1-0-5-13/patches/dtl-volume.yaml

+---
+- op: replace
+  path: /spec/template/spec/volumes/0
+  value:
+    name: data-transport-layer
+    persistentVolumeClaim:
+      claimName: data-transport-layer-data

infra/op-replica/kustomize/overlays/mainnet-replica-l1-0-5-13/patches/dtl.yaml

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: data-transport-layer
+spec:
+  template:
+    spec:
+      initContainers:
+        - name: wait-for-l1
+          env:
+            - name: L1_NODE_WEB3_URL
+              value: http://failover-proxyd.default:8080
+      containers:
+        - name: data-transport-layer
+          resources:
+            limits:
+              cpu: "2"
+              memory: 4Gi
+            requests:
+              cpu: "1"
+              memory: 1Gi
+          env:
+            - name: DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT
+              value: http://failover-proxyd.default:8080
+            - name: DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT
+              value: http://sequencer.default:8545
+            - name: L1_NODE_WEB3_URL
+              value: http://failover-proxyd.default:8080
\ No newline at end of file

infra/op-replica/kustomize/overlays/mainnet-replica-l1-0-5-13/patches/l2geth-volume.yaml

+---
+- op: replace
+  path: /spec/template/spec/volumes/0
+  value:
+    name: l2geth-replica-data
+    persistentVolumeClaim:
+      claimName: l2geth-replica-data

infra/op-replica/kustomize/overlays/mainnet-replica-l1-0-5-13/patches/l2geth.yaml

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: l2geth-replica
+spec:
+  template:
+    spec:
+      containers:
+        - name: l2geth-replica
+          env:
+            - name: IPC_DISABLE
+              value: "false"
+          resources:
+            limits:
+              cpu: "4"
+              memory: 12Gi
+            requests:
+              cpu: "2"
+              memory: 8Gi

infra/op-replica/kustomize/overlays/mainnet-replica-l1-0-5-13/patches/replica-healthcheck.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: replica-healthcheck
+spec:
+  replicas: 1
+  template:
+    spec:
+      containers:
+        - name: replica-healthcheck
+          env:
+            - name: REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER
+              value: http://sequencer.default:8545

infra/op-replica/kustomize/overlays/mainnet-replica-l1-0-5-13/volumes.yaml

+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: l2geth-replica-data
+spec:
+  storageClassName: premium-rwo
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 500Gi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: data-transport-layer-data
+spec:
+  storageClassName: premium-rwo
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 10Gi

infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-11/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: kovan-replica-0-5-11
+commonLabels:
+  network: kovan
+  provider: internal
+
+bases:
+  - ../../envs/kovan-gen5-berlin
+
+resources:
+  - ../../bases/data-transport-layer
+  - ../../bases/l2geth-replica
+  - ../../bases/configmaps
+  - ../../bases/servicemonitors
+  - ../../bases/replica-healthcheck
+  - ./volumes.yaml
+
+images:
+  - name: ethereumoptimism/data-transport-layer
+    newName: ethereumoptimism/data-transport-layer
+    newTag: 0.5.16
+  - name: ethereumoptimism/l2geth
+    newName: ethereumoptimism/l2geth
+    newTag: 0.5.11
+  - name: ethereumoptimism/replica-healthcheck
+    newName: ethereumoptimism/replica-healthcheck
+    newTag: 0.3.6
+
+patchesStrategicMerge:
+  - ./patches/dtl-endpoints.yaml
+  - ./patches/l2geth-resources.yaml
+  - ./patches/replica-healthcheck.yaml
+
+patches:
+  - path: ./patches/l2geth-volume.yaml
+    target:
+      group: apps
+      version: v1
+      kind: StatefulSet
+      name: l2geth-replica
+  - path: ./patches/dtl-volume.yaml
+    target:
+      group: apps
+      version: v1
+      kind: StatefulSet
+      name: data-transport-layer
\ No newline at end of file

infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-11/patches/dtl-endpoints.yaml

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: data-transport-layer
+spec:
+  template:
+    spec:
+      initContainers:
+        - name: wait-for-l1
+          env:
+            - name: L1_NODE_WEB3_URL
+              valueFrom:
+                secretKeyRef:
+                  name: replica-secrets
+                  key: l1-rpc-endpoint
+      containers:
+        - name: data-transport-layer
+          resources:
+            limits:
+              cpu: "2"
+              memory: 4Gi
+            requests:
+              cpu: "1"
+              memory: 1Gi
+          env:
+            - name: DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT
+              valueFrom:
+                secretKeyRef:
+                  name: replica-secrets
+                  key: l1-rpc-endpoint
+            - name: DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT
+              valueFrom:
+                secretKeyRef:
+                  name: replica-secrets
+                  key: l2-rpc-endpoint
+            - name: L1_NODE_WEB3_URL
+              valueFrom:
+                secretKeyRef:
+                  name: replica-secrets
+                  key: l1-rpc-endpoint
\ No newline at end of file

infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-11/patches/dtl-volume.yaml

+---
+- op: replace
+  path: /spec/template/spec/volumes/0
+  value:
+    name: data-transport-layer
+    persistentVolumeClaim:
+      claimName: data-transport-layer-data

infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-11/patches/l2geth-resources.yaml

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: l2geth-replica
+spec:
+  template:
+    spec:
+      containers:
+        - name: l2geth-replica
+          env:
+            - name: IPC_DISABLE
+              value: "false"
+          resources:
+            limits:
+              cpu: "4"
+              memory: 12Gi
+            requests:
+              cpu: "2"
+              memory: 8Gi

infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-11/patches/l2geth-volume.yaml

+- op: replace
+  path: /spec/template/spec/volumes/0
+  value:
+    name: l2geth-replica-data
+    persistentVolumeClaim:
+      claimName: l2geth-replica-data

infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-11/patches/replica-healthcheck.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: replica-healthcheck
+spec:
+  template:
+    spec:
+      containers:
+        - name: replica-healthcheck
+          env:
+            - name: REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER
+              value: https://kovan.optimism.io

infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-11/volumes.yaml

+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: l2geth-replica-data
+spec:
+  storageClassName: premium-rwo
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 500Gi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: data-transport-layer-data
+spec:
+  storageClassName: premium-rwo
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 10Gi

infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-9-berlin/ingress.yaml

+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: kovan-replica-0-5-9-berlin
+  annotations:
+    kubernetes.io/ingress.class: gce
+    kubernetes.io/ingress.global-static-ip-name: kovan-replica-0-5-9-berlin
+    networking.gke.io/managed-certificates: kovan-replica-0-5-9-berlin
+spec:
+  rules:
+  - host: kovan-replica-0-5-9-berlin.optimism.io
+    http:
+      paths:
+      - backend:
+          service:
+            name: l2geth-replica
+            port:
+              name: rpc
+        path: /
+        pathType: ImplementationSpecific
+---
+apiVersion: networking.gke.io/v1
+kind: ManagedCertificate
+metadata:
+  name: kovan-replica-0-5-9-berlin
+spec:
+  domains:
+  - kovan-replica-0-5-9-berlin.optimism.io

infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-9-berlin/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: kovan-replica-0-5-9-berlin
+commonLabels:
+  network: kovan
+  provider: internal
+
+bases:
+  - ../../envs/kovan-gen5-berlin
+
+resources:
+  - ../../bases/data-transport-layer
+  - ../../bases/l2geth-replica
+  - ../../bases/configmaps
+  - ../../bases/servicemonitors
+  - ../../bases/replica-healthcheck
+  - ./volumes.yaml
+  - ./ingress.yaml
+
+images:
+  - name: ethereumoptimism/data-transport-layer
+    newName: ethereumoptimism/data-transport-layer
+    newTag: 0.5.11
+  - name: ethereumoptimism/l2geth
+    newName: ethereumoptimism/l2geth
+    newTag: 0.5.9
+  - name: ethereumoptimism/replica-healthcheck
+    newName: ethereumoptimism/replica-healthcheck
+    newTag: 0.3.3
+
+patchesStrategicMerge:
+  - ./patches/dtl-endpoints.yaml
+  - ./patches/l2geth-resources.yaml
+  - ./patches/replica-healthcheck.yaml
+
+patches:
+  - path: ./patches/l2geth-volume.yaml
+    target:
+      group: apps
+      version: v1
+      kind: StatefulSet
+      name: l2geth-replica
+  - path: ./patches/dtl-volume.yaml
+    target:
+      group: apps
+      version: v1
+      kind: StatefulSet
+      name: data-transport-layer
\ No newline at end of file

infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-9-berlin/patches/dtl-endpoints.yaml

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: data-transport-layer
+spec:
+  template:
+    spec:
+      initContainers:
+        - name: wait-for-l1
+          env:
+            - name: L1_NODE_WEB3_URL
+              valueFrom:
+                secretKeyRef:
+                  name: replica-secrets
+                  key: l1-rpc-endpoint
+      containers:
+        - name: data-transport-layer
+          resources:
+            limits:
+              cpu: "2"
+              memory: 4Gi
+            requests:
+              cpu: "1"
+              memory: 1Gi
+          env:
+            - name: DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT
+              valueFrom:
+                secretKeyRef:
+                  name: replica-secrets
+                  key: l1-rpc-endpoint
+            - name: DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT
+              valueFrom:
+                secretKeyRef:
+                  name: replica-secrets
+                  key: l2-rpc-endpoint
+            - name: L1_NODE_WEB3_URL
+              valueFrom:
+                secretKeyRef:
+                  name: replica-secrets
+                  key: l1-rpc-endpoint
\ No newline at end of file

infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-9-berlin/patches/dtl-volume.yaml

+---
+- op: replace
+  path: /spec/template/spec/volumes/0
+  value:
+    name: data-transport-layer
+    persistentVolumeClaim:
+      claimName: data-transport-layer-data

infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-9-berlin/patches/l2geth-resources.yaml

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: l2geth-replica
+spec:
+  template:
+    spec:
+      containers:
+        - name: l2geth-replica
+          env:
+            - name: IPC_DISABLE
+              value: "false"
+          resources:
+            limits:
+              cpu: "4"
+              memory: 12Gi
+            requests:
+              cpu: "2"
+              memory: 8Gi

infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-9-berlin/patches/l2geth-volume.yaml

+- op: replace
+  path: /spec/template/spec/volumes/0
+  value:
+    name: l2geth-replica-data
+    persistentVolumeClaim:
+      claimName: l2geth-replica-data

infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-9-berlin/patches/replica-healthcheck.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: replica-healthcheck
+spec:
+  template:
+    spec:
+      containers:
+        - name: replica-healthcheck
+          env:
+            - name: REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER
+              value: https://kovan.optimism.io

infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-9-berlin/volumes.yaml

+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: l2geth-replica-data
+spec:
+  storageClassName: premium-rwo
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 500Gi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: data-transport-layer-data
+spec:
+  storageClassName: premium-rwo
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 10Gi
\ No newline at end of file

infra/op-replica/kustomize/public-overlays/mainnet-replica-0-5-8/ingress.yaml

+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: mainnet-replica-0-5-8
+  annotations:
+    kubernetes.io/ingress.class: gce
+    kubernetes.io/ingress.global-static-ip-name: mainnet-replica-history
+    networking.gke.io/managed-certificates: mainnet-replica-0-5-8
+spec:
+  rules:
+  - host: mainnet-replica-0-5-8.optimism.io
+    http:
+      paths:
+      - backend:
+          service:
+            name: l2geth-replica
+            port:
+              name: rpc
+        path: /
+        pathType: ImplementationSpecific
+---
+apiVersion: networking.gke.io/v1
+kind: ManagedCertificate
+metadata:
+  name: mainnet-replica-0-5-8
+spec:
+  domains:
+  - mainnet-replica-0-5-8.optimism.io

infra/op-replica/kustomize/public-overlays/mainnet-replica-0-5-8/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: mainnet-replica-0-5-8
+commonLabels:
+  network: mainnet
+  provider: internal
+
+bases:
+  - ../../envs/mainnet-gen5-berlin/
+
+resources:
+  - ../../bases/data-transport-layer
+  - ../../bases/l2geth-replica
+  - ../../bases/configmaps
+  - ../../bases/servicemonitors
+  - ../../bases/replica-healthcheck
+  - ./l2geth-volume.yaml
+  - ./ingress.yaml
+
+images:
+  - name: ethereumoptimism/data-transport-layer
+    newName: ethereumoptimism/data-transport-layer
+    newTag: 0.5.10
+  - name: ethereumoptimism/l2geth
+    newName: ethereumoptimism/l2geth
+    newTag: 0.5.11
+  - name: ethereumoptimism/replica-healthcheck
+    newName: ethereumoptimism/replica-healthcheck
+    newTag: 0.3.3
+
+patchesStrategicMerge:
+  - ./patches/l2geth-resources.yaml
+  - ./patches/replica-healthcheck.yaml
+
+patches:
+  - path: ./patches/l2geth-volume.yaml
+    target:
+      group: apps
+      version: v1
+      kind: StatefulSet
+      name: l2geth-replica
\ No newline at end of file

infra/op-replica/kustomize/public-overlays/mainnet-replica-0-5-8/l2geth-volume.yaml

+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: l2geth-replica-data
+spec:
+  storageClassName: premium-rwo
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 500Gi

infra/op-replica/kustomize/public-overlays/mainnet-replica-0-5-8/patches/l2geth-resources.yaml

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: l2geth-replica
+spec:
+  template:
+    spec:
+      containers:
+        - name: l2geth-replica
+          command:
+            - geth
+            - --config=/l2geth-config/l2geth.toml
+            - --datadir=$(DATADIR)
+            - --password=$(DATADIR)/password
+            - --allow-insecure-unlock
+            - --unlock=$(BLOCK_SIGNER_ADDRESS)
+            - --mine
+            - --miner.etherbase=$(BLOCK_SIGNER_ADDRESS)
+            - --metrics
+            - --metrics.influxdb
+            - --metrics.influxdb.endpoint=http://influxdb.monitoring:8086
+            - --metrics.influxdb.database=$(NAMESPACE)
+          resources:
+            limits:
+              cpu: "8"
+              memory: 24Gi
+            requests:
+              cpu: "4"
+              memory: 12Gi
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: data-transport-layer
+spec:
+  template:
+    spec:
+      initContainers:
+        - name: wait-for-l1
+          env:
+            - name: L1_NODE_WEB3_URL
+              valueFrom:
+                secretKeyRef:
+                  name: replica-secrets
+                  key: l1-rpc-endpoint
+      containers:
+        - name: data-transport-layer
+          resources:
+            limits:
+              cpu: "2"
+              memory: 4Gi
+            requests:
+              cpu: "1"
+              memory: 1Gi
+          env:
+            - name: DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT
+              valueFrom:
+                secretKeyRef:
+                  name: replica-secrets
+                  key: l1-rpc-endpoint
+            - name: DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT
+              valueFrom:
+                secretKeyRef:
+                  name: replica-secrets
+                  key: l2-rpc-endpoint
+            - name: L1_NODE_WEB3_URL
+              valueFrom:
+                secretKeyRef:
+                  name: replica-secrets
+                  key: l1-rpc-endpoint
\ No newline at end of file

infra/op-replica/kustomize/public-overlays/mainnet-replica-0-5-8/patches/l2geth-volume.yaml

+- op: replace
+  path: /spec/template/spec/volumes/0
+  value:
+    name: l2geth-replica-data
+    persistentVolumeClaim:
+      claimName: l2geth-replica-data

infra/op-replica/kustomize/public-overlays/mainnet-replica-0-5-8/patches/replica-healthcheck.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: replica-healthcheck
+spec:
+  template:
+    spec:
+      containers:
+        - name: replica-healthcheck
+          env:
+            - name: REPLICA_HEALTHCHECK__ETH_NETWORK_RPC_PROVIDER
+              value: https://mainnet.optimism.io

infra/op-replica/scripts/check-for-chaindata-berlin.sh

+#!/bin/sh
+set -exu
+
+echo running "${0}"
+GETH_DATA_DIR=/geth
+GETH_CHAINDATA_DIR=$GETH_DATA_DIR/geth/chaindata
+GETH_KEYSTORE_DIR=$GETH_DATA_DIR/keystore
+if [ ! -d "$GETH_KEYSTORE_DIR" ]; then
+    echo "$GETH_KEYSTORE_DIR missing, running account import"
+    echo -n "$BLOCK_SIGNER_PRIVATE_KEY_PASSWORD" > "$GETH_DATA_DIR"/password
+    echo -n "$BLOCK_SIGNER_PRIVATE_KEY" > "$GETH_DATA_DIR"/block-signer-key
+    geth account import \
+        --datadir="$GETH_DATA_DIR" \
+        --password="$GETH_DATA_DIR"/password \
+        "$GETH_DATA_DIR"/block-signer-key
+    echo "get account import complete"
+fi
+if [ ! -d "$GETH_CHAINDATA_DIR" ]; then
+    echo "$GETH_CHAINDATA_DIR missing, running init"
+    geth init --datadir="$GETH_DATA_DIR" "$L2GETH_GENESIS_URL" "$L2GETH_GENESIS_HASH"
+    echo "geth init complete"
+else
+    echo "$GETH_CHAINDATA_DIR exists, checking for hardfork."
+    echo "Chain config:"
+    geth dump-chain-cfg --datadir="$GETH_DATA_DIR"
+    if geth dump-chain-cfg --datadir="$GETH_DATA_DIR" | grep -q "\"berlinBlock\": $L2GETH_BERLIN_ACTIVATION_HEIGHT"; then
+        echo "Hardfork already activated."
+    else
+        echo "Hardfork not activated, running init."
+        geth init --datadir="$GETH_DATA_DIR" "$L2GETH_GENESIS_URL" "$L2GETH_GENESIS_HASH"
+        echo "geth hardfork activation complete"
+    fi
+fi
\ No newline at end of file

infra/op-replica/scripts/check-for-chaindata.sh

+#!/bin/sh
+set -eou
+
+echo running "${0}"
+if [ -z "$DATADIR" ]; then
+    echo "Must pass DATADIR"
+    exit 1
+fi
+if [ -z "$BLOCK_SIGNER_PRIVATE_KEY" ]; then
+    echo "Must pass BLOCK_SIGNER_PRIVATE_KEY"
+    exit 1
+fi
+if [ -z "$BLOCK_SIGNER_PRIVATE_KEY_PASSWORD" ]; then
+    echo "Must pass BLOCK_SIGNER_PRIVATE_KEY_PASSWORD"
+    exit 1
+fi
+if [ -z "$L2GETH_GENESIS_URL" ]; then
+    echo "Must pass L2GETH_GENESIS_URL"
+    exit 1
+fi
+if [ -z "$L2GETH_GENESIS_URL_SHA256SUM" ]; then
+    echo "Must pass L2GETH_GENESIS_URL_SHA256SUM"
+    exit 1
+fi
+# Check for an existing chaindata folder.
+# If it exists, assume it's correct and skip geth init step
+GETH_CHAINDATA_DIR=$DATADIR/geth/chaindata
+
+if [ -d "$GETH_CHAINDATA_DIR" ]; then
+    echo "$GETH_CHAINDATA_DIR existing, skipping geth init"
+else
+    echo "$GETH_CHAINDATA_DIR missing, running geth init"
+    echo "Retrieving genesis file $L2GETH_GENESIS_URL"
+    TEMP_DIR=$(mktemp -d)
+    wget -O "$TEMP_DIR"/genesis.json "$L2GETH_GENESIS_URL"
+    GENESIS_SHA256SUM=$(sha256sum "$TEMP_DIR"/genesis.json | awk '{print $1}')
+    if [ "$GENESIS_SHA256SUM" != "$L2GETH_GENESIS_URL_SHA256SUM" ];then
+        echo GENESIS_SHA256SUM: "$GENESIS_SHA256SUM" != L2GETH_GENESIS_URL_SHA256SUM: "$L2GETH_GENESIS_URL_SHA256SUM"
+        exit 1
+    fi
+    echo checksums match
+    echo GENESIS_SHA256SUM: "$GENESIS_SHA256SUM" == L2GETH_GENESIS_URL_SHA256SUM: "$L2GETH_GENESIS_URL_SHA256SUM"
+    geth init \
+        --datadir=/"$DATADIR" \
+        "$TEMP_DIR"/genesis.json
+    echo geth init complete
+fi
+
+# Check for an existing keystore folder.
+# If it exists, assume it's correct and skip geth acount import step
+GETH_KEYSTORE_DIR=$DATADIR/keystore
+mkdir -p "$GETH_KEYSTORE_DIR"
+GETH_KEYSTORE_KEYS=$(find "$GETH_KEYSTORE_DIR" -type f)
+
+if [ ! -z "$GETH_KEYSTORE_KEYS" ]; then
+    echo "$GETH_KEYSTORE_KEYS exist, skipping account import if any keys are present"
+else
+    echo "$GETH_KEYSTORE_DIR missing, running account import"
+    echo -n "$BLOCK_SIGNER_PRIVATE_KEY_PASSWORD" > "$DATADIR"/password
+    echo -n "$BLOCK_SIGNER_PRIVATE_KEY" > "$DATADIR"/block-signer-key
+    geth account import \
+        --datadir=/"$DATADIR" \
+        --password "$DATADIR"/password \
+        "$DATADIR"/block-signer-key
+fi
+
+echo "l2geth setup complete"

infra/op-replica/scripts/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+configMapGenerator:
+  - name: liveliness-script
+    files:
+      - ./test.sh
+  - name: wait-scripts
+    files:
+      - ./wait-for-deployer.sh
+      - ./wait-for-dtl.sh
+      - ./wait-for-l1.sh
+      - ./wait-for-l2.sh
+  - name: l2geth-config
+    files:
+      - ./l2geth.toml
\ No newline at end of file

infra/op-replica/scripts/l2geth-replica-start.sh

+#!/bin/sh
+set -eou
+
+if [[ -z $DATADIR ]]; then
+    echo "Must pass DATADIR"
+    exit 1
+fi
+if [[ -z $BLOCK_SIGNER_ADDRESS ]]; then
+    echo "Must pass BLOCK_SIGNER_ADDRESS"
+    exit 1
+fi
+
+exec geth \
+  --vmodule=eth/*=5,miner=4,rpc=5,rollup=4,consensus/clique=1 \
+  --datadir=$DATADIR \
+  --password=$DATADIR/password \
+  --allow-insecure-unlock \
+  --unlock=$BLOCK_SIGNER_ADDRESS \
+  --mine \
+  --miner.etherbase=$BLOCK_SIGNER_ADDRESS \
+  $@

infra/op-replica/scripts/l2geth.toml

+# l2geth configs go here
+[Node.HTTPTimeouts]
+ReadTimeout = 120000000000
+WriteTimeout = 120000000000
+IdleTimeout = 120000000000
\ No newline at end of file

infra/op-replica/scripts/test.sh

+#!/bin/sh
+if [ -z "$1" ]; then
+    exit 1
+fi
+
+if [[ $(ps -ef | grep -v grep | grep "$1" | wc -l) -eq 0 ]]; then
+    exit 1
+else
+    exit 0
+fi
\ No newline at end of file

infra/op-replica/scripts/wait-for-deployer.sh

+#!/bin/bash
+set -eou
+if [[ -z $URL ]]; then
+    echo "Must pass URL"
+    exit 1
+fi
+echo "Waiting for Deployer"
+curl \
+    --silent \
+    --output /dev/null \
+    --retry-connrefused \
+    --retry 1000 \
+    --retry-delay 1 \
+    $URL
+echo "Contracts deployed"
\ No newline at end of file

infra/op-replica/scripts/wait-for-dtl.sh

+#!/bin/bash
+set -eou
+if [[ -z $ROLLUP_CLIENT_HTTP ]]; then
+    echo "Must pass ROLLUP_CLIENT_HTTP"
+    exit 1
+fi
+echo "Waiting for DTL"
+curl \
+    --silent \
+    --output /dev/null \
+    --retry-connrefused \
+    --retry 1000 \
+    --retry-delay 1 \
+    $ROLLUP_CLIENT_HTTP
\ No newline at end of file

infra/op-replica/scripts/wait-for-l1.sh

+#!/bin/bash
+set -eou
+if [[ -z $L1_NODE_WEB3_URL ]]; then
+    echo "Must pass L1_NODE_WEB3_URL "
+    exit 1
+fi
+JSON='{"jsonrpc":"2.0","id":0,"method":"eth_chainId","params":[]}'
+echo "Waiting for L1"
+curl \
+    -X POST \
+    --silent \
+    --output /dev/null \
+    --retry-connrefused \
+    --retry 1000 \
+    --retry-delay 1 \
+    -d "$JSON" \
+    $L1_NODE_WEB3_URL
+echo "Connected to L1"
\ No newline at end of file

infra/op-replica/scripts/wait-for-l2.sh

+#!/bin/bash
+set -eou
+if [[ -z $L2_NODE_WEB3_URL ]]; then
+    echo "Must pass L2_NODE_WEB3_URL"
+    exit 1
+fi
+JSON='{"jsonrpc":"2.0","id":0,"method":"eth_chainId","params":[]}'
+echo "Waiting for L2"
+curl \
+    -X POST \
+    --silent \
+    --output /dev/null \
+    --retry-connrefused \
+    --retry 1000 \
+    --retry-delay 1 \
+    -d "$JSON" \
+    $L2_NODE_WEB3_URL
+echo "Connected to L2"
\ No newline at end of file

l2geth/README.md

@@ -26,7 +26,7 @@ $ make geth
 ### Running a Sequencer
 
 Running a sequencer that ingests L1 to L2 transactions requires running the
-[Data Transport Layer](https://github.com/ethereum-optimism/data-transport-layer).
+[Data Transport Layer](https://github.com/ethereum-optimism/optimism/tree/develop/packages/data-transport-layer).
 The data transport layer is responsible for indexing transactions
 from layer one Ethereum. It is possible to run a local development sequencer
 without the data transport layer by turning off the sync service. To turn on

l2geth/cmd/geth/main.go

@@ -164,6 +164,15 @@ var (
 		utils.RollupFeeThresholdDownFlag,
 		utils.RollupFeeThresholdUpFlag,
 		utils.SequencerClientHttpFlag,
+		utils.TxPublisherEnableFlag,
+		utils.TxPublisherProjectIDFlag,
+		utils.TxPublisherTopicIDFlag,
+		utils.TxPublisherTimeoutFlag,
+		utils.TxQueueEnableFlag,
+		utils.TxQueueProjectIDFlag,
+		utils.TxQueueSubscriptionIDFlag,
+		utils.TxQueueMaxOutstandingBytesFlag,
+		utils.TxQueueMaxOutstandingMessagesFlag,
 	}
 
 	rpcFlags = []cli.Flag{

l2geth/cmd/geth/usage.go

@@ -78,6 +78,15 @@ var AppHelpFlagGroups = []flagGroup{
 			utils.RollupFeeThresholdDownFlag,
 			utils.RollupFeeThresholdUpFlag,
 			utils.SequencerClientHttpFlag,
+			utils.TxPublisherEnableFlag,
+			utils.TxPublisherProjectIDFlag,
+			utils.TxPublisherTopicIDFlag,
+			utils.TxPublisherTimeoutFlag,
+			utils.TxQueueEnableFlag,
+			utils.TxQueueProjectIDFlag,
+			utils.TxQueueSubscriptionIDFlag,
+			utils.TxQueueMaxOutstandingBytesFlag,
+			utils.TxQueueMaxOutstandingMessagesFlag,
 		},
 	},
 	{

l2geth/cmd/utils/flags.go

@@ -61,6 +61,7 @@ import (
 	"github.com/ethereum-optimism/optimism/l2geth/p2p/netutil"
 	"github.com/ethereum-optimism/optimism/l2geth/params"
 	"github.com/ethereum-optimism/optimism/l2geth/rollup"
+	"github.com/ethereum-optimism/optimism/l2geth/rollup/pub"
 	"github.com/ethereum-optimism/optimism/l2geth/rpc"
 	whisper "github.com/ethereum-optimism/optimism/l2geth/whisper/whisperv6"
 	pcsclite "github.com/gballet/go-libpcsclite"
@@ -831,7 +832,7 @@ var (
 	}
 	RollupBackendFlag = cli.StringFlag{
 		Name:   "rollup.backend",
-		Usage:  "Sync backend for verifiers (\"l1\" or \"l2\"), defaults to l1",
+		Usage:  "Sync backend for verifiers (\"l1\", \"l2\" or \"queue\"), defaults to l1",
 		Value:  "l1",
 		EnvVar: "ROLLUP_BACKEND",
 	}
@@ -866,6 +867,51 @@ var (
 		Usage:  "HTTP endpoint for the sequencer client",
 		EnvVar: "SEQUENCER_CLIENT_HTTP",
 	}
+	TxPublisherEnableFlag = cli.BoolFlag{
+		Name:   "txpublisher.enable",
+		Usage:  "Enable transaction logging to PubSub",
+		EnvVar: "TX_PUBLISHER_ENABLE",
+	}
+	TxPublisherProjectIDFlag = cli.StringFlag{
+		Name:   "txpublisher.projectid",
+		Usage:  "GCP project ID for the tx PubSub",
+		EnvVar: "TX_PUBLISHER_PROJECT_ID",
+	}
+	TxPublisherTopicIDFlag = cli.StringFlag{
+		Name:   "txpublisher.topicid",
+		Usage:  "Topic ID used for PubSub",
+		EnvVar: "TX_PUBLISHER_TOPIC_ID",
+	}
+	TxPublisherTimeoutFlag = cli.DurationFlag{
+		Name:   "txpublisher.timeout",
+		Usage:  "Transaction publishing timeout",
+		EnvVar: "TX_PUBLISHER_TIMEOUT",
+	}
+	TxQueueEnableFlag = cli.BoolFlag{
+		Name:   "txqueue.enable",
+		Usage:  "Enable transaction syncing from the Backend Queue",
+		EnvVar: "TX_QUEUE_ENABLE",
+	}
+	TxQueueProjectIDFlag = cli.StringFlag{
+		Name:   "txqueue.projectid",
+		Usage:  "Backend Queue project ID",
+		EnvVar: "TX_QUEUE_PROJECT_ID",
+	}
+	TxQueueSubscriptionIDFlag = cli.StringFlag{
+		Name:   "txqueue.subscriptionid",
+		Usage:  "Transaction Queue subscription ID",
+		EnvVar: "TX_QUEUE_SUBSCRIPTION_ID",
+	}
+	TxQueueMaxOutstandingMessagesFlag = cli.IntFlag{
+		Name:   "txqueue.maxoutstandingmessages",
+		Usage:  "Max number of messages buffered in the transaction queue subscriber",
+		EnvVar: "TX_QUEUE_MAX_OUTSTANDING_MESSAGES",
+	}
+	TxQueueMaxOutstandingBytesFlag = cli.IntFlag{
+		Name:   "txqueue.maxoutstandingbytes",
+		Usage:  "Max outstanding bytes bufferered in the transaction queue subscriber",
+		EnvVar: "TX_QUEUE_MAX_OUTSTANDING_BYTES",
+	}
 )
 
 // MakeDataDir retrieves the currently requested data directory, terminating
@@ -1147,6 +1193,43 @@ func setRollup(ctx *cli.Context, cfg *rollup.Config) {
 	}
 }
 
+// UsingOVM
+// setTxPublisher configures the transaction logger
+func setTxPublisher(ctx *cli.Context, cfg *pub.Config) {
+	if ctx.GlobalIsSet(TxPublisherEnableFlag.Name) {
+		cfg.Enable = ctx.GlobalBool(TxPublisherEnableFlag.Name)
+	}
+	if ctx.GlobalIsSet(TxPublisherProjectIDFlag.Name) {
+		cfg.ProjectID = ctx.GlobalString(TxPublisherProjectIDFlag.Name)
+	}
+	if ctx.GlobalIsSet(TxPublisherTopicIDFlag.Name) {
+		cfg.TopicID = ctx.GlobalString(TxPublisherTopicIDFlag.Name)
+	}
+	if ctx.GlobalIsSet(TxPublisherTimeoutFlag.Name) {
+		cfg.Timeout = ctx.GlobalDuration(TxPublisherTimeoutFlag.Name)
+	}
+}
+
+// UsingOVM
+// setTxQueueSubscriber configures the Queue Backend
+func setTxQueueSubscriber(ctx *cli.Context, cfg *rollup.QueueSubscriberConfig) {
+	if ctx.GlobalIsSet(TxQueueEnableFlag.Name) {
+		cfg.Enable = ctx.GlobalBool(TxQueueEnableFlag.Name)
+	}
+	if ctx.GlobalIsSet(TxQueueProjectIDFlag.Name) {
+		cfg.ProjectID = ctx.GlobalString(TxQueueProjectIDFlag.Name)
+	}
+	if ctx.GlobalIsSet(TxQueueSubscriptionIDFlag.Name) {
+		cfg.SubscriptionID = ctx.GlobalString(TxQueueSubscriptionIDFlag.Name)
+	}
+	if ctx.GlobalIsSet(TxQueueMaxOutstandingMessagesFlag.Name) {
+		cfg.MaxOutstandingMessages = ctx.GlobalInt(TxQueueMaxOutstandingMessagesFlag.Name)
+	}
+	if ctx.GlobalIsSet(TxQueueMaxOutstandingBytesFlag.Name) {
+		cfg.MaxOutstandingBytes = ctx.GlobalInt(TxQueueMaxOutstandingBytesFlag.Name)
+	}
+}
+
 // setLes configures the les server and ultra light client settings from the command line flags.
 func setLes(ctx *cli.Context, cfg *eth.Config) {
 	if ctx.GlobalIsSet(LightLegacyServFlag.Name) {
@@ -1606,6 +1689,8 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
 	setLes(ctx, cfg)
 	setEth1(ctx, &cfg.Rollup)
 	setRollup(ctx, &cfg.Rollup)
+	setTxPublisher(ctx, &cfg.TxPublisher)
+	setTxQueueSubscriber(ctx, &cfg.TxQueueSubscriber)
 
 	if ctx.GlobalIsSet(SyncModeFlag.Name) {
 		cfg.SyncMode = *GlobalTextMarshaler(ctx, SyncModeFlag.Name).(*downloader.SyncMode)

l2geth/core/types/transaction_meta.go

@@ -32,6 +32,17 @@ func (q QueueOrigin) String() string {
 	}
 }
 
+func (q QueueOrigin) MarshalJSON() ([]byte, error) {
+	switch q {
+	case QueueOriginSequencer:
+		return []byte(`"sequencer"`), nil
+	case QueueOriginL1ToL2:
+		return []byte(`"l1"`), nil
+	default:
+		return []byte(`""`), nil
+	}
+}
+
 func (q *QueueOrigin) UnmarshalJSON(b []byte) error {
 	switch string(b) {
 	case "\"sequencer\"":

l2geth/eth/backend.go

@@ -52,6 +52,7 @@ import (
 	"github.com/ethereum-optimism/optimism/l2geth/params"
 	"github.com/ethereum-optimism/optimism/l2geth/rlp"
 	"github.com/ethereum-optimism/optimism/l2geth/rollup"
+	"github.com/ethereum-optimism/optimism/l2geth/rollup/pub"
 	"github.com/ethereum-optimism/optimism/l2geth/rollup/rcfg"
 	"github.com/ethereum-optimism/optimism/l2geth/rpc"
 )
@@ -206,7 +207,19 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
 	}
 	eth.txPool = core.NewTxPool(config.TxPool, chainConfig, eth.blockchain)
 
-	eth.syncService, err = rollup.NewSyncService(context.Background(), config.Rollup, eth.txPool, eth.blockchain, eth.chainDb)
+	var txLogger pub.Publisher
+	txLogger, err = pub.NewGooglePublisher(context.Background(), config.TxPublisher)
+	if err != nil {
+		return nil, err
+	}
+
+	var txQueueSubscriber rollup.QueueSubscriber
+	txQueueSubscriber, err = rollup.NewQueueSubscriber(context.Background(), config.TxQueueSubscriber)
+	if err != nil {
+		return nil, err
+	}
+
+	eth.syncService, err = rollup.NewSyncService(context.Background(), config.Rollup, eth.txPool, eth.blockchain, eth.chainDb, txLogger, txQueueSubscriber)
 	if err != nil {
 		return nil, fmt.Errorf("Cannot initialize syncservice: %w", err)
 	}

l2geth/eth/config.go

@@ -32,6 +32,7 @@ import (
 	"github.com/ethereum-optimism/optimism/l2geth/miner"
 	"github.com/ethereum-optimism/optimism/l2geth/params"
 	"github.com/ethereum-optimism/optimism/l2geth/rollup"
+	"github.com/ethereum-optimism/optimism/l2geth/rollup/pub"
 )
 
 // DefaultConfig contains default settings for use on the Ethereum main net.
@@ -183,4 +184,8 @@ type Config struct {
 
 	// Optimism Rollup Config
 	Rollup rollup.Config
+
+	TxPublisher pub.Config
+
+	TxQueueSubscriber rollup.QueueSubscriberConfig
 }

l2geth/go.mod

@@ -3,6 +3,7 @@ module github.com/ethereum-optimism/optimism/l2geth
 go 1.15
 
 require (
+	cloud.google.com/go/pubsub v1.18.0
 	github.com/Azure/azure-storage-blob-go v0.7.0
 	github.com/VictoriaMetrics/fastcache v1.6.0
 	github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847
@@ -21,7 +22,7 @@ require (
 	github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff
 	github.com/go-resty/resty/v2 v2.4.0
 	github.com/go-stack/stack v1.8.0
-	github.com/golang/protobuf v1.4.3
+	github.com/golang/protobuf v1.5.2
 	github.com/golang/snappy v0.0.4
 	github.com/gorilla/websocket v1.4.2
 	github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29
@@ -51,9 +52,9 @@ require (
 	github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208
 	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912
+	golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27
 	golang.org/x/text v0.3.6
-	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
+	golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce
 	gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6
 	gopkg.in/sourcemap.v1 v1.0.5 // indirect

l2geth/go.sum

@@ -8,14 +8,55 @@ cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTj
 cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
 cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
 cloud.google.com/go v0.51.0/go.mod h1:hWtGJ6gnXH+KgDv+V0zFGDvpi07n3z8ZNj3T1RW0Gcw=
+cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
+cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
+cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
+cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
+cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
+cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
+cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
+cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
+cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
+cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
+cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
+cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
+cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY=
+cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM=
+cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY=
+cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ=
+cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI=
+cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
+cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
+cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
+cloud.google.com/go v0.100.1/go.mod h1:fs4QogzfH5n2pBXBP9vRiU+eCny7lD2vmFZy79Iuw1U=
+cloud.google.com/go v0.100.2 h1:t9Iw5QH5v4XtlEQaCtUY7x6sCABps8sW0acw7e2WQ6Y=
+cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
+cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
+cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
+cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
+cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
 cloud.google.com/go/bigtable v1.2.0/go.mod h1:JcVAOl45lrTmQfLj7T6TxyMzIN/3FGGcFm+2xVAli2o=
+cloud.google.com/go/compute v0.1.0 h1:rSUBvAyVwNJ5uQCKNJFMwPtTvJkfN38b6Pvb9zZoqJ8=
+cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
+cloud.google.com/go/iam v0.1.0 h1:W2vbGCrE3Z7J/x3WXLxxGl9LMSB2uhsAA7Ss/6u/qRY=
+cloud.google.com/go/iam v0.1.0/go.mod h1:vcUNEa0pEm0qRVpmWepWaFMIAI8/hjB9mO8rNCJtF6c=
+cloud.google.com/go/kms v1.1.0 h1:1yc4rLqCkVDS9Zvc7m+3mJ47kw0Uo5Q5+sMjcmUVUeM=
+cloud.google.com/go/kms v1.1.0/go.mod h1:WdbppnCDMDpOvoYBMn1+gNmOeEoZYqAv+HeuKARGCXI=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
+cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
+cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
+cloud.google.com/go/pubsub v1.18.0 h1:f5HKj3RCujL2zm2cT/Op1mHG1bIDj2fYQ2NDbiAuNAU=
+cloud.google.com/go/pubsub v1.18.0/go.mod h1:Vg6zS1lnXBFiQuHMntX4Id4mKIdsVRjKED4nCVMdMJ8=
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
+cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
+cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
+cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4=
@@ -54,6 +95,7 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
 github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8=
 github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VTxUBvSJ3s3eHAg65PNgrsn5BtqCRPdmyXh6rAfdxN0=
 github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847 h1:rtI0fD4oG/8eVokGVPYJEW1F88p1ZNgXiEIs9thEE4A=
 github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ=
@@ -99,6 +141,10 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudflare/cloudflare-go v0.14.0 h1:gFqGlGl/5f9UGXAaKapCGUfaTCgRKKnzu2VvzMZlOFA=
 github.com/cloudflare/cloudflare-go v0.14.0/go.mod h1:EnwdgGMaFOruiPZRFSgn+TsQ3hQ7C/YWzIGLeu5c304=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ=
 github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
@@ -129,7 +175,13 @@ github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw=
 github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
 github.com/elastic/gosigar v0.8.1-0.20180330100440-37f05ff46ffa h1:XKAhUk/dtp+CV0VO6mhG2V7jA9vbcGcnYF/Ay9NjZrY=
 github.com/elastic/gosigar v0.8.1-0.20180330100440-37f05ff46ffa/go.mod h1:cdorVVzy1fhmEqmtgqkoE3bYtCfSCkVyjTyCIo22xvs=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/ethereum/go-ethereum v1.10.12 h1:el/KddB3gLEsnNgGQ3SQuZuiZjwnFTYHe5TwUet5Om4=
 github.com/ethereum/go-ethereum v1.10.12/go.mod h1:W3yfrFyL9C1pHcwY5hmRHVDaorTiQxhYBkKyu5mEDHw=
@@ -151,6 +203,7 @@ github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1T
 github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-kit/kit v0.8.0 h1:Wz+5lgoB0kkuqLEc6NVmwRknTKP6dTGbSqvhZtBI/j0=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
@@ -174,20 +227,35 @@ github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgR
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
+github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
+github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
@@ -201,23 +269,49 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
+github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.5/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
+github.com/googleapis/gax-go/v2 v2.1.1 h1:dp3bWCh+PPO1zjRRiCSczJav13sBvG4UhNyVTa1KqdU=
+github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29 h1:sezaKhEfPFg8W0Enm61B9Gs911H8iesGY5R8NDPtd1M=
 github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -230,6 +324,7 @@ github.com/huin/goupnp v1.0.2 h1:RfGLP+h3mvisuWEyybxNq5Eft3NWhHLPeUN72kpKZoI=
 github.com/huin/goupnp v1.0.2/go.mod h1:0dxJBVBHqTMjIUMkESDTNgOOx/Mw5wYIfyFmdzSamkM=
 github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/influxdata/flux v0.65.1/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7mYlOw2LqY=
 github.com/influxdata/influxdb v1.8.3 h1:WEypI1BQFTT4teLM+1qkEcvUi0dAvopAI/ir0vAiBg8=
@@ -372,6 +467,7 @@ github.com/rjeczalik/notify v0.9.1 h1:CLCKso/QK1snAlnhNR/CNvNiFU2saUtjV0bx3EwNeC
 github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho=
 github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff h1:+6NUiITWwE5q1KO6SAfUX918c+Tab0+tGAM/mtdlUyA=
 github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
 github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
@@ -401,6 +497,7 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
@@ -418,10 +515,20 @@ github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPyS
 github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208 h1:1cngl9mPEoITZG8s8cVcUy5CeIBYhEESkOB7m6Gmkrk=
 github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208/go.mod h1:IotVbo4F+mw0EzQ08zFqg7pK3FebNXpaMsRy2RT+Ees=
 github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
+github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
+go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
+go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
@@ -449,6 +556,9 @@ golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm0
 golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
 golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
+golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
@@ -460,12 +570,20 @@ golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHl
 golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
+golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -481,16 +599,35 @@ golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d h1:20cMwl2fHAzkJMEA+8J4JgqBQcQGzbisXo31MIeenXI=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
@@ -499,6 +636,18 @@ golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4Iltr
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 h1:RerP+noqYHUQ8CMRcPlC2nvTa4dcBIjegkuWdcUDuqg=
+golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -506,7 +655,9 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -525,31 +676,64 @@ golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912 h1:uCLL3g5wH2xjxVREVuAbP9JM5PPKjRbXKRa6IBjkzmU=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 h1:XDXtA5hveEEV8JB2l7nhMTp3t3cHp9ZpwcdjqyEWLlo=
+golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/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 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
 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=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -560,9 +744,11 @@ golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE=
 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 h1:GZokNIeuVkl3aZHJchRrr13WCsols02MLUcz1U9is6M=
+golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -587,10 +773,39 @@ golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200108203644-89082a384178/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
+golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
+golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
+golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -609,11 +824,41 @@ google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEn
 google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
+google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
+google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
+google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
+google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
+google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
+google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
+google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo=
+google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4=
+google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw=
+google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU=
+google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k=
+google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
+google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
+google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI=
+google.golang.org/api v0.58.0/go.mod h1:cAbP2FsxoGVNwtgNAmmn3y5G1TWAiVYRmg4yku3lv+E=
+google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I=
+google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo=
+google.golang.org/api v0.67.0 h1:lYaaLa+x3VVUhtosaK9xihwQ9H9KRa557REHwwZ2orM=
+google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
+google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -628,18 +873,101 @@ google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvx
 google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20200108215221-bd8f9a0ef82f/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
+google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
+google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A=
+google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
+google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
+google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
+google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
+google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
+google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w=
+google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211018162055-cf77aa76bad2/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00 h1:zmf8Yq9j+IyTpps+paSkmHkSu5fJlRKy69LxRzc17Q0=
+google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
+google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
+google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
+google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
+google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/grpc v1.40.1 h1:pnP7OclFFFgFi4VHQDQDaoXUVauOFyktqTsqqgzFKbc=
+google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -676,6 +1004,10 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
+rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

l2geth/rollup/metrics.go

+package rollup
+
+import "github.com/ethereum-optimism/optimism/l2geth/metrics"
+
+var (
+	pubTxDropCounter = metrics.NewRegisteredCounter("rollup/pub/txdrops", nil)
+)

l2geth/rollup/pub/google.go

+package pub
+
+import (
+	"context"
+	"sync"
+	"time"
+
+	"cloud.google.com/go/pubsub"
+	"github.com/ethereum-optimism/optimism/l2geth/log"
+)
+
+const messageOrderingKey = "o"
+
+type Config struct {
+	Enable    bool
+	ProjectID string
+	TopicID   string
+	Timeout   time.Duration
+}
+
+type GooglePublisher struct {
+	client          *pubsub.Client
+	topic           *pubsub.Topic
+	publishSettings pubsub.PublishSettings
+	timeout         time.Duration
+	mutex           sync.Mutex
+}
+
+func NewGooglePublisher(ctx context.Context, config Config) (Publisher, error) {
+	if !config.Enable {
+		return &NoopPublisher{}, nil
+	}
+
+	client, err := pubsub.NewClient(ctx, config.ProjectID)
+	if err != nil {
+		return nil, err
+	}
+	topic := client.Topic(config.TopicID)
+	topic.EnableMessageOrdering = true
+
+	// Publish messages immediately
+	publishSettings := pubsub.PublishSettings{
+		DelayThreshold: 0,
+		CountThreshold: 0,
+	}
+	timeout := config.Timeout
+	if timeout == 0 {
+		log.Info("Sanitizing publisher timeout to 2 seconds")
+		timeout = time.Second * 2
+	}
+
+	log.Info("Initialized transaction log to PubSub", "topic", config.TopicID)
+	return &GooglePublisher{
+		client:          client,
+		topic:           topic,
+		publishSettings: publishSettings,
+		timeout:         timeout,
+	}, nil
+}
+
+func (p *GooglePublisher) Publish(ctx context.Context, msg []byte) error {
+	ctx, cancel := context.WithTimeout(ctx, p.timeout)
+	defer cancel()
+	pmsg := pubsub.Message{
+		Data:        msg,
+		OrderingKey: messageOrderingKey,
+	}
+
+	p.mutex.Lock()
+	// If there was an error previously, clear it out to allow publishing to proceed again
+	p.topic.ResumePublish(messageOrderingKey)
+	result := p.topic.Publish(ctx, &pmsg)
+	_, err := result.Get(ctx)
+	p.mutex.Unlock()
+
+	return err
+}

l2geth/rollup/pub/pub.go

+package pub
+
+import "context"
+
+type Publisher interface {
+	// Publish schedules an ordereed message to be sent
+	Publish(ctx context.Context, msg []byte) error
+}
+
+type NoopPublisher struct{}
+
+func (p *NoopPublisher) Publish(ctx context.Context, msg []byte) error {
+	return nil
+}

l2geth/rollup/sub.go

+package rollup
+
+import (
+	"context"
+
+	"cloud.google.com/go/pubsub"
+	"github.com/ethereum-optimism/optimism/l2geth/log"
+)
+
+type QueueSubscriberMessage interface {
+	Data() []byte
+	Ack()
+	Nack()
+}
+
+type QueueSubscriber interface {
+	ReceiveMessage(ctx context.Context, cb func(ctx context.Context, msg QueueSubscriberMessage)) error
+	Close() error
+}
+
+type QueueSubscriberConfig struct {
+	Enable                 bool
+	ProjectID              string
+	SubscriptionID         string
+	MaxOutstandingMessages int
+	MaxOutstandingBytes    int
+}
+
+type queueSubscriber struct {
+	client *pubsub.Client
+	sub    *pubsub.Subscription
+}
+
+func NewQueueSubscriber(ctx context.Context, config QueueSubscriberConfig) (QueueSubscriber, error) {
+	if !config.Enable {
+		return &noopQueueSubscriber{}, nil
+	}
+
+	client, err := pubsub.NewClient(ctx, config.ProjectID)
+	if err != nil {
+		return nil, err
+	}
+
+	sub := client.Subscription(config.SubscriptionID)
+
+	maxOutstandingMsgs := config.MaxOutstandingMessages
+	if maxOutstandingMsgs == 0 {
+		maxOutstandingMsgs = 10000
+	}
+	maxOutstandingBytes := config.MaxOutstandingBytes
+	if maxOutstandingBytes == 0 {
+		maxOutstandingBytes = 1e9
+	}
+	sub.ReceiveSettings = pubsub.ReceiveSettings{
+		MaxOutstandingMessages: maxOutstandingMsgs,
+		MaxOutstandingBytes:    maxOutstandingBytes,
+	}
+
+	log.Info("Created Queue Subscriber", "projectID", config.ProjectID, "subscriptionID", config.SubscriptionID)
+	return &queueSubscriber{client, sub}, nil
+}
+
+func (q *queueSubscriber) ReceiveMessage(ctx context.Context, cb func(ctx context.Context, msg QueueSubscriberMessage)) error {
+	return q.sub.Receive(ctx, func(ctx context.Context, pmsg *pubsub.Message) {
+		cb(ctx, &queueSubscriberMessage{pmsg})
+	})
+}
+
+func (q *queueSubscriber) Close() error {
+	return q.client.Close()
+}
+
+type queueSubscriberMessage struct {
+	inner *pubsub.Message
+}
+
+func (q *queueSubscriberMessage) Data() []byte {
+	return q.inner.Data
+}
+
+func (q *queueSubscriberMessage) Ack() {
+	q.inner.Ack()
+}
+
+func (q *queueSubscriberMessage) Nack() {
+	q.inner.Nack()
+}
+
+type noopQueueSubscriber struct{}
+
+func (q *noopQueueSubscriber) ReceiveMessage(ctx context.Context, cb func(ctx context.Context, msg QueueSubscriberMessage)) error {
+	return nil
+}
+func (q *noopQueueSubscriber) Close() error { return nil }

l2geth/rollup/sync_service.go

 package rollup
 
 import (
+	"bytes"
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"math/big"
@@ -16,12 +18,14 @@ import (
 	"github.com/ethereum-optimism/optimism/l2geth/ethdb"
 	"github.com/ethereum-optimism/optimism/l2geth/event"
 	"github.com/ethereum-optimism/optimism/l2geth/log"
+	"github.com/ethereum-optimism/optimism/l2geth/rlp"
 
 	"github.com/ethereum-optimism/optimism/l2geth/core/rawdb"
 	"github.com/ethereum-optimism/optimism/l2geth/core/types"
 
 	"github.com/ethereum-optimism/optimism/l2geth/eth/gasprice"
 	"github.com/ethereum-optimism/optimism/l2geth/rollup/fees"
+	"github.com/ethereum-optimism/optimism/l2geth/rollup/pub"
 	"github.com/ethereum-optimism/optimism/l2geth/rollup/rcfg"
 )
 
@@ -68,10 +72,12 @@ type SyncService struct {
 	signer                         types.Signer
 	feeThresholdUp                 *big.Float
 	feeThresholdDown               *big.Float
+	txLogger                       pub.Publisher
+	queueSub                       QueueSubscriber
 }
 
 // NewSyncService returns an initialized sync service
-func NewSyncService(ctx context.Context, cfg Config, txpool *core.TxPool, bc *core.BlockChain, db ethdb.Database) (*SyncService, error) {
+func NewSyncService(ctx context.Context, cfg Config, txpool *core.TxPool, bc *core.BlockChain, db ethdb.Database, txLogger pub.Publisher, queueSub QueueSubscriber) (*SyncService, error) {
 	if bc == nil {
 		return nil, errors.New("Must pass BlockChain to SyncService")
 	}
@@ -143,6 +149,8 @@ func NewSyncService(ctx context.Context, cfg Config, txpool *core.TxPool, bc *co
 		signer:                         types.NewEIP155Signer(chainID),
 		feeThresholdDown:               cfg.FeeThresholdDown,
 		feeThresholdUp:                 cfg.FeeThresholdUp,
+		txLogger:                       txLogger,
+		queueSub:                       queueSub,
 	}
 
 	// The chainHeadSub is used to synchronize the SyncService with the chain.
@@ -157,7 +165,8 @@ func NewSyncService(ctx context.Context, cfg Config, txpool *core.TxPool, bc *co
 	// a remote server that indexes the layer one contracts. Place this
 	// code behind this if statement so that this can run without the
 	// requirement of the remote server being up.
-	if service.enable {
+	// If we're syncing from the Queue, then we can skip all this and rely on L2 published transactions
+	if service.enable && service.backend != BackendQueue {
 		// Ensure that the rollup client can connect to a remote server
 		// before starting. Retry until it can connect.
 		tEnsure := time.NewTicker(10 * time.Second)
@@ -418,6 +427,10 @@ func (s *SyncService) verify() error {
 		if err := s.syncTransactionsToTip(); err != nil {
 			return fmt.Errorf("Verifier cannot sync transactions with BackendL2: %w", err)
 		}
+	case BackendQueue:
+		if err := s.syncTransactionsFromQueue(); err != nil {
+			return fmt.Errorf("Verifier cannot sync transactions with BackendQueue: %w", err)
+		}
 	}
 	return nil
 }
@@ -872,6 +885,12 @@ func (s *SyncService) applyTransactionToTip(tx *types.Transaction) error {
 	// The index was set above so it is safe to dereference
 	log.Debug("Applying transaction to tip", "index", *tx.GetMeta().Index, "hash", tx.Hash().Hex(), "origin", tx.QueueOrigin().String())
 
+	// Log transaction to the failover log
+	if err := s.publishTransaction(tx); err != nil {
+		log.Error("Failed to publish transaction to log", "msg", err)
+		return fmt.Errorf("internal error: transaction logging failed")
+	}
+
 	txs := types.Transactions{tx}
 	errCh := make(chan error, 1)
 	s.txFeed.Send(core.NewTxsEvent{
@@ -1215,12 +1234,95 @@ func (s *SyncService) syncTransactionRange(start, end uint64, backend Backend) e
 	return nil
 }
 
+// syncTransactionsFromQueue will sync the earliest transaction from an external message queue
+func (s *SyncService) syncTransactionsFromQueue() error {
+	// we don't drop messages unless they're already applied
+	cb := func(ctx context.Context, msg QueueSubscriberMessage) {
+		var (
+			queuedTxMeta QueuedTransactionMeta
+			tx           types.Transaction
+			txMeta       *types.TransactionMeta
+		)
+		log.Debug("Reading transaction from queue", "json", string(msg.Data()))
+
+		if err := json.Unmarshal(msg.Data(), &queuedTxMeta); err != nil {
+			log.Error("Failed to unmarshal logged TransactionMeta", "msg", err)
+			msg.Nack()
+			return
+		}
+		if err := rlp.DecodeBytes(queuedTxMeta.RawTransaction, &tx); err != nil {
+			log.Error("decoding raw transaction failed", "msg", err)
+			msg.Nack()
+			return
+		}
+		if queuedTxMeta.L1BlockNumber == nil || queuedTxMeta.L1Timestamp == nil {
+			log.Error("Missing required queued transaction fields", "msg", string(msg.Data()))
+			msg.Nack()
+			return
+		}
+
+		txMeta = types.NewTransactionMeta(
+			queuedTxMeta.L1BlockNumber,
+			*queuedTxMeta.L1Timestamp,
+			queuedTxMeta.L1MessageSender,
+			*queuedTxMeta.QueueOrigin,
+			queuedTxMeta.Index,
+			queuedTxMeta.QueueIndex,
+			queuedTxMeta.RawTransaction)
+		tx.SetTransactionMeta(txMeta)
+
+		if readTx, _, _, _ := rawdb.ReadTransaction(s.db, tx.Hash()); readTx != nil {
+			msg.Ack()
+			return
+		}
+
+		if err := s.applyTransactionToTip(&tx); err != nil {
+			log.Error("Unable to apply transactions to tip from Queue", "msg", err)
+			msg.Nack()
+			return
+		}
+
+		log.Debug("Successfully applied queued transaction", "txhash", tx.Hash())
+		msg.Ack()
+	}
+
+	// This blocks until there's a new message in the queue or ctx deadline hits
+	return s.queueSub.ReceiveMessage(s.ctx, cb)
+}
+
 // SubscribeNewTxsEvent registers a subscription of NewTxsEvent and
 // starts sending event to the given channel.
 func (s *SyncService) SubscribeNewTxsEvent(ch chan<- core.NewTxsEvent) event.Subscription {
 	return s.scope.Track(s.txFeed.Subscribe(ch))
 }
 
+func (s *SyncService) publishTransaction(tx *types.Transaction) error {
+	rawTx := new(bytes.Buffer)
+	if err := tx.EncodeRLP(rawTx); err != nil {
+		return err
+	}
+
+	if tx.L1BlockNumber() == nil || tx.L1Timestamp() == 0 {
+		return fmt.Errorf("transaction doesn't contain required fields")
+	}
+
+	// Manually populate RawTransaction as it's not always available
+	txMeta := tx.GetMeta()
+	txMeta.RawTransaction = rawTx.Bytes()
+
+	txLog := AsQueuedTransactionMeta(txMeta)
+	encodedTxLog, err := json.Marshal(&txLog)
+	if err != nil {
+		return err
+	}
+
+	if err := s.txLogger.Publish(s.ctx, encodedTxLog); err != nil {
+		pubTxDropCounter.Inc(1)
+		return err
+	}
+	return nil
+}
+
 func stringify(i *uint64) string {
 	if i == nil {
 		return "<nil>"
@@ -1233,3 +1335,25 @@ func stringify(i *uint64) string {
 func (s *SyncService) IngestTransaction(tx *types.Transaction) error {
 	return s.applyTransaction(tx)
 }
+
+type QueuedTransactionMeta struct {
+	L1BlockNumber   *big.Int           `json:"l1BlockNumber"`
+	L1Timestamp     *uint64            `json:"l1Timestamp"`
+	L1MessageSender *common.Address    `json:"l1MessageSender"`
+	QueueOrigin     *types.QueueOrigin `json:"queueOrigin"`
+	Index           *uint64            `json:"index"`
+	QueueIndex      *uint64            `json:"queueIndex"`
+	RawTransaction  []byte             `json:"rawTransaction"`
+}
+
+func AsQueuedTransactionMeta(txMeta *types.TransactionMeta) *QueuedTransactionMeta {
+	return &QueuedTransactionMeta{
+		L1BlockNumber:   txMeta.L1BlockNumber,
+		L1Timestamp:     &txMeta.L1Timestamp,
+		L1MessageSender: txMeta.L1MessageSender,
+		QueueOrigin:     &txMeta.QueueOrigin,
+		Index:           txMeta.Index,
+		QueueIndex:      txMeta.QueueIndex,
+		RawTransaction:  txMeta.RawTransaction,
+	}
+}

l2geth/rollup/sync_service_test.go

 package rollup
 
 import (
+	"bytes"
 	"context"
 	"crypto/rand"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"math/big"
@@ -22,13 +24,14 @@ import (
 	"github.com/ethereum-optimism/optimism/l2geth/ethdb"
 	"github.com/ethereum-optimism/optimism/l2geth/event"
 	"github.com/ethereum-optimism/optimism/l2geth/params"
+	"github.com/ethereum-optimism/optimism/l2geth/rollup/pub"
 	"github.com/ethereum-optimism/optimism/l2geth/rollup/rcfg"
 )
 
 // Test that the timestamps are updated correctly.
 // This impacts execution, for `block.timestamp`
 func TestSyncServiceTimestampUpdate(t *testing.T) {
-	service, txCh, _, err := newTestSyncService(false, nil)
+	service, txCh, _, err := newTestSyncService(false, nil, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -111,7 +114,7 @@ func TestSyncServiceTimestampUpdate(t *testing.T) {
 
 // Test that the L1 blocknumber is updated correctly
 func TestSyncServiceL1BlockNumberUpdate(t *testing.T) {
-	service, txCh, _, err := newTestSyncService(false, nil)
+	service, txCh, _, err := newTestSyncService(false, nil, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -179,7 +182,7 @@ func TestSyncServiceL1BlockNumberUpdate(t *testing.T) {
 // after the transaction enqueued event is emitted. Set `false` as
 // the argument to start as a sequencer
 func TestSyncServiceTransactionEnqueued(t *testing.T) {
-	service, txCh, _, err := newTestSyncService(false, nil)
+	service, txCh, _, err := newTestSyncService(false, nil, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -241,7 +244,7 @@ func TestSyncServiceTransactionEnqueued(t *testing.T) {
 }
 
 func TestTransactionToTipNoIndex(t *testing.T) {
-	service, txCh, _, err := newTestSyncService(false, nil)
+	service, txCh, _, err := newTestSyncService(false, nil, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -292,7 +295,7 @@ func TestTransactionToTipNoIndex(t *testing.T) {
 }
 
 func TestTransactionToTipTimestamps(t *testing.T) {
-	service, txCh, _, err := newTestSyncService(false, nil)
+	service, txCh, _, err := newTestSyncService(false, nil, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -368,7 +371,7 @@ func TestTransactionToTipTimestamps(t *testing.T) {
 }
 
 func TestApplyIndexedTransaction(t *testing.T) {
-	service, txCh, _, err := newTestSyncService(true, nil)
+	service, txCh, _, err := newTestSyncService(true, nil, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -411,7 +414,7 @@ func TestApplyIndexedTransaction(t *testing.T) {
 }
 
 func TestApplyBatchedTransaction(t *testing.T) {
-	service, txCh, _, err := newTestSyncService(true, nil)
+	service, txCh, _, err := newTestSyncService(true, nil, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -448,7 +451,7 @@ func TestApplyBatchedTransaction(t *testing.T) {
 }
 
 func TestIsAtTip(t *testing.T) {
-	service, _, _, err := newTestSyncService(true, nil)
+	service, _, _, err := newTestSyncService(true, nil, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -521,7 +524,7 @@ func TestIsAtTip(t *testing.T) {
 }
 
 func TestSyncQueue(t *testing.T) {
-	service, txCh, _, err := newTestSyncService(true, nil)
+	service, txCh, _, err := newTestSyncService(true, nil, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -578,7 +581,7 @@ func TestSyncQueue(t *testing.T) {
 }
 
 func TestSyncServiceL1GasPrice(t *testing.T) {
-	service, _, _, err := newTestSyncService(true, nil)
+	service, _, _, err := newTestSyncService(true, nil, nil)
 	setupMockClient(service, map[string]interface{}{})
 
 	if err != nil {
@@ -616,7 +619,7 @@ func TestSyncServiceL1GasPrice(t *testing.T) {
 }
 
 func TestSyncServiceL2GasPrice(t *testing.T) {
-	service, _, _, err := newTestSyncService(true, nil)
+	service, _, _, err := newTestSyncService(true, nil, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -651,7 +654,7 @@ func TestSyncServiceL2GasPrice(t *testing.T) {
 }
 
 func TestSyncServiceGasPriceOracleOwnerAddress(t *testing.T) {
-	service, _, _, err := newTestSyncService(true, nil)
+	service, _, _, err := newTestSyncService(true, nil, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -685,7 +688,7 @@ func TestSyncServiceGasPriceOracleOwnerAddress(t *testing.T) {
 // Only the gas price oracle owner can send 0 gas price txs
 // when fees are enforced
 func TestFeeGasPriceOracleOwnerTransactions(t *testing.T) {
-	service, _, _, err := newTestSyncService(true, nil)
+	service, _, _, err := newTestSyncService(true, nil, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -741,7 +744,7 @@ func TestFeeGasPriceOracleOwnerTransactions(t *testing.T) {
 
 // Pass true to set as a verifier
 func TestSyncServiceSync(t *testing.T) {
-	service, txCh, sub, err := newTestSyncService(true, nil)
+	service, txCh, sub, err := newTestSyncService(true, nil, nil)
 	defer sub.Unsubscribe()
 	if err != nil {
 		t.Fatal(err)
@@ -793,7 +796,7 @@ func TestSyncServiceSync(t *testing.T) {
 }
 
 func TestInitializeL1ContextPostGenesis(t *testing.T) {
-	service, _, _, err := newTestSyncService(true, nil)
+	service, _, _, err := newTestSyncService(true, nil, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -896,7 +899,7 @@ func TestBadFeeThresholds(t *testing.T) {
 			cfg.FeeThresholdDown = tt.thresholdDown
 			cfg.FeeThresholdUp = tt.thresholdUp
 
-			_, err := NewSyncService(context.Background(), cfg, txPool, chain, db)
+			_, err := NewSyncService(context.Background(), cfg, txPool, chain, db, &pub.NoopPublisher{}, &noopQueueSubscriber{})
 			if !errors.Is(err, tt.err) {
 				t.Fatalf("%s: %s", name, err)
 			}
@@ -904,6 +907,155 @@ func TestBadFeeThresholds(t *testing.T) {
 	}
 }
 
+// Ensure that Transaction Logging precedes transaction apply
+func TestSyncServiceTransactionLog(t *testing.T) {
+	txLogger := newMockPublisher()
+	service, txCh, _, err := newTestSyncService(false, nil, txLogger)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	tx := mockTx()
+
+	go func() {
+		err = service.applyTransactionToTip(tx)
+	}()
+
+	txLogger.waitForPublish()
+
+	select {
+	case <-txCh:
+		t.Fatal("transaction applied before being logged")
+	default:
+	}
+	txLogger.unblockPublish()
+	<-txCh
+
+	loggedTxMeta := new(QueuedTransactionMeta)
+	buf := <-txLogger.msgs
+	if err := json.Unmarshal(buf, loggedTxMeta); err != nil {
+		t.Fatalf("unable to decode logged transaction meta: %v", err)
+	}
+
+	txMetaJSON, _ := tx.GetMeta().MarshalJSON()
+	loggedTxJSON, _ := json.Marshal(loggedTxMeta)
+	if !bytes.Equal(txMetaJSON, loggedTxJSON) {
+		t.Fatal("mismatched logged transactions")
+	}
+}
+
+func TestSyncServiceTransactionLogFailed(t *testing.T) {
+	txLogger := &failingMockPublisher{}
+	service, txCh, _, err := newTestSyncService(false, nil, txLogger)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	tx := mockTx()
+
+	errCh := make(chan error)
+	go func() {
+		err = service.applyTransactionToTip(tx)
+		errCh <- err
+		close(errCh)
+	}()
+
+	if err := <-errCh; err == nil {
+		t.Fatal("transaction applied with log failure")
+	}
+	select {
+	case <-txCh:
+		t.Fatal("transaction applied after log failed")
+	default:
+	}
+}
+
+func TestSyncServiceBackendQueue(t *testing.T) {
+	txLogger := newMockPublisher()
+	txLogger.unblockPublish()
+	activeService, _, _, err := newTestSyncService(false, nil, txLogger)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	queueSub := newMockQueueSubscriber()
+	followerService, followerTxCh, _, err := newTestSyncServiceWithQueueSubscriber(true, nil, &pub.NoopPublisher{}, queueSub)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	tx := mockTx()
+	go func() {
+		activeService.applyTransactionToTip(tx)
+	}()
+
+	go func() {
+		followerService.syncTransactionsFromQueue()
+	}()
+
+	// forward the logged transaction from the "active sequencer"
+	msg := <-txLogger.msgs
+	queueSub.ProduceMessage(msg)
+
+	event := <-followerTxCh
+	if len(event.Txs) != 1 {
+		t.Fatal("Unexpected number of transactions")
+	}
+
+	expected, _ := tx.MarshalJSON()
+	eventTx, _ := event.Txs[0].MarshalJSON()
+	if !bytes.Equal(expected, eventTx) {
+		t.Fatalf("invalid tx applied")
+	}
+	expectedMeta, _ := tx.GetMeta().MarshalJSON()
+	eventTxMeta, _ := event.Txs[0].GetMeta().MarshalJSON()
+	if !bytes.Equal(expectedMeta, eventTxMeta) {
+		t.Fatalf("invalid tx meta applied")
+	}
+
+	followerService.chainHeadCh <- core.ChainHeadEvent{}
+	subEvent := <-queueSub.events
+
+	if subEvent != mockAckEvent {
+		t.Fatalf("subscriber failed to acknowledge transaction")
+	}
+}
+
+func TestSyncServiceBackendQueueNack(t *testing.T) {
+	tx := mockTx()
+	tx.GetMeta().RawTransaction = nil
+	tests := map[string][]byte{
+		//"good txmeta":                      []byte("{\"l1BlockNumber\":0,\"l1Timestamp\":1647549225,\"l1MessageSender\":\"0x1487ef4dd5b0ca7610b85964371c1d8ab7c468eb\",\"queueOrigin\":\"sequencer\",\"index\":0,\"queueIndex\":0,\"rawTransaction\":\"34CAgJQrz3UmBr9M0373farCJhgNfaGiVICCAACAgIA=\"}"),
+		"invalid json":           nil,
+		"invalid RawTransaction": []byte("{\"l1BlockNumber\":0,\"l1Timestamp\":1647549225,\"l1MessageSender\":\"0x1487ef4dd5b0ca7610b85964371c1d8ab7c468eb\",\"queueOrigin\":\"sequencer\",\"index\":0,\"queueIndex\":0,\"rawTransaction\":\"\"}"),
+		"missing L1BlockNumber":  []byte("{\"l1Timestamp\":1647549225,\"l1MessageSender\":\"0x1487ef4dd5b0ca7610b85964371c1d8ab7c468eb\",\"queueOrigin\":\"sequencer\",\"index\":0,\"queueIndex\":0,\"rawTransaction\":\"34CAgJQrz3UmBr9M0373farCJhgNfaGiVICCAACAgIA=\"}"),
+		"missing L1Timestamp":    []byte("{\"l1BlockNumber\":0,\"l1MessageSender\":\"0x1487ef4dd5b0ca7610b85964371c1d8ab7c468eb\",\"queueOrigin\":\"sequencer\",\"index\":0,\"queueIndex\":0,\"rawTransaction\":\"34CAgJQrz3UmBr9M0373farCJhgNfaGiVICCAACAgIA=\"}"),
+	}
+
+	for name, msg := range tests {
+		t.Run(name, func(t *testing.T) {
+			queueSub := newMockQueueSubscriber()
+			service, _, _, err := newTestSyncServiceWithQueueSubscriber(true, nil, &pub.NoopPublisher{}, queueSub)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			go func() {
+				service.syncTransactionsFromQueue()
+			}()
+
+			queueSub.ProduceMessage(msg)
+
+			service.chainHeadCh <- core.ChainHeadEvent{}
+			event := <-queueSub.events
+
+			if event != mockNackEvent {
+				t.Fatalf("subscriber failed to acknowledge transaction")
+			}
+		})
+	}
+}
+
 func newTestSyncServiceDeps(isVerifier bool, alloc *common.Address) (Config, *core.TxPool, *core.BlockChain, ethdb.Database, error) {
 	chainCfg := params.AllEthashProtocolChanges
 	chainID := big.NewInt(420)
@@ -937,12 +1089,15 @@ func newTestSyncServiceDeps(isVerifier bool, alloc *common.Address) (Config, *co
 	return cfg, txPool, chain, db, nil
 }
 
-func newTestSyncService(isVerifier bool, alloc *common.Address) (*SyncService, chan core.NewTxsEvent, event.Subscription, error) {
+func newTestSyncServiceWithQueueSubscriber(isVerifier bool, alloc *common.Address, txLogger pub.Publisher, queueSub QueueSubscriber) (*SyncService, chan core.NewTxsEvent, event.Subscription, error) {
 	cfg, txPool, chain, db, err := newTestSyncServiceDeps(isVerifier, alloc)
 	if err != nil {
 		return nil, nil, nil, fmt.Errorf("Cannot initialize syncservice: %w", err)
 	}
-	service, err := NewSyncService(context.Background(), cfg, txPool, chain, db)
+	if txLogger == nil {
+		txLogger = &pub.NoopPublisher{}
+	}
+	service, err := NewSyncService(context.Background(), cfg, txPool, chain, db, txLogger, queueSub)
 	if err != nil {
 		return nil, nil, nil, fmt.Errorf("Cannot initialize syncservice: %w", err)
 	}
@@ -954,6 +1109,91 @@ func newTestSyncService(isVerifier bool, alloc *common.Address) (*SyncService, c
 	return service, txCh, sub, nil
 }
 
+func newTestSyncService(isVerifier bool, alloc *common.Address, txLogger pub.Publisher) (*SyncService, chan core.NewTxsEvent, event.Subscription, error) {
+	return newTestSyncServiceWithQueueSubscriber(isVerifier, alloc, txLogger, &noopQueueSubscriber{})
+}
+
+type mockPublisher struct {
+	wg1  sync.WaitGroup
+	wg2  sync.WaitGroup
+	msgs chan ([]byte)
+}
+
+func newMockPublisher() *mockPublisher {
+	p := mockPublisher{
+		msgs: make(chan []byte, 1024),
+	}
+	p.wg1.Add(1)
+	p.wg2.Add(1)
+	return &p
+}
+
+// unblockPublish allows a call to Publish to proceed
+func (p *mockPublisher) unblockPublish() {
+	p.wg1.Done()
+}
+
+// waitForPublish blocks until a call is made to Publish
+func (p *mockPublisher) waitForPublish() {
+	p.wg2.Wait()
+}
+
+func (p *mockPublisher) Publish(ctx context.Context, msg []byte) error {
+	p.wg2.Done()
+	p.wg1.Wait()
+	p.msgs <- msg
+	return nil
+}
+
+type failingMockPublisher struct{}
+
+func (p *failingMockPublisher) Publish(ctx context.Context, msg []byte) error {
+	return fmt.Errorf("publish failed")
+}
+
+type mockQueueEvent int
+
+const mockAckEvent mockQueueEvent = 0
+const mockNackEvent mockQueueEvent = 1
+
+type mockQueueSubscriber struct {
+	msgs   chan []byte
+	events chan mockQueueEvent
+}
+
+func newMockQueueSubscriber() *mockQueueSubscriber {
+	return &mockQueueSubscriber{make(chan []byte, 1024), make(chan mockQueueEvent, 1024)}
+}
+
+func (p *mockQueueSubscriber) ProduceMessage(msg []byte) {
+	p.msgs <- msg
+}
+
+func (p *mockQueueSubscriber) ReceiveMessage(ctx context.Context, cb func(ctx context.Context, msg QueueSubscriberMessage)) error {
+	msg := <-p.msgs
+	cb(ctx, &mockQueueSubscriberMessage{msg, p.events})
+	return nil
+}
+
+func (p *mockQueueSubscriber) Close() error { return nil }
+
+type mockQueueSubscriberMessage struct {
+	data   []byte
+	events chan<- mockQueueEvent
+}
+
+func (m *mockQueueSubscriberMessage) Data() []byte {
+	return m.data
+}
+
+func (m *mockQueueSubscriberMessage) Ack() {
+	m.events <- mockAckEvent
+}
+
+func (m *mockQueueSubscriberMessage) Nack() {
+	m.events <- mockNackEvent
+}
+
 type mockClient struct {
 	getEnqueueCallCount            int
 	getEnqueue                     []*types.Transaction
@@ -1108,6 +1348,7 @@ func mockTx() *types.Transaction {
 	gasLimit := uint64(0)
 	data := []byte{0x00, 0x00}
 	l1BlockNumber := big.NewInt(0)
+	queueIndex := uint64(0)
 
 	tx := types.NewTransaction(0, target, big.NewInt(0), gasLimit, big.NewInt(0), data)
 	meta := types.NewTransactionMeta(
@@ -1116,7 +1357,7 @@ func mockTx() *types.Transaction {
 		&l1TxOrigin,
 		types.QueueOriginSequencer,
 		nil,
-		nil,
+		&queueIndex,
 		nil,
 	)
 	tx.SetTransactionMeta(meta)

l2geth/rollup/types.go

@@ -26,6 +26,8 @@ func (s Backend) String() string {
 		return "l1"
 	case BackendL2:
 		return "l2"
+	case BackendQueue:
+		return "queue"
 	default:
 		return ""
 	}
@@ -38,6 +40,8 @@ func NewBackend(typ string) (Backend, error) {
 		return BackendL1, nil
 	case "l2":
 		return BackendL2, nil
+	case "queue":
+		return BackendQueue, nil
 	default:
 		return 0, fmt.Errorf("Unknown Backend: %s", typ)
 	}
@@ -54,6 +58,11 @@ const (
 	// around the transactions as they have not been submitted via a batch to
 	// L1.
 	BackendL2
+
+	// BackendQueue Backend involves syncing transactions from an external message queue.
+	// This has the same guarantees as BackendL2 as such transactions may not have been
+	// submitted via a batch to L1.
+	BackendQueue
 )
 
 func isCtcTxEqual(a, b *types.Transaction) bool {

ops/docker-compose.yml

@@ -136,9 +136,9 @@ services:
     image: ethereumoptimism/message-relayer:${DOCKER_TAG_MESSAGE_RELAYER:-latest}
     entrypoint: ./relayer.sh
     environment:
-      MESSAGE_RELAYER__L1RPCPROVIDER: http://l1_chain:8545
-      MESSAGE_RELAYER__L2RPCPROVIDER: http://l2geth:8545
-      MESSAGE_RELAYER__L1WALLET: '0xdbda1821b80551c9d65939329250298aa3472ba22feea921c0cf5d620ea67b97'
+      MESSAGE_RELAYER__L1_RPC_PROVIDER: http://l1_chain:8545
+      MESSAGE_RELAYER__L2_RPC_PROVIDER: http://l2geth:8545
+      MESSAGE_RELAYER__L1_WALLET: '0xdbda1821b80551c9d65939329250298aa3472ba22feea921c0cf5d620ea67b97'
       RETRIES: 60
 
   verifier:

ops/docker/Dockerfile.batch-submitter-service

@@ -15,5 +15,6 @@ FROM alpine:3.13
 RUN apk add --no-cache ca-certificates jq curl
 COPY --from=builder /go/batch-submitter/batch-submitter /usr/local/bin/
 
+WORKDIR /usr/local/bin
 COPY ./ops/scripts/batch-submitter.sh .
 ENTRYPOINT ["batch-submitter"]

ops/docker/Dockerfile.gas-oracle

@@ -2,7 +2,7 @@ FROM golang:1.15-alpine3.13 as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git jq bash
 
-ADD ./go/gas-oracle /gas-oracle
+COPY ./go/gas-oracle /gas-oracle
 RUN cd /gas-oracle && make gas-oracle
 
 FROM alpine:3.13
@@ -10,5 +10,6 @@ FROM alpine:3.13
 RUN apk add --no-cache ca-certificates jq curl
 COPY --from=builder /gas-oracle/gas-oracle /usr/local/bin/
 
+WORKDIR /usr/local/bin/
 COPY ./ops/scripts/gas-oracle.sh .
 ENTRYPOINT ["gas-oracle"]

ops/docker/Dockerfile.geth

@@ -15,6 +15,7 @@ FROM alpine:3.13
 RUN apk add --no-cache ca-certificates jq curl
 COPY --from=builder /go-ethereum/build/bin/geth /usr/local/bin/
 
+WORKDIR /usr/local/bin/
 EXPOSE 8545 8546 8547
 COPY ./ops/scripts/geth.sh .
 ENTRYPOINT ["geth"]

ops/docker/Dockerfile.l2geth-exporter

 FROM golang:1.16 as builder
 
-ADD ./go/l2geth-exporter /app/
+COPY ./go/l2geth-exporter /app/
 WORKDIR /app/
 RUN make build
 
-FROM alpine:latest
+FROM alpine:3.13
 RUN apk --no-cache add ca-certificates
 WORKDIR /root/
 COPY --from=builder /app/l2geth-exporter /usr/local/bin/

ops/docker/Dockerfile.op-exporter

 FROM golang:1.16 as builder
 
-ADD ./go/op-exporter /app/
+COPY ./go/op-exporter /app/
 WORKDIR /app/
 RUN make build
 
-FROM alpine:latest
+FROM alpine:3.13
 RUN apk --no-cache add ca-certificates
 WORKDIR /root/
 COPY --from=builder /app/op-exporter /usr/local/bin/

ops/docker/Dockerfile.packages

@@ -6,7 +6,12 @@
 # when used with typescript/hardhat: https://github.com/nomiclabs/hardhat/issues/1219
 FROM node:16.13-buster-slim as base
 
-RUN apt-get update -y && apt-get install -y git curl jq python3
+RUN apt-get update -y && apt-get install -y --no-install-recommends git \
+      curl \
+      jq \
+      python3 \
+      ca-certificates \
+  &&  rm -rf /var/lib/apt/lists/*
 
 # copy over the needed configs to run the dep installation
 # note: this approach can be a bit unhandy to maintain, but it allows
@@ -22,7 +27,7 @@ COPY packages/message-relayer/package.json ./packages/message-relayer/package.js
 COPY packages/replica-healthcheck/package.json ./packages/replica-healthcheck/package.json
 COPY integration-tests/package.json ./integration-tests/package.json
 
-RUN yarn install --frozen-lockfile
+RUN yarn install --frozen-lockfile && yarn cache clean
 
 COPY ./packages ./packages
 COPY ./integration-tests ./integration-tests
@@ -57,4 +62,4 @@ CMD ["npm", "run", "start"]
 
 FROM base as replica-healthcheck
 WORKDIR /opts/optimism/packages/replica-healthcheck
-ENTRYPOINT ["node", "dist/exec/run-healthcheck-server.js"]
+ENTRYPOINT ["npm", "run", "start"]

ops/docker/hardhat/Dockerfile

@@ -8,7 +8,7 @@ COPY [ \
 
 # install deps
 WORKDIR /hardhat
-RUN yarn install
+RUN yarn install && yarn cache clean
 
 # bring in dockerenv so that hardhat launches with host = 0.0.0.0 instead of 127.0.0.1
 # so that it's accessible from other boxes as well

ops/envs/batch-submitter.env

@@ -6,6 +6,8 @@ BATCH_SUBMITTER_LOG_LEVEL=debug
 BATCH_SUBMITTER_LOG_TERMINAL=true
 BATCH_SUBMITTER_MIN_L1_TX_SIZE=32
 BATCH_SUBMITTER_MAX_L1_TX_SIZE=90000
+BATCH_SUBMITTER_MIN_STATE_ROOT_ELEMENTS=1
+BATCH_SUBMITTER_MAX_STATE_ROOT_ELEMENTS=3000
 BATCH_SUBMITTER_MAX_BATCH_SUBMISSION_TIME=0
 BATCH_SUBMITTER_POLL_INTERVAL=500ms
 BATCH_SUBMITTER_NUM_CONFIRMATIONS=1

ops/scripts/relayer.sh

@@ -13,7 +13,7 @@ curl \
     --retry-connrefused \
     --retry $RETRIES \
     --retry-delay 1 \
-    $MESSAGE_RELAYER__L2RPCPROVIDER
+    $MESSAGE_RELAYER__L2_RPC_PROVIDER
 
 # go
 exec yarn start

package.json

@@ -13,7 +13,9 @@
       "ops/docker/hardhat"
     ],
     "nohoist": [
-      "examples/*"
+      "examples/*",
+      "**/typechain",
+      "**/@typechain/*"
     ]
   },
   "private": true,

packages/common-ts/src/base-service/base-service-v2.ts

@@ -107,15 +107,28 @@ export abstract class BaseServiceV2<
       params.loopIntervalMs !== undefined ? params.loopIntervalMs : 0
     this.state = {} as TServiceState
 
+    /**
+     * Special snake_case function which accounts for the common strings "L1" and "L2" which would
+     * normally be split into "L_1" and "L_2" by the snake_case function.
+     *
+     * @param str String to convert to snake_case.
+     * @returns snake_case string.
+     */
+    const opSnakeCase = (str: string) => {
+      const reg = /l_1|l_2/g
+      const repl = str.includes('l1') ? 'l1' : 'l2'
+      return snakeCase(str).replace(reg, repl)
+    }
+
     // Use commander as a way to communicate info about the service. We don't actually *use*
     // commander for anything besides the ability to run `ts-node ./service.ts --help`.
     const program = new Command()
     for (const [optionName, optionSpec] of Object.entries(params.optionsSpec)) {
       program.addOption(
         new Option(`--${optionName.toLowerCase()}`, `${optionSpec.desc}`).env(
-          `${params.name
-            .replace(/-/g, '_')
-            .toUpperCase()}__${optionName.toUpperCase()}`
+          `${opSnakeCase(
+            params.name.replace(/-/g, '_')
+          ).toUpperCase()}__${opSnakeCase(optionName).toUpperCase()}`
         )
       )
     }
@@ -136,7 +149,7 @@ export abstract class BaseServiceV2<
       'after',
       `\nMetrics:\n${Object.entries(params.metricsSpec)
         .map(([metricName, metricSpec]) => {
-          const parsedName = snakeCase(metricName)
+          const parsedName = opSnakeCase(metricName)
           return `  ${parsedName}${' '.repeat(
             longestMetricNameLength - parsedName.length + 2
           )}${metricSpec.desc} (type: ${metricSpec.type.name})`
@@ -183,7 +196,7 @@ export abstract class BaseServiceV2<
     this.metrics = Object.keys(params.metricsSpec || {}).reduce((acc, key) => {
       const spec = params.metricsSpec[key]
       acc[key] = new spec.type({
-        name: `${snakeCase(params.name)}_${snakeCase(key)}`,
+        name: `${opSnakeCase(params.name)}_${opSnakeCase(key)}`,
         help: spec.desc,
         labelNames: spec.labels || [],
       })
@@ -194,7 +207,7 @@ export abstract class BaseServiceV2<
 
     // Gracefully handle stop signals.
     const stop = async (signal: string) => {
-      this.logger.info(`stopping service`, { signal })
+      this.logger.info(`stopping service with signal`, { signal })
       await this.stop()
       process.exit(0)
     }
@@ -250,9 +263,11 @@ export abstract class BaseServiceV2<
     this.running = false
 
     // Wait until the main loop has finished.
+    this.logger.info('stopping service, waiting for main loop to finish')
     while (!this.done) {
       await sleep(1000)
     }
+    this.logger.info('main loop finished, goodbye!')
   }
 
   /**

packages/contracts/.depcheckrc

 ignores: [
   "@codechecks/client",
+  "@ethersproject/bytes",
+  "@ethersproject/providers",
   "@openzeppelin/contracts",
   "@openzeppelin/contracts-upgradeable",
   "@typechain/ethers-v5",

packages/contracts/README.md

@@ -23,7 +23,7 @@ import { SomeContract } from "@eth-optimism/contracts/path/to/SomeContract.sol";
 ```
 
 Note that the `/path/to/SomeContract.sol` is the path to the target contract within the [contracts folder](https://github.com/ethereum-optimism/optimism/tree/develop/packages/contracts/contracts) inside of this package.
-For example, the [L1CrossDomainMessenger](/contracts/L1/messaging/L1CrossDomainMessenger.sol) contract is located at `/contracts/L1/messaging/L1CrossDomainMessenger.sol`, relative to this README.
+For example, the [L1CrossDomainMessenger](https://github.com/ethereum-optimism/optimism/blob/develop/packages/contracts/contracts/L1/messaging/L1CrossDomainMessenger.sol) contract is located at `packages/contracts/contracts/L1/messaging/L1CrossDomainMessenger.sol`, relative to this README.
 You would therefore import the contract as:
 
 

packages/contracts/package.json

@@ -66,6 +66,9 @@
   "devDependencies": {
     "@codechecks/client": "^0.1.11",
     "@defi-wonderland/smock": "^2.0.2",
+    "@ethersproject/abi": "^5.6.0",
+    "@ethersproject/bytes": "^5.6.0",
+    "@ethersproject/providers": "^5.6.0",
     "@nomiclabs/ethereumjs-vm": "^4.2.2",
     "@nomiclabs/hardhat-ethers": "^2.0.2",
     "@nomiclabs/hardhat-etherscan": "^2.1.6",
@@ -79,6 +82,7 @@
     "@types/lodash": "^4.14.168",
     "@types/mkdirp": "^1.0.1",
     "@types/mocha": "^8.2.2",
+    "@types/node": "^17.0.21",
     "@typescript-eslint/eslint-plugin": "^4.26.0",
     "@typescript-eslint/parser": "^4.26.0",
     "babel-eslint": "^10.1.0",
@@ -115,6 +119,7 @@
     "solhint": "^3.3.6",
     "solhint-plugin-prettier": "^0.0.5",
     "solidity-coverage": "^0.7.17",
+    "squirrelly": "^8.0.8",
     "ts-generator": "0.0.8",
     "ts-node": "^10.0.0",
     "typechain": "^6.0.2",

packages/contracts/tasks/fetch-batches.ts

 import { ethers } from 'ethers'
 import { task } from 'hardhat/config'
 import * as types from 'hardhat/internal/core/params/argumentTypes'
-import { SequencerBatch } from '@eth-optimism/core-utils'
+import { BatchType, SequencerBatch } from '@eth-optimism/core-utils'
 
 import { names } from '../src/address-names'
 import { getContractFromArtifact } from '../src/deploy-utils'
@@ -51,7 +51,31 @@ task('fetch-batches')
       for (const event of events) {
         const tx = await provider.getTransaction(event.transactionHash)
         const batch = (SequencerBatch as any).fromHex(tx.data)
-        batches.push(batch.toJSON())
+
+        // Add an extra field to the resulting json
+        // so that the serialization sizes can be observed
+        const json = batch.toJSON()
+        json.sizes = {
+          legacy: 0,
+          zlib: 0,
+        }
+
+        // Create a copy of the batch to serialize in
+        // the alternative format
+        const copy = (SequencerBatch as any).fromHex(tx.data)
+        if (batch.type === BatchType.ZLIB) {
+          copy.type = BatchType.LEGACY
+          json.sizes.legacy = copy.encode().length
+          json.sizes.zlib = batch.encode().length
+        } else {
+          copy.type = BatchType.ZLIB
+          json.sizes.zlib = copy.encode().length
+          json.sizes.legacy = batch.encode().length
+        }
+
+        json.compressionRatio = json.sizes.zlib / json.sizes.legacy
+
+        batches.push(json)
       }
     }
 

packages/data-transport-layer/README.md

@@ -19,7 +19,7 @@ We run two sub-services, the [`L1IngestionService`](./src/services/l1-ingestion/
 
 See an example config at [.env.example](.env.example); copy into a `.env` file before running.
 
-`L1_TRANSPORT__L1_RPC_ENDPOINT` can be the JSON RPC endpoint of any L1 Ethereum node. `L1_TRANSPORT__ADDRESS_MANAGER` should be the contract addresss of the Address Manager on the corresponding network; find their values in the [Regenesis repo](https://github.com/ethereum-optimism/regenesis).
+`L1_TRANSPORT__L1_RPC_ENDPOINT` can be the JSON RPC endpoint of any L1 Ethereum node. `L1_TRANSPORT__ADDRESS_MANAGER` should be the contract addresss of the Address Manager on the corresponding network; find their values in the [contracts package](https://github.com/ethereum-optimism/optimism/tree/develop/packages/contracts/deployments).
 
 ### Building and usage
 
@@ -47,7 +47,7 @@ Here's the list of environment variables you can change:
 | Variable                                                | Default     | Description                                                                                                                                                   |
 | ------------------------------------------------------- | ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | DATA_TRANSPORT_LAYER__DB_PATH                           | ./db        | Path to the database for this service.                                                                                                                        |
-| DATA_TRANSPORT_LAYER__ADDRESS_MANAGER                   | -           | Address of the AddressManager contract on L1. See [regenesis](https://github.com/ethereum-optimism/regenesis) repo to find this address for mainnet or kovan. |
+| DATA_TRANSPORT_LAYER__ADDRESS_MANAGER                   | -           | Address of the AddressManager contract on L1. See [contracts](https://github.com/ethereum-optimism/optimism/tree/develop/packages/contracts/deployments) package to find this address for mainnet or kovan. |
 | DATA_TRANSPORT_LAYER__POLLING_INTERVAL                  | 5000        | Period of time between execution loops.                                                                                                                       |
 | DATA_TRANSPORT_LAYER__DANGEROUSLY_CATCH_ALL_ERRORS      | false       | If true, will catch all errors without throwing.                                                                                                              |
 | DATA_TRANSPORT_LAYER__CONFIRMATIONS                     | 12          | Number of confirmations to wait before accepting transactions as "canonical".                                                                                 |
@@ -55,9 +55,13 @@ Here's the list of environment variables you can change:
 | DATA_TRANSPORT_LAYER__SERVER_PORT                       | 7878        | Port to run the API on.                                                                                                                                       |
 | DATA_TRANSPORT_LAYER__SYNC_FROM_L1                      | true        | Whether or not to sync from L1.                                                                                                                               |
 | DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT                   | -           | RPC endpoint for an L1 node.                                                                                                                                  |
+| DATA_TRANSPORT_LAYER__L1_RPC_USER                       | -           | Basic Authentication user for the L1 node endpoint.                                                                                                           |
+| DATA_TRANSPORT_LAYER__L1_RPC_PASSWORD                   | -           | Basic Authentication password for the L1 node endpoint.                                                                                                       |
 | DATA_TRANSPORT_LAYER__LOGS_PER_POLLING_INTERVAL         | 2000        | Logs to sync per polling interval.                                                                                                                            |
 | DATA_TRANSPORT_LAYER__SYNC_FROM_L2                      | false       | Whether or not to sync from L2.                                                                                                                               |
 | DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT                   | -           | RPC endpoint for an L2 node.                                                                                                                                  |
+| DATA_TRANSPORT_LAYER__L2_RPC_USER                       | -           | Basic Authentication user for the L2 node endpoint.                                                                                                           |
+| DATA_TRANSPORT_LAYER__L2_RPC_PASSWORD                   | -           | Basic Authentication password for the L2 node endpoint.                                                                                                       |
 | DATA_TRANSPORT_LAYER__TRANSACTIONS_PER_POLLING_INTERVAL | 1000        | Number of L2 transactions to query per polling interval.                                                                                                      |
 | DATA_TRANSPORT_LAYER__L2_CHAIN_ID                       | -           | L2 chain ID.                                                                                                                                                  |
 | DATA_TRANSPORT_LAYER__LEGACY_SEQUENCER_COMPATIBILITY    | false       | Whether or not to enable "legacy" sequencer sync (without the custom `eth_getBlockRange` endpoint)                                                            |

packages/data-transport-layer/package.json

@@ -47,24 +47,20 @@
     "axios": "^0.21.1",
     "bcfg": "^0.1.6",
     "bfj": "^7.0.2",
-    "browser-or-node": "^1.3.0",
     "cors": "^2.8.5",
     "dotenv": "^10.0.0",
     "ethers": "^5.5.4",
     "express": "^4.17.1",
     "express-prom-bundle": "^6.3.6",
     "level": "^6.0.1",
-    "levelup": "^4.4.0",
-    "node-fetch": "^2.6.1"
+    "levelup": "^4.4.0"
   },
   "devDependencies": {
-    "@types/browser-or-node": "^1.3.0",
     "@types/chai": "^4.2.18",
     "@types/chai-as-promised": "^7.1.4",
     "@types/cors": "^2.8.9",
     "@types/levelup": "^4.3.0",
     "@types/mocha": "^8.2.2",
-    "@types/node-fetch": "^2.5.10",
     "@typescript-eslint/eslint-plugin": "^4.26.0",
     "@typescript-eslint/parser": "^4.26.0",
     "babel-eslint": "^10.1.0",

packages/data-transport-layer/src/client/client.ts

-// Only load if not in browser.
-import { isNode } from 'browser-or-node'
-
-// eslint-disable-next-line no-var
-declare var window: any
-
-const fetch = isNode ? require('node-fetch') : window.fetch
-
-import {
-  EnqueueResponse,
-  StateRootBatchResponse,
-  StateRootResponse,
-  SyncingResponse,
-  TransactionBatchResponse,
-  TransactionResponse,
-} from '../types'
-
-export class L1DataTransportClient {
-  constructor(private url: string) {}
-
-  public async syncing(): Promise<SyncingResponse> {
-    return this._get(`/eth/syncing`)
-  }
-
-  public async getEnqueueByIndex(index: number): Promise<EnqueueResponse> {
-    return this._get(`/enqueue/index/${index}`)
-  }
-
-  public async getLatestEnqueue(): Promise<EnqueueResponse> {
-    return this._get(`/enqueue/latest`)
-  }
-
-  public async getTransactionByIndex(
-    index: number
-  ): Promise<TransactionResponse> {
-    return this._get(`/transaction/index/${index}`)
-  }
-
-  public async getLatestTransacton(): Promise<TransactionResponse> {
-    return this._get(`/transaction/latest`)
-  }
-
-  public async getTransactionBatchByIndex(
-    index: number
-  ): Promise<TransactionBatchResponse> {
-    return this._get(`/batch/transaction/index/${index}`)
-  }
-
-  public async getLatestTransactionBatch(): Promise<TransactionBatchResponse> {
-    return this._get(`/batch/transaction/latest`)
-  }
-
-  public async getStateRootByIndex(index: number): Promise<StateRootResponse> {
-    return this._get(`/stateroot/index/${index}`)
-  }
-
-  public async getLatestStateRoot(): Promise<StateRootResponse> {
-    return this._get(`/stateroot/latest`)
-  }
-
-  public async getStateRootBatchByIndex(
-    index: number
-  ): Promise<StateRootBatchResponse> {
-    return this._get(`/batch/stateroot/index/${index}`)
-  }
-
-  public async getLatestStateRootBatch(): Promise<StateRootBatchResponse> {
-    return this._get(`/batch/stateroot/latest`)
-  }
-
-  private async _get<TResponse>(endpoint: string): Promise<TResponse> {
-    return (await fetch(`${this.url}${endpoint}`)).json()
-  }
-}

packages/data-transport-layer/src/index.ts

-export * from './client/client'
 export * from './types'

packages/data-transport-layer/src/services/l1-ingestion/service.ts

 /* Imports: External */
-import {
-  fromHexString,
-  FallbackProvider,
-  sleep,
-} from '@eth-optimism/core-utils'
+import { fromHexString, sleep } from '@eth-optimism/core-utils'
 import { BaseService, Metrics } from '@eth-optimism/common-ts'
 import { TypedEvent } from '@eth-optimism/contracts/dist/types/common'
-import { BaseProvider } from '@ethersproject/providers'
+import { BaseProvider, StaticJsonRpcProvider } from '@ethersproject/providers'
 import { LevelUp } from 'levelup'
 import { constants } from 'ethers'
 import { Gauge, Counter } from 'prom-client'
@@ -114,8 +110,11 @@ export class L1IngestionService extends BaseService<L1IngestionServiceOptions> {
     this.l1IngestionMetrics = registerMetrics(this.metrics)
 
     if (typeof this.options.l1RpcProvider === 'string') {
-      this.state.l1RpcProvider = FallbackProvider(this.options.l1RpcProvider, {
-        'User-Agent': 'data-transport-layer',
+      this.state.l1RpcProvider = new StaticJsonRpcProvider({
+        url: this.options.l1RpcProvider,
+        user: this.options.l1RpcProviderUser,
+        password: this.options.l1RpcProviderPassword,
+        headers: { 'User-Agent': 'data-transport-layer' },
       })
     } else {
       this.state.l1RpcProvider = this.options.l1RpcProvider

packages/data-transport-layer/src/services/l2-ingestion/service.ts

@@ -93,6 +93,8 @@ export class L2IngestionService extends BaseService<L2IngestionServiceOptions> {
       typeof this.options.l2RpcProvider === 'string'
         ? new StaticJsonRpcProvider({
             url: this.options.l2RpcProvider,
+            user: this.options.l2RpcProviderUser,
+            password: this.options.l2RpcProviderPassword,
             headers: { 'User-Agent': 'data-transport-layer' },
           })
         : this.options.l2RpcProvider

packages/data-transport-layer/src/services/main/service.ts

@@ -20,8 +20,12 @@ export interface L1DataTransportServiceOptions {
   dangerouslyCatchAllErrors?: boolean
   hostname: string
   l1RpcProvider: string
+  l1RpcProviderUser?: string
+  l1RpcProviderPassword?: string
   l2ChainId: number
   l2RpcProvider: string
+  l2RpcProviderUser?: string
+  l2RpcProviderPassword?: string
   metrics?: Metrics
   dbPath: string
   logsPerPollingInterval: number

packages/data-transport-layer/src/services/run.ts

@@ -26,6 +26,8 @@ type ethNetwork = 'mainnet' | 'kovan' | 'goerli'
       hostname: config.str('server-hostname', 'localhost'),
       confirmations: config.uint('confirmations', 35),
       l1RpcProvider: config.str('l1-rpc-endpoint'),
+      l1RpcProviderUser: config.str('l1-rpc-user'),
+      l1RpcProviderPassword: config.str('l1-rpc-password'),
       addressManager: config.str('address-manager'),
       pollingInterval: config.uint('polling-interval', 5000),
       logsPerPollingInterval: config.uint('logs-per-polling-interval', 2000),
@@ -34,6 +36,8 @@ type ethNetwork = 'mainnet' | 'kovan' | 'goerli'
         false
       ),
       l2RpcProvider: config.str('l2-rpc-endpoint'),
+      l2RpcProviderUser: config.str('l2-rpc-user'),
+      l2RpcProviderPassword: config.str('l2-rpc-password'),
       l2ChainId: config.uint('l2-chain-id'),
       syncFromL1: config.bool('sync-from-l1', true),
       syncFromL2: config.bool('sync-from-l2', false),

packages/message-relayer/.env.example

 # URL pointing to an L1 RPC provider
-MESSAGE_RELAYER__L1RPCPROVIDER=
+MESSAGE_RELAYER__L1_RPC_PROVIDER=
 
 # URL pointing to an L2 RPC provider
-MESSAGE_RELAYER__L2RPCPROVIDER=
+MESSAGE_RELAYER__L2_RPC_PROVIDER=
 
 # Private key for a wallet with ETH on L1
-MESSAGE_RELAYER__L1WALLET=
+MESSAGE_RELAYER__L1_WALLET=
 
 # Optional, L2 block height to start relaying messages from (default is 0)
-MESSAGE_RELAYER__FROML2TRANSACTIONINDEX=
+MESSAGE_RELAYER__FROM_L2_TRANSACTION_INDEX=

packages/message-relayer/package.json

 {
+  "private": true,
   "name": "@eth-optimism/message-relayer",
   "version": "0.4.0",
   "description": "[Optimism] Service for automatically relaying L2 to L1 transactions",

packages/replica-healthcheck/.env.example

-HEALTHCHECK__REFERENCERPCPROVIDER=https://mainnet.optimism.io
-HEALTHCHECK__TARGETRPCPROVIDER=http://localhost:9991
+HEALTHCHECK__REFERENCE_RPC_PROVIDER=https://mainnet.optimism.io
+HEALTHCHECK__TARGET_RPC_PROVIDER=http://localhost:9991

packages/sdk/src/cross-chain-messenger.ts

@@ -208,22 +208,22 @@ export class CrossChainMessenger implements ICrossChainMessenger {
       })
   }
 
-  public async getMessagesByAddress(
-    address: AddressLike,
-    opts?: {
-      direction?: MessageDirection
-      fromBlock?: NumberLike
-      toBlock?: NumberLike
-    }
-  ): Promise<CrossChainMessage[]> {
-    throw new Error(`
-      The function getMessagesByAddress is currently not enabled because the sender parameter of
-      the SentMessage event is not indexed within the CrossChainMessenger contracts.
-      getMessagesByAddress will be enabled by plugging in an Optimism Indexer (coming soon).
-      See the following issue on GitHub for additional context:
-      https://github.com/ethereum-optimism/optimism/issues/2129
-    `)
-  }
+  // public async getMessagesByAddress(
+  //   address: AddressLike,
+  //   opts?: {
+  //     direction?: MessageDirection
+  //     fromBlock?: NumberLike
+  //     toBlock?: NumberLike
+  //   }
+  // ): Promise<CrossChainMessage[]> {
+  //   throw new Error(`
+  //     The function getMessagesByAddress is currently not enabled because the sender parameter of
+  //     the SentMessage event is not indexed within the CrossChainMessenger contracts.
+  //     getMessagesByAddress will be enabled by plugging in an Optimism Indexer (coming soon).
+  //     See the following issue on GitHub for additional context:
+  //     https://github.com/ethereum-optimism/optimism/issues/2129
+  //   `)
+  // }
 
   public async getBridgeForTokenPair(
     l1Token: AddressLike,

packages/sdk/src/interfaces/cross-chain-messenger.ts

@@ -103,27 +103,30 @@ export interface ICrossChainMessenger {
     }
   ): Promise<CrossChainMessage[]>
 
-  /**
-   * Retrieves all cross chain messages sent by a particular address.
-   *
-   * @param address Address to search for messages from.
-   * @param opts Options object.
-   * @param opts.direction Direction to search for messages in. If not provided, will attempt to
-   * find all messages in both directions.
-   * @param opts.fromBlock Block to start searching for messages from. If not provided, will start
-   * from the first block (block #0).
-   * @param opts.toBlock Block to stop searching for messages at. If not provided, will stop at the
-   * latest known block ("latest").
-   * @returns All cross chain messages sent by the particular address.
-   */
-  getMessagesByAddress(
-    address: AddressLike,
-    opts?: {
-      direction?: MessageDirection
-      fromBlock?: NumberLike
-      toBlock?: NumberLike
-    }
-  ): Promise<CrossChainMessage[]>
+  // TODO: Make this function work. Likely requires indexer or the function will be prohibitively
+  // slow to query all of the necessary data.
+  //
+  // /**
+  //  * Retrieves all cross chain messages sent by a particular address.
+  //  *
+  //  * @param address Address to search for messages from.
+  //  * @param opts Options object.
+  //  * @param opts.direction Direction to search for messages in. If not provided, will attempt to
+  //  * find all messages in both directions.
+  //  * @param opts.fromBlock Block to start searching for messages from. If not provided, will start
+  //  * from the first block (block #0).
+  //  * @param opts.toBlock Block to stop searching for messages at. If not provided, will stop at the
+  //  * latest known block ("latest").
+  //  * @returns All cross chain messages sent by the particular address.
+  //  */
+  // getMessagesByAddress(
+  //   address: AddressLike,
+  //   opts?: {
+  //     direction?: MessageDirection
+  //     fromBlock?: NumberLike
+  //     toBlock?: NumberLike
+  //   }
+  // ): Promise<CrossChainMessage[]>
 
   /**
    * Finds the appropriate bridge adapter for a given L1<>L2 token pair. Will throw if no bridges

packages/sdk/test/cross-chain-messenger.spec.ts

@@ -383,7 +383,8 @@ describe('CrossChainMessenger', () => {
     })
   })
 
-  describe('getMessagesByAddress', () => {
+  // Skipped until getMessagesByAddress can be implemented
+  describe.skip('getMessagesByAddress', () => {
     describe('when the address has sent messages', () => {
       describe('when no direction is specified', () => {
         it('should find all messages sent by the address')

packages/smock/README.md

-# @eth-optimism/smock
-
-## NOTICE
-
-Smock v1 is being deprecated.
-Please migrate to [Smock v2](https://github.com/defi-wonderland/smock).
-You can find an archive of the Smock v1 codebase at [optimism@d337713c91](https://github.com/ethereum-optimism/optimism/tree/d337713c91c6634f546b8d6572392c0784ab8217/packages/smock).

yarn.lock

@@ -695,6 +695,21 @@
     "@ethersproject/properties" "^5.4.0"
     "@ethersproject/strings" "^5.4.0"
 
+"@ethersproject/abi@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.6.0.tgz#ea07cbc1eec2374d32485679c12408005895e9f3"
+  integrity sha512-AhVByTwdXCc2YQ20v300w6KVHle9g2OFc28ZAFCPnJyEpkv1xKXjZcSTgWOlv1i+0dqlgF8RCF2Rn2KC1t+1Vg==
+  dependencies:
+    "@ethersproject/address" "^5.6.0"
+    "@ethersproject/bignumber" "^5.6.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/constants" "^5.6.0"
+    "@ethersproject/hash" "^5.6.0"
+    "@ethersproject/keccak256" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
+    "@ethersproject/strings" "^5.6.0"
+
 "@ethersproject/abstract-provider@5.4.1", "@ethersproject/abstract-provider@^5.4.0":
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.4.1.tgz#e404309a29f771bd4d28dbafadcaa184668c2a6e"
@@ -721,6 +736,19 @@
     "@ethersproject/transactions" "^5.5.0"
     "@ethersproject/web" "^5.5.0"
 
+"@ethersproject/abstract-provider@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.6.0.tgz#0c4ac7054650dbd9c476cf5907f588bbb6ef3061"
+  integrity sha512-oPMFlKLN+g+y7a79cLK3WiLcjWFnZQtXWgnLAbHZcN3s7L4v90UHpTOrLk+m3yr0gt+/h9STTM6zrr7PM8uoRw==
+  dependencies:
+    "@ethersproject/bignumber" "^5.6.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/networks" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
+    "@ethersproject/transactions" "^5.6.0"
+    "@ethersproject/web" "^5.6.0"
+
 "@ethersproject/abstract-signer@5.4.1", "@ethersproject/abstract-signer@^5.4.0", "@ethersproject/abstract-signer@^5.4.1":
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.4.1.tgz#e4e9abcf4dd4f1ba0db7dff9746a5f78f355ea81"
@@ -743,6 +771,17 @@
     "@ethersproject/logger" "^5.5.0"
     "@ethersproject/properties" "^5.5.0"
 
+"@ethersproject/abstract-signer@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.6.0.tgz#9cd7ae9211c2b123a3b29bf47aab17d4d016e3e7"
+  integrity sha512-WOqnG0NJKtI8n0wWZPReHtaLkDByPL67tn4nBaDAhmVq8sjHTPbCdz4DRhVu/cfTOvfy9w3iq5QZ7BX7zw56BQ==
+  dependencies:
+    "@ethersproject/abstract-provider" "^5.6.0"
+    "@ethersproject/bignumber" "^5.6.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
+
 "@ethersproject/address@5.4.0", "@ethersproject/address@>=5.0.0-beta.128", "@ethersproject/address@^5.0.2", "@ethersproject/address@^5.0.4", "@ethersproject/address@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.4.0.tgz#ba2d00a0f8c4c0854933b963b9a3a9f6eb4a37a3"
@@ -765,6 +804,17 @@
     "@ethersproject/logger" "^5.5.0"
     "@ethersproject/rlp" "^5.5.0"
 
+"@ethersproject/address@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.6.0.tgz#13c49836d73e7885fc148ad633afad729da25012"
+  integrity sha512-6nvhYXjbXsHPS+30sHZ+U4VMagFC/9zAk6Gd/h3S21YW4+yfb0WfRtaAIZ4kfM4rrVwqiy284LP0GtL5HXGLxQ==
+  dependencies:
+    "@ethersproject/bignumber" "^5.6.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/keccak256" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/rlp" "^5.6.0"
+
 "@ethersproject/base64@5.4.0", "@ethersproject/base64@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.4.0.tgz#7252bf65295954c9048c7ca5f43e5c86441b2a9a"
@@ -779,6 +829,13 @@
   dependencies:
     "@ethersproject/bytes" "^5.5.0"
 
+"@ethersproject/base64@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.6.0.tgz#a12c4da2a6fb86d88563216b0282308fc15907c9"
+  integrity sha512-2Neq8wxJ9xHxCF9TUgmKeSh9BXJ6OAxWfeGWvbauPh8FuHEjamgHilllx8KkSd5ErxyHIX7Xv3Fkcud2kY9ezw==
+  dependencies:
+    "@ethersproject/bytes" "^5.6.0"
+
 "@ethersproject/basex@5.4.0", "@ethersproject/basex@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.4.0.tgz#0a2da0f4e76c504a94f2b21d3161ed9438c7f8a6"
@@ -795,6 +852,14 @@
     "@ethersproject/bytes" "^5.5.0"
     "@ethersproject/properties" "^5.5.0"
 
+"@ethersproject/basex@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.6.0.tgz#9ea7209bf0a1c3ddc2a90f180c3a7f0d7d2e8a69"
+  integrity sha512-qN4T+hQd/Md32MoJpc69rOwLYRUXwjTlhHDIeUkUmiN/JyWkkLLMoG0TqvSQKNqZOMgN5stbUYN6ILC+eD7MEQ==
+  dependencies:
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
+
 "@ethersproject/bignumber@5.4.1", "@ethersproject/bignumber@>=5.0.0-beta.130", "@ethersproject/bignumber@^5.0.7", "@ethersproject/bignumber@^5.4.0":
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.4.1.tgz#64399d3b9ae80aa83d483e550ba57ea062c1042d"
@@ -822,6 +887,15 @@
     "@ethersproject/logger" "^5.4.0"
     bn.js "^4.11.9"
 
+"@ethersproject/bignumber@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.6.0.tgz#116c81b075c57fa765a8f3822648cf718a8a0e26"
+  integrity sha512-VziMaXIUHQlHJmkv1dlcd6GY2PmT0khtAqaMctCIDogxkrarMzA9L94KN1NeXqqOfFD6r0sJT3vCTOFSmZ07DA==
+  dependencies:
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    bn.js "^4.11.9"
+
 "@ethersproject/bytes@5.4.0", "@ethersproject/bytes@>=5.0.0-beta.129", "@ethersproject/bytes@^5.0.4", "@ethersproject/bytes@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.4.0.tgz#56fa32ce3bf67153756dbaefda921d1d4774404e"
@@ -836,6 +910,13 @@
   dependencies:
     "@ethersproject/logger" "^5.5.0"
 
+"@ethersproject/bytes@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.6.0.tgz#81652f2a0e04533575befadce555213c11d8aa20"
+  integrity sha512-3hJPlYemb9V4VLfJF5BfN0+55vltPZSHU3QKUyP9M3Y2TcajbiRrz65UG+xVHOzBereB1b9mn7r12o177xgN7w==
+  dependencies:
+    "@ethersproject/logger" "^5.6.0"
+
 "@ethersproject/constants@5.4.0", "@ethersproject/constants@>=5.0.0-beta.128", "@ethersproject/constants@^5.0.4", "@ethersproject/constants@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.4.0.tgz#ee0bdcb30bf1b532d2353c977bf2ef1ee117958a"
@@ -850,6 +931,13 @@
   dependencies:
     "@ethersproject/bignumber" "^5.5.0"
 
+"@ethersproject/constants@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.6.0.tgz#55e3eb0918584d3acc0688e9958b0cedef297088"
+  integrity sha512-SrdaJx2bK0WQl23nSpV/b1aq293Lh0sUaZT/yYKPDKn4tlAbkH96SPJwIhwSwTsoQQZxuh1jnqsKwyymoiBdWA==
+  dependencies:
+    "@ethersproject/bignumber" "^5.6.0"
+
 "@ethersproject/contracts@5.4.1", "@ethersproject/contracts@^5.4.1":
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.4.1.tgz#3eb4f35b7fe60a962a75804ada2746494df3e470"
@@ -922,6 +1010,20 @@
     "@ethersproject/properties" "^5.5.0"
     "@ethersproject/strings" "^5.5.0"
 
+"@ethersproject/hash@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.6.0.tgz#d24446a5263e02492f9808baa99b6e2b4c3429a2"
+  integrity sha512-fFd+k9gtczqlr0/BruWLAu7UAOas1uRRJvOR84uDf4lNZ+bTkGl366qvniUZHKtlqxBRU65MkOobkmvmpHU+jA==
+  dependencies:
+    "@ethersproject/abstract-signer" "^5.6.0"
+    "@ethersproject/address" "^5.6.0"
+    "@ethersproject/bignumber" "^5.6.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/keccak256" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
+    "@ethersproject/strings" "^5.6.0"
+
 "@ethersproject/hdnode@5.4.0", "@ethersproject/hdnode@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.4.0.tgz#4bc9999b9a12eb5ce80c5faa83114a57e4107cac"
@@ -1012,6 +1114,14 @@
     "@ethersproject/bytes" "^5.5.0"
     js-sha3 "0.8.0"
 
+"@ethersproject/keccak256@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.6.0.tgz#fea4bb47dbf8f131c2e1774a1cecbfeb9d606459"
+  integrity sha512-tk56BJ96mdj/ksi7HWZVWGjCq0WVl/QvfhFQNeL8fxhBlGoP+L80uDCiQcpJPd+2XxkivS3lwRm3E0CXTfol0w==
+  dependencies:
+    "@ethersproject/bytes" "^5.6.0"
+    js-sha3 "0.8.0"
+
 "@ethersproject/logger@5.4.0", "@ethersproject/logger@>=5.0.0-beta.129", "@ethersproject/logger@^5.0.5", "@ethersproject/logger@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.4.0.tgz#f39adadf62ad610c420bcd156fd41270e91b3ca9"
@@ -1022,6 +1132,11 @@
   resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.5.0.tgz#0c2caebeff98e10aefa5aef27d7441c7fd18cf5d"
   integrity sha512-rIY/6WPm7T8n3qS2vuHTUBPdXHl+rGxWxW5okDfo9J4Z0+gRRZT0msvUdIJkE4/HS29GUMziwGaaKO2bWONBrg==
 
+"@ethersproject/logger@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.6.0.tgz#d7db1bfcc22fd2e4ab574cba0bb6ad779a9a3e7a"
+  integrity sha512-BiBWllUROH9w+P21RzoxJKzqoqpkyM1pRnEKG69bulE9TSQD8SAIvTQqIMZmmCO8pUNkgLP1wndX1gKghSpBmg==
+
 "@ethersproject/networks@5.4.2", "@ethersproject/networks@^5.4.0":
   version "5.4.2"
   resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.4.2.tgz#2247d977626e97e2c3b8ee73cd2457babde0ce35"
@@ -1036,6 +1151,13 @@
   dependencies:
     "@ethersproject/logger" "^5.5.0"
 
+"@ethersproject/networks@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.6.0.tgz#486d03fff29b4b6b5414d47a232ded09fe10de5e"
+  integrity sha512-DaVzgyThzHgSDLuURhvkp4oviGoGe9iTZW4jMEORHDRCgSZ9K9THGFKqL+qGXqPAYLEgZTf5z2w56mRrPR1MjQ==
+  dependencies:
+    "@ethersproject/logger" "^5.6.0"
+
 "@ethersproject/pbkdf2@5.4.0", "@ethersproject/pbkdf2@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.4.0.tgz#ed88782a67fda1594c22d60d0ca911a9d669641c"
@@ -1066,6 +1188,13 @@
   dependencies:
     "@ethersproject/logger" "^5.5.0"
 
+"@ethersproject/properties@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.6.0.tgz#38904651713bc6bdd5bdd1b0a4287ecda920fa04"
+  integrity sha512-szoOkHskajKePTJSZ46uHUWWkbv7TzP2ypdEK6jGMqJaEt2sb0jCgfBo0gH0m2HBpRixMuJ6TBRaQCF7a9DoCg==
+  dependencies:
+    "@ethersproject/logger" "^5.6.0"
+
 "@ethersproject/providers@5.4.4":
   version "5.4.4"
   resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.4.4.tgz#6729120317942fc0ab0ecdb35e944ec6bbedb795"
@@ -1141,6 +1270,31 @@
     bech32 "1.1.4"
     ws "7.4.6"
 
+"@ethersproject/providers@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.6.0.tgz#08ec8e2666771e3a347e66c8f664a2af97366534"
+  integrity sha512-6+5PKXTWAttJWFWF8+xCDTCa2/dtq9BNrdKQHGl0IyIOwj99vM6OeThmIRcsIAzIOb8m0XS6w+1KFZwrf3j9nw==
+  dependencies:
+    "@ethersproject/abstract-provider" "^5.6.0"
+    "@ethersproject/abstract-signer" "^5.6.0"
+    "@ethersproject/address" "^5.6.0"
+    "@ethersproject/basex" "^5.6.0"
+    "@ethersproject/bignumber" "^5.6.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/constants" "^5.6.0"
+    "@ethersproject/hash" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/networks" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
+    "@ethersproject/random" "^5.6.0"
+    "@ethersproject/rlp" "^5.6.0"
+    "@ethersproject/sha2" "^5.6.0"
+    "@ethersproject/strings" "^5.6.0"
+    "@ethersproject/transactions" "^5.6.0"
+    "@ethersproject/web" "^5.6.0"
+    bech32 "1.1.4"
+    ws "7.4.6"
+
 "@ethersproject/random@5.4.0", "@ethersproject/random@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.4.0.tgz#9cdde60e160d024be39cc16f8de3b9ce39191e16"
@@ -1165,6 +1319,14 @@
     "@ethersproject/bytes" "^5.5.0"
     "@ethersproject/logger" "^5.5.0"
 
+"@ethersproject/random@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.6.0.tgz#1505d1ab6a250e0ee92f436850fa3314b2cb5ae6"
+  integrity sha512-si0PLcLjq+NG/XHSZz90asNf+YfKEqJGVdxoEkSukzbnBgC8rydbgbUgBbBGLeHN4kAJwUFEKsu3sCXT93YMsw==
+  dependencies:
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+
 "@ethersproject/rlp@5.4.0", "@ethersproject/rlp@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.4.0.tgz#de61afda5ff979454e76d3b3310a6c32ad060931"
@@ -1181,6 +1343,14 @@
     "@ethersproject/bytes" "^5.5.0"
     "@ethersproject/logger" "^5.5.0"
 
+"@ethersproject/rlp@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.6.0.tgz#55a7be01c6f5e64d6e6e7edb6061aa120962a717"
+  integrity sha512-dz9WR1xpcTL+9DtOT/aDO+YyxSSdO8YIS0jyZwHHSlAmnxA6cKU3TrTd4Xc/bHayctxTgGLYNuVVoiXE4tTq1g==
+  dependencies:
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+
 "@ethersproject/sha2@5.4.0", "@ethersproject/sha2@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.4.0.tgz#c9a8db1037014cbc4e9482bd662f86c090440371"
@@ -1199,6 +1369,15 @@
     "@ethersproject/logger" "^5.5.0"
     hash.js "1.1.7"
 
+"@ethersproject/sha2@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.6.0.tgz#364c4c11cc753bda36f31f001628706ebadb64d9"
+  integrity sha512-1tNWCPFLu1n3JM9t4/kytz35DkuF9MxqkGGEHNauEbaARdm2fafnOyw1s0tIQDPKF/7bkP1u3dbrmjpn5CelyA==
+  dependencies:
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    hash.js "1.1.7"
+
 "@ethersproject/signing-key@5.4.0", "@ethersproject/signing-key@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.4.0.tgz#2f05120984e81cf89a3d5f6dec5c68ee0894fbec"
@@ -1223,6 +1402,18 @@
     elliptic "6.5.4"
     hash.js "1.1.7"
 
+"@ethersproject/signing-key@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.6.0.tgz#4f02e3fb09e22b71e2e1d6dc4bcb5dafa69ce042"
+  integrity sha512-S+njkhowmLeUu/r7ir8n78OUKx63kBdMCPssePS89So1TH4hZqnWFsThEd/GiXYp9qMxVrydf7KdM9MTGPFukA==
+  dependencies:
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
+    bn.js "^4.11.9"
+    elliptic "6.5.4"
+    hash.js "1.1.7"
+
 "@ethersproject/solidity@5.4.0", "@ethersproject/solidity@^5.0.9", "@ethersproject/solidity@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.4.0.tgz#1305e058ea02dc4891df18b33232b11a14ece9ec"
@@ -1264,6 +1455,15 @@
     "@ethersproject/constants" "^5.5.0"
     "@ethersproject/logger" "^5.5.0"
 
+"@ethersproject/strings@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.6.0.tgz#9891b26709153d996bf1303d39a7f4bc047878fd"
+  integrity sha512-uv10vTtLTZqrJuqBZR862ZQjTIa724wGPWQqZrofaPI/kUsf53TBG0I0D+hQ1qyNtllbNzaW+PDPHHUI6/65Mg==
+  dependencies:
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/constants" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+
 "@ethersproject/transactions@5.4.0", "@ethersproject/transactions@^5.0.0-beta.135", "@ethersproject/transactions@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.4.0.tgz#a159d035179334bd92f340ce0f77e83e9e1522e0"
@@ -1294,6 +1494,21 @@
     "@ethersproject/rlp" "^5.5.0"
     "@ethersproject/signing-key" "^5.5.0"
 
+"@ethersproject/transactions@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.6.0.tgz#4b594d73a868ef6e1529a2f8f94a785e6791ae4e"
+  integrity sha512-4HX+VOhNjXHZyGzER6E/LVI2i6lf9ejYeWD6l4g50AdmimyuStKc39kvKf1bXWQMg7QNVh+uC7dYwtaZ02IXeg==
+  dependencies:
+    "@ethersproject/address" "^5.6.0"
+    "@ethersproject/bignumber" "^5.6.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/constants" "^5.6.0"
+    "@ethersproject/keccak256" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
+    "@ethersproject/rlp" "^5.6.0"
+    "@ethersproject/signing-key" "^5.6.0"
+
 "@ethersproject/units@5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.4.0.tgz#d57477a4498b14b88b10396062c8cbbaf20c79fe"
@@ -1376,6 +1591,17 @@
     "@ethersproject/properties" "^5.5.0"
     "@ethersproject/strings" "^5.5.0"
 
+"@ethersproject/web@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.6.0.tgz#4bf8b3cbc17055027e1a5dd3c357e37474eaaeb8"
+  integrity sha512-G/XHj0hV1FxI2teHRfCGvfBUHFmU+YOSbCxlAMqJklxSa7QMiHFQfAxvwY2PFqgvdkxEKwRNr/eCjfAPEm2Ctg==
+  dependencies:
+    "@ethersproject/base64" "^5.6.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
+    "@ethersproject/strings" "^5.6.0"
+
 "@ethersproject/wordlists@5.4.0", "@ethersproject/wordlists@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.4.0.tgz#f34205ec3bbc9e2c49cadaee774cf0b07e7573d7"
@@ -2809,11 +3035,6 @@
     "@types/connect" "*"
     "@types/node" "*"
 
-"@types/browser-or-node@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@types/browser-or-node/-/browser-or-node-1.3.0.tgz#896ec59bcb8109fc858d8e68d3c056c176a19622"
-  integrity sha512-MVetr65IR7RdJbUxVHsaPFaXAO8fi89zv1g8L/mHygh1Q7xnnK02XZLwfMh57FOpTO6gtnagoPMQ/UOFfctXRQ==
-
 "@types/chai-as-promised@^7.1.4":
   version "7.1.4"
   resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.4.tgz#caf64e76fb056b8c8ced4b761ed499272b737601"
@@ -2942,14 +3163,6 @@
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.2.3.tgz#bbeb55fbc73f28ea6de601fbfa4613f58d785323"
   integrity sha512-ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw==
 
-"@types/node-fetch@^2.5.10":
-  version "2.5.12"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.12.tgz#8a6f779b1d4e60b7a57fb6fd48d84fb545b9cc66"
-  integrity sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==
-  dependencies:
-    "@types/node" "*"
-    form-data "^3.0.0"
-
 "@types/node-fetch@^2.5.5":
   version "2.5.10"
   resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.10.tgz#9b4d4a0425562f9fcea70b12cb3fcdd946ca8132"
@@ -2978,6 +3191,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-15.14.9.tgz#bc43c990c3c9be7281868bbc7b8fdd6e2b57adfa"
   integrity sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==
 
+"@types/node@^17.0.21":
+  version "17.0.21"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz#864b987c0c68d07b4345845c3e63b75edd143644"
+  integrity sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ==
+
 "@types/node@^8.0.0":
   version "8.10.66"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.66.tgz#dd035d409df322acc83dff62a602f12a5783bbb3"
@@ -4594,11 +4812,6 @@ brorand@^1.0.1, brorand@^1.1.0:
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
-browser-or-node@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/browser-or-node/-/browser-or-node-1.3.0.tgz#f2a4e8568f60263050a6714b2cc236bb976647a7"
-  integrity sha512-0F2z/VSnLbmEeBcUrSuDH5l0HxTXdQQzLjkmBR4cYfvg1zJrKSlmIZFqyFR8oX0NrwPhy3c3HQ6i3OxMbew4Tg==
-
 browser-stdout@1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"