From 3448831dbd0b8b7ef0aaf37478d69a0261b479a5 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Tue, 22 Oct 2024 11:08:15 +0200 Subject: [PATCH 1/6] chore: Bump utils --- package.json | 2 +- packages/examples/packages/bip32/package.json | 2 +- packages/examples/packages/bip44/package.json | 2 +- .../packages/get-entropy/package.json | 2 +- .../packages/consumer-signer/package.json | 2 +- .../packages/core-signer/package.json | 2 +- packages/examples/packages/jsx/package.json | 2 +- .../packages/preinstalled/package.json | 2 +- packages/snaps-cli/package.json | 2 +- packages/snaps-controllers/package.json | 2 +- .../snaps-execution-environments/package.json | 2 +- packages/snaps-jest/package.json | 2 +- packages/snaps-rpc-methods/package.json | 2 +- packages/snaps-simulation/package.json | 2 +- packages/snaps-simulator/package.json | 2 +- packages/snaps-utils/package.json | 2 +- packages/snaps-webpack-plugin/package.json | 2 +- packages/test-snaps/package.json | 2 +- yarn.lock | 53 ++++++++++++------- 19 files changed, 53 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index ca2ae658bd..5683e29969 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "@metamask/eslint-config-jest": "^12.1.0", "@metamask/eslint-config-nodejs": "^12.1.0", "@metamask/eslint-config-typescript": "^12.1.0", - "@metamask/utils": "^9.2.1", + "@metamask/utils": "^10.0.0", "@swc/core": "1.3.78", "@ts-bridge/cli": "^0.5.1", "@types/jest": "^27.5.1", diff --git a/packages/examples/packages/bip32/package.json b/packages/examples/packages/bip32/package.json index 6b00553577..2a972cded8 100644 --- a/packages/examples/packages/bip32/package.json +++ b/packages/examples/packages/bip32/package.json @@ -45,7 +45,7 @@ "dependencies": { "@metamask/key-tree": "^9.1.2", "@metamask/snaps-sdk": "workspace:^", - "@metamask/utils": "^9.2.1", + "@metamask/utils": "^10.0.0", "@noble/ed25519": "^1.6.0", "@noble/secp256k1": "^1.7.1" }, diff --git a/packages/examples/packages/bip44/package.json b/packages/examples/packages/bip44/package.json index b69f2cd39c..d12e82f896 100644 --- a/packages/examples/packages/bip44/package.json +++ b/packages/examples/packages/bip44/package.json @@ -45,7 +45,7 @@ "dependencies": { "@metamask/key-tree": "^9.1.2", "@metamask/snaps-sdk": "workspace:^", - "@metamask/utils": "^9.2.1", + "@metamask/utils": "^10.0.0", "@noble/bls12-381": "^1.2.0" }, "devDependencies": { diff --git a/packages/examples/packages/get-entropy/package.json b/packages/examples/packages/get-entropy/package.json index eeb92ffba9..daa13177fd 100644 --- a/packages/examples/packages/get-entropy/package.json +++ b/packages/examples/packages/get-entropy/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@metamask/snaps-sdk": "workspace:^", - "@metamask/utils": "^9.2.1", + "@metamask/utils": "^10.0.0", "@noble/bls12-381": "^1.2.0" }, "devDependencies": { diff --git a/packages/examples/packages/invoke-snap/packages/consumer-signer/package.json b/packages/examples/packages/invoke-snap/packages/consumer-signer/package.json index 5af913311d..b41db1a855 100644 --- a/packages/examples/packages/invoke-snap/packages/consumer-signer/package.json +++ b/packages/examples/packages/invoke-snap/packages/consumer-signer/package.json @@ -45,7 +45,7 @@ "dependencies": { "@metamask/key-tree": "^9.1.2", "@metamask/snaps-sdk": "workspace:^", - "@metamask/utils": "^9.2.1", + "@metamask/utils": "^10.0.0", "@noble/hashes": "^1.3.1" }, "devDependencies": { diff --git a/packages/examples/packages/invoke-snap/packages/core-signer/package.json b/packages/examples/packages/invoke-snap/packages/core-signer/package.json index 61a0467c06..fa001b79ff 100644 --- a/packages/examples/packages/invoke-snap/packages/core-signer/package.json +++ b/packages/examples/packages/invoke-snap/packages/core-signer/package.json @@ -45,7 +45,7 @@ "dependencies": { "@metamask/key-tree": "^9.1.2", "@metamask/snaps-sdk": "workspace:^", - "@metamask/utils": "^9.2.1", + "@metamask/utils": "^10.0.0", "@noble/curves": "^1.1.0", "async-mutex": "^0.4.0" }, diff --git a/packages/examples/packages/jsx/package.json b/packages/examples/packages/jsx/package.json index 0089b72740..73a3a5dc0e 100644 --- a/packages/examples/packages/jsx/package.json +++ b/packages/examples/packages/jsx/package.json @@ -56,7 +56,7 @@ "@metamask/eslint-config-typescript": "^12.1.0", "@metamask/snaps-cli": "workspace:^", "@metamask/snaps-jest": "workspace:^", - "@metamask/utils": "^9.2.1", + "@metamask/utils": "^10.0.0", "@swc/core": "1.3.78", "@swc/jest": "^0.2.26", "@typescript-eslint/eslint-plugin": "^5.42.1", diff --git a/packages/examples/packages/preinstalled/package.json b/packages/examples/packages/preinstalled/package.json index 7e08f1707b..d78825cebb 100644 --- a/packages/examples/packages/preinstalled/package.json +++ b/packages/examples/packages/preinstalled/package.json @@ -57,7 +57,7 @@ "@metamask/snaps-cli": "workspace:^", "@metamask/snaps-controllers": "workspace:^", "@metamask/snaps-jest": "workspace:^", - "@metamask/utils": "^9.2.1", + "@metamask/utils": "^10.0.0", "@swc/core": "1.3.78", "@swc/jest": "^0.2.26", "@typescript-eslint/eslint-plugin": "^5.42.1", diff --git a/packages/snaps-cli/package.json b/packages/snaps-cli/package.json index 9dd7129b4f..baae0ade4d 100644 --- a/packages/snaps-cli/package.json +++ b/packages/snaps-cli/package.json @@ -76,7 +76,7 @@ "@metamask/snaps-utils": "workspace:^", "@metamask/snaps-webpack-plugin": "workspace:^", "@metamask/superstruct": "^3.1.0", - "@metamask/utils": "^9.2.1", + "@metamask/utils": "^10.0.0", "@swc/core": "1.3.78", "assert": "^2.0.0", "babelify": "^10.0.0", diff --git a/packages/snaps-controllers/package.json b/packages/snaps-controllers/package.json index daf6f486a6..11c4cf4bcc 100644 --- a/packages/snaps-controllers/package.json +++ b/packages/snaps-controllers/package.json @@ -92,7 +92,7 @@ "@metamask/snaps-rpc-methods": "workspace:^", "@metamask/snaps-sdk": "workspace:^", "@metamask/snaps-utils": "workspace:^", - "@metamask/utils": "^9.2.1", + "@metamask/utils": "^10.0.0", "@xstate/fsm": "^2.0.0", "browserify-zlib": "^0.2.0", "concat-stream": "^2.0.0", diff --git a/packages/snaps-execution-environments/package.json b/packages/snaps-execution-environments/package.json index 00b90adb08..e186bf7b9f 100644 --- a/packages/snaps-execution-environments/package.json +++ b/packages/snaps-execution-environments/package.json @@ -72,7 +72,7 @@ "@metamask/snaps-sdk": "workspace:^", "@metamask/snaps-utils": "workspace:^", "@metamask/superstruct": "^3.1.0", - "@metamask/utils": "^9.2.1", + "@metamask/utils": "^10.0.0", "nanoid": "^3.1.31", "readable-stream": "^3.6.2" }, diff --git a/packages/snaps-jest/package.json b/packages/snaps-jest/package.json index 851de2afbe..bc5f6171f9 100644 --- a/packages/snaps-jest/package.json +++ b/packages/snaps-jest/package.json @@ -64,7 +64,7 @@ "@metamask/snaps-sdk": "workspace:^", "@metamask/snaps-simulation": "workspace:^", "@metamask/superstruct": "^3.1.0", - "@metamask/utils": "^9.2.1", + "@metamask/utils": "^10.0.0", "express": "^4.18.2", "jest-environment-node": "^29.5.0", "jest-matcher-utils": "^29.5.0", diff --git a/packages/snaps-rpc-methods/package.json b/packages/snaps-rpc-methods/package.json index 0e90cffe39..134abe915f 100644 --- a/packages/snaps-rpc-methods/package.json +++ b/packages/snaps-rpc-methods/package.json @@ -61,7 +61,7 @@ "@metamask/snaps-sdk": "workspace:^", "@metamask/snaps-utils": "workspace:^", "@metamask/superstruct": "^3.1.0", - "@metamask/utils": "^9.2.1", + "@metamask/utils": "^10.0.0", "@noble/hashes": "^1.3.1" }, "devDependencies": { diff --git a/packages/snaps-simulation/package.json b/packages/snaps-simulation/package.json index e0634d018b..54a2ee4176 100644 --- a/packages/snaps-simulation/package.json +++ b/packages/snaps-simulation/package.json @@ -68,7 +68,7 @@ "@metamask/snaps-sdk": "workspace:^", "@metamask/snaps-utils": "workspace:^", "@metamask/superstruct": "^3.1.0", - "@metamask/utils": "^9.2.1", + "@metamask/utils": "^10.0.0", "@reduxjs/toolkit": "^1.9.5", "mime": "^3.0.0", "readable-stream": "^3.6.2", diff --git a/packages/snaps-simulator/package.json b/packages/snaps-simulator/package.json index 0b20493945..cc68da6b36 100644 --- a/packages/snaps-simulator/package.json +++ b/packages/snaps-simulator/package.json @@ -58,7 +58,7 @@ "@metamask/snaps-sdk": "workspace:^", "@metamask/snaps-utils": "workspace:^", "@metamask/superstruct": "^3.1.0", - "@metamask/utils": "^9.2.1", + "@metamask/utils": "^10.0.0", "@minoru/react-dnd-treeview": "^3.4.4", "@noble/hashes": "^1.3.1", "@reduxjs/toolkit": "^1.9.5", diff --git a/packages/snaps-utils/package.json b/packages/snaps-utils/package.json index f2b6446e8a..dbe90ff5e0 100644 --- a/packages/snaps-utils/package.json +++ b/packages/snaps-utils/package.json @@ -87,7 +87,7 @@ "@metamask/snaps-registry": "^3.2.1", "@metamask/snaps-sdk": "workspace:^", "@metamask/superstruct": "^3.1.0", - "@metamask/utils": "^9.2.1", + "@metamask/utils": "^10.0.0", "@noble/hashes": "^1.3.1", "@scure/base": "^1.1.1", "chalk": "^4.1.2", diff --git a/packages/snaps-webpack-plugin/package.json b/packages/snaps-webpack-plugin/package.json index c8dd04cd7e..5fed0238b3 100644 --- a/packages/snaps-webpack-plugin/package.json +++ b/packages/snaps-webpack-plugin/package.json @@ -59,7 +59,7 @@ "dependencies": { "@metamask/snaps-sdk": "workspace:^", "@metamask/snaps-utils": "workspace:^", - "@metamask/utils": "^9.2.1", + "@metamask/utils": "^10.0.0", "prettier": "^2.8.8", "webpack-sources": "^3.2.3" }, diff --git a/packages/test-snaps/package.json b/packages/test-snaps/package.json index cdf54868cd..80cbc79e60 100644 --- a/packages/test-snaps/package.json +++ b/packages/test-snaps/package.json @@ -68,7 +68,7 @@ "@metamask/send-flow-example-snap": "workspace:^", "@metamask/signature-insights-example-snap": "workspace:^", "@metamask/snaps-utils": "workspace:^", - "@metamask/utils": "^9.2.1", + "@metamask/utils": "^10.0.0", "@metamask/wasm-example-snap": "workspace:^", "@popperjs/core": "^2.11.8", "@reduxjs/toolkit": "^1.9.5", diff --git a/yarn.lock b/yarn.lock index 6e053b127b..b66e1f8b54 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3941,7 +3941,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@noble/ed25519": "npm:^1.6.0" "@noble/secp256k1": "npm:^1.7.1" "@swc/core": "npm:1.3.78" @@ -3982,7 +3982,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@noble/bls12-381": "npm:^1.2.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" @@ -4147,7 +4147,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@noble/hashes": "npm:^1.3.1" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" @@ -4204,7 +4204,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@noble/curves": "npm:^1.1.0" "@noble/hashes": "npm:^1.3.1" "@swc/core": "npm:1.3.78" @@ -4710,7 +4710,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@noble/bls12-381": "npm:^1.2.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" @@ -5028,7 +5028,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@typescript-eslint/eslint-plugin": "npm:^5.42.1" @@ -5369,7 +5369,7 @@ __metadata: "@metamask/snaps-controllers": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@typescript-eslint/eslint-plugin": "npm:^5.42.1" @@ -5635,7 +5635,7 @@ __metadata: "@metamask/snaps-utils": "workspace:^" "@metamask/snaps-webpack-plugin": "workspace:^" "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@ts-bridge/cli": "npm:^0.5.1" @@ -5735,7 +5735,7 @@ __metadata: "@metamask/snaps-sdk": "workspace:^" "@metamask/snaps-utils": "workspace:^" "@metamask/template-snap": "npm:^0.7.0" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@ts-bridge/cli": "npm:^0.5.1" @@ -5829,7 +5829,7 @@ __metadata: "@metamask/snaps-sdk": "workspace:^" "@metamask/snaps-utils": "workspace:^" "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@ts-bridge/cli": "npm:^0.5.1" @@ -5906,7 +5906,7 @@ __metadata: "@metamask/snaps-simulation": "workspace:^" "@metamask/snaps-utils": "workspace:^" "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@ts-bridge/cli": "npm:^0.5.1" @@ -6005,7 +6005,7 @@ __metadata: "@metamask/snaps-sdk": "workspace:^" "@metamask/snaps-utils": "workspace:^" "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@noble/hashes": "npm:^1.3.1" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" @@ -6096,7 +6096,7 @@ __metadata: "@metamask/snaps-sdk": "workspace:^" "@metamask/snaps-utils": "workspace:^" "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@reduxjs/toolkit": "npm:^1.9.5" "@ts-bridge/cli": "npm:^0.5.1" "@types/express": "npm:^4.17.17" @@ -6156,7 +6156,7 @@ __metadata: "@metamask/snaps-sdk": "workspace:^" "@metamask/snaps-utils": "workspace:^" "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@minoru/react-dnd-treeview": "npm:^3.4.4" "@noble/hashes": "npm:^1.3.1" "@pmmmwh/react-refresh-webpack-plugin": "npm:^0.5.10" @@ -6262,7 +6262,7 @@ __metadata: "@metamask/snaps-registry": "npm:^3.2.1" "@metamask/snaps-sdk": "workspace:^" "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@noble/hashes": "npm:^1.3.1" "@scure/base": "npm:^1.1.1" "@swc/core": "npm:1.3.78" @@ -6335,7 +6335,7 @@ __metadata: "@metamask/eslint-config-typescript": "npm:^12.1.0" "@metamask/snaps-sdk": "workspace:^" "@metamask/snaps-utils": "workspace:^" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@ts-bridge/cli": "npm:^0.5.1" @@ -6416,7 +6416,7 @@ __metadata: "@metamask/send-flow-example-snap": "workspace:^" "@metamask/signature-insights-example-snap": "workspace:^" "@metamask/snaps-utils": "workspace:^" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@metamask/wasm-example-snap": "workspace:^" "@pmmmwh/react-refresh-webpack-plugin": "npm:^0.5.10" "@popperjs/core": "npm:^2.11.8" @@ -6465,6 +6465,23 @@ __metadata: languageName: unknown linkType: soft +"@metamask/utils@npm:^10.0.0": + version: 10.0.0 + resolution: "@metamask/utils@npm:10.0.0" + dependencies: + "@ethereumjs/tx": "npm:^4.2.0" + "@metamask/superstruct": "npm:^3.1.0" + "@noble/hashes": "npm:^1.3.1" + "@scure/base": "npm:^1.1.3" + "@types/debug": "npm:^4.1.7" + debug: "npm:^4.3.4" + pony-cause: "npm:^2.1.10" + semver: "npm:^7.5.4" + uuid: "npm:^9.0.1" + checksum: 10/9c2e6421f685d8a45145b6026a6f9fd0701eb5a2e8490fc6d18e64c103d5a62097f301cbc797790da52ceb5853bd9f65845c934b00299e69e5e6736c52b32f0f + languageName: node + linkType: hard + "@metamask/utils@npm:^9.0.0, @metamask/utils@npm:^9.1.0, @metamask/utils@npm:^9.2.1": version: 9.2.1 resolution: "@metamask/utils@npm:9.2.1" @@ -20453,7 +20470,7 @@ __metadata: "@metamask/eslint-config-jest": "npm:^12.1.0" "@metamask/eslint-config-nodejs": "npm:^12.1.0" "@metamask/eslint-config-typescript": "npm:^12.1.0" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@swc/core": "npm:1.3.78" "@ts-bridge/cli": "npm:^0.5.1" "@types/jest": "npm:^27.5.1" From 2ed0b6dc78c8efcad139e8091181f3efd754114b Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Tue, 22 Oct 2024 11:15:53 +0200 Subject: [PATCH 2/6] Bump missing packages --- .../packages/ethereum-provider/package.json | 2 +- .../examples/packages/file-upload/package.json | 2 +- .../examples/packages/interactive-ui/package.json | 2 +- .../examples/packages/network-access/package.json | 2 +- .../packages/transaction-insights/package.json | 2 +- packages/snaps-sdk/package.json | 2 +- yarn.lock | 14 +++++++------- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/examples/packages/ethereum-provider/package.json b/packages/examples/packages/ethereum-provider/package.json index aa40a54f99..e4871226dd 100644 --- a/packages/examples/packages/ethereum-provider/package.json +++ b/packages/examples/packages/ethereum-provider/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@metamask/snaps-sdk": "workspace:^", - "@metamask/utils": "^9.2.1" + "@metamask/utils": "^10.0.0" }, "devDependencies": { "@jest/globals": "^29.5.0", diff --git a/packages/examples/packages/file-upload/package.json b/packages/examples/packages/file-upload/package.json index 0556e60191..ebabad88c0 100644 --- a/packages/examples/packages/file-upload/package.json +++ b/packages/examples/packages/file-upload/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@metamask/snaps-sdk": "workspace:^", - "@metamask/utils": "^9.2.1" + "@metamask/utils": "^10.0.0" }, "devDependencies": { "@jest/globals": "^29.5.0", diff --git a/packages/examples/packages/interactive-ui/package.json b/packages/examples/packages/interactive-ui/package.json index 715fe881f8..1f24ec9f37 100644 --- a/packages/examples/packages/interactive-ui/package.json +++ b/packages/examples/packages/interactive-ui/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@metamask/snaps-sdk": "workspace:^", - "@metamask/utils": "^9.2.1" + "@metamask/utils": "^10.0.0" }, "devDependencies": { "@jest/globals": "^29.5.0", diff --git a/packages/examples/packages/network-access/package.json b/packages/examples/packages/network-access/package.json index 63081d3ed9..065fa0b7f0 100644 --- a/packages/examples/packages/network-access/package.json +++ b/packages/examples/packages/network-access/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@metamask/snaps-sdk": "workspace:^", - "@metamask/utils": "^9.2.1" + "@metamask/utils": "^10.0.0" }, "devDependencies": { "@jest/globals": "^29.5.0", diff --git a/packages/examples/packages/transaction-insights/package.json b/packages/examples/packages/transaction-insights/package.json index d7a1b97826..6a7d512251 100644 --- a/packages/examples/packages/transaction-insights/package.json +++ b/packages/examples/packages/transaction-insights/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@metamask/snaps-sdk": "workspace:^", - "@metamask/utils": "^9.2.1" + "@metamask/utils": "^10.0.0" }, "devDependencies": { "@jest/globals": "^29.5.0", diff --git a/packages/snaps-sdk/package.json b/packages/snaps-sdk/package.json index 0bc15b549d..428d66374f 100644 --- a/packages/snaps-sdk/package.json +++ b/packages/snaps-sdk/package.json @@ -95,7 +95,7 @@ "@metamask/providers": "^17.1.2", "@metamask/rpc-errors": "^6.3.1", "@metamask/superstruct": "^3.1.0", - "@metamask/utils": "^9.2.1" + "@metamask/utils": "^10.0.0" }, "devDependencies": { "@lavamoat/allow-scripts": "^3.0.4", diff --git a/yarn.lock b/yarn.lock index b66e1f8b54..a7797137c2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4553,7 +4553,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@typescript-eslint/eslint-plugin": "npm:^5.42.1" @@ -4671,7 +4671,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@typescript-eslint/eslint-plugin": "npm:^5.42.1" @@ -4861,7 +4861,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@typescript-eslint/eslint-plugin": "npm:^5.42.1" @@ -4899,7 +4899,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@typescript-eslint/eslint-plugin": "npm:^5.42.1" @@ -5228,7 +5228,7 @@ __metadata: "@metamask/snaps-controllers": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@typescript-eslint/eslint-plugin": "npm:^5.42.1" @@ -6046,7 +6046,7 @@ __metadata: "@metamask/providers": "npm:^17.1.2" "@metamask/rpc-errors": "npm:^6.3.1" "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^10.0.0" "@ts-bridge/cli": "npm:^0.5.1" "@types/jest": "npm:^27.5.1" "@typescript-eslint/eslint-plugin": "npm:^5.42.1" @@ -6482,7 +6482,7 @@ __metadata: languageName: node linkType: hard -"@metamask/utils@npm:^9.0.0, @metamask/utils@npm:^9.1.0, @metamask/utils@npm:^9.2.1": +"@metamask/utils@npm:^9.0.0, @metamask/utils@npm:^9.1.0": version: 9.2.1 resolution: "@metamask/utils@npm:9.2.1" dependencies: From 4811770b0fcf089c88ecce005d7b1b489886de9a Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Fri, 25 Oct 2024 11:12:22 +0200 Subject: [PATCH 3/6] Bump rpc-errors --- packages/examples/packages/jsx/package.json | 2 +- .../examples/packages/send-flow/package.json | 2 +- packages/snaps-controllers/package.json | 4 +- .../snaps-execution-environments/package.json | 4 +- packages/snaps-rpc-methods/package.json | 4 +- packages/snaps-sdk/package.json | 2 +- packages/snaps-simulation/package.json | 6 +- packages/snaps-simulator/package.json | 6 +- packages/snaps-utils/package.json | 2 +- yarn.lock | 89 ++++++++++++------- 10 files changed, 71 insertions(+), 50 deletions(-) diff --git a/packages/examples/packages/jsx/package.json b/packages/examples/packages/jsx/package.json index 73a3a5dc0e..4265aa1d8e 100644 --- a/packages/examples/packages/jsx/package.json +++ b/packages/examples/packages/jsx/package.json @@ -43,7 +43,7 @@ "test:watch": "jest --watch" }, "dependencies": { - "@metamask/rpc-errors": "^6.3.1", + "@metamask/rpc-errors": "^7.0.1", "@metamask/snaps-sdk": "workspace:^" }, "devDependencies": { diff --git a/packages/examples/packages/send-flow/package.json b/packages/examples/packages/send-flow/package.json index 14c8ae99aa..fa0b6f462b 100644 --- a/packages/examples/packages/send-flow/package.json +++ b/packages/examples/packages/send-flow/package.json @@ -43,7 +43,7 @@ "test:watch": "jest --watch" }, "dependencies": { - "@metamask/rpc-errors": "^6.3.1", + "@metamask/rpc-errors": "^7.0.1", "@metamask/snaps-sdk": "workspace:^" }, "devDependencies": { diff --git a/packages/snaps-controllers/package.json b/packages/snaps-controllers/package.json index 11c4cf4bcc..e8970e6380 100644 --- a/packages/snaps-controllers/package.json +++ b/packages/snaps-controllers/package.json @@ -81,13 +81,13 @@ "dependencies": { "@metamask/approval-controller": "^7.0.2", "@metamask/base-controller": "^6.0.2", - "@metamask/json-rpc-engine": "^9.0.2", + "@metamask/json-rpc-engine": "^10.0.0", "@metamask/json-rpc-middleware-stream": "^8.0.2", "@metamask/object-multiplex": "^2.0.0", "@metamask/permission-controller": "^11.0.0", "@metamask/phishing-controller": "^12.0.2", "@metamask/post-message-stream": "^8.1.1", - "@metamask/rpc-errors": "^6.3.1", + "@metamask/rpc-errors": "^7.0.1", "@metamask/snaps-registry": "^3.2.1", "@metamask/snaps-rpc-methods": "workspace:^", "@metamask/snaps-sdk": "workspace:^", diff --git a/packages/snaps-execution-environments/package.json b/packages/snaps-execution-environments/package.json index e186bf7b9f..132bcb0386 100644 --- a/packages/snaps-execution-environments/package.json +++ b/packages/snaps-execution-environments/package.json @@ -64,11 +64,11 @@ "test:watch": "jest --watch" }, "dependencies": { - "@metamask/json-rpc-engine": "^9.0.2", + "@metamask/json-rpc-engine": "^10.0.0", "@metamask/object-multiplex": "^2.0.0", "@metamask/post-message-stream": "^8.1.1", "@metamask/providers": "^17.1.2", - "@metamask/rpc-errors": "^6.3.1", + "@metamask/rpc-errors": "^7.0.1", "@metamask/snaps-sdk": "workspace:^", "@metamask/snaps-utils": "workspace:^", "@metamask/superstruct": "^3.1.0", diff --git a/packages/snaps-rpc-methods/package.json b/packages/snaps-rpc-methods/package.json index 134abe915f..103bebeba2 100644 --- a/packages/snaps-rpc-methods/package.json +++ b/packages/snaps-rpc-methods/package.json @@ -57,7 +57,7 @@ "dependencies": { "@metamask/key-tree": "^9.1.2", "@metamask/permission-controller": "^11.0.0", - "@metamask/rpc-errors": "^6.3.1", + "@metamask/rpc-errors": "^7.0.1", "@metamask/snaps-sdk": "workspace:^", "@metamask/snaps-utils": "workspace:^", "@metamask/superstruct": "^3.1.0", @@ -71,7 +71,7 @@ "@metamask/eslint-config-jest": "^12.1.0", "@metamask/eslint-config-nodejs": "^12.1.0", "@metamask/eslint-config-typescript": "^12.1.0", - "@metamask/json-rpc-engine": "^9.0.2", + "@metamask/json-rpc-engine": "^10.0.0", "@swc/core": "1.3.78", "@swc/jest": "^0.2.26", "@ts-bridge/cli": "^0.5.1", diff --git a/packages/snaps-sdk/package.json b/packages/snaps-sdk/package.json index 428d66374f..9271c35d64 100644 --- a/packages/snaps-sdk/package.json +++ b/packages/snaps-sdk/package.json @@ -93,7 +93,7 @@ "dependencies": { "@metamask/key-tree": "^9.1.2", "@metamask/providers": "^17.1.2", - "@metamask/rpc-errors": "^6.3.1", + "@metamask/rpc-errors": "^7.0.1", "@metamask/superstruct": "^3.1.0", "@metamask/utils": "^10.0.0" }, diff --git a/packages/snaps-simulation/package.json b/packages/snaps-simulation/package.json index 54a2ee4176..3c342926ad 100644 --- a/packages/snaps-simulation/package.json +++ b/packages/snaps-simulation/package.json @@ -56,9 +56,9 @@ }, "dependencies": { "@metamask/base-controller": "^6.0.2", - "@metamask/eth-json-rpc-middleware": "^14.0.0", - "@metamask/json-rpc-engine": "^9.0.2", - "@metamask/json-rpc-middleware-stream": "^8.0.2", + "@metamask/eth-json-rpc-middleware": "^15.0.0", + "@metamask/json-rpc-engine": "^10.0.0", + "@metamask/json-rpc-middleware-stream": "^8.0.4", "@metamask/key-tree": "^9.1.2", "@metamask/permission-controller": "^11.0.0", "@metamask/phishing-controller": "^12.0.2", diff --git a/packages/snaps-simulator/package.json b/packages/snaps-simulator/package.json index cc68da6b36..27e4225ffa 100644 --- a/packages/snaps-simulator/package.json +++ b/packages/snaps-simulator/package.json @@ -47,9 +47,9 @@ "@emotion/styled": "^11.10.8", "@ethersproject/units": "^5.7.0", "@metamask/base-controller": "^6.0.2", - "@metamask/eth-json-rpc-middleware": "^14.0.0", - "@metamask/json-rpc-engine": "^9.0.2", - "@metamask/json-rpc-middleware-stream": "^8.0.2", + "@metamask/eth-json-rpc-middleware": "^15.0.0", + "@metamask/json-rpc-engine": "^10.0.0", + "@metamask/json-rpc-middleware-stream": "^8.0.4", "@metamask/key-tree": "^9.1.2", "@metamask/permission-controller": "^11.0.0", "@metamask/snaps-controllers": "workspace:^", diff --git a/packages/snaps-utils/package.json b/packages/snaps-utils/package.json index dbe90ff5e0..69a7070ed1 100644 --- a/packages/snaps-utils/package.json +++ b/packages/snaps-utils/package.json @@ -82,7 +82,7 @@ "@metamask/base-controller": "^6.0.2", "@metamask/key-tree": "^9.1.2", "@metamask/permission-controller": "^11.0.0", - "@metamask/rpc-errors": "^6.3.1", + "@metamask/rpc-errors": "^7.0.1", "@metamask/slip44": "^4.0.0", "@metamask/snaps-registry": "^3.2.1", "@metamask/snaps-sdk": "workspace:^", diff --git a/yarn.lock b/yarn.lock index a7797137c2..8527824b07 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4483,35 +4483,35 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-json-rpc-middleware@npm:^14.0.0": - version: 14.0.1 - resolution: "@metamask/eth-json-rpc-middleware@npm:14.0.1" +"@metamask/eth-json-rpc-middleware@npm:^15.0.0": + version: 15.0.0 + resolution: "@metamask/eth-json-rpc-middleware@npm:15.0.0" dependencies: "@metamask/eth-block-tracker": "npm:^11.0.1" - "@metamask/eth-json-rpc-provider": "npm:^4.1.1" + "@metamask/eth-json-rpc-provider": "npm:^4.1.5" "@metamask/eth-sig-util": "npm:^7.0.3" - "@metamask/json-rpc-engine": "npm:^9.0.2" - "@metamask/rpc-errors": "npm:^6.3.1" + "@metamask/json-rpc-engine": "npm:^10.0.0" + "@metamask/rpc-errors": "npm:^7.0.0" "@metamask/utils": "npm:^9.1.0" "@types/bn.js": "npm:^5.1.5" bn.js: "npm:^5.2.1" klona: "npm:^2.0.6" pify: "npm:^5.0.0" safe-stable-stringify: "npm:^2.4.3" - checksum: 10/39beecb0d2be19854b132fd615aee1f29195602d3db902f52755260b26a2c37c0a91cd635a09d4dc16f922d32bb229003b338228ae29577c5151d880fad04637 + checksum: 10/3c48d34264c695535f2b4e819fb602d835b6ed37309116a06d04d1b706a7335e0205cd4ccdbf1d3e9dc15ebf40d88954a9a2dc18a91f223dcd6d6392e026a5e9 languageName: node linkType: hard -"@metamask/eth-json-rpc-provider@npm:^4.1.1": - version: 4.1.3 - resolution: "@metamask/eth-json-rpc-provider@npm:4.1.3" +"@metamask/eth-json-rpc-provider@npm:^4.1.1, @metamask/eth-json-rpc-provider@npm:^4.1.5": + version: 4.1.5 + resolution: "@metamask/eth-json-rpc-provider@npm:4.1.5" dependencies: - "@metamask/json-rpc-engine": "npm:^9.0.2" - "@metamask/rpc-errors": "npm:^6.3.1" + "@metamask/json-rpc-engine": "npm:^10.0.0" + "@metamask/rpc-errors": "npm:^7.0.0" "@metamask/safe-event-emitter": "npm:^3.0.0" "@metamask/utils": "npm:^9.1.0" uuid: "npm:^8.3.2" - checksum: 10/d581cc0f6485783ed59ac9517aa7f0eb37ee6a0674409eeaba1bbda4b54fcc5f633cc8ace66207871e2c2fac33195982969f4e61c18b04faf4656cccf79d8d3d + checksum: 10/13df5c85a4152eea36439b7abac932b3d86f2def87c641df2e01678c7b1ef193917bd82265118abb8acc39bf6549551ac3c189fcd2953e49e6138a92f26c7b45 languageName: node linkType: hard @@ -4953,6 +4953,17 @@ __metadata: languageName: unknown linkType: soft +"@metamask/json-rpc-engine@npm:^10.0.0": + version: 10.0.0 + resolution: "@metamask/json-rpc-engine@npm:10.0.0" + dependencies: + "@metamask/rpc-errors": "npm:^7.0.0" + "@metamask/safe-event-emitter": "npm:^3.0.0" + "@metamask/utils": "npm:^9.1.0" + checksum: 10/2c401a4a64392aeb11c4f7ca8d7b458ba1106cff1e0b3dba8b3e0cc90e82f8c55ac2dc9fdfcd914b289e3298fb726d637cf21382336dde2c207cf76129ce5eab + languageName: node + linkType: hard + "@metamask/json-rpc-engine@npm:^9.0.1, @metamask/json-rpc-engine@npm:^9.0.2": version: 9.0.2 resolution: "@metamask/json-rpc-engine@npm:9.0.2" @@ -5001,15 +5012,15 @@ __metadata: languageName: unknown linkType: soft -"@metamask/json-rpc-middleware-stream@npm:^8.0.1, @metamask/json-rpc-middleware-stream@npm:^8.0.2": - version: 8.0.2 - resolution: "@metamask/json-rpc-middleware-stream@npm:8.0.2" +"@metamask/json-rpc-middleware-stream@npm:^8.0.1, @metamask/json-rpc-middleware-stream@npm:^8.0.2, @metamask/json-rpc-middleware-stream@npm:^8.0.4": + version: 8.0.4 + resolution: "@metamask/json-rpc-middleware-stream@npm:8.0.4" dependencies: - "@metamask/json-rpc-engine": "npm:^9.0.2" + "@metamask/json-rpc-engine": "npm:^10.0.0" "@metamask/safe-event-emitter": "npm:^3.0.0" "@metamask/utils": "npm:^9.1.0" readable-stream: "npm:^3.6.2" - checksum: 10/aaf41cb6fa015494eb0424959d14022b1355c390066898603223e3418d93bd72249b6e54caee3e23b4d6a679f389c2374f687882f2a7202379b4f4b042a84974 + checksum: 10/93c842e1ac8e624c65d888cb3539b38ade5b8415ea45f649d78dad91e7139f11fa96bbf89136998d21def7711b3f710939f8e4498ce31a6cf461892e3f4ba176 languageName: node linkType: hard @@ -5024,7 +5035,7 @@ __metadata: "@metamask/eslint-config-jest": "npm:^12.1.0" "@metamask/eslint-config-nodejs": "npm:^12.1.0" "@metamask/eslint-config-typescript": "npm:^12.1.0" - "@metamask/rpc-errors": "npm:^6.3.1" + "@metamask/rpc-errors": "npm:^7.0.1" "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -5471,6 +5482,16 @@ __metadata: languageName: node linkType: hard +"@metamask/rpc-errors@npm:^7.0.0, @metamask/rpc-errors@npm:^7.0.1": + version: 7.0.1 + resolution: "@metamask/rpc-errors@npm:7.0.1" + dependencies: + "@metamask/utils": "npm:^10.0.0" + fast-safe-stringify: "npm:^2.0.6" + checksum: 10/819708b4a7d9695ee67fd867d8f94bb5a273b479a242b17bd53c83d1fceec421fc42928f0bb340f4f138ec803dd82ec9659ce7b09a86aedad6a81d5a39ec5c35 + languageName: node + linkType: hard + "@metamask/safe-event-emitter@npm:^3.0.0, @metamask/safe-event-emitter@npm:^3.1.1": version: 3.1.1 resolution: "@metamask/safe-event-emitter@npm:3.1.1" @@ -5499,7 +5520,7 @@ __metadata: "@metamask/eslint-config-jest": "npm:^12.1.0" "@metamask/eslint-config-nodejs": "npm:^12.1.0" "@metamask/eslint-config-typescript": "npm:^12.1.0" - "@metamask/rpc-errors": "npm:^6.3.1" + "@metamask/rpc-errors": "npm:^7.0.1" "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -5723,13 +5744,13 @@ __metadata: "@metamask/eslint-config-jest": "npm:^12.1.0" "@metamask/eslint-config-nodejs": "npm:^12.1.0" "@metamask/eslint-config-typescript": "npm:^12.1.0" - "@metamask/json-rpc-engine": "npm:^9.0.2" + "@metamask/json-rpc-engine": "npm:^10.0.0" "@metamask/json-rpc-middleware-stream": "npm:^8.0.2" "@metamask/object-multiplex": "npm:^2.0.0" "@metamask/permission-controller": "npm:^11.0.0" "@metamask/phishing-controller": "npm:^12.0.2" "@metamask/post-message-stream": "npm:^8.1.1" - "@metamask/rpc-errors": "npm:^6.3.1" + "@metamask/rpc-errors": "npm:^7.0.1" "@metamask/snaps-registry": "npm:^3.2.1" "@metamask/snaps-rpc-methods": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -5821,11 +5842,11 @@ __metadata: "@metamask/eslint-config-jest": "npm:^12.1.0" "@metamask/eslint-config-nodejs": "npm:^12.1.0" "@metamask/eslint-config-typescript": "npm:^12.1.0" - "@metamask/json-rpc-engine": "npm:^9.0.2" + "@metamask/json-rpc-engine": "npm:^10.0.0" "@metamask/object-multiplex": "npm:^2.0.0" "@metamask/post-message-stream": "npm:^8.1.1" "@metamask/providers": "npm:^17.1.2" - "@metamask/rpc-errors": "npm:^6.3.1" + "@metamask/rpc-errors": "npm:^7.0.1" "@metamask/snaps-sdk": "workspace:^" "@metamask/snaps-utils": "workspace:^" "@metamask/superstruct": "npm:^3.1.0" @@ -5998,10 +6019,10 @@ __metadata: "@metamask/eslint-config-jest": "npm:^12.1.0" "@metamask/eslint-config-nodejs": "npm:^12.1.0" "@metamask/eslint-config-typescript": "npm:^12.1.0" - "@metamask/json-rpc-engine": "npm:^9.0.2" + "@metamask/json-rpc-engine": "npm:^10.0.0" "@metamask/key-tree": "npm:^9.1.2" "@metamask/permission-controller": "npm:^11.0.0" - "@metamask/rpc-errors": "npm:^6.3.1" + "@metamask/rpc-errors": "npm:^7.0.1" "@metamask/snaps-sdk": "workspace:^" "@metamask/snaps-utils": "workspace:^" "@metamask/superstruct": "npm:^3.1.0" @@ -6044,7 +6065,7 @@ __metadata: "@metamask/eslint-config-typescript": "npm:^12.1.0" "@metamask/key-tree": "npm:^9.1.2" "@metamask/providers": "npm:^17.1.2" - "@metamask/rpc-errors": "npm:^6.3.1" + "@metamask/rpc-errors": "npm:^7.0.1" "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^10.0.0" "@ts-bridge/cli": "npm:^0.5.1" @@ -6084,9 +6105,9 @@ __metadata: "@metamask/eslint-config-jest": "npm:^12.1.0" "@metamask/eslint-config-nodejs": "npm:^12.1.0" "@metamask/eslint-config-typescript": "npm:^12.1.0" - "@metamask/eth-json-rpc-middleware": "npm:^14.0.0" - "@metamask/json-rpc-engine": "npm:^9.0.2" - "@metamask/json-rpc-middleware-stream": "npm:^8.0.2" + "@metamask/eth-json-rpc-middleware": "npm:^15.0.0" + "@metamask/json-rpc-engine": "npm:^10.0.0" + "@metamask/json-rpc-middleware-stream": "npm:^8.0.4" "@metamask/key-tree": "npm:^9.1.2" "@metamask/permission-controller": "npm:^11.0.0" "@metamask/phishing-controller": "npm:^12.0.2" @@ -6145,9 +6166,9 @@ __metadata: "@metamask/eslint-config-jest": "npm:^12.1.0" "@metamask/eslint-config-nodejs": "npm:^12.1.0" "@metamask/eslint-config-typescript": "npm:^12.1.0" - "@metamask/eth-json-rpc-middleware": "npm:^14.0.0" - "@metamask/json-rpc-engine": "npm:^9.0.2" - "@metamask/json-rpc-middleware-stream": "npm:^8.0.2" + "@metamask/eth-json-rpc-middleware": "npm:^15.0.0" + "@metamask/json-rpc-engine": "npm:^10.0.0" + "@metamask/json-rpc-middleware-stream": "npm:^8.0.4" "@metamask/key-tree": "npm:^9.1.2" "@metamask/permission-controller": "npm:^11.0.0" "@metamask/snaps-controllers": "workspace:^" @@ -6257,7 +6278,7 @@ __metadata: "@metamask/key-tree": "npm:^9.1.2" "@metamask/permission-controller": "npm:^11.0.0" "@metamask/post-message-stream": "npm:^8.1.1" - "@metamask/rpc-errors": "npm:^6.3.1" + "@metamask/rpc-errors": "npm:^7.0.1" "@metamask/slip44": "npm:^4.0.0" "@metamask/snaps-registry": "npm:^3.2.1" "@metamask/snaps-sdk": "workspace:^" From b9177f98ad44516f282e45a3bf248420f52d3bdf Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Fri, 25 Oct 2024 11:16:25 +0200 Subject: [PATCH 4/6] Address breaking changes --- .../src/common/BaseSnapExecutor.test.browser.ts | 2 +- .../snaps-execution-environments/src/common/BaseSnapExecutor.ts | 2 ++ packages/snaps-rpc-methods/src/permitted/getFile.test.ts | 2 +- packages/snaps-rpc-methods/src/permitted/middleware.test.ts | 2 +- packages/snaps-rpc-methods/src/permitted/requestSnaps.test.ts | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/snaps-execution-environments/src/common/BaseSnapExecutor.test.browser.ts b/packages/snaps-execution-environments/src/common/BaseSnapExecutor.test.browser.ts index 088015170f..f75bb23c8d 100644 --- a/packages/snaps-execution-environments/src/common/BaseSnapExecutor.test.browser.ts +++ b/packages/snaps-execution-environments/src/common/BaseSnapExecutor.test.browser.ts @@ -1971,7 +1971,7 @@ describe('BaseSnapExecutor', () => { error: { code: -32603, message: - 'Received non-JSON-serializable value: Expected the value to satisfy a union of `literal | boolean | finite number | string | array | record`, but received: 0.', + 'Received non-JSON-serializable value: Expected a value of type `JSON`, but received: `0`.', stack: expect.any(String), }, }); diff --git a/packages/snaps-execution-environments/src/common/BaseSnapExecutor.ts b/packages/snaps-execution-environments/src/common/BaseSnapExecutor.ts index 49d9f83f99..4bfb2ee729 100644 --- a/packages/snaps-execution-environments/src/common/BaseSnapExecutor.ts +++ b/packages/snaps-execution-environments/src/common/BaseSnapExecutor.ts @@ -192,6 +192,7 @@ export class BaseSnapExecutor { const serializedError = serializeError(error, { fallbackError: unhandledError, shouldIncludeStack: false, + shouldPreserveMessage: false, }); const errorData = getErrorData(serializedError); @@ -280,6 +281,7 @@ export class BaseSnapExecutor { await this.#respond(id, { error: serializeError(rpcError, { fallbackError, + shouldPreserveMessage: false, }), }); } diff --git a/packages/snaps-rpc-methods/src/permitted/getFile.test.ts b/packages/snaps-rpc-methods/src/permitted/getFile.test.ts index 8b8f613ecd..b52bd2e9bd 100644 --- a/packages/snaps-rpc-methods/src/permitted/getFile.test.ts +++ b/packages/snaps-rpc-methods/src/permitted/getFile.test.ts @@ -152,7 +152,7 @@ describe('snap_getFile', () => { expect(response.error).toStrictEqual({ code: -32603, - message: 'Internal JSON-RPC error.', + message: 'foo bar', data: { cause: { message: 'foo bar', diff --git a/packages/snaps-rpc-methods/src/permitted/middleware.test.ts b/packages/snaps-rpc-methods/src/permitted/middleware.test.ts index 3d9a4bfa54..4b9630d16f 100644 --- a/packages/snaps-rpc-methods/src/permitted/middleware.test.ts +++ b/packages/snaps-rpc-methods/src/permitted/middleware.test.ts @@ -82,7 +82,7 @@ describe('createSnapsMethodMiddleware', () => { data: { cause: expect.objectContaining({ message: 'foo' }), }, - message: 'Internal JSON-RPC error.', + message: 'foo', }, }); }); diff --git a/packages/snaps-rpc-methods/src/permitted/requestSnaps.test.ts b/packages/snaps-rpc-methods/src/permitted/requestSnaps.test.ts index 041dd146f2..9f823e98e0 100644 --- a/packages/snaps-rpc-methods/src/permitted/requestSnaps.test.ts +++ b/packages/snaps-rpc-methods/src/permitted/requestSnaps.test.ts @@ -441,7 +441,7 @@ describe('implementation', () => { error: { code: -32603, data: { cause: expect.objectContaining({ message: 'error' }) }, - message: 'Internal JSON-RPC error.', + message: 'error', }, id: 1, jsonrpc: '2.0', From b3510f58f7fda7d7c0b55079936e86b5cf93b35d Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Mon, 28 Oct 2024 02:44:23 +0000 Subject: [PATCH 5/6] fix: force @metamask/utils v10 --- package.json | 1 + .../examples/packages/bip32/snap.manifest.json | 2 +- .../examples/packages/bip44/snap.manifest.json | 2 +- .../browserify-plugin/snap.manifest.json | 2 +- .../packages/browserify/snap.manifest.json | 2 +- .../packages/client-status/snap.manifest.json | 2 +- .../packages/cronjobs/snap.manifest.json | 2 +- .../packages/dialogs/snap.manifest.json | 2 +- .../ethereum-provider/snap.manifest.json | 2 +- .../packages/ethers-js/snap.manifest.json | 2 +- .../packages/file-upload/snap.manifest.json | 2 +- .../packages/get-entropy/snap.manifest.json | 2 +- .../packages/get-file/snap.manifest.json | 2 +- .../examples/packages/images/snap.manifest.json | 2 +- .../packages/interactive-ui/snap.manifest.json | 2 +- .../packages/consumer-signer/snap.manifest.json | 2 +- .../packages/core-signer/snap.manifest.json | 2 +- .../packages/json-rpc/snap.manifest.json | 2 +- .../examples/packages/jsx/snap.manifest.json | 2 +- .../packages/localization/snap.manifest.json | 2 +- .../packages/manage-state/snap.manifest.json | 2 +- .../packages/network-access/package.json | 4 ++++ .../packages/network-access/snap.manifest.json | 2 +- .../packages/notifications/snap.manifest.json | 2 +- .../examples/packages/preinstalled/package.json | 4 ++++ .../packages/preinstalled/snap.manifest.json | 2 +- .../packages/rollup-plugin/snap.manifest.json | 2 +- .../packages/send-flow/snap.manifest.json | 2 +- .../examples/packages/wasm/snap.manifest.json | 2 +- .../packages/webpack-plugin/snap.manifest.json | 2 +- packages/snaps-cli/package.json | 4 ++++ packages/snaps-controllers/package.json | 4 ++++ .../lavamoat/browserify/iframe/policy.json | 17 +++++++++++++++-- .../browserify/node-process/policy.json | 17 +++++++++++++++-- .../lavamoat/browserify/node-thread/policy.json | 17 +++++++++++++++-- .../browserify/worker-executor/policy.json | 17 +++++++++++++++-- packages/snaps-jest/package.json | 4 ++++ packages/snaps-rpc-methods/package.json | 4 ++++ packages/snaps-simulation/package.json | 4 ++++ packages/snaps-simulator/package.json | 4 ++++ packages/snaps-utils/package.json | 4 ++++ yarn.lock | 17 ----------------- 42 files changed, 124 insertions(+), 52 deletions(-) diff --git a/package.json b/package.json index 5683e29969..f7afcbd644 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ "@babel/core": "patch:@babel/core@npm%3A7.23.2#./.yarn/patches/@babel-core-npm-7.23.2-b93f586907.patch", "@esbuild-plugins/node-modules-polyfill@^0.2.2": "patch:@esbuild-plugins/node-modules-polyfill@npm%3A0.2.2#./.yarn/patches/@esbuild-plugins-node-modules-polyfill-npm-0.2.2-f612681798.patch", "@lavamoat/lavapack@^6.1.1": "patch:@lavamoat/lavapack@npm%3A6.1.1#./.yarn/patches/@lavamoat-lavapack-npm-6.1.1-b81af21193.patch", + "@metamask/utils": "^10.0.0", "@puppeteer/browsers@1.4.6": "patch:@puppeteer/browsers@npm%3A1.7.0#./.yarn/patches/@puppeteer-browsers-npm-1.7.0-203cb4f44b.patch", "@puppeteer/browsers@^1.6.0": "patch:@puppeteer/browsers@npm%3A1.7.0#./.yarn/patches/@puppeteer-browsers-npm-1.7.0-203cb4f44b.patch", "@types/glob@*": "patch:@types/glob@npm%3A7.1.4#./.yarn/patches/@types-glob-npm-7.1.4-d45247eaa2.patch", diff --git a/packages/examples/packages/bip32/snap.manifest.json b/packages/examples/packages/bip32/snap.manifest.json index 4b9136702f..d1720e6002 100644 --- a/packages/examples/packages/bip32/snap.manifest.json +++ b/packages/examples/packages/bip32/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "PxNHa0ebJ1qA/LXiY4vTzUsBKNl3rdfbHwg198YtOH4=", + "shasum": "91E9F5mKtPKnWv893Hb0hAi7vzVdiwLQdUCFWCeOLYc=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/bip44/snap.manifest.json b/packages/examples/packages/bip44/snap.manifest.json index 2c39cfc189..0e7dd8455d 100644 --- a/packages/examples/packages/bip44/snap.manifest.json +++ b/packages/examples/packages/bip44/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "Nb4y6u121k+rnDRGblkG77S7s9IFt1TZTQeSZOXNdyY=", + "shasum": "XYcRmLNVxyyIdoSJGROTMIAmlbeH7FsMWppZ5DpyREw=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/browserify-plugin/snap.manifest.json b/packages/examples/packages/browserify-plugin/snap.manifest.json index 3fa785166d..2835f676c3 100644 --- a/packages/examples/packages/browserify-plugin/snap.manifest.json +++ b/packages/examples/packages/browserify-plugin/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "zA6fni0b6B+ELhkMRiw6vcAgKj1/9A/Rm+dxkPY/oxM=", + "shasum": "D5uPpprRmrMeqwvti5+Sy5PxuCdyFlMw8PA+7OlP/WY=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/browserify/snap.manifest.json b/packages/examples/packages/browserify/snap.manifest.json index 1f1ce212a2..d92a96e851 100644 --- a/packages/examples/packages/browserify/snap.manifest.json +++ b/packages/examples/packages/browserify/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "diJJzn5l3lSAKQvHldlYmQXjTcO/IDnLOnxH7kGmkW0=", + "shasum": "87AZ5qZxOtBTdc4cRBbCRTX5vYhIlhSSJgyUc8WWi1A=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/client-status/snap.manifest.json b/packages/examples/packages/client-status/snap.manifest.json index 722cc84de1..82c487cc1e 100644 --- a/packages/examples/packages/client-status/snap.manifest.json +++ b/packages/examples/packages/client-status/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "fyBeeuYGaIpBnxm6MVoRe19JR+8QiIeFtJM+nlOWnsU=", + "shasum": "U1D6XbPDJ3m50P5jpjrEKh18nmCtNsAu0Th4sgqMqPk=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/cronjobs/snap.manifest.json b/packages/examples/packages/cronjobs/snap.manifest.json index 72e5804a10..9f65cb0d1f 100644 --- a/packages/examples/packages/cronjobs/snap.manifest.json +++ b/packages/examples/packages/cronjobs/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "52lYQY0bh6ZtKx4ZNtQNO17ustuhQBewko/WzQkS68A=", + "shasum": "ZjF3VIQyyZMjs7bCHZHcBqkkM4mxQjAHhxURv3bNdIg=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/dialogs/snap.manifest.json b/packages/examples/packages/dialogs/snap.manifest.json index 75edcaa8a6..c3eee95800 100644 --- a/packages/examples/packages/dialogs/snap.manifest.json +++ b/packages/examples/packages/dialogs/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "v2oIs3UY5j/3dXW5eRh3rg7Tv5qcVzHon7qzPQeRsAE=", + "shasum": "Mo4tLj3FLGjTrODhiznPVbTmqLdghRqKWaAEhPUmBmg=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/ethereum-provider/snap.manifest.json b/packages/examples/packages/ethereum-provider/snap.manifest.json index 80264829d5..acb0ebd9cb 100644 --- a/packages/examples/packages/ethereum-provider/snap.manifest.json +++ b/packages/examples/packages/ethereum-provider/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "pSiTZjO5nox8zYh+fQtQfZLp5HwbxKByu+WOo+tAAH0=", + "shasum": "jb8yEH2CbYso7JvLwI2hxARfkiq1IXhGMJcD6xpGPrs=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/ethers-js/snap.manifest.json b/packages/examples/packages/ethers-js/snap.manifest.json index c626a4725d..23600ab4d0 100644 --- a/packages/examples/packages/ethers-js/snap.manifest.json +++ b/packages/examples/packages/ethers-js/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "nq+20IfAzY+Ml8k+aa6NMCOdcqmFRn9yku3zCbbhxto=", + "shasum": "kgnGTfsOQs26Kb8oopMnEvXPmbOeDqy0BllLa9z5GCM=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/file-upload/snap.manifest.json b/packages/examples/packages/file-upload/snap.manifest.json index a34c9a115e..421cb8261f 100644 --- a/packages/examples/packages/file-upload/snap.manifest.json +++ b/packages/examples/packages/file-upload/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "z4vMdrs40TdVE+vk7sPruIvWi0q669V+p3jc6WQIib4=", + "shasum": "OeWGq3s0Anzwjj9wjWBtQQ+M2ArnYyo7iiJVb5I4NWg=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/get-entropy/snap.manifest.json b/packages/examples/packages/get-entropy/snap.manifest.json index eaa27579dd..dad8d9c063 100644 --- a/packages/examples/packages/get-entropy/snap.manifest.json +++ b/packages/examples/packages/get-entropy/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "OYSzxQ1qHApZ2MHWvQ/XYWRwKJptpyVQ5VgyhgFEmmo=", + "shasum": "i70snr3mPw7knx20YaN64bYsJjEgaqNNDl01oFi4Bo4=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/get-file/snap.manifest.json b/packages/examples/packages/get-file/snap.manifest.json index 771cf66e98..94ce1ee8cb 100644 --- a/packages/examples/packages/get-file/snap.manifest.json +++ b/packages/examples/packages/get-file/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "aTuxZCIXcq/FP7XjSoBY4e4pHQbuoDJ1U6FUe/rAfiQ=", + "shasum": "IHFTR7r/ZFrWGriDCjtG4cIh1TnQ/DOJ9/7XvzBnaXA=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/images/snap.manifest.json b/packages/examples/packages/images/snap.manifest.json index d0a0d9eef2..061436bd4d 100644 --- a/packages/examples/packages/images/snap.manifest.json +++ b/packages/examples/packages/images/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "kbuZtLjZiY9+HOtc7DIpuGUjMes2id67dES3Ze/Z3dY=", + "shasum": "KJTZWGggYaU8C3LnOd9CodSJoIMtvzkNKC5bzfMPg4M=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/interactive-ui/snap.manifest.json b/packages/examples/packages/interactive-ui/snap.manifest.json index 16385ab7df..a94e678ae5 100644 --- a/packages/examples/packages/interactive-ui/snap.manifest.json +++ b/packages/examples/packages/interactive-ui/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "Q2JcD7CoRLqjextX7QhYK6SOIK6ROF4NpvbUEwtITe8=", + "shasum": "tjpxfy8rDCt+Qfl9RH+E+58FgwnkyN6WNHac2BzGH8A=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/invoke-snap/packages/consumer-signer/snap.manifest.json b/packages/examples/packages/invoke-snap/packages/consumer-signer/snap.manifest.json index fe8c817357..b7083dde01 100644 --- a/packages/examples/packages/invoke-snap/packages/consumer-signer/snap.manifest.json +++ b/packages/examples/packages/invoke-snap/packages/consumer-signer/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "KFAIwiPcEKSJL79+hVHmZPCTIrqAnWJN7uM7vFuaDj0=", + "shasum": "HICk/M3ngw+6Vc+5PD1z97BZ0+hIIb0OhZMB1gNlA3g=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/invoke-snap/packages/core-signer/snap.manifest.json b/packages/examples/packages/invoke-snap/packages/core-signer/snap.manifest.json index 0367556298..48be6a1208 100644 --- a/packages/examples/packages/invoke-snap/packages/core-signer/snap.manifest.json +++ b/packages/examples/packages/invoke-snap/packages/core-signer/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "EMv6OrPDoNKIb8YjY5cbjumuwN8Oz3x6ASB1AODM/jM=", + "shasum": "2+rwch/Q1vV/ReD0xLKW9D0cZhfzoWCOQnARZopT7/M=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/json-rpc/snap.manifest.json b/packages/examples/packages/json-rpc/snap.manifest.json index 4ca36a011d..d3f668118d 100644 --- a/packages/examples/packages/json-rpc/snap.manifest.json +++ b/packages/examples/packages/json-rpc/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "loHXuvuW/Zb4kMSSdekMiV20UVtxXYyoDC0iRZbV274=", + "shasum": "fnBcv6jDxgrg7eGcfSt877oYlchyk3LOvWHXUarlMmM=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/jsx/snap.manifest.json b/packages/examples/packages/jsx/snap.manifest.json index f9a9c92dcf..58aa53ae18 100644 --- a/packages/examples/packages/jsx/snap.manifest.json +++ b/packages/examples/packages/jsx/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "3U9+Lvmmdc9JRmaHLcwGgi9lpnaj25joBF9+zXY4644=", + "shasum": "pwOggutOjvi9JIOQUsz3PtcWuIVeq88V8sM4H2Be+QE=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/localization/snap.manifest.json b/packages/examples/packages/localization/snap.manifest.json index 66585bec34..548fe4c2b1 100644 --- a/packages/examples/packages/localization/snap.manifest.json +++ b/packages/examples/packages/localization/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "KHrWdamfUEJ10ak4/oE/C4/oTO9BRnLSLjOiS9RFlHw=", + "shasum": "Riel+Ad0p0CyhwwLM52UgkSx6BORsIoK3N6g5f/3Epw=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/manage-state/snap.manifest.json b/packages/examples/packages/manage-state/snap.manifest.json index bb792bf7a1..bd217bac79 100644 --- a/packages/examples/packages/manage-state/snap.manifest.json +++ b/packages/examples/packages/manage-state/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "5FNiUEpsrVxG3rTbJvhx/IBZ/jIYYu0ZbnCX9A6dAPE=", + "shasum": "qPBUmh7sDOnakV5nawQSF5g4Z3Oq9SA0S7md02dV4NE=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/network-access/package.json b/packages/examples/packages/network-access/package.json index 065fa0b7f0..cbbcf1a949 100644 --- a/packages/examples/packages/network-access/package.json +++ b/packages/examples/packages/network-access/package.json @@ -42,6 +42,10 @@ "test:verbose": "jest --verbose", "test:watch": "jest --watch" }, + "resolutions": { + "@metamask/utils@npm:^9.0.0": "@metamask/utils@npm:^10.0.0", + "@metamask/utils@npm:^9.1.0": "@metamask/utils@npm:^10.0.0" + }, "dependencies": { "@metamask/snaps-sdk": "workspace:^", "@metamask/utils": "^10.0.0" diff --git a/packages/examples/packages/network-access/snap.manifest.json b/packages/examples/packages/network-access/snap.manifest.json index 39bb82c00e..0cfb3e31cf 100644 --- a/packages/examples/packages/network-access/snap.manifest.json +++ b/packages/examples/packages/network-access/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "+V4EDf0266FOJDTVrhQ91ZaycBruUesJqSoAzohWnO0=", + "shasum": "TTxdWj886/layHpYcL7oQMNqjur7dKuCGwQqoCwIZ+E=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/notifications/snap.manifest.json b/packages/examples/packages/notifications/snap.manifest.json index db46bad3d9..08da285ebb 100644 --- a/packages/examples/packages/notifications/snap.manifest.json +++ b/packages/examples/packages/notifications/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "S3wZGdkOLX7tdJYssmy+UxBXe+VuwZaNUQNqK+G3hu4=", + "shasum": "FxFEoTtrqrgcIixfoilv0YsEofcugLh1ZNLpz1tz/us=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/preinstalled/package.json b/packages/examples/packages/preinstalled/package.json index d78825cebb..b095a58c29 100644 --- a/packages/examples/packages/preinstalled/package.json +++ b/packages/examples/packages/preinstalled/package.json @@ -43,6 +43,10 @@ "test:verbose": "jest --verbose", "test:watch": "jest --watch" }, + "resolutions": { + "@metamask/utils@npm:^9.0.0": "@metamask/utils@npm:^10.0.0", + "@metamask/utils@npm:^9.1.0": "@metamask/utils@npm:^10.0.0" + }, "dependencies": { "@metamask/snaps-sdk": "workspace:^" }, diff --git a/packages/examples/packages/preinstalled/snap.manifest.json b/packages/examples/packages/preinstalled/snap.manifest.json index cf6a42afee..a69b9506d5 100644 --- a/packages/examples/packages/preinstalled/snap.manifest.json +++ b/packages/examples/packages/preinstalled/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "KUHZC+FvI4Ll48Ngy9ufvs6CFMsxqaNVw+dd2iyRNNE=", + "shasum": "KbOfXRukEkbyCkPhl4rONcCB3Ih1YXLJK+2QV/WoKHE=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/rollup-plugin/snap.manifest.json b/packages/examples/packages/rollup-plugin/snap.manifest.json index f9310a6e8a..4eb14e03ee 100644 --- a/packages/examples/packages/rollup-plugin/snap.manifest.json +++ b/packages/examples/packages/rollup-plugin/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "FvkhD/R3iN0i/0P4OTlD0rPX+697OZ0a5kns8T669Jk=", + "shasum": "rPQS5d+6fj93/L4Y7L1oNp5v+8IobP+t6JAUW31ZSQA=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/send-flow/snap.manifest.json b/packages/examples/packages/send-flow/snap.manifest.json index f2ff99c36e..6cc53614b8 100644 --- a/packages/examples/packages/send-flow/snap.manifest.json +++ b/packages/examples/packages/send-flow/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "PTmRKwKUzSGr2ZBWOMDRHn1HTmmgk32dzd7zqmvcoMo=", + "shasum": "0oqDk8ELSuPUKhZ1e9kqw42QXW+hNMUtYIgThYsN0hk=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/wasm/snap.manifest.json b/packages/examples/packages/wasm/snap.manifest.json index 206f6e4e8e..8c278e9d4e 100644 --- a/packages/examples/packages/wasm/snap.manifest.json +++ b/packages/examples/packages/wasm/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "rNBULIRBi45r+MXpWUNwkSaWog2pNTfG5VYKZ676w6g=", + "shasum": "1LptzjDvA6o8jrzA9XsE7NYdhh7kx3alSd7pLwiUq0w=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/webpack-plugin/snap.manifest.json b/packages/examples/packages/webpack-plugin/snap.manifest.json index 67c98679a9..6ba01b0c31 100644 --- a/packages/examples/packages/webpack-plugin/snap.manifest.json +++ b/packages/examples/packages/webpack-plugin/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "YvikqvHw0838qOaBrqjfegOyMSFM4ZwdyOH2qXode5M=", + "shasum": "7PgzAThtBB7Ay2cfYsGz8xhHXjzEfJWyW9d+Uh3gTX0=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/snaps-cli/package.json b/packages/snaps-cli/package.json index baae0ade4d..017458b2b3 100644 --- a/packages/snaps-cli/package.json +++ b/packages/snaps-cli/package.json @@ -63,6 +63,10 @@ "test:verbose": "jest --verbose", "test:watch": "jest --watch" }, + "resolutions": { + "@metamask/utils@npm:^9.0.0": "@metamask/utils@npm:^10.0.0", + "@metamask/utils@npm:^9.1.0": "@metamask/utils@npm:^10.0.0" + }, "dependencies": { "@babel/core": "^7.23.2", "@babel/plugin-transform-class-properties": "^7.22.5", diff --git a/packages/snaps-controllers/package.json b/packages/snaps-controllers/package.json index e8970e6380..88360b44b0 100644 --- a/packages/snaps-controllers/package.json +++ b/packages/snaps-controllers/package.json @@ -78,6 +78,10 @@ "test:verbose": "jest --verbose", "test:watch": "jest --watch" }, + "resolutions": { + "@metamask/utils@npm:^9.0.0": "@metamask/utils@npm:^10.0.0", + "@metamask/utils@npm:^9.1.0": "@metamask/utils@npm:^10.0.0" + }, "dependencies": { "@metamask/approval-controller": "^7.0.2", "@metamask/base-controller": "^6.0.2", diff --git a/packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json index 5f53e91c6f..00db489d5d 100644 --- a/packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json +++ b/packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json @@ -42,16 +42,23 @@ "console": true }, "packages": { - "@metamask/json-rpc-engine": true, "@metamask/object-multiplex": true, + "@metamask/providers>@metamask/json-rpc-engine": true, "@metamask/providers>@metamask/json-rpc-middleware-stream": true, + "@metamask/providers>@metamask/rpc-errors": true, "@metamask/providers>@metamask/safe-event-emitter": true, "@metamask/providers>is-stream": true, - "@metamask/rpc-errors": true, "eslint>fast-deep-equal": true, "readable-stream": true } }, + "@metamask/providers>@metamask/json-rpc-engine": { + "packages": { + "@metamask/providers>@metamask/rpc-errors": true, + "@metamask/providers>@metamask/safe-event-emitter": true, + "@metamask/utils": true + } + }, "@metamask/providers>@metamask/json-rpc-middleware-stream": { "globals": { "console.warn": true, @@ -63,6 +70,12 @@ "readable-stream": true } }, + "@metamask/providers>@metamask/rpc-errors": { + "packages": { + "@metamask/rpc-errors>fast-safe-stringify": true, + "@metamask/utils": true + } + }, "@metamask/providers>@metamask/safe-event-emitter": { "globals": { "setTimeout": true diff --git a/packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json index 1c4b1c0425..e7ef059bc6 100644 --- a/packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json +++ b/packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json @@ -49,16 +49,23 @@ "console": true }, "packages": { - "@metamask/json-rpc-engine": true, "@metamask/object-multiplex": true, + "@metamask/providers>@metamask/json-rpc-engine": true, "@metamask/providers>@metamask/json-rpc-middleware-stream": true, + "@metamask/providers>@metamask/rpc-errors": true, "@metamask/providers>@metamask/safe-event-emitter": true, "@metamask/providers>is-stream": true, - "@metamask/rpc-errors": true, "eslint>fast-deep-equal": true, "readable-stream": true } }, + "@metamask/providers>@metamask/json-rpc-engine": { + "packages": { + "@metamask/providers>@metamask/rpc-errors": true, + "@metamask/providers>@metamask/safe-event-emitter": true, + "@metamask/utils": true + } + }, "@metamask/providers>@metamask/json-rpc-middleware-stream": { "globals": { "console.warn": true, @@ -70,6 +77,12 @@ "readable-stream": true } }, + "@metamask/providers>@metamask/rpc-errors": { + "packages": { + "@metamask/rpc-errors>fast-safe-stringify": true, + "@metamask/utils": true + } + }, "@metamask/providers>@metamask/safe-event-emitter": { "builtin": { "events.EventEmitter": true diff --git a/packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json index 1c4b1c0425..e7ef059bc6 100644 --- a/packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json +++ b/packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json @@ -49,16 +49,23 @@ "console": true }, "packages": { - "@metamask/json-rpc-engine": true, "@metamask/object-multiplex": true, + "@metamask/providers>@metamask/json-rpc-engine": true, "@metamask/providers>@metamask/json-rpc-middleware-stream": true, + "@metamask/providers>@metamask/rpc-errors": true, "@metamask/providers>@metamask/safe-event-emitter": true, "@metamask/providers>is-stream": true, - "@metamask/rpc-errors": true, "eslint>fast-deep-equal": true, "readable-stream": true } }, + "@metamask/providers>@metamask/json-rpc-engine": { + "packages": { + "@metamask/providers>@metamask/rpc-errors": true, + "@metamask/providers>@metamask/safe-event-emitter": true, + "@metamask/utils": true + } + }, "@metamask/providers>@metamask/json-rpc-middleware-stream": { "globals": { "console.warn": true, @@ -70,6 +77,12 @@ "readable-stream": true } }, + "@metamask/providers>@metamask/rpc-errors": { + "packages": { + "@metamask/rpc-errors>fast-safe-stringify": true, + "@metamask/utils": true + } + }, "@metamask/providers>@metamask/safe-event-emitter": { "builtin": { "events.EventEmitter": true diff --git a/packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json index 5f53e91c6f..00db489d5d 100644 --- a/packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json +++ b/packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json @@ -42,16 +42,23 @@ "console": true }, "packages": { - "@metamask/json-rpc-engine": true, "@metamask/object-multiplex": true, + "@metamask/providers>@metamask/json-rpc-engine": true, "@metamask/providers>@metamask/json-rpc-middleware-stream": true, + "@metamask/providers>@metamask/rpc-errors": true, "@metamask/providers>@metamask/safe-event-emitter": true, "@metamask/providers>is-stream": true, - "@metamask/rpc-errors": true, "eslint>fast-deep-equal": true, "readable-stream": true } }, + "@metamask/providers>@metamask/json-rpc-engine": { + "packages": { + "@metamask/providers>@metamask/rpc-errors": true, + "@metamask/providers>@metamask/safe-event-emitter": true, + "@metamask/utils": true + } + }, "@metamask/providers>@metamask/json-rpc-middleware-stream": { "globals": { "console.warn": true, @@ -63,6 +70,12 @@ "readable-stream": true } }, + "@metamask/providers>@metamask/rpc-errors": { + "packages": { + "@metamask/rpc-errors>fast-safe-stringify": true, + "@metamask/utils": true + } + }, "@metamask/providers>@metamask/safe-event-emitter": { "globals": { "setTimeout": true diff --git a/packages/snaps-jest/package.json b/packages/snaps-jest/package.json index bc5f6171f9..0a2d94c662 100644 --- a/packages/snaps-jest/package.json +++ b/packages/snaps-jest/package.json @@ -56,6 +56,10 @@ "test:verbose": "jest --verbose", "test:watch": "jest --watch" }, + "resolutions": { + "@metamask/utils@npm:^9.0.0": "@metamask/utils@npm:^10.0.0", + "@metamask/utils@npm:^9.1.0": "@metamask/utils@npm:^10.0.0" + }, "dependencies": { "@jest/environment": "^29.5.0", "@jest/expect": "^29.5.0", diff --git a/packages/snaps-rpc-methods/package.json b/packages/snaps-rpc-methods/package.json index 103bebeba2..d4dbf666f0 100644 --- a/packages/snaps-rpc-methods/package.json +++ b/packages/snaps-rpc-methods/package.json @@ -54,6 +54,10 @@ "test:verbose": "jest --verbose", "test:watch": "jest --watch" }, + "resolutions": { + "@metamask/utils@npm:^9.0.0": "@metamask/utils@npm:^10.0.0", + "@metamask/utils@npm:^9.1.0": "@metamask/utils@npm:^10.0.0" + }, "dependencies": { "@metamask/key-tree": "^9.1.2", "@metamask/permission-controller": "^11.0.0", diff --git a/packages/snaps-simulation/package.json b/packages/snaps-simulation/package.json index 3c342926ad..ed9cb0444e 100644 --- a/packages/snaps-simulation/package.json +++ b/packages/snaps-simulation/package.json @@ -54,6 +54,10 @@ "test:verbose": "jest --verbose", "test:watch": "jest --watch" }, + "resolutions": { + "@metamask/utils@npm:^9.0.0": "@metamask/utils@npm:^10.0.0", + "@metamask/utils@npm:^9.1.0": "@metamask/utils@npm:^10.0.0" + }, "dependencies": { "@metamask/base-controller": "^6.0.2", "@metamask/eth-json-rpc-middleware": "^15.0.0", diff --git a/packages/snaps-simulator/package.json b/packages/snaps-simulator/package.json index 27e4225ffa..c725798d55 100644 --- a/packages/snaps-simulator/package.json +++ b/packages/snaps-simulator/package.json @@ -40,6 +40,10 @@ "test:verbose": "jest --verbose", "test:watch": "jest --watch" }, + "resolutions": { + "@metamask/utils@npm:^9.0.0": "@metamask/utils@npm:^10.0.0", + "@metamask/utils@npm:^9.1.0": "@metamask/utils@npm:^10.0.0" + }, "dependencies": { "@chakra-ui/anatomy": "^2.1.1", "@chakra-ui/react": "^2.6.1", diff --git a/packages/snaps-utils/package.json b/packages/snaps-utils/package.json index 69a7070ed1..9d241429e7 100644 --- a/packages/snaps-utils/package.json +++ b/packages/snaps-utils/package.json @@ -76,6 +76,10 @@ "test:verbose": "jest --verbose", "test:watch": "jest --watch" }, + "resolutions": { + "@metamask/utils@npm:^9.0.0": "@metamask/utils@npm:^10.0.0", + "@metamask/utils@npm:^9.1.0": "@metamask/utils@npm:^10.0.0" + }, "dependencies": { "@babel/core": "^7.23.2", "@babel/types": "^7.23.0", diff --git a/yarn.lock b/yarn.lock index 8527824b07..4dfaf7e233 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6503,23 +6503,6 @@ __metadata: languageName: node linkType: hard -"@metamask/utils@npm:^9.0.0, @metamask/utils@npm:^9.1.0": - version: 9.2.1 - resolution: "@metamask/utils@npm:9.2.1" - dependencies: - "@ethereumjs/tx": "npm:^4.2.0" - "@metamask/superstruct": "npm:^3.1.0" - "@noble/hashes": "npm:^1.3.1" - "@scure/base": "npm:^1.1.3" - "@types/debug": "npm:^4.1.7" - debug: "npm:^4.3.4" - pony-cause: "npm:^2.1.10" - semver: "npm:^7.5.4" - uuid: "npm:^9.0.1" - checksum: 10/2192797afd91af19898e107afeaf63e89b61dc7285e0a75d0cc814b5b288e4cdfc856781b01904034c4d2c1efd9bdab512af24c7e4dfe7b77a03f1f3d9dec7e8 - languageName: node - linkType: hard - "@metamask/wasm-example-snap@workspace:^, @metamask/wasm-example-snap@workspace:packages/examples/packages/wasm": version: 0.0.0-use.local resolution: "@metamask/wasm-example-snap@workspace:packages/examples/packages/wasm" From ee3d47cb93b5cf4a7371db90f1655d5f17080302 Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Mon, 28 Oct 2024 02:49:52 +0000 Subject: [PATCH 6/6] lint:fix --- packages/snaps-controllers/package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/snaps-controllers/package.json b/packages/snaps-controllers/package.json index 88360b44b0..2a87bd8de4 100644 --- a/packages/snaps-controllers/package.json +++ b/packages/snaps-controllers/package.json @@ -86,7 +86,7 @@ "@metamask/approval-controller": "^7.0.2", "@metamask/base-controller": "^6.0.2", "@metamask/json-rpc-engine": "^10.0.0", - "@metamask/json-rpc-middleware-stream": "^8.0.2", + "@metamask/json-rpc-middleware-stream": "^8.0.4", "@metamask/object-multiplex": "^2.0.0", "@metamask/permission-controller": "^11.0.0", "@metamask/phishing-controller": "^12.0.2", diff --git a/yarn.lock b/yarn.lock index 4dfaf7e233..a34e8bc002 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5012,7 +5012,7 @@ __metadata: languageName: unknown linkType: soft -"@metamask/json-rpc-middleware-stream@npm:^8.0.1, @metamask/json-rpc-middleware-stream@npm:^8.0.2, @metamask/json-rpc-middleware-stream@npm:^8.0.4": +"@metamask/json-rpc-middleware-stream@npm:^8.0.1, @metamask/json-rpc-middleware-stream@npm:^8.0.4": version: 8.0.4 resolution: "@metamask/json-rpc-middleware-stream@npm:8.0.4" dependencies: @@ -5745,7 +5745,7 @@ __metadata: "@metamask/eslint-config-nodejs": "npm:^12.1.0" "@metamask/eslint-config-typescript": "npm:^12.1.0" "@metamask/json-rpc-engine": "npm:^10.0.0" - "@metamask/json-rpc-middleware-stream": "npm:^8.0.2" + "@metamask/json-rpc-middleware-stream": "npm:^8.0.4" "@metamask/object-multiplex": "npm:^2.0.0" "@metamask/permission-controller": "npm:^11.0.0" "@metamask/phishing-controller": "npm:^12.0.2"