Jl/caip25 permission migration/update mutators

app/scripts/controllers/permissions/background-api.test.js

@@ -120,14 +120,6 @@ describe('permission background API methods', () => {
                 'eip155:1:0x4',
               ],
             },
-            'wallet:eip155': {
-              accounts: [
-                'wallet:eip155:0x1',
-                'wallet:eip155:0x2',
-                'wallet:eip155:0x3',
-                'wallet:eip155:0x4',
-              ],
-            },
           },
           isMultichainOrigin: true,
         },
@@ -245,15 +237,6 @@ describe('permission background API methods', () => {
                 'eip155:1:0x5',
               ],
             },
-            'wallet:eip155': {
-              accounts: [
-                'wallet:eip155:0x1',
-                'wallet:eip155:0x2',
-                'wallet:eip155:0x3',
-                'wallet:eip155:0x4',
-                'wallet:eip155:0x5',
-              ],
-            },
           },
           isMultichainOrigin: true,
         },
@@ -424,9 +407,6 @@ describe('permission background API methods', () => {
             'eip155:1': {
               accounts: ['eip155:1:0x1', 'eip155:1:0x3'],
             },
-            'wallet:eip155': {
-              accounts: ['wallet:eip155:0x1', 'wallet:eip155:0x3'],
-            },
           },
           isMultichainOrigin: true,
         },
@@ -510,9 +490,6 @@ describe('permission background API methods', () => {
                     'eip155:5': {
                       accounts: ['eip155:5:0xdeadbeef'],
                     },
-                    'wallet:eip155': {
-                      accounts: ['wallet:eip155:0xdeadbeef'],
-                    },
                   },
                   isMultichainOrigin: false,
                 },
@@ -619,9 +596,6 @@ describe('permission background API methods', () => {
             'eip155:1337': {
               accounts: ['eip155:1337:0x1', 'eip155:1337:0x2'],
             },
-            'wallet:eip155': {
-              accounts: ['wallet:eip155:0x1', 'wallet:eip155:0x2'],
-            },
           },
           isMultichainOrigin: true,
         },
@@ -727,9 +701,6 @@ describe('permission background API methods', () => {
             'eip155:5': {
               accounts: ['eip155:5:0x1', 'eip155:5:0x2'],
             },
-            'wallet:eip155': {
-              accounts: ['wallet:eip155:0x1', 'wallet:eip155:0x2'],
-            },
           },
           isMultichainOrigin: true,
         },

app/scripts/controllers/permissions/index.js

@@ -1,4 +1,3 @@
-export * from './caveat-mutators';
 export * from './background-api';
 export * from './enums';
 export * from './specifications';

app/scripts/lib/rpc-method-middleware/handlers/request-accounts.test.ts

@@ -231,14 +231,18 @@ describe('requestEthereumAccountsHandler', () => {
       expect(MockMultichain.setPermittedEthChainIds).not.toHaveBeenCalled();
     });
 
-    it('sets the approved accounts on an empty CAIP-25 caveat with isMultichainOrigin: false if origin is snapId', async () => {
+    it('sets the approved accounts for the `wallet:eip155` scope with isMultichainOrigin: false if origin is snapId', async () => {
       const { handler } = createMockedHandler();
 
       await handler({ ...baseRequest, origin: 'npm:snap' });
       expect(MockMultichain.setEthAccounts).toHaveBeenCalledWith(
         {
           requiredScopes: {},
-          optionalScopes: {},
+          optionalScopes: {
+            'wallet:eip155': {
+              accounts: [],
+            },
+          },
           isMultichainOrigin: false,
         },
         ['0xdeadbeef'],

app/scripts/lib/rpc-method-middleware/handlers/request-accounts.ts

@@ -143,7 +143,13 @@ async function requestEthereumAccountsHandler(
     isMultichainOrigin: false,
   };
 
-  if (!isSnapId(origin)) {
+  if (isSnapId(origin)) {
+    caveatValue.optionalScopes = {
+      'wallet:eip155': {
+        accounts: [],
+      },
+    };
+  } else {
     caveatValue = setPermittedEthChainIds(
       caveatValue,
       legacyApproval.approvedChainIds,

app/scripts/lib/rpc-method-middleware/handlers/wallet-requestPermissions.test.ts

@@ -579,14 +579,18 @@ describe('requestPermissionsHandler', () => {
       expect(MockMultichain.setPermittedEthChainIds).not.toHaveBeenCalled();
     });
 
-    it('sets the approved accounts on an empty CAIP-25 caveat with isMultichainOrigin: false if origin is snapId', async () => {
+    it('sets the approved accounts for the `wallet:eip155` scope with isMultichainOrigin: false if origin is snapId', async () => {
       const { handler } = createMockedHandler();
 
       await handler({ ...getBaseRequest(), origin: 'npm:snapm' });
       expect(MockMultichain.setEthAccounts).toHaveBeenCalledWith(
         {
           requiredScopes: {},
-          optionalScopes: {},
+          optionalScopes: {
+            'wallet:eip155': {
+              accounts: [],
+            },
+          },
           isMultichainOrigin: false,
         },
         ['0xdeadbeef'],

app/scripts/lib/rpc-method-middleware/handlers/wallet-requestPermissions.ts

@@ -176,7 +176,14 @@ async function requestPermissionsImplementation(
       optionalScopes: {},
       isMultichainOrigin: false,
     };
-    if (!isSnapId(origin)) {
+
+    if (isSnapId(origin)) {
+      newCaveatValue.optionalScopes = {
+        'wallet:eip155': {
+          accounts: [],
+        },
+      };
+    } else {
       newCaveatValue = setPermittedEthChainIds(
         newCaveatValue,
         legacyApproval.approvedChainIds,

app/scripts/metamask-controller.js

@@ -192,7 +192,6 @@ import {
 } from '../../shared/constants/hardware-wallets';
 import { KeyringType } from '../../shared/constants/keyring';
 import {
-  CaveatTypes,
   RestrictedMethods,
   EndowmentPermissions,
   ExcludedSnapPermissions,
@@ -325,7 +324,6 @@ import EncryptionPublicKeyController from './controllers/encryption-public-key';
 import AppMetadataController from './controllers/app-metadata';
 
 import {
-  CaveatMutatorFactories,
   getCaveatSpecifications,
   diffMap,
   getPermissionBackgroundApiMethods,
@@ -5148,13 +5146,6 @@ export default class MetamaskController extends EventEmitter {
    * to third parties.
    */
   removeAllAccountPermissions(targetAccount) {
-    this.permissionController.updatePermissionsByCaveat(
-      CaveatTypes.restrictReturnedAccounts,
-      (existingAccounts) =>
-        CaveatMutatorFactories[
-          CaveatTypes.restrictReturnedAccounts
-        ].removeAccount(targetAccount, existingAccounts),
-    );
     this.permissionController.updatePermissionsByCaveat(
       Caip25CaveatType,
       (existingScopes) =>

package.json

@@ -326,7 +326,7 @@
     "@metamask/message-manager": "^10.1.0",
     "@metamask/message-signing-snap": "^0.4.0",
     "@metamask/metamask-eth-abis": "^3.1.1",
-    "@metamask/multichain": "^1.0.0",
+    "@metamask/multichain": "^1.1.0",
     "@metamask/name-controller": "^8.0.0",
     "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch",
     "@metamask/notification-controller": "^6.0.0",

yarn.lock

@@ -5951,9 +5951,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/multichain@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@metamask/multichain@npm:1.0.0"
+"@metamask/multichain@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@metamask/multichain@npm:1.1.0"
   dependencies:
     "@metamask/api-specs": "npm:^0.10.12"
     "@metamask/controller-utils": "npm:^11.4.3"
@@ -5964,7 +5964,7 @@ __metadata:
   peerDependencies:
     "@metamask/network-controller": ^22.0.0
     "@metamask/permission-controller": ^11.0.0
-  checksum: 10/ec4ae86bb91a002863bf2b50900488bcb3851981d9b5e91f4d14bba05acf89dd7fce23738b11b1c5079fd3e0edc3702849e28e5ecd59b99a1f9ddedf19d3fd14
+  checksum: 10/dab9a223c6cf1b11705f53cab3c1d6f2ecfb5f0c2b7b44d32847ea42b5cd2c3a9936b10239d3dbf0215b2656b3584a08a2ee979004cedd2edfb27813ec25665d
   languageName: node
   linkType: hard
 
@@ -26883,7 +26883,7 @@ __metadata:
     "@metamask/message-manager": "npm:^10.1.0"
     "@metamask/message-signing-snap": "npm:^0.4.0"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
-    "@metamask/multichain": "npm:^1.0.0"
+    "@metamask/multichain": "npm:^1.1.0"
     "@metamask/name-controller": "npm:^8.0.0"
     "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch"
     "@metamask/notification-controller": "npm:^6.0.0"