Skip to content

Commit

Permalink
Delete chain-mon in favor of monitorism (#11239)
Browse files Browse the repository at this point in the history
* Delete chain-mon

* Delete chain-mon from other places.

---------

Co-authored-by: Kevin Kz <k@oplabs.co>
  • Loading branch information
zchn and Kevin Kz authored Jul 25, 2024
1 parent 461b02a commit d3d920f
Show file tree
Hide file tree
Showing 44 changed files with 2 additions and 22,246 deletions.
34 changes: 1 addition & 33 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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: <<pipeline.git.revision>>,latest
publish: true
release: true
resource_class: xlarge
context:
- oplabs-gcr-release
requires:
- hold
- docker-build:
name: ci-builder-docker-release
filters:
Expand Down Expand Up @@ -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: <<pipeline.git.revision>>,<<pipeline.git.branch>>
resource_class: xlarge
publish: true
context:
- oplabs-gcr
- slack
- docker-build:
name: contracts-bedrock-docker-publish
docker_name: contracts-bedrock
docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>
resource_class: xlarge
requires: [ 'chain-mon-docker-publish' ] # use the cached base image
publish: true
context:
- oplabs-gcr
Expand Down
2 changes: 0 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -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

Expand Down
8 changes: 0 additions & 8 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/'
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/tag-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ on:
- ci-builder
- ci-builder-rust
- op-heartbeat
- chain-mon
- op-node
- op-batcher
- op-proposer
Expand Down
12 changes: 0 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ The Optimism Immunefi program offers up to $2,000,042 for in-scope critical vuln
├── <a href="./ops">ops</a>: Various operational packages
├── <a href="./ops-bedrock">ops-bedrock</a>: Bedrock devnet work
├── <a href="./packages">packages</a>
│ ├── <a href="./packages/chain-mon">chain-mon</a>: Chain monitoring services
│ ├── <a href="./packages/contracts-bedrock">contracts-bedrock</a>: OP Stack smart contracts
│ ├── <a href="./packages/devnet-tasks">devnet-tasks</a>: Legacy Hardhat tasks used within devnet CI tests
├── <a href="./proxyd">proxyd</a>: Configurable RPC request router and proxy
Expand Down Expand Up @@ -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`
Expand Down
1 change: 0 additions & 1 deletion codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,4 @@ flag_management:
target: 100%
- name: bedrock-go-tests
- name: contracts-tests
- name: chain-mon-tests
- name: sdk-tests
15 changes: 0 additions & 15 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "."
Expand Down
33 changes: 0 additions & 33 deletions ops/docker/Dockerfile.packages
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion ops/scripts/ci-docker-tag-op-stack-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion ops/tag-service/tag-service.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 0 additions & 2 deletions ops/tag-service/tag-tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
SERVICES = [
'ci-builder',
'ci-builder-rust',
'chain-mon',
'op-node',
'op-batcher',
'op-challenger',
Expand Down Expand Up @@ -88,4 +87,3 @@ def main():

if __name__ == "__main__":
main()

13 changes: 0 additions & 13 deletions packages/chain-mon/.depcheckrc

This file was deleted.

85 changes: 0 additions & 85 deletions packages/chain-mon/.env.example

This file was deleted.

3 changes: 0 additions & 3 deletions packages/chain-mon/.eslintrc.js

This file was deleted.

2 changes: 0 additions & 2 deletions packages/chain-mon/.lintstagedrc.yml

This file was deleted.

3 changes: 0 additions & 3 deletions packages/chain-mon/.prettierrc.js

This file was deleted.

Loading

0 comments on commit d3d920f

Please sign in to comment.