Develop -> Master

.changeset/curly-swans-crash.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/teleportr': patch
+---
+
+Improve metrics

.changeset/red-eyes-sparkle.md

@@ -0,0 +1,5 @@
+---
+
+---
+
+chore(deps): bump github.com/ethereum/go-ethereum from 1.10.16 to 1.10.17 in /op-exporter

.changeset/short-nails-burn.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/teleportr': patch
+---
+
+Increase max disbursements to 15

.changeset/tricky-hotels-crash.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Move core-utils to deps instead of devdeps

.circleci/config.yml

@@ -63,7 +63,7 @@ jobs:
 
   yarn-monorepo:
     docker:
-      - image: ethereumoptimism/js-builder:nightly
+      - image: ethereumoptimism/js-builder:latest
     steps:
       - restore_cache:
           keys:
@@ -98,8 +98,7 @@ jobs:
             - integration-tests/node_modules
       - run:
           name: Build monorepo
-          command: |
-            yarn build
+          command: yarn build
       - save_cache:
           key: v2-cache-yarn-build-{{ .Revision }}
           paths:
@@ -366,15 +365,14 @@ jobs:
           command: |
             docker run --init -it -v `pwd`:/input lycheeverse/lychee --verbose --no-progress --exclude-loopback --exclude twitter.com --exclude-mail /input/README.md "/input/specs/**/*.md" "/input/meta/**/*.md" "/input/op-node/**/*.md" || exit 0
 
-  bedrock-solidity:
+  contracts-bedrock-tests:
     docker:
-      - image: ethereumoptimism/js-builder:nightly
+      - image: ethereumoptimism/js-builder:latest
     steps:
+      - restore_cache:
+          keys:
+            - v2-cache-yarn-build-{{ .Revision }}
       - checkout
-      - run:
-          name: install
-          command: yarn install
-          working_directory: packages/contracts-bedrock
       - run:
           name: lint
           command: yarn lint:check
@@ -383,10 +381,6 @@ jobs:
           name: slither
           command: yarn slither || exit 0
           working_directory: packages/contracts-bedrock
-      - run:
-          name: build
-          command: yarn build
-          working_directory: packages/contracts-bedrock
       - run:
           name: test
           command: yarn test
@@ -468,7 +462,7 @@ jobs:
 
   bedrock-integration-tests:
     machine:
-      image: ethereumoptimism/js-builder:nightly
+      image: ethereumoptimism/js-builder:latest
       docker_layer_caching: true
     steps:
       - checkout
@@ -490,7 +484,6 @@ workflows:
     jobs:
       - yarn-monorepo
       - bedrock-go-tests
-      - bedrock-solidity
       - bedrock-markdown
       - fuzz-op-node
       - go-lint-test-build:
@@ -522,6 +515,9 @@ workflows:
       - contracts-periphery-tests:
           requires:
             - yarn-monorepo
+      - contracts-bedrock-tests:
+          requires:
+            - yarn-monorepo
       - js-lint-test:
           name: dtl-tests
           package_name: data-transport-layer

.github/mergify.yml

@@ -10,6 +10,7 @@ pull_request_rules:
         - "#approved-reviews-by>=2"
         - "#changes-requested-reviews-by=0"
         - "label!=do-not-merge"
+        - "label!=mergify-ignore"
         - or:
           - and:
             - "label!=SR-Risk"

.github/workflows/publish-canary.yml

@@ -56,7 +56,7 @@ jobs:
             ${{ runner.os }}-yarn-
 
       - name: Install Dependencies
-        run: yarn
+        run: yarn --frozen-lockfile
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1

.github/workflows/release.yml

@@ -53,7 +53,7 @@ jobs:
             ${{ runner.os }}-yarn-
 
       - name: Install Dependencies
-        run: yarn
+        run: yarn --frozen-lockfile
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1

.github/workflows/sync-tests.yml

@@ -11,8 +11,8 @@ jobs:
         ports:
           - 5000:5000
     env:
-        DOCKER_BUILDKIT: 1
-        COMPOSE_DOCKER_CLI_BUILD: 1
+      DOCKER_BUILDKIT: 1
+      COMPOSE_DOCKER_CLI_BUILD: 1
     steps:
       - uses: actions/checkout@v2
 
@@ -53,7 +53,7 @@ jobs:
       - name: Run the sync tests
         working-directory: ./integration-tests
         run: |
-          yarn
+          yarn --frozen-lockfile
           yarn build
           yarn test:sync
 

Makefile

@@ -1,13 +1,14 @@
 COMPOSEFLAGS=-d
 ITESTS_L2_HOST=http://localhost:9545
 
-build: build-go contracts integration-tests
+build: build-go build-ts
 .PHONY: build
 
 build-go: submodules op-node op-proposer op-batcher
 .PHONY: build-go
 
-build-ts: submodules contracts integration-tests
+build-ts: submodules
+	yarn build
 .PHONY: build-ts
 
 submodules:
@@ -42,14 +43,6 @@ mod-tidy:
 	cd ./op-e2e && go mod tidy && cd ..
 .PHONY: mod-tidy
 
-contracts:
-	cd ./contracts-bedrock && yarn install && yarn build
-.PHONY: contracts
-
-integration-tests:
-	cd ./packages/integration-tests-bedrock && yarn install && yarn build:contracts
-.PHONY: integration-tests
-
 clean:
 	rm -rf ./bin
 .PHONY: clean
@@ -63,25 +56,25 @@ devnet-down:
 .PHONY: devnet-down
 
 devnet-clean:
-	rm -rf ./contracts-bedrock/deployments/devnetL1
+	rm -rf ./packages/contracts-bedrock/deployments/devnetL1
 	rm -rf ./.devnet
 	cd ./ops-bedrock && docker-compose down
-	docker volume rm ops-bedrock_l1_data
-	docker volume rm ops-bedrock_l2_data
-	docker volume rm ops-bedrock_op_log
+	docker image ls | grep ops-bedrock_ | cut -d ' ' -f 1 | xargs docker rmi
+	docker volume ls | grep ops-bedrock_ | cut -d ' ' -f 1 | xargs docker volume rm
+
 .PHONY: devnet-clean
 
 test-unit:
 	make -C ./op-node test
 	make -C ./op-proposer test
 	make -C ./op-batcher test
 	make -C ./op-e2e test
-	cd ./contracts-bedrock && yarn test
+	yarn test
 .PHONY: test-unit
 
 test-integration:
 	bash ./ops-bedrock/test-integration.sh \
-		./contracts-bedrock/deployments/devnetL1
+		./packages/contracts-bedrock/deployments/devnetL1
 .PHONY: test-integration
 
 devnet-genesis:

go.work

@@ -17,7 +17,7 @@ use (
 	./teleportr
 )
 
-replace github.com/ethereum/go-ethereum v1.10.17 => github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220518163235-a32d414959ea
+replace github.com/ethereum/go-ethereum v1.10.17 => github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220602230953-dd2e24b3359f
 
 // For local debugging:
-// replace github.com/ethereum/go-ethereum v1.10.17 => ../go-ethereum
+//replace github.com/ethereum/go-ethereum v1.10.17 => ../go-ethereum

go.work.sum

@@ -1,9 +1,7 @@
 github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
 github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d h1:t5Wuyh53qYyg9eqn4BbnlIT+vmhyww0TatL+zT3uWgI=
-github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220512193241-32ef0bba48ce h1:Wa0BVNdeyzIoJkrZtI7o2NEw8F98vVIzkPpiFACbdCA=
-github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220512193241-32ef0bba48ce/go.mod h1:zwRwhzbX7GhQgG12DdrLr9aRGGLObKwmZxYrCLICIRc=
-github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220518163235-a32d414959ea h1:xGKKbowc5Q2d4VEYMkJg6E3h5ki2Kgi2r+qxaTHCnxc=
-github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220518163235-a32d414959ea/go.mod h1:zwRwhzbX7GhQgG12DdrLr9aRGGLObKwmZxYrCLICIRc=
+github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220602230953-dd2e24b3359f h1:Ad47wE5WEFzyOaaLff7LTRh79mUgWHKuYe4fpGOG23k=
+github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220602230953-dd2e24b3359f/go.mod h1:RD3NhcSBjZpj3k+SnQq24wBrmnmie78P5R/P62iNBD8=
 github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5 h1:2U0HzY8BJ8hVwDKIzp7y4voR9CX/nvcfymLmg2UiOio=
 github.com/klauspost/cpuid v1.2.1 h1:vJi+O/nMdFt0vqm8NZBI6wzALWdA2X+egi0ogNyrC/w=
 github.com/libp2p/go-yamux v1.4.1 h1:P1Fe9vF4th5JOxxgQvfbOHkrGqIZniTLf+ddhZp8YTI=

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

@@ -6,7 +6,7 @@ metadata:
 spec:
   selector:
     app: l2geth-replica
-  type: ClusterIP
+  type: NodePort
   ports:
     - name: rpc
       port: 8545

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

@@ -9,6 +9,9 @@ spec:
       containers:
         - name: replica-healthcheck
           image: ethereumoptimism/replica-healthcheck-v1
+          envFrom:
+            - configMapRef:
+                name: replica-healthcheck-v1
           ports:
             - containerPort: 7300
               name: metrics

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

@@ -14,6 +14,7 @@ resources:
   - ../../bases/l2geth-replica
   - ../../bases/servicemonitors
   - ../../bases/replica-healthcheck
+  - ../../bases/replica-healthcheck-v1
   - ./volumes.yaml
 
 images:
@@ -26,6 +27,9 @@ images:
   - name: ethereumoptimism/replica-healthcheck
     newName: ethereumoptimism/replica-healthcheck
     newTag: 0.3.6
+  - name: ethereumoptimism/replica-healthcheck-v1
+    newName: ethereumoptimism/replica-healthcheck
+    newTag: 1.0.6
 
 patchesStrategicMerge:
   - ./patches/dtl.yaml
@@ -44,4 +48,9 @@ patches:
       group: apps
       version: v1
       kind: StatefulSet
-      name: data-transport-layer
+      name: data-transport-layer
+
+configMapGenerator:
+  - name: replica-healthcheck-v1
+    envs:
+      - ./replica-healthcheck-v1.env

infra/op-replica/kustomize/overlays/mainnet-replica-0-5-14/replica-healthcheck-v1.env

@@ -0,0 +1,2 @@
+HEALTHCHECK__REFERENCE_RPC_PROVIDER=http://sequencer.default:8545
+HEALTHCHECK__TARGET_RPC_PROVIDER=http://l2geth-replica:8545

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

@@ -15,18 +15,22 @@ resources:
   - ../../bases/l2geth-replica
   - ../../bases/servicemonitors
   - ../../bases/replica-healthcheck
+  - ../../bases/replica-healthcheck-v1
   - ./volumes.yaml
 
 images:
   - name: ethereumoptimism/data-transport-layer
     newName: ethereumoptimism/data-transport-layer
-    newTag: 0.5.21
+    newTag: prerelease-dtl-race
   - name: ethereumoptimism/l2geth
     newName: ethereumoptimism/l2geth
-    newTag: 0.5.14
+    newTag: prerelease-l2g-l1-sync-recovery
   - name: ethereumoptimism/replica-healthcheck
     newName: ethereumoptimism/replica-healthcheck
     newTag: 0.3.6
+  - name: ethereumoptimism/replica-healthcheck-v1
+    newName: ethereumoptimism/replica-healthcheck
+    newTag: 1.0.6
 
 patchesStrategicMerge:
   - ./patches/dtl.yaml
@@ -45,4 +49,9 @@ patches:
       group: apps
       version: v1
       kind: StatefulSet
-      name: data-transport-layer
+      name: data-transport-layer
+
+configMapGenerator:
+  - name: replica-healthcheck-v1
+    envs:
+      - ./replica-healthcheck-v1.env

infra/op-replica/kustomize/overlays/mainnet-replica-l1-0-5-14/replica-healthcheck-v1.env

@@ -0,0 +1,2 @@
+HEALTHCHECK__REFERENCE_RPC_PROVIDER=http://sequencer.default:8545
+HEALTHCHECK__TARGET_RPC_PROVIDER=http://l2geth-replica:8545

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

@@ -13,7 +13,7 @@ resources:
   - ../../bases/data-transport-layer
   - ../../bases/l2geth-replica
   - ../../bases/servicemonitors
-  - ../../bases/replica-healthcheck
+  - ../../bases/replica-healthcheck-v1
   - ./ingress.yaml
   - ./volumes.yaml
 
@@ -24,14 +24,13 @@ images:
   - name: ethereumoptimism/l2geth
     newName: ethereumoptimism/l2geth
     newTag: 0.5.14
-  - name: ethereumoptimism/replica-healthcheck
+  - name: ethereumoptimism/replica-healthcheck-v1
     newName: ethereumoptimism/replica-healthcheck
-    newTag: 0.3.6
+    newTag: 1.0.6
 
 patchesStrategicMerge:
   - ./patches/dtl.yaml
   - ./patches/l2geth.yaml
-  - ./patches/replica-healthcheck.yaml
 
 patches:
   - path: ./patches/l2geth-volume.yaml
@@ -45,4 +44,9 @@ patches:
       group: apps
       version: v1
       kind: StatefulSet
-      name: data-transport-layer
+      name: data-transport-layer
+
+configMapGenerator:
+  - name: replica-healthcheck-v1
+    envs:
+      - ./replica-healthcheck-v1.env

infra/op-replica/kustomize/public-overlays/kovan-replica-0-5-14/replica-healthcheck-v1.env

@@ -0,0 +1,2 @@
+HEALTHCHECK__REFERENCE_RPC_PROVIDER=https://kovan.optimism.io
+HEALTHCHECK__TARGET_RPC_PROVIDER=http://l2geth-replica:8545