fix: fix tests (missing scopes)

MetaMask · Jan 6, 2025 · fd50073 · fd50073
1 parent e7409ab
commit fd50073
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 8 deletions.
diff --git a/packages/accounts-controller/src/AccountsController.test.ts b/packages/accounts-controller/src/AccountsController.test.ts
@@ -4,6 +4,8 @@ import {
   EthAccountType,
   BtcMethod,
   EthMethod,
+  EthScopes,
+  BtcScopes,
 } from '@metamask/keyring-api';
 import { KeyringTypes } from '@metamask/keyring-controller';
 import type {
@@ -66,6 +68,7 @@ const mockAccount: InternalAccount = {
   options: {},
   methods: [...ETH_EOA_METHODS],
   type: EthAccountType.Eoa,
+  scopes: [EthScopes.Namespace],
   metadata: {
     name: 'Account 1',
     keyring: { type: KeyringTypes.hd },
@@ -81,6 +84,7 @@ const mockAccount2: InternalAccount = {
   options: {},
   methods: [...ETH_EOA_METHODS],
   type: EthAccountType.Eoa,
+  scopes: [EthScopes.Namespace],
   metadata: {
     name: 'Account 2',
     keyring: { type: KeyringTypes.hd },
@@ -95,6 +99,7 @@ const mockAccount3: InternalAccount = {
   options: {},
   methods: [...ETH_EOA_METHODS],
   type: EthAccountType.Eoa,
+  scopes: [EthScopes.Namespace],
   metadata: {
     name: '',
     keyring: { type: KeyringTypes.snap },
@@ -114,6 +119,7 @@ const mockAccount4: InternalAccount = {
   options: {},
   methods: [...ETH_EOA_METHODS],
   type: EthAccountType.Eoa,
+  scopes: [EthScopes.Namespace],
   metadata: {
     name: 'Custom Name',
     keyring: { type: KeyringTypes.snap },
@@ -191,24 +197,36 @@ function createExpectedInternalAccount({
   lastSelected?: number;
   nameLastUpdatedAt?: number;
 }): InternalAccount {
-  const accountTypeToMethods = {
-    [`${EthAccountType.Eoa}`]: [...Object.values(ETH_EOA_METHODS)],
+  const accountTypeToInfo: Record<
+    string,
+    { methods: string[]; scopes: string[] }
+  > = {
+    [`${EthAccountType.Eoa}`]: {
+      methods: [...Object.values(ETH_EOA_METHODS)],
+      scopes: [EthScopes.Namespace],
+    },
     // TODO: Either fix this lint violation or explain why it's necessary to ignore.
     // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-    [`${EthAccountType.Erc4337}`]: [...Object.values(ETH_ERC_4337_METHODS)],
+    [`${EthAccountType.Erc4337}`]: {
+      methods: [...Object.values(ETH_ERC_4337_METHODS)],
+      scopes: [EthScopes.Mainnet], // Assuming we are using mainnet for those Smart Accounts
+    },
     // TODO: Either fix this lint violation or explain why it's necessary to ignore.
     // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-    [`${BtcAccountType.P2wpkh}`]: [...Object.values(BtcMethod)],
+    [`${BtcAccountType.P2wpkh}`]: {
+      methods: [...Object.values(BtcMethod)],
+      scopes: [BtcScopes.Mainnet],
+    },
   };
 
-  const methods =
-    accountTypeToMethods[type as keyof typeof accountTypeToMethods];
+  const { methods, scopes } = accountTypeToInfo[type];
 
-  const account = {
+  const account: InternalAccount = {
     id,
     address,
     options: {},
     methods,
+    scopes,
     type,
     metadata: {
       name,
@@ -217,7 +235,7 @@ function createExpectedInternalAccount({
       lastSelected: lastSelected || expect.any(Number),
       ...(nameLastUpdatedAt && { nameLastUpdatedAt }),
     },
-  } as InternalAccount;
+  };
 
   if (snapId) {
     account.metadata.snap = {

diff --git a/packages/transaction-controller/src/TransactionController.test.ts b/packages/transaction-controller/src/TransactionController.test.ts
@@ -388,6 +388,7 @@ const INTERNAL_ACCOUNT_MOCK: InternalAccount = {
   id: '58def058-d35f-49a1-a7ab-e2580565f6f5',
   address: ACCOUNT_MOCK,
   type: 'eip155:eoa',
+  scopes: ['eip155'],
   options: {},
   methods: [],
   metadata: {

diff --git a/packages/transaction-controller/src/TransactionControllerIntegration.test.ts b/packages/transaction-controller/src/TransactionControllerIntegration.test.ts
@@ -95,6 +95,7 @@ const createMockInternalAccount = ({
     options: {},
     methods: [],
     type: 'eip155:eoa',
+    scopes: ['eip155'],
     metadata: {
       name,
       keyring: { type: 'HD Key Tree' },

diff --git a/packages/transaction-controller/src/helpers/IncomingTransactionHelper.test.ts b/packages/transaction-controller/src/helpers/IncomingTransactionHelper.test.ts
@@ -28,6 +28,7 @@ const CONTROLLER_ARGS_MOCK: ConstructorParameters<
       type: 'eip155:eoa' as const,
       options: {},
       methods: [],
+      scopes: ['eip155'],
       metadata: {
         name: 'Account 1',
         keyring: { type: 'HD Key Tree' },