From e5cce9eeb028e29bd50c22801852320d22c12c8f Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Mon, 1 Dec 2025 10:40:47 +0100 Subject: [PATCH 01/24] wip: Add Multichain API support --- .../src/common/BaseSnapExecutor.ts | 30 +++++++++++++++++-- .../src/common/utils.ts | 17 +++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/packages/snaps-execution-environments/src/common/BaseSnapExecutor.ts b/packages/snaps-execution-environments/src/common/BaseSnapExecutor.ts index 3818439f46..288480b113 100644 --- a/packages/snaps-execution-environments/src/common/BaseSnapExecutor.ts +++ b/packages/snaps-execution-environments/src/common/BaseSnapExecutor.ts @@ -48,6 +48,7 @@ import { sanitizeRequestArguments, withTeardown, isValidResponse, + isMultichainRequest, } from './utils'; import { ExecuteSnapRequestArgumentsStruct, @@ -417,7 +418,16 @@ export class BaseSnapExecutor { provider.initializeSync(); - const snap = this.createSnapGlobal(provider); + const multichainProvider = new SnapProvider( + multiplex.createStream('metamask-multichain-provider'), + { + rpcMiddleware: [createIdRemapMiddleware()], + }, + ); + + multichainProvider.initializeSync(); + + const snap = this.createSnapGlobal(provider, multichainProvider); const ethereum = this.createEIP1193Provider(provider); // We specifically use any type because the Snap can modify the object any way they want const snapModule: any = { exports: {} }; @@ -516,19 +526,33 @@ export class BaseSnapExecutor { /** * Instantiates a snap API object (i.e. `globalThis.snap`). * - * @param provider - A StreamProvider connected to MetaMask. + * @param provider - A StreamProvider connected to the EIP-1193 client stream. + * @param multichainProvider - A StreamProvider connected to the CAIP-27 client stream. * @returns The snap provider object. */ // TODO: Either fix this lint violation or explain why it's necessary to // ignore. // eslint-disable-next-line no-restricted-syntax - private createSnapGlobal(provider: StreamProvider): SnapsProvider { + private createSnapGlobal( + provider: StreamProvider, + multichainProvider: StreamProvider, + ): SnapsProvider { const originalRequest = provider.request.bind(provider); + const originalMultichainRequest = + multichainProvider.request.bind(multichainProvider); const request = async (args: RequestArguments) => { // As part of the sanitization, we validate that the args are valid JSON. const sanitizedArgs = sanitizeRequestArguments(args); assertSnapOutboundRequest(sanitizedArgs); + + if (isMultichainRequest(sanitizedArgs)) { + return await withTeardown( + originalMultichainRequest(sanitizedArgs), + this as any, + ); + } + return await withTeardown(originalRequest(sanitizedArgs), this as any); }; diff --git a/packages/snaps-execution-environments/src/common/utils.ts b/packages/snaps-execution-environments/src/common/utils.ts index 72e5ff343d..a0041fca3e 100644 --- a/packages/snaps-execution-environments/src/common/utils.ts +++ b/packages/snaps-execution-environments/src/common/utils.ts @@ -62,6 +62,23 @@ export const BLOCKED_RPC_METHODS = Object.freeze([ 'wallet_scanQRCode', ]); +export const MULTICHAIN_API_METHODS = Object.freeze([ + 'wallet_createSession', + 'wallet_invokeMethod', + 'wallet_getSession', + 'wallet_revokeSession', +]); + +/** + * Check whether a validated request should be routed to the multichain API. + * + * @param args - The request arguments. + * @returns True if the request is a multichain request, otherwise false. + */ +export function isMultichainRequest(args: RequestArguments) { + return MULTICHAIN_API_METHODS.includes(args.method); +} + /** * Asserts the validity of request arguments for a snap outbound request using the `snap.request` API. * From dca3f00d90c9b466e276248f4bb31bd10ab9255a Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Mon, 1 Dec 2025 12:33:47 +0100 Subject: [PATCH 02/24] Add example Snap --- .../multichain-provider/.depcheckrc.json | 18 ++ .../packages/multichain-provider/CHANGELOG.md | 10 + .../multichain-provider/LICENSE.APACHE2 | 201 ++++++++++++++ .../packages/multichain-provider/LICENSE.MIT0 | 16 ++ .../packages/multichain-provider/README.md | 40 +++ .../multichain-provider/jest.config.js | 36 +++ .../packages/multichain-provider/package.json | 74 +++++ .../multichain-provider/snap.config.ts | 17 ++ .../multichain-provider/snap.manifest.json | 26 ++ .../multichain-provider/src/index.test.ts | 130 +++++++++ .../packages/multichain-provider/src/index.ts | 262 ++++++++++++++++++ .../packages/multichain-provider/src/types.ts | 13 + .../multichain-provider/tsconfig.json | 8 + packages/test-snaps/package.json | 1 + .../test-snaps/src/features/snaps/index.ts | 1 + .../MultichainProvider.tsx | 85 ++++++ .../components/SignMessage.tsx | 71 +++++ .../components/SignTypedData.tsx | 68 +++++ .../components/SwitchChain.tsx | 31 +++ .../multichain-provider/components/index.ts | 3 + .../snaps/multichain-provider/constants.ts | 6 + .../snaps/multichain-provider/index.ts | 1 + yarn.lock | 26 ++ 23 files changed, 1144 insertions(+) create mode 100644 packages/examples/packages/multichain-provider/.depcheckrc.json create mode 100644 packages/examples/packages/multichain-provider/CHANGELOG.md create mode 100644 packages/examples/packages/multichain-provider/LICENSE.APACHE2 create mode 100644 packages/examples/packages/multichain-provider/LICENSE.MIT0 create mode 100644 packages/examples/packages/multichain-provider/README.md create mode 100644 packages/examples/packages/multichain-provider/jest.config.js create mode 100644 packages/examples/packages/multichain-provider/package.json create mode 100644 packages/examples/packages/multichain-provider/snap.config.ts create mode 100644 packages/examples/packages/multichain-provider/snap.manifest.json create mode 100644 packages/examples/packages/multichain-provider/src/index.test.ts create mode 100644 packages/examples/packages/multichain-provider/src/index.ts create mode 100644 packages/examples/packages/multichain-provider/src/types.ts create mode 100644 packages/examples/packages/multichain-provider/tsconfig.json create mode 100644 packages/test-snaps/src/features/snaps/multichain-provider/MultichainProvider.tsx create mode 100644 packages/test-snaps/src/features/snaps/multichain-provider/components/SignMessage.tsx create mode 100644 packages/test-snaps/src/features/snaps/multichain-provider/components/SignTypedData.tsx create mode 100644 packages/test-snaps/src/features/snaps/multichain-provider/components/SwitchChain.tsx create mode 100644 packages/test-snaps/src/features/snaps/multichain-provider/components/index.ts create mode 100644 packages/test-snaps/src/features/snaps/multichain-provider/constants.ts create mode 100644 packages/test-snaps/src/features/snaps/multichain-provider/index.ts diff --git a/packages/examples/packages/multichain-provider/.depcheckrc.json b/packages/examples/packages/multichain-provider/.depcheckrc.json new file mode 100644 index 0000000000..c437c59cd2 --- /dev/null +++ b/packages/examples/packages/multichain-provider/.depcheckrc.json @@ -0,0 +1,18 @@ +{ + "ignore-patterns": ["dist", "coverage"], + "ignores": [ + "@lavamoat/allow-scripts", + "@lavamoat/preinstall-always-fail", + "@metamask/auto-changelog", + "@metamask/eslint-*", + "@types/*", + "@typescript-eslint/*", + "eslint-config-*", + "eslint-plugin-*", + "jest-silent-reporter", + "prettier-plugin-packagejson", + "ts-node", + "typedoc", + "typescript" + ] +} diff --git a/packages/examples/packages/multichain-provider/CHANGELOG.md b/packages/examples/packages/multichain-provider/CHANGELOG.md new file mode 100644 index 0000000000..da9116130a --- /dev/null +++ b/packages/examples/packages/multichain-provider/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +[Unreleased]: https://github.com/MetaMask/snaps/compare/@metamask/multichain-provider-example-snap@HEAD diff --git a/packages/examples/packages/multichain-provider/LICENSE.APACHE2 b/packages/examples/packages/multichain-provider/LICENSE.APACHE2 new file mode 100644 index 0000000000..bf37d0e612 --- /dev/null +++ b/packages/examples/packages/multichain-provider/LICENSE.APACHE2 @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2023 ConsenSys Software Inc. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/packages/examples/packages/multichain-provider/LICENSE.MIT0 b/packages/examples/packages/multichain-provider/LICENSE.MIT0 new file mode 100644 index 0000000000..913c577462 --- /dev/null +++ b/packages/examples/packages/multichain-provider/LICENSE.MIT0 @@ -0,0 +1,16 @@ +MIT No Attribution + +Copyright 2023 ConsenSys Software Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy of this +software and associated documentation files (the "Software"), to deal in the Software +without restriction, including without limitation the rights to use, copy, modify, +merge, publish, distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/packages/examples/packages/multichain-provider/README.md b/packages/examples/packages/multichain-provider/README.md new file mode 100644 index 0000000000..1e8220acf2 --- /dev/null +++ b/packages/examples/packages/multichain-provider/README.md @@ -0,0 +1,40 @@ +# `@metamask/ethereum-provider-example-snap` + +This snap demonstrates the use of the `endowment:ethereum-provider` permission +and the corresponding `ethereum` global. This is similar to the +`window.ethereum` API, but it does not have access to all methods. + +## Snap manifest + +> **Note**: Using `ethereum` requires the `endowment:ethereum-provider` +> permissions. Refer to [the documentation](https://docs.metamask.io/snaps/reference/permissions/#endowmentethereum-provider) +> for more information. + +Along with other permissions, the manifest of this snap includes the +`endowment:ethereum-provider` permission: + +```json +{ + "initialPermissions": { + "endowment:ethereum-provider": {} + } +} +``` + +This permission does not require any additional configuration. + +## Snap usage + +This snap exposes an `onRpcRequest` handler, which supports the following +JSON-RPC methods: + +- `getGasPrice`: Get the current recommended gas price from an Ethereum + provider. +- `getVersion`: Get the Ethereum network version from an Ethereum provider. +- `getAccounts`: Get the Ethereum accounts made available to the snap from an + Ethereum provider. +- `personalSign`: Sign a message using an Ethereum account made available to the Snap. +- `signTypedData`: Sign a struct using an Ethereum account made available to the Snap. + +For more information, you can refer to +[the end-to-end tests](./src/index.test.ts). diff --git a/packages/examples/packages/multichain-provider/jest.config.js b/packages/examples/packages/multichain-provider/jest.config.js new file mode 100644 index 0000000000..f473a91b83 --- /dev/null +++ b/packages/examples/packages/multichain-provider/jest.config.js @@ -0,0 +1,36 @@ +const deepmerge = require('deepmerge'); + +const baseConfig = require('../../../../jest.config.base'); + +module.exports = deepmerge(baseConfig, { + preset: '@metamask/snaps-jest', + + // Since `@metamask/snaps-jest` runs in the browser, we can't collect + // coverage information. + collectCoverage: false, + + // This is required for the tests to run inside the `MetaMask/snaps` + // repository. You don't need this in your own project. + moduleNameMapper: { + '^@metamask/(.+)/production/jsx-runtime': [ + '/../../../$1/src/jsx/production/jsx-runtime', + '/../../../../node_modules/@metamask/$1/jsx/production/jsx-runtime', + '/node_modules/@metamask/$1/jsx/production/jsx-runtime', + ], + '^@metamask/(.+)/jsx': [ + '/../../../$1/src/jsx', + '/../../../../node_modules/@metamask/$1/jsx', + '/node_modules/@metamask/$1/jsx', + ], + '^@metamask/(.+)/node$': [ + '/../../../$1/src/node', + '/../../../../node_modules/@metamask/$1/node', + '/node_modules/@metamask/$1/node', + ], + '^@metamask/(.+)$': [ + '/../../../$1/src', + '/../../../../node_modules/@metamask/$1', + '/node_modules/@metamask/$1', + ], + }, +}); diff --git a/packages/examples/packages/multichain-provider/package.json b/packages/examples/packages/multichain-provider/package.json new file mode 100644 index 0000000000..6fae95b0d2 --- /dev/null +++ b/packages/examples/packages/multichain-provider/package.json @@ -0,0 +1,74 @@ +{ + "name": "@metamask/multichain-provider-example-snap", + "version": "0.0.0", + "description": "MetaMask example snap demonstrating the use of the Multichain Provider API and `endowment:multichain-provider` permission", + "keywords": [ + "MetaMask", + "Snaps", + "Ethereum" + ], + "homepage": "https://github.com/MetaMask/snaps/tree/main/packages/examples/packages/multichain-provider#readme", + "bugs": { + "url": "https://github.com/MetaMask/snaps/issues" + }, + "repository": { + "type": "git", + "url": "https://github.com/MetaMask/snaps.git" + }, + "license": "(MIT-0 OR Apache-2.0)", + "sideEffects": false, + "main": "./dist/bundle.js", + "files": [ + "dist", + "snap.manifest.json" + ], + "scripts": { + "build": "mm-snap build", + "build:clean": "yarn clean && yarn build", + "changelog:update": "../../../../scripts/update-changelog.sh @metamask/multichain-provider-example-snap", + "changelog:validate": "../../../../scripts/validate-changelog.sh @metamask/multichain-provider-example-snap", + "clean": "rimraf \"dist\"", + "lint": "yarn lint:eslint && yarn lint:misc --check && yarn changelog:validate && yarn lint:dependencies", + "lint:ci": "yarn lint", + "lint:dependencies": "depcheck", + "lint:eslint": "eslint . --cache", + "lint:fix": "yarn lint:eslint --fix && yarn lint:misc --write", + "lint:misc": "prettier --no-error-on-unmatched-pattern --log-level warn \"**/*.json\" \"**/*.md\" \"**/*.html\" \"!CHANGELOG.md\" \"!snap.manifest.json\" --ignore-path ../../../../.gitignore", + "publish:preview": "yarn npm publish --tag preview", + "since-latest-release": "../../../../scripts/since-latest-release.sh", + "start": "mm-snap watch", + "test": "jest --reporters=jest-silent-reporter", + "test:clean": "jest --clearCache", + "test:verbose": "jest --verbose", + "test:watch": "jest --watch" + }, + "dependencies": { + "@metamask/snaps-sdk": "workspace:^", + "@metamask/utils": "^11.8.1" + }, + "devDependencies": { + "@jest/globals": "^29.5.0", + "@lavamoat/allow-scripts": "^3.4.0", + "@metamask/auto-changelog": "^5.0.2", + "@metamask/snaps-cli": "workspace:^", + "@metamask/snaps-jest": "workspace:^", + "@swc/core": "1.11.31", + "@swc/jest": "^0.2.38", + "@types/node": "18.14.2", + "deepmerge": "^4.2.2", + "depcheck": "^1.4.7", + "eslint": "^9.11.0", + "jest": "^29.0.2", + "jest-silent-reporter": "^0.6.0", + "prettier": "^3.3.3", + "ts-node": "^10.9.1", + "typescript": "~5.3.3" + }, + "engines": { + "node": "^20 || >=22" + }, + "publishConfig": { + "access": "public", + "registry": "https://registry.npmjs.org/" + } +} diff --git a/packages/examples/packages/multichain-provider/snap.config.ts b/packages/examples/packages/multichain-provider/snap.config.ts new file mode 100644 index 0000000000..9310eec961 --- /dev/null +++ b/packages/examples/packages/multichain-provider/snap.config.ts @@ -0,0 +1,17 @@ +import type { SnapConfig } from '@metamask/snaps-cli'; +import { resolve } from 'path'; + +const config: SnapConfig = { + input: resolve(__dirname, 'src/index.ts'), + server: { + port: 8036, + }, + typescript: { + enabled: true, + }, + stats: { + buffer: false, + }, +}; + +export default config; diff --git a/packages/examples/packages/multichain-provider/snap.manifest.json b/packages/examples/packages/multichain-provider/snap.manifest.json new file mode 100644 index 0000000000..67704295ce --- /dev/null +++ b/packages/examples/packages/multichain-provider/snap.manifest.json @@ -0,0 +1,26 @@ +{ + "version": "0.0.0", + "description": "MetaMask example snap demonstrating the use of the Multichain Provider API and `endowment:multichain-provider` permission.", + "proposedName": "Multichain Provider Example Snap", + "repository": { + "type": "git", + "url": "https://github.com/MetaMask/snaps.git" + }, + "source": { + "shasum": "HiDMIdRqE5RxfB+Ck6pAMkIZJUSUdAtaHdjhcmP3Dnw=", + "location": { + "npm": { + "filePath": "dist/bundle.js", + "packageName": "@metamask/multichain-provider-example-snap", + "registry": "https://registry.npmjs.org/" + } + } + }, + "initialPermissions": { + "endowment:rpc": { + "dapps": true + } + }, + "platformVersion": "10.1.0", + "manifestVersion": "0.1" +} diff --git a/packages/examples/packages/multichain-provider/src/index.test.ts b/packages/examples/packages/multichain-provider/src/index.test.ts new file mode 100644 index 0000000000..e60536c7ac --- /dev/null +++ b/packages/examples/packages/multichain-provider/src/index.test.ts @@ -0,0 +1,130 @@ +import { expect } from '@jest/globals'; +import { installSnap } from '@metamask/snaps-jest'; + +describe('onRpcRequest', () => { + it('throws an error if the requested method does not exist', async () => { + const { request } = await installSnap(); + + const response = await request({ + method: 'foo', + }); + + expect(response).toRespondWithError({ + code: -32601, + message: 'The method does not exist / is not available.', + stack: expect.any(String), + data: { + method: 'foo', + cause: null, + }, + }); + }); + + describe('getGasPrice', () => { + const MOCK_GAS_PRICE = '0x387c64b64'; + + it('returns the current gas price', async () => { + const { request, mockJsonRpc } = await installSnap(); + + // To avoid relying on the network, we mock the response from the Ethereum + // provider. + mockJsonRpc({ + method: 'eth_gasPrice', + result: MOCK_GAS_PRICE, + }); + + const response = await request({ + method: 'getGasPrice', + }); + + expect(response).toRespondWith(MOCK_GAS_PRICE); + }); + }); + + describe('getVersion', () => { + const MOCK_VERSION = '1'; // Ethereum Mainnet + + it('returns the current network version', async () => { + const { request } = await installSnap(); + + const response = await request({ + method: 'getVersion', + }); + + expect(response).toRespondWith(MOCK_VERSION); + }); + }); + + describe('getChainId', () => { + const MOCK_CHAIN_ID = '0x01'; // Ethereum Mainnet + + it('returns the current network version', async () => { + const { request } = await installSnap(); + + const response = await request({ + method: 'getChainId', + }); + + expect(response).toRespondWith(MOCK_CHAIN_ID); + }); + }); + + describe('getAccounts', () => { + it('returns the addresses granted access to by the user', async () => { + const { request } = await installSnap(); + + const response = await request({ + method: 'getAccounts', + }); + + // Currently, snaps-jest will always return this account. + expect(response).toRespondWith([ + '0xc6d5a3c98ec9073b54fa0969957bd582e8d874bf', + ]); + }); + }); + + describe('personalSign', () => { + const MOCK_SIGNATURE = + '0x16f672a12220dc4d9e27671ef580cfc1397a9a4d5ee19eadea46c0f350b2f72a4922be7c1f16ed9b03ef1d3351eac469e33accf5a36194b1d88923701c2b163f1b'; + + it('returns a signature', async () => { + const { request, mockJsonRpc } = await installSnap(); + + // We can mock the signature request with the response we want. + mockJsonRpc({ + method: 'personal_sign', + result: MOCK_SIGNATURE, + }); + + const response = await request({ + method: 'personalSign', + params: { message: 'foo' }, + }); + + expect(response).toRespondWith(MOCK_SIGNATURE); + }); + }); + + describe('signTypedData', () => { + const MOCK_SIGNATURE = + '0x01b37713300d99fecf0274bcb0dfb586a23d56c4bf2ed700c5ecf4ada7a2a14825e7b1212b1cc49c9440c375337561f2b7a6e639ba25be6a6f5a16f60e6931d31c'; + + it('returns a signature', async () => { + const { request, mockJsonRpc } = await installSnap(); + + // We can mock the signature request with the response we want. + mockJsonRpc({ + method: 'eth_signTypedData_v4', + result: MOCK_SIGNATURE, + }); + + const response = await request({ + method: 'signTypedData', + params: { message: 'foo' }, + }); + + expect(response).toRespondWith(MOCK_SIGNATURE); + }); + }); +}); diff --git a/packages/examples/packages/multichain-provider/src/index.ts b/packages/examples/packages/multichain-provider/src/index.ts new file mode 100644 index 0000000000..7266237061 --- /dev/null +++ b/packages/examples/packages/multichain-provider/src/index.ts @@ -0,0 +1,262 @@ +import { + MethodNotFoundError, + type OnRpcRequestHandler, +} from '@metamask/snaps-sdk'; +import type { + CaipAccountId, + CaipChainId, + Hex, + JsonRpcRequest, +} from '@metamask/utils'; +import { + assert, + stringToBytes, + bytesToHex, + hexToNumber, + parseCaipChainId, + parseCaipAccountId, +} from '@metamask/utils'; + +import type { + BaseParams, + PersonalSignParams, + SignTypedDataParams, +} from './types'; + +// TODO: Consider letting the permission create the "session" +async function createSession() { + const optionalScopes = { + 'eip155:1': { + methods: ['personal_sign', 'eth_signTypedData_v4'], + notifications: [], + accounts: [], + }, + }; + // TODO: Fix snap.request types + return await (snap as any).request({ + method: 'wallet_createSession', + params: { + optionalScopes, + }, + }); +} + +async function invokeMethod( + scope: CaipChainId, + request: Omit, +): Promise { + // TODO: Fix snap.request types + return (await (snap as any).request({ + method: 'wallet_invokeMethod', + params: { + scope, + request, + }, + })) as ReturnType; +} + +/** + * Get the current chain ID using the `ethereum` global. This is essentially + * the same as the `window.ethereum` global, but does not have access to all + * methods. + * + * Note that using the `ethereum` global requires the + * `endowment:ethereum-provider` permission. + * + * @returns The current chain ID as a string. + * @see https://docs.metamask.io/snaps/reference/permissions/#endowmentethereum-provider + */ +async function getChainId(scope: CaipChainId) { + const chainId = await invokeMethod(scope, { + method: 'eth_chainId', + }); + + assert(chainId, 'Multichain provider did not return a chain ID.'); + + return chainId; +} + +async function getAccounts(scope: CaipChainId) { + const session = await await (snap as any).request({ + method: 'wallet_getSession', + }); + + return session.sessionScopes[scope]?.accounts ?? []; +} + +/** + * Sign a message using the `personal_sign` JSON-RPC method. + * + * @param message - The message to sign as a string. + * @param from - The account to sign the message with as a string. + * @returns A signature for the proposed message and account. + * @throws If the user rejects the prompt. + * @see https://docs.metamask.io/snaps/reference/permissions/#endowmentethereum-provider + * @see https://docs.metamask.io/wallet/concepts/signing-methods/#personal_sign + */ +async function personalSign( + scope: CaipChainId, + message: string, + from: CaipAccountId, +) { + const { namespace } = parseCaipChainId(scope); + assert( + namespace === 'eip155', + 'personal_sign only available for eip155 namespace.', + ); + + const { address } = parseCaipAccountId(from); + + const signature = await invokeMethod(scope, { + method: 'personal_sign', + params: [bytesToHex(stringToBytes(message)), address], + }); + assert(signature, 'Multichain provider did not return a signature.'); + + return signature; +} + +/** + * Sign a struct using the `eth_signTypedData_v4` JSON-RPC method. + * + * This uses the Ether Mail struct for example purposes. + * + * @param message - The message include in Ether Mail a string. + * @param from - The account to sign the message with as a string. + * @returns A signature for the struct and account. + * @throws If the user rejects the prompt. + * @see https://docs.metamask.io/snaps/reference/permissions/#endowmentethereum-provider + * @see https://docs.metamask.io/wallet/concepts/signing-methods/#eth_signtypeddata_v4 + */ +async function signTypedData( + scope: CaipChainId, + message: string, + from: CaipAccountId, +) { + const { namespace, reference } = parseCaipChainId(scope); + assert( + namespace === 'eip155', + 'eth_signTypedData_v4 only available for eip155 namespace.', + ); + + const { address } = parseCaipAccountId(from); + + const signature = await invokeMethod(scope, { + method: 'eth_signTypedData_v4', + params: [ + address, + { + types: { + EIP712Domain: [ + { + name: 'name', + type: 'string', + }, + { + name: 'version', + type: 'string', + }, + { + name: 'chainId', + type: 'uint256', + }, + { + name: 'verifyingContract', + type: 'address', + }, + ], + Person: [ + { + name: 'name', + type: 'string', + }, + { + name: 'wallet', + type: 'address', + }, + ], + Mail: [ + { + name: 'from', + type: 'Person', + }, + { + name: 'to', + type: 'Person', + }, + { + name: 'contents', + type: 'string', + }, + ], + }, + primaryType: 'Mail', + domain: { + name: 'Ether Mail', + version: '1', + chainId: hexToNumber(reference), + verifyingContract: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC', + }, + message: { + from: { + name: 'Snap', + wallet: address, + }, + to: { + name: 'Bob', + wallet: '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB', + }, + contents: message, + }, + }, + ], + }); + assert(signature, 'Multichain provider did not return a signature.'); + + return signature; +} + +/** + * Handle incoming JSON-RPC requests from the dapp, sent through the + * `wallet_invokeSnap` method. This handler handles six methods: + * + * - `getChainId`: Get the current Ethereum chain ID as a string. + * - `getAccounts`: Get the Ethereum accounts that the snap has access to. + * - `personalSign`: Sign a message using an Ethereum account. + * - `signTypedData` Sign a struct using an Ethereum account. + * + * @param params - The request parameters. + * @param params.request - The JSON-RPC request object. + * @returns The JSON-RPC response. + * @see https://docs.metamask.io/snaps/reference/exports/#onrpcrequest + * @see https://docs.metamask.io/snaps/reference/rpc-api/#wallet_invokesnap + */ +export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { + const { scope = 'eip155:1' } = (request.params as BaseParams) ?? {}; + + switch (request.method) { + case 'createSession': + return await createSession(); + + case 'getChainId': + return await getChainId(scope); + + case 'getAccounts': + return await getAccounts(scope); + + case 'personalSign': { + const params = request.params as PersonalSignParams; + const accounts = await getAccounts(scope); + return await personalSign(scope, params.message, accounts[0]); + } + + case 'signTypedData': { + const params = request.params as SignTypedDataParams; + const accounts = await getAccounts(scope); + return await signTypedData(scope, params.message, accounts[0]); + } + + default: + throw new MethodNotFoundError({ method: request.method }); + } +}; diff --git a/packages/examples/packages/multichain-provider/src/types.ts b/packages/examples/packages/multichain-provider/src/types.ts new file mode 100644 index 0000000000..2538c7114b --- /dev/null +++ b/packages/examples/packages/multichain-provider/src/types.ts @@ -0,0 +1,13 @@ +import type { CaipChainId } from '@metamask/utils'; + +export type BaseParams = { + scope: CaipChainId; +}; + +export type PersonalSignParams = BaseParams & { + message: string; +}; + +export type SignTypedDataParams = { + message: string; +}; diff --git a/packages/examples/packages/multichain-provider/tsconfig.json b/packages/examples/packages/multichain-provider/tsconfig.json new file mode 100644 index 0000000000..17a40a6a74 --- /dev/null +++ b/packages/examples/packages/multichain-provider/tsconfig.json @@ -0,0 +1,8 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "composite": false, + "baseUrl": "./" + }, + "include": ["src", "snap.config.ts"] +} diff --git a/packages/test-snaps/package.json b/packages/test-snaps/package.json index c141cc294e..bb9cb0745c 100644 --- a/packages/test-snaps/package.json +++ b/packages/test-snaps/package.json @@ -66,6 +66,7 @@ "@metamask/lifecycle-hooks-example-snap": "workspace:^", "@metamask/localization-example-snap": "workspace:^", "@metamask/manage-state-example-snap": "workspace:^", + "@metamask/multichain-provider-example-snap": "workspace:^", "@metamask/name-lookup-example-snap": "workspace:^", "@metamask/network-example-snap": "workspace:^", "@metamask/notification-example-snap": "workspace:^", diff --git a/packages/test-snaps/src/features/snaps/index.ts b/packages/test-snaps/src/features/snaps/index.ts index 601569b976..dac2b82224 100644 --- a/packages/test-snaps/src/features/snaps/index.ts +++ b/packages/test-snaps/src/features/snaps/index.ts @@ -19,6 +19,7 @@ export * from './jsx'; export * from './lifecycle-hooks'; export * from './legacy-state'; export * from './multi-install'; +export * from './multichain-provider'; export * from './name-lookup'; export * from './network-access'; export * from './notifications'; diff --git a/packages/test-snaps/src/features/snaps/multichain-provider/MultichainProvider.tsx b/packages/test-snaps/src/features/snaps/multichain-provider/MultichainProvider.tsx new file mode 100644 index 0000000000..ec4fe9ef9f --- /dev/null +++ b/packages/test-snaps/src/features/snaps/multichain-provider/MultichainProvider.tsx @@ -0,0 +1,85 @@ +import { logError } from '@metamask/snaps-utils'; +import type { CaipChainId } from '@metamask/utils'; +import type { FunctionComponent } from 'react'; +import { useState } from 'react'; +import { Button, ButtonGroup } from 'react-bootstrap'; + +import { SignMessage, SignTypedData, SwitchChain } from './components'; +import { + MULTICHAIN_PROVIDER_SNAP_ID, + MULTICHAIN_PROVIDER_SNAP_PORT, + MULTICHAIN_PROVIDER_VERSION, +} from './constants'; +import { useInvokeMutation } from '../../../api'; +import { Result, Snap } from '../../../components'; +import { getSnapId } from '../../../utils'; + +export const MultichainProvider: FunctionComponent = () => { + const [invokeSnap, { isLoading, data, error }] = useInvokeMutation(); + const [scope, setScope] = useState('eip155:1'); + + const handleSubmit = (method: string) => { + invokeSnap({ + snapId: getSnapId( + MULTICHAIN_PROVIDER_SNAP_ID, + MULTICHAIN_PROVIDER_SNAP_PORT, + ), + method, + params: { + scope, + }, + }).catch(logError); + }; + + const handleCreateSession = () => handleSubmit('createSession'); + const handleGetChainId = () => handleSubmit('getChainId'); + const handleGetAccounts = () => handleSubmit('getAccounts'); + + return ( + + + + + + + + + + {JSON.stringify(data, null, 2)} + {JSON.stringify(error, null, 2)} + + + + + + ); +}; diff --git a/packages/test-snaps/src/features/snaps/multichain-provider/components/SignMessage.tsx b/packages/test-snaps/src/features/snaps/multichain-provider/components/SignMessage.tsx new file mode 100644 index 0000000000..f7c011542e --- /dev/null +++ b/packages/test-snaps/src/features/snaps/multichain-provider/components/SignMessage.tsx @@ -0,0 +1,71 @@ +import { logError } from '@metamask/snaps-utils'; +import type { CaipChainId } from '@metamask/utils'; +import type { ChangeEvent, FormEvent, FunctionComponent } from 'react'; +import { useState } from 'react'; +import { Button, Form } from 'react-bootstrap'; + +import { useInvokeMutation } from '../../../../api'; +import { Result } from '../../../../components'; +import { getSnapId } from '../../../../utils'; +import { + MULTICHAIN_PROVIDER_SNAP_ID, + MULTICHAIN_PROVIDER_SNAP_PORT, +} from '../constants'; + +export type SignMessageProps = { + scope: CaipChainId; +}; + +export const SignMessage: FunctionComponent = ({ + scope, +}) => { + const [message, setMessage] = useState(''); + const [invokeSnap, { isLoading, data, error }] = useInvokeMutation(); + + const handleChange = (event: ChangeEvent) => { + setMessage(event.target.value); + }; + + const handleSubmit = (event: FormEvent) => { + event.preventDefault(); + + invokeSnap({ + snapId: getSnapId( + MULTICHAIN_PROVIDER_SNAP_ID, + MULTICHAIN_PROVIDER_SNAP_PORT, + ), + method: 'personalSign', + params: { + message, + scope, + }, + }).catch(logError); + }; + + return ( + <> +

Personal Sign

+
+ Message + + + + + + + {JSON.stringify(data, null, 2)} + {JSON.stringify(error, null, 2)} + + + + ); +}; diff --git a/packages/test-snaps/src/features/snaps/multichain-provider/components/SignTypedData.tsx b/packages/test-snaps/src/features/snaps/multichain-provider/components/SignTypedData.tsx new file mode 100644 index 0000000000..8987846354 --- /dev/null +++ b/packages/test-snaps/src/features/snaps/multichain-provider/components/SignTypedData.tsx @@ -0,0 +1,68 @@ +import { logError } from '@metamask/snaps-utils'; +import type { CaipChainId } from '@metamask/utils'; +import type { ChangeEvent, FormEvent, FunctionComponent } from 'react'; +import { useState } from 'react'; +import { Button, Form } from 'react-bootstrap'; + +import { useInvokeMutation } from '../../../../api'; +import { Result } from '../../../../components'; +import { getSnapId } from '../../../../utils'; +import { + MULTICHAIN_PROVIDER_SNAP_ID, + MULTICHAIN_PROVIDER_SNAP_PORT, +} from '../constants'; + +export type SignTypedDataProps = { + scope: CaipChainId; +}; + +export const SignTypedData: FunctionComponent = ({ + scope, +}) => { + const [message, setMessage] = useState(''); + const [invokeSnap, { isLoading, data, error }] = useInvokeMutation(); + + const handleChange = (event: ChangeEvent) => { + setMessage(event.target.value); + }; + + const handleSubmit = (event: FormEvent) => { + event.preventDefault(); + + invokeSnap({ + snapId: getSnapId(MULTICHAIN_PROVIDER_SNAP_ID, MULTICHAIN_PROVIDER_SNAP_PORT), + method: 'signTypedData', + params: { + message, + scope, + }, + }).catch(logError); + }; + + return ( + <> +

Sign Typed Data

+
+ Message + + + + + + + {JSON.stringify(data, null, 2)} + {JSON.stringify(error, null, 2)} + + + + ); +}; diff --git a/packages/test-snaps/src/features/snaps/multichain-provider/components/SwitchChain.tsx b/packages/test-snaps/src/features/snaps/multichain-provider/components/SwitchChain.tsx new file mode 100644 index 0000000000..b83bac6d58 --- /dev/null +++ b/packages/test-snaps/src/features/snaps/multichain-provider/components/SwitchChain.tsx @@ -0,0 +1,31 @@ +import { CaipChainId } from '@metamask/utils'; +import type { ChangeEvent, FunctionComponent } from 'react'; + +export type SwitchChainProps = { + onChange: (chainId: CaipChainId) => void; +}; + +export const SwitchChain: FunctionComponent = ({ + onChange, +}) => { + const handleChange = (event: ChangeEvent) => { + onChange(event.target.value as CaipChainId); + }; + + return ( + <> +

Select chain

+ + + ); +}; diff --git a/packages/test-snaps/src/features/snaps/multichain-provider/components/index.ts b/packages/test-snaps/src/features/snaps/multichain-provider/components/index.ts new file mode 100644 index 0000000000..5f58fe7608 --- /dev/null +++ b/packages/test-snaps/src/features/snaps/multichain-provider/components/index.ts @@ -0,0 +1,3 @@ +export * from './SignMessage'; +export * from './SignTypedData'; +export * from './SwitchChain'; diff --git a/packages/test-snaps/src/features/snaps/multichain-provider/constants.ts b/packages/test-snaps/src/features/snaps/multichain-provider/constants.ts new file mode 100644 index 0000000000..9da3800a38 --- /dev/null +++ b/packages/test-snaps/src/features/snaps/multichain-provider/constants.ts @@ -0,0 +1,6 @@ +import packageJson from '@metamask/multichain-provider-example-snap/package.json'; + +export const MULTICHAIN_PROVIDER_SNAP_ID = + 'npm:@metamask/multichain-provider-example-snap'; +export const MULTICHAIN_PROVIDER_SNAP_PORT = 8036; +export const MULTICHAIN_PROVIDER_VERSION = packageJson.version; diff --git a/packages/test-snaps/src/features/snaps/multichain-provider/index.ts b/packages/test-snaps/src/features/snaps/multichain-provider/index.ts new file mode 100644 index 0000000000..f337f07f51 --- /dev/null +++ b/packages/test-snaps/src/features/snaps/multichain-provider/index.ts @@ -0,0 +1 @@ +export * from './MultichainProvider'; diff --git a/yarn.lock b/yarn.lock index 126f205818..48b3ef262d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3758,6 +3758,31 @@ __metadata: languageName: node linkType: hard +"@metamask/multichain-provider-example-snap@workspace:^, @metamask/multichain-provider-example-snap@workspace:packages/examples/packages/multichain-provider": + version: 0.0.0-use.local + resolution: "@metamask/multichain-provider-example-snap@workspace:packages/examples/packages/multichain-provider" + dependencies: + "@jest/globals": "npm:^29.5.0" + "@lavamoat/allow-scripts": "npm:^3.4.0" + "@metamask/auto-changelog": "npm:^5.0.2" + "@metamask/snaps-cli": "workspace:^" + "@metamask/snaps-jest": "workspace:^" + "@metamask/snaps-sdk": "workspace:^" + "@metamask/utils": "npm:^11.8.1" + "@swc/core": "npm:1.11.31" + "@swc/jest": "npm:^0.2.38" + "@types/node": "npm:18.14.2" + deepmerge: "npm:^4.2.2" + depcheck: "npm:^1.4.7" + eslint: "npm:^9.11.0" + jest: "npm:^29.0.2" + jest-silent-reporter: "npm:^0.6.0" + prettier: "npm:^3.3.3" + ts-node: "npm:^10.9.1" + typescript: "npm:~5.3.3" + languageName: unknown + linkType: soft + "@metamask/name-lookup-example-snap@workspace:^, @metamask/name-lookup-example-snap@workspace:packages/examples/packages/name-lookup": version: 0.0.0-use.local resolution: "@metamask/name-lookup-example-snap@workspace:packages/examples/packages/name-lookup" @@ -4656,6 +4681,7 @@ __metadata: "@metamask/lifecycle-hooks-example-snap": "workspace:^" "@metamask/localization-example-snap": "workspace:^" "@metamask/manage-state-example-snap": "workspace:^" + "@metamask/multichain-provider-example-snap": "workspace:^" "@metamask/name-lookup-example-snap": "workspace:^" "@metamask/network-example-snap": "workspace:^" "@metamask/notification-example-snap": "workspace:^" From 8218725d6934b85b36c9078b405a9ea42715e0ab Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Mon, 1 Dec 2025 14:41:53 +0100 Subject: [PATCH 03/24] Support signing messages with Solana --- .../multichain-provider/snap.manifest.json | 2 +- .../packages/multichain-provider/src/index.ts | 90 +++++++------------ .../multichain-provider/src/modules/base.ts | 29 ++++++ .../multichain-provider/src/modules/evm.ts | 19 ++++ .../multichain-provider/src/modules/sol.ts | 22 +++++ .../packages/multichain-provider/src/types.ts | 2 +- .../MultichainProvider.tsx | 46 +++++----- .../components/SignMessage.tsx | 16 ++-- .../components/SignTypedData.tsx | 15 +++- .../components/SwitchChain.tsx | 1 - 10 files changed, 149 insertions(+), 93 deletions(-) create mode 100644 packages/examples/packages/multichain-provider/src/modules/base.ts create mode 100644 packages/examples/packages/multichain-provider/src/modules/evm.ts create mode 100644 packages/examples/packages/multichain-provider/src/modules/sol.ts diff --git a/packages/examples/packages/multichain-provider/snap.manifest.json b/packages/examples/packages/multichain-provider/snap.manifest.json index 67704295ce..5eae465e21 100644 --- a/packages/examples/packages/multichain-provider/snap.manifest.json +++ b/packages/examples/packages/multichain-provider/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "HiDMIdRqE5RxfB+Ck6pAMkIZJUSUdAtaHdjhcmP3Dnw=", + "shasum": "enLq+2n+VbAequXWrxX4SyxISNxqBIc01ibXNQbjlKg=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/multichain-provider/src/index.ts b/packages/examples/packages/multichain-provider/src/index.ts index 7266237061..f9dffb1255 100644 --- a/packages/examples/packages/multichain-provider/src/index.ts +++ b/packages/examples/packages/multichain-provider/src/index.ts @@ -2,16 +2,9 @@ import { MethodNotFoundError, type OnRpcRequestHandler, } from '@metamask/snaps-sdk'; -import type { - CaipAccountId, - CaipChainId, - Hex, - JsonRpcRequest, -} from '@metamask/utils'; +import type { CaipAccountId, CaipChainId, Hex } from '@metamask/utils'; import { assert, - stringToBytes, - bytesToHex, hexToNumber, parseCaipChainId, parseCaipAccountId, @@ -19,9 +12,12 @@ import { import type { BaseParams, - PersonalSignParams, + SignMessageParams, SignTypedDataParams, } from './types'; +import { invokeMethod } from './modules/base'; +import { Evm } from './modules/evm'; +import { Solana } from './modules/sol'; // TODO: Consider letting the permission create the "session" async function createSession() { @@ -31,6 +27,13 @@ async function createSession() { notifications: [], accounts: [], }, + 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp': { + methods: ['signMessage'], + notifications: [], + accounts: [ + 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp:CYWSQQ2iiFL6EZzuqvMM9o22CZX3N8PowvvkpBXqLK4e', + ], + }, }; // TODO: Fix snap.request types return await (snap as any).request({ @@ -41,20 +44,6 @@ async function createSession() { }); } -async function invokeMethod( - scope: CaipChainId, - request: Omit, -): Promise { - // TODO: Fix snap.request types - return (await (snap as any).request({ - method: 'wallet_invokeMethod', - params: { - scope, - request, - }, - })) as ReturnType; -} - /** * Get the current chain ID using the `ethereum` global. This is essentially * the same as the `window.ethereum` global, but does not have access to all @@ -84,38 +73,6 @@ async function getAccounts(scope: CaipChainId) { return session.sessionScopes[scope]?.accounts ?? []; } -/** - * Sign a message using the `personal_sign` JSON-RPC method. - * - * @param message - The message to sign as a string. - * @param from - The account to sign the message with as a string. - * @returns A signature for the proposed message and account. - * @throws If the user rejects the prompt. - * @see https://docs.metamask.io/snaps/reference/permissions/#endowmentethereum-provider - * @see https://docs.metamask.io/wallet/concepts/signing-methods/#personal_sign - */ -async function personalSign( - scope: CaipChainId, - message: string, - from: CaipAccountId, -) { - const { namespace } = parseCaipChainId(scope); - assert( - namespace === 'eip155', - 'personal_sign only available for eip155 namespace.', - ); - - const { address } = parseCaipAccountId(from); - - const signature = await invokeMethod(scope, { - method: 'personal_sign', - params: [bytesToHex(stringToBytes(message)), address], - }); - assert(signature, 'Multichain provider did not return a signature.'); - - return signature; -} - /** * Sign a struct using the `eth_signTypedData_v4` JSON-RPC method. * @@ -216,6 +173,21 @@ async function signTypedData( return signature; } +function getModule(scope: CaipChainId) { + const { namespace } = parseCaipChainId(scope); + + switch (namespace) { + case 'eip155': + return new Evm(scope); + + case 'solana': + return new Solana(scope); + + default: + throw new Error(`${namespace} not supported.`); + } +} + /** * Handle incoming JSON-RPC requests from the dapp, sent through the * `wallet_invokeSnap` method. This handler handles six methods: @@ -234,6 +206,8 @@ async function signTypedData( export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { const { scope = 'eip155:1' } = (request.params as BaseParams) ?? {}; + const scopeModule = getModule(scope); + switch (request.method) { case 'createSession': return await createSession(); @@ -244,10 +218,10 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { case 'getAccounts': return await getAccounts(scope); - case 'personalSign': { - const params = request.params as PersonalSignParams; + case 'signMessage': { + const params = request.params as SignMessageParams; const accounts = await getAccounts(scope); - return await personalSign(scope, params.message, accounts[0]); + return await scopeModule.signMessage(accounts[0], params.message); } case 'signTypedData': { diff --git a/packages/examples/packages/multichain-provider/src/modules/base.ts b/packages/examples/packages/multichain-provider/src/modules/base.ts new file mode 100644 index 0000000000..f1e7d556c2 --- /dev/null +++ b/packages/examples/packages/multichain-provider/src/modules/base.ts @@ -0,0 +1,29 @@ +import { + CaipAccountId, + CaipChainId, + Hex, + JsonRpcRequest, +} from '@metamask/utils'; + +export abstract class Module { + scope: CaipChainId; + constructor(scope: CaipChainId) { + this.scope = scope; + } + + abstract signMessage(account: CaipAccountId, message: string): Promise; +} + +export async function invokeMethod( + scope: CaipChainId, + request: Omit, +): Promise { + // TODO: Fix snap.request types + return (await (snap as any).request({ + method: 'wallet_invokeMethod', + params: { + scope, + request, + }, + })) as ReturnType; +} diff --git a/packages/examples/packages/multichain-provider/src/modules/evm.ts b/packages/examples/packages/multichain-provider/src/modules/evm.ts new file mode 100644 index 0000000000..55d1d5ebfa --- /dev/null +++ b/packages/examples/packages/multichain-provider/src/modules/evm.ts @@ -0,0 +1,19 @@ +import { + bytesToHex, + CaipAccountId, + Hex, + parseCaipAccountId, + stringToBytes, +} from '@metamask/utils'; +import { invokeMethod, Module } from './base'; + +export class Evm extends Module { + async signMessage(account: CaipAccountId, message: string): Promise { + const { address } = parseCaipAccountId(account); + + return await invokeMethod(this.scope, { + method: 'personal_sign', + params: [bytesToHex(stringToBytes(message)), address], + }); + } +} diff --git a/packages/examples/packages/multichain-provider/src/modules/sol.ts b/packages/examples/packages/multichain-provider/src/modules/sol.ts new file mode 100644 index 0000000000..8d92061494 --- /dev/null +++ b/packages/examples/packages/multichain-provider/src/modules/sol.ts @@ -0,0 +1,22 @@ +import { + bytesToBase64, + CaipAccountId, + parseCaipAccountId, + stringToBytes, +} from '@metamask/utils'; +import { invokeMethod, Module } from './base'; + +export class Solana extends Module { + async signMessage(account: CaipAccountId, message: string): Promise { + const { address } = parseCaipAccountId(account); + + const bytes = stringToBytes(message); + + const result = await invokeMethod<{ signature: string }>(this.scope, { + method: 'signMessage', + params: { account: { address }, message: bytesToBase64(bytes) }, + }); + + return result.signature; + } +} diff --git a/packages/examples/packages/multichain-provider/src/types.ts b/packages/examples/packages/multichain-provider/src/types.ts index 2538c7114b..219052a709 100644 --- a/packages/examples/packages/multichain-provider/src/types.ts +++ b/packages/examples/packages/multichain-provider/src/types.ts @@ -4,7 +4,7 @@ export type BaseParams = { scope: CaipChainId; }; -export type PersonalSignParams = BaseParams & { +export type SignMessageParams = BaseParams & { message: string; }; diff --git a/packages/test-snaps/src/features/snaps/multichain-provider/MultichainProvider.tsx b/packages/test-snaps/src/features/snaps/multichain-provider/MultichainProvider.tsx index ec4fe9ef9f..273f6a5c11 100644 --- a/packages/test-snaps/src/features/snaps/multichain-provider/MultichainProvider.tsx +++ b/packages/test-snaps/src/features/snaps/multichain-provider/MultichainProvider.tsx @@ -52,34 +52,38 @@ export const MultichainProvider: FunctionComponent = () => { Create Session - - - - {JSON.stringify(data, null, 2)} {JSON.stringify(error, null, 2)} + {scope.startsWith('eip155') && ( + <> + + + + + + + )} - ); }; diff --git a/packages/test-snaps/src/features/snaps/multichain-provider/components/SignMessage.tsx b/packages/test-snaps/src/features/snaps/multichain-provider/components/SignMessage.tsx index f7c011542e..59a4dd9fa4 100644 --- a/packages/test-snaps/src/features/snaps/multichain-provider/components/SignMessage.tsx +++ b/packages/test-snaps/src/features/snaps/multichain-provider/components/SignMessage.tsx @@ -16,9 +16,7 @@ export type SignMessageProps = { scope: CaipChainId; }; -export const SignMessage: FunctionComponent = ({ - scope, -}) => { +export const SignMessage: FunctionComponent = ({ scope }) => { const [message, setMessage] = useState(''); const [invokeSnap, { isLoading, data, error }] = useInvokeMutation(); @@ -34,7 +32,7 @@ export const SignMessage: FunctionComponent = ({ MULTICHAIN_PROVIDER_SNAP_ID, MULTICHAIN_PROVIDER_SNAP_PORT, ), - method: 'personalSign', + method: 'signMessage', params: { message, scope, @@ -52,16 +50,20 @@ export const SignMessage: FunctionComponent = ({ placeholder="Message" value={message} onChange={handleChange} - id="personalSignMessage" + id="signMessageMultichain" className="mb-3" /> - - + {JSON.stringify(data, null, 2)} {JSON.stringify(error, null, 2)} diff --git a/packages/test-snaps/src/features/snaps/multichain-provider/components/SignTypedData.tsx b/packages/test-snaps/src/features/snaps/multichain-provider/components/SignTypedData.tsx index 8987846354..c135b618b9 100644 --- a/packages/test-snaps/src/features/snaps/multichain-provider/components/SignTypedData.tsx +++ b/packages/test-snaps/src/features/snaps/multichain-provider/components/SignTypedData.tsx @@ -30,7 +30,10 @@ export const SignTypedData: FunctionComponent = ({ event.preventDefault(); invokeSnap({ - snapId: getSnapId(MULTICHAIN_PROVIDER_SNAP_ID, MULTICHAIN_PROVIDER_SNAP_PORT), + snapId: getSnapId( + MULTICHAIN_PROVIDER_SNAP_ID, + MULTICHAIN_PROVIDER_SNAP_PORT, + ), method: 'signTypedData', params: { message, @@ -49,16 +52,20 @@ export const SignTypedData: FunctionComponent = ({ placeholder="Message" value={message} onChange={handleChange} - id="signTypedData" + id="signTypedDataMultichain" className="mb-3" /> - - + {JSON.stringify(data, null, 2)} {JSON.stringify(error, null, 2)} diff --git a/packages/test-snaps/src/features/snaps/multichain-provider/components/SwitchChain.tsx b/packages/test-snaps/src/features/snaps/multichain-provider/components/SwitchChain.tsx index b83bac6d58..08b5e219f2 100644 --- a/packages/test-snaps/src/features/snaps/multichain-provider/components/SwitchChain.tsx +++ b/packages/test-snaps/src/features/snaps/multichain-provider/components/SwitchChain.tsx @@ -23,7 +23,6 @@ export const SwitchChain: FunctionComponent = ({ - From 3fc8cb39c957f11a659d7455046ece5d963067ca Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Tue, 2 Dec 2025 14:32:22 +0100 Subject: [PATCH 04/24] Restructure example --- .../multichain-provider/snap.manifest.json | 2 +- .../multichain-provider/src/index.test.ts | 39 +---- .../packages/multichain-provider/src/index.ts | 140 +----------------- .../multichain-provider/src/modules/base.ts | 17 ++- .../multichain-provider/src/modules/evm.ts | 82 ++++++++++ .../multichain-provider/src/modules/sol.ts | 5 + 6 files changed, 107 insertions(+), 178 deletions(-) diff --git a/packages/examples/packages/multichain-provider/snap.manifest.json b/packages/examples/packages/multichain-provider/snap.manifest.json index 5eae465e21..ec9dd3ce1d 100644 --- a/packages/examples/packages/multichain-provider/snap.manifest.json +++ b/packages/examples/packages/multichain-provider/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "enLq+2n+VbAequXWrxX4SyxISNxqBIc01ibXNQbjlKg=", + "shasum": "8moi/4aXzVCQqXY7V33rT1LAz1eW07sKq4b4TGEzOyg=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/multichain-provider/src/index.test.ts b/packages/examples/packages/multichain-provider/src/index.test.ts index e60536c7ac..8e64d9b6eb 100644 --- a/packages/examples/packages/multichain-provider/src/index.test.ts +++ b/packages/examples/packages/multichain-provider/src/index.test.ts @@ -20,41 +20,6 @@ describe('onRpcRequest', () => { }); }); - describe('getGasPrice', () => { - const MOCK_GAS_PRICE = '0x387c64b64'; - - it('returns the current gas price', async () => { - const { request, mockJsonRpc } = await installSnap(); - - // To avoid relying on the network, we mock the response from the Ethereum - // provider. - mockJsonRpc({ - method: 'eth_gasPrice', - result: MOCK_GAS_PRICE, - }); - - const response = await request({ - method: 'getGasPrice', - }); - - expect(response).toRespondWith(MOCK_GAS_PRICE); - }); - }); - - describe('getVersion', () => { - const MOCK_VERSION = '1'; // Ethereum Mainnet - - it('returns the current network version', async () => { - const { request } = await installSnap(); - - const response = await request({ - method: 'getVersion', - }); - - expect(response).toRespondWith(MOCK_VERSION); - }); - }); - describe('getChainId', () => { const MOCK_CHAIN_ID = '0x01'; // Ethereum Mainnet @@ -84,7 +49,7 @@ describe('onRpcRequest', () => { }); }); - describe('personalSign', () => { + describe('signMessage', () => { const MOCK_SIGNATURE = '0x16f672a12220dc4d9e27671ef580cfc1397a9a4d5ee19eadea46c0f350b2f72a4922be7c1f16ed9b03ef1d3351eac469e33accf5a36194b1d88923701c2b163f1b'; @@ -98,7 +63,7 @@ describe('onRpcRequest', () => { }); const response = await request({ - method: 'personalSign', + method: 'signMessage', params: { message: 'foo' }, }); diff --git a/packages/examples/packages/multichain-provider/src/index.ts b/packages/examples/packages/multichain-provider/src/index.ts index f9dffb1255..638389f6f9 100644 --- a/packages/examples/packages/multichain-provider/src/index.ts +++ b/packages/examples/packages/multichain-provider/src/index.ts @@ -2,13 +2,8 @@ import { MethodNotFoundError, type OnRpcRequestHandler, } from '@metamask/snaps-sdk'; -import type { CaipAccountId, CaipChainId, Hex } from '@metamask/utils'; -import { - assert, - hexToNumber, - parseCaipChainId, - parseCaipAccountId, -} from '@metamask/utils'; +import type { CaipChainId } from '@metamask/utils'; +import { parseCaipChainId } from '@metamask/utils'; import type { BaseParams, @@ -30,9 +25,7 @@ async function createSession() { 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp': { methods: ['signMessage'], notifications: [], - accounts: [ - 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp:CYWSQQ2iiFL6EZzuqvMM9o22CZX3N8PowvvkpBXqLK4e', - ], + accounts: [], }, }; // TODO: Fix snap.request types @@ -44,27 +37,6 @@ async function createSession() { }); } -/** - * Get the current chain ID using the `ethereum` global. This is essentially - * the same as the `window.ethereum` global, but does not have access to all - * methods. - * - * Note that using the `ethereum` global requires the - * `endowment:ethereum-provider` permission. - * - * @returns The current chain ID as a string. - * @see https://docs.metamask.io/snaps/reference/permissions/#endowmentethereum-provider - */ -async function getChainId(scope: CaipChainId) { - const chainId = await invokeMethod(scope, { - method: 'eth_chainId', - }); - - assert(chainId, 'Multichain provider did not return a chain ID.'); - - return chainId; -} - async function getAccounts(scope: CaipChainId) { const session = await await (snap as any).request({ method: 'wallet_getSession', @@ -73,106 +45,6 @@ async function getAccounts(scope: CaipChainId) { return session.sessionScopes[scope]?.accounts ?? []; } -/** - * Sign a struct using the `eth_signTypedData_v4` JSON-RPC method. - * - * This uses the Ether Mail struct for example purposes. - * - * @param message - The message include in Ether Mail a string. - * @param from - The account to sign the message with as a string. - * @returns A signature for the struct and account. - * @throws If the user rejects the prompt. - * @see https://docs.metamask.io/snaps/reference/permissions/#endowmentethereum-provider - * @see https://docs.metamask.io/wallet/concepts/signing-methods/#eth_signtypeddata_v4 - */ -async function signTypedData( - scope: CaipChainId, - message: string, - from: CaipAccountId, -) { - const { namespace, reference } = parseCaipChainId(scope); - assert( - namespace === 'eip155', - 'eth_signTypedData_v4 only available for eip155 namespace.', - ); - - const { address } = parseCaipAccountId(from); - - const signature = await invokeMethod(scope, { - method: 'eth_signTypedData_v4', - params: [ - address, - { - types: { - EIP712Domain: [ - { - name: 'name', - type: 'string', - }, - { - name: 'version', - type: 'string', - }, - { - name: 'chainId', - type: 'uint256', - }, - { - name: 'verifyingContract', - type: 'address', - }, - ], - Person: [ - { - name: 'name', - type: 'string', - }, - { - name: 'wallet', - type: 'address', - }, - ], - Mail: [ - { - name: 'from', - type: 'Person', - }, - { - name: 'to', - type: 'Person', - }, - { - name: 'contents', - type: 'string', - }, - ], - }, - primaryType: 'Mail', - domain: { - name: 'Ether Mail', - version: '1', - chainId: hexToNumber(reference), - verifyingContract: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC', - }, - message: { - from: { - name: 'Snap', - wallet: address, - }, - to: { - name: 'Bob', - wallet: '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB', - }, - contents: message, - }, - }, - ], - }); - assert(signature, 'Multichain provider did not return a signature.'); - - return signature; -} - function getModule(scope: CaipChainId) { const { namespace } = parseCaipChainId(scope); @@ -213,7 +85,9 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { return await createSession(); case 'getChainId': - return await getChainId(scope); + return await invokeMethod(scope, { + method: 'eth_chainId', + }); case 'getAccounts': return await getAccounts(scope); @@ -227,7 +101,7 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { case 'signTypedData': { const params = request.params as SignTypedDataParams; const accounts = await getAccounts(scope); - return await signTypedData(scope, params.message, accounts[0]); + return await scopeModule.signMessage(accounts[0], params.message); } default: diff --git a/packages/examples/packages/multichain-provider/src/modules/base.ts b/packages/examples/packages/multichain-provider/src/modules/base.ts index f1e7d556c2..a833dea299 100644 --- a/packages/examples/packages/multichain-provider/src/modules/base.ts +++ b/packages/examples/packages/multichain-provider/src/modules/base.ts @@ -1,9 +1,4 @@ -import { - CaipAccountId, - CaipChainId, - Hex, - JsonRpcRequest, -} from '@metamask/utils'; +import { CaipAccountId, CaipChainId, JsonRpcRequest } from '@metamask/utils'; export abstract class Module { scope: CaipChainId; @@ -11,7 +6,15 @@ export abstract class Module { this.scope = scope; } - abstract signMessage(account: CaipAccountId, message: string): Promise; + abstract signMessage( + account: CaipAccountId, + message: string, + ): Promise; + + abstract signTypedData( + account: CaipAccountId, + message: string, + ): Promise; } export async function invokeMethod( diff --git a/packages/examples/packages/multichain-provider/src/modules/evm.ts b/packages/examples/packages/multichain-provider/src/modules/evm.ts index 55d1d5ebfa..1a1b476b18 100644 --- a/packages/examples/packages/multichain-provider/src/modules/evm.ts +++ b/packages/examples/packages/multichain-provider/src/modules/evm.ts @@ -2,6 +2,7 @@ import { bytesToHex, CaipAccountId, Hex, + hexToNumber, parseCaipAccountId, stringToBytes, } from '@metamask/utils'; @@ -16,4 +17,85 @@ export class Evm extends Module { params: [bytesToHex(stringToBytes(message)), address], }); } + + async signTypedData( + account: CaipAccountId, + message: string, + ): Promise { + const { + chain: { reference }, + address, + } = parseCaipAccountId(account); + + return await invokeMethod(this.scope, { + method: 'eth_signTypedData_v4', + params: [ + address, + { + types: { + EIP712Domain: [ + { + name: 'name', + type: 'string', + }, + { + name: 'version', + type: 'string', + }, + { + name: 'chainId', + type: 'uint256', + }, + { + name: 'verifyingContract', + type: 'address', + }, + ], + Person: [ + { + name: 'name', + type: 'string', + }, + { + name: 'wallet', + type: 'address', + }, + ], + Mail: [ + { + name: 'from', + type: 'Person', + }, + { + name: 'to', + type: 'Person', + }, + { + name: 'contents', + type: 'string', + }, + ], + }, + primaryType: 'Mail', + domain: { + name: 'Ether Mail', + version: '1', + chainId: hexToNumber(reference), + verifyingContract: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC', + }, + message: { + from: { + name: 'Snap', + wallet: address, + }, + to: { + name: 'Bob', + wallet: '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB', + }, + contents: message, + }, + }, + ], + }); + } } diff --git a/packages/examples/packages/multichain-provider/src/modules/sol.ts b/packages/examples/packages/multichain-provider/src/modules/sol.ts index 8d92061494..73b1f7c443 100644 --- a/packages/examples/packages/multichain-provider/src/modules/sol.ts +++ b/packages/examples/packages/multichain-provider/src/modules/sol.ts @@ -5,6 +5,7 @@ import { stringToBytes, } from '@metamask/utils'; import { invokeMethod, Module } from './base'; +import { MethodNotSupportedError } from '@metamask/snaps-sdk'; export class Solana extends Module { async signMessage(account: CaipAccountId, message: string): Promise { @@ -19,4 +20,8 @@ export class Solana extends Module { return result.signature; } + + signTypedData(_account: CaipAccountId, _message: string): Promise { + throw new MethodNotSupportedError(); + } } From d86deabb73a9f5f77f7a1351ec9c8e85a492f6e8 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Wed, 3 Dec 2025 10:16:55 +0100 Subject: [PATCH 05/24] Add permission boilerplate --- .../snaps-rpc-methods/src/endowments/enum.ts | 1 + .../snaps-rpc-methods/src/endowments/index.ts | 3 ++ .../endowments/multichain-provider.test.ts | 20 +++++++++ .../src/endowments/multichain-provider.ts | 44 +++++++++++++++++++ 4 files changed, 68 insertions(+) create mode 100644 packages/snaps-rpc-methods/src/endowments/multichain-provider.test.ts create mode 100644 packages/snaps-rpc-methods/src/endowments/multichain-provider.ts diff --git a/packages/snaps-rpc-methods/src/endowments/enum.ts b/packages/snaps-rpc-methods/src/endowments/enum.ts index e3f24b4de5..fa8c695d6e 100644 --- a/packages/snaps-rpc-methods/src/endowments/enum.ts +++ b/packages/snaps-rpc-methods/src/endowments/enum.ts @@ -4,6 +4,7 @@ export enum SnapEndowments { TransactionInsight = 'endowment:transaction-insight', Cronjob = 'endowment:cronjob', EthereumProvider = 'endowment:ethereum-provider', + MultichainProvider = 'endowment:multichain-provider', Rpc = 'endowment:rpc', WebAssemblyAccess = 'endowment:webassembly', NameLookup = 'endowment:name-lookup', diff --git a/packages/snaps-rpc-methods/src/endowments/index.ts b/packages/snaps-rpc-methods/src/endowments/index.ts index 91bc010ce3..f170b96bfb 100644 --- a/packages/snaps-rpc-methods/src/endowments/index.ts +++ b/packages/snaps-rpc-methods/src/endowments/index.ts @@ -21,6 +21,7 @@ import { keyringEndowmentBuilder, } from './keyring'; import { lifecycleHooksEndowmentBuilder } from './lifecycle-hooks'; +import { multichainProviderEndowmentBuilder } from './multichain-provider'; import { getNameLookupCaveatMapper, nameLookupCaveatSpecifications, @@ -57,6 +58,8 @@ export const endowmentPermissionBuilders = { [cronjobEndowmentBuilder.targetName]: cronjobEndowmentBuilder, [ethereumProviderEndowmentBuilder.targetName]: ethereumProviderEndowmentBuilder, + [multichainProviderEndowmentBuilder.targetName]: + multichainProviderEndowmentBuilder, [rpcEndowmentBuilder.targetName]: rpcEndowmentBuilder, [webAssemblyEndowmentBuilder.targetName]: webAssemblyEndowmentBuilder, [nameLookupEndowmentBuilder.targetName]: nameLookupEndowmentBuilder, diff --git a/packages/snaps-rpc-methods/src/endowments/multichain-provider.test.ts b/packages/snaps-rpc-methods/src/endowments/multichain-provider.test.ts new file mode 100644 index 0000000000..a0fb610401 --- /dev/null +++ b/packages/snaps-rpc-methods/src/endowments/multichain-provider.test.ts @@ -0,0 +1,20 @@ +import { PermissionType, SubjectType } from '@metamask/permission-controller'; + +import { SnapEndowments } from './enum'; +import { multichainProviderEndowmentBuilder } from './multichain-provider'; + +describe('endowment:multichain-provider', () => { + it('builds the expected permission specification', () => { + const specification = + multichainProviderEndowmentBuilder.specificationBuilder({}); + expect(specification).toStrictEqual({ + permissionType: PermissionType.Endowment, + targetName: SnapEndowments.MultichainProvider, + endowmentGetter: expect.any(Function), + allowedCaveats: null, + subjectTypes: [SubjectType.Snap], + }); + + expect(specification.endowmentGetter()).toBeNull(); + }); +}); diff --git a/packages/snaps-rpc-methods/src/endowments/multichain-provider.ts b/packages/snaps-rpc-methods/src/endowments/multichain-provider.ts new file mode 100644 index 0000000000..924777d2c5 --- /dev/null +++ b/packages/snaps-rpc-methods/src/endowments/multichain-provider.ts @@ -0,0 +1,44 @@ +import type { + EndowmentGetterParams, + PermissionSpecificationBuilder, + ValidPermissionSpecification, +} from '@metamask/permission-controller'; +import { PermissionType, SubjectType } from '@metamask/permission-controller'; + +import { SnapEndowments } from './enum'; + +const permissionName = SnapEndowments.MultichainProvider; + +type MultichainProviderEndowmentSpecification = ValidPermissionSpecification<{ + permissionType: PermissionType.Endowment; + targetName: typeof permissionName; + endowmentGetter: (_options?: EndowmentGetterParams) => null; + allowedCaveats: null; +}>; + +/** + * `endowment:multichain-provider` returns nothing; it is intended to be used as a + * flag by the Snaps Platform to detect whether a Snap has the capability to + * use the multichain API. + * + * @param _builderOptions - Optional specification builder options. + * @returns The specification for the network endowment. + */ +const specificationBuilder: PermissionSpecificationBuilder< + PermissionType.Endowment, + any, + MultichainProviderEndowmentSpecification +> = (_builderOptions?: any) => { + return { + permissionType: PermissionType.Endowment, + targetName: permissionName, + allowedCaveats: null, + endowmentGetter: (_getterOptions?: EndowmentGetterParams) => null, + subjectTypes: [SubjectType.Snap], + }; +}; + +export const multichainProviderEndowmentBuilder = Object.freeze({ + targetName: permissionName, + specificationBuilder, +} as const); From 18231d07460d39aa3ef9b1ed08c9373a7237e1fb Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Wed, 3 Dec 2025 10:24:07 +0100 Subject: [PATCH 06/24] Add execution env test --- .../common/BaseSnapExecutor.test.browser.ts | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) 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 a0b358791b..ce7982380b 100644 --- a/packages/snaps-execution-environments/src/common/BaseSnapExecutor.test.browser.ts +++ b/packages/snaps-execution-environments/src/common/BaseSnapExecutor.test.browser.ts @@ -612,6 +612,65 @@ describe('BaseSnapExecutor', () => { }); }); + it('supports the multichain API using the snap global', async () => { + const CODE = ` + module.exports.onRpcRequest = () => snap.request({ method: 'wallet_invokeMethod', params: { scope: 'eip155:1', request: { method: 'eth_chainId' } } }); + `; + + const executor = new TestSnapExecutor(); + await executor.executeSnap(1, MOCK_SNAP_ID, CODE, []); + + expect(await executor.readCommand()).toStrictEqual({ + jsonrpc: '2.0', + id: 1, + result: 'OK', + }); + + await executor.writeCommand({ + jsonrpc: '2.0', + id: 2, + method: 'snapRpc', + params: [ + MOCK_SNAP_ID, + HandlerType.OnRpcRequest, + MOCK_ORIGIN, + { jsonrpc: '2.0', method: '', params: [] }, + ], + }); + + const multichainRequest = await executor.readRpc(); + expect(multichainRequest).toStrictEqual({ + name: 'metamask-multichain-provider', + data: { + id: expect.any(Number), + jsonrpc: '2.0', + method: 'wallet_invokeMethod', + params: { + scope: 'eip155:1', + request: { + method: 'eth_chainId', + }, + }, + }, + }); + + await executor.writeRpc({ + name: 'metamask-multichain-provider', + data: { + jsonrpc: '2.0', + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + id: multichainRequest.data.id!, + result: '0x1', + }, + }); + + expect(await executor.readCommand()).toStrictEqual({ + id: 2, + jsonrpc: '2.0', + result: '0x1', + }); + }); + it('sanitizes JSON before checking for blocked methods using snap global', async () => { const CODE = ` const badToJSON = () => { From 49cffe8b6f6748a7d6cd8771a2048cb5e86cf9fc Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Wed, 3 Dec 2025 10:31:02 +0100 Subject: [PATCH 07/24] Update snapshots --- packages/snaps-rpc-methods/src/permissions.test.ts | 9 +++++++++ .../snaps-simulation/src/methods/specifications.test.ts | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/packages/snaps-rpc-methods/src/permissions.test.ts b/packages/snaps-rpc-methods/src/permissions.test.ts index ba39525e4d..4064e3ffdf 100644 --- a/packages/snaps-rpc-methods/src/permissions.test.ts +++ b/packages/snaps-rpc-methods/src/permissions.test.ts @@ -63,6 +63,15 @@ describe('buildSnapEndowmentSpecifications', () => { ], "targetName": "endowment:lifecycle-hooks", }, + "endowment:multichain-provider": { + "allowedCaveats": null, + "endowmentGetter": [Function], + "permissionType": "Endowment", + "subjectTypes": [ + "snap", + ], + "targetName": "endowment:multichain-provider", + }, "endowment:name-lookup": { "allowedCaveats": [ "chainIds", diff --git a/packages/snaps-simulation/src/methods/specifications.test.ts b/packages/snaps-simulation/src/methods/specifications.test.ts index 8881eab17a..1c66594739 100644 --- a/packages/snaps-simulation/src/methods/specifications.test.ts +++ b/packages/snaps-simulation/src/methods/specifications.test.ts @@ -104,6 +104,15 @@ describe('getPermissionSpecifications', () => { ], "targetName": "endowment:lifecycle-hooks", }, + "endowment:multichain-provider": { + "allowedCaveats": null, + "endowmentGetter": [Function], + "permissionType": "Endowment", + "subjectTypes": [ + "snap", + ], + "targetName": "endowment:multichain-provider", + }, "endowment:name-lookup": { "allowedCaveats": [ "chainIds", From 945b8cff61774ff9c603494815756af2ec753779 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Wed, 3 Dec 2025 14:07:15 +0100 Subject: [PATCH 08/24] Fix lint --- .../packages/multichain-provider/snap.manifest.json | 5 +++-- .../examples/packages/multichain-provider/src/index.ts | 4 +--- .../packages/multichain-provider/src/modules/base.ts | 7 ++++++- .../packages/multichain-provider/src/modules/evm.ts | 4 ++-- .../packages/multichain-provider/src/modules/index.ts | 3 +++ .../packages/multichain-provider/src/modules/sol.ts | 10 +++++++--- 6 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 packages/examples/packages/multichain-provider/src/modules/index.ts diff --git a/packages/examples/packages/multichain-provider/snap.manifest.json b/packages/examples/packages/multichain-provider/snap.manifest.json index ec9dd3ce1d..f07977b4b4 100644 --- a/packages/examples/packages/multichain-provider/snap.manifest.json +++ b/packages/examples/packages/multichain-provider/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "8moi/4aXzVCQqXY7V33rT1LAz1eW07sKq4b4TGEzOyg=", + "shasum": "RyR1kz1QopXlnxzsiEeZ701kfshofBBz30eYJu7MOdQ=", "location": { "npm": { "filePath": "dist/bundle.js", @@ -19,7 +19,8 @@ "initialPermissions": { "endowment:rpc": { "dapps": true - } + }, + "endowment:multichain-provider": {} }, "platformVersion": "10.1.0", "manifestVersion": "0.1" diff --git a/packages/examples/packages/multichain-provider/src/index.ts b/packages/examples/packages/multichain-provider/src/index.ts index 638389f6f9..7334a8b11c 100644 --- a/packages/examples/packages/multichain-provider/src/index.ts +++ b/packages/examples/packages/multichain-provider/src/index.ts @@ -5,14 +5,12 @@ import { import type { CaipChainId } from '@metamask/utils'; import { parseCaipChainId } from '@metamask/utils'; +import { invokeMethod, Evm, Solana } from './modules'; import type { BaseParams, SignMessageParams, SignTypedDataParams, } from './types'; -import { invokeMethod } from './modules/base'; -import { Evm } from './modules/evm'; -import { Solana } from './modules/sol'; // TODO: Consider letting the permission create the "session" async function createSession() { diff --git a/packages/examples/packages/multichain-provider/src/modules/base.ts b/packages/examples/packages/multichain-provider/src/modules/base.ts index a833dea299..38c2c989bc 100644 --- a/packages/examples/packages/multichain-provider/src/modules/base.ts +++ b/packages/examples/packages/multichain-provider/src/modules/base.ts @@ -1,7 +1,12 @@ -import { CaipAccountId, CaipChainId, JsonRpcRequest } from '@metamask/utils'; +import type { + CaipAccountId, + CaipChainId, + JsonRpcRequest, +} from '@metamask/utils'; export abstract class Module { scope: CaipChainId; + constructor(scope: CaipChainId) { this.scope = scope; } diff --git a/packages/examples/packages/multichain-provider/src/modules/evm.ts b/packages/examples/packages/multichain-provider/src/modules/evm.ts index 1a1b476b18..12d365ab6e 100644 --- a/packages/examples/packages/multichain-provider/src/modules/evm.ts +++ b/packages/examples/packages/multichain-provider/src/modules/evm.ts @@ -1,11 +1,11 @@ +import type { CaipAccountId, Hex } from '@metamask/utils'; import { bytesToHex, - CaipAccountId, - Hex, hexToNumber, parseCaipAccountId, stringToBytes, } from '@metamask/utils'; + import { invokeMethod, Module } from './base'; export class Evm extends Module { diff --git a/packages/examples/packages/multichain-provider/src/modules/index.ts b/packages/examples/packages/multichain-provider/src/modules/index.ts new file mode 100644 index 0000000000..2c78cb4762 --- /dev/null +++ b/packages/examples/packages/multichain-provider/src/modules/index.ts @@ -0,0 +1,3 @@ +export * from './base'; +export * from './evm'; +export * from './sol'; \ No newline at end of file diff --git a/packages/examples/packages/multichain-provider/src/modules/sol.ts b/packages/examples/packages/multichain-provider/src/modules/sol.ts index 73b1f7c443..5d164e98d7 100644 --- a/packages/examples/packages/multichain-provider/src/modules/sol.ts +++ b/packages/examples/packages/multichain-provider/src/modules/sol.ts @@ -1,11 +1,12 @@ +import { MethodNotSupportedError } from '@metamask/snaps-sdk'; +import type { CaipAccountId } from '@metamask/utils'; import { bytesToBase64, - CaipAccountId, parseCaipAccountId, stringToBytes, } from '@metamask/utils'; + import { invokeMethod, Module } from './base'; -import { MethodNotSupportedError } from '@metamask/snaps-sdk'; export class Solana extends Module { async signMessage(account: CaipAccountId, message: string): Promise { @@ -21,7 +22,10 @@ export class Solana extends Module { return result.signature; } - signTypedData(_account: CaipAccountId, _message: string): Promise { + async signTypedData( + _account: CaipAccountId, + _message: string, + ): Promise { throw new MethodNotSupportedError(); } } From 2b6213de37803bf4ba67b8f4eb6166e64a92d126 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Mon, 8 Dec 2025 10:52:01 +0100 Subject: [PATCH 09/24] wip: Partial simulation support --- .../snaps-simulation/src/middleware/engine.ts | 6 +++ .../middleware/internal-methods/middleware.ts | 4 +- .../multichain/get-session.ts | 22 ++++++++ .../internal-methods/multichain/index.ts | 1 + .../src/middleware/multichain.ts | 24 +++++++++ packages/snaps-simulation/src/simulation.ts | 54 ++++++++++++++----- 6 files changed, 96 insertions(+), 15 deletions(-) create mode 100644 packages/snaps-simulation/src/middleware/internal-methods/multichain/get-session.ts create mode 100644 packages/snaps-simulation/src/middleware/internal-methods/multichain/index.ts create mode 100644 packages/snaps-simulation/src/middleware/multichain.ts diff --git a/packages/snaps-simulation/src/middleware/engine.ts b/packages/snaps-simulation/src/middleware/engine.ts index 1ccfcfb1c9..0b93e37d93 100644 --- a/packages/snaps-simulation/src/middleware/engine.ts +++ b/packages/snaps-simulation/src/middleware/engine.ts @@ -12,6 +12,7 @@ import type { RestrictedMiddlewareHooks, } from '../simulation'; import type { Store } from '../store'; +import { createMultichainMiddleware } from './multichain'; export type CreateJsonRpcEngineOptions = { store: Store; @@ -19,6 +20,7 @@ export type CreateJsonRpcEngineOptions = { permittedHooks: PermittedMiddlewareHooks; permissionMiddleware: JsonRpcMiddleware; endpoint?: string; + isMultichain: boolean; }; /** @@ -32,6 +34,7 @@ export type CreateJsonRpcEngineOptions = { * @param options.restrictedHooks - Any hooks used by the middleware handlers. * @param options.permittedHooks - Any hooks used by the middleware handlers. * @param options.permissionMiddleware - The permission middleware to use. + * @param options.isMultichain - Whether the engine is used for multichain. * @returns A JSON-RPC engine. */ export function createJsonRpcEngine({ @@ -39,10 +42,13 @@ export function createJsonRpcEngine({ restrictedHooks, permittedHooks, permissionMiddleware, + isMultichain, }: CreateJsonRpcEngineOptions) { const engine = new JsonRpcEngine(); engine.push(createMockMiddleware(store)); + engine.push(createMultichainMiddleware(isMultichain)); + // The hooks here do not match the hooks used by the clients, so this // middleware should not be used outside of the simulation environment. engine.push(createInternalMethodsMiddleware(restrictedHooks)); diff --git a/packages/snaps-simulation/src/middleware/internal-methods/middleware.ts b/packages/snaps-simulation/src/middleware/internal-methods/middleware.ts index 69b8732db7..591a663fa9 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/middleware.ts +++ b/packages/snaps-simulation/src/middleware/internal-methods/middleware.ts @@ -7,6 +7,7 @@ import { getChainIdHandler } from './chain-id'; import { getNetworkVersionHandler } from './net-version'; import { getSwitchEthereumChainHandler } from './switch-ethereum-chain'; import type { ApplicationState } from '../../store'; +import { getSessionHandler } from './multichain'; export type InternalMethodsMiddlewareHooks = { /** @@ -38,6 +39,7 @@ const methodHandlers = { eth_chainId: getChainIdHandler, net_version: getNetworkVersionHandler, wallet_switchEthereumChain: getSwitchEthereumChainHandler, + wallet_getSession: getSessionHandler, /* eslint-enable @typescript-eslint/naming-convention */ }; @@ -63,7 +65,7 @@ export function createInternalMethodsMiddleware( if (handler) { try { // Implementations may or may not be async, so we must await them. - return await handler(request, response, next, end, hooks); + return await handler(request as any, response as any, next, end, hooks as any); } catch (error: any) { logError(error); return end(error); diff --git a/packages/snaps-simulation/src/middleware/internal-methods/multichain/get-session.ts b/packages/snaps-simulation/src/middleware/internal-methods/multichain/get-session.ts new file mode 100644 index 0000000000..9ce3fe051d --- /dev/null +++ b/packages/snaps-simulation/src/middleware/internal-methods/multichain/get-session.ts @@ -0,0 +1,22 @@ +import type { + JsonRpcEngineEndCallback, + JsonRpcEngineNextCallback, +} from '@metamask/json-rpc-engine'; +import { Caveat } from '@metamask/permission-controller'; +import type { Json, JsonRpcRequest, PendingJsonRpcResponse } from '@metamask/utils'; + +export type GetSessionHandlerHooks = { + getCaveat: (permission: string, caveatType: string) => Caveat; +}; + +export async function getSessionHandler( + _request: JsonRpcRequest, + response: PendingJsonRpcResponse, + _next: JsonRpcEngineNextCallback, + end: JsonRpcEngineEndCallback, + hooks: GetSessionHandlerHooks, +) { + + response.result = hooks.getCaveat('endowment:caip25', "authorizedScopes"); + return end(); +} diff --git a/packages/snaps-simulation/src/middleware/internal-methods/multichain/index.ts b/packages/snaps-simulation/src/middleware/internal-methods/multichain/index.ts new file mode 100644 index 0000000000..107f4cc3b1 --- /dev/null +++ b/packages/snaps-simulation/src/middleware/internal-methods/multichain/index.ts @@ -0,0 +1 @@ +export * from './get-session'; diff --git a/packages/snaps-simulation/src/middleware/multichain.ts b/packages/snaps-simulation/src/middleware/multichain.ts new file mode 100644 index 0000000000..c842a63aa7 --- /dev/null +++ b/packages/snaps-simulation/src/middleware/multichain.ts @@ -0,0 +1,24 @@ +import { createAsyncMiddleware, JsonRpcMiddleware } from "@metamask/json-rpc-engine"; +import { Json, JsonRpcParams } from "@metamask/utils"; +import { rpcErrors } from '@metamask/rpc-errors'; + +export function createMultichainMiddleware(isMultichain: boolean): JsonRpcMiddleware { + return createAsyncMiddleware(async (request, response, next) => { + const isMultichainRequest = [ + 'wallet_createSession', + 'wallet_invokeMethod', + 'wallet_getSession', + 'wallet_revokeSession', +].includes(request.method); + +if (!isMultichain && isMultichainRequest) { + throw rpcErrors.methodNotFound(); +} + +if (isMultichain && !isMultichainRequest) { + throw rpcErrors.methodNotFound(); +} + + await next(); + }); +} \ No newline at end of file diff --git a/packages/snaps-simulation/src/simulation.ts b/packages/snaps-simulation/src/simulation.ts index 5a95ec994f..21ba8035c1 100644 --- a/packages/snaps-simulation/src/simulation.ts +++ b/packages/snaps-simulation/src/simulation.ts @@ -68,6 +68,7 @@ import type { } from './store'; import { createStore, getCurrentInterface } from './store'; import { addSnapMetadataToAccount } from './utils/account'; +import { Caveat } from '@metamask/permission-controller'; /** * Options for the execution service, without the options that are shared @@ -99,16 +100,16 @@ export type InstallSnapOptions< ) => InstanceType>, > = ExecutionServiceOptions extends Record - ? { - executionService: Service; - executionServiceOptions?: ExecutionServiceOptions; - options?: SimulationUserOptions; - } - : { - executionService: Service; - executionServiceOptions: ExecutionServiceOptions; - options?: SimulationUserOptions; - }; + ? { + executionService: Service; + executionServiceOptions?: ExecutionServiceOptions; + options?: SimulationUserOptions; + } + : { + executionService: Service; + executionServiceOptions: ExecutionServiceOptions; + options?: SimulationUserOptions; + }; export type InstalledSnap = { snapId: SnapId; @@ -175,6 +176,7 @@ export type RestrictedMiddlewareHooks = { * @returns The simulation state. */ getSimulationState: () => ApplicationState; + getCaveat: (permission: string, caveatType: string) => Caveat; }; export type PermittedMiddlewareHooks = { @@ -393,7 +395,7 @@ export async function installSnap< registerActions(controllerMessenger, runSaga, options, snapId); // Set up controllers and JSON-RPC stack. - const restrictedHooks = getRestrictedHooks(options, store, runSaga); + const restrictedHooks = getRestrictedHooks(snapId, options, controllerMessenger); const permittedHooks = getPermittedHooks( snapId, snapFiles, @@ -408,13 +410,24 @@ export async function installSnap< options, }); + const permissionMiddleware = permissionController.createPermissionMiddleware({ + origin: snapId, + }); + const engine = createJsonRpcEngine({ store, restrictedHooks, permittedHooks, - permissionMiddleware: permissionController.createPermissionMiddleware({ - origin: snapId, - }), + permissionMiddleware, + isMultichain: false, + }); + + const multichainEngine = createJsonRpcEngine({ + store, + restrictedHooks, + permittedHooks, + permissionMiddleware, + isMultichain: true, }); // Create execution service. @@ -437,6 +450,16 @@ export async function installSnap< logError(`Provider stream failure.`, error); } }); + + const multichainStream = mux.createStream('metamask-multichain-provider'); + const multichainProviderStream = createEngineStream({ engine: multichainEngine }); + + /* istanbul ignore next 2 */ + pipeline(multichainStream, multichainProviderStream, multichainStream, (error) => { + if (error && !error.message?.match('Premature close')) { + logError(`Provider stream failure.`, error); + } + }); }, }); @@ -482,9 +505,11 @@ export async function installSnap< * @returns The hooks for the simulation. */ export function getRestrictedHooks( + snapId: SnapId, options: SimulationOptions, store: Store, runSaga: RunSagaFunction, + controllerMessenger: RootControllerMessenger, ): RestrictedMiddlewareHooks { return { getMnemonic: getGetMnemonicImplementation(options.secretRecoveryPhrase), @@ -496,6 +521,7 @@ export function getRestrictedHooks( getSnap: getGetSnapImplementation(true), setCurrentChain: getSetCurrentChainImplementation(runSaga), getSimulationState: store.getState.bind(store), + getCaveat: (permission: string, caveatType: string) => controllerMessenger.call('PermissionController:getCaveat', snapId, permission, caveatType), }; } From f58134cbf6bc83bcc882add8daa7751158f9b846 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Mon, 5 Jan 2026 16:36:33 +0100 Subject: [PATCH 10/24] Tweak version --- packages/examples/packages/multichain-provider/package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/examples/packages/multichain-provider/package.json b/packages/examples/packages/multichain-provider/package.json index 6fae95b0d2..12a6fd16f8 100644 --- a/packages/examples/packages/multichain-provider/package.json +++ b/packages/examples/packages/multichain-provider/package.json @@ -48,7 +48,7 @@ }, "devDependencies": { "@jest/globals": "^29.5.0", - "@lavamoat/allow-scripts": "^3.4.0", + "@lavamoat/allow-scripts": "^3.4.1", "@metamask/auto-changelog": "^5.0.2", "@metamask/snaps-cli": "workspace:^", "@metamask/snaps-jest": "workspace:^", diff --git a/yarn.lock b/yarn.lock index 48b3ef262d..b76faa37d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3763,7 +3763,7 @@ __metadata: resolution: "@metamask/multichain-provider-example-snap@workspace:packages/examples/packages/multichain-provider" dependencies: "@jest/globals": "npm:^29.5.0" - "@lavamoat/allow-scripts": "npm:^3.4.0" + "@lavamoat/allow-scripts": "npm:^3.4.1" "@metamask/auto-changelog": "npm:^5.0.2" "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" From 0f906f0e4df1a48d163723a75fe3a4ec5bcf70c9 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Tue, 6 Jan 2026 12:13:11 +0100 Subject: [PATCH 11/24] Fix lint --- .../packages/multichain-provider/src/index.ts | 21 ++++++- .../multichain-provider/src/modules/base.ts | 7 +++ .../multichain-provider/src/modules/index.ts | 2 +- .../snaps-simulation/src/middleware/engine.ts | 2 +- .../middleware/internal-methods/middleware.ts | 10 +++- .../multichain/get-session.ts | 23 +++++-- .../src/middleware/multichain.ts | 41 ++++++++----- packages/snaps-simulation/src/simulation.ts | 60 +++++++++++++------ .../components/SwitchChain.tsx | 2 +- 9 files changed, 122 insertions(+), 46 deletions(-) diff --git a/packages/examples/packages/multichain-provider/src/index.ts b/packages/examples/packages/multichain-provider/src/index.ts index 7334a8b11c..5de15800d7 100644 --- a/packages/examples/packages/multichain-provider/src/index.ts +++ b/packages/examples/packages/multichain-provider/src/index.ts @@ -12,7 +12,11 @@ import type { SignTypedDataParams, } from './types'; -// TODO: Consider letting the permission create the "session" +/** + * Create the multichain API session. + * + * @returns The session. + */ async function createSession() { const optionalScopes = { 'eip155:1': { @@ -35,6 +39,12 @@ async function createSession() { }); } +/** + * Retrieve the currently permissioned accounts in the active session for a given scope. + * + * @param scope - The CAIP-2 scope. + * @returns A list of CAIP-10 addresses. + */ async function getAccounts(scope: CaipChainId) { const session = await await (snap as any).request({ method: 'wallet_getSession', @@ -43,6 +53,12 @@ async function getAccounts(scope: CaipChainId) { return session.sessionScopes[scope]?.accounts ?? []; } +/** + * Get the Snap sub-module for the given scope. + * + * @param scope - The CAIP-2 scope. + * @returns The module. + */ function getModule(scope: CaipChainId) { const { namespace } = parseCaipChainId(scope); @@ -62,9 +78,10 @@ function getModule(scope: CaipChainId) { * Handle incoming JSON-RPC requests from the dapp, sent through the * `wallet_invokeSnap` method. This handler handles six methods: * + * - `createSession`: Create the multichain API session. * - `getChainId`: Get the current Ethereum chain ID as a string. * - `getAccounts`: Get the Ethereum accounts that the snap has access to. - * - `personalSign`: Sign a message using an Ethereum account. + * - `signMessage`: Sign a message using an Ethereum or Solana account. * - `signTypedData` Sign a struct using an Ethereum account. * * @param params - The request parameters. diff --git a/packages/examples/packages/multichain-provider/src/modules/base.ts b/packages/examples/packages/multichain-provider/src/modules/base.ts index 38c2c989bc..fcaa98939a 100644 --- a/packages/examples/packages/multichain-provider/src/modules/base.ts +++ b/packages/examples/packages/multichain-provider/src/modules/base.ts @@ -22,6 +22,13 @@ export abstract class Module { ): Promise; } +/** + * Invoke a RPC method for a given scope. + * + * @param scope - The CAIP-2 scope. + * @param request - The JSON-RPC request. + * @returns The JSON-RPC response. + */ export async function invokeMethod( scope: CaipChainId, request: Omit, diff --git a/packages/examples/packages/multichain-provider/src/modules/index.ts b/packages/examples/packages/multichain-provider/src/modules/index.ts index 2c78cb4762..f69a8a3ddc 100644 --- a/packages/examples/packages/multichain-provider/src/modules/index.ts +++ b/packages/examples/packages/multichain-provider/src/modules/index.ts @@ -1,3 +1,3 @@ export * from './base'; export * from './evm'; -export * from './sol'; \ No newline at end of file +export * from './sol'; diff --git a/packages/snaps-simulation/src/middleware/engine.ts b/packages/snaps-simulation/src/middleware/engine.ts index 0b93e37d93..36ed6c6dfe 100644 --- a/packages/snaps-simulation/src/middleware/engine.ts +++ b/packages/snaps-simulation/src/middleware/engine.ts @@ -6,13 +6,13 @@ import type { Json } from '@metamask/utils'; import { createInternalMethodsMiddleware } from './internal-methods'; import { createMockMiddleware } from './mock'; +import { createMultichainMiddleware } from './multichain'; import { createProviderMiddleware } from './provider'; import type { PermittedMiddlewareHooks, RestrictedMiddlewareHooks, } from '../simulation'; import type { Store } from '../store'; -import { createMultichainMiddleware } from './multichain'; export type CreateJsonRpcEngineOptions = { store: Store; diff --git a/packages/snaps-simulation/src/middleware/internal-methods/middleware.ts b/packages/snaps-simulation/src/middleware/internal-methods/middleware.ts index 591a663fa9..1be81ba432 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/middleware.ts +++ b/packages/snaps-simulation/src/middleware/internal-methods/middleware.ts @@ -4,10 +4,10 @@ import type { Hex, Json, JsonRpcParams } from '@metamask/utils'; import { getAccountsHandler } from './accounts'; import { getChainIdHandler } from './chain-id'; +import { getSessionHandler } from './multichain'; import { getNetworkVersionHandler } from './net-version'; import { getSwitchEthereumChainHandler } from './switch-ethereum-chain'; import type { ApplicationState } from '../../store'; -import { getSessionHandler } from './multichain'; export type InternalMethodsMiddlewareHooks = { /** @@ -65,7 +65,13 @@ export function createInternalMethodsMiddleware( if (handler) { try { // Implementations may or may not be async, so we must await them. - return await handler(request as any, response as any, next, end, hooks as any); + return await handler( + request as any, + response as any, + next, + end, + hooks as any, + ); } catch (error: any) { logError(error); return end(error); diff --git a/packages/snaps-simulation/src/middleware/internal-methods/multichain/get-session.ts b/packages/snaps-simulation/src/middleware/internal-methods/multichain/get-session.ts index 9ce3fe051d..3250672959 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/multichain/get-session.ts +++ b/packages/snaps-simulation/src/middleware/internal-methods/multichain/get-session.ts @@ -2,13 +2,29 @@ import type { JsonRpcEngineEndCallback, JsonRpcEngineNextCallback, } from '@metamask/json-rpc-engine'; -import { Caveat } from '@metamask/permission-controller'; -import type { Json, JsonRpcRequest, PendingJsonRpcResponse } from '@metamask/utils'; +import type { Caveat } from '@metamask/permission-controller'; +import type { + Json, + JsonRpcRequest, + PendingJsonRpcResponse, +} from '@metamask/utils'; export type GetSessionHandlerHooks = { getCaveat: (permission: string, caveatType: string) => Caveat; }; +/** + * A handler that implements `wallet_getSession`. + * + * @param _request - Incoming JSON-RPC request. Ignored for this specific + * handler. + * @param response - The outgoing JSON-RPC response, modified to return the + * result. + * @param _next - The `json-rpc-engine` middleware next handler. + * @param end - The `json-rpc-engine` middleware end handler. + * @param hooks - The method hooks. + * @returns The JSON-RPC response. + */ export async function getSessionHandler( _request: JsonRpcRequest, response: PendingJsonRpcResponse, @@ -16,7 +32,6 @@ export async function getSessionHandler( end: JsonRpcEngineEndCallback, hooks: GetSessionHandlerHooks, ) { - - response.result = hooks.getCaveat('endowment:caip25', "authorizedScopes"); + response.result = hooks.getCaveat('endowment:caip25', 'authorizedScopes'); return end(); } diff --git a/packages/snaps-simulation/src/middleware/multichain.ts b/packages/snaps-simulation/src/middleware/multichain.ts index c842a63aa7..aad84a2adf 100644 --- a/packages/snaps-simulation/src/middleware/multichain.ts +++ b/packages/snaps-simulation/src/middleware/multichain.ts @@ -1,24 +1,33 @@ -import { createAsyncMiddleware, JsonRpcMiddleware } from "@metamask/json-rpc-engine"; -import { Json, JsonRpcParams } from "@metamask/utils"; +import type { JsonRpcMiddleware } from '@metamask/json-rpc-engine'; +import { createAsyncMiddleware } from '@metamask/json-rpc-engine'; import { rpcErrors } from '@metamask/rpc-errors'; +import type { Json, JsonRpcParams } from '@metamask/utils'; -export function createMultichainMiddleware(isMultichain: boolean): JsonRpcMiddleware { - return createAsyncMiddleware(async (request, response, next) => { +/** + * Create a middleware that handles requests to the multichain API. + * + * @param isMultichain - Whether the JSON-RPC pipeline has multichain enabled. + * @returns The middleware. + */ +export function createMultichainMiddleware( + isMultichain: boolean, +): JsonRpcMiddleware { + return createAsyncMiddleware(async (request, _response, next) => { const isMultichainRequest = [ - 'wallet_createSession', - 'wallet_invokeMethod', - 'wallet_getSession', - 'wallet_revokeSession', -].includes(request.method); + 'wallet_createSession', + 'wallet_invokeMethod', + 'wallet_getSession', + 'wallet_revokeSession', + ].includes(request.method); -if (!isMultichain && isMultichainRequest) { - throw rpcErrors.methodNotFound(); -} + if (!isMultichain && isMultichainRequest) { + throw rpcErrors.methodNotFound(); + } -if (isMultichain && !isMultichainRequest) { - throw rpcErrors.methodNotFound(); -} + if (isMultichain && !isMultichainRequest) { + throw rpcErrors.methodNotFound(); + } await next(); }); -} \ No newline at end of file +} diff --git a/packages/snaps-simulation/src/simulation.ts b/packages/snaps-simulation/src/simulation.ts index 21ba8035c1..e61966a4ab 100644 --- a/packages/snaps-simulation/src/simulation.ts +++ b/packages/snaps-simulation/src/simulation.ts @@ -7,6 +7,7 @@ import type { NamespacedName, } from '@metamask/messenger'; import { MOCK_ANY_NAMESPACE, Messenger } from '@metamask/messenger'; +import type { Caveat } from '@metamask/permission-controller'; import { PhishingDetectorResultType } from '@metamask/phishing-controller'; import type { AbstractExecutionService } from '@metamask/snaps-controllers'; import { @@ -68,7 +69,6 @@ import type { } from './store'; import { createStore, getCurrentInterface } from './store'; import { addSnapMetadataToAccount } from './utils/account'; -import { Caveat } from '@metamask/permission-controller'; /** * Options for the execution service, without the options that are shared @@ -100,16 +100,16 @@ export type InstallSnapOptions< ) => InstanceType>, > = ExecutionServiceOptions extends Record - ? { - executionService: Service; - executionServiceOptions?: ExecutionServiceOptions; - options?: SimulationUserOptions; - } - : { - executionService: Service; - executionServiceOptions: ExecutionServiceOptions; - options?: SimulationUserOptions; - }; + ? { + executionService: Service; + executionServiceOptions?: ExecutionServiceOptions; + options?: SimulationUserOptions; + } + : { + executionService: Service; + executionServiceOptions: ExecutionServiceOptions; + options?: SimulationUserOptions; + }; export type InstalledSnap = { snapId: SnapId; @@ -395,7 +395,14 @@ export async function installSnap< registerActions(controllerMessenger, runSaga, options, snapId); // Set up controllers and JSON-RPC stack. - const restrictedHooks = getRestrictedHooks(snapId, options, controllerMessenger); + const restrictedHooks = getRestrictedHooks( + snapId, + options, + store, + runSaga, + controllerMessenger, + ); + const permittedHooks = getPermittedHooks( snapId, snapFiles, @@ -452,14 +459,21 @@ export async function installSnap< }); const multichainStream = mux.createStream('metamask-multichain-provider'); - const multichainProviderStream = createEngineStream({ engine: multichainEngine }); + const multichainProviderStream = createEngineStream({ + engine: multichainEngine, + }); /* istanbul ignore next 2 */ - pipeline(multichainStream, multichainProviderStream, multichainStream, (error) => { - if (error && !error.message?.match('Premature close')) { - logError(`Provider stream failure.`, error); - } - }); + pipeline( + multichainStream, + multichainProviderStream, + multichainStream, + (error) => { + if (error && !error.message?.match('Premature close')) { + logError(`Provider stream failure.`, error); + } + }, + ); }, }); @@ -499,9 +513,11 @@ export async function installSnap< /** * Get the hooks for the simulation. * + * @param snapId - The Snap ID. * @param options - The simulation options. * @param store - The Redux store. * @param runSaga - The run saga function. + * @param controllerMessenger - The controller messenger. * @returns The hooks for the simulation. */ export function getRestrictedHooks( @@ -521,7 +537,13 @@ export function getRestrictedHooks( getSnap: getGetSnapImplementation(true), setCurrentChain: getSetCurrentChainImplementation(runSaga), getSimulationState: store.getState.bind(store), - getCaveat: (permission: string, caveatType: string) => controllerMessenger.call('PermissionController:getCaveat', snapId, permission, caveatType), + getCaveat: async (permission: string, caveatType: string) => + controllerMessenger.call( + 'PermissionController:getCaveat', + snapId, + permission, + caveatType, + ), }; } diff --git a/packages/test-snaps/src/features/snaps/multichain-provider/components/SwitchChain.tsx b/packages/test-snaps/src/features/snaps/multichain-provider/components/SwitchChain.tsx index 08b5e219f2..b6e776032c 100644 --- a/packages/test-snaps/src/features/snaps/multichain-provider/components/SwitchChain.tsx +++ b/packages/test-snaps/src/features/snaps/multichain-provider/components/SwitchChain.tsx @@ -1,4 +1,4 @@ -import { CaipChainId } from '@metamask/utils'; +import type { CaipChainId } from '@metamask/utils'; import type { ChangeEvent, FunctionComponent } from 'react'; export type SwitchChainProps = { From 307272d896448fcd47de957260a401390d169a67 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Tue, 6 Jan 2026 12:25:42 +0100 Subject: [PATCH 12/24] Add genesis hash method --- .../packages/multichain-provider/snap.manifest.json | 4 ++-- .../packages/multichain-provider/src/modules/base.ts | 2 ++ .../packages/multichain-provider/src/modules/evm.ts | 12 ++++++++++++ .../packages/multichain-provider/src/modules/sol.ts | 4 ++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/packages/examples/packages/multichain-provider/snap.manifest.json b/packages/examples/packages/multichain-provider/snap.manifest.json index f07977b4b4..63e53f8063 100644 --- a/packages/examples/packages/multichain-provider/snap.manifest.json +++ b/packages/examples/packages/multichain-provider/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "RyR1kz1QopXlnxzsiEeZ701kfshofBBz30eYJu7MOdQ=", + "shasum": "CJiAtl5nGAZkZbPg4iyLxboK9t1qFs2glulvFYQoW8c=", "location": { "npm": { "filePath": "dist/bundle.js", @@ -22,6 +22,6 @@ }, "endowment:multichain-provider": {} }, - "platformVersion": "10.1.0", + "platformVersion": "10.3.0", "manifestVersion": "0.1" } diff --git a/packages/examples/packages/multichain-provider/src/modules/base.ts b/packages/examples/packages/multichain-provider/src/modules/base.ts index fcaa98939a..909f808796 100644 --- a/packages/examples/packages/multichain-provider/src/modules/base.ts +++ b/packages/examples/packages/multichain-provider/src/modules/base.ts @@ -20,6 +20,8 @@ export abstract class Module { account: CaipAccountId, message: string, ): Promise; + + abstract getGenesisHash(): Promise; } /** diff --git a/packages/examples/packages/multichain-provider/src/modules/evm.ts b/packages/examples/packages/multichain-provider/src/modules/evm.ts index 12d365ab6e..44a5dce517 100644 --- a/packages/examples/packages/multichain-provider/src/modules/evm.ts +++ b/packages/examples/packages/multichain-provider/src/modules/evm.ts @@ -1,5 +1,6 @@ import type { CaipAccountId, Hex } from '@metamask/utils'; import { + assert, bytesToHex, hexToNumber, parseCaipAccountId, @@ -98,4 +99,15 @@ export class Evm extends Module { ], }); } + + async getGenesisHash(): Promise { + const block = await invokeMethod<{ hash: string }>(this.scope, { + method: 'eth_getBlockByNumber', + params: ['0x0', false], + }); + + assert(block, 'Multichain API did not return a valid block.'); + + return block.hash; + } } diff --git a/packages/examples/packages/multichain-provider/src/modules/sol.ts b/packages/examples/packages/multichain-provider/src/modules/sol.ts index 5d164e98d7..9888e36adc 100644 --- a/packages/examples/packages/multichain-provider/src/modules/sol.ts +++ b/packages/examples/packages/multichain-provider/src/modules/sol.ts @@ -28,4 +28,8 @@ export class Solana extends Module { ): Promise { throw new MethodNotSupportedError(); } + + async getGenesisHash(): Promise { + return await invokeMethod(this.scope, { method: 'getGenesisHash' }); + } } From 491f06dfcef37d5aad1a5382cc1898039b043173 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Wed, 7 Jan 2026 11:58:10 +0100 Subject: [PATCH 13/24] Support creating and using multichain API sessions --- .../multichain-provider/snap.manifest.json | 2 +- .../multichain-provider/src/index.test.ts | 56 +++++++++++++-- .../packages/multichain-provider/src/index.ts | 3 + packages/snaps-simulation/package.json | 1 + packages/snaps-simulation/src/controllers.ts | 9 +++ .../src/methods/specifications.ts | 3 + .../middleware/internal-methods/middleware.ts | 8 ++- .../multichain/create-session.ts | 68 +++++++++++++++++++ .../multichain/get-session.ts | 16 ++++- .../internal-methods/multichain/index.ts | 2 + .../multichain/invoke-method.ts | 56 +++++++++++++++ .../src/middleware/provider.ts | 63 +++++++++++------ packages/snaps-simulation/src/simulation.ts | 33 ++++++++- yarn.lock | 22 ++++++ 14 files changed, 312 insertions(+), 30 deletions(-) create mode 100644 packages/snaps-simulation/src/middleware/internal-methods/multichain/create-session.ts create mode 100644 packages/snaps-simulation/src/middleware/internal-methods/multichain/invoke-method.ts diff --git a/packages/examples/packages/multichain-provider/snap.manifest.json b/packages/examples/packages/multichain-provider/snap.manifest.json index 63e53f8063..669e32f68e 100644 --- a/packages/examples/packages/multichain-provider/snap.manifest.json +++ b/packages/examples/packages/multichain-provider/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "CJiAtl5nGAZkZbPg4iyLxboK9t1qFs2glulvFYQoW8c=", + "shasum": "h+Tn09Nkej5V97sNnoVXIBlZ+qCoRHQcvUVwwtIbGTU=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/multichain-provider/src/index.test.ts b/packages/examples/packages/multichain-provider/src/index.test.ts index 8e64d9b6eb..7e5082bff6 100644 --- a/packages/examples/packages/multichain-provider/src/index.test.ts +++ b/packages/examples/packages/multichain-provider/src/index.test.ts @@ -20,6 +20,31 @@ describe('onRpcRequest', () => { }); }); + describe('createSession', () => { + it('returns the established session', async () => { + const { request } = await installSnap(); + + const response = await request({ + method: 'createSession', + }); + + expect(response).toRespondWith({ + sessionScopes: { + 'eip155:1': { + accounts: [], + methods: expect.any(Array), + notifications: expect.any(Array), + }, + 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp': { + accounts: [], + methods: expect.any(Array), + notifications: expect.any(Array), + }, + }, + }); + }); + }); + describe('getChainId', () => { const MOCK_CHAIN_ID = '0x01'; // Ethereum Mainnet @@ -38,6 +63,8 @@ describe('onRpcRequest', () => { it('returns the addresses granted access to by the user', async () => { const { request } = await installSnap(); + await request({ method: 'createSession' }); + const response = await request({ method: 'getAccounts', }); @@ -53,9 +80,11 @@ describe('onRpcRequest', () => { const MOCK_SIGNATURE = '0x16f672a12220dc4d9e27671ef580cfc1397a9a4d5ee19eadea46c0f350b2f72a4922be7c1f16ed9b03ef1d3351eac469e33accf5a36194b1d88923701c2b163f1b'; - it('returns a signature', async () => { + it('returns a signature for Ethereum', async () => { const { request, mockJsonRpc } = await installSnap(); + await request({ method: 'createSession' }); + // We can mock the signature request with the response we want. mockJsonRpc({ method: 'personal_sign', @@ -64,7 +93,7 @@ describe('onRpcRequest', () => { const response = await request({ method: 'signMessage', - params: { message: 'foo' }, + params: { scope: 'eip155:1', message: 'foo' }, }); expect(response).toRespondWith(MOCK_SIGNATURE); @@ -75,9 +104,11 @@ describe('onRpcRequest', () => { const MOCK_SIGNATURE = '0x01b37713300d99fecf0274bcb0dfb586a23d56c4bf2ed700c5ecf4ada7a2a14825e7b1212b1cc49c9440c375337561f2b7a6e639ba25be6a6f5a16f60e6931d31c'; - it('returns a signature', async () => { + it('returns a signature for Ethereum', async () => { const { request, mockJsonRpc } = await installSnap(); + await request({ method: 'createSession' }); + // We can mock the signature request with the response we want. mockJsonRpc({ method: 'eth_signTypedData_v4', @@ -86,10 +117,27 @@ describe('onRpcRequest', () => { const response = await request({ method: 'signTypedData', - params: { message: 'foo' }, + params: { scope: 'eip155:1', message: 'foo' }, }); expect(response).toRespondWith(MOCK_SIGNATURE); }); }); + + describe('getGenesisHash', () => { + it('returns a hash', async () => { + const { request } = await installSnap(); + + await request({ method: 'createSession' }); + + const response = await request({ + method: 'getGenesisHash', + params: { scope: 'eip155:1' }, + }); + + expect(response).toRespondWith( + '0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3', + ); + }); + }); }); diff --git a/packages/examples/packages/multichain-provider/src/index.ts b/packages/examples/packages/multichain-provider/src/index.ts index 5de15800d7..10829d3054 100644 --- a/packages/examples/packages/multichain-provider/src/index.ts +++ b/packages/examples/packages/multichain-provider/src/index.ts @@ -119,6 +119,9 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { return await scopeModule.signMessage(accounts[0], params.message); } + case 'getGenesisHash': + return await scopeModule.getGenesisHash(); + default: throw new MethodNotFoundError({ method: request.method }); } diff --git a/packages/snaps-simulation/package.json b/packages/snaps-simulation/package.json index 7c759c8421..9acbf2f3a3 100644 --- a/packages/snaps-simulation/package.json +++ b/packages/snaps-simulation/package.json @@ -55,6 +55,7 @@ "test:watch": "jest --watch" }, "dependencies": { + "@metamask/chain-agnostic-permission": "^1.4.0", "@metamask/json-rpc-engine": "^10.1.0", "@metamask/json-rpc-middleware-stream": "^8.0.8", "@metamask/key-tree": "^10.1.1", diff --git a/packages/snaps-simulation/src/controllers.ts b/packages/snaps-simulation/src/controllers.ts index 020416bf85..6d452eeedb 100644 --- a/packages/snaps-simulation/src/controllers.ts +++ b/packages/snaps-simulation/src/controllers.ts @@ -1,3 +1,7 @@ +import { + caip25CaveatBuilder, + Caip25CaveatType, +} from '@metamask/chain-agnostic-permission'; import { Messenger } from '@metamask/messenger'; import type { CaveatSpecificationConstraint, @@ -145,6 +149,11 @@ function getPermissionController(options: GetControllersOptions) { return new PermissionController({ messenger, caveatSpecifications: { + // @ts-expect-error Missing args temporarily. + [Caip25CaveatType]: caip25CaveatBuilder({ + findNetworkClientIdByChainId: (chainId) => chainId, + isNonEvmScopeSupported: (_scope) => true, + }), ...snapsCaveatsSpecifications, ...snapsEndowmentCaveatSpecifications, }, diff --git a/packages/snaps-simulation/src/methods/specifications.ts b/packages/snaps-simulation/src/methods/specifications.ts index 38c6346779..55a247f5dc 100644 --- a/packages/snaps-simulation/src/methods/specifications.ts +++ b/packages/snaps-simulation/src/methods/specifications.ts @@ -1,3 +1,4 @@ +import { caip25EndowmentBuilder } from '@metamask/chain-agnostic-permission'; import type { GenericPermissionController } from '@metamask/permission-controller'; import { endowmentPermissionBuilders, @@ -81,6 +82,8 @@ export function getPermissionSpecifications({ options, }: GetPermissionSpecificationsOptions) { return { + [caip25EndowmentBuilder.targetName]: + caip25EndowmentBuilder.specificationBuilder({}), ...buildSnapEndowmentSpecifications(EXCLUDED_SNAP_ENDOWMENTS), ...buildSnapRestrictedMethodSpecifications(EXCLUDED_SNAP_PERMISSIONS, { // Shared hooks. diff --git a/packages/snaps-simulation/src/middleware/internal-methods/middleware.ts b/packages/snaps-simulation/src/middleware/internal-methods/middleware.ts index 1be81ba432..39327e1a3a 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/middleware.ts +++ b/packages/snaps-simulation/src/middleware/internal-methods/middleware.ts @@ -4,7 +4,11 @@ import type { Hex, Json, JsonRpcParams } from '@metamask/utils'; import { getAccountsHandler } from './accounts'; import { getChainIdHandler } from './chain-id'; -import { getSessionHandler } from './multichain'; +import { + createSessionHandler, + getSessionHandler, + invokeMethodHandler, +} from './multichain'; import { getNetworkVersionHandler } from './net-version'; import { getSwitchEthereumChainHandler } from './switch-ethereum-chain'; import type { ApplicationState } from '../../store'; @@ -39,7 +43,9 @@ const methodHandlers = { eth_chainId: getChainIdHandler, net_version: getNetworkVersionHandler, wallet_switchEthereumChain: getSwitchEthereumChainHandler, + wallet_createSession: createSessionHandler, wallet_getSession: getSessionHandler, + wallet_invokeMethod: invokeMethodHandler, /* eslint-enable @typescript-eslint/naming-convention */ }; diff --git a/packages/snaps-simulation/src/middleware/internal-methods/multichain/create-session.ts b/packages/snaps-simulation/src/middleware/internal-methods/multichain/create-session.ts new file mode 100644 index 0000000000..b3e84eaf88 --- /dev/null +++ b/packages/snaps-simulation/src/middleware/internal-methods/multichain/create-session.ts @@ -0,0 +1,68 @@ +import { getSessionScopes } from '@metamask/chain-agnostic-permission'; +import type { + JsonRpcEngineEndCallback, + JsonRpcEngineNextCallback, +} from '@metamask/json-rpc-engine'; +import type { RequestedPermissions } from '@metamask/permission-controller'; +import { rpcErrors } from '@metamask/rpc-errors'; +import { + isObject, + type JsonRpcRequest, + type PendingJsonRpcResponse, +} from '@metamask/utils'; + +export type CreateSessionHandlerHooks = { + grantPermissions: (permissions: RequestedPermissions) => void; +}; + +/** + * A handler that implements a simplified version of `wallet_createSession`. + * + * @param request - Incoming JSON-RPC request. + * @param response - The outgoing JSON-RPC response, modified to return the + * result. + * @param _next - The `json-rpc-engine` middleware next handler. + * @param end - The `json-rpc-engine` middleware end handler. + * @param hooks - The method hooks. + * @returns The JSON-RPC response. + */ +export async function createSessionHandler( + request: JsonRpcRequest, + response: PendingJsonRpcResponse, + _next: JsonRpcEngineNextCallback, + end: JsonRpcEngineEndCallback, + hooks: CreateSessionHandlerHooks, +) { + if (!isObject(request.params)) { + return end(rpcErrors.invalidParams({ data: { request } })); + } + + const caveat = { + requiredScopes: request.params.requiredScopes ?? {}, + optionalScopes: request.params.optionalScopes ?? {}, + sessionProperties: {}, + isMultichainOrigin: true, + }; + + const permissions = { + 'endowment:caip25': { + caveats: [ + { + type: 'authorizedScopes', + value: caveat, + }, + ], + }, + }; + + // @ts-expect-error Ignore for now. + hooks.grantPermissions(permissions); + + // @ts-expect-error Ignore for now. + const sessionScopes = getSessionScopes(caveat, { + getNonEvmSupportedMethods: () => [], + }); + + response.result = { sessionScopes }; + return end(); +} diff --git a/packages/snaps-simulation/src/middleware/internal-methods/multichain/get-session.ts b/packages/snaps-simulation/src/middleware/internal-methods/multichain/get-session.ts index 3250672959..afda6f6997 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/multichain/get-session.ts +++ b/packages/snaps-simulation/src/middleware/internal-methods/multichain/get-session.ts @@ -1,3 +1,7 @@ +import { + Caip25CaveatType, + Caip25EndowmentPermissionName, +} from '@metamask/chain-agnostic-permission'; import type { JsonRpcEngineEndCallback, JsonRpcEngineNextCallback, @@ -14,7 +18,7 @@ export type GetSessionHandlerHooks = { }; /** - * A handler that implements `wallet_getSession`. + * A handler that implements a simplified version of `wallet_getSession`. * * @param _request - Incoming JSON-RPC request. Ignored for this specific * handler. @@ -32,6 +36,14 @@ export async function getSessionHandler( end: JsonRpcEngineEndCallback, hooks: GetSessionHandlerHooks, ) { - response.result = hooks.getCaveat('endowment:caip25', 'authorizedScopes'); + try { + const caveat = hooks.getCaveat( + Caip25EndowmentPermissionName, + Caip25CaveatType, + ); + response.result = { sessionScopes: caveat?.value ?? {} }; + } catch { + response.result = { sessionScopes: {} }; + } return end(); } diff --git a/packages/snaps-simulation/src/middleware/internal-methods/multichain/index.ts b/packages/snaps-simulation/src/middleware/internal-methods/multichain/index.ts index 107f4cc3b1..d2a70d960c 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/multichain/index.ts +++ b/packages/snaps-simulation/src/middleware/internal-methods/multichain/index.ts @@ -1 +1,3 @@ +export * from './create-session'; export * from './get-session'; +export * from './invoke-method'; diff --git a/packages/snaps-simulation/src/middleware/internal-methods/multichain/invoke-method.ts b/packages/snaps-simulation/src/middleware/internal-methods/multichain/invoke-method.ts new file mode 100644 index 0000000000..fef573639f --- /dev/null +++ b/packages/snaps-simulation/src/middleware/internal-methods/multichain/invoke-method.ts @@ -0,0 +1,56 @@ +import { + Caip25CaveatType, + Caip25EndowmentPermissionName, +} from '@metamask/chain-agnostic-permission'; +import type { + JsonRpcEngineEndCallback, + JsonRpcEngineNextCallback, +} from '@metamask/json-rpc-engine'; +import type { Caveat } from '@metamask/permission-controller'; +import { rpcErrors } from '@metamask/rpc-errors'; +import { + type CaipChainId, + isObject, + type Json, + type JsonRpcRequest, + type PendingJsonRpcResponse, +} from '@metamask/utils'; + +export type InvokeMethodHandlerHooks = { + getCaveat: (permission: string, caveatType: string) => Caveat; +}; + +/** + * A handler that implements a simplified version of `wallet_invokeMethod`. + * + * @param request - Incoming JSON-RPC request. + * @param _response - The outgoing JSON-RPC response. Ignored for this specific + * handler. + * @param next - The `json-rpc-engine` middleware next handler. + * @param end - The `json-rpc-engine` middleware end handler. + * @param hooks - The method hooks. + * @returns The JSON-RPC response. + */ +export async function invokeMethodHandler( + request: JsonRpcRequest & { scope: CaipChainId }, + _response: PendingJsonRpcResponse, + next: JsonRpcEngineNextCallback, + end: JsonRpcEngineEndCallback, + hooks: InvokeMethodHandlerHooks, +) { + if (!isObject(request.params)) { + return end(rpcErrors.invalidParams({ data: { request } })); + } + + // TODO: Struct? + const { request: wrappedRequest, scope } = request.params as any; + + hooks.getCaveat(Caip25EndowmentPermissionName, Caip25CaveatType); + // TODO: Validate + + request.method = wrappedRequest.method; + request.params = wrappedRequest.params; + request.scope = scope; + + return next(); +} diff --git a/packages/snaps-simulation/src/middleware/provider.ts b/packages/snaps-simulation/src/middleware/provider.ts index f457037873..26114d9b19 100644 --- a/packages/snaps-simulation/src/middleware/provider.ts +++ b/packages/snaps-simulation/src/middleware/provider.ts @@ -1,8 +1,13 @@ import type { JsonRpcMiddleware } from '@metamask/json-rpc-engine'; import { createAsyncMiddleware } from '@metamask/json-rpc-engine'; import { rpcErrors, serializeCause } from '@metamask/rpc-errors'; -import type { Json, JsonRpcParams } from '@metamask/utils'; -import { hasProperty, hexToBigInt } from '@metamask/utils'; +import type { + CaipChainId, + Json, + JsonRpcParams, + JsonRpcRequest, +} from '@metamask/utils'; +import { hasProperty, hexToBigInt, parseCaipChainId } from '@metamask/utils'; import { InfuraProvider } from 'ethers'; import type { Store } from '../store'; @@ -17,25 +22,45 @@ import { getChainId } from '../store'; export function createProviderMiddleware( store: Store, ): JsonRpcMiddleware { - return createAsyncMiddleware(async (request, response) => { - try { - const chainId = getChainId(store.getState()); - const provider = new InfuraProvider(hexToBigInt(chainId)); + return createAsyncMiddleware( + async ( + request: JsonRpcRequest & { scope?: CaipChainId }, + response, + next, + ) => { + const requestScope = request.scope && parseCaipChainId(request.scope); + const isEvm = requestScope ? requestScope.namespace === 'eip155' : true; - const result = await provider.send(request.method, request.params ?? []); - response.result = result; - } catch (error) { - if (hasProperty(error, 'info') && hasProperty(error.info, 'error')) { - response.error = error.info.error; + if (!isEvm) { + await next(); return; } - if (hasProperty(error, 'error')) { - response.error = error.error; - return; + + const chainId = requestScope + ? BigInt(requestScope.reference) + : hexToBigInt(getChainId(store.getState())); + + try { + const provider = new InfuraProvider(chainId); + + const result = await provider.send( + request.method, + request.params ?? [], + ); + response.result = result; + } catch (error) { + if (hasProperty(error, 'info') && hasProperty(error.info, 'error')) { + response.error = error.info.error; + return; + } + if (hasProperty(error, 'error')) { + response.error = error.error; + return; + } + response.error = rpcErrors.internal({ + data: { cause: serializeCause(error) }, + }); } - response.error = rpcErrors.internal({ - data: { cause: serializeCause(error) }, - }); - } - }); + }, + ); } diff --git a/packages/snaps-simulation/src/simulation.ts b/packages/snaps-simulation/src/simulation.ts index e61966a4ab..37367c5605 100644 --- a/packages/snaps-simulation/src/simulation.ts +++ b/packages/snaps-simulation/src/simulation.ts @@ -7,7 +7,10 @@ import type { NamespacedName, } from '@metamask/messenger'; import { MOCK_ANY_NAMESPACE, Messenger } from '@metamask/messenger'; -import type { Caveat } from '@metamask/permission-controller'; +import type { + Caveat, + RequestedPermissions, +} from '@metamask/permission-controller'; import { PhishingDetectorResultType } from '@metamask/phishing-controller'; import type { AbstractExecutionService } from '@metamask/snaps-controllers'; import { @@ -176,7 +179,25 @@ export type RestrictedMiddlewareHooks = { * @returns The simulation state. */ getSimulationState: () => ApplicationState; - getCaveat: (permission: string, caveatType: string) => Caveat; + + /** + * A hook that retrieves a caveat for a given permission. + * + * @param permission - The permission name. + * @param caveatType - The caveat type. + * @returns The caveat, if it exists. + */ + getCaveat: ( + permission: string, + caveatType: string, + ) => Caveat | undefined; + + /** + * A hook that grants permissions to the origin. + * + * @param permissions - The permissions. + */ + grantPermissions: (permissions: RequestedPermissions) => void; }; export type PermittedMiddlewareHooks = { @@ -537,13 +558,19 @@ export function getRestrictedHooks( getSnap: getGetSnapImplementation(true), setCurrentChain: getSetCurrentChainImplementation(runSaga), getSimulationState: store.getState.bind(store), - getCaveat: async (permission: string, caveatType: string) => + getCaveat: (permission: string, caveatType: string) => controllerMessenger.call( 'PermissionController:getCaveat', snapId, permission, caveatType, ), + grantPermissions: (approvedPermissions: RequestedPermissions) => { + controllerMessenger.call('PermissionController:grantPermissions', { + subject: { origin: snapId }, + approvedPermissions, + }); + }, }; } diff --git a/yarn.lock b/yarn.lock index b76faa37d3..6f406fbaa9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2830,6 +2830,13 @@ __metadata: languageName: node linkType: hard +"@metamask/api-specs@npm:^0.14.0": + version: 0.14.0 + resolution: "@metamask/api-specs@npm:0.14.0" + checksum: 10/6caad5e233c12b87f25313fe1e0fb35af6ad9f0ef49e105b36a1826bd8b611a9335642920ddb6c556343375db4b02138a32598b7185392e50050ae7f390e0e7d + languageName: node + linkType: hard + "@metamask/approval-controller@npm:^8.0.0": version: 8.0.0 resolution: "@metamask/approval-controller@npm:8.0.0" @@ -2976,6 +2983,20 @@ __metadata: languageName: node linkType: hard +"@metamask/chain-agnostic-permission@npm:^1.4.0": + version: 1.4.0 + resolution: "@metamask/chain-agnostic-permission@npm:1.4.0" + dependencies: + "@metamask/api-specs": "npm:^0.14.0" + "@metamask/controller-utils": "npm:^11.17.0" + "@metamask/permission-controller": "npm:^12.2.0" + "@metamask/rpc-errors": "npm:^7.0.2" + "@metamask/utils": "npm:^11.9.0" + lodash: "npm:^4.17.21" + checksum: 10/fecd0ead0423b283519d8e2a4c783621a4323c961e7ff33653ef0c7fe4a0b3b039918b082c76267a1beb3c11178283a0c1b7e0dc18b3030e5e2019e7cbd10080 + languageName: node + linkType: hard + "@metamask/client-status-example-snap@workspace:^, @metamask/client-status-example-snap@workspace:packages/examples/packages/client-status": version: 0.0.0-use.local resolution: "@metamask/client-status-example-snap@workspace:packages/examples/packages/client-status" @@ -4519,6 +4540,7 @@ __metadata: dependencies: "@lavamoat/allow-scripts": "npm:^3.4.1" "@metamask/auto-changelog": "npm:^5.0.2" + "@metamask/chain-agnostic-permission": "npm:^1.4.0" "@metamask/json-rpc-engine": "npm:^10.1.0" "@metamask/json-rpc-middleware-stream": "npm:^8.0.8" "@metamask/key-tree": "npm:^10.1.1" From f6ed19cd06c175352daeb2c9262d61ab1b8ef6f2 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Wed, 7 Jan 2026 12:12:46 +0100 Subject: [PATCH 14/24] Sync versions --- packages/examples/packages/multichain-provider/package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/examples/packages/multichain-provider/package.json b/packages/examples/packages/multichain-provider/package.json index 12a6fd16f8..55fe69d296 100644 --- a/packages/examples/packages/multichain-provider/package.json +++ b/packages/examples/packages/multichain-provider/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@metamask/snaps-sdk": "workspace:^", - "@metamask/utils": "^11.8.1" + "@metamask/utils": "^11.9.0" }, "devDependencies": { "@jest/globals": "^29.5.0", diff --git a/yarn.lock b/yarn.lock index 6f406fbaa9..b64481892d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3789,7 +3789,7 @@ __metadata: "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" - "@metamask/utils": "npm:^11.8.1" + "@metamask/utils": "npm:^11.9.0" "@swc/core": "npm:1.11.31" "@swc/jest": "npm:^0.2.38" "@types/node": "npm:18.14.2" From 1a787c15cc0de341186a29a777a4880a564d001a Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Wed, 7 Jan 2026 13:19:55 +0100 Subject: [PATCH 15/24] Fix some more tests --- .../multichain-provider/snap.manifest.json | 2 +- .../multichain-provider/src/index.test.ts | 47 +++++++++++++++++-- .../packages/multichain-provider/src/index.ts | 7 ++- packages/snaps-rpc-methods/jest.config.js | 6 +-- .../src/methods/specifications.test.ts | 9 ++++ .../multichain/create-session.ts | 1 + .../multichain/get-session.ts | 15 +++--- .../snaps-simulation/src/simulation.test.ts | 27 +++++++++-- packages/snaps-simulation/src/simulation.ts | 29 ++++++++---- 9 files changed, 112 insertions(+), 31 deletions(-) diff --git a/packages/examples/packages/multichain-provider/snap.manifest.json b/packages/examples/packages/multichain-provider/snap.manifest.json index 669e32f68e..ebe5dd5246 100644 --- a/packages/examples/packages/multichain-provider/snap.manifest.json +++ b/packages/examples/packages/multichain-provider/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "h+Tn09Nkej5V97sNnoVXIBlZ+qCoRHQcvUVwwtIbGTU=", + "shasum": "Fw9wcR00gRhCuv8didz94NR4xdkbeOk0eCA2un4ONrw=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/multichain-provider/src/index.test.ts b/packages/examples/packages/multichain-provider/src/index.test.ts index 7e5082bff6..8c04121884 100644 --- a/packages/examples/packages/multichain-provider/src/index.test.ts +++ b/packages/examples/packages/multichain-provider/src/index.test.ts @@ -35,6 +35,11 @@ describe('onRpcRequest', () => { methods: expect.any(Array), notifications: expect.any(Array), }, + 'eip155:11155111': { + accounts: [], + methods: expect.any(Array), + notifications: expect.any(Array), + }, 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp': { accounts: [], methods: expect.any(Array), @@ -46,16 +51,34 @@ describe('onRpcRequest', () => { }); describe('getChainId', () => { - const MOCK_CHAIN_ID = '0x01'; // Ethereum Mainnet + const ETHEREUM_CHAIN_ID = '0x1'; + const SEPOLIA_CHAIN_ID = '0xaa36a7'; + + it('returns the Ethereum Mainnet chain ID', async () => { + const { request } = await installSnap(); + + await request({ method: 'createSession' }); + + const response = await request({ + method: 'getChainId', + }); + + expect(response).toRespondWith(ETHEREUM_CHAIN_ID); + }); - it('returns the current network version', async () => { + it('returns the Sepolia chain ID', async () => { const { request } = await installSnap(); + await request({ method: 'createSession' }); + const response = await request({ method: 'getChainId', + params: { + scope: 'eip155:11155111', + }, }); - expect(response).toRespondWith(MOCK_CHAIN_ID); + expect(response).toRespondWith(SEPOLIA_CHAIN_ID); }); }); @@ -125,7 +148,7 @@ describe('onRpcRequest', () => { }); describe('getGenesisHash', () => { - it('returns a hash', async () => { + it('returns the Ethereum Mainnet hash', async () => { const { request } = await installSnap(); await request({ method: 'createSession' }); @@ -139,5 +162,21 @@ describe('onRpcRequest', () => { '0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3', ); }); + + it('returns the Solana Mainnet hash', async () => { + const SOLANA_GENESIS_HASH = 'abc'; + const { request, mockJsonRpc } = await installSnap(); + + await request({ method: 'createSession' }); + + mockJsonRpc({ method: 'getGenesisHash', result: SOLANA_GENESIS_HASH }); + + const response = await request({ + method: 'getGenesisHash', + params: { scope: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp' }, + }); + + expect(response).toRespondWith(SOLANA_GENESIS_HASH); + }); }); }); diff --git a/packages/examples/packages/multichain-provider/src/index.ts b/packages/examples/packages/multichain-provider/src/index.ts index 10829d3054..7c28fa4bbf 100644 --- a/packages/examples/packages/multichain-provider/src/index.ts +++ b/packages/examples/packages/multichain-provider/src/index.ts @@ -24,8 +24,13 @@ async function createSession() { notifications: [], accounts: [], }, + 'eip155:11155111': { + methods: ['personal_sign', 'eth_signTypedData_v4'], + notifications: [], + accounts: [], + }, 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp': { - methods: ['signMessage'], + methods: ['signMessage', 'getGenesisHash'], notifications: [], accounts: [], }, diff --git a/packages/snaps-rpc-methods/jest.config.js b/packages/snaps-rpc-methods/jest.config.js index f4af002854..bf861e0833 100644 --- a/packages/snaps-rpc-methods/jest.config.js +++ b/packages/snaps-rpc-methods/jest.config.js @@ -11,9 +11,9 @@ module.exports = deepmerge(baseConfig, { coverageThreshold: { global: { branches: 95.7, - functions: 98.76, - lines: 98.99, - statements: 98.7, + functions: 98.77, + lines: 99, + statements: 98.71, }, }, }); diff --git a/packages/snaps-simulation/src/methods/specifications.test.ts b/packages/snaps-simulation/src/methods/specifications.test.ts index 1c66594739..8e622b6d1a 100644 --- a/packages/snaps-simulation/src/methods/specifications.test.ts +++ b/packages/snaps-simulation/src/methods/specifications.test.ts @@ -61,6 +61,15 @@ describe('getPermissionSpecifications', () => { "targetName": "endowment:assets", "validator": [Function], }, + "endowment:caip25": { + "allowedCaveats": [ + "authorizedScopes", + ], + "endowmentGetter": [Function], + "permissionType": "Endowment", + "targetName": "endowment:caip25", + "validator": [Function], + }, "endowment:cronjob": { "allowedCaveats": [ "snapCronjob", diff --git a/packages/snaps-simulation/src/middleware/internal-methods/multichain/create-session.ts b/packages/snaps-simulation/src/middleware/internal-methods/multichain/create-session.ts index b3e84eaf88..3dabc7859a 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/multichain/create-session.ts +++ b/packages/snaps-simulation/src/middleware/internal-methods/multichain/create-session.ts @@ -37,6 +37,7 @@ export async function createSessionHandler( return end(rpcErrors.invalidParams({ data: { request } })); } + // TODO: Inject accounts const caveat = { requiredScopes: request.params.requiredScopes ?? {}, optionalScopes: request.params.optionalScopes ?? {}, diff --git a/packages/snaps-simulation/src/middleware/internal-methods/multichain/get-session.ts b/packages/snaps-simulation/src/middleware/internal-methods/multichain/get-session.ts index afda6f6997..19a15217f0 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/multichain/get-session.ts +++ b/packages/snaps-simulation/src/middleware/internal-methods/multichain/get-session.ts @@ -36,14 +36,11 @@ export async function getSessionHandler( end: JsonRpcEngineEndCallback, hooks: GetSessionHandlerHooks, ) { - try { - const caveat = hooks.getCaveat( - Caip25EndowmentPermissionName, - Caip25CaveatType, - ); - response.result = { sessionScopes: caveat?.value ?? {} }; - } catch { - response.result = { sessionScopes: {} }; - } + const caveat = hooks.getCaveat( + Caip25EndowmentPermissionName, + Caip25CaveatType, + ); + response.result = { sessionScopes: caveat?.value ?? {} }; + return end(); } diff --git a/packages/snaps-simulation/src/simulation.test.ts b/packages/snaps-simulation/src/simulation.test.ts index 726c877903..b252a27d71 100644 --- a/packages/snaps-simulation/src/simulation.test.ts +++ b/packages/snaps-simulation/src/simulation.test.ts @@ -215,33 +215,54 @@ describe('installSnap', () => { }); describe('getRestrictedHooks', () => { + const controllerMessenger = getRootControllerMessenger(); const options = getMockOptions(); const { runSaga, store } = createStore(getMockOptions()); it('returns the `getMnemonic` hook', async () => { - const { getMnemonic } = getRestrictedHooks(options, store, runSaga); + const { getMnemonic } = getRestrictedHooks( + MOCK_SNAP_ID, + options, + store, + runSaga, + controllerMessenger, + ); expect(await getMnemonic()).toStrictEqual( mnemonicPhraseToBytes(DEFAULT_SRP), ); }); it('returns the `getIsLocked` hook', async () => { - const { getIsLocked } = getRestrictedHooks(options, store, runSaga); + const { getIsLocked } = getRestrictedHooks( + MOCK_SNAP_ID, + options, + store, + runSaga, + controllerMessenger, + ); expect(getIsLocked()).toBe(false); }); it('returns the `getClientCryptography` hook', async () => { const { getClientCryptography } = getRestrictedHooks( + MOCK_SNAP_ID, options, store, runSaga, + controllerMessenger, ); expect(getClientCryptography()).toStrictEqual({}); }); it('returns the `getSimulationState` hook', async () => { - const { getSimulationState } = getRestrictedHooks(options, store, runSaga); + const { getSimulationState } = getRestrictedHooks( + MOCK_SNAP_ID, + options, + store, + runSaga, + controllerMessenger, + ); expect(getSimulationState()).toStrictEqual(store.getState()); }); diff --git a/packages/snaps-simulation/src/simulation.ts b/packages/snaps-simulation/src/simulation.ts index 37367c5605..a804030fc9 100644 --- a/packages/snaps-simulation/src/simulation.ts +++ b/packages/snaps-simulation/src/simulation.ts @@ -7,9 +7,10 @@ import type { NamespacedName, } from '@metamask/messenger'; import { MOCK_ANY_NAMESPACE, Messenger } from '@metamask/messenger'; -import type { - Caveat, - RequestedPermissions, +import { + PermissionDoesNotExistError, + type Caveat, + type RequestedPermissions, } from '@metamask/permission-controller'; import { PhishingDetectorResultType } from '@metamask/phishing-controller'; import type { AbstractExecutionService } from '@metamask/snaps-controllers'; @@ -558,13 +559,21 @@ export function getRestrictedHooks( getSnap: getGetSnapImplementation(true), setCurrentChain: getSetCurrentChainImplementation(runSaga), getSimulationState: store.getState.bind(store), - getCaveat: (permission: string, caveatType: string) => - controllerMessenger.call( - 'PermissionController:getCaveat', - snapId, - permission, - caveatType, - ), + getCaveat: (permission: string, caveatType: string) => { + try { + return controllerMessenger.call( + 'PermissionController:getCaveat', + snapId, + permission, + caveatType, + ); + } catch (error) { + if (error instanceof PermissionDoesNotExistError) { + return undefined; + } + throw error; + } + }, grantPermissions: (approvedPermissions: RequestedPermissions) => { controllerMessenger.call('PermissionController:grantPermissions', { subject: { origin: snapId }, From 151b0cf98f0dc43708d282e168d68129f317b594 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Wed, 7 Jan 2026 13:45:32 +0100 Subject: [PATCH 16/24] Move multichain methods to multichain middleware --- .../snaps-simulation/src/middleware/engine.ts | 9 +- .../middleware/internal-methods/middleware.ts | 8 -- .../src/middleware/multichain.ts | 33 ----- .../multichain/create-session.ts | 2 +- .../multichain/get-session.ts | 2 +- .../multichain/index.ts | 1 + .../multichain/invoke-method.ts | 2 +- .../src/middleware/multichain/middleware.ts | 59 +++++++++ .../snaps-simulation/src/simulation.test.ts | 27 +---- packages/snaps-simulation/src/simulation.ts | 113 ++++++++++-------- 10 files changed, 135 insertions(+), 121 deletions(-) delete mode 100644 packages/snaps-simulation/src/middleware/multichain.ts rename packages/snaps-simulation/src/middleware/{internal-methods => }/multichain/create-session.ts (97%) rename packages/snaps-simulation/src/middleware/{internal-methods => }/multichain/get-session.ts (96%) rename packages/snaps-simulation/src/middleware/{internal-methods => }/multichain/index.ts (76%) rename packages/snaps-simulation/src/middleware/{internal-methods => }/multichain/invoke-method.ts (97%) create mode 100644 packages/snaps-simulation/src/middleware/multichain/middleware.ts diff --git a/packages/snaps-simulation/src/middleware/engine.ts b/packages/snaps-simulation/src/middleware/engine.ts index 36ed6c6dfe..fd3df1fe9d 100644 --- a/packages/snaps-simulation/src/middleware/engine.ts +++ b/packages/snaps-simulation/src/middleware/engine.ts @@ -9,6 +9,7 @@ import { createMockMiddleware } from './mock'; import { createMultichainMiddleware } from './multichain'; import { createProviderMiddleware } from './provider'; import type { + MultichainMiddlewareHooks, PermittedMiddlewareHooks, RestrictedMiddlewareHooks, } from '../simulation'; @@ -18,6 +19,7 @@ export type CreateJsonRpcEngineOptions = { store: Store; restrictedHooks: RestrictedMiddlewareHooks; permittedHooks: PermittedMiddlewareHooks; + multichainHooks: MultichainMiddlewareHooks; permissionMiddleware: JsonRpcMiddleware; endpoint?: string; isMultichain: boolean; @@ -34,6 +36,7 @@ export type CreateJsonRpcEngineOptions = { * @param options.restrictedHooks - Any hooks used by the middleware handlers. * @param options.permittedHooks - Any hooks used by the middleware handlers. * @param options.permissionMiddleware - The permission middleware to use. + * @param options.multichainHooks - Hooks used by the multichain middleware. * @param options.isMultichain - Whether the engine is used for multichain. * @returns A JSON-RPC engine. */ @@ -42,12 +45,14 @@ export function createJsonRpcEngine({ restrictedHooks, permittedHooks, permissionMiddleware, + multichainHooks, isMultichain, }: CreateJsonRpcEngineOptions) { const engine = new JsonRpcEngine(); - engine.push(createMockMiddleware(store)); - engine.push(createMultichainMiddleware(isMultichain)); + engine.push(createMultichainMiddleware(isMultichain, multichainHooks)); + + engine.push(createMockMiddleware(store)); // The hooks here do not match the hooks used by the clients, so this // middleware should not be used outside of the simulation environment. diff --git a/packages/snaps-simulation/src/middleware/internal-methods/middleware.ts b/packages/snaps-simulation/src/middleware/internal-methods/middleware.ts index 39327e1a3a..991988c099 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/middleware.ts +++ b/packages/snaps-simulation/src/middleware/internal-methods/middleware.ts @@ -4,11 +4,6 @@ import type { Hex, Json, JsonRpcParams } from '@metamask/utils'; import { getAccountsHandler } from './accounts'; import { getChainIdHandler } from './chain-id'; -import { - createSessionHandler, - getSessionHandler, - invokeMethodHandler, -} from './multichain'; import { getNetworkVersionHandler } from './net-version'; import { getSwitchEthereumChainHandler } from './switch-ethereum-chain'; import type { ApplicationState } from '../../store'; @@ -43,9 +38,6 @@ const methodHandlers = { eth_chainId: getChainIdHandler, net_version: getNetworkVersionHandler, wallet_switchEthereumChain: getSwitchEthereumChainHandler, - wallet_createSession: createSessionHandler, - wallet_getSession: getSessionHandler, - wallet_invokeMethod: invokeMethodHandler, /* eslint-enable @typescript-eslint/naming-convention */ }; diff --git a/packages/snaps-simulation/src/middleware/multichain.ts b/packages/snaps-simulation/src/middleware/multichain.ts deleted file mode 100644 index aad84a2adf..0000000000 --- a/packages/snaps-simulation/src/middleware/multichain.ts +++ /dev/null @@ -1,33 +0,0 @@ -import type { JsonRpcMiddleware } from '@metamask/json-rpc-engine'; -import { createAsyncMiddleware } from '@metamask/json-rpc-engine'; -import { rpcErrors } from '@metamask/rpc-errors'; -import type { Json, JsonRpcParams } from '@metamask/utils'; - -/** - * Create a middleware that handles requests to the multichain API. - * - * @param isMultichain - Whether the JSON-RPC pipeline has multichain enabled. - * @returns The middleware. - */ -export function createMultichainMiddleware( - isMultichain: boolean, -): JsonRpcMiddleware { - return createAsyncMiddleware(async (request, _response, next) => { - const isMultichainRequest = [ - 'wallet_createSession', - 'wallet_invokeMethod', - 'wallet_getSession', - 'wallet_revokeSession', - ].includes(request.method); - - if (!isMultichain && isMultichainRequest) { - throw rpcErrors.methodNotFound(); - } - - if (isMultichain && !isMultichainRequest) { - throw rpcErrors.methodNotFound(); - } - - await next(); - }); -} diff --git a/packages/snaps-simulation/src/middleware/internal-methods/multichain/create-session.ts b/packages/snaps-simulation/src/middleware/multichain/create-session.ts similarity index 97% rename from packages/snaps-simulation/src/middleware/internal-methods/multichain/create-session.ts rename to packages/snaps-simulation/src/middleware/multichain/create-session.ts index 3dabc7859a..15b55af8dd 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/multichain/create-session.ts +++ b/packages/snaps-simulation/src/middleware/multichain/create-session.ts @@ -26,7 +26,7 @@ export type CreateSessionHandlerHooks = { * @param hooks - The method hooks. * @returns The JSON-RPC response. */ -export async function createSessionHandler( +export function createSessionHandler( request: JsonRpcRequest, response: PendingJsonRpcResponse, _next: JsonRpcEngineNextCallback, diff --git a/packages/snaps-simulation/src/middleware/internal-methods/multichain/get-session.ts b/packages/snaps-simulation/src/middleware/multichain/get-session.ts similarity index 96% rename from packages/snaps-simulation/src/middleware/internal-methods/multichain/get-session.ts rename to packages/snaps-simulation/src/middleware/multichain/get-session.ts index 19a15217f0..11768f9f10 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/multichain/get-session.ts +++ b/packages/snaps-simulation/src/middleware/multichain/get-session.ts @@ -29,7 +29,7 @@ export type GetSessionHandlerHooks = { * @param hooks - The method hooks. * @returns The JSON-RPC response. */ -export async function getSessionHandler( +export function getSessionHandler( _request: JsonRpcRequest, response: PendingJsonRpcResponse, _next: JsonRpcEngineNextCallback, diff --git a/packages/snaps-simulation/src/middleware/internal-methods/multichain/index.ts b/packages/snaps-simulation/src/middleware/multichain/index.ts similarity index 76% rename from packages/snaps-simulation/src/middleware/internal-methods/multichain/index.ts rename to packages/snaps-simulation/src/middleware/multichain/index.ts index d2a70d960c..911fc1f568 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/multichain/index.ts +++ b/packages/snaps-simulation/src/middleware/multichain/index.ts @@ -1,3 +1,4 @@ export * from './create-session'; export * from './get-session'; export * from './invoke-method'; +export * from './middleware'; diff --git a/packages/snaps-simulation/src/middleware/internal-methods/multichain/invoke-method.ts b/packages/snaps-simulation/src/middleware/multichain/invoke-method.ts similarity index 97% rename from packages/snaps-simulation/src/middleware/internal-methods/multichain/invoke-method.ts rename to packages/snaps-simulation/src/middleware/multichain/invoke-method.ts index fef573639f..cb4edae3bf 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/multichain/invoke-method.ts +++ b/packages/snaps-simulation/src/middleware/multichain/invoke-method.ts @@ -31,7 +31,7 @@ export type InvokeMethodHandlerHooks = { * @param hooks - The method hooks. * @returns The JSON-RPC response. */ -export async function invokeMethodHandler( +export function invokeMethodHandler( request: JsonRpcRequest & { scope: CaipChainId }, _response: PendingJsonRpcResponse, next: JsonRpcEngineNextCallback, diff --git a/packages/snaps-simulation/src/middleware/multichain/middleware.ts b/packages/snaps-simulation/src/middleware/multichain/middleware.ts new file mode 100644 index 0000000000..488d9eb59c --- /dev/null +++ b/packages/snaps-simulation/src/middleware/multichain/middleware.ts @@ -0,0 +1,59 @@ +import type { JsonRpcMiddleware } from '@metamask/json-rpc-engine'; +import { rpcErrors } from '@metamask/rpc-errors'; +import { logError } from '@metamask/snaps-utils'; +import type { Json, JsonRpcParams } from '@metamask/utils'; + +import { createSessionHandler } from './create-session'; +import { getSessionHandler } from './get-session'; +import { invokeMethodHandler } from './invoke-method'; +import type { MultichainMiddlewareHooks } from '../../simulation'; + +const multichainHandlers = { + /* eslint-disable @typescript-eslint/naming-convention */ + wallet_createSession: createSessionHandler, + wallet_invokeMethod: invokeMethodHandler, + wallet_getSession: getSessionHandler, + /* eslint-enable @typescript-eslint/naming-convention */ +}; + +/** + * Create a middleware that handles requests to the multichain API. + * + * @param isMultichain - Whether the JSON-RPC pipeline has multichain enabled. + * @param hooks - Hooks required to execute the middleware RPC methods. + * @returns The middleware. + */ +export function createMultichainMiddleware( + isMultichain: boolean, + hooks: MultichainMiddlewareHooks, +): JsonRpcMiddleware { + return (request, response, next, end) => { + const isMultichainRequest = [ + 'wallet_createSession', + 'wallet_invokeMethod', + 'wallet_getSession', + 'wallet_revokeSession', + ].includes(request.method); + + if (!isMultichain && isMultichainRequest) { + throw rpcErrors.methodNotFound(); + } + + if (isMultichain && !isMultichainRequest) { + throw rpcErrors.methodNotFound(); + } + + const handler = + multichainHandlers[request.method as keyof typeof multichainHandlers]; + if (handler) { + try { + return handler(request as any, response, next, end, hooks as any); + } catch (error) { + logError(error); + return end(error); + } + } + + return next(); + }; +} diff --git a/packages/snaps-simulation/src/simulation.test.ts b/packages/snaps-simulation/src/simulation.test.ts index b252a27d71..726c877903 100644 --- a/packages/snaps-simulation/src/simulation.test.ts +++ b/packages/snaps-simulation/src/simulation.test.ts @@ -215,54 +215,33 @@ describe('installSnap', () => { }); describe('getRestrictedHooks', () => { - const controllerMessenger = getRootControllerMessenger(); const options = getMockOptions(); const { runSaga, store } = createStore(getMockOptions()); it('returns the `getMnemonic` hook', async () => { - const { getMnemonic } = getRestrictedHooks( - MOCK_SNAP_ID, - options, - store, - runSaga, - controllerMessenger, - ); + const { getMnemonic } = getRestrictedHooks(options, store, runSaga); expect(await getMnemonic()).toStrictEqual( mnemonicPhraseToBytes(DEFAULT_SRP), ); }); it('returns the `getIsLocked` hook', async () => { - const { getIsLocked } = getRestrictedHooks( - MOCK_SNAP_ID, - options, - store, - runSaga, - controllerMessenger, - ); + const { getIsLocked } = getRestrictedHooks(options, store, runSaga); expect(getIsLocked()).toBe(false); }); it('returns the `getClientCryptography` hook', async () => { const { getClientCryptography } = getRestrictedHooks( - MOCK_SNAP_ID, options, store, runSaga, - controllerMessenger, ); expect(getClientCryptography()).toStrictEqual({}); }); it('returns the `getSimulationState` hook', async () => { - const { getSimulationState } = getRestrictedHooks( - MOCK_SNAP_ID, - options, - store, - runSaga, - controllerMessenger, - ); + const { getSimulationState } = getRestrictedHooks(options, store, runSaga); expect(getSimulationState()).toStrictEqual(store.getState()); }); diff --git a/packages/snaps-simulation/src/simulation.ts b/packages/snaps-simulation/src/simulation.ts index a804030fc9..6d38b3ef5b 100644 --- a/packages/snaps-simulation/src/simulation.ts +++ b/packages/snaps-simulation/src/simulation.ts @@ -180,25 +180,6 @@ export type RestrictedMiddlewareHooks = { * @returns The simulation state. */ getSimulationState: () => ApplicationState; - - /** - * A hook that retrieves a caveat for a given permission. - * - * @param permission - The permission name. - * @param caveatType - The caveat type. - * @returns The caveat, if it exists. - */ - getCaveat: ( - permission: string, - caveatType: string, - ) => Caveat | undefined; - - /** - * A hook that grants permissions to the origin. - * - * @param permissions - The permissions. - */ - grantPermissions: (permissions: RequestedPermissions) => void; }; export type PermittedMiddlewareHooks = { @@ -371,6 +352,27 @@ export type PermittedMiddlewareHooks = { endTrace(request: EndTraceRequest): void; }; +export type MultichainMiddlewareHooks = { + /** + * A hook that retrieves a caveat for a given permission. + * + * @param permission - The permission name. + * @param caveatType - The caveat type. + * @returns The caveat, if it exists. + */ + getCaveat: ( + permission: string, + caveatType: string, + ) => Caveat | undefined; + + /** + * A hook that grants permissions to the origin. + * + * @param permissions - The permissions. + */ + grantPermissions: (permissions: RequestedPermissions) => void; +}; + /** * Install a Snap in a simulated environment. This will fetch the Snap files, * create a Redux store, set up the controllers and JSON-RPC stack, register the @@ -417,13 +419,7 @@ export async function installSnap< registerActions(controllerMessenger, runSaga, options, snapId); // Set up controllers and JSON-RPC stack. - const restrictedHooks = getRestrictedHooks( - snapId, - options, - store, - runSaga, - controllerMessenger, - ); + const restrictedHooks = getRestrictedHooks(options, store, runSaga); const permittedHooks = getPermittedHooks( snapId, @@ -432,6 +428,8 @@ export async function installSnap< runSaga, ); + const multichainHooks = getMultichainHooks(snapId, controllerMessenger); + const { subjectMetadataController, permissionController } = getControllers({ controllerMessenger, hooks: restrictedHooks, @@ -448,6 +446,7 @@ export async function installSnap< restrictedHooks, permittedHooks, permissionMiddleware, + multichainHooks, isMultichain: false, }); @@ -456,6 +455,7 @@ export async function installSnap< restrictedHooks, permittedHooks, permissionMiddleware, + multichainHooks, isMultichain: true, }); @@ -535,19 +535,15 @@ export async function installSnap< /** * Get the hooks for the simulation. * - * @param snapId - The Snap ID. * @param options - The simulation options. * @param store - The Redux store. * @param runSaga - The run saga function. - * @param controllerMessenger - The controller messenger. * @returns The hooks for the simulation. */ export function getRestrictedHooks( - snapId: SnapId, options: SimulationOptions, store: Store, runSaga: RunSagaFunction, - controllerMessenger: RootControllerMessenger, ): RestrictedMiddlewareHooks { return { getMnemonic: getGetMnemonicImplementation(options.secretRecoveryPhrase), @@ -559,27 +555,6 @@ export function getRestrictedHooks( getSnap: getGetSnapImplementation(true), setCurrentChain: getSetCurrentChainImplementation(runSaga), getSimulationState: store.getState.bind(store), - getCaveat: (permission: string, caveatType: string) => { - try { - return controllerMessenger.call( - 'PermissionController:getCaveat', - snapId, - permission, - caveatType, - ); - } catch (error) { - if (error instanceof PermissionDoesNotExistError) { - return undefined; - } - throw error; - } - }, - grantPermissions: (approvedPermissions: RequestedPermissions) => { - controllerMessenger.call('PermissionController:grantPermissions', { - subject: { origin: snapId }, - approvedPermissions, - }); - }, }; } @@ -652,6 +627,42 @@ export function getPermittedHooks( }; } +/** + * Get the hooks for the multichain middleware simulation. + * + * @param snapId - The Snap ID. + * @param controllerMessenger - The controller messenger. + * @returns The hooks for the middleware. + */ +export function getMultichainHooks( + snapId: SnapId, + controllerMessenger: RootControllerMessenger, +) { + return { + getCaveat: (permission: string, caveatType: string) => { + try { + return controllerMessenger.call( + 'PermissionController:getCaveat', + snapId, + permission, + caveatType, + ); + } catch (error) { + if (error instanceof PermissionDoesNotExistError) { + return undefined; + } + throw error; + } + }, + grantPermissions: (approvedPermissions: RequestedPermissions) => { + controllerMessenger.call('PermissionController:grantPermissions', { + subject: { origin: snapId }, + approvedPermissions, + }); + }, + }; +} + /** * Register mocked action handlers. * From f80d035c01b5e7ea9802ae7700e327f5bc3d2f77 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Wed, 7 Jan 2026 15:47:42 +0100 Subject: [PATCH 17/24] Inject accounts into session --- .../packages/multichain-provider/CHANGELOG.md | 2 +- .../multichain-provider/snap.manifest.json | 2 +- .../multichain-provider/src/index.test.ts | 9 ++- .../packages/multichain-provider/src/index.ts | 4 +- .../snaps-simulation/src/controllers.test.ts | 19 +++-- packages/snaps-simulation/src/controllers.ts | 15 +++- .../middleware/internal-methods/accounts.ts | 41 +++++++--- .../middleware/multichain/create-session.ts | 47 +++++------ .../src/middleware/multichain/get-session.ts | 35 ++++----- .../middleware/multichain/invoke-method.ts | 25 ++---- .../src/middleware/multichain/middleware.ts | 78 ++++++++++++------- packages/snaps-simulation/src/simulation.ts | 30 +++++-- 12 files changed, 172 insertions(+), 135 deletions(-) diff --git a/packages/examples/packages/multichain-provider/CHANGELOG.md b/packages/examples/packages/multichain-provider/CHANGELOG.md index da9116130a..720e00537e 100644 --- a/packages/examples/packages/multichain-provider/CHANGELOG.md +++ b/packages/examples/packages/multichain-provider/CHANGELOG.md @@ -7,4 +7,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -[Unreleased]: https://github.com/MetaMask/snaps/compare/@metamask/multichain-provider-example-snap@HEAD +[Unreleased]: https://github.com/MetaMask/snaps/ diff --git a/packages/examples/packages/multichain-provider/snap.manifest.json b/packages/examples/packages/multichain-provider/snap.manifest.json index ebe5dd5246..aab6c63188 100644 --- a/packages/examples/packages/multichain-provider/snap.manifest.json +++ b/packages/examples/packages/multichain-provider/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "Fw9wcR00gRhCuv8didz94NR4xdkbeOk0eCA2un4ONrw=", + "shasum": "/71hyHus4xSBCPLrzCzc7sYLZgRXAddpGoPT8Kw1PsM=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/multichain-provider/src/index.test.ts b/packages/examples/packages/multichain-provider/src/index.test.ts index 8c04121884..a3334c12eb 100644 --- a/packages/examples/packages/multichain-provider/src/index.test.ts +++ b/packages/examples/packages/multichain-provider/src/index.test.ts @@ -31,12 +31,14 @@ describe('onRpcRequest', () => { expect(response).toRespondWith({ sessionScopes: { 'eip155:1': { - accounts: [], + accounts: ['eip155:10xc6d5a3c98ec9073b54fa0969957bd582e8d874bf'], methods: expect.any(Array), notifications: expect.any(Array), }, 'eip155:11155111': { - accounts: [], + accounts: [ + 'eip155:11155111:0xc6d5a3c98ec9073b54fa0969957bd582e8d874bf', + ], methods: expect.any(Array), notifications: expect.any(Array), }, @@ -92,9 +94,8 @@ describe('onRpcRequest', () => { method: 'getAccounts', }); - // Currently, snaps-jest will always return this account. expect(response).toRespondWith([ - '0xc6d5a3c98ec9073b54fa0969957bd582e8d874bf', + 'eip155:1:0xc6d5a3c98ec9073b54fa0969957bd582e8d874bf', ]); }); }); diff --git a/packages/examples/packages/multichain-provider/src/index.ts b/packages/examples/packages/multichain-provider/src/index.ts index 7c28fa4bbf..788d6aa94f 100644 --- a/packages/examples/packages/multichain-provider/src/index.ts +++ b/packages/examples/packages/multichain-provider/src/index.ts @@ -51,7 +51,7 @@ async function createSession() { * @returns A list of CAIP-10 addresses. */ async function getAccounts(scope: CaipChainId) { - const session = await await (snap as any).request({ + const session = await (snap as any).request({ method: 'wallet_getSession', }); @@ -121,7 +121,7 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { case 'signTypedData': { const params = request.params as SignTypedDataParams; const accounts = await getAccounts(scope); - return await scopeModule.signMessage(accounts[0], params.message); + return await scopeModule.signTypedData(accounts[0], params.message); } case 'getGenesisHash': diff --git a/packages/snaps-simulation/src/controllers.test.ts b/packages/snaps-simulation/src/controllers.test.ts index 431baf15cf..4998f580a9 100644 --- a/packages/snaps-simulation/src/controllers.test.ts +++ b/packages/snaps-simulation/src/controllers.test.ts @@ -1,16 +1,18 @@ +import { mnemonicPhraseToBytes } from '@metamask/key-tree'; import { Messenger } from '@metamask/messenger'; import { PermissionController, SubjectMetadataController, } from '@metamask/permission-controller'; +import { DEFAULT_SRP } from './constants'; import { getControllers } from './controllers'; import type { RestrictedMiddlewareHooks } from './simulation'; import { getMockOptions } from './test-utils'; const MOCK_HOOKS: RestrictedMiddlewareHooks = { getIsLocked: jest.fn(), - getMnemonic: jest.fn(), + getMnemonic: jest.fn().mockResolvedValue(mnemonicPhraseToBytes(DEFAULT_SRP)), getSnapFile: jest.fn(), createInterface: jest.fn(), updateInterface: jest.fn(), @@ -19,13 +21,14 @@ const MOCK_HOOKS: RestrictedMiddlewareHooks = { }; describe('getControllers', () => { - it('returns the controllers', () => { - const { permissionController, subjectMetadataController } = getControllers({ - controllerMessenger: new Messenger({ namespace: 'Root' }), - hooks: MOCK_HOOKS, - runSaga: jest.fn(), - options: getMockOptions(), - }); + it('returns the controllers', async () => { + const { permissionController, subjectMetadataController } = + await getControllers({ + controllerMessenger: new Messenger({ namespace: 'Root' }), + hooks: MOCK_HOOKS, + runSaga: jest.fn(), + options: getMockOptions(), + }); expect(permissionController).toBeInstanceOf(PermissionController); expect(subjectMetadataController).toBeInstanceOf(SubjectMetadataController); diff --git a/packages/snaps-simulation/src/controllers.ts b/packages/snaps-simulation/src/controllers.ts index 6d452eeedb..f9c10c8982 100644 --- a/packages/snaps-simulation/src/controllers.ts +++ b/packages/snaps-simulation/src/controllers.ts @@ -32,6 +32,7 @@ import { getSafeJson } from '@metamask/utils'; import { getPermissionSpecifications } from './methods'; import { UNRESTRICTED_METHODS } from './methods/constants'; +import { getSimulationAccount } from './middleware/internal-methods/accounts'; import type { SimulationOptions } from './options'; import type { RestrictedMiddlewareHooks } from './simulation'; import type { RunSagaFunction } from './store'; @@ -74,7 +75,9 @@ export type Controllers = { * @param options - The options. * @returns The controllers for the Snap. */ -export function getControllers(options: GetControllersOptions): Controllers { +export async function getControllers( + options: GetControllersOptions, +): Promise { const { controllerMessenger } = options; const subjectMetadataController = new SubjectMetadataController({ messenger: new Messenger({ @@ -108,7 +111,7 @@ export function getControllers(options: GetControllersOptions): Controllers { messenger: interfaceControllerMessenger, }); - const permissionController = getPermissionController(options); + const permissionController = await getPermissionController(options); return { permissionController, @@ -125,7 +128,7 @@ export function getControllers(options: GetControllersOptions): Controllers { * @param options.options - Miscellaneous options. * @returns The permission controller for the Snap. */ -function getPermissionController(options: GetControllersOptions) { +async function getPermissionController(options: GetControllersOptions) { const { controllerMessenger } = options; const permissionSpecifications = getPermissionSpecifications(options); const messenger = new Messenger({ @@ -146,13 +149,17 @@ function getPermissionController(options: GetControllersOptions) { ], }); + const mnemonic = await options.hooks.getMnemonic(); + const defaultAddress = await getSimulationAccount(mnemonic); + return new PermissionController({ messenger, caveatSpecifications: { - // @ts-expect-error Missing args temporarily. [Caip25CaveatType]: caip25CaveatBuilder({ findNetworkClientIdByChainId: (chainId) => chainId, isNonEvmScopeSupported: (_scope) => true, + getNonEvmAccountAddresses: () => [], + listAccounts: () => [{ type: 'eip155:eoa', address: defaultAddress }], }), ...snapsCaveatsSpecifications, ...snapsEndowmentCaveatSpecifications, diff --git a/packages/snaps-simulation/src/middleware/internal-methods/accounts.ts b/packages/snaps-simulation/src/middleware/internal-methods/accounts.ts index d2f2ab5dbd..f93ed34035 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/accounts.ts +++ b/packages/snaps-simulation/src/middleware/internal-methods/accounts.ts @@ -3,12 +3,37 @@ import type { JsonRpcEngineNextCallback, } from '@metamask/json-rpc-engine'; import { BIP44Node } from '@metamask/key-tree'; -import type { JsonRpcRequest, PendingJsonRpcResponse } from '@metamask/utils'; +import type { + Hex, + JsonRpcRequest, + PendingJsonRpcResponse, +} from '@metamask/utils'; export type GetAccountsHandlerHooks = { getMnemonic: () => Promise; }; +/** + * Derive the account returned by the Snaps simulation. + * + * @param mnemonic - The mnemonic. + * @returns An account address. + */ +export async function getSimulationAccount(mnemonic: Uint8Array): Promise { + const { address } = await BIP44Node.fromDerivationPath({ + derivationPath: [ + mnemonic, + `bip32:44'`, + `bip32:60'`, + `bip32:0'`, + `bip32:0`, + `bip32:0`, + ], + }); + + return address as Hex; +} + /** * A mock handler for account related methods that always returns the first * address for the selected secret recovery phrase. @@ -31,17 +56,9 @@ export async function getAccountsHandler( ) { const { getMnemonic } = hooks; - const node = await BIP44Node.fromDerivationPath({ - derivationPath: [ - await getMnemonic(), - `bip32:44'`, - `bip32:60'`, - `bip32:0'`, - `bip32:0`, - `bip32:0`, - ], - }); + const mnemonic = await getMnemonic(); + const address = await getSimulationAccount(mnemonic); - response.result = [node.address]; + response.result = [address]; return end(); } diff --git a/packages/snaps-simulation/src/middleware/multichain/create-session.ts b/packages/snaps-simulation/src/middleware/multichain/create-session.ts index 15b55af8dd..9e60e66f3e 100644 --- a/packages/snaps-simulation/src/middleware/multichain/create-session.ts +++ b/packages/snaps-simulation/src/middleware/multichain/create-session.ts @@ -1,43 +1,33 @@ -import { getSessionScopes } from '@metamask/chain-agnostic-permission'; -import type { - JsonRpcEngineEndCallback, - JsonRpcEngineNextCallback, -} from '@metamask/json-rpc-engine'; +import { + getSessionScopes, + setEthAccounts, +} from '@metamask/chain-agnostic-permission'; import type { RequestedPermissions } from '@metamask/permission-controller'; import { rpcErrors } from '@metamask/rpc-errors'; -import { - isObject, - type JsonRpcRequest, - type PendingJsonRpcResponse, -} from '@metamask/utils'; +import { isObject, type JsonRpcRequest } from '@metamask/utils'; + +import { getSimulationAccount } from '../internal-methods/accounts'; export type CreateSessionHandlerHooks = { grantPermissions: (permissions: RequestedPermissions) => void; + getMnemonic: () => Promise; }; /** * A handler that implements a simplified version of `wallet_createSession`. * * @param request - Incoming JSON-RPC request. - * @param response - The outgoing JSON-RPC response, modified to return the - * result. - * @param _next - The `json-rpc-engine` middleware next handler. - * @param end - The `json-rpc-engine` middleware end handler. * @param hooks - The method hooks. * @returns The JSON-RPC response. */ -export function createSessionHandler( +export async function createSessionHandler( request: JsonRpcRequest, - response: PendingJsonRpcResponse, - _next: JsonRpcEngineNextCallback, - end: JsonRpcEngineEndCallback, hooks: CreateSessionHandlerHooks, ) { if (!isObject(request.params)) { - return end(rpcErrors.invalidParams({ data: { request } })); + throw rpcErrors.invalidParams({ data: { request } }); } - // TODO: Inject accounts const caveat = { requiredScopes: request.params.requiredScopes ?? {}, optionalScopes: request.params.optionalScopes ?? {}, @@ -45,25 +35,28 @@ export function createSessionHandler( isMultichainOrigin: true, }; + const mnemonic = await hooks.getMnemonic(); + const ethereumAccounts = [await getSimulationAccount(mnemonic)]; + + // @ts-expect-error Ignore for now. + const caveatWithAccounts = setEthAccounts(caveat, ethereumAccounts); + const permissions = { 'endowment:caip25': { caveats: [ { type: 'authorizedScopes', - value: caveat, + value: caveatWithAccounts, }, ], }, - }; + } as RequestedPermissions; - // @ts-expect-error Ignore for now. hooks.grantPermissions(permissions); - // @ts-expect-error Ignore for now. - const sessionScopes = getSessionScopes(caveat, { + const sessionScopes = getSessionScopes(caveatWithAccounts, { getNonEvmSupportedMethods: () => [], }); - response.result = { sessionScopes }; - return end(); + return { sessionScopes }; } diff --git a/packages/snaps-simulation/src/middleware/multichain/get-session.ts b/packages/snaps-simulation/src/middleware/multichain/get-session.ts index 11768f9f10..9bfb3b4c07 100644 --- a/packages/snaps-simulation/src/middleware/multichain/get-session.ts +++ b/packages/snaps-simulation/src/middleware/multichain/get-session.ts @@ -1,20 +1,17 @@ +import type { Caip25CaveatValue } from '@metamask/chain-agnostic-permission'; import { Caip25CaveatType, Caip25EndowmentPermissionName, + getSessionScopes, } from '@metamask/chain-agnostic-permission'; -import type { - JsonRpcEngineEndCallback, - JsonRpcEngineNextCallback, -} from '@metamask/json-rpc-engine'; import type { Caveat } from '@metamask/permission-controller'; -import type { - Json, - JsonRpcRequest, - PendingJsonRpcResponse, -} from '@metamask/utils'; +import type { Json, JsonRpcRequest } from '@metamask/utils'; export type GetSessionHandlerHooks = { - getCaveat: (permission: string, caveatType: string) => Caveat; + getCaveat: ( + permission: string, + caveatType: string, + ) => Caveat | undefined; }; /** @@ -22,25 +19,23 @@ export type GetSessionHandlerHooks = { * * @param _request - Incoming JSON-RPC request. Ignored for this specific * handler. - * @param response - The outgoing JSON-RPC response, modified to return the - * result. - * @param _next - The `json-rpc-engine` middleware next handler. - * @param end - The `json-rpc-engine` middleware end handler. * @param hooks - The method hooks. * @returns The JSON-RPC response. */ export function getSessionHandler( _request: JsonRpcRequest, - response: PendingJsonRpcResponse, - _next: JsonRpcEngineNextCallback, - end: JsonRpcEngineEndCallback, hooks: GetSessionHandlerHooks, ) { const caveat = hooks.getCaveat( Caip25EndowmentPermissionName, Caip25CaveatType, - ); - response.result = { sessionScopes: caveat?.value ?? {} }; + ) as Caveat; - return end(); + const sessionScopes = caveat + ? getSessionScopes(caveat.value, { + getNonEvmSupportedMethods: () => [], + }) + : {}; + + return { sessionScopes }; } diff --git a/packages/snaps-simulation/src/middleware/multichain/invoke-method.ts b/packages/snaps-simulation/src/middleware/multichain/invoke-method.ts index cb4edae3bf..c9d6370fec 100644 --- a/packages/snaps-simulation/src/middleware/multichain/invoke-method.ts +++ b/packages/snaps-simulation/src/middleware/multichain/invoke-method.ts @@ -2,10 +2,6 @@ import { Caip25CaveatType, Caip25EndowmentPermissionName, } from '@metamask/chain-agnostic-permission'; -import type { - JsonRpcEngineEndCallback, - JsonRpcEngineNextCallback, -} from '@metamask/json-rpc-engine'; import type { Caveat } from '@metamask/permission-controller'; import { rpcErrors } from '@metamask/rpc-errors'; import { @@ -13,33 +9,28 @@ import { isObject, type Json, type JsonRpcRequest, - type PendingJsonRpcResponse, } from '@metamask/utils'; export type InvokeMethodHandlerHooks = { - getCaveat: (permission: string, caveatType: string) => Caveat; + getCaveat: ( + permission: string, + caveatType: string, + ) => Caveat | undefined; }; /** * A handler that implements a simplified version of `wallet_invokeMethod`. * * @param request - Incoming JSON-RPC request. - * @param _response - The outgoing JSON-RPC response. Ignored for this specific - * handler. - * @param next - The `json-rpc-engine` middleware next handler. - * @param end - The `json-rpc-engine` middleware end handler. * @param hooks - The method hooks. - * @returns The JSON-RPC response. + * @returns Nothing. */ -export function invokeMethodHandler( +export async function invokeMethodHandler( request: JsonRpcRequest & { scope: CaipChainId }, - _response: PendingJsonRpcResponse, - next: JsonRpcEngineNextCallback, - end: JsonRpcEngineEndCallback, hooks: InvokeMethodHandlerHooks, ) { if (!isObject(request.params)) { - return end(rpcErrors.invalidParams({ data: { request } })); + throw rpcErrors.invalidParams({ data: { request } }); } // TODO: Struct? @@ -51,6 +42,4 @@ export function invokeMethodHandler( request.method = wrappedRequest.method; request.params = wrappedRequest.params; request.scope = scope; - - return next(); } diff --git a/packages/snaps-simulation/src/middleware/multichain/middleware.ts b/packages/snaps-simulation/src/middleware/multichain/middleware.ts index 488d9eb59c..c7b11eb0b6 100644 --- a/packages/snaps-simulation/src/middleware/multichain/middleware.ts +++ b/packages/snaps-simulation/src/middleware/multichain/middleware.ts @@ -1,7 +1,15 @@ -import type { JsonRpcMiddleware } from '@metamask/json-rpc-engine'; +import type { + AsyncJsonRpcEngineNextCallback, + createAsyncMiddleware, + type JsonRpcMiddleware, +} from '@metamask/json-rpc-engine'; import { rpcErrors } from '@metamask/rpc-errors'; -import { logError } from '@metamask/snaps-utils'; -import type { Json, JsonRpcParams } from '@metamask/utils'; +import type { + Json, + JsonRpcParams, + JsonRpcRequest, + PendingJsonRpcResponse, +} from '@metamask/utils'; import { createSessionHandler } from './create-session'; import { getSessionHandler } from './get-session'; @@ -27,33 +35,43 @@ export function createMultichainMiddleware( isMultichain: boolean, hooks: MultichainMiddlewareHooks, ): JsonRpcMiddleware { - return (request, response, next, end) => { - const isMultichainRequest = [ - 'wallet_createSession', - 'wallet_invokeMethod', - 'wallet_getSession', - 'wallet_revokeSession', - ].includes(request.method); - - if (!isMultichain && isMultichainRequest) { - throw rpcErrors.methodNotFound(); - } - - if (isMultichain && !isMultichainRequest) { - throw rpcErrors.methodNotFound(); - } - - const handler = - multichainHandlers[request.method as keyof typeof multichainHandlers]; - if (handler) { - try { - return handler(request as any, response, next, end, hooks as any); - } catch (error) { - logError(error); - return end(error); + return createAsyncMiddleware( + async ( + request: JsonRpcRequest, + response: PendingJsonRpcResponse, + next: AsyncJsonRpcEngineNextCallback, + ) => { + const isMultichainRequest = [ + 'wallet_createSession', + 'wallet_invokeMethod', + 'wallet_getSession', + 'wallet_revokeSession', + ].includes(request.method); + + if (!isMultichain && isMultichainRequest) { + throw rpcErrors.methodNotFound(); + } + + if (isMultichain && !isMultichainRequest) { + throw rpcErrors.methodNotFound(); + } + + const handler = + multichainHandlers[request.method as keyof typeof multichainHandlers]; + + if (!handler) { + await next(); + return; + } + + const result = await handler(request as any, hooks); + + if (result) { + response.result = result; + return; } - } - return next(); - }; + await next(); + }, + ); } diff --git a/packages/snaps-simulation/src/simulation.ts b/packages/snaps-simulation/src/simulation.ts index 6d38b3ef5b..7bd1099ba8 100644 --- a/packages/snaps-simulation/src/simulation.ts +++ b/packages/snaps-simulation/src/simulation.ts @@ -353,6 +353,12 @@ export type PermittedMiddlewareHooks = { }; export type MultichainMiddlewareHooks = { + /** + * A hook that returns the user's secret recovery phrase. + * + * @returns The user's secret recovery phrase. + */ + getMnemonic: () => Promise; /** * A hook that retrieves a caveat for a given permission. * @@ -428,14 +434,19 @@ export async function installSnap< runSaga, ); - const multichainHooks = getMultichainHooks(snapId, controllerMessenger); - - const { subjectMetadataController, permissionController } = getControllers({ - controllerMessenger, - hooks: restrictedHooks, - runSaga, + const multichainHooks = getMultichainHooks( + snapId, options, - }); + controllerMessenger, + ); + + const { subjectMetadataController, permissionController } = + await getControllers({ + controllerMessenger, + hooks: restrictedHooks, + runSaga, + options, + }); const permissionMiddleware = permissionController.createPermissionMiddleware({ origin: snapId, @@ -631,14 +642,17 @@ export function getPermittedHooks( * Get the hooks for the multichain middleware simulation. * * @param snapId - The Snap ID. + * @param options - The simulation options. * @param controllerMessenger - The controller messenger. * @returns The hooks for the middleware. */ export function getMultichainHooks( snapId: SnapId, + options: SimulationOptions, controllerMessenger: RootControllerMessenger, -) { +): MultichainMiddlewareHooks { return { + getMnemonic: getGetMnemonicImplementation(options.secretRecoveryPhrase), getCaveat: (permission: string, caveatType: string) => { try { return controllerMessenger.call( From d17e5143c78ae154fe7bca369eab46151b6d2c72 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Wed, 7 Jan 2026 15:53:13 +0100 Subject: [PATCH 18/24] Fix import --- .../snaps-simulation/src/middleware/multichain/middleware.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/snaps-simulation/src/middleware/multichain/middleware.ts b/packages/snaps-simulation/src/middleware/multichain/middleware.ts index c7b11eb0b6..e4bbf803d4 100644 --- a/packages/snaps-simulation/src/middleware/multichain/middleware.ts +++ b/packages/snaps-simulation/src/middleware/multichain/middleware.ts @@ -1,8 +1,8 @@ import type { AsyncJsonRpcEngineNextCallback, - createAsyncMiddleware, - type JsonRpcMiddleware, + JsonRpcMiddleware, } from '@metamask/json-rpc-engine'; +import { createAsyncMiddleware } from '@metamask/json-rpc-engine'; import { rpcErrors } from '@metamask/rpc-errors'; import type { Json, From 6244ce1e59fd94b1b6f44806b637a5423de3d4ac Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Wed, 7 Jan 2026 16:36:28 +0100 Subject: [PATCH 19/24] Tweak test-snaps layout and implementation --- .../MultichainProvider.tsx | 57 +++++++++++-------- .../components/SignMessage.tsx | 2 +- .../components/SignTypedData.tsx | 2 +- .../components/SwitchChain.tsx | 1 - 4 files changed, 34 insertions(+), 28 deletions(-) diff --git a/packages/test-snaps/src/features/snaps/multichain-provider/MultichainProvider.tsx b/packages/test-snaps/src/features/snaps/multichain-provider/MultichainProvider.tsx index 273f6a5c11..4c6e6819a2 100644 --- a/packages/test-snaps/src/features/snaps/multichain-provider/MultichainProvider.tsx +++ b/packages/test-snaps/src/features/snaps/multichain-provider/MultichainProvider.tsx @@ -34,6 +34,7 @@ export const MultichainProvider: FunctionComponent = () => { const handleCreateSession = () => handleSubmit('createSession'); const handleGetChainId = () => handleSubmit('getChainId'); const handleGetAccounts = () => handleSubmit('getAccounts'); + const handleGetGenesisHash = () => handleSubmit('getGenesisHash'); return ( { Create Session + + {scope.startsWith('eip155') && ( + + )} + + + {JSON.stringify(data, null, 2)} {JSON.stringify(error, null, 2)} - {scope.startsWith('eip155') && ( - <> - - - - - - - )} + {scope.startsWith('eip155') && } ); }; diff --git a/packages/test-snaps/src/features/snaps/multichain-provider/components/SignMessage.tsx b/packages/test-snaps/src/features/snaps/multichain-provider/components/SignMessage.tsx index 59a4dd9fa4..3fdf36e0e2 100644 --- a/packages/test-snaps/src/features/snaps/multichain-provider/components/SignMessage.tsx +++ b/packages/test-snaps/src/features/snaps/multichain-provider/components/SignMessage.tsx @@ -42,7 +42,7 @@ export const SignMessage: FunctionComponent = ({ scope }) => { return ( <> -

Personal Sign

+

Message Signing

Message = ({ Sign Typed Data - + {JSON.stringify(data, null, 2)} {JSON.stringify(error, null, 2)} diff --git a/packages/test-snaps/src/features/snaps/multichain-provider/components/SwitchChain.tsx b/packages/test-snaps/src/features/snaps/multichain-provider/components/SwitchChain.tsx index b6e776032c..0f356af94e 100644 --- a/packages/test-snaps/src/features/snaps/multichain-provider/components/SwitchChain.tsx +++ b/packages/test-snaps/src/features/snaps/multichain-provider/components/SwitchChain.tsx @@ -21,7 +21,6 @@ export const SwitchChain: FunctionComponent = ({ onChange={handleChange} > - From 50ecf3fb12634dd58f999fece507b4347174ba79 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Thu, 8 Jan 2026 11:11:34 +0100 Subject: [PATCH 20/24] Properly manage session scopes + request.scope --- .../multichain-provider/src/index.test.ts | 2 +- .../middleware/internal-methods/chain-id.ts | 18 +++++++--- .../internal-methods/net-version.ts | 19 +++++++---- .../middleware/multichain/create-session.ts | 10 ++---- .../src/middleware/multichain/get-session.ts | 9 ++--- .../middleware/multichain/invoke-method.ts | 17 ++++++++-- .../src/middleware/multichain/utils.ts | 33 +++++++++++++++++++ 7 files changed, 79 insertions(+), 29 deletions(-) create mode 100644 packages/snaps-simulation/src/middleware/multichain/utils.ts diff --git a/packages/examples/packages/multichain-provider/src/index.test.ts b/packages/examples/packages/multichain-provider/src/index.test.ts index a3334c12eb..d98f7c719c 100644 --- a/packages/examples/packages/multichain-provider/src/index.test.ts +++ b/packages/examples/packages/multichain-provider/src/index.test.ts @@ -31,7 +31,7 @@ describe('onRpcRequest', () => { expect(response).toRespondWith({ sessionScopes: { 'eip155:1': { - accounts: ['eip155:10xc6d5a3c98ec9073b54fa0969957bd582e8d874bf'], + accounts: ['eip155:1:0xc6d5a3c98ec9073b54fa0969957bd582e8d874bf'], methods: expect.any(Array), notifications: expect.any(Array), }, 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 ae62d4d104..80d4b84077 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/chain-id.ts +++ b/packages/snaps-simulation/src/middleware/internal-methods/chain-id.ts @@ -2,7 +2,13 @@ import type { JsonRpcEngineEndCallback, JsonRpcEngineNextCallback, } from '@metamask/json-rpc-engine'; -import type { JsonRpcRequest, PendingJsonRpcResponse } from '@metamask/utils'; +import { + bigIntToHex, + parseCaipChainId, + type CaipChainId, + type JsonRpcRequest, + type PendingJsonRpcResponse, +} from '@metamask/utils'; import type { InternalMethodsMiddlewareHooks } from './middleware'; @@ -10,8 +16,7 @@ import type { InternalMethodsMiddlewareHooks } from './middleware'; * A mock handler for eth_chainId that always returns a specific * hardcoded result. * - * @param _request - Incoming JSON-RPC request. Ignored for this specific - * handler. + * @param request - Incoming JSON-RPC request. * @param response - The outgoing JSON-RPC response, modified to return the * result. * @param _next - The `json-rpc-engine` middleware next handler. @@ -20,13 +25,16 @@ import type { InternalMethodsMiddlewareHooks } from './middleware'; * @returns The JSON-RPC response. */ export async function getChainIdHandler( - _request: JsonRpcRequest, + request: JsonRpcRequest & { scope?: CaipChainId }, response: PendingJsonRpcResponse, _next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: Pick, ) { - response.result = hooks.getSimulationState().chain.chainId; + const requestScope = request.scope && parseCaipChainId(request.scope); + response.result = requestScope + ? bigIntToHex(BigInt(requestScope.reference)) + : hooks.getSimulationState().chain.chainId; return end(); } 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 94b706e550..63c1143974 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/net-version.ts +++ b/packages/snaps-simulation/src/middleware/internal-methods/net-version.ts @@ -2,8 +2,12 @@ import type { JsonRpcEngineEndCallback, JsonRpcEngineNextCallback, } from '@metamask/json-rpc-engine'; -import { hexToBigInt } from '@metamask/utils'; -import type { JsonRpcRequest, PendingJsonRpcResponse } from '@metamask/utils'; +import { hexToBigInt, parseCaipChainId } from '@metamask/utils'; +import type { + CaipChainId, + JsonRpcRequest, + PendingJsonRpcResponse, +} from '@metamask/utils'; import type { InternalMethodsMiddlewareHooks } from './middleware'; @@ -11,8 +15,7 @@ import type { InternalMethodsMiddlewareHooks } from './middleware'; * A mock handler for net_version that always returns a specific * hardcoded result. * - * @param _request - Incoming JSON-RPC request. Ignored for this specific - * handler. + * @param request - Incoming JSON-RPC request. * @param response - The outgoing JSON-RPC response, modified to return the * result. * @param _next - The `json-rpc-engine` middleware next handler. @@ -21,14 +24,16 @@ import type { InternalMethodsMiddlewareHooks } from './middleware'; * @returns The JSON-RPC response. */ export async function getNetworkVersionHandler( - _request: JsonRpcRequest, + request: JsonRpcRequest & { scope?: CaipChainId }, response: PendingJsonRpcResponse, _next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: Pick, ) { - const hexChainId = hooks.getSimulationState().chain.chainId; - response.result = hexToBigInt(hexChainId).toString(10); + const requestScope = request.scope && parseCaipChainId(request.scope); + response.result = requestScope + ? BigInt(requestScope.reference).toString(10) + : hexToBigInt(hooks.getSimulationState().chain.chainId).toString(10); return end(); } diff --git a/packages/snaps-simulation/src/middleware/multichain/create-session.ts b/packages/snaps-simulation/src/middleware/multichain/create-session.ts index 9e60e66f3e..02eb5bf972 100644 --- a/packages/snaps-simulation/src/middleware/multichain/create-session.ts +++ b/packages/snaps-simulation/src/middleware/multichain/create-session.ts @@ -1,11 +1,9 @@ -import { - getSessionScopes, - setEthAccounts, -} from '@metamask/chain-agnostic-permission'; +import { setEthAccounts } from '@metamask/chain-agnostic-permission'; import type { RequestedPermissions } from '@metamask/permission-controller'; import { rpcErrors } from '@metamask/rpc-errors'; import { isObject, type JsonRpcRequest } from '@metamask/utils'; +import { getSessionScopes } from './utils'; import { getSimulationAccount } from '../internal-methods/accounts'; export type CreateSessionHandlerHooks = { @@ -54,9 +52,7 @@ export async function createSessionHandler( hooks.grantPermissions(permissions); - const sessionScopes = getSessionScopes(caveatWithAccounts, { - getNonEvmSupportedMethods: () => [], - }); + const sessionScopes = getSessionScopes(caveatWithAccounts); return { sessionScopes }; } diff --git a/packages/snaps-simulation/src/middleware/multichain/get-session.ts b/packages/snaps-simulation/src/middleware/multichain/get-session.ts index 9bfb3b4c07..bf0880873d 100644 --- a/packages/snaps-simulation/src/middleware/multichain/get-session.ts +++ b/packages/snaps-simulation/src/middleware/multichain/get-session.ts @@ -2,11 +2,12 @@ import type { Caip25CaveatValue } from '@metamask/chain-agnostic-permission'; import { Caip25CaveatType, Caip25EndowmentPermissionName, - getSessionScopes, } from '@metamask/chain-agnostic-permission'; import type { Caveat } from '@metamask/permission-controller'; import type { Json, JsonRpcRequest } from '@metamask/utils'; +import { getSessionScopes } from './utils'; + export type GetSessionHandlerHooks = { getCaveat: ( permission: string, @@ -31,11 +32,7 @@ export function getSessionHandler( Caip25CaveatType, ) as Caveat; - const sessionScopes = caveat - ? getSessionScopes(caveat.value, { - getNonEvmSupportedMethods: () => [], - }) - : {}; + const sessionScopes = caveat ? getSessionScopes(caveat.value) : {}; return { sessionScopes }; } diff --git a/packages/snaps-simulation/src/middleware/multichain/invoke-method.ts b/packages/snaps-simulation/src/middleware/multichain/invoke-method.ts index c9d6370fec..f7126329b7 100644 --- a/packages/snaps-simulation/src/middleware/multichain/invoke-method.ts +++ b/packages/snaps-simulation/src/middleware/multichain/invoke-method.ts @@ -1,9 +1,10 @@ +import type { Caip25CaveatValue } from '@metamask/chain-agnostic-permission'; import { Caip25CaveatType, Caip25EndowmentPermissionName, } from '@metamask/chain-agnostic-permission'; import type { Caveat } from '@metamask/permission-controller'; -import { rpcErrors } from '@metamask/rpc-errors'; +import { providerErrors, rpcErrors } from '@metamask/rpc-errors'; import { type CaipChainId, isObject, @@ -11,6 +12,8 @@ import { type JsonRpcRequest, } from '@metamask/utils'; +import { getSessionScopes } from './utils'; + export type InvokeMethodHandlerHooks = { getCaveat: ( permission: string, @@ -36,8 +39,16 @@ export async function invokeMethodHandler( // TODO: Struct? const { request: wrappedRequest, scope } = request.params as any; - hooks.getCaveat(Caip25EndowmentPermissionName, Caip25CaveatType); - // TODO: Validate + const caveat = hooks.getCaveat( + Caip25EndowmentPermissionName, + Caip25CaveatType, + ) as Caveat; + + const sessionScopes = getSessionScopes(caveat.value); + + if (!sessionScopes[scope]?.methods.includes(wrappedRequest.method)) { + throw providerErrors.unauthorized(); + } request.method = wrappedRequest.method; request.params = wrappedRequest.params; diff --git a/packages/snaps-simulation/src/middleware/multichain/utils.ts b/packages/snaps-simulation/src/middleware/multichain/utils.ts new file mode 100644 index 0000000000..fc0c3f974e --- /dev/null +++ b/packages/snaps-simulation/src/middleware/multichain/utils.ts @@ -0,0 +1,33 @@ +import type { + Caip25CaveatValue, + InternalScopeObject, +} from '@metamask/chain-agnostic-permission'; +import { getSessionScopes as getMergedSessionScopes } from '@metamask/chain-agnostic-permission'; +import type { CaipChainId } from '@metamask/utils'; + +/** + * Get a session scopes value that can be used for simulation, by injecting non-EVM methods into the returned session scopes + * directly from the caveat. + * + * @param value The caveat value. + * @returns The session scopes. + */ +export function getSessionScopes(value: Caip25CaveatValue) { + const mergedScopes = { + ...value.requiredScopes, + ...value.optionalScopes, + } as Record; + const nonEvmMethods = Object.keys(mergedScopes).reduce< + Record + >((accumulator, scope) => { + const castScope = scope as CaipChainId | 'wallet'; + if (!castScope.startsWith('eip155') && castScope !== 'wallet') { + accumulator[castScope] = mergedScopes[castScope].methods; + } + return accumulator; + }, {}); + + return getMergedSessionScopes(value, { + getNonEvmSupportedMethods: (scope) => nonEvmMethods[scope] ?? [], + }); +} From 289d1b4f046c37779f048b0962f103c488325a04 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Thu, 8 Jan 2026 11:30:21 +0100 Subject: [PATCH 21/24] Improve typing --- .../packages/multichain-provider/src/index.ts | 5 ++-- .../multichain-provider/src/modules/base.ts | 3 +-- packages/snaps-sdk/src/types/methods/index.ts | 1 + .../snaps-sdk/src/types/methods/methods.ts | 10 +++++++ .../methods/multichain/create-session.ts | 27 +++++++++++++++++++ .../types/methods/multichain/get-session.ts | 15 +++++++++++ .../src/types/methods/multichain/index.ts | 3 +++ .../types/methods/multichain/invoke-method.ts | 19 +++++++++++++ .../snaps-simulation/src/controllers.test.ts | 22 ++++++++------- .../src/methods/specifications.test.ts | 2 +- .../src/middleware/multichain/utils.ts | 1 + 11 files changed, 92 insertions(+), 16 deletions(-) create mode 100644 packages/snaps-sdk/src/types/methods/multichain/create-session.ts create mode 100644 packages/snaps-sdk/src/types/methods/multichain/get-session.ts create mode 100644 packages/snaps-sdk/src/types/methods/multichain/index.ts create mode 100644 packages/snaps-sdk/src/types/methods/multichain/invoke-method.ts diff --git a/packages/examples/packages/multichain-provider/src/index.ts b/packages/examples/packages/multichain-provider/src/index.ts index 788d6aa94f..45dfc91e6e 100644 --- a/packages/examples/packages/multichain-provider/src/index.ts +++ b/packages/examples/packages/multichain-provider/src/index.ts @@ -35,8 +35,7 @@ async function createSession() { accounts: [], }, }; - // TODO: Fix snap.request types - return await (snap as any).request({ + return await snap.request({ method: 'wallet_createSession', params: { optionalScopes, @@ -51,7 +50,7 @@ async function createSession() { * @returns A list of CAIP-10 addresses. */ async function getAccounts(scope: CaipChainId) { - const session = await (snap as any).request({ + const session = await snap.request({ method: 'wallet_getSession', }); diff --git a/packages/examples/packages/multichain-provider/src/modules/base.ts b/packages/examples/packages/multichain-provider/src/modules/base.ts index 909f808796..3a3d6d2d8f 100644 --- a/packages/examples/packages/multichain-provider/src/modules/base.ts +++ b/packages/examples/packages/multichain-provider/src/modules/base.ts @@ -35,8 +35,7 @@ export async function invokeMethod( scope: CaipChainId, request: Omit, ): Promise { - // TODO: Fix snap.request types - return (await (snap as any).request({ + return (await snap.request({ method: 'wallet_invokeMethod', params: { scope, diff --git a/packages/snaps-sdk/src/types/methods/index.ts b/packages/snaps-sdk/src/types/methods/index.ts index 72da8be705..abcc53a41a 100644 --- a/packages/snaps-sdk/src/types/methods/index.ts +++ b/packages/snaps-sdk/src/types/methods/index.ts @@ -21,6 +21,7 @@ export type * from './list-entropy-sources'; export type * from './manage-accounts'; export * from './manage-state'; export type * from './methods'; +export type * from './multichain'; export * from './notify'; export type * from './provider-request'; export type * from './request-snaps'; diff --git a/packages/snaps-sdk/src/types/methods/methods.ts b/packages/snaps-sdk/src/types/methods/methods.ts index 0668c1700a..7313a7677f 100644 --- a/packages/snaps-sdk/src/types/methods/methods.ts +++ b/packages/snaps-sdk/src/types/methods/methods.ts @@ -72,6 +72,13 @@ import type { ManageAccountsResult, } from './manage-accounts'; import type { ManageStateParams, ManageStateResult } from './manage-state'; +import type { + CreateSessionParams, + CreateSessionResult, + GetSessionParams, + GetSessionResult, + InvokeMethodParams, +} from './multichain'; import type { NotifyParams, NotifyResult } from './notify'; import type { OpenWebSocketParams, @@ -154,8 +161,11 @@ export type SnapMethods = { SendWebSocketMessageParams, SendWebSocketMessageResult, ]; + wallet_createSession: [CreateSessionParams, CreateSessionResult]; + wallet_getSession: [GetSessionParams, GetSessionResult]; wallet_getSnaps: [GetSnapsParams, GetSnapsResult]; wallet_invokeKeyring: [InvokeKeyringParams, InvokeKeyringResult]; + wallet_invokeMethod: [InvokeMethodParams, InvokeKeyringResult]; wallet_invokeSnap: [InvokeSnapParams, InvokeSnapResult]; wallet_snap: [InvokeSnapParams, InvokeSnapResult]; wallet_requestSnaps: [RequestSnapsParams, RequestSnapsResult]; diff --git a/packages/snaps-sdk/src/types/methods/multichain/create-session.ts b/packages/snaps-sdk/src/types/methods/multichain/create-session.ts new file mode 100644 index 0000000000..eab75fd53c --- /dev/null +++ b/packages/snaps-sdk/src/types/methods/multichain/create-session.ts @@ -0,0 +1,27 @@ +import type { CaipChainId } from '@metamask/utils'; + +export type SessionScopes = Record< + CaipChainId, + { + methods: string[]; + notifications: string[]; + accounts: string[]; + } +>; + +/** + * The request parameters for the `wallet_createSession` method. + * + * @property id - The id of the background event to cancel. + */ +export type CreateSessionParams = { + requiredScopes?: SessionScopes; + optionalScopes?: SessionScopes; +}; + +/** + * The result returned for the `wallet_createSession` method. + * + * @property sessionScopes - The scopes granted for the session. + */ +export type CreateSessionResult = { sessionScopes: SessionScopes }; diff --git a/packages/snaps-sdk/src/types/methods/multichain/get-session.ts b/packages/snaps-sdk/src/types/methods/multichain/get-session.ts new file mode 100644 index 0000000000..b5e8ca38b5 --- /dev/null +++ b/packages/snaps-sdk/src/types/methods/multichain/get-session.ts @@ -0,0 +1,15 @@ +import type { CreateSessionResult } from './create-session'; + +/** + * The request parameters for the `wallet_getSession` method. + * + * This method does not accept any parameters. + */ +export type GetSessionParams = never; + +/** + * The result returned for the `wallet_getSession` method. + * + * @property sessionScopes - The scopes granted for the session. + */ +export type GetSessionResult = CreateSessionResult; diff --git a/packages/snaps-sdk/src/types/methods/multichain/index.ts b/packages/snaps-sdk/src/types/methods/multichain/index.ts new file mode 100644 index 0000000000..552052da65 --- /dev/null +++ b/packages/snaps-sdk/src/types/methods/multichain/index.ts @@ -0,0 +1,3 @@ +export type * from './create-session'; +export type * from './get-session'; +export type * from './invoke-method'; diff --git a/packages/snaps-sdk/src/types/methods/multichain/invoke-method.ts b/packages/snaps-sdk/src/types/methods/multichain/invoke-method.ts new file mode 100644 index 0000000000..e916c5e99f --- /dev/null +++ b/packages/snaps-sdk/src/types/methods/multichain/invoke-method.ts @@ -0,0 +1,19 @@ +import type { CaipChainId, Json, JsonRpcRequest } from '@metamask/utils'; + +/** + * The request parameters for the `wallet_invokeMethod` method. + * + * @property scope - The scope on which to invoke the method. + * @property request - The request to send. + */ +export type InvokeMethodParams = { + scope: CaipChainId; + request: Pick; +}; + +/** + * The result returned for the `wallet_invokeMethod` method. + * + * This method returns the response of the wrapped request. + */ +export type InvokeMethodResult = Json; diff --git a/packages/snaps-simulation/src/controllers.test.ts b/packages/snaps-simulation/src/controllers.test.ts index 4998f580a9..89bf4ee11a 100644 --- a/packages/snaps-simulation/src/controllers.test.ts +++ b/packages/snaps-simulation/src/controllers.test.ts @@ -10,18 +10,20 @@ import { getControllers } from './controllers'; import type { RestrictedMiddlewareHooks } from './simulation'; import { getMockOptions } from './test-utils'; -const MOCK_HOOKS: RestrictedMiddlewareHooks = { - getIsLocked: jest.fn(), - getMnemonic: jest.fn().mockResolvedValue(mnemonicPhraseToBytes(DEFAULT_SRP)), - getSnapFile: jest.fn(), - createInterface: jest.fn(), - updateInterface: jest.fn(), - getInterfaceState: jest.fn(), - resolveInterface: jest.fn(), -}; - describe('getControllers', () => { it('returns the controllers', async () => { + const MOCK_HOOKS: RestrictedMiddlewareHooks = { + getIsLocked: jest.fn(), + getMnemonic: jest + .fn() + .mockResolvedValue(mnemonicPhraseToBytes(DEFAULT_SRP)), + getSnapFile: jest.fn(), + createInterface: jest.fn(), + updateInterface: jest.fn(), + getInterfaceState: jest.fn(), + resolveInterface: jest.fn(), + }; + const { permissionController, subjectMetadataController } = await getControllers({ controllerMessenger: new Messenger({ namespace: 'Root' }), diff --git a/packages/snaps-simulation/src/methods/specifications.test.ts b/packages/snaps-simulation/src/methods/specifications.test.ts index 8e622b6d1a..70b76b17c6 100644 --- a/packages/snaps-simulation/src/methods/specifications.test.ts +++ b/packages/snaps-simulation/src/methods/specifications.test.ts @@ -341,7 +341,7 @@ describe('getPermissionSpecifications', () => { describe('getEndowments', () => { it('returns the endowments', async () => { - const controllers = getControllers({ + const controllers = await getControllers({ controllerMessenger: new Messenger({ namespace: MOCK_ANY_NAMESPACE, }), diff --git a/packages/snaps-simulation/src/middleware/multichain/utils.ts b/packages/snaps-simulation/src/middleware/multichain/utils.ts index fc0c3f974e..1ca2fd1c38 100644 --- a/packages/snaps-simulation/src/middleware/multichain/utils.ts +++ b/packages/snaps-simulation/src/middleware/multichain/utils.ts @@ -17,6 +17,7 @@ export function getSessionScopes(value: Caip25CaveatValue) { ...value.requiredScopes, ...value.optionalScopes, } as Record; + const nonEvmMethods = Object.keys(mergedScopes).reduce< Record >((accumulator, scope) => { From 45a2b567392650d12152fa08a6c33f07be415bb8 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Thu, 8 Jan 2026 13:08:26 +0100 Subject: [PATCH 22/24] More type and docs fixes --- .../examples/packages/multichain-provider/src/index.ts | 5 +++-- .../src/types/methods/multichain/create-session.ts | 4 ++-- .../src/middleware/internal-methods/middleware.ts | 8 +------- .../src/middleware/multichain/create-session.ts | 4 ++-- .../src/middleware/multichain/invoke-method.ts | 2 +- .../src/middleware/multichain/middleware.ts | 2 +- .../snaps/multichain-provider/components/SwitchChain.tsx | 2 +- 7 files changed, 11 insertions(+), 16 deletions(-) diff --git a/packages/examples/packages/multichain-provider/src/index.ts b/packages/examples/packages/multichain-provider/src/index.ts index 45dfc91e6e..761fbb2ea7 100644 --- a/packages/examples/packages/multichain-provider/src/index.ts +++ b/packages/examples/packages/multichain-provider/src/index.ts @@ -84,9 +84,10 @@ function getModule(scope: CaipChainId) { * * - `createSession`: Create the multichain API session. * - `getChainId`: Get the current Ethereum chain ID as a string. - * - `getAccounts`: Get the Ethereum accounts that the snap has access to. + * - `getAccounts`: Get the accounts for the selected scope. * - `signMessage`: Sign a message using an Ethereum or Solana account. - * - `signTypedData` Sign a struct using an Ethereum account. + * - `signTypedData`: Sign a struct using an Ethereum account. + * - `getGenesisHash`: Get the genesis hash for the selected scope. * * @param params - The request parameters. * @param params.request - The JSON-RPC request object. diff --git a/packages/snaps-sdk/src/types/methods/multichain/create-session.ts b/packages/snaps-sdk/src/types/methods/multichain/create-session.ts index eab75fd53c..c30f281d3c 100644 --- a/packages/snaps-sdk/src/types/methods/multichain/create-session.ts +++ b/packages/snaps-sdk/src/types/methods/multichain/create-session.ts @@ -1,11 +1,11 @@ -import type { CaipChainId } from '@metamask/utils'; +import type { CaipAccountId, CaipChainId } from '@metamask/utils'; export type SessionScopes = Record< CaipChainId, { methods: string[]; notifications: string[]; - accounts: string[]; + accounts: CaipAccountId[]; } >; diff --git a/packages/snaps-simulation/src/middleware/internal-methods/middleware.ts b/packages/snaps-simulation/src/middleware/internal-methods/middleware.ts index 991988c099..69b8732db7 100644 --- a/packages/snaps-simulation/src/middleware/internal-methods/middleware.ts +++ b/packages/snaps-simulation/src/middleware/internal-methods/middleware.ts @@ -63,13 +63,7 @@ export function createInternalMethodsMiddleware( if (handler) { try { // Implementations may or may not be async, so we must await them. - return await handler( - request as any, - response as any, - next, - end, - hooks as any, - ); + return await handler(request, response, next, end, hooks); } catch (error: any) { logError(error); return end(error); diff --git a/packages/snaps-simulation/src/middleware/multichain/create-session.ts b/packages/snaps-simulation/src/middleware/multichain/create-session.ts index 02eb5bf972..d7748107f3 100644 --- a/packages/snaps-simulation/src/middleware/multichain/create-session.ts +++ b/packages/snaps-simulation/src/middleware/multichain/create-session.ts @@ -1,3 +1,4 @@ +import type { Caip25CaveatValue } from '@metamask/chain-agnostic-permission'; import { setEthAccounts } from '@metamask/chain-agnostic-permission'; import type { RequestedPermissions } from '@metamask/permission-controller'; import { rpcErrors } from '@metamask/rpc-errors'; @@ -31,12 +32,11 @@ export async function createSessionHandler( optionalScopes: request.params.optionalScopes ?? {}, sessionProperties: {}, isMultichainOrigin: true, - }; + } as Caip25CaveatValue; const mnemonic = await hooks.getMnemonic(); const ethereumAccounts = [await getSimulationAccount(mnemonic)]; - // @ts-expect-error Ignore for now. const caveatWithAccounts = setEthAccounts(caveat, ethereumAccounts); const permissions = { diff --git a/packages/snaps-simulation/src/middleware/multichain/invoke-method.ts b/packages/snaps-simulation/src/middleware/multichain/invoke-method.ts index f7126329b7..2950962857 100644 --- a/packages/snaps-simulation/src/middleware/multichain/invoke-method.ts +++ b/packages/snaps-simulation/src/middleware/multichain/invoke-method.ts @@ -29,7 +29,7 @@ export type InvokeMethodHandlerHooks = { * @returns Nothing. */ export async function invokeMethodHandler( - request: JsonRpcRequest & { scope: CaipChainId }, + request: JsonRpcRequest & { scope?: CaipChainId }, hooks: InvokeMethodHandlerHooks, ) { if (!isObject(request.params)) { diff --git a/packages/snaps-simulation/src/middleware/multichain/middleware.ts b/packages/snaps-simulation/src/middleware/multichain/middleware.ts index e4bbf803d4..4799c7f5e7 100644 --- a/packages/snaps-simulation/src/middleware/multichain/middleware.ts +++ b/packages/snaps-simulation/src/middleware/multichain/middleware.ts @@ -64,7 +64,7 @@ export function createMultichainMiddleware( return; } - const result = await handler(request as any, hooks); + const result = await handler(request, hooks); if (result) { response.result = result; diff --git a/packages/test-snaps/src/features/snaps/multichain-provider/components/SwitchChain.tsx b/packages/test-snaps/src/features/snaps/multichain-provider/components/SwitchChain.tsx index 0f356af94e..323c61a5c6 100644 --- a/packages/test-snaps/src/features/snaps/multichain-provider/components/SwitchChain.tsx +++ b/packages/test-snaps/src/features/snaps/multichain-provider/components/SwitchChain.tsx @@ -16,7 +16,7 @@ export const SwitchChain: FunctionComponent = ({ <>

Select chain