Merge branch 'develop' into 20230201-lang-2

.circleci/config.yml

@@ -846,9 +846,9 @@ workflows:
           requires:
             - yarn-monorepo
       - js-lint-test:
-          name: drippie-mon-tests
-          coverage_flag: drippie-mon-tests
-          package_name: drippie-mon
+          name: chain-mon-tests
+          coverage_flag: chain-mon-tests
+          package_name: chain-mon
           dependencies: "(common-ts|contracts-periphery|core-utils|sdk)"
           requires:
             - yarn-monorepo

.dockerignore

 .github
+.vscode
 
 node_modules
+**/node_modules
 .env
 **/.env
 

.github/CODEOWNERS

@@ -12,7 +12,7 @@
 /packages/contracts-periphery   @ethereum-optimism/contract-reviewers
 /packages/core-utils            @ethereum-optimism/legacy-reviewers
 /packages/data-transport-layer  @ethereum-optimism/legacy-reviewers
-/packages/drippie-mon           @smartcontracts
+/packages/chain-mon             @smartcontracts
 /packages/fault-detector        @ethereum-optimism/legacy-reviewers
 /packages/hardhat-deploy-config @ethereum-optimism/legacy-reviewers
 /packages/message-relayer       @ethereum-optimism/legacy-reviewers

.vscode/settings.json

@@ -25,7 +25,7 @@
       "changeProcessCWD": true
     },
     {
-      "directory": "packages/drippie-mon",
+      "directory": "packages/chain-mon",
       "changeProcessCWD": true
     },
     {
@@ -45,4 +45,4 @@
   "eslint.format.enable": true,
   "editorconfig.generateAuto": false,
   "files.trimTrailingWhitespace": true
-}
\ No newline at end of file
+}

README.md

@@ -57,7 +57,7 @@ Refer to the Directory Structure section below to understand which packages are
 │   ├── <a href="./packages/contracts-periphery">contracts-periphery</a>: Peripheral contracts for Optimism
 │   ├── <a href="./packages/core-utils">core-utils</a>: Low-level utilities that make building Optimism easier
 │   ├── <a href="./packages/data-transport-layer">data-transport-layer</a>: Service for indexing Optimism-related L1 data
-│   ├── <a href="./packages/drippie-mon">drippie-mon</a>: Service for monitoring Drippie instances
+│   ├── <a href="./packages/chain-mon">chain-mon</a>: Chain monitoring services
 │   ├── <a href="./packages/fault-detector">fault-detector</a>: Service for detecting Sequencer faults
 │   ├── <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

codecov.yml

@@ -37,7 +37,7 @@ flag_management:
     - name: actor-tests-tests
     - name: contracts-periphery-tests
     - name: dtl-tests
-    - name: drippie-mon-tests
+    - name: chain-mon-tests
     - name: fault-detector-tests
     - name: message-relayer-tests
     - name: replica-healthcheck-tests

ops/docker/Dockerfile.packages

@@ -46,7 +46,7 @@ COPY packages/hardhat-deploy-config/package.json ./packages/hardhat-deploy-confi
 COPY packages/message-relayer/package.json ./packages/message-relayer/package.json
 COPY packages/fault-detector/package.json ./packages/fault-detector/package.json
 COPY packages/replica-healthcheck/package.json ./packages/replica-healthcheck/package.json
-COPY packages/drippie-mon/package.json ./packages/drippie-mon/package.json
+COPY packages/chain-mon/package.json ./packages/chain-mon/package.json
 COPY packages/balance-monitor/package.json ./packages/balance-monitor/package.json
 COPY packages/two-step-monitor/package.json ./packages/two-step-monitor/package.json
 COPY integration-tests/package.json ./integration-tests/package.json
@@ -106,8 +106,8 @@ WORKDIR /opt/optimism/packages/replica-healthcheck
 ENTRYPOINT ["npm", "run", "start"]
 
 FROM base as drippie-mon
-WORKDIR /opt/optimism/packages/drippie-mon
-ENTRYPOINT ["npm", "run", "start"]
+WORKDIR /opt/optimism/packages/chain-mon
+ENTRYPOINT ["npm", "run", "start:drippie-mon"]
 
 FROM base as balance-monitor
 WORKDIR /opt/optimism/packages/balance-monitor

packages/drippie-mon/.env.example → packages/chain-mon/.env.example

+###############################################################################
+#                               ↓ drippie-mon ↓                               #
+###############################################################################
+
 # RPC pointing to network where Drippie is deployed
 DRIPPIE_MON__RPC=
 

packages/drippie-mon/README.md → packages/chain-mon/README.md

-# @eth-optimism/drippie-mon
+# @eth-optimism/chain-mon
 
-[![codecov](https://codecov.io/gh/ethereum-optimism/optimism/branch/develop/graph/badge.svg?token=0VTG7PG7YR&flag=drippie-mon-tests)](https://codecov.io/gh/ethereum-optimism/optimism)
+[![codecov](https://codecov.io/gh/ethereum-optimism/optimism/branch/develop/graph/badge.svg?token=0VTG7PG7YR&flag=chain-mon-tests)](https://codecov.io/gh/ethereum-optimism/optimism)
 
-`drippie-mon` is a simple service for monitoring Drippie contracts.
+`chain-mon` is a collection of chain monitoring services.
 
 ## Installation
 
@@ -14,11 +14,17 @@ yarn install
 yarn build
 ```
 
-## Running the service
+## Running a service
 
-Copy `.env.example` into a new file named `.env`, then set the environment variables listed there.
+Copy `.env.example` into a new file named `.env`, then set the environment variables listed there depending on the service you want to run.
 Once your environment variables have been set, run via:
 
 ```
-yarn start
+yarn start:<service name>
+```
+
+For example, to run `drippie-mon`, execute:
+
+```
+yarn start:drippie-mon
 ```

packages/drippie-mon/package.json → packages/chain-mon/package.json

 {
   "private": true,
-  "name": "@eth-optimism/drippie-mon",
-  "version": "0.4.3",
-  "description": "[Optimism] Service for monitoring Drippie instances",
+  "name": "@eth-optimism/chain-mon",
+  "version": "0.1.0",
+  "description": "[Optimism] Chain monitoring services",
   "main": "dist/index",
   "types": "dist/index",
   "files": [
     "dist/*"
   ],
   "scripts": {
-    "start": "ts-node ./src/service.ts",
+    "start:drippie-mon": "ts-node ./src/drippie-mon/service.ts",
     "test:coverage": "echo 'No tests defined.'",
     "build": "tsc -p ./tsconfig.json",
     "clean": "rimraf  dist/ ./tsconfig.tsbuildinfo",
@@ -21,10 +21,9 @@
   "keywords": [
     "optimism",
     "ethereum",
-    "drippie",
     "monitoring"
   ],
-  "homepage": "https://github.com/ethereum-optimism/optimism/tree/develop/packages/drippie-mon#readme",
+  "homepage": "https://github.com/ethereum-optimism/optimism/tree/develop/packages/chain-mon#readme",
   "license": "MIT",
   "author": "Optimism PBC",
   "repository": {

packages/drippie-mon/src/service.ts → packages/chain-mon/src/drippie-mon/service.ts

@@ -9,7 +9,7 @@ import { Provider } from '@ethersproject/abstract-provider'
 import { ethers } from 'ethers'
 import * as DrippieArtifact from '@eth-optimism/contracts-periphery/artifacts/contracts/universal/drippie/Drippie.sol/Drippie.json'
 
-import { version } from '../package.json'
+import { version } from '../../package.json'
 
 type DrippieMonOptions = {
   rpc: Provider

packages/chain-mon/src/index.ts

+export * from './drippie-mon/service'

packages/contracts-bedrock/.gas-snapshot

@@ -9,13 +9,13 @@ GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 88513)
 GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 74998)
 GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 36156)
 GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 167187)
-Bytes_Test:test_slice_acrossMultipleWords_works() (gas: 9391)
-Bytes_Test:test_slice_acrossWords_works() (gas: 1397)
-Bytes_Test:test_slice_fromNonZeroIdx_works() (gas: 17218)
-Bytes_Test:test_slice_fromZeroIdx_works() (gas: 20826)
-Bytes_Test:test_toNibbles_expectedResult128Bytes_works() (gas: 129885)
-Bytes_Test:test_toNibbles_expectedResult5Bytes_works() (gas: 6132)
-Bytes_Test:test_toNibbles_zeroLengthInput_works() (gas: 966)
+Bytes_slice_Test:test_slice_acrossMultipleWords_works() (gas: 9357)
+Bytes_slice_Test:test_slice_acrossWords_works() (gas: 1396)
+Bytes_slice_Test:test_slice_fromNonZeroIdx_works() (gas: 17154)
+Bytes_slice_Test:test_slice_fromZeroIdx_works() (gas: 20671)
+Bytes_toNibbles_Test:test_toNibbles_expectedResult128Bytes_works() (gas: 129830)
+Bytes_toNibbles_Test:test_toNibbles_expectedResult5Bytes_works() (gas: 6088)
+Bytes_toNibbles_Test:test_toNibbles_zeroLengthInput_works() (gas: 944)
 CrossDomainMessenger_BaseGas_Test:test_baseGas_succeeds() (gas: 20120)
 CrossDomainOwnableThroughPortal_Test:test_depositTransaction_crossDomainOwner_succeeds() (gas: 61882)
 CrossDomainOwnable_Test:test_onlyOwner_notOwner_reverts() (gas: 10530)

packages/contracts-bedrock/contracts/test/AddressAliasHelper.t.sol

@@ -4,7 +4,10 @@ pragma solidity 0.8.15;
 import { Test } from "forge-std/Test.sol";
 import { AddressAliasHelper } from "../vendor/AddressAliasHelper.sol";
 
-contract AddressAliasHelper_Test is Test {
+contract AddressAliasHelper_applyAndUndo_Test is Test {
+    /**
+     * @notice Tests that applying and then undoing an alias results in the original address.
+     */
     function testFuzz_applyAndUndo_succeeds(address _address) external {
         address aliased = AddressAliasHelper.applyL1ToL2Alias(_address);
         address unaliased = AddressAliasHelper.undoL1ToL2Alias(aliased);

packages/contracts-periphery/package.json

@@ -54,7 +54,6 @@
     "url": "https://github.com/ethereum-optimism/optimism.git"
   },
   "devDependencies": {
-    "@defi-wonderland/smock": "^2.0.7",
     "@eth-optimism/contracts-bedrock": "0.11.3",
     "@eth-optimism/core-utils": "^0.12.0",
     "@eth-optimism/hardhat-deploy-config": "^0.2.5",

packages/contracts-periphery/test/contracts/universal/drippie/dripchecks/CheckBalanceHigh.spec.ts

-import hre from 'hardhat'
-import { Contract } from 'ethers'
-import { toRpcHexString } from '@eth-optimism/core-utils'
-
-import { expect } from '../../../../setup'
-import { deploy } from '../../../../helpers'
-import { encodeDripCheckParams } from '../../../../../src'
-
-describe('CheckBalanceHigh', () => {
-  const RECIPIENT = '0x' + '11'.repeat(20)
-  const THRESHOLD = 100
-
-  let CheckBalanceHigh: Contract
-  before(async () => {
-    CheckBalanceHigh = await deploy('CheckBalanceHigh')
-  })
-
-  describe('check', () => {
-    it('should return true when balance is above threshold', async () => {
-      await hre.ethers.provider.send('hardhat_setBalance', [
-        RECIPIENT,
-        toRpcHexString(THRESHOLD + 1),
-      ])
-
-      expect(
-        await CheckBalanceHigh.check(
-          encodeDripCheckParams(CheckBalanceHigh.interface, {
-            target: RECIPIENT,
-            threshold: THRESHOLD,
-          })
-        )
-      ).to.equal(true)
-    })
-
-    it('should return false when balance is below threshold', async () => {
-      await hre.ethers.provider.send('hardhat_setBalance', [
-        RECIPIENT,
-        toRpcHexString(THRESHOLD - 1),
-      ])
-
-      expect(
-        await CheckBalanceHigh.check(
-          encodeDripCheckParams(CheckBalanceHigh.interface, {
-            target: RECIPIENT,
-            threshold: THRESHOLD,
-          })
-        )
-      ).to.equal(false)
-    })
-  })
-})

packages/contracts-periphery/test/contracts/universal/drippie/dripchecks/CheckBalanceLow.spec.ts

-import hre from 'hardhat'
-import { Contract } from 'ethers'
-import { toRpcHexString } from '@eth-optimism/core-utils'
-
-import { expect } from '../../../../setup'
-import { deploy } from '../../../../helpers'
-import { encodeDripCheckParams } from '../../../../../src'
-
-describe('CheckBalanceLow', () => {
-  const RECIPIENT = '0x' + '11'.repeat(20)
-  const THRESHOLD = 100
-
-  let CheckBalanceLow: Contract
-  before(async () => {
-    CheckBalanceLow = await deploy('CheckBalanceLow')
-  })
-
-  describe('check', () => {
-    it('should return true when balance is below threshold', async () => {
-      await hre.ethers.provider.send('hardhat_setBalance', [
-        RECIPIENT,
-        toRpcHexString(THRESHOLD - 1),
-      ])
-
-      expect(
-        await CheckBalanceLow.check(
-          encodeDripCheckParams(CheckBalanceLow.interface, {
-            target: RECIPIENT,
-            threshold: THRESHOLD,
-          })
-        )
-      ).to.equal(true)
-    })
-
-    it('should return false when balance is above threshold', async () => {
-      await hre.ethers.provider.send('hardhat_setBalance', [
-        RECIPIENT,
-        toRpcHexString(THRESHOLD + 1),
-      ])
-
-      expect(
-        await CheckBalanceLow.check(
-          encodeDripCheckParams(CheckBalanceLow.interface, {
-            target: RECIPIENT,
-            threshold: THRESHOLD,
-          })
-        )
-      ).to.equal(false)
-    })
-  })
-})

packages/contracts-periphery/test/contracts/universal/drippie/dripchecks/CheckGelatoLow.spec.ts

-import { Contract } from 'ethers'
-import { smock, FakeContract } from '@defi-wonderland/smock'
-
-import { expect } from '../../../../setup'
-import { deploy } from '../../../../helpers'
-import { encodeDripCheckParams } from '../../../../../src'
-
-describe('CheckGelatoLow', () => {
-  const RECIPIENT = '0x' + '11'.repeat(20)
-  const THRESHOLD = 100
-
-  let CheckGelatoLow: Contract
-  let FakeGelatoTresury: FakeContract<Contract>
-  before(async () => {
-    CheckGelatoLow = await deploy('CheckGelatoLow')
-    FakeGelatoTresury = await smock.fake('IGelatoTreasury')
-  })
-
-  describe('check', () => {
-    it('should return true when balance is below threshold', async () => {
-      FakeGelatoTresury.userTokenBalance.returns(THRESHOLD - 1)
-
-      expect(
-        await CheckGelatoLow.check(
-          encodeDripCheckParams(CheckGelatoLow.interface, {
-            treasury: FakeGelatoTresury.address,
-            threshold: THRESHOLD,
-            recipient: RECIPIENT,
-          })
-        )
-      ).to.equal(true)
-    })
-
-    it('should return false when balance is above threshold', async () => {
-      FakeGelatoTresury.userTokenBalance.returns(THRESHOLD + 1)
-
-      expect(
-        await CheckGelatoLow.check(
-          encodeDripCheckParams(CheckGelatoLow.interface, {
-            treasury: FakeGelatoTresury.address,
-            threshold: THRESHOLD,
-            recipient: RECIPIENT,
-          })
-        )
-      ).to.equal(false)
-    })
-  })
-})

packages/contracts-periphery/test/contracts/universal/drippie/dripchecks/CheckTrue.spec.ts

-import { Contract } from 'ethers'
-
-import { expect } from '../../../../setup'
-import { deploy } from '../../../../helpers'
-
-describe('CheckTrue', () => {
-  let CheckTrue: Contract
-  before(async () => {
-    CheckTrue = await deploy('CheckTrue')
-  })
-
-  describe('check', () => {
-    it('should return true', async () => {
-      expect(await CheckTrue.check('0x')).to.equal(true)
-    })
-  })
-})

packages/drippie-mon/src/index.ts

-export * from './service'