fix: add accounts to caip25 permissions when adding chain permissions to ethereum-provider enabled snaps

app/scripts/migrations/160.test.ts

@@ -28,7 +28,7 @@ describe(`migration #${version}`, () => {
     expect(newStorage.meta).toStrictEqual({ version });
   });
 
-  it('adds the network endowment to Snaps with the `endowment:ethereum-provider` permission', async () => {
+  it('adds the `endowment:caip25` permission with the current globally selected chainId (and no accounts) permissioned to Snaps which have a `endowment:ethereum-provider` permission but which do not already have a `endowment:caip25` permission', async () => {
     const oldStorage = {
       meta: { version: oldVersion },
       data: {
@@ -122,7 +122,7 @@ describe(`migration #${version}`, () => {
     });
   });
 
-  it('merges with an existing permission if the Snap already has `endowment:caip25`', async () => {
+  it('adds the current globally selected chainId as a new scope with the existing permitted eth accounts to an existing snap `endowment:caip25` permission', async () => {
     const oldStorage = {
       meta: { version: oldVersion },
       data: {
@@ -166,7 +166,7 @@ describe(`migration #${version}`, () => {
                         optionalScopes: {
                           'wallet:eip155': {
                             accounts: [
-                              '0x1234567890123456789012345678901234567890',
+                              'wallet:eip155:0x1234567890123456789012345678901234567890',
                             ],
                           },
                         },
@@ -214,11 +214,13 @@ describe(`migration #${version}`, () => {
                     optionalScopes: {
                       'wallet:eip155': {
                         accounts: [
-                          '0x1234567890123456789012345678901234567890',
+                          'wallet:eip155:0x1234567890123456789012345678901234567890',
                         ],
                       },
                       'eip155:1': {
-                        accounts: [],
+                        accounts: [
+                          'eip155:1:0x1234567890123456789012345678901234567890',
+                        ],
                       },
                     },
                     requiredScopes: {},

app/scripts/migrations/160.ts

@@ -11,6 +11,8 @@ import {
   Caip25EndowmentPermissionName,
   addPermittedEthChainId,
   Caip25CaveatValue,
+  setEthAccounts,
+  getEthAccounts,
 } from '@metamask/chain-agnostic-permission';
 
 type GenericPermissionControllerSubject =
@@ -201,11 +203,27 @@ function transformState(state: Record<string, unknown>) {
 
     updatedSubjects.push(key);
 
+    const existingCaip25Caveat = getExistingCaip25PermissionCaveat(subject);
     const caip25PermissionCaveatWithCurrentChainIdSet = addPermittedEthChainId(
-      getExistingCaip25PermissionCaveat(subject),
+      existingCaip25Caveat,
       currentChainId,
     );
 
+    let caip25PermissionCaveatWithCurrentChainIdAndAccountsSet =
+      caip25PermissionCaveatWithCurrentChainIdSet;
+
+    if (existingCaip25Caveat) {
+      const existingPermittedAccounts = getEthAccounts(existingCaip25Caveat);
+      // if there are existing permitted accounts in the `wallet:eip155` scope
+      // we add them to the newly added (currentChainId) scope
+      if (existingPermittedAccounts.length > 0) {
+        caip25PermissionCaveatWithCurrentChainIdAndAccountsSet = setEthAccounts(
+          caip25PermissionCaveatWithCurrentChainIdSet,
+          existingPermittedAccounts,
+        );
+      }
+    }
+
     const {
       date = Date.now(),
       id = nanoid(),
@@ -221,7 +239,7 @@ function transformState(state: Record<string, unknown>) {
           caveats: [
             {
               type: Caip25CaveatType,
-              value: caip25PermissionCaveatWithCurrentChainIdSet,
+              value: caip25PermissionCaveatWithCurrentChainIdAndAccountsSet,
             },
           ],
           date,