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

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

Closed
wants to merge 8 commits into from
Closed

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
8 commits
Select commit Hold shift + click to select a range
0332f4a
deps: @metamask/rpc-errors@^6.3.1->^7.0.0
legobeat Oct 9, 2024
80319e2
chore(snaps-execution-environments): update lavamoat policies
legobeat Oct 9, 2024
156ca44
deps: @metamask/json-rpc-engine@^9.0.2->^10.0.0
legobeat Oct 17, 2024
c50b699
deps: @metamask/json-rpc-middleware-stream@^8.0.2->^8.0.4
legobeat Oct 17, 2024
f6b7298
deps: @metamask/providers@^17.1.2->^18.0.0
legobeat Oct 17, 2024
ecce9e8
chore(snaps-execution-environments): update lavamoat policies
legobeat Oct 17, 2024
1c12ef1
deps: eth-json-rpc-middleware@^14.0.0->^15.0.0
legobeat Oct 18, 2024
1e516a7
peerDeps(keyring-api): @metamask/providers@^18.0.0->^18.1.0
legobeat Oct 18, 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
6 changes: 3 additions & 3 deletions packages/snaps-controllers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-middleware-stream": "^8.0.2",
"@metamask/json-rpc-engine": "^10.0.0",
"@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",
"@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
6 changes: 3 additions & 3 deletions packages/snaps-execution-environments/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/providers": "^18.1.0",
"@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
4 changes: 2 additions & 2 deletions 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 All @@ -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",
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
4 changes: 2 additions & 2 deletions packages/snaps-sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@
},
"dependencies": {
"@metamask/key-tree": "^9.1.2",
"@metamask/providers": "^17.1.2",
"@metamask/rpc-errors": "^6.3.1",
"@metamask/providers": "^18.1.0",
"@metamask/rpc-errors": "^7.0.0",
"@metamask/superstruct": "^3.1.0",
"@metamask/utils": "^9.2.1"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/snaps-simulation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions packages/snaps-simulator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:^",
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
2 changes: 1 addition & 1 deletion packages/test-snaps/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"@metamask/eslint-config-jest": "^12.1.0",
"@metamask/eslint-config-nodejs": "^12.1.0",
"@metamask/eslint-config-typescript": "^12.1.0",
"@metamask/providers": "^17.1.2",
"@metamask/providers": "^18.1.0",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
"@swc/core": "1.3.78",
"@swc/jest": "^0.2.26",
Expand Down
Loading
Loading