Merge branch 'main' into rekm/eth-json-rpc-middleware-finalize-migration

Author: rekmarks

.github/CODEOWNERS

@@ -84,6 +84,7 @@
 
 ## Joint team ownership
 /packages/core-backend                          @MetaMask/core-platform @MetaMask/metamask-assets
+/packages/eth-block-tracker            @MetaMask/wallet-integrations @MetaMask/core-platform
 /packages/eth-json-rpc-middleware/src/methods   @MetaMask/confirmations @MetaMask/wallet-api-platform-engineers
 /packages/eth-json-rpc-middleware/src/wallet.*  @MetaMask/confirmations @MetaMask/wallet-api-platform-engineers
 /packages/eth-json-rpc-provider                 @MetaMask/wallet-integrations @MetaMask/core-platform

eslint-warning-thresholds.json

@@ -493,5 +493,39 @@
   },
   "tests/setupAfterEnv/nock.ts": {
     "import-x/no-named-as-default-member": 3
+  },
+  "packages/eth-block-tracker/src/BlockTracker.ts": {
+    "@typescript-eslint/naming-convention": 1
+  },
+  "packages/eth-block-tracker/src/PollingBlockTracker.test.ts": {
+    "@typescript-eslint/explicit-function-return-type": 12,
+    "@typescript-eslint/naming-convention": 1
+  },
+  "packages/eth-block-tracker/src/PollingBlockTracker.ts": {
+    "@typescript-eslint/explicit-function-return-type": 14,
+    "@typescript-eslint/naming-convention": 1,
+    "@typescript-eslint/unbound-method": 5
+  },
+  "packages/eth-block-tracker/tests/buildDeferred.ts": {
+    "@typescript-eslint/explicit-function-return-type": 1,
+    "@typescript-eslint/naming-convention": 1
+  },
+  "packages/eth-block-tracker/tests/emptyFunction.ts": {
+    "@typescript-eslint/explicit-function-return-type": 1
+  },
+  "packages/eth-block-tracker/tests/recordCallsToSetTimeout.ts": {
+    "@typescript-eslint/explicit-function-return-type": 4,
+    "@typescript-eslint/naming-convention": 2,
+    "@typescript-eslint/no-explicit-any": 1
+  },
+  "packages/eth-block-tracker/tests/setupAfterEnv.ts": {
+    "@typescript-eslint/consistent-type-definitions": 1,
+    "@typescript-eslint/explicit-function-return-type": 2,
+    "@typescript-eslint/naming-convention": 1,
+    "@typescript-eslint/no-explicit-any": 3
+  },
+  "packages/eth-block-tracker/tests/withBlockTracker.ts": {
+    "@typescript-eslint/explicit-function-return-type": 2,
+    "@typescript-eslint/no-explicit-any": 1
   }
 }

eslint.config.mjs

@@ -251,6 +251,20 @@ const config = createConfig([
       'n/no-deprecated-api': 'off',
     },
   },
+  {
+    files: ['packages/eth-block-tracker/**/*.ts'],
+    rules: {
+      // TODO: These should perhaps be enabled
+      '@typescript-eslint/prefer-nullish-coalescing': 'off',
+      'no-restricted-syntax': 'off',
+      // TODO: These should definitely be enabled
+      '@typescript-eslint/naming-convention': 'warn',
+      '@typescript-eslint/no-explicit-any': 'warn',
+      '@typescript-eslint/unbound-method': 'warn',
+      '@typescript-eslint/consistent-type-definitions': 'warn',
+      '@typescript-eslint/explicit-function-return-type': 'warn',
+    },
+  },
 ]);
 
 export default config;

merged-packages/eth-block-tracker/tsconfig.json

@@ -60,7 +60,7 @@
     "@metamask/eslint-config-jest": "^14.0.0",
     "@metamask/eslint-config-nodejs": "^14.0.0",
     "@metamask/eslint-config-typescript": "^14.0.0",
-    "@metamask/eth-block-tracker": "^12.2.1",
+    "@metamask/eth-block-tracker": "^13.0.0",
     "@metamask/eth-json-rpc-provider": "^5.0.1",
     "@metamask/json-rpc-engine": "^10.1.1",
     "@metamask/utils": "^11.8.1",

package.json

@@ -7,8 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- **BREAKING:** Update minimum Node.js version from `^18.16.0` to `^18.18.0` ([#7930](https://github.com/MetaMask/core/pull/7930))
 - This package was migrated from `MetaMask/eth-block-tracker` to the
-  `MetaMask/core` monorepo.
+  `MetaMask/core` monorepo ([#7930](https://github.com/MetaMask/core/pull/7930))
   - See [`MetaMask/eth-block-tracker`](https://github.com/MetaMask/eth-block-tracker/blob/main/CHANGELOG.md)
     for the original changelog.
 

merged-packages/eth-block-tracker/CHANGELOG.md renamed to packages/eth-block-tracker/CHANGELOG.md

@@ -2,9 +2,13 @@
   "name": "@metamask/eth-block-tracker",
   "version": "13.0.0",
   "description": "A block tracker for the Ethereum blockchain. Keeps track of the latest block",
-  "homepage": "https://github.com/MetaMask/eth-block-tracker#readme",
+  "keywords": [
+    "MetaMask",
+    "Ethereum"
+  ],
+  "homepage": "https://github.com/MetaMask/core/tree/main/packages/eth-block-tracker#readme",
   "bugs": {
-    "url": "https://github.com/MetaMask/eth-block-tracker/issues"
+    "url": "https://github.com/MetaMask/core/issues"
   },
   "repository": {
     "type": "git",
@@ -29,23 +33,25 @@
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.cts",
   "files": [
-    "dist"
+    "dist",
+    "dist/"
   ],
   "scripts": {
-    "build": "ts-bridge --project tsconfig.build.json --clean",
-    "build:clean": "rimraf dist && yarn build",
+    "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references",
     "build:docs": "typedoc",
-    "lint": "yarn lint:eslint && yarn lint:constraints && yarn lint:misc --check && yarn lint:dependencies --check && yarn lint:changelog",
-    "lint:changelog": "auto-changelog validate --prettier",
-    "lint:constraints": "yarn constraints",
-    "lint:dependencies": "depcheck && yarn dedupe --check",
-    "lint:dependencies:fix": "depcheck && yarn dedupe",
-    "lint:eslint": "eslint . --cache",
-    "lint:fix": "yarn lint:eslint --fix && yarn lint:constraints --fix && yarn lint:misc --write && yarn lint:dependencies:fix && yarn lint:changelog",
-    "lint:misc": "prettier '**/*.json' '**/*.md' '**/*.yml' '!.yarnrc.yml' --ignore-path .gitignore --no-error-on-unmatched-pattern",
-    "prepack": "./scripts/prepack.sh",
-    "test": "jest && attw --pack",
-    "test:watch": "jest --watch"
+    "changelog:update": "../../scripts/update-changelog.sh @metamask/eth-block-tracker",
+    "changelog:validate": "../../scripts/validate-changelog.sh @metamask/eth-block-tracker",
+    "lint": "yarn lint:eslint && yarn lint:misc --check && yarn lint:dependencies",
+    "lint:dependencies": "depcheck",
+    "lint:eslint": "eslint . --cache --ext js,ts",
+    "lint:fix": "yarn lint:eslint --fix && yarn lint:misc --write && yarn lint:dependencies",
+    "lint:misc": "prettier '**/*.json' '**/*.md' '!CHANGELOG.md' '**/*.yml' '!.yarnrc.yml' --ignore-path .gitignore --no-error-on-unmatched-pattern",
+    "publish:preview": "yarn npm publish --tag preview",
+    "since-latest-release": "../../scripts/since-latest-release.sh",
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
+    "test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
+    "test:verbose": "NODE_OPTIONS=--experimental-vm-modules jest --verbose",
+    "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
   },
   "dependencies": {
     "@metamask/eth-json-rpc-provider": "^5.0.1",
@@ -65,18 +71,11 @@
     "typedoc-plugin-missing-exports": "^2.0.0",
     "typescript": "~5.2.2"
   },
-  "packageManager": "yarn@4.5.3",
   "engines": {
-    "node": "^18.16 || ^20 || >=22"
+    "node": "^18.18 || >=20"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
-  },
-  "lavamoat": {
-    "allowScripts": {
-      "@lavamoat/preinstall-always-fail": false,
-      "eslint-plugin-import-x>unrs-resolver": false
-    }
   }
 }