diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2d563dbc5ccb..4b4db8c9a757 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,6 +1,6 @@ # Packages /packages/chain-mon @ethereum-optimism/security-reviewers -/packages/chain-mon/src/balance-mon @ethereum-optimism/infra-reviewers +/packages/chain-mon/internal/balance-mon @ethereum-optimism/infra-reviewers /packages/common-ts @ethereum-optimism/typescript-reviewers /packages/contracts-bedrock @ethereum-optimism/contract-reviewers /packages/core-utils @ethereum-optimism/legacy-reviewers diff --git a/ops/docker/Dockerfile.packages b/ops/docker/Dockerfile.packages index 70c981b7f197..bb960b36654a 100644 --- a/ops/docker/Dockerfile.packages +++ b/ops/docker/Dockerfile.packages @@ -95,31 +95,31 @@ 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 +WORKDIR /opt/optimism/packages/chain-mon/internal CMD ["start:balance-mon"] FROM base as drippie-mon -WORKDIR /opt/optimism/packages/chain-mon +WORKDIR /opt/optimism/packages/chain-mon/contrib CMD ["start:drippie-mon"] from base as fault-mon -WORKDIR /opt/optimism/packages/chain-mon +WORKDIR /opt/optimism/packages/chain-mon/ CMD ["start:fault-mon"] from base as multisig-mon -WORKDIR /opt/optimism/packages/multisig-mon +WORKDIR /opt/optimism/packages/internal/multisig-mon CMD ["start:multisig-mon"] FROM base as replica-mon -WORKDIR /opt/optimism/packages/chain-mon +WORKDIR /opt/optimism/packages/chain-mon/contrib CMD ["start:replica-mon"] FROM base as wallet-mon -WORKDIR /opt/optimism/packages/chain-mon +WORKDIR /opt/optimism/packages/chain-mon/contrib CMD ["start:wallet-mon"] FROM base as wd-mon -WORKDIR /opt/optimism/packages/chain-mon +WORKDIR /opt/optimism/packages/chain-mon/ CMD ["start:wd-mon"] FROM base as contracts-bedrock diff --git a/packages/chain-mon/src/drippie-mon/service.ts b/packages/chain-mon/contrib/drippie-mon/service.ts similarity index 100% rename from packages/chain-mon/src/drippie-mon/service.ts rename to packages/chain-mon/contrib/drippie-mon/service.ts diff --git a/packages/chain-mon/src/initialized-upgraded-mon/service.ts b/packages/chain-mon/contrib/initialized-upgraded-mon/service.ts similarity index 100% rename from packages/chain-mon/src/initialized-upgraded-mon/service.ts rename to packages/chain-mon/contrib/initialized-upgraded-mon/service.ts diff --git a/packages/chain-mon/src/replica-mon/README.md b/packages/chain-mon/contrib/replica-mon/README.md similarity index 100% rename from packages/chain-mon/src/replica-mon/README.md rename to packages/chain-mon/contrib/replica-mon/README.md diff --git a/packages/chain-mon/src/replica-mon/index.ts b/packages/chain-mon/contrib/replica-mon/index.ts similarity index 100% rename from packages/chain-mon/src/replica-mon/index.ts rename to packages/chain-mon/contrib/replica-mon/index.ts diff --git a/packages/chain-mon/src/replica-mon/service.ts b/packages/chain-mon/contrib/replica-mon/service.ts similarity index 100% rename from packages/chain-mon/src/replica-mon/service.ts rename to packages/chain-mon/contrib/replica-mon/service.ts diff --git a/packages/chain-mon/src/wallet-mon/service.ts b/packages/chain-mon/contrib/wallet-mon/service.ts similarity index 100% rename from packages/chain-mon/src/wallet-mon/service.ts rename to packages/chain-mon/contrib/wallet-mon/service.ts diff --git a/packages/chain-mon/src/balance-mon/service.ts b/packages/chain-mon/internal/balance-mon/service.ts similarity index 100% rename from packages/chain-mon/src/balance-mon/service.ts rename to packages/chain-mon/internal/balance-mon/service.ts diff --git a/packages/chain-mon/src/multisig-mon/service.ts b/packages/chain-mon/internal/multisig-mon/service.ts similarity index 98% rename from packages/chain-mon/src/multisig-mon/service.ts rename to packages/chain-mon/internal/multisig-mon/service.ts index bb50d18b3d9b..432089fc0eb3 100644 --- a/packages/chain-mon/src/multisig-mon/service.ts +++ b/packages/chain-mon/internal/multisig-mon/service.ts @@ -10,8 +10,8 @@ import { import { Provider } from '@ethersproject/abstract-provider' import { ethers } from 'ethers' -import Safe from '../abi/IGnosisSafe.0.8.19.json' -import OptimismPortal from '../abi/OptimismPortal.json' +import Safe from '../../src/abi/IGnosisSafe.0.8.19.json' +import OptimismPortal from '../../src/abi/OptimismPortal.json' import { version } from '../../package.json' type MultisigMonOptions = { diff --git a/packages/chain-mon/package.json b/packages/chain-mon/package.json index 53a01d441a2b..a302b3029b98 100644 --- a/packages/chain-mon/package.json +++ b/packages/chain-mon/package.json @@ -9,22 +9,22 @@ "dist/*" ], "scripts": { - "dev:balance-mon": "tsx watch ./src/balance-mon/service.ts", - "dev:drippie-mon": "tsx watch ./src/drippie-mon/service.ts", + "dev:balance-mon": "tsx watch ./internal/balance-mon/service.ts", + "dev:drippie-mon": "tsx watch ./contrib/drippie/service.ts", "dev:fault-mon": "tsx watch ./src/fault-mon/service.ts", - "dev:multisig-mon": "tsx watch ./src/multisig-mon/service.ts", - "dev:replica-mon": "tsx watch ./src/replica-mon/service.ts", - "dev:wallet-mon": "tsx watch ./src/wallet-mon/service.ts", + "dev:multisig-mon": "tsx watch ./internal/multisig-mon/service.ts", + "dev:replica-mon": "tsx watch ./contrib/replica-mon/service.ts", + "dev:wallet-mon": "tsx watch ./contrib/wallet-mon/service.ts", "dev:wd-mon": "tsx watch ./src/wd-mon/service.ts", - "dev:initialized-upgraded-mon": "tsx watch ./src/initialized-upgraded-mon/service.ts", - "start:balance-mon": "tsx ./src/balance-mon/service.ts", - "start:drippie-mon": "tsx ./src/drippie-mon/service.ts", + "dev:initialized-upgraded-mon": "tsx watch ./contrib/initialized-upgraded-mon/service.ts", + "start:balance-mon": "tsx ./internal/balance-mon/service.ts", + "start:drippie-mon": "tsx ./contrib/drippie/service.ts", "start:fault-mon": "tsx ./src/fault-mon/service.ts", - "start:multisig-mon": "tsx ./src/multisig-mon/service.ts", - "start:replica-mon": "tsx ./src/replica-mon/service.ts", - "start:wallet-mon": "tsx ./src/wallet-mon/service.ts", + "start:multisig-mon": "tsx ./internal/multisig-mon/service.ts", + "start:replica-mon": "tsx ./contrib/replica-mon/service.ts", + "start:wallet-mon": "tsx ./contrib/wallet-mon/service.ts", "start:wd-mon": "tsx ./src/wd-mon/service.ts", - "start:initialized-upgraded-mon": "tsx ./src/initialized-upgraded-mon/service.ts", + "start:initialized-upgraded-mon": "tsx ./contrib/initialized-upgraded-mon/service.ts", "test": "hardhat test", "test:coverage": "nyc hardhat test && nyc merge .nyc_output coverage.json", "build": "tsc -p ./tsconfig.json", @@ -66,4 +66,4 @@ "ts-node": "^10.9.2", "tsx": "^4.7.0" } -} \ No newline at end of file +} diff --git a/packages/chain-mon/src/index.ts b/packages/chain-mon/src/index.ts index 9091eca096d6..512e4741c298 100644 --- a/packages/chain-mon/src/index.ts +++ b/packages/chain-mon/src/index.ts @@ -1,7 +1,7 @@ -export * from './balance-mon/service' -export * from './drippie-mon/service' +export * from '../internal/balance-mon/service' +export * from '../contrib/drippie-mon/service' export * from './fault-mon/index' -export * from './multisig-mon/service' +export * from '../internal/multisig-mon/service' export * from './wd-mon/service' -export * from './wallet-mon/service' -export * from './initialized-upgraded-mon/service' +export * from '../contrib/wallet-mon/service' +export * from '../contrib/initialized-upgraded-mon/service' diff --git a/packages/chain-mon/tsconfig.json b/packages/chain-mon/tsconfig.json index 24967ddae693..f9bea541e657 100644 --- a/packages/chain-mon/tsconfig.json +++ b/packages/chain-mon/tsconfig.json @@ -8,6 +8,8 @@ "package.json", "src/abi/IGnosisSafe.0.8.19.json", "src/abi/OptimismPortal.json", - "src/**/*" + "src/**/*", + "contrib/**/*", + "internal/**/*" ] }