cleanup: l2geth references

.semgrepignore

@@ -18,6 +18,5 @@ tests/
 # Semgrep-action log folder
 .semgrep_logs/
 
-l2geth/
 packages/*/node_modules
 packages/*/test

CONTRIBUTING.md

@@ -120,23 +120,6 @@ export DOCKER_BUILDKIT=1
 docker-compose build
 ```
 
-This will build the following containers:
-
-* [`l1_chain`](https://hub.docker.com/r/ethereumoptimism/hardhat): simulated L1 chain using hardhat-evm as a backend
-* [`deployer`](https://hub.docker.com/r/ethereumoptimism/deployer): process that deploys L1 smart contracts to the L1 chain
-* [`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
-
-If you want to make a change to a container, you'll need to take it down and rebuild it.
-For example, if you make a change in l2geth:
-
-```bash
-cd ops
-docker-compose stop -- l2geth
-docker-compose build -- l2geth
-docker-compose start l2geth
-```
-
 Source code changes can have an impact on more than one container.
 **If you're unsure about which containers to rebuild, just rebuild them all**:
 

README.md

@@ -86,7 +86,6 @@ Refer to the Directory Structure section below to understand which packages are
 │   ├── <a href="./packages/replica-healthcheck">replica-healthcheck</a>: Service for monitoring the health of a replica node
 │   └── <a href="./packages/sdk">sdk</a>: provides a set of tools for interacting with Optimism
 ├── <a href="./indexer">indexer</a>: indexes and syncs transactions
-├── <a href="./l2geth">l2geth</a>: Optimism client software, a fork of <a href="https://github.com/ethereum/go-ethereum/tree/v1.9.10">geth v1.9.10</a>
 ├── <a href="./op-exporter">op-exporter</a>: A prometheus exporter to collect/serve metrics from an Optimism node
 ├── <a href="./proxyd">proxyd</a>: Configurable RPC request router and proxy
 └── <a href="./technical-documents">technical-documents</a>: audits and post-mortem documents
@@ -160,6 +159,4 @@ It's strongly recommended to avoid merging PRs into develop during an active rel
 
 ## License
 
-Code forked from [`go-ethereum`](https://github.com/ethereum/go-ethereum) under the name [`l2geth`](https://github.com/ethereum-optimism/optimism/tree/master/l2geth) is licensed under the [GNU GPLv3](https://gist.github.com/kn9ts/cbe95340d29fc1aaeaa5dd5c059d2e60) in accordance with the [original license](https://github.com/ethereum/go-ethereum/blob/master/COPYING).
-
 All other files within this repository are licensed under the [MIT License](https://github.com/ethereum-optimism/optimism/blob/master/LICENSE) unless stated otherwise.

codecov.yml

@@ -3,7 +3,6 @@ comment:
   behavior: default
   require_changes: true    # only post the comment if coverage changes
 ignore:
-  - "l2geth"
   - "op-e2e"
   - "**/*.t.sol"
   - "op-bindings/bindings/*.go"

endpoint-monitor/go.mod

@@ -11,6 +11,8 @@ require (
 	github.com/urfave/cli v1.22.9
 )
 
+replace github.com/ethereum-optimism/optimism/l2geth v0.0.0-20220923210602-7121648c1f26 => github.com/ethereum-optimism/optimism-legacy/l2geth v0.0.0-20220923210602-7121648c1f26
+
 require (
 	github.com/VictoriaMetrics/fastcache v1.9.0 // indirect
 	github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847 // indirect

endpoint-monitor/go.sum

@@ -186,8 +186,8 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
 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/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/ethereum-optimism/optimism/l2geth v0.0.0-20220923210602-7121648c1f26 h1:wqYJm5ko5jzJx5wJM5BrN2nYxdgbIl1aIfFjyqA3T64=
-github.com/ethereum-optimism/optimism/l2geth v0.0.0-20220923210602-7121648c1f26/go.mod h1:Oj5A6Qs/Ao1SP17i3uKroyhz49q/ehagSXRAlvwaI5Y=
+github.com/ethereum-optimism/optimism-legacy/l2geth v0.0.0-20220923210602-7121648c1f26 h1:znJULRia1IjB0OLUvy0ayXcZHXPSY10B1xEG7xKOpuk=
+github.com/ethereum-optimism/optimism-legacy/l2geth v0.0.0-20220923210602-7121648c1f26/go.mod h1:Oj5A6Qs/Ao1SP17i3uKroyhz49q/ehagSXRAlvwaI5Y=
 github.com/ethereum-optimism/optimism/op-service v0.8.8 h1:k5E78Zr2cGU0SwjoHpFXuC1eyfXhu3oKEOnDDaFi57I=
 github.com/ethereum-optimism/optimism/op-service v0.8.8/go.mod h1:K0uybOhICTc2yfhrRj0cD1m7aPkOf5C9e6bUmvf4rGA=
 github.com/ethereum/go-ethereum v1.10.4/go.mod h1:nEE0TP5MtxGzOMd7egIrbPJMQBnhVU3ELNxhBglIzhg=

ops/docker-compose.yml

-version: '3.4'
-
-x-system-addr-env: &system-addr-env
-  # private key: a6aecc98b63bafb0de3b29ae9964b14acb4086057808be29f90150214ebd4a0f
-  # OK to publish this since it will only ever be used in itests
-  SYSTEM_ADDRESS_0_DEPLOYER: '0xa961b0d6dce82db098cf70a42a14add3ee3db2d5'
-
-  # private key: 3b8d2345102cce2443acb240db6e87c8edd4bb3f821b17fab8ea2c9da08ea132
-  # OK to publish this since it will only ever be used in itests
-  SYSTEM_ADDRESS_1_DEPLOYER: '0xdfc82d475833a50de90c642770f34a9db7deb725'
-
-services:
-  # this is a helper service used because there's no official hardhat image
-  l1_chain:
-    image: ethereumoptimism/hardhat-node:${DOCKER_TAG_HARDHAT:-latest}
-    build:
-      context: ./docker/hardhat
-      dockerfile: Dockerfile
-    env_file:
-      - ./envs/l1_chain.env
-    ports:
-      # expose the service to the host for integration testing
-      - ${L1CHAIN_HTTP_PORT:-9545}:8545
-
-  deployer:
-    depends_on:
-      - l1_chain
-    build:
-      context: ..
-      dockerfile: ./ops/docker/Dockerfile.packages
-      target: deployer
-    image: ethereumoptimism/deployer:${DOCKER_TAG_DEPLOYER:-latest}
-    entrypoint: ./deployer.sh
-    environment:
-      # Env vars for the deployment script.
-      CONTRACTS_RPC_URL: http://l1_chain:8545
-      CONTRACTS_DEPLOYER_KEY: 'ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80'
-      CONTRACTS_TARGET_NETWORK: 'local'
-    ports:
-      # expose the service to the host for getting the contract addrs
-      - ${DEPLOYER_PORT:-8080}:8081
-
-  dtl:
-    depends_on:
-      - l1_chain
-      - deployer
-    build:
-      context: ..
-      dockerfile: ./ops/docker/Dockerfile.packages
-      target: data-transport-layer
-    image: ethereumoptimism/data-transport-layer:${DOCKER_TAG_DATA_TRANSPORT_LAYER:-latest}
-    # override with the dtl script and the env vars required for it
-    entrypoint: ./dtl.sh
-    env_file:
-      - ./envs/dtl.env
-    # set the rest of the env vars for the network whcih do not
-    # depend on the docker-compose setup
-    environment:
-      # used for setting the address manager address
-      URL: http://deployer:8081/addresses.json
-      # connect to the 2 layers
-      DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT: http://l1_chain:8545
-      DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT: http://l2geth:8545
-      DATA_TRANSPORT_LAYER__SYNC_FROM_L2: 'true'
-      DATA_TRANSPORT_LAYER__L2_CHAIN_ID: 17
-    ports:
-      - ${DTL_PORT:-7878}:7878
-
-  relayer:
-    depends_on:
-      - l1_chain
-      - l2geth
-    deploy:
-      replicas: 0
-    build:
-      context: ..
-      dockerfile: ./ops/docker/Dockerfile.packages
-      target: message-relayer
-    image: ethereumoptimism/message-relayer:${DOCKER_TAG_MESSAGE_RELAYER:-latest}
-    entrypoint: ./relayer.sh
-    environment:
-      MESSAGE_RELAYER__L1_RPC_PROVIDER: http://l1_chain:8545
-      MESSAGE_RELAYER__L2_RPC_PROVIDER: http://l2geth:8545
-      MESSAGE_RELAYER__L1_WALLET: '0xdbda1821b80551c9d65939329250298aa3472ba22feea921c0cf5d620ea67b97'
-      RETRIES: 60
-
-  fault_detector:
-    depends_on:
-      - l1_chain
-      - l2geth
-    deploy:
-      replicas: 0
-    build:
-      context: ..
-      dockerfile: ./ops/docker/Dockerfile.packages
-      target: fault-detector
-    image: ethereumoptimism/fault-detector:${DOCKER_TAG_FAULT_DETECTOR:-latest}
-    entrypoint: ./detector.sh
-    environment:
-      FAULT_DETECTOR__L1_RPC_PROVIDER: http://l1_chain:8545
-      FAULT_DETECTOR__L2_RPC_PROVIDER: http://l2geth:8545
-      RETRIES: 60
-
-  verifier:
-    depends_on:
-      - l1_chain
-      - deployer
-      - dtl
-      - l2geth
-    deploy:
-      replicas: 1
-    build:
-      context: ..
-      dockerfile: ./l2geth/Dockerfile
-    image: ethereumoptimism/l2geth:${DOCKER_TAG_L2GETH:-latest}
-    entrypoint: sh ./geth.sh
-    env_file:
-      - ./envs/geth.env
-    environment:
-      <<: *system-addr-env
-      ETH1_HTTP: http://l1_chain:8545
-      SEQUENCER_CLIENT_HTTP: http://l2geth:8545
-      ROLLUP_STATE_DUMP_PATH: http://deployer:8081/state-dump.latest.json
-      ROLLUP_CLIENT_HTTP: http://dtl:7878
-      ROLLUP_BACKEND: 'l1'
-      ETH1_CTC_DEPLOYMENT_HEIGHT: 8
-      RETRIES: 60
-      ROLLUP_VERIFIER_ENABLE: 'true'
-    ports:
-      - ${VERIFIER_HTTP_PORT:-8547}:8545
-      - ${VERIFIER_WS_PORT:-8548}:8546
-
-  replica:
-    depends_on:
-      - dtl
-      - l2geth
-    deploy:
-      replicas: 1
-    build:
-      context: ..
-      dockerfile: ./l2geth/Dockerfile
-    image: ethereumoptimism/l2geth:${DOCKER_TAG_L2GETH:-latest}
-    entrypoint: sh ./geth.sh
-    env_file:
-      - ./envs/geth.env
-    environment:
-      <<: *system-addr-env
-      ETH1_HTTP: http://l1_chain:8545
-      SEQUENCER_CLIENT_HTTP: http://l2geth:8545
-      ROLLUP_STATE_DUMP_PATH: http://deployer:8081/state-dump.latest.json
-      ROLLUP_CLIENT_HTTP: http://dtl:7878
-      ROLLUP_BACKEND: 'l2'
-      ROLLUP_VERIFIER_ENABLE: 'true'
-      ETH1_CTC_DEPLOYMENT_HEIGHT: 8
-      RETRIES: 60
-    ports:
-      - ${REPLICA_HTTP_PORT:-8549}:8545
-      - ${REPLICA_WS_PORT:-8550}:8546
-
-  replica_healthcheck:
-    depends_on:
-      - l2geth
-      - replica
-    deploy:
-      replicas: 0
-    build:
-      context: ..
-      dockerfile: ./ops/docker/Dockerfile.packages
-      target: replica-healthcheck
-    image: ethereumoptimism/replica-healthcheck:${DOCKER_TAG_REPLICA_HEALTHCHECK:-latest}
-    environment:
-      HEALTHCHECK__REFERENCE_RPC_PROVIDER: http://l2geth:8545
-      HEALTHCHECK__TARGET_RPC_PROVIDER: http://replica:8545
-    ports:
-      - ${HEALTHCHECK_HTTP_PORT:-7300}:7300
-
-  gas_oracle:
-    deploy:
-      replicas: 0
-    build:
-      context: ..
-      dockerfile: ./gas-oracle/Dockerfile
-    image: ethereumoptimism/gas-oracle:${DOCKER_TAG_GAS_ORACLE:-latest}
-    environment:
-      GAS_PRICE_ORACLE_ETHEREUM_HTTP_URL: http://l1_chain:8545
-      GAS_PRICE_ORACLE_LAYER_TWO_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: ./batch-submitter/Dockerfile
-    image: ethereumoptimism/batch-submitter-service:${DOCKER_TAG_BATCH_SUBMITTER_SERVICE:-latest}
-    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}

package.json

@@ -6,12 +6,6 @@
   "workspaces": {
     "packages": [
       "packages/*",
-      "l2geth",
-      "ops/docker/rpc-proxy",
-      "ops/docker/hardhat",
-      "ops/docker/go-builder",
-      "ops/docker/js-builder",
-      "ops/docker/foundry",
       "endpoint-monitor"
     ],
     "nohoist": [

specs/meta/versioning.md

@@ -26,12 +26,9 @@ Go modules that are currently versioned:
 Go modules which are not yet versioned:
 
 ```text
-./batch-submitter  (changesets)
 ./indexer          (changesets)
-./l2geth           (changesets)
 ./op-exporter      (changesets)
 ./proxyd           (changesets)
-./state-surgery
 ```
 
 ### versioning process