feat: remove TS BSS from itests + Docker

ethereum-optimism · Mar 3, 2022 · f388748 · f388748
1 parent aa726e8
commit f388748
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 175 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -20,9 +20,6 @@ jobs:
           - 5000:5000
     strategy:
       matrix:
-        batch-submitter:
-          - ts-batch-submitter
-          - go-batch-submitter
         batch-type:
           - zlib
           - legacy
@@ -53,7 +50,7 @@ jobs:
         working-directory: ./ops
         run: |
           ./scripts/stats.sh &
-          docker-compose -f docker-compose.yml -f docker-compose.${{ matrix.batch-submitter }}.yml up -d
+          docker-compose -f docker-compose.yml up -d
 
       - name: Wait for the Sequencer node
         working-directory: ./ops

diff --git a/.github/workflows/ts-packages.yml b/.github/workflows/ts-packages.yml
@@ -113,12 +113,6 @@ jobs:
           fail_ci_if_error: false
           verbose: true
           flags: core-utils
-      - uses: codecov/codecov-action@v1
-        with:
-          files: ./packages/batch-submitter/coverage.json
-          fail_ci_if_error: false
-          verbose: true
-          flags: batch-submitter
       - uses: codecov/codecov-action@v1
         with:
           files: ./packages/data-transport-layer/coverage.json
@@ -170,10 +164,6 @@ jobs:
         # if: steps.yarn-cache.outputs.cache-hit != 'true'
         run: yarn install
 
-      - name: Check packages/batch-submitter
-        working-directory: ./packages/batch-submitter
-        run: npx depcheck
-
       - name: Check packages/contracts
         working-directory: ./packages/contracts
         run: npx depcheck

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -116,7 +116,7 @@ This will build the following containers:
 * [`l2geth`](https://hub.docker.com/r/ethereumoptimism/l2geth): L2 geth node running in Sequencer mode
 * [`verifier`](https://hub.docker.com/r/ethereumoptimism/go-ethereum): L2 geth node running in Verifier mode
 * [`relayer`](https://hub.docker.com/r/ethereumoptimism/message-relayer): helper process that relays messages between L1 and L2
-* [`batch_submitter`](https://hub.docker.com/r/ethereumoptimism/batch-submitter): service that submits batches of Sequencer transactions to the L1 chain
+* [`batch_submitter`](https://hub.docker.com/r/ethereumoptimism/batch-submitter-service): service that submits batches of Sequencer transactions to the L1 chain
 * [`integration_tests`](https://hub.docker.com/r/ethereumoptimism/integration-tests): integration tests in a box
 
 If you want to make a change to a container, you'll need to take it down and rebuild it.

diff --git a/README.md b/README.md
@@ -35,7 +35,6 @@ root
 │   ├── <a href="./packages/core-utils">core-utils</a>: Low-level utilities that make building Optimism easier
 │   ├── <a href="./packages/common-ts">common-ts</a>: Common tools for building apps in TypeScript
 │   ├── <a href="./packages/data-transport-layer">data-transport-layer</a>: Service for indexing Optimism-related L1 data
-│   ├── <a href="./packages/batch-submitter">batch-submitter</a>: Service for submitting batches of transactions and results to L1
 │   ├── <a href="./packages/message-relayer">message-relayer</a>: Tool for automatically relaying L1<>L2 messages in development
 │   └── <a href="./packages/replica-healthcheck">replica-healthcheck</a>: Service for monitoring the health of a replica node
 ├── <a href="./go">go</a>

diff --git a/ops/Makefile b/ops/Makefile
@@ -1,7 +1,5 @@
-BATCH_SUBMITTER ?= docker-compose.ts-batch-submitter.yml
 DOCKER_COMPOSE_CMD := docker-compose \
-	-f docker-compose.yml \
-	-f $(BATCH_SUBMITTER)
+	-f docker-compose.yml
 
 build:
 	DOCKER_BUILDKIT=1 \

diff --git a/ops/README.md b/ops/README.md
@@ -26,7 +26,6 @@ The base stack can be started and stopped with a command like this:
 ```
 docker-compose \
     -f docker-compose.yml \
-    -f docker-compose.ts-batch-submitter.yml \
     up --build --detach
 ```
 
@@ -40,7 +39,6 @@ To start the stack with monitoring enabled, just add the metric composition file
 ```
 docker-compose \
     -f docker-compose.yml \
-    -f docker-compose.ts-batch-submitter.yml \
     -f docker-compose-metrics.yml \
     up --build --detach
 ```
@@ -50,7 +48,6 @@ Optionally, run a verifier along the rest of the stack. Run a replica with the s
 ```
 docker-compose
     -f docker-compose.yml \
-    -f docker-compose.ts-batch-submitter.yml \
     up --scale \
     verifier=1 \
     --build --detach
@@ -71,24 +68,6 @@ Fees can be turned off at runtime by setting the environment variable
 ROLLUP_ENFORCE_FEES=false docker-compose up
 ```
 
-## Using the Go Batch Submitter
-
-The existing Typescript batch submitter is in the process of being reimplemented
-in Go. During this transition, the user is required to specify which batch
-submitter to use with docker-compose.
-
-The commands above all use the Typescript batch submitter, by specifying
-`-f docker-compose.ts-batch-submitter.yml`. This can be swapped out for the go
-batch submitter by supplying `-f docker-compose.go-batch-submitter.yml` instead.
-
-Additionally, the `make` targets assume the use of the Typescript batch
-submitter. This can be overridden by setting the `BATCH_SUBMITTER` environment
-variable, e.g. `BATCH_SUBMITTER=docker-compose.go-batch-submitter.yml make up`.
-
-Once the transition is complete, specifying the desired batch submitter will be
-obsolete, and the Go batch submitter will be selected by default from the
-`docker-compose.yml` file and `Makefile`.
-
 ## Cross domain communication
 
 By default, the `message-relayer` service is turned off. This means that

diff --git a/ops/docker-compose-nobuild.yml b/ops/docker-compose-nobuild.yml
@@ -85,16 +85,17 @@ services:
       - l1_chain
       - deployer
       - l2geth
-    image: ethereumoptimism/batch-submitter:${DOCKER_TAG:-prerelease-0.5.0-rc-7-ee217ce}
-    entrypoint: ./batches.sh
+    image: ethereumoptimism/batch-submitter-service:${DOCKER_TAG:-prerelease-0.5.0-rc-7-ee217ce}
+    entrypoint: ./batch-submitter.sh
     env_file:
-      - ./envs/batches.env
+      - ./envs/batch-submitter.env
     environment:
-        L1_NODE_WEB3_URL: http://l1_chain:8545
-        L2_NODE_WEB3_URL: http://l2geth:8545
-        URL: http://deployer:8081/addresses.json
-        SEQUENCER_PRIVATE_KEY: "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d"
-        PROPOSER_PRIVATE_KEY: "0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a"
+      L1_ETH_RPC: http://l1_chain:8545
+      L2_ETH_RPC: http://l2geth:8545
+      URL: http://deployer:8081/addresses.json
+      BATCH_SUBMITTER_SEQUENCER_PRIVATE_KEY: '0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d'
+      BATCH_SUBMITTER_PROPOSER_PRIVATE_KEY: '0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a'
+      BATCH_SUBMITTER_SEQUENCER_BATCH_TYPE: ${BATCH_SUBMITTER_SEQUENCER_BATCH_TYPE:-zlib}
 
   verifier:
     depends_on:

diff --git a/ops/docker-compose.go-batch-submitter.yml b/ops/docker-compose.go-batch-submitter.yml
diff --git a/ops/docker-compose.ts-batch-submitter.yml b/ops/docker-compose.ts-batch-submitter.yml
diff --git a/ops/docker-compose.yml b/ops/docker-compose.yml
@@ -212,3 +212,22 @@ services:
       GAS_PRICE_ORACLE_ETHEREUM_HTTP_URL: http://l2geth:8545
       # Default hardhat account 5
       GAS_PRICE_ORACLE_PRIVATE_KEY: '0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba'
+
+  batch_submitter:
+    depends_on:
+      - l1_chain
+      - deployer
+      - l2geth
+    build:
+      context: ..
+      dockerfile: ./ops/docker/Dockerfile.batch-submitter-service
+    entrypoint: ./batch-submitter.sh
+    env_file:
+      - ./envs/batch-submitter.env
+    environment:
+      L1_ETH_RPC: http://l1_chain:8545
+      L2_ETH_RPC: http://l2geth:8545
+      URL: http://deployer:8081/addresses.json
+      BATCH_SUBMITTER_SEQUENCER_PRIVATE_KEY: '0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d'
+      BATCH_SUBMITTER_PROPOSER_PRIVATE_KEY: '0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a'
+      BATCH_SUBMITTER_SEQUENCER_BATCH_TYPE: ${BATCH_SUBMITTER_SEQUENCER_BATCH_TYPE:-zlib}
diff --git a/ops/docker/Dockerfile.batch-submitter b/ops/docker/Dockerfile.batch-submitter
diff --git a/ops/docker/Dockerfile.monorepo b/ops/docker/Dockerfile.monorepo
@@ -29,7 +29,6 @@ COPY packages/core-utils/package.json ./packages/core-utils/package.json
 COPY packages/common-ts/package.json ./packages/common-ts/package.json
 COPY packages/contracts/package.json ./packages/contracts/package.json
 COPY packages/data-transport-layer/package.json ./packages/data-transport-layer/package.json
-COPY packages/batch-submitter/package.json ./packages/batch-submitter/package.json
 COPY packages/message-relayer/package.json ./packages/message-relayer/package.json
 COPY packages/replica-healthcheck/package.json ./packages/replica-healthcheck/package.json
 COPY integration-tests/package.json ./integration-tests/package.json

diff --git a/ops/docker/Dockerfile.packages b/ops/docker/Dockerfile.packages
@@ -18,7 +18,6 @@ COPY packages/core-utils/package.json ./packages/core-utils/package.json
 COPY packages/common-ts/package.json ./packages/common-ts/package.json
 COPY packages/contracts/package.json ./packages/contracts/package.json
 COPY packages/data-transport-layer/package.json ./packages/data-transport-layer/package.json
-COPY packages/batch-submitter/package.json ./packages/batch-submitter/package.json
 COPY packages/message-relayer/package.json ./packages/message-relayer/package.json
 COPY packages/replica-healthcheck/package.json ./packages/replica-healthcheck/package.json
 COPY integration-tests/package.json ./integration-tests/package.json
@@ -38,12 +37,6 @@ COPY ./ops/scripts/deployer.sh .
 CMD ["yarn", "run", "deploy"]
 
 
-FROM base as batch-submitter
-WORKDIR /opt/optimism/packages/batch-submitter
-COPY ./ops/scripts/batches.sh .
-CMD ["npm", "run", "start"]
-
-
 FROM base as data-transport-layer
 WORKDIR /opt/optimism/packages/data-transport-layer
 COPY ./ops/scripts/dtl.sh .

diff --git a/ops/envs/batches.env b/ops/envs/batches.env
diff --git a/ops/scripts/batches.sh b/ops/scripts/batches.sh
diff --git a/ops/scripts/build-ci.sh b/ops/scripts/build-ci.sh
@@ -43,7 +43,6 @@ docker tag localhost:5000/ethereumoptimism/builder:latest ethereumoptimism/build
 
 build deployer "ethereumoptimism/deployer:latest" "./ops/docker/Dockerfile.deployer" .
 build dtl "ethereumoptimism/data-transport-layer:latest" "./ops/docker/Dockerfile.data-transport-layer" .
-build batch_submitter "ethereumoptimism/batch-submitter:latest" "./ops/docker/Dockerfile.batch-submitter" .
 build relayer "ethereumoptimism/message-relayer:latest" "./ops/docker/Dockerfile.message-relayer" .
 build integration-tests "ethereumoptimism/integration-tests:latest" "./ops/docker/Dockerfile.integration-tests" .