Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

deps: @metamask/rpc-errors@^6.3.1->^7.0.0 #2817

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

deps: @metamask/rpc-errors@^6.3.1->^7.0.0 #2817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
386b944
deps: @metamask/rpc-errors@^6.3.1->^7.0.0
legobeat Oct 9, 2024
cf032c4
chore(snaps-execution-environments): update lavamoat policies
legobeat Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/examples/packages/jsx/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"test:watch": "jest --watch"
},
"dependencies": {
"@metamask/rpc-errors": "^6.3.1",
"@metamask/rpc-errors": "^7.0.0",
"@metamask/snaps-sdk": "workspace:^"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/examples/packages/send-flow/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"test:watch": "jest --watch"
},
"dependencies": {
"@metamask/rpc-errors": "^6.3.1",
"@metamask/rpc-errors": "^7.0.0",
"@metamask/snaps-sdk": "workspace:^"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/snaps-controllers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"@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.0",
"@metamask/snaps-registry": "^3.2.1",
"@metamask/snaps-rpc-methods": "workspace:^",
"@metamask/snaps-sdk": "workspace:^",
Expand Down
16 changes: 14 additions & 2 deletions packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@
"resources": {
"@metamask/json-rpc-engine": {
"packages": {
"@metamask/json-rpc-engine>@metamask/rpc-errors": true,
"@metamask/providers>@metamask/safe-event-emitter": true,
"@metamask/rpc-errors": true,
"@metamask/utils": true
}
},
"@metamask/json-rpc-engine>@metamask/rpc-errors": {
"packages": {
"@metamask/rpc-errors>fast-safe-stringify": true,
"@metamask/utils": true
}
},
Expand Down Expand Up @@ -45,9 +51,9 @@
"@metamask/json-rpc-engine": true,
"@metamask/object-multiplex": 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
}
Expand All @@ -63,6 +69,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
Expand Down
16 changes: 14 additions & 2 deletions packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@
"resources": {
"@metamask/json-rpc-engine": {
"packages": {
"@metamask/json-rpc-engine>@metamask/rpc-errors": true,
"@metamask/providers>@metamask/safe-event-emitter": true,
"@metamask/rpc-errors": true,
"@metamask/utils": true
}
},
"@metamask/json-rpc-engine>@metamask/rpc-errors": {
"packages": {
"@metamask/rpc-errors>fast-safe-stringify": true,
"@metamask/utils": true
}
},
Expand Down Expand Up @@ -52,9 +58,9 @@
"@metamask/json-rpc-engine": true,
"@metamask/object-multiplex": 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
}
Expand All @@ -70,6 +76,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
Expand Down
16 changes: 14 additions & 2 deletions packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@
"resources": {
"@metamask/json-rpc-engine": {
"packages": {
"@metamask/json-rpc-engine>@metamask/rpc-errors": true,
"@metamask/providers>@metamask/safe-event-emitter": true,
"@metamask/rpc-errors": true,
"@metamask/utils": true
}
},
"@metamask/json-rpc-engine>@metamask/rpc-errors": {
"packages": {
"@metamask/rpc-errors>fast-safe-stringify": true,
"@metamask/utils": true
}
},
Expand Down Expand Up @@ -52,9 +58,9 @@
"@metamask/json-rpc-engine": true,
"@metamask/object-multiplex": 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
}
Expand All @@ -70,6 +76,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
Expand Down
16 changes: 14 additions & 2 deletions packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@
"resources": {
"@metamask/json-rpc-engine": {
"packages": {
"@metamask/json-rpc-engine>@metamask/rpc-errors": true,
"@metamask/providers>@metamask/safe-event-emitter": true,
"@metamask/rpc-errors": true,
"@metamask/utils": true
}
},
"@metamask/json-rpc-engine>@metamask/rpc-errors": {
"packages": {
"@metamask/rpc-errors>fast-safe-stringify": true,
"@metamask/utils": true
}
},
Expand Down Expand Up @@ -45,9 +51,9 @@
"@metamask/json-rpc-engine": true,
"@metamask/object-multiplex": 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
}
Expand All @@ -63,6 +69,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
Expand Down
2 changes: 1 addition & 1 deletion packages/snaps-execution-environments/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"@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.0",
"@metamask/snaps-sdk": "workspace:^",
"@metamask/snaps-utils": "workspace:^",
"@metamask/superstruct": "^3.1.0",
Expand Down
8 changes: 8 additions & 0 deletions packages/snaps-execution-environments/src/common/BaseSnapExecutor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ export class BaseSnapExecutor {
const serializedError = serializeError(error, {
fallbackError: unhandledError,
shouldIncludeStack: false,
shouldPreserveMessage: false,
});

const errorData = getErrorData(serializedError);
Expand Down Expand Up @@ -225,6 +226,9 @@ export class BaseSnapExecutor {
rpcErrors.internal(
'JSON-RPC requests must be JSON serializable objects.',
),
{
shouldPreserveMessage: false,
},
),
id: (message as Pick<JsonRpcRequest, 'id'>).id,
jsonrpc: '2.0',
Expand Down Expand Up @@ -280,6 +284,7 @@ export class BaseSnapExecutor {
await this.#respond(id, {
error: serializeError(rpcError, {
fallbackError,
shouldPreserveMessage: false,
}),
});
}
Expand Down Expand Up @@ -322,6 +327,9 @@ export class BaseSnapExecutor {
rpcErrors.internal(
'JSON-RPC responses must be JSON serializable objects smaller than 64 MB.',
),
{
shouldPreserveMessage: false,
},
),
id,
jsonrpc: '2.0',
Expand Down
2 changes: 1 addition & 1 deletion packages/snaps-rpc-methods/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.0",
"@metamask/snaps-sdk": "workspace:^",
"@metamask/snaps-utils": "workspace:^",
"@metamask/superstruct": "^3.1.0",
Expand Down
5 changes: 4 additions & 1 deletion packages/snaps-rpc-methods/src/permitted/experimentalProviderRequest.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,10 @@ describe('snap_experimentalProviderRequest', () => {
expect(response.error).toStrictEqual({
...serializeError(
rpcErrors.internal({ data: { cause: 'Invalid params' } }),
{ shouldIncludeStack: false },
{
shouldIncludeStack: false,
shouldPreserveMessage: false,
},
),
});
});
Expand Down
1 change: 1 addition & 0 deletions packages/snaps-rpc-methods/src/permitted/middleware.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ describe('createSnapsMethodMiddleware', () => {
error: expect.objectContaining(
serializeError(rpcErrors.methodNotFound(), {
shouldIncludeStack: false,
shouldPreserveMessage: false,
}),
),
});
Expand Down
2 changes: 1 addition & 1 deletion packages/snaps-sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.0",
"@metamask/superstruct": "^3.1.0",
"@metamask/utils": "^9.2.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/snaps-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.0",
"@metamask/slip44": "^4.0.0",
"@metamask/snaps-registry": "^3.2.1",
"@metamask/snaps-sdk": "workspace:^",
Expand Down
24 changes: 17 additions & 7 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5002,7 +5002,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.0"
"@metamask/snaps-cli": "workspace:^"
"@metamask/snaps-jest": "workspace:^"
"@metamask/snaps-sdk": "workspace:^"
Expand Down Expand Up @@ -5449,6 +5449,16 @@ __metadata:
languageName: node
linkType: hard

"@metamask/rpc-errors@npm:^7.0.0":
version: 7.0.0
resolution: "@metamask/rpc-errors@npm:7.0.0"
dependencies:
"@metamask/utils": "npm:^9.0.0"
fast-safe-stringify: "npm:^2.0.6"
checksum: 10/f25e2a5506d4d0d6193c88aef8f035ec189a1177f8aee8fa01c9a33d73b1536ca7b5eea2fb33a477768bbd2abaf16529e68f0b3cf714387e5d6c9178225354fd
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"
Expand Down Expand Up @@ -5477,7 +5487,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.0"
"@metamask/snaps-cli": "workspace:^"
"@metamask/snaps-jest": "workspace:^"
"@metamask/snaps-sdk": "workspace:^"
Expand Down Expand Up @@ -5706,7 +5716,7 @@ __metadata:
"@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.0"
"@metamask/snaps-registry": "npm:^3.2.1"
"@metamask/snaps-rpc-methods": "workspace:^"
"@metamask/snaps-sdk": "workspace:^"
Expand Down Expand Up @@ -5800,7 +5810,7 @@ __metadata:
"@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.0"
"@metamask/snaps-sdk": "workspace:^"
"@metamask/snaps-utils": "workspace:^"
"@metamask/superstruct": "npm:^3.1.0"
Expand Down Expand Up @@ -5976,7 +5986,7 @@ __metadata:
"@metamask/json-rpc-engine": "npm:^9.0.2"
"@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.0"
"@metamask/snaps-sdk": "workspace:^"
"@metamask/snaps-utils": "workspace:^"
"@metamask/superstruct": "npm:^3.1.0"
Expand Down Expand Up @@ -6019,7 +6029,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.0"
"@metamask/superstruct": "npm:^3.1.0"
"@metamask/utils": "npm:^9.2.1"
"@ts-bridge/cli": "npm:^0.5.1"
Expand Down Expand Up @@ -6232,7 +6242,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.0"
"@metamask/slip44": "npm:^4.0.0"
"@metamask/snaps-registry": "npm:^3.2.1"
"@metamask/snaps-sdk": "workspace:^"
Expand Down
Loading