From 321ac2dcb60c9e5a71d31304b67faf82e1200a2f Mon Sep 17 00:00:00 2001 From: Monte Lai Date: Thu, 6 Jun 2024 00:47:24 +0800 Subject: [PATCH] fix: bump accounts controller --- lavamoat/browserify/beta/policy.json | 13 ++- lavamoat/browserify/desktop/policy.json | 13 ++- lavamoat/browserify/flask/policy.json | 13 ++- lavamoat/browserify/main/policy.json | 13 ++- lavamoat/browserify/mmi/policy.json | 13 ++- lavamoat/build-system/policy.json | 118 ++++++++++++++++++++++-- package.json | 2 +- yarn.lock | 35 +++++-- 8 files changed, 199 insertions(+), 21 deletions(-) diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index c4be0f8d827c..4afaaae3cde1 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -742,14 +742,25 @@ }, "packages": { "@ethereumjs/tx": true, + "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-api": true, "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": true, - "@metamask/accounts-controller>@metamask/keyring-api": true, "@metamask/eth-sig-util": true, "@metamask/utils": true, "superstruct": true, "webpack>events": true } }, + "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-api": { + "globals": { + "URL": true + }, + "packages": { + "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": true, + "@metamask/keyring-api>bech32": true, + "@metamask/utils": true, + "superstruct": true + } + }, "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": { "globals": { "crypto": true diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json index c9e37e32ffbe..ee8fa1c53d92 100644 --- a/lavamoat/browserify/desktop/policy.json +++ b/lavamoat/browserify/desktop/policy.json @@ -742,14 +742,25 @@ }, "packages": { "@ethereumjs/tx": true, + "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-api": true, "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": true, - "@metamask/accounts-controller>@metamask/keyring-api": true, "@metamask/eth-sig-util": true, "@metamask/utils": true, "superstruct": true, "webpack>events": true } }, + "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-api": { + "globals": { + "URL": true + }, + "packages": { + "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": true, + "@metamask/keyring-api>bech32": true, + "@metamask/utils": true, + "superstruct": true + } + }, "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": { "globals": { "crypto": true diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index dcd7e1e7b86a..ab6bff90ce36 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -742,14 +742,25 @@ }, "packages": { "@ethereumjs/tx": true, + "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-api": true, "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": true, - "@metamask/accounts-controller>@metamask/keyring-api": true, "@metamask/eth-sig-util": true, "@metamask/utils": true, "superstruct": true, "webpack>events": true } }, + "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-api": { + "globals": { + "URL": true + }, + "packages": { + "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": true, + "@metamask/keyring-api>bech32": true, + "@metamask/utils": true, + "superstruct": true + } + }, "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": { "globals": { "crypto": true diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 063b0bc9f25e..b15f073e580e 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -742,14 +742,25 @@ }, "packages": { "@ethereumjs/tx": true, + "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-api": true, "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": true, - "@metamask/accounts-controller>@metamask/keyring-api": true, "@metamask/eth-sig-util": true, "@metamask/utils": true, "superstruct": true, "webpack>events": true } }, + "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-api": { + "globals": { + "URL": true + }, + "packages": { + "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": true, + "@metamask/keyring-api>bech32": true, + "@metamask/utils": true, + "superstruct": true + } + }, "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": { "globals": { "crypto": true diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index aafdf655705d..b444398b7702 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -927,14 +927,25 @@ }, "packages": { "@ethereumjs/tx": true, + "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-api": true, "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": true, - "@metamask/accounts-controller>@metamask/keyring-api": true, "@metamask/eth-sig-util": true, "@metamask/utils": true, "superstruct": true, "webpack>events": true } }, + "@metamask/accounts-controller>@metamask/eth-snap-keyring>@metamask/keyring-api": { + "globals": { + "URL": true + }, + "packages": { + "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": true, + "@metamask/keyring-api>bech32": true, + "@metamask/utils": true, + "superstruct": true + } + }, "@metamask/accounts-controller>@metamask/eth-snap-keyring>uuid": { "globals": { "crypto": true diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json index 4bffd2d03f42..4a59409dc69c 100644 --- a/lavamoat/build-system/policy.json +++ b/lavamoat/build-system/policy.json @@ -1837,7 +1837,8 @@ "chokidar>normalize-path": true, "chokidar>readdirp": true, "del>is-glob": true, - "eslint>glob-parent": true + "eslint>glob-parent": true, + "tsx>fsevents": true } }, "chokidar>anymatch": { @@ -4653,6 +4654,7 @@ "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog": true, "gulp-watch>chokidar>fsevents>node-pre-gyp>detect-libc": true, "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt": true, + "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog": true, "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf": true, "gulp-watch>chokidar>fsevents>node-pre-gyp>semver": true } @@ -4682,6 +4684,7 @@ }, "packages": { "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>nopt>abbrev": true, + "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>abbrev": true, "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv": true } }, @@ -4710,9 +4713,20 @@ }, "packages": { "@storybook/core>@storybook/core-server>x-default-browser>default-browser-id>untildify>os-homedir": true, + "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-homedir": true, "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": true } }, + "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-homedir": { + "builtin": { + "os.homedir": true + }, + "globals": { + "process.env": true, + "process.getuid": true, + "process.platform": true + } + }, "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": { "globals": { "process.env.SystemRoot": true, @@ -4723,6 +4737,85 @@ "process.platform": true } }, + "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog": { + "builtin": { + "events.EventEmitter": true, + "util": true + }, + "globals": { + "process.nextTick": true, + "process.stderr": true + }, + "packages": { + "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet": true, + "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>console-control-strings": true, + "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge": true, + "nyc>yargs>set-blocking": true + } + }, + "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>are-we-there-yet": { + "builtin": { + "events.EventEmitter": true, + "util.inherits": true + }, + "packages": { + "koa>delegates": true, + "readable-stream": true + } + }, + "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge": { + "builtin": { + "util.format": true + }, + "globals": { + "clearInterval": true, + "process": true, + "setImmediate": true, + "setInterval": true + }, + "packages": { + "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>console-control-strings": true, + "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>aproba": true, + "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>has-unicode": true, + "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width": true, + "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi": true, + "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>wide-align": true, + "nyc>signal-exit": true, + "react>object-assign": true + } + }, + "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>has-unicode": { + "builtin": { + "os.type": true + }, + "globals": { + "process.env.LANG": true, + "process.env.LC_ALL": true, + "process.env.LC_CTYPE": true + } + }, + "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width": { + "packages": { + "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width>is-fullwidth-code-point": true, + "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi": true, + "gulp>gulp-cli>yargs>string-width>code-point-at": true + } + }, + "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>string-width>is-fullwidth-code-point": { + "packages": { + "gulp>gulp-cli>yargs>string-width>is-fullwidth-code-point>number-is-nan": true + } + }, + "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi": { + "packages": { + "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>strip-ansi>ansi-regex": true + } + }, + "gulp-watch>chokidar>fsevents>node-pre-gyp>npmlog>gauge>wide-align": { + "packages": { + "yargs>string-width": true + } + }, "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf": { "builtin": { "assert": true, @@ -6099,6 +6192,13 @@ "process.argv": true } }, + "mockttp>portfinder>mkdirp": { + "builtin": { + "fs": true, + "path.dirname": true, + "path.resolve": true + } + }, "nock>debug": { "builtin": { "tty.isatty": true, @@ -7816,14 +7916,7 @@ "path.dirname": true }, "packages": { - "stylelint>file-entry-cache>flat-cache>write>mkdirp": true - } - }, - "stylelint>file-entry-cache>flat-cache>write>mkdirp": { - "builtin": { - "fs": true, - "path.dirname": true, - "path.resolve": true + "mockttp>portfinder>mkdirp": true } }, "stylelint>global-modules": { @@ -8500,6 +8593,13 @@ "typescript": true } }, + "tsx>fsevents": { + "globals": { + "console.assert": true, + "process.platform": true + }, + "native": true + }, "typescript": { "builtin": { "buffer.Buffer": true, diff --git a/package.json b/package.json index 240676cd3a51..6b5213e8009e 100644 --- a/package.json +++ b/package.json @@ -272,7 +272,7 @@ "@metamask-institutional/sdk": "^0.1.26", "@metamask-institutional/transaction-update": "^0.2.2", "@metamask/abi-utils": "^2.0.2", - "@metamask/accounts-controller": "npm:@metamask-previews/accounts-controller@16.0.0-preview-8e708969", + "@metamask/accounts-controller": "npm:@metamask-previews/accounts-controller@16.0.0-preview-e2529f0", "@metamask/address-book-controller": "^4.0.1", "@metamask/announcement-controller": "^6.1.0", "@metamask/approval-controller": "^6.0.1", diff --git a/yarn.lock b/yarn.lock index c89f48580dd7..57990e8571aa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4518,14 +4518,14 @@ __metadata: languageName: node linkType: hard -"@metamask/accounts-controller@npm:@metamask-previews/accounts-controller@16.0.0-preview-8e708969": - version: 16.0.0-preview-8e708969 - resolution: "@metamask-previews/accounts-controller@npm:16.0.0-preview-8e708969" +"@metamask/accounts-controller@npm:@metamask-previews/accounts-controller@16.0.0-preview-e2529f0": + version: 16.0.0-preview-e2529f0 + resolution: "@metamask-previews/accounts-controller@npm:16.0.0-preview-e2529f0" dependencies: "@ethereumjs/util": "npm:^8.1.0" "@metamask/base-controller": "npm:^6.0.0" "@metamask/eth-snap-keyring": "npm:^4.1.1" - "@metamask/keyring-api": "npm:^6.1.1" + "@metamask/keyring-api": "npm:^6.4.0" "@metamask/snaps-sdk": "npm:^4.2.0" "@metamask/snaps-utils": "npm:^7.4.0" "@metamask/utils": "npm:^8.3.0" @@ -4536,7 +4536,7 @@ __metadata: peerDependencies: "@metamask/keyring-controller": ^17.0.0 "@metamask/snaps-controllers": ^8.1.1 - checksum: 3f8954e2da1c202b6f0e42e5052a1de26ad92c7e418a8224722890e2ea7af347ad1aec1e2368896db0477ab9a5456043c75606134c5b8ca121b63f10f000f4c1 + checksum: e3aa69b1cf8879627f39fc75c272d83c468b4b8ce5e5d73f841a095f8f3bffda68f7478421ffe5ac9e6515e8d57625242df4d24c50f7dc0d4ae97fc55379ca71 languageName: node linkType: hard @@ -5464,6 +5464,22 @@ __metadata: languageName: node linkType: hard +"@metamask/keyring-api@npm:^6.4.0": + version: 6.4.0 + resolution: "@metamask/keyring-api@npm:6.4.0" + dependencies: + "@metamask/snaps-sdk": "npm:^4.2.0" + "@metamask/utils": "npm:^8.4.0" + "@types/uuid": "npm:^9.0.8" + bech32: "npm:^2.0.0" + superstruct: "npm:^1.0.3" + uuid: "npm:^9.0.1" + peerDependencies: + "@metamask/providers": ">=15 <18" + checksum: 19cfc14b9dcc9ff26dfc5fd0ab935acfcf0464e52bc6bdfe566264fcf36b309b8f189ebe3a7bb3599c408b1fe715db2fdbedb187d2a1a09afa39b582da503baa + languageName: node + linkType: hard + "@metamask/keyring-controller@npm:15.0.0, @metamask/keyring-controller@npm:^15.0.0": version: 15.0.0 resolution: "@metamask/keyring-controller@npm:15.0.0" @@ -10483,6 +10499,13 @@ __metadata: languageName: node linkType: hard +"@types/uuid@npm:^9.0.8": + version: 9.0.8 + resolution: "@types/uuid@npm:9.0.8" + checksum: b8c60b7ba8250356b5088302583d1704a4e1a13558d143c549c408bf8920535602ffc12394ede77f8a8083511b023704bc66d1345792714002bfa261b17c5275 + languageName: node + linkType: hard + "@types/vinyl-fs@npm:*": version: 2.4.12 resolution: "@types/vinyl-fs@npm:2.4.12" @@ -25032,7 +25055,7 @@ __metadata: "@metamask-institutional/sdk": "npm:^0.1.26" "@metamask-institutional/transaction-update": "npm:^0.2.2" "@metamask/abi-utils": "npm:^2.0.2" - "@metamask/accounts-controller": "npm:@metamask-previews/accounts-controller@16.0.0-preview-8e708969" + "@metamask/accounts-controller": "npm:@metamask-previews/accounts-controller@16.0.0-preview-e2529f0" "@metamask/address-book-controller": "npm:^4.0.1" "@metamask/announcement-controller": "npm:^6.1.0" "@metamask/approval-controller": "npm:^6.0.1"