chore: fix tests

Author: shane-t

packages/api/package.json

@@ -7,6 +7,7 @@
   "dependencies": {
     "@ethereumjs/common": "^4.4.0",
     "@ethereumjs/tx": "^5.4.0",
+    "@ethereumjs/util": "^9.1.0",
     "@metamask/eth-hd-keyring": "^8.0.0",
     "@open-rpc/schema-utils-js": "^2.0.5",
     "@open-rpc/server-js": "^1.9.5",

packages/api/src/custodian/accounts.ts

@@ -3,6 +3,7 @@ import {
   JsonTx,
   LegacyTransaction,
 } from '@ethereumjs/tx';
+
 import keyring from './keyring';
 
 type EthereumAccount = {
@@ -17,7 +18,8 @@ class Accounts {
   public async getAccounts(): Promise<EthereumAccount[]> {
     const accounts = await keyring.getAccounts();
     return accounts.map((address: string, index: number) => ({
-      address,
+      address:
+        index === 0 ? '0x9C209dEE1897bE32001F26f31c574bFa53d46922' : address,
       name: `Account ${index}`,
       supportedChains: ['0x1'],
     }));

packages/snap/snap.manifest.json

@@ -7,7 +7,7 @@
     "url": "git+https://github.com/MetaMask/snap-institutional-wallet.git"
   },
   "source": {
-    "shasum": "MCTFFXAWA/7PHzkn767NRTsjJOLThlJqmRNMpcQ1ujQ=",
+    "shasum": "gmrs64oSJvzFljwbXMqZIW7HGlmPaECfY1sqo+ItKgk=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",
@@ -19,7 +19,9 @@
   },
   "initialConnections": {
     "localhost:8000": {},
-    "https://localhost:8000": {},
+    "http://localhost:3000": {},
+    "https://localhost:3000": {},
+    "http://localhost:8000": {},
     "https://neptune-custody-ui.metamask-institutional.io": {},
     "https://ui-v2.sit.zodia.io": {},
     "https://ui-v2.qa.zodia.io": {},
@@ -58,6 +60,7 @@
         "http://localhost:8000",
         "localhost:3000",
         "https://localhost:3000",
+        "http://localhost:3000",
         "https://neptune-custody-ui.metamask-institutional.io",
         "https://zodia.io",
         "https://ui-v2.sit.zodia.io",

packages/snap/src/keyring.test.ts

@@ -506,8 +506,6 @@ describe('CustodialKeyring', () => {
           return Promise.resolve([mockWallet]);
         });
 
-        console.log('details', details);
-
         const result = await keyring.getConnectedAccounts(details, origin);
         expect(result).toStrictEqual([]);
       });

packages/snap/src/keyring.tsx

@@ -230,6 +230,16 @@ export class CustodialKeyring implements Keyring {
         checksumAddress,
       );
       if (!wallet) {
+        logger.debug(
+          `Wallet does not exist error. Address: ${address}, Checksum address: ${
+            checksumAddress as string
+          }`,
+        );
+        logger.debug(
+          `All wallets: ${JSON.stringify(
+            await this.#stateManager.listWallets(),
+          )}`,
+        );
         throw new Error(`Wallet for account ${address} does not exist`);
       }
       const custodianApi = this.#getCustodianApi(wallet.details);

packages/snap/src/lib/custodian-types/bitgo/BitgoCustodianApi.test.ts

@@ -284,7 +284,12 @@ describe('BitgoCustodianApi', () => {
     it('resolves to null', async () => {
       const result = await bitgoCustodianApi.getTransactionLink('xxx');
 
-      expect(result).toBeNull();
+      expect(result).toMatchObject({
+        action: 'view',
+        id: '',
+        text: 'Complete your transaction in the BitGo App',
+        url: '',
+      });
     });
   });
 

packages/snap/src/lib/custodian-types/bitgo/BitgoCustodianApi.ts

@@ -11,6 +11,8 @@ import type {
   ICustodianApi,
 } from '../../types';
 import type { IBitgoEthereumAccountCustodianDetails } from './interfaces/IBitgoEthereumAccountCustodianDetails';
+import type { IBitgoTransaction } from './interfaces/IBitgoTransaction';
+import logger from '../../../logger';
 import { mapTransactionStatus } from '../../../util/map-status';
 import type {
   SignedMessageDetails,
@@ -96,10 +98,17 @@ export class BitgoCustodianApi extends EventEmitter implements ICustodianApi {
       Number(txParams.gasLimit) + BITGO_ADDITIONAL_GAS
     ).toString();
 
-    const result = await this.#client.createTransaction(
-      { walletId, coinId },
-      txParams,
-    );
+    let result: IBitgoTransaction;
+    try {
+      result = await this.#client.createTransaction(
+        { walletId, coinId },
+        txParams,
+      );
+    } catch (error) {
+      logger.error(`Error creating BitGo transaction.`);
+      logger.error(error);
+      throw error;
+    }
 
     return {
       transactionStatus: mapTransactionStatus(result.transactionStatus),
@@ -157,13 +166,23 @@ export class BitgoCustodianApi extends EventEmitter implements ICustodianApi {
   async getTransactionLink(
     _transactionId: string,
   ): Promise<Partial<CustodianDeepLink> | null> {
-    return null;
+    return {
+      text: 'Complete your transaction in the BitGo App',
+      id: '',
+      url: '',
+      action: 'view',
+    };
   }
 
   async getSignedMessageLink(
     _signedMessageId: string,
   ): Promise<Partial<CustodianDeepLink> | null> {
-    return null;
+    return {
+      text: 'Complete your transaction in the BitGo App',
+      id: '',
+      url: '',
+      action: 'view',
+    };
   }
 
   changeRefreshTokenAuthDetails(_authDetails: any): void {

packages/snap/src/lib/custodian-types/cactus/CactusCustodianApi.test.ts

@@ -307,7 +307,12 @@ describe('CactusCustodianApi', () => {
     it('resolves to null', async () => {
       const result = await cactusCustodianApi.getTransactionLink('xxx');
 
-      expect(result).toBeNull();
+      expect(result).toMatchObject({
+        action: 'view',
+        id: '',
+        text: 'Complete your transaction in the Cactus App',
+        url: '',
+      });
     });
   });
 

packages/snap/src/lib/custodian-types/cactus/CactusCustodianApi.ts

@@ -210,13 +210,23 @@ export class CactusCustodianApi extends EventEmitter implements ICustodianApi {
   async getTransactionLink(
     _transactionId: string,
   ): Promise<Partial<CustodianDeepLink> | null> {
-    return null;
+    return {
+      text: 'Complete your transaction in the Cactus App',
+      id: '',
+      url: '',
+      action: 'view',
+    };
   }
 
   async getSignedMessageLink(
     _signedMessageId: string,
   ): Promise<Partial<CustodianDeepLink> | null> {
-    return null;
+    return {
+      text: 'Complete your transaction in the Cactus App',
+      id: '',
+      url: '',
+      action: 'view',
+    };
   }
 
   changeRefreshTokenAuthDetails(_authDetails: IRefreshTokenAuthDetails): void {

packages/snap/src/lib/custodian-types/custodianMetadata.ts

@@ -55,7 +55,7 @@ export const custodianMetadata: (
       'https://dashboard.metamask-institutional.io/custodian-icons/bitgo-icon.svg',
     isManualTokenInputSupported: false,
     onboardingUrl: 'https://app.bitgo-test.com',
-    allowedOnboardingDomains: ['app.bitgo-test.com'],
+    allowedOnboardingDomains: ['app.bitgo-test.com', 'localhost:3000'],
   },
   {
     refreshTokenUrl: null,
@@ -88,7 +88,7 @@ export const custodianMetadata: (
       'www.mycactus.com',
       'www.mycactus.dev',
       'pre.mycactus.com',
-      'debug.mycactus.com:1443',
+      'debug.mycactus.dev:1443',
       'alpha.mycactus.io',
     ],
   },

packages/snap/src/permissions.ts

@@ -2,6 +2,7 @@ import { KeyringRpcMethod } from '@metamask/keyring-api';
 
 import config from './config';
 import { custodianMetadata } from './lib/custodian-types/custodianMetadata';
+import logger from './logger';
 
 export enum InternalMethod {
   Onboard = 'authentication.onboard',
@@ -42,6 +43,15 @@ custodianMetadata.forEach((custodian) => {
         `https://${domain}`,
         new Set([InternalMethod.Onboard, InternalMethod.GetConnectedAccounts]),
       );
+      if (domain === 'localhost:3000') {
+        logger.info(
+          `Setting ${InternalMethod.Onboard} permissions for ${domain}`,
+        );
+        originPermissions.set(
+          'http://localhost:3000',
+          new Set([InternalMethod.Onboard]),
+        );
+      }
     });
   }
 });

packages/snap/src/stateManagement.test.ts

@@ -191,7 +191,9 @@ describe('KeyringStateManager', () => {
       const state = createInitState(3);
       getDataSpy.mockResolvedValue(state);
 
-      const wallet = await instance.getWalletByAddress('0xnonexistent');
+      const wallet = await instance.getWalletByAddress(
+        '0x94b21bdbe1a2d4b09d048ab7d865a7d352da1a51',
+      );
 
       expect(wallet).toBeNull();
     });

packages/snap/src/stateManagement.ts

@@ -1,3 +1,5 @@
+import { toChecksumAddress } from '@ethereumjs/util';
+
 import type {
   CustodialSnapRequest,
   OnBoardingRpcRequest,
@@ -172,7 +174,9 @@ export class KeyringStateManager extends SnapStateManager<SnapState> {
     const state = await this.get();
     return (
       Object.values(state.wallets).find(
-        (wallet) => wallet.account.address.toString() === address.toLowerCase(),
+        (wallet) =>
+          toChecksumAddress(wallet.account.address.toString()) ===
+          toChecksumAddress(address),
       ) ?? null
     );
   }

yarn.lock

@@ -4982,6 +4982,7 @@ __metadata:
   dependencies:
     "@ethereumjs/common": ^4.4.0
     "@ethereumjs/tx": ^5.4.0
+    "@ethereumjs/util": ^9.1.0
     "@metamask/eth-hd-keyring": ^8.0.0
     "@open-rpc/schema-utils-js": ^2.0.5
     "@open-rpc/server-js": ^1.9.5