diff --git a/eslint.config.mjs b/eslint.config.mjs index 2a22879db9..8d53698e43 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -350,13 +350,17 @@ const config = createConfig([ }, }, - // Wasm example + // Examples { - files: ['packages/examples/packages/wasm/src/index.ts'], + files: [ + 'packages/examples/packages/rollup-plugin/rollup.config.mjs', + 'packages/examples/packages/wasm/src/index.ts', + ], rules: { - // This rule changes depending on whether the build files exist or not. + // These rules change depending on whether the build files exist or not. 'import-x/extensions': 'off', + 'import-x/no-unresolved': 'off', }, }, ]); diff --git a/package.json b/package.json index 36acf7fe24..0ffa086db5 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "@metamask/eslint-config-jest": "^14.0.0", "@metamask/eslint-config-nodejs": "^14.0.0", "@metamask/eslint-config-typescript": "^14.0.0", - "@metamask/utils": "^11.2.0", + "@metamask/utils": "^11.4.0", "@swc/core": "1.3.78", "@ts-bridge/cli": "^0.6.1", "@types/jest": "^27.5.1", diff --git a/packages/examples/packages/bip32/package.json b/packages/examples/packages/bip32/package.json index ceed0c6c84..12b5c49ef9 100644 --- a/packages/examples/packages/bip32/package.json +++ b/packages/examples/packages/bip32/package.json @@ -45,7 +45,7 @@ "dependencies": { "@metamask/key-tree": "^10.1.1", "@metamask/snaps-sdk": "workspace:^", - "@metamask/utils": "^11.2.0", + "@metamask/utils": "^11.4.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 adeb4a5c00..39d5d7e2a5 100644 --- a/packages/examples/packages/bip44/package.json +++ b/packages/examples/packages/bip44/package.json @@ -45,7 +45,7 @@ "dependencies": { "@metamask/key-tree": "^10.1.1", "@metamask/snaps-sdk": "workspace:^", - "@metamask/utils": "^11.2.0", + "@metamask/utils": "^11.4.0", "@noble/bls12-381": "^1.2.0" }, "devDependencies": { diff --git a/packages/examples/packages/ethereum-provider/package.json b/packages/examples/packages/ethereum-provider/package.json index 0c5e8ddb74..d9bb73cfab 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": "^11.2.0" + "@metamask/utils": "^11.4.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 8dd1194631..58aa6b0d43 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": "^11.2.0" + "@metamask/utils": "^11.4.0" }, "devDependencies": { "@jest/globals": "^29.5.0", diff --git a/packages/examples/packages/get-entropy/package.json b/packages/examples/packages/get-entropy/package.json index d122ffbbe4..4e3d47a532 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": "^11.2.0", + "@metamask/utils": "^11.4.0", "@noble/bls12-381": "^1.2.0" }, "devDependencies": { diff --git a/packages/examples/packages/interactive-ui/package.json b/packages/examples/packages/interactive-ui/package.json index 928f498e65..a246755e6e 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": "^11.2.0" + "@metamask/utils": "^11.4.0" }, "devDependencies": { "@jest/globals": "^29.5.0", 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 b93280b596..3a2f3c0c71 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": "^10.1.1", "@metamask/snaps-sdk": "workspace:^", - "@metamask/utils": "^11.2.0", + "@metamask/utils": "^11.4.0", "@noble/hashes": "^1.7.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 7176dc775c..7f9bf37fc1 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": "^10.1.1", "@metamask/snaps-sdk": "workspace:^", - "@metamask/utils": "^11.2.0", + "@metamask/utils": "^11.4.0", "@noble/curves": "^1.1.0", "async-mutex": "^0.5.0" }, diff --git a/packages/examples/packages/jsx/package.json b/packages/examples/packages/jsx/package.json index 358a5b7baf..a227e9ab79 100644 --- a/packages/examples/packages/jsx/package.json +++ b/packages/examples/packages/jsx/package.json @@ -52,7 +52,7 @@ "@metamask/auto-changelog": "^5.0.1", "@metamask/snaps-cli": "workspace:^", "@metamask/snaps-jest": "workspace:^", - "@metamask/utils": "^11.2.0", + "@metamask/utils": "^11.4.0", "@swc/core": "1.3.78", "@swc/jest": "^0.2.26", "@types/node": "18.14.2", diff --git a/packages/examples/packages/manage-state/package.json b/packages/examples/packages/manage-state/package.json index 6cc87e6265..1f508c2841 100644 --- a/packages/examples/packages/manage-state/package.json +++ b/packages/examples/packages/manage-state/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@metamask/snaps-sdk": "workspace:^", - "@metamask/utils": "^11.2.0" + "@metamask/utils": "^11.4.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 c41800b1e9..943dc8ae0e 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": "^11.2.0" + "@metamask/utils": "^11.4.0" }, "devDependencies": { "@jest/globals": "^29.5.0", diff --git a/packages/examples/packages/preinstalled/package.json b/packages/examples/packages/preinstalled/package.json index 901b36977d..93b9217150 100644 --- a/packages/examples/packages/preinstalled/package.json +++ b/packages/examples/packages/preinstalled/package.json @@ -53,7 +53,7 @@ "@metamask/snaps-cli": "workspace:^", "@metamask/snaps-controllers": "workspace:^", "@metamask/snaps-jest": "workspace:^", - "@metamask/utils": "^11.2.0", + "@metamask/utils": "^11.4.0", "@swc/core": "1.3.78", "@swc/jest": "^0.2.26", "@types/node": "18.14.2", diff --git a/packages/examples/packages/protocol/package.json b/packages/examples/packages/protocol/package.json index aa9d470779..fd6bced3ed 100644 --- a/packages/examples/packages/protocol/package.json +++ b/packages/examples/packages/protocol/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@metamask/snaps-sdk": "workspace:^", - "@metamask/utils": "^11.2.0" + "@metamask/utils": "^11.4.0" }, "devDependencies": { "@lavamoat/allow-scripts": "^3.0.4", diff --git a/packages/examples/packages/rollup-plugin/rollup.config.mjs b/packages/examples/packages/rollup-plugin/rollup.config.mjs index cf968a7dc6..fa233ef49c 100644 --- a/packages/examples/packages/rollup-plugin/rollup.config.mjs +++ b/packages/examples/packages/rollup-plugin/rollup.config.mjs @@ -1,4 +1,3 @@ -// eslint-disable-next-line import snaps from '@metamask/snaps-rollup-plugin'; import { babel } from '@rollup/plugin-babel'; import commonjs from '@rollup/plugin-commonjs'; diff --git a/packages/examples/packages/send-flow/package.json b/packages/examples/packages/send-flow/package.json index 93cbb90a15..71388af0d6 100644 --- a/packages/examples/packages/send-flow/package.json +++ b/packages/examples/packages/send-flow/package.json @@ -45,7 +45,7 @@ "dependencies": { "@metamask/rpc-errors": "^7.0.2", "@metamask/snaps-sdk": "workspace:^", - "@metamask/utils": "^11.2.0" + "@metamask/utils": "^11.4.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 d7763408e4..c0c3809c52 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": "^11.2.0" + "@metamask/utils": "^11.4.0" }, "devDependencies": { "@jest/globals": "^29.5.0", diff --git a/packages/snaps-cli/package.json b/packages/snaps-cli/package.json index 0a8ea646cc..9f955077df 100644 --- a/packages/snaps-cli/package.json +++ b/packages/snaps-cli/package.json @@ -68,7 +68,7 @@ "@metamask/snaps-utils": "workspace:^", "@metamask/snaps-webpack-plugin": "workspace:^", "@metamask/superstruct": "^3.2.1", - "@metamask/utils": "^11.2.0", + "@metamask/utils": "^11.4.0", "@swc/core": "1.3.78", "assert": "^2.0.0", "browserify-zlib": "^0.2.0", diff --git a/packages/snaps-controllers/package.json b/packages/snaps-controllers/package.json index e8086dc3b6..93ce742a10 100644 --- a/packages/snaps-controllers/package.json +++ b/packages/snaps-controllers/package.json @@ -94,7 +94,7 @@ "@metamask/snaps-rpc-methods": "workspace:^", "@metamask/snaps-sdk": "workspace:^", "@metamask/snaps-utils": "workspace:^", - "@metamask/utils": "^11.2.0", + "@metamask/utils": "^11.4.0", "@xstate/fsm": "^2.0.0", "async-mutex": "^0.5.0", "browserify-zlib": "^0.2.0", diff --git a/packages/snaps-execution-environments/package.json b/packages/snaps-execution-environments/package.json index 12df926fbc..e1a9498efe 100644 --- a/packages/snaps-execution-environments/package.json +++ b/packages/snaps-execution-environments/package.json @@ -73,7 +73,7 @@ "@metamask/snaps-sdk": "workspace:^", "@metamask/snaps-utils": "workspace:^", "@metamask/superstruct": "^3.2.1", - "@metamask/utils": "^11.2.0", + "@metamask/utils": "^11.4.0", "nanoid": "^3.3.10", "readable-stream": "^3.6.2" }, diff --git a/packages/snaps-execution-environments/src/common/test-utils/executor.ts b/packages/snaps-execution-environments/src/common/test-utils/executor.ts index d6cd84763d..5b1990da8e 100644 --- a/packages/snaps-execution-environments/src/common/test-utils/executor.ts +++ b/packages/snaps-execution-environments/src/common/test-utils/executor.ts @@ -1,4 +1,4 @@ -import type { Json, JsonRpcRequest, JsonRpcResponse } from '@metamask/utils'; +import type { JsonRpcRequest, JsonRpcResponse } from '@metamask/utils'; import type { DuplexOptions, Readable } from 'readable-stream'; import { Duplex } from 'readable-stream'; @@ -157,7 +157,7 @@ export class TestSnapExecutor extends BaseSnapExecutor { public async writeRpc(message: { name: string; - data: JsonRpcResponse; + data: JsonRpcResponse; }): Promise { return new Promise((resolve, reject) => this.#rpcLeft.write(message, (error) => { diff --git a/packages/snaps-execution-environments/src/common/validation.ts b/packages/snaps-execution-environments/src/common/validation.ts index 2f4c7f6f3a..fb066f4afe 100644 --- a/packages/snaps-execution-environments/src/common/validation.ts +++ b/packages/snaps-execution-environments/src/common/validation.ts @@ -24,7 +24,6 @@ import { } from '@metamask/superstruct'; import type { CaipChainId, - Json, JsonRpcRequest, JsonRpcSuccess, } from '@metamask/utils'; @@ -372,7 +371,7 @@ type RequestParams = type RequestFunction< Args extends RequestArguments, - ResponseType extends JsonRpcSuccess, + ResponseType extends JsonRpcSuccess, > = (...args: RequestParams) => Promise; export type Ping = RequestFunction; diff --git a/packages/snaps-jest/package.json b/packages/snaps-jest/package.json index 0abd1be1c2..e66bc34b16 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.2.1", - "@metamask/utils": "^11.2.0", + "@metamask/utils": "^11.4.0", "express": "^4.21.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 9ef5360a0c..cdbb459f1c 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.2.1", - "@metamask/utils": "^11.2.0", + "@metamask/utils": "^11.4.0", "@noble/hashes": "^1.7.1", "luxon": "^3.5.0" }, diff --git a/packages/snaps-rpc-methods/src/permitted/experimentalProviderRequest.ts b/packages/snaps-rpc-methods/src/permitted/experimentalProviderRequest.ts index d6ca0014f6..4d62733149 100644 --- a/packages/snaps-rpc-methods/src/permitted/experimentalProviderRequest.ts +++ b/packages/snaps-rpc-methods/src/permitted/experimentalProviderRequest.ts @@ -143,6 +143,11 @@ export type ProviderRequestParameters = InferMatching< */ async function providerRequestImplementation( req: JsonRpcRequest, + // `ProviderRequestResult` is an alias for `Json` (which is the default type + // argument for `PendingJsonRpcResponse`), but that may not be the case in the + // future. We use `ProviderRequestResult` here to make it clear that this is + // the expected type of the result. + // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-arguments res: PendingJsonRpcResponse, _next: unknown, end: JsonRpcEngineEndCallback, diff --git a/packages/snaps-rpc-methods/src/permitted/getState.ts b/packages/snaps-rpc-methods/src/permitted/getState.ts index d1c98fe467..707922d8ff 100644 --- a/packages/snaps-rpc-methods/src/permitted/getState.ts +++ b/packages/snaps-rpc-methods/src/permitted/getState.ts @@ -91,6 +91,11 @@ export type GetStateParameters = InferMatching< */ async function getStateImplementation( request: JsonRpcRequest, + // `GetStateResult` is an alias for `Json` (which is the default type argument + // for `PendingJsonRpcResponse`), but that may not be the case in the future. + // We use `GetStateResult` here to make it clear that this is the expected + // type of the result. + // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-arguments response: PendingJsonRpcResponse, _next: unknown, end: JsonRpcEngineEndCallback, diff --git a/packages/snaps-rpc-methods/src/permitted/invokeKeyring.ts b/packages/snaps-rpc-methods/src/permitted/invokeKeyring.ts index 4af044a891..d916636262 100644 --- a/packages/snaps-rpc-methods/src/permitted/invokeKeyring.ts +++ b/packages/snaps-rpc-methods/src/permitted/invokeKeyring.ts @@ -71,6 +71,11 @@ export type InvokeKeyringHooks = { */ async function invokeKeyringImplementation( req: JsonRpcRequest, + // `InvokeKeyringResult` is an alias for `Json` (which is the default type + // argument for `PendingJsonRpcResponse`), but that may not be the case in the + // future. We use `InvokeKeyringResult` here to make it clear that this is the + // expected type of the result. + // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-arguments res: PendingJsonRpcResponse, _next: unknown, end: JsonRpcEngineEndCallback, diff --git a/packages/snaps-rpc-methods/src/permitted/invokeSnapSugar.test.ts b/packages/snaps-rpc-methods/src/permitted/invokeSnapSugar.test.ts index 32df53a53b..b72271e5b1 100644 --- a/packages/snaps-rpc-methods/src/permitted/invokeSnapSugar.test.ts +++ b/packages/snaps-rpc-methods/src/permitted/invokeSnapSugar.test.ts @@ -3,7 +3,7 @@ import type { JsonRpcEngineNextCallback, } from '@metamask/json-rpc-engine'; import { rpcErrors } from '@metamask/rpc-errors'; -import type { InvokeSnapParams, InvokeSnapResult } from '@metamask/snaps-sdk'; +import type { InvokeSnapParams } from '@metamask/snaps-sdk'; import type { PendingJsonRpcResponse } from '@metamask/utils'; import { assertIsJsonRpcSuccess, jsonrpc2 } from '@metamask/utils'; @@ -17,11 +17,12 @@ describe('wallet_invokeSnap', () => { method: 'wallet_invokeSnap', params, }); + const getMockRpcResponse = () => ({ id: 'some-id', jsonrpc: jsonrpc2, - }) as PendingJsonRpcResponse; + }) as PendingJsonRpcResponse; it('invokes snap using hook', async () => { const params = { diff --git a/packages/snaps-rpc-methods/src/permitted/invokeSnapSugar.ts b/packages/snaps-rpc-methods/src/permitted/invokeSnapSugar.ts index 0f40329f30..5c0b07c042 100644 --- a/packages/snaps-rpc-methods/src/permitted/invokeSnapSugar.ts +++ b/packages/snaps-rpc-methods/src/permitted/invokeSnapSugar.ts @@ -43,6 +43,11 @@ export type InvokeSnapSugarHooks = { */ export async function invokeSnapSugar( req: JsonRpcRequest, + // `InvokeSnapResult` is an alias for `Json` (which is the default type + // argument for `PendingJsonRpcResponse`), but that may not be the case in the + // future. We use `InvokeSnapResult` here to make it clear that this is the + // expected type of the result. + // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-arguments res: PendingJsonRpcResponse, _next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, diff --git a/packages/snaps-sdk/package.json b/packages/snaps-sdk/package.json index eb87496018..90ad7fe36c 100644 --- a/packages/snaps-sdk/package.json +++ b/packages/snaps-sdk/package.json @@ -95,7 +95,7 @@ "@metamask/providers": "^21.0.0", "@metamask/rpc-errors": "^7.0.2", "@metamask/superstruct": "^3.2.1", - "@metamask/utils": "^11.2.0" + "@metamask/utils": "^11.4.0" }, "devDependencies": { "@lavamoat/allow-scripts": "^3.0.4", diff --git a/packages/snaps-simulation/package.json b/packages/snaps-simulation/package.json index da27a98496..eb8b47bdfb 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.2.1", - "@metamask/utils": "^11.2.0", + "@metamask/utils": "^11.4.0", "@reduxjs/toolkit": "^1.9.5", "fast-deep-equal": "^3.1.3", "mime": "^3.0.0", diff --git a/packages/snaps-simulation/src/middleware/internal-methods/accounts.ts b/packages/snaps-simulation/src/middleware/internal-methods/accounts.ts index 44e1328ead..d2f2ab5dbd 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/accounts.ts +++ b/packages/snaps-simulation/src/middleware/internal-methods/accounts.ts @@ -3,11 +3,7 @@ import type { JsonRpcEngineNextCallback, } from '@metamask/json-rpc-engine'; import { BIP44Node } from '@metamask/key-tree'; -import type { - Json, - JsonRpcRequest, - PendingJsonRpcResponse, -} from '@metamask/utils'; +import type { JsonRpcRequest, PendingJsonRpcResponse } from '@metamask/utils'; export type GetAccountsHandlerHooks = { getMnemonic: () => Promise; @@ -28,7 +24,7 @@ export type GetAccountsHandlerHooks = { */ export async function getAccountsHandler( _request: JsonRpcRequest, - response: PendingJsonRpcResponse, + response: PendingJsonRpcResponse, _next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: GetAccountsHandlerHooks, diff --git a/packages/snaps-simulation/src/middleware/internal-methods/chain-id.test.ts b/packages/snaps-simulation/src/middleware/internal-methods/chain-id.test.ts index 4862777297..c5f8288600 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/chain-id.test.ts +++ b/packages/snaps-simulation/src/middleware/internal-methods/chain-id.test.ts @@ -1,11 +1,11 @@ -import type { Json, PendingJsonRpcResponse } from '@metamask/utils'; +import type { PendingJsonRpcResponse } from '@metamask/utils'; import { getChainIdHandler } from './chain-id'; describe('getChainIdHandler', () => { it('returns the chain id', async () => { const end = jest.fn(); - const result: PendingJsonRpcResponse = { + const result: PendingJsonRpcResponse = { jsonrpc: '2.0' as const, id: 1, }; diff --git a/packages/snaps-simulation/src/middleware/internal-methods/chain-id.ts b/packages/snaps-simulation/src/middleware/internal-methods/chain-id.ts index 877b4d90e6..33f8bc5c90 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/chain-id.ts +++ b/packages/snaps-simulation/src/middleware/internal-methods/chain-id.ts @@ -2,11 +2,7 @@ import type { JsonRpcEngineEndCallback, JsonRpcEngineNextCallback, } from '@metamask/json-rpc-engine'; -import type { - Json, - JsonRpcRequest, - PendingJsonRpcResponse, -} from '@metamask/utils'; +import type { JsonRpcRequest, PendingJsonRpcResponse } from '@metamask/utils'; /** * A mock handler for eth_chainId that always returns a specific @@ -22,7 +18,7 @@ import type { */ export async function getChainIdHandler( _request: JsonRpcRequest, - response: PendingJsonRpcResponse, + response: PendingJsonRpcResponse, _next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, ) { diff --git a/packages/snaps-simulation/src/middleware/internal-methods/net-version.test.ts b/packages/snaps-simulation/src/middleware/internal-methods/net-version.test.ts index 0bd6d22c6f..f160ea321e 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/net-version.test.ts +++ b/packages/snaps-simulation/src/middleware/internal-methods/net-version.test.ts @@ -1,11 +1,11 @@ -import type { Json, PendingJsonRpcResponse } from '@metamask/utils'; +import type { PendingJsonRpcResponse } from '@metamask/utils'; import { getNetworkVersionHandler } from './net-version'; describe('getNetworkVersionHandler', () => { it('returns the network version', async () => { const end = jest.fn(); - const result: PendingJsonRpcResponse = { + const result: PendingJsonRpcResponse = { jsonrpc: '2.0' as const, id: 1, }; diff --git a/packages/snaps-simulation/src/middleware/internal-methods/net-version.ts b/packages/snaps-simulation/src/middleware/internal-methods/net-version.ts index 0c3a337d3c..1095b90ddf 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/net-version.ts +++ b/packages/snaps-simulation/src/middleware/internal-methods/net-version.ts @@ -2,11 +2,7 @@ import type { JsonRpcEngineEndCallback, JsonRpcEngineNextCallback, } from '@metamask/json-rpc-engine'; -import type { - Json, - JsonRpcRequest, - PendingJsonRpcResponse, -} from '@metamask/utils'; +import type { JsonRpcRequest, PendingJsonRpcResponse } from '@metamask/utils'; /** * A mock handler for net_version that always returns a specific @@ -22,7 +18,7 @@ import type { */ export async function getNetworkVersionHandler( _request: JsonRpcRequest, - response: PendingJsonRpcResponse, + response: PendingJsonRpcResponse, _next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, ) { diff --git a/packages/snaps-simulation/src/middleware/internal-methods/provider-state.test.ts b/packages/snaps-simulation/src/middleware/internal-methods/provider-state.test.ts index cec4a9a53b..6c9eb646d6 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/provider-state.test.ts +++ b/packages/snaps-simulation/src/middleware/internal-methods/provider-state.test.ts @@ -1,11 +1,11 @@ -import type { Json, PendingJsonRpcResponse } from '@metamask/utils'; +import type { PendingJsonRpcResponse } from '@metamask/utils'; import { getProviderStateHandler } from './provider-state'; describe('getProviderStateHandler', () => { it('returns the provider state', async () => { const end = jest.fn(); - const result: PendingJsonRpcResponse = { + const result: PendingJsonRpcResponse = { jsonrpc: '2.0' as const, id: 1, }; diff --git a/packages/snaps-simulation/src/middleware/internal-methods/provider-state.ts b/packages/snaps-simulation/src/middleware/internal-methods/provider-state.ts index 3e74878a47..7fa386d8ae 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/provider-state.ts +++ b/packages/snaps-simulation/src/middleware/internal-methods/provider-state.ts @@ -2,11 +2,7 @@ import type { JsonRpcEngineEndCallback, JsonRpcEngineNextCallback, } from '@metamask/json-rpc-engine'; -import type { - Json, - JsonRpcRequest, - PendingJsonRpcResponse, -} from '@metamask/utils'; +import type { JsonRpcRequest, PendingJsonRpcResponse } from '@metamask/utils'; /** * A mock handler for metamask_getProviderState that always returns a specific @@ -22,7 +18,7 @@ import type { */ export async function getProviderStateHandler( _request: JsonRpcRequest, - response: PendingJsonRpcResponse, + response: PendingJsonRpcResponse, _next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, ) { diff --git a/packages/snaps-utils/package.json b/packages/snaps-utils/package.json index aa854f97fb..a8b606a25f 100644 --- a/packages/snaps-utils/package.json +++ b/packages/snaps-utils/package.json @@ -88,7 +88,7 @@ "@metamask/snaps-registry": "^3.2.3", "@metamask/snaps-sdk": "workspace:^", "@metamask/superstruct": "^3.2.1", - "@metamask/utils": "^11.2.0", + "@metamask/utils": "^11.4.0", "@noble/hashes": "^1.7.1", "@scure/base": "^1.1.1", "chalk": "^4.1.2", diff --git a/packages/snaps-utils/src/json-rpc.ts b/packages/snaps-utils/src/json-rpc.ts index a9ad33c038..eeda77a8f7 100644 --- a/packages/snaps-utils/src/json-rpc.ts +++ b/packages/snaps-utils/src/json-rpc.ts @@ -10,7 +10,6 @@ import { } from '@metamask/superstruct'; import type { AssertionErrorConstructor, - Json, JsonRpcSuccess, } from '@metamask/utils'; import { @@ -184,7 +183,7 @@ export function isOriginAllowed( */ export function assertIsJsonRpcSuccess( value: unknown, -): asserts value is JsonRpcSuccess { +): asserts value is JsonRpcSuccess { if (!isJsonRpcSuccess(value)) { if (isJsonRpcFailure(value)) { throw new Error(`JSON-RPC request failed: ${value.error.message}`); diff --git a/packages/snaps-webpack-plugin/package.json b/packages/snaps-webpack-plugin/package.json index 378141a245..9e1d565114 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": "^11.2.0", + "@metamask/utils": "^11.4.0", "webpack-sources": "^3.2.3" }, "devDependencies": { diff --git a/packages/test-snaps/package.json b/packages/test-snaps/package.json index a5b89b84ad..f4f38b1394 100644 --- a/packages/test-snaps/package.json +++ b/packages/test-snaps/package.json @@ -71,7 +71,7 @@ "@metamask/signature-insights-example-snap": "workspace:^", "@metamask/snaps-sdk": "workspace:^", "@metamask/snaps-utils": "workspace:^", - "@metamask/utils": "^11.2.0", + "@metamask/utils": "^11.4.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 8a8e61302b..27011f12a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2702,7 +2702,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@noble/ed25519": "npm:^1.6.0" "@noble/secp256k1": "npm:^1.7.1" "@swc/core": "npm:1.3.78" @@ -2730,7 +2730,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@noble/bls12-381": "npm:^1.2.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" @@ -2819,7 +2819,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@noble/hashes": "npm:^1.7.1" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" @@ -2867,7 +2867,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@noble/curves": "npm:^1.1.0" "@noble/hashes": "npm:^1.7.1" "@swc/core": "npm:1.3.78" @@ -3171,7 +3171,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@types/node": "npm:18.14.2" @@ -3250,7 +3250,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@types/node": "npm:18.14.2" @@ -3276,7 +3276,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@noble/bls12-381": "npm:^1.2.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" @@ -3375,7 +3375,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@types/node": "npm:18.14.2" @@ -3400,7 +3400,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@types/node": "npm:18.14.2" @@ -3490,7 +3490,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@types/node": "npm:18.14.2" @@ -3576,7 +3576,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@types/node": "npm:18.14.2" @@ -3625,7 +3625,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@types/node": "npm:18.14.2" @@ -3764,7 +3764,7 @@ __metadata: "@metamask/snaps-controllers": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@types/node": "npm:18.14.2" @@ -3790,7 +3790,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@types/node": "npm:18.14.2" @@ -3897,7 +3897,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@types/node": "npm:18.14.2" @@ -3982,7 +3982,7 @@ __metadata: "@metamask/snaps-utils": "workspace:^" "@metamask/snaps-webpack-plugin": "workspace:^" "@metamask/superstruct": "npm:^3.2.1" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@ts-bridge/cli": "npm:^0.6.1" @@ -4065,7 +4065,7 @@ __metadata: "@metamask/snaps-sdk": "workspace:^" "@metamask/snaps-utils": "workspace:^" "@metamask/template-snap": "npm:^0.7.0" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@noble/hashes": "npm:^1.7.1" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" @@ -4141,7 +4141,7 @@ __metadata: "@metamask/snaps-sdk": "workspace:^" "@metamask/snaps-utils": "workspace:^" "@metamask/superstruct": "npm:^3.2.1" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@testing-library/dom": "npm:^10.4.0" @@ -4197,7 +4197,7 @@ __metadata: "@metamask/snaps-simulation": "workspace:^" "@metamask/snaps-utils": "workspace:^" "@metamask/superstruct": "npm:^3.2.1" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@ts-bridge/cli": "npm:^0.6.1" @@ -4268,7 +4268,7 @@ __metadata: "@metamask/snaps-sdk": "workspace:^" "@metamask/snaps-utils": "workspace:^" "@metamask/superstruct": "npm:^3.2.1" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@noble/hashes": "npm:^1.7.1" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" @@ -4297,7 +4297,7 @@ __metadata: "@metamask/providers": "npm:^21.0.0" "@metamask/rpc-errors": "npm:^7.0.2" "@metamask/superstruct": "npm:^3.2.1" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@ts-bridge/cli": "npm:^0.6.1" "@types/jest": "npm:^27.5.1" deepmerge: "npm:^4.2.2" @@ -4333,7 +4333,7 @@ __metadata: "@metamask/snaps-sdk": "workspace:^" "@metamask/snaps-utils": "workspace:^" "@metamask/superstruct": "npm:^3.2.1" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@reduxjs/toolkit": "npm:^1.9.5" "@ts-bridge/cli": "npm:^0.6.1" "@types/express": "npm:^4.17.17" @@ -4374,7 +4374,7 @@ __metadata: "@metamask/snaps-registry": "npm:^3.2.3" "@metamask/snaps-sdk": "workspace:^" "@metamask/superstruct": "npm:^3.2.1" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@noble/hashes": "npm:^1.7.1" "@scure/base": "npm:^1.1.1" "@swc/core": "npm:1.3.78" @@ -4427,7 +4427,7 @@ __metadata: "@metamask/auto-changelog": "npm:^5.0.1" "@metamask/snaps-sdk": "workspace:^" "@metamask/snaps-utils": "workspace:^" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" "@ts-bridge/cli": "npm:^0.6.1" @@ -4497,7 +4497,7 @@ __metadata: "@metamask/signature-insights-example-snap": "workspace:^" "@metamask/snaps-sdk": "workspace:^" "@metamask/snaps-utils": "workspace:^" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@metamask/wasm-example-snap": "workspace:^" "@pmmmwh/react-refresh-webpack-plugin": "npm:^0.5.10" "@popperjs/core": "npm:^2.11.8" @@ -4539,9 +4539,9 @@ __metadata: languageName: unknown linkType: soft -"@metamask/utils@npm:^11.0.1, @metamask/utils@npm:^11.1.0, @metamask/utils@npm:^11.2.0": - version: 11.2.0 - resolution: "@metamask/utils@npm:11.2.0" +"@metamask/utils@npm:^11.0.1, @metamask/utils@npm:^11.1.0, @metamask/utils@npm:^11.2.0, @metamask/utils@npm:^11.4.0": + version: 11.4.0 + resolution: "@metamask/utils@npm:11.4.0" dependencies: "@ethereumjs/tx": "npm:^4.2.0" "@metamask/superstruct": "npm:^3.1.0" @@ -4552,7 +4552,7 @@ __metadata: pony-cause: "npm:^2.1.10" semver: "npm:^7.5.4" uuid: "npm:^9.0.1" - checksum: 10/9cc2cb6af4627085e72a310ba9b8921c69757d94e2992d4664627e5a0d99b1f2f7f8069c6f22262515135e1172bd66b82d00512d90ea2ec6da4e768f3d7d4ae2 + checksum: 10/7c976268e944b542b5e936bae89f58a50eef58501bd3512944995c6d416cb1a7dd3f712aec8c7ca0969dcee889ab963b815fbc3e863dc80ccf16e9258eaec3ff languageName: node linkType: hard @@ -15939,7 +15939,7 @@ __metadata: "@metamask/eslint-config-jest": "npm:^14.0.0" "@metamask/eslint-config-nodejs": "npm:^14.0.0" "@metamask/eslint-config-typescript": "npm:^14.0.0" - "@metamask/utils": "npm:^11.2.0" + "@metamask/utils": "npm:^11.4.0" "@swc/core": "npm:1.3.78" "@ts-bridge/cli": "npm:^0.6.1" "@types/jest": "npm:^27.5.1"