Skip to content

Commit

Permalink
Merge branch 'main' into 240610-upgrade-AssetsContractController
Browse files Browse the repository at this point in the history
  • Loading branch information
MajorLift authored Jul 17, 2024
2 parents 418df79 + 30df5f0 commit c35943c
Show file tree
Hide file tree
Showing 43 changed files with 345 additions and 493 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@metamask/core-monorepo",
"version": "176.0.0",
"version": "177.0.0",
"private": true,
"description": "Monorepo for packages shared between MetaMask clients",
"repository": {
Expand Down Expand Up @@ -58,7 +58,7 @@
"@metamask/eth-block-tracker": "^9.0.3",
"@metamask/eth-json-rpc-provider": "^4.1.1",
"@metamask/json-rpc-engine": "^9.0.1",
"@metamask/utils": "^9.0.0",
"@metamask/utils": "^9.1.0",
"@types/jest": "^27.4.1",
"@types/node": "^16.18.54",
"@typescript-eslint/eslint-plugin": "^5.62.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/accounts-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"@metamask/keyring-controller": "^17.1.1",
"@metamask/snaps-sdk": "^4.2.0",
"@metamask/snaps-utils": "^7.4.0",
"@metamask/utils": "^9.0.0",
"@metamask/utils": "^9.1.0",
"deepmerge": "^4.2.2",
"ethereum-cryptography": "^2.1.2",
"immer": "^9.0.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/address-book-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"dependencies": {
"@metamask/base-controller": "^6.0.1",
"@metamask/controller-utils": "^11.0.1",
"@metamask/utils": "^9.0.0"
"@metamask/utils": "^9.1.0"
},
"devDependencies": {
"@metamask/auto-changelog": "^3.4.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/approval-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"dependencies": {
"@metamask/base-controller": "^6.0.1",
"@metamask/rpc-errors": "^6.3.1",
"@metamask/utils": "^9.0.0",
"@metamask/utils": "^9.1.0",
"nanoid": "^3.1.31"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/assets-controllers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"@metamask/polling-controller": "^9.0.0",
"@metamask/preferences-controller": "^13.0.0",
"@metamask/rpc-errors": "^6.3.1",
"@metamask/utils": "^9.0.0",
"@metamask/utils": "^9.1.0",
"@types/bn.js": "^5.1.5",
"@types/uuid": "^8.3.0",
"async-mutex": "^0.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/base-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"test:watch": "jest --watch"
},
"dependencies": {
"@metamask/utils": "^9.0.0",
"@metamask/utils": "^9.1.0",
"immer": "^9.0.6"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/build-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"test:watch": "jest --watch"
},
"dependencies": {
"@metamask/utils": "^9.0.0",
"@metamask/utils": "^9.1.0",
"@types/eslint": "^8.44.7"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/chain-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@metamask/snaps-controllers": "^8.1.1",
"@metamask/snaps-sdk": "^4.2.0",
"@metamask/snaps-utils": "^7.4.0",
"@metamask/utils": "^9.0.0",
"@metamask/utils": "^9.1.0",
"uuid": "^8.3.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/controller-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@ethereumjs/util": "^8.1.0",
"@metamask/eth-query": "^4.0.0",
"@metamask/ethjs-unit": "^0.3.0",
"@metamask/utils": "^9.0.0",
"@metamask/utils": "^9.1.0",
"@spruceid/siwe-parser": "2.1.0",
"@types/bn.js": "^5.1.5",
"bn.js": "^5.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/ens-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@ethersproject/providers": "^5.7.0",
"@metamask/base-controller": "^6.0.1",
"@metamask/controller-utils": "^11.0.1",
"@metamask/utils": "^9.0.0",
"@metamask/utils": "^9.1.0",
"punycode": "^2.1.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/eth-json-rpc-provider/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"@metamask/json-rpc-engine": "^9.0.1",
"@metamask/rpc-errors": "^6.3.1",
"@metamask/safe-event-emitter": "^3.0.0",
"@metamask/utils": "^9.0.0",
"@metamask/utils": "^9.1.0",
"uuid": "^8.3.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/gas-fee-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@metamask/ethjs-unit": "^0.3.0",
"@metamask/network-controller": "^20.0.0",
"@metamask/polling-controller": "^9.0.0",
"@metamask/utils": "^9.0.0",
"@metamask/utils": "^9.1.0",
"@types/bn.js": "^5.1.5",
"@types/uuid": "^8.3.0",
"bn.js": "^5.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/json-rpc-engine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"dependencies": {
"@metamask/rpc-errors": "^6.3.1",
"@metamask/safe-event-emitter": "^3.0.0",
"@metamask/utils": "^9.0.0"
"@metamask/utils": "^9.1.0"
},
"devDependencies": {
"@lavamoat/allow-scripts": "^3.0.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/json-rpc-middleware-stream/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"dependencies": {
"@metamask/json-rpc-engine": "^9.0.1",
"@metamask/safe-event-emitter": "^3.0.0",
"@metamask/utils": "^9.0.0",
"@metamask/utils": "^9.1.0",
"readable-stream": "^3.6.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/keyring-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@metamask/eth-simple-keyring": "^6.0.1",
"@metamask/keyring-api": "^8.0.0",
"@metamask/message-manager": "^10.0.1",
"@metamask/utils": "^9.0.0",
"@metamask/utils": "^9.1.0",
"async-mutex": "^0.5.0",
"ethereumjs-wallet": "^1.0.1",
"immer": "^9.0.6"
Expand Down
2 changes: 1 addition & 1 deletion packages/message-manager/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@metamask/base-controller": "^6.0.1",
"@metamask/controller-utils": "^11.0.1",
"@metamask/eth-sig-util": "^7.0.1",
"@metamask/utils": "^9.0.0",
"@metamask/utils": "^9.1.0",
"@types/uuid": "^8.3.0",
"jsonschema": "^1.2.4",
"uuid": "^8.3.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/name-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"dependencies": {
"@metamask/base-controller": "^6.0.1",
"@metamask/controller-utils": "^11.0.1",
"@metamask/utils": "^9.0.0",
"@metamask/utils": "^9.1.0",
"async-mutex": "^0.5.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/network-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@metamask/json-rpc-engine": "^9.0.1",
"@metamask/rpc-errors": "^6.3.1",
"@metamask/swappable-obj-proxy": "^2.2.0",
"@metamask/utils": "^9.0.0",
"@metamask/utils": "^9.1.0",
"async-mutex": "^0.5.0",
"immer": "^9.0.6",
"loglevel": "^1.8.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/notification-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
},
"dependencies": {
"@metamask/base-controller": "^6.0.1",
"@metamask/utils": "^9.0.0",
"@metamask/utils": "^9.1.0",
"nanoid": "^3.1.31"
},
"devDependencies": {
Expand Down
88 changes: 88 additions & 0 deletions packages/permission-controller/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
module.exports = {
extends: ['../../.eslintrc.js'],

overrides: [
{
files: [
'src/PermissionController.test.ts',
'src/rpc-methods/revokePermissions.test.ts',
],
rules: {
// This is taken directly from @metamask/eslint-config-typescript@12.1.0
'@typescript-eslint/naming-convention': [
'error',
// We have to disable the default selector for our objectLiteralProperty
// filter to work.
// {
// selector: 'default',
// format: ['camelCase'],
// leadingUnderscore: 'allow',
// trailingUnderscore: 'forbid',
// },
{
selector: 'enumMember',
format: ['PascalCase'],
},
{
selector: 'interface',
format: ['PascalCase'],
custom: {
regex: '^I[A-Z]',
match: false,
},
},
{
selector: 'objectLiteralMethod',
format: ['camelCase', 'PascalCase', 'UPPER_CASE'],
},
// This option is modified by the addition of a filter.
{
selector: 'objectLiteralProperty',
format: ['camelCase', 'PascalCase', 'UPPER_CASE'],
filter: {
// Match RPC method names like foo_bar, foo_barBaz, etc., and metamask.io
regex: '(^[a-z]+_[a-z]+[a-zA-Z0-9]*)|metamask\\.io$',
match: false,
},
},
{
selector: 'typeLike',
format: ['PascalCase'],
},
{
selector: 'typeParameter',
format: ['PascalCase'],
custom: {
regex: '^.{3,}',
match: true,
},
},
{
selector: 'variable',
format: ['camelCase', 'UPPER_CASE', 'PascalCase'],
leadingUnderscore: 'allow',
},
{
selector: 'parameter',
format: ['camelCase', 'PascalCase'],
leadingUnderscore: 'allow',
},
{
selector: [
'classProperty',
'objectLiteralProperty',
'typeProperty',
'classMethod',
'objectLiteralMethod',
'typeMethod',
'accessor',
'enumMember',
],
format: null,
modifiers: ['requiresQuotes'],
},
],
},
},
],
};
2 changes: 1 addition & 1 deletion packages/permission-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@metamask/controller-utils": "^11.0.1",
"@metamask/json-rpc-engine": "^9.0.1",
"@metamask/rpc-errors": "^6.3.1",
"@metamask/utils": "^9.0.0",
"@metamask/utils": "^9.1.0",
"@types/deep-freeze-strict": "^1.1.0",
"deep-freeze-strict": "^1.1.1",
"immer": "^9.0.6",
Expand Down
Loading

0 comments on commit c35943c

Please sign in to comment.