deep clone flattened scopeObjects

MetaMask · Sep 25, 2024 · b336213 · b336213
1 parent 450ec01
commit b336213
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/app/scripts/lib/multichain-api/scope/transform.test.ts b/app/scripts/lib/multichain-api/scope/transform.test.ts
@@ -38,6 +38,20 @@ describe('Scope Transform', () => {
           'eip155:64': validScopeObject,
         });
       });
+
+      it('returns one deep cloned scope per `scopes` element', () => {
+        const flattenedScopes = flattenScope('eip155', {
+          ...validScopeObject,
+          scopes: ['eip155:1', 'eip155:5'],
+        });
+
+        expect(flattenedScopes['eip155:1']).not.toBe(
+          flattenedScopes['eip155:5'],
+        );
+        expect(flattenedScopes['eip155:1'].methods).not.toBe(
+          flattenedScopes['eip155:5'].methods,
+        );
+      });
     });
   });
 

diff --git a/app/scripts/lib/multichain-api/scope/transform.ts b/app/scripts/lib/multichain-api/scope/transform.ts
@@ -1,4 +1,5 @@
 import { CaipChainId, isCaipChainId } from '@metamask/utils';
+import { cloneDeep } from 'lodash';
 import {
   ExternalScopeObject,
   ExternalScopesObject,
@@ -35,7 +36,7 @@ export const flattenScope = (
 
   const scopeMap: ScopesObject = {};
   scopes.forEach((nestedScopeString: CaipChainId) => {
-    scopeMap[nestedScopeString] = restScopeObject;
+    scopeMap[nestedScopeString] = cloneDeep(restScopeObject);
   });
   return scopeMap;
 };

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -6221,7 +6221,7 @@ export default class MetamaskController extends EventEmitter {
           this.networkController,
         ),
         updateNetwork: this.networkController.updateNetwork.bind(
-          this.networkController
+          this.networkController,
         ),
         setActiveNetwork: async (networkClientId) => {
           await this.networkController.setActiveNetwork(networkClientId);