From 4f6a10249c59a6a95020202b5d26e6ba5e2eb325 Mon Sep 17 00:00:00 2001 From: Kevin Kz Date: Thu, 25 Jul 2024 13:44:33 -0400 Subject: [PATCH] Delete chain-mon from other places. --- .circleci/config.yml | 34 +----------- .github/CODEOWNERS | 2 - .github/mergify.yml | 8 --- .github/workflows/tag-service.yml | 1 - Makefile | 12 ----- README.md | 2 - codecov.yml | 1 - docker-bake.hcl | 15 ------ ops/docker/Dockerfile.packages | 33 ------------ ops/scripts/ci-docker-tag-op-stack-release.sh | 2 +- ops/tag-service/tag-service.py | 1 - ops/tag-service/tag-tool.py | 2 - pnpm-lock.yaml | 52 ------------------- 13 files changed, 2 insertions(+), 163 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9fdd9a9708fd..3845143b1185 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1532,12 +1532,6 @@ workflows: - contracts-bedrock-validate-spaces: requires: - pnpm-monorepo - - js-lint-test: - name: chain-mon-tests - package_name: chain-mon - dependencies: "(contracts-bedrock|sdk)" - requires: - - pnpm-monorepo - semgrep-scan - go-mod-download - fuzz-golang: @@ -1764,7 +1758,7 @@ workflows: type: approval filters: tags: - only: /^(da-server|chain-mon|ci-builder(-rust)?|ufm-[a-z0-9\-]*|op-[a-z0-9\-]*)\/v.*/ + only: /^(da-server|ci-builder(-rust)?|ufm-[a-z0-9\-]*|op-[a-z0-9\-]*)\/v.*/ branches: ignore: /.*/ - docker-build: @@ -1962,22 +1956,6 @@ workflows: op_component: op-supervisor requires: - op-supervisor-docker-release - - docker-build: - name: chain-mon-docker-release - filters: - tags: - only: /^chain-mon\/v.*/ - branches: - ignore: /.*/ - docker_name: chain-mon - docker_tags: <>,latest - publish: true - release: true - resource_class: xlarge - context: - - oplabs-gcr-release - requires: - - hold - docker-build: name: ci-builder-docker-release filters: @@ -2205,21 +2183,11 @@ workflows: op_component: op-supervisor requires: - op-supervisor-docker-publish - - docker-build: - name: chain-mon-docker-publish - docker_name: chain-mon - docker_tags: <>,<> - resource_class: xlarge - publish: true - context: - - oplabs-gcr - - slack - docker-build: name: contracts-bedrock-docker-publish docker_name: contracts-bedrock docker_tags: <>,<> resource_class: xlarge - requires: [ 'chain-mon-docker-publish' ] # use the cached base image publish: true context: - oplabs-gcr diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 91ae9af99425..2b10c56d812c 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,6 +1,4 @@ # Packages -/packages/chain-mon @ethereum-optimism/security-reviewers -/packages/chain-mon/internal/balance-mon @ethereum-optimism/infra-reviewers /packages/contracts-bedrock @ethereum-optimism/contract-reviewers /packages/sdk @ethereum-optimism/devxpod diff --git a/.github/mergify.yml b/.github/mergify.yml index c95e05bfdace..53fa7701e084 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -195,14 +195,6 @@ pull_request_rules: label: add: - A-ops - - name: Add A-pkg-chain-mon label - conditions: - - 'files~=^packages/chain-mon/' - - '#label<5' - actions: - label: - add: - - A-pkg-chain-mon - name: Add A-pkg-contracts-bedrock label conditions: - 'files~=^packages/contracts-bedrock/' diff --git a/.github/workflows/tag-service.yml b/.github/workflows/tag-service.yml index 80390ef689e6..3bec832a4112 100644 --- a/.github/workflows/tag-service.yml +++ b/.github/workflows/tag-service.yml @@ -21,7 +21,6 @@ on: - ci-builder - ci-builder-rust - op-heartbeat - - chain-mon - op-node - op-batcher - op-proposer diff --git a/Makefile b/Makefile index 1f7f91667408..66a0b329b339 100644 --- a/Makefile +++ b/Makefile @@ -80,18 +80,6 @@ cross-op-node: op-node .PHONY: golang-docker -chain-mon-docker: - # We don't use a buildx builder here, and just load directly into regular docker, for convenience. - GIT_COMMIT=$$(git rev-parse HEAD) \ - GIT_DATE=$$(git show -s --format='%ct') \ - IMAGE_TAGS=$$(git rev-parse HEAD),latest \ - docker buildx bake \ - --progress plain \ - --load \ - -f docker-bake.hcl \ - chain-mon -.PHONY: chain-mon-docker - contracts-bedrock-docker: IMAGE_TAGS=$$(git rev-parse HEAD),latest \ docker buildx bake \ diff --git a/README.md b/README.md index 15d70b522077..10142dcad7a1 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,6 @@ The Optimism Immunefi program offers up to $2,000,042 for in-scope critical vuln ├── ops: Various operational packages ├── ops-bedrock: Bedrock devnet work ├── packages -│ ├── chain-mon: Chain monitoring services │ ├── contracts-bedrock: OP Stack smart contracts │ ├── devnet-tasks: Legacy Hardhat tasks used within devnet CI tests ├── proxyd: Configurable RPC request router and proxy @@ -116,7 +115,6 @@ See the [Node Software Releases](https://docs.optimism.io/builders/node-operator The full set of components that have releases are: -- `chain-mon` - `ci-builder` - `op-batcher` - `op-contracts` diff --git a/codecov.yml b/codecov.yml index e8e97e47304f..96b195edabf9 100644 --- a/codecov.yml +++ b/codecov.yml @@ -38,5 +38,4 @@ flag_management: target: 100% - name: bedrock-go-tests - name: contracts-tests - - name: chain-mon-tests - name: sdk-tests diff --git a/docker-bake.hcl b/docker-bake.hcl index c96164e765ce..42e46cb72138 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -216,21 +216,6 @@ target "cannon" { tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/cannon:${tag}"] } -target "chain-mon" { - dockerfile = "./ops/docker/Dockerfile.packages" - context = "." - args = { - // proxyd dockerfile has no _ in the args - GITCOMMIT = "${GIT_COMMIT}" - GITDATE = "${GIT_DATE}" - GITVERSION = "${GIT_VERSION}" - } - // this is a multi-stage build, where each stage is a possible output target, but wd-mon is all we publish - target = "wd-mon" - platforms = split(",", PLATFORMS) - tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/chain-mon:${tag}"] -} - target "ci-builder" { dockerfile = "./ops/docker/ci-builder/Dockerfile" context = "." diff --git a/ops/docker/Dockerfile.packages b/ops/docker/Dockerfile.packages index 224a748fc56c..58062d3af501 100644 --- a/ops/docker/Dockerfile.packages +++ b/ops/docker/Dockerfile.packages @@ -89,39 +89,6 @@ RUN pnpm build ENTRYPOINT ["pnpm", "run"] -FROM base as chain-mon -WORKDIR /opt/optimism/packages/chain-mon - -# TODO keeping the rest of these here for now because they are being used -# but we should really delete them we only need one image -FROM base as balance-mon -WORKDIR /opt/optimism/packages/chain-mon/internal -CMD ["start:balance-mon"] - -from base as fault-mon -WORKDIR /opt/optimism/packages/chain-mon/ -CMD ["start:fault-mon"] - -from base as multisig-mon -WORKDIR /opt/optimism/packages/internal/multisig-mon -CMD ["start:multisig-mon"] - -FROM base as replica-mon -WORKDIR /opt/optimism/packages/chain-mon/contrib -CMD ["start:replica-mon"] - -FROM base as wallet-mon -WORKDIR /opt/optimism/packages/chain-mon/contrib -CMD ["start:wallet-mon"] - -FROM base as wd-mon -WORKDIR /opt/optimism/packages/chain-mon/ -CMD ["start:wd-mon"] - -FROM base as faultproof-wd-mon -WORKDIR /opt/optimism/packages/chain-mon/ -CMD ["start:faultproof-wd-mon"] - FROM base as contracts-bedrock WORKDIR /opt/optimism/packages/contracts-bedrock CMD ["deploy"] diff --git a/ops/scripts/ci-docker-tag-op-stack-release.sh b/ops/scripts/ci-docker-tag-op-stack-release.sh index f743a20cbc41..49904d7cce9a 100755 --- a/ops/scripts/ci-docker-tag-op-stack-release.sh +++ b/ops/scripts/ci-docker-tag-op-stack-release.sh @@ -6,7 +6,7 @@ DOCKER_REPO=$1 GIT_TAG=$2 GIT_SHA=$3 -IMAGE_NAME=$(echo "$GIT_TAG" | grep -Eow '^(ci-builder(-rust)?|chain-mon|da-server|ufm-[a-z0-9\-]*|op-[a-z0-9\-]*)' || true) +IMAGE_NAME=$(echo "$GIT_TAG" | grep -Eow '^(ci-builder(-rust)?|da-server|ufm-[a-z0-9\-]*|op-[a-z0-9\-]*)' || true) if [ -z "$IMAGE_NAME" ]; then echo "image name could not be parsed from git tag '$GIT_TAG'" exit 1 diff --git a/ops/tag-service/tag-service.py b/ops/tag-service/tag-service.py index 319c997eb858..6cf8fdff0183 100755 --- a/ops/tag-service/tag-service.py +++ b/ops/tag-service/tag-service.py @@ -11,7 +11,6 @@ MIN_VERSIONS = { 'ci-builder': '0.6.0', 'ci-builder-rust': '0.1.0', - 'chain-mon': '0.2.2', 'da-server': '0.0.4', 'op-node': '0.10.14', 'op-batcher': '0.10.14', diff --git a/ops/tag-service/tag-tool.py b/ops/tag-service/tag-tool.py index 5da97d3cb924..08a8df922515 100644 --- a/ops/tag-service/tag-tool.py +++ b/ops/tag-service/tag-tool.py @@ -5,7 +5,6 @@ SERVICES = [ 'ci-builder', 'ci-builder-rust', - 'chain-mon', 'op-node', 'op-batcher', 'op-challenger', @@ -88,4 +87,3 @@ def main(): if __name__ == "__main__": main() - diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5481561a1b58..daeb9e3a3a6c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -84,58 +84,6 @@ importers: specifier: ^5.5.4 version: 5.5.4 - packages/chain-mon: - dependencies: - '@eth-optimism/common-ts': - specifier: ^0.8.9 - version: 0.8.9(bufferutil@4.0.8)(utf-8-validate@5.0.7) - '@eth-optimism/contracts-bedrock': - specifier: workspace:* - version: link:../contracts-bedrock - '@eth-optimism/contracts-periphery': - specifier: 1.0.8 - version: 1.0.8 - '@eth-optimism/core-utils': - specifier: ^0.13.2 - version: 0.13.2(bufferutil@4.0.8)(utf-8-validate@5.0.7) - '@eth-optimism/sdk': - specifier: ^3.3.2 - version: 3.3.2(bufferutil@4.0.8)(ethers@5.7.2(bufferutil@4.0.8)(utf-8-validate@5.0.7))(utf-8-validate@5.0.7) - '@types/dateformat': - specifier: ^5.0.0 - version: 5.0.0 - chai-as-promised: - specifier: ^7.1.1 - version: 7.1.1(chai@4.3.10) - dateformat: - specifier: ^4.5.1 - version: 4.5.1 - dotenv: - specifier: ^16.4.5 - version: 16.4.5 - ethers: - specifier: ^5.7.2 - version: 5.7.2(bufferutil@4.0.8)(utf-8-validate@5.0.7) - devDependencies: - '@ethersproject/abstract-provider': - specifier: ^5.7.0 - version: 5.7.0 - '@nomiclabs/hardhat-ethers': - specifier: ^2.2.3 - version: 2.2.3(ethers@5.7.2(bufferutil@4.0.8)(utf-8-validate@5.0.7))(hardhat@2.20.1(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.4.13)(@types/node@20.14.12)(typescript@5.5.4))(typescript@5.5.4)(utf-8-validate@5.0.7)) - '@nomiclabs/hardhat-waffle': - specifier: ^2.0.6 - version: 2.0.6(@nomiclabs/hardhat-ethers@2.2.3(ethers@5.7.2(bufferutil@4.0.8)(utf-8-validate@5.0.7))(hardhat@2.20.1(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.4.13)(@types/node@20.14.12)(typescript@5.5.4))(typescript@5.5.4)(utf-8-validate@5.0.7)))(@types/sinon-chai@3.2.5)(ethereum-waffle@4.0.10(@ensdomains/ens@0.4.5)(@ensdomains/resolver@0.2.4)(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2(bufferutil@4.0.8)(utf-8-validate@5.0.7))(ethers@5.7.2(bufferutil@4.0.8)(utf-8-validate@5.0.7))(typescript@5.5.4))(ethers@5.7.2(bufferutil@4.0.8)(utf-8-validate@5.0.7))(hardhat@2.20.1(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.4.13)(@types/node@20.14.12)(typescript@5.5.4))(typescript@5.5.4)(utf-8-validate@5.0.7)) - hardhat: - specifier: ^2.20.1 - version: 2.20.1(bufferutil@4.0.8)(ts-node@10.9.2(@swc/core@1.4.13)(@types/node@20.14.12)(typescript@5.5.4))(typescript@5.5.4)(utf-8-validate@5.0.7) - ts-node: - specifier: ^10.9.2 - version: 10.9.2(@swc/core@1.4.13)(@types/node@20.14.12)(typescript@5.5.4) - tsx: - specifier: ^4.16.2 - version: 4.16.2 - packages/contracts-bedrock: devDependencies: '@typescript-eslint/eslint-plugin':