Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

843 changes: 843 additions & 0 deletions .yarn/patches/@metamask-snaps-rpc-methods-npm-14.1.1-ac6ae2a3ba.patch

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions app/scripts/controller-init/snaps/execution-service-init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,16 @@
import { ControllerInitFunction } from '../types';
import { isManifestV3 } from '../../../../shared/modules/mv3.utils';
import { ExecutionServiceMessenger } from '../messengers/snaps';
import { setupMultiplex } from '../../lib/stream-utils';
import {
METAMASK_CAIP_MULTICHAIN_PROVIDER,
METAMASK_EIP_1193_PROVIDER,
} from '../../constants/stream';

/**

Check failure on line 18 in app/scripts/controller-init/snaps/execution-service-init.ts

View workflow job for this annotation

GitHub Actions / test-lint / Test lint

Missing JSDoc @param "request.setupUntrustedCommunicationCaip" declaration
* Initialize the Snaps execution service.
*
* @param request - The request object.

Check failure on line 21 in app/scripts/controller-init/snaps/execution-service-init.ts

View workflow job for this annotation

GitHub Actions / test-lint / Test lint

Missing @param "request.setupUntrustedCommunicationCaip"
* @param request.controllerMessenger - The messenger to use for the service.
* @param request.offscreenPromise - The promise that resolves when the
* offscreen document is ready.
Expand All @@ -28,6 +33,7 @@
controllerMessenger,
offscreenPromise,
setupUntrustedCommunicationEip1193,
setupUntrustedCommunicationCaip,
}) => {
const useOffscreenDocument =
isManifestV3 &&
Expand All @@ -46,6 +52,15 @@
sender: { snapId },
subjectType: SubjectType.Snap,
});

const mux = setupMultiplex(connectionStream);
mux.ignoreStream(METAMASK_EIP_1193_PROVIDER);

setupUntrustedCommunicationCaip({
connectionStream: mux.createStream(METAMASK_CAIP_MULTICHAIN_PROVIDER),
sender: { snapId },
subjectType: SubjectType.Snap,
});
}

if (useOffscreenDocument) {
Expand Down
2 changes: 2 additions & 0 deletions app/scripts/metamask-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -9438,6 +9438,8 @@ export default class MetamaskController extends EventEmitter {
removeAllConnections: this.removeAllConnections.bind(this),
setupUntrustedCommunicationEip1193:
this.setupUntrustedCommunicationEip1193.bind(this),
setupUntrustedCommunicationCaip:
this.setupUntrustedCommunicationCaip.bind(this),
setLocked: this.setLocked.bind(this),
showNotification: this.platform._showNotification,
showUserConfirmation: this.opts.showUserConfirmation,
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -373,8 +373,8 @@
"@metamask/signature-controller": "^38.0.0",
"@metamask/smart-transactions-controller": "^21.0.0",
"@metamask/snaps-controllers": "^17.2.0",
"@metamask/snaps-execution-environments": "^10.3.0",
"@metamask/snaps-rpc-methods": "^14.1.1",
"@metamask/snaps-execution-environments": "patch:@metamask/snaps-execution-environments@npm%3A10.3.0#~/.yarn/patches/@metamask-snaps-execution-environments-npm-10.3.0-75e3841f68.patch",
"@metamask/snaps-rpc-methods": "patch:@metamask/snaps-rpc-methods@npm%3A14.1.1#~/.yarn/patches/@metamask-snaps-rpc-methods-npm-14.1.1-ac6ae2a3ba.patch",
"@metamask/snaps-sdk": "^10.3.0",
"@metamask/snaps-utils": "^11.7.0",
"@metamask/solana-wallet-snap": "^2.5.1",
Expand Down
47 changes: 41 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8327,7 +8327,7 @@ __metadata:
languageName: node
linkType: hard

"@metamask/snaps-execution-environments@npm:^10.3.0":
"@metamask/snaps-execution-environments@npm:10.3.0":
version: 10.3.0
resolution: "@metamask/snaps-execution-environments@npm:10.3.0"
dependencies:
Expand All @@ -8345,6 +8345,24 @@ __metadata:
languageName: node
linkType: hard

"@metamask/snaps-execution-environments@patch:@metamask/snaps-execution-environments@npm%3A10.3.0#~/.yarn/patches/@metamask-snaps-execution-environments-npm-10.3.0-75e3841f68.patch":
version: 10.3.0
resolution: "@metamask/snaps-execution-environments@patch:@metamask/snaps-execution-environments@npm%3A10.3.0#~/.yarn/patches/@metamask-snaps-execution-environments-npm-10.3.0-75e3841f68.patch::version=10.3.0&hash=516850"
dependencies:
"@metamask/json-rpc-engine": "npm:^10.1.0"
"@metamask/object-multiplex": "npm:^2.1.0"
"@metamask/post-message-stream": "npm:^10.0.0"
"@metamask/providers": "npm:^22.1.1"
"@metamask/rpc-errors": "npm:^7.0.3"
"@metamask/snaps-sdk": "npm:^10.2.0"
"@metamask/snaps-utils": "npm:^11.6.2"
"@metamask/superstruct": "npm:^3.2.1"
"@metamask/utils": "npm:^11.8.1"
readable-stream: "npm:^3.6.2"
checksum: 10/15359d81f93130ee457763ddea6d5f928f61e3cd2c3e549061907332ec6cc97d0a16b2990266652df3ba76fedf66bc8b543ad9e235bb8183f3faf6090cdbf698
languageName: node
linkType: hard

"@metamask/snaps-registry@npm:^3.2.3":
version: 3.3.0
resolution: "@metamask/snaps-registry@npm:3.3.0"
Expand All @@ -8369,6 +8387,23 @@ __metadata:
languageName: node
linkType: hard

"@metamask/snaps-rpc-methods@npm:14.1.1, @metamask/snaps-rpc-methods@npm:^14.1.1":
version: 14.1.1
resolution: "@metamask/snaps-rpc-methods@npm:14.1.1"
dependencies:
"@metamask/key-tree": "npm:^10.1.1"
"@metamask/permission-controller": "npm:^12.1.0"
"@metamask/rpc-errors": "npm:^7.0.3"
"@metamask/snaps-sdk": "npm:^10.1.0"
"@metamask/snaps-utils": "npm:^11.6.1"
"@metamask/superstruct": "npm:^3.2.1"
"@metamask/utils": "npm:^11.8.1"
"@noble/hashes": "npm:^1.7.1"
async-mutex: "npm:^0.5.0"
checksum: 10/871c50f20e6427bcb14d30648bca2867725cc8ef6df579ef8951481f9919ebed2a7713dd821c94666829e240df6ceeb6181a0203fe18413e20a7ff45b1b29895
languageName: node
linkType: hard

"@metamask/snaps-rpc-methods@npm:^13.5.0":
version: 13.5.3
resolution: "@metamask/snaps-rpc-methods@npm:13.5.3"
Expand All @@ -8385,9 +8420,9 @@ __metadata:
languageName: node
linkType: hard

"@metamask/snaps-rpc-methods@npm:^14.1.1":
"@metamask/snaps-rpc-methods@patch:@metamask/snaps-rpc-methods@npm%3A14.1.1#~/.yarn/patches/@metamask-snaps-rpc-methods-npm-14.1.1-ac6ae2a3ba.patch":
version: 14.1.1
resolution: "@metamask/snaps-rpc-methods@npm:14.1.1"
resolution: "@metamask/snaps-rpc-methods@patch:@metamask/snaps-rpc-methods@npm%3A14.1.1#~/.yarn/patches/@metamask-snaps-rpc-methods-npm-14.1.1-ac6ae2a3ba.patch::version=14.1.1&hash=c129f6"
dependencies:
"@metamask/key-tree": "npm:^10.1.1"
"@metamask/permission-controller": "npm:^12.1.0"
Expand All @@ -8398,7 +8433,7 @@ __metadata:
"@metamask/utils": "npm:^11.8.1"
"@noble/hashes": "npm:^1.7.1"
async-mutex: "npm:^0.5.0"
checksum: 10/871c50f20e6427bcb14d30648bca2867725cc8ef6df579ef8951481f9919ebed2a7713dd821c94666829e240df6ceeb6181a0203fe18413e20a7ff45b1b29895
checksum: 10/58896123692fdc87a3c1bdef32159806eada96ff6a248f9161947fa30cd967b0f2d992b31fd78b4dbb16d74801462475a4496232679911d7e01a5e0d072ccb10
languageName: node
linkType: hard

Expand Down Expand Up @@ -32913,8 +32948,8 @@ __metadata:
"@metamask/snap-account-abstraction-keyring-site": "npm:^1.0.0"
"@metamask/snap-simple-keyring-site": "npm:^2.0.0"
"@metamask/snaps-controllers": "npm:^17.2.0"
"@metamask/snaps-execution-environments": "npm:^10.3.0"
"@metamask/snaps-rpc-methods": "npm:^14.1.1"
"@metamask/snaps-execution-environments": "patch:@metamask/snaps-execution-environments@npm%3A10.3.0#~/.yarn/patches/@metamask-snaps-execution-environments-npm-10.3.0-75e3841f68.patch"
"@metamask/snaps-rpc-methods": "patch:@metamask/snaps-rpc-methods@npm%3A14.1.1#~/.yarn/patches/@metamask-snaps-rpc-methods-npm-14.1.1-ac6ae2a3ba.patch"
"@metamask/snaps-sdk": "npm:^10.3.0"
"@metamask/snaps-utils": "npm:^11.7.0"
"@metamask/solana-wallet-snap": "npm:^2.5.1"
Expand Down
Loading