Add more tests

Author: FrederikBolding

packages/examples/packages/browserify-plugin/snap.manifest.json

@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "ssGPi4fxyZSvKOMXbVdOa/vnTx0qrq6WZWCUV91dLqo=",
+    "shasum": "OSiIEtXrriLywqI5Ri/27eUOis8/bkC0K9YNYXX27yc=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

packages/examples/packages/browserify/snap.manifest.json

@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "+342Ghzfo9UpTxJgqIPOieHvqRTnf4h00s8r0DpbozY=",
+    "shasum": "cRFWr8JAZoT/HDjmUcJe+1gNOtSQzikgwKw+WxrPjig=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

packages/snaps-controllers/coverage.json

@@ -1,6 +1,6 @@
 {
-  "branches": 92.96,
-  "functions": 96.56,
-  "lines": 98.05,
-  "statements": 97.77
+  "branches": 93.16,
+  "functions": 96.63,
+  "lines": 98.1,
+  "statements": 97.82
 }

packages/snaps-controllers/src/multichain/MultichainRoutingController.test.ts

@@ -198,4 +198,97 @@ describe('MultichainRoutingController', () => {
       }),
     ).rejects.toThrow('The method does not exist / is not available');
   });
+
+  it('throws if address resolution fails', async () => {
+    const rootMessenger = getRootMultichainRoutingControllerMessenger();
+    const messenger =
+      getRestrictedMultichainRoutingControllerMessenger(rootMessenger);
+
+    /* eslint-disable-next-line no-new */
+    new MultichainRoutingController({
+      messenger,
+    });
+
+    rootMessenger.registerActionHandler(
+      'AccountsController:listMultichainAccounts',
+      () => MOCK_SOLANA_ACCOUNTS,
+    );
+
+    rootMessenger.registerActionHandler(
+      'PermissionController:getPermissions',
+      () => MOCK_SOLANA_SNAP_PERMISSIONS,
+    );
+
+    rootMessenger.registerActionHandler(
+      'SnapController:handleRequest',
+      async ({ handler }) => {
+        if (handler === HandlerType.OnKeyringRequest) {
+          // Simulate the Snap returning a bogus address
+          return { address: 'foo' };
+        }
+        throw new Error('Unmocked request');
+      },
+    );
+
+    await expect(
+      messenger.call('MultichainRoutingController:handleRequest', {
+        connectedAddresses: SOLANA_CONNECTED_ACCOUNTS,
+        scope: SOLANA_CAIP2,
+        request: {
+          method: 'signAndSendTransaction',
+          params: {
+            message: 'foo',
+          },
+        },
+      }),
+    ).rejects.toThrow('Internal JSON-RPC error');
+  });
+
+  it('throws if address resolution returns an address that isnt available', async () => {
+    const rootMessenger = getRootMultichainRoutingControllerMessenger();
+    const messenger =
+      getRestrictedMultichainRoutingControllerMessenger(rootMessenger);
+
+    /* eslint-disable-next-line no-new */
+    new MultichainRoutingController({
+      messenger,
+    });
+
+    rootMessenger.registerActionHandler(
+      'AccountsController:listMultichainAccounts',
+      () => MOCK_SOLANA_ACCOUNTS,
+    );
+
+    rootMessenger.registerActionHandler(
+      'PermissionController:getPermissions',
+      () => MOCK_SOLANA_SNAP_PERMISSIONS,
+    );
+
+    rootMessenger.registerActionHandler(
+      'SnapController:handleRequest',
+      async ({ handler }) => {
+        if (handler === HandlerType.OnKeyringRequest) {
+          // Simulate the Snap returning an unconnected address
+          return {
+            address:
+              'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp:7S3P4HxJpyyigGzodYwHtCxZyUQe9JiBMHyRWXArAaKa',
+          };
+        }
+        throw new Error('Unmocked request');
+      },
+    );
+
+    await expect(
+      messenger.call('MultichainRoutingController:handleRequest', {
+        connectedAddresses: SOLANA_CONNECTED_ACCOUNTS,
+        scope: SOLANA_CAIP2,
+        request: {
+          method: 'signAndSendTransaction',
+          params: {
+            message: 'foo',
+          },
+        },
+      }),
+    ).rejects.toThrow('Invalid method parameter(s)');
+  });
 });

packages/snaps-execution-environments/src/common/BaseSnapExecutor.test.browser.ts

@@ -1600,6 +1600,48 @@ describe('BaseSnapExecutor', () => {
     });
   });
 
+  it('supports onProtocolRequest export', async () => {
+    const CODE = `
+      module.exports.onProtocolRequest = ({ origin, scope, request }) => ({ origin, scope, request })
+    `;
+
+    const executor = new TestSnapExecutor();
+    await executor.executeSnap(1, MOCK_SNAP_ID, CODE, []);
+
+    expect(await executor.readCommand()).toStrictEqual({
+      jsonrpc: '2.0',
+      id: 1,
+      result: 'OK',
+    });
+
+    const params = {
+      scope: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+      request: {
+        jsonrpc: '2.0',
+        id: 'foo',
+        method: 'getVersion',
+      },
+    };
+
+    await executor.writeCommand({
+      jsonrpc: '2.0',
+      id: 2,
+      method: 'snapRpc',
+      params: [
+        MOCK_SNAP_ID,
+        HandlerType.OnProtocolRequest,
+        MOCK_ORIGIN,
+        { jsonrpc: '2.0', method: '', params },
+      ],
+    });
+
+    expect(await executor.readCommand()).toStrictEqual({
+      id: 2,
+      jsonrpc: '2.0',
+      result: { origin: MOCK_ORIGIN, ...params },
+    });
+  });
+
   describe('lifecycle hooks', () => {
     const LIFECYCLE_HOOKS = [HandlerType.OnInstall, HandlerType.OnUpdate];
 

packages/snaps-execution-environments/src/common/validation.test.ts

@@ -2,6 +2,7 @@ import { UserInputEventType } from '@metamask/snaps-sdk';
 
 import {
   assertIsOnNameLookupRequestArguments,
+  assertIsOnProtocolRequestArguments,
   assertIsOnSignatureRequestArguments,
   assertIsOnTransactionRequestArguments,
   assertIsOnUserInputRequestArguments,
@@ -232,3 +233,68 @@ describe('assertIsOnUserInputRequestArguments', () => {
     );
   });
 });
+
+describe('assertIsOnProtocolRequestArguments', () => {
+  it.each([
+    {
+      scope: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+      request: {
+        jsonrpc: '2.0',
+        id: 'foo',
+        method: 'getVersion',
+      },
+    },
+    {
+      scope: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+      request: {
+        jsonrpc: '2.0',
+        id: 'foo',
+        method: 'getVersion',
+        params: {
+          foo: 'bar',
+        },
+      },
+    },
+  ])('does not throw for a valid protocol request param object', (value) => {
+    expect(() => assertIsOnProtocolRequestArguments(value)).not.toThrow();
+  });
+
+  it.each([
+    true,
+    false,
+    null,
+    undefined,
+    0,
+    1,
+    '',
+    'foo',
+    [],
+    {},
+    { request: { foo: 'bar' } },
+    {
+      request: {
+        jsonrpc: '2.0',
+        id: 'foo',
+        method: 'getVersion',
+        params: {
+          foo: 'bar',
+        },
+      },
+    },
+    {
+      scope: 'foo',
+      request: {
+        jsonrpc: '2.0',
+        id: 'foo',
+        method: 'getVersion',
+      },
+    },
+  ])(
+    'throws if the value is not a valid protocol request params object',
+    (value) => {
+      expect(() => assertIsOnProtocolRequestArguments(value as any)).toThrow(
+        'Invalid request params:',
+      );
+    },
+  );
+});

packages/snaps-rpc-methods/jest.config.js

@@ -10,10 +10,10 @@ module.exports = deepmerge(baseConfig, {
   ],
   coverageThreshold: {
     global: {
-      branches: 93.97,
-      functions: 98.05,
-      lines: 98.67,
-      statements: 98.25,
+      branches: 94.17,
+      functions: 98.59,
+      lines: 98.78,
+      statements: 98.37,
     },
   },
 });

packages/snaps-simulation/src/methods/specifications.test.ts

@@ -133,6 +133,19 @@ describe('getPermissionSpecifications', () => {
           ],
           "targetName": "endowment:page-settings",
         },
+        "endowment:protocol": {
+          "allowedCaveats": [
+            "protocolSnapScopes",
+            "maxRequestTime",
+          ],
+          "endowmentGetter": [Function],
+          "permissionType": "Endowment",
+          "subjectTypes": [
+            "snap",
+          ],
+          "targetName": "endowment:protocol",
+          "validator": [Function],
+        },
         "endowment:rpc": {
           "allowedCaveats": [
             "rpcOrigin",