MetaMask · jiexi · Sep 25, 2024 · Sep 25, 2024
@@ -53,7 +53,7 @@ export const KnownNotifications: Record<NonWalletKnownCaipNamespace, string[]> =
 export type ExternalScope = CaipChainId | CaipReference;
 export type ExternalScopeString = CaipChainId | CaipReference;
 export type ExternalScopeObject = ScopeObject & {
-  scopes?: CaipChainId[];
+  references?: CaipReference[];
 };
 export type ExternalScopesObject = Record<
   ExternalScopeString,
@@ -63,7 +63,7 @@ export type ExternalScopesObject = Record<
 // These non-prefixed types represent CAIP-217 Scope and
 // ScopeObject as defined by the spec but without
 // namespace-only Scopes (except for "wallet") and without
-// the `scopes` array of CAIP Chain IDs on ScopeObject.
+// the `references` array of CAIP References on the ScopeObject.
 // These deviations from the spec are necessary as MetaMask
 // does not support wildcarded Scopes, i.e. Scopes that only
 // specify a namespace but no specific reference.

@@ -20,17 +20,17 @@ describe('Scope Transform', () => {
     });
 
     describe('scopeString is namespace scoped', () => {
-      it('returns the scope as is when `scopes` is not defined', () => {
+      it('returns the scope as is when `references` is not defined', () => {
         expect(flattenScope('eip155', validScopeObject)).toStrictEqual({
           eip155: validScopeObject,
         });
       });
 
-      it('returns one scope per `scopes` element with `scopes` excluded from the scopeObject', () => {
+      it('returns one scope per `references` element with `references` excluded from the scopeObject', () => {
         expect(
           flattenScope('eip155', {
             ...validScopeObject,
-            scopes: ['eip155:1', 'eip155:5', 'eip155:64'],
+            references: ['1', '5', '64'],
           }),
         ).toStrictEqual({
           'eip155:1': validScopeObject,
@@ -247,7 +247,7 @@ describe('Scope Transform', () => {
           eip155: {
             ...validScopeObject,
             methods: ['a', 'b'],
-            scopes: ['eip155:1', 'eip155:5'],
+            references: ['1', '5'],
           },
           'eip155:1': {
             ...validScopeObject,

@@ -1,10 +1,11 @@
-import { CaipChainId, isCaipChainId } from '@metamask/utils';
+import { CaipReference } from '@metamask/utils';
 import {
   ExternalScopeObject,
   ExternalScopesObject,
   ScopeString,
   ScopeObject,
   ScopesObject,
+  parseScopeString,
 } from './scope';
 
 // DRY THIS
@@ -14,9 +15,9 @@ function unique<T>(list: T[]): T[] {
 
 /**
  * Flattens a ScopeString and ScopeObject into a separate
- * ScopeString and ScopeObject for each scope in the `scopes` value
- * if defined. Returns the ScopeString and ScopeObject unmodified if
- * it cannot be flattened
+ * ScopeString and ScopeObject for each reference in the `references`
+ * value if defined. Returns the ScopeString and ScopeObject
+ * unmodified if it cannot be flattened
  *
  * @param scopeString - The string representing the scopeObject
  * @param scopeObject - The object that defines the scope
@@ -26,16 +27,17 @@ export const flattenScope = (
   scopeString: string,
   scopeObject: ExternalScopeObject,
 ): ScopesObject => {
-  const { scopes, ...restScopeObject } = scopeObject;
-  const isChainScoped = isCaipChainId(scopeString);
+  const { references, ...restScopeObject } = scopeObject;
+  const { namespace, reference } = parseScopeString(scopeString);
 
-  if (isChainScoped || !scopes) {
+  // Scope is already a CAIP-2 ID and has no references to flatten
+  if (reference || !references) {
     return { [scopeString]: scopeObject };
   }
 
   const scopeMap: ScopesObject = {};
-  scopes.forEach((nestedScopeString: CaipChainId) => {
-    scopeMap[nestedScopeString] = restScopeObject;
+  references.forEach((nestedReference: CaipReference) => {
+    scopeMap[`${namespace}:${nestedReference}`] = restScopeObject;
   });
   return scopeMap;
 };

@@ -45,29 +45,11 @@ describe('Scope Validation', () => {
       ],
       [
         false,
-        'the scopeString is a CAIP chainId but scopes is nonempty',
+        'the scopeString is a CAIP chainId but references is nonempty',
         'eip155:1',
         {
           ...validScopeObject,
-          scopes: ['eip155:5'],
-        },
-      ],
-      [
-        false,
-        'the scopeString is a CAIP namespace but scopes contains CAIP chainIds for a different namespace',
-        'eip155:1',
-        {
-          ...validScopeObject,
-          scopes: ['eip155:5', 'bip122:000000000019d6689c085ae165831e93'],
-        },
-      ],
-      [
-        true,
-        'the scopeString is a CAIP namespace and scopes contains CAIP chainIds for only the same namespace',
-        'eip155',
-        {
-          ...validScopeObject,
-          scopes: ['eip155:5', 'eip155:64'],
+          references: ['5'],
         },
       ],
       [
@@ -138,7 +120,7 @@ describe('Scope Validation', () => {
         'only expected properties are defined',
         validScopeString,
         {
-          scopes: [],
+          references: [],
           methods: [],
           notifications: [],
           accounts: [],

@@ -1,4 +1,4 @@
-import { KnownCaipNamespace, parseCaipChainId } from '@metamask/utils';
+import { isCaipReference, KnownCaipNamespace } from '@metamask/utils';
 import { toHex } from '@metamask/controller-utils';
 import { validateAddEthereumChainParams } from '../../rpc-method-middleware/handlers/ethereum-chain-utils';
 import {
@@ -19,7 +19,7 @@ export const isValidScope = (
   }
 
   const {
-    scopes,
+    references,
     methods,
     notifications,
     accounts,
@@ -33,20 +33,15 @@ export const isValidScope = (
   }
 
   // These assume that the namespace has a notion of chainIds
-  if (reference && scopes && scopes.length > 0) {
+  if (reference && references && references.length > 0) {
     return false;
   }
-  if (namespace && scopes) {
-    const areScopesValid = scopes.every((scope) => {
-      try {
-        return parseCaipChainId(scope).namespace === namespace;
-      } catch (e) {
-        console.log(e);
-        return false;
-      }
+  if (namespace && references) {
+    const areReferencesValid = references.every((nestedReference) => {
+      return isCaipReference(nestedReference);
     });
 
-    if (!areScopesValid) {
+    if (!areReferencesValid) {
       return false;
     }
   }

@@ -38,7 +38,7 @@ const baseRequest = {
   params: {
     requiredScopes: {
       eip155: {
-        scopes: ['eip155:1', 'eip155:137'],
+        references: ['1', '137'],
         methods: [
           'eth_sendTransaction',
           'eth_signTransaction',

@@ -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);

@@ -61,7 +61,7 @@ async function main() {
               name: 'requiredScopes',
               value: {
                 eip155: {
-                  scopes: ['eip155:1'],
+                  references: ['1'],
                   methods: ['eth_sendTransaction', 'eth_getBalance'],
                   notifications: [],
                 },