chore: improve swap failure messaging & log them to Sentry

package.json

@@ -27,21 +27,21 @@
     "@avalabs/avalanchejs": "4.2.0-alpha.1",
     "@avalabs/bitcoin-module": "1.4.2",
     "@avalabs/bridge-unified": "4.0.1",
-    "@avalabs/core-bridge-sdk": "3.1.0-alpha.34",
-    "@avalabs/core-chains-sdk": "3.1.0-alpha.34",
-    "@avalabs/core-coingecko-sdk": "3.1.0-alpha.34",
-    "@avalabs/core-covalent-sdk": "3.1.0-alpha.34",
-    "@avalabs/core-etherscan-sdk": "3.1.0-alpha.34",
+    "@avalabs/core-bridge-sdk": "3.1.0-alpha.37",
+    "@avalabs/core-chains-sdk": "3.1.0-alpha.37",
+    "@avalabs/core-coingecko-sdk": "3.1.0-alpha.37",
+    "@avalabs/core-covalent-sdk": "3.1.0-alpha.37",
+    "@avalabs/core-etherscan-sdk": "3.1.0-alpha.37",
     "@avalabs/core-k2-components": "4.18.0-alpha.53",
-    "@avalabs/core-snowtrace-sdk": "3.1.0-alpha.34",
-    "@avalabs/core-token-prices-sdk": "3.1.0-alpha.34",
-    "@avalabs/core-utils-sdk": "3.1.0-alpha.34",
-    "@avalabs/core-wallets-sdk": "3.1.0-alpha.34",
+    "@avalabs/core-snowtrace-sdk": "3.1.0-alpha.37",
+    "@avalabs/core-token-prices-sdk": "3.1.0-alpha.37",
+    "@avalabs/core-utils-sdk": "3.1.0-alpha.37",
+    "@avalabs/core-wallets-sdk": "3.1.0-alpha.37",
     "@avalabs/evm-module": "1.4.2",
-    "@avalabs/glacier-sdk": "3.1.0-alpha.34",
+    "@avalabs/glacier-sdk": "3.1.0-alpha.37",
     "@avalabs/hw-app-avalanche": "0.14.1",
     "@avalabs/hvm-module": "1.4.2",
-    "@avalabs/types": "3.1.0-alpha.34",
+    "@avalabs/types": "3.1.0-alpha.37",
     "@avalabs/vm-module-types": "1.4.2",
     "@blockaid/client": "0.10.0",
     "@coinbase/cbpay-js": "1.6.0",
@@ -274,5 +274,6 @@
       "@avalabs/avalanche-module>@avalabs/vm-module-types>hypersdk-client>@metamask/sdk>@metamask/sdk-communication-layer>utf-8-validate": false,
       "@avalabs/avalanche-module>@avalabs/vm-module-types>hypersdk-client>@metamask/sdk>eciesjs>secp256k1": false
     }
-  }
+  },
+  "packageManager": "[email protected]+sha1.4ba7fc5c6e704fce2066ecbfb0b0d8976fe62447"
 }

src/background/connections/middlewares/ExtensionRequestHandlerMiddleware.ts

@@ -7,7 +7,7 @@ import {
 } from '../models';
 import * as Sentry from '@sentry/browser';
 import { ModuleManager } from '@src/background/vmModules/ModuleManager';
-import { Module } from '@avalabs/vm-module-types';
+import { Module, Network } from '@avalabs/vm-module-types';
 import { runtime } from 'webextension-polyfill';
 
 export function ExtensionRequestHandlerMiddleware(
@@ -96,7 +96,7 @@ const handleRequest = async (
       params: context.request.params.request.params,
       context: context.request.context,
     },
-    context.network,
+    context.network as Network, // TODO: Remove this cast after SVM network type appears in vm-module-types,
   );
 
   return {

src/background/services/accounts/AccountsService.test.ts

@@ -347,6 +347,7 @@ describe('background/services/accounts/AccountsService', () => {
         [NetworkVMType.PVM]: pvmAddress,
         [NetworkVMType.CoreEth]: coreEthAddress,
         [NetworkVMType.HVM]: otherEvmAddress,
+        [NetworkVMType.SVM]: undefined,
       });
 
       await accountsService.onUnlock();
@@ -410,6 +411,7 @@ describe('background/services/accounts/AccountsService', () => {
         [NetworkVMType.PVM]: pvmAddress,
         [NetworkVMType.CoreEth]: coreEthAddress,
         [NetworkVMType.HVM]: otherEvmAddress,
+        [NetworkVMType.SVM]: undefined,
       });
       jest
         .mocked(secretsService.getImportedAddresses)

src/background/services/balances/BalancesService.ts

@@ -7,6 +7,7 @@ import { SettingsService } from '../settings/SettingsService';
 import { getPriceChangeValues } from './utils/getPriceChangeValues';
 import * as Sentry from '@sentry/browser';
 import {
+  Network,
   NetworkVMType,
   TokenType,
   TokenWithBalance,
@@ -66,7 +67,7 @@ export class BalancesService {
           }
         })
         .filter((address): address is string => !!address),
-      network,
+      network: network as Network, // TODO: Remove this cast after SVM network type appears in vm-module-types
       currency,
       customTokens,
       tokenTypes,

src/background/services/history/HistoryService.test.ts

@@ -1,7 +1,7 @@
-import { Network, NetworkToken, NetworkVMType } from '@avalabs/core-chains-sdk';
+import { Network, NetworkToken } from '@avalabs/core-chains-sdk';
 import { HistoryService } from './HistoryService';
 import { TxHistoryItem } from './models';
-import { TokenType } from '@avalabs/vm-module-types';
+import { NetworkVMType, TokenType } from '@avalabs/vm-module-types';
 import { TransactionType } from '@avalabs/vm-module-types';
 import { ETHEREUM_ADDRESS } from '@src/utils/bridgeTransactionUtils';
 import { BridgeType } from '@avalabs/bridge-unified';

src/background/services/networkFee/NetworkFeeService.ts

@@ -1,4 +1,4 @@
-import { NetworkVMType } from '@avalabs/core-chains-sdk';
+import { Network, NetworkVMType } from '@avalabs/vm-module-types';
 import { JsonRpcBatchInternal } from '@avalabs/core-wallets-sdk';
 import { getProviderForNetwork } from '@src/utils/network/getProviderForNetwork';
 import { singleton } from 'tsyringe';
@@ -12,7 +12,7 @@ export class NetworkFeeService {
 
   async getNetworkFee(network: NetworkWithCaipId): Promise<NetworkFee | null> {
     const module = await this.moduleManager.loadModuleByNetwork(network);
-    const fees = await module.getNetworkFee(network);
+    const fees = await module.getNetworkFee(network as Network); // TODO: Remove this cast after SVM network type appears in vm-module-types
     return {
       ...fees,
       displayDecimals: fees.displayDecimals ?? 0,

src/background/services/secrets/SecretsService.test.ts

@@ -1462,6 +1462,7 @@ describe('src/background/services/secrets/SecretsService.ts', () => {
       ).resolves.toStrictEqual({
         ...addressesMock('0x1', '0x2'),
         HVM: '0xhvm',
+        SVM: undefined,
       });
     });
     it('returns the addresses for xpub', async () => {
@@ -1473,6 +1474,7 @@ describe('src/background/services/secrets/SecretsService.ts', () => {
       ).resolves.toStrictEqual({
         ...addressesMock('0x1', '0x2'),
         HVM: undefined,
+        SVM: undefined,
       });
       expect(Avalanche.getAddressPublicKeyFromXpub).toBeCalledWith('xpubXP', 0);
       expect(getAddressFromXPub).toHaveBeenCalledWith('xpub', 0);
@@ -1508,6 +1510,7 @@ describe('src/background/services/secrets/SecretsService.ts', () => {
       ).resolves.toStrictEqual({
         ...addressesMock('0x1', '0x2'),
         HVM: undefined,
+        SVM: undefined,
       });
 
       expect(getEvmAddressFromPubKey).toHaveBeenCalledWith(pubKeyBuff);

src/background/services/secrets/SecretsService.ts

@@ -791,6 +791,7 @@ export class SecretsService implements OnUnlock {
         [NetworkVMType.AVM]: xAddr,
         [NetworkVMType.PVM]: pAddr,
         [NetworkVMType.CoreEth]: cAddr,
+        [NetworkVMType.SVM]: undefined,
         [NetworkVMType.HVM]:
           secrets.secretType === SecretType.Mnemonic
             ? getAddressForHvm(
@@ -836,6 +837,7 @@ export class SecretsService implements OnUnlock {
         [NetworkVMType.PVM]: addrP,
         [NetworkVMType.CoreEth]: providerXP.getAddress(pubKeyBuffer, 'C'),
         [NetworkVMType.HVM]: undefined,
+        [NetworkVMType.SVM]: undefined,
       };
     }
 

src/contexts/SwapProvider/SwapProvider.test.tsx

@@ -13,12 +13,19 @@ import { useWalletContext } from '../WalletProvider';
 import { ChainId } from '@avalabs/core-chains-sdk';
 import { Contract } from 'ethers';
 import Big from 'big.js';
-import { GetRateParams, SwapContextAPI, SwapParams } from './models';
+import {
+  GetRateParams,
+  SwapContextAPI,
+  SwapErrorCode,
+  SwapParams,
+} from './models';
 import { SwapContextProvider, useSwapContext } from './SwapProvider';
 import { useNetworkFeeContext } from '../NetworkFeeProvider';
 import { FeatureGates } from '@src/background/services/featureFlags/models';
 import { SecretType } from '@src/background/services/secrets/models';
 import { RpcMethod } from '@avalabs/vm-module-types';
+import * as swapUtils from './swap-utils';
+import { CommonError } from '@src/utils/errors';
 
 const API_URL = 'https://apiv5.paraswap.io';
 const ACTIVE_ACCOUNT_ADDRESS = 'addressC';
@@ -132,6 +139,10 @@ describe('contexts/SwapProvider', () => {
     jest.resetAllMocks();
     jest.useRealTimers();
 
+    jest
+      .spyOn(swapUtils, 'getParaswapSpender')
+      .mockResolvedValue('0xParaswapContractAddress');
+
     jest.spyOn(global, 'fetch').mockResolvedValue({
       json: async () => ({}),
       ok: true,
@@ -210,7 +221,7 @@ describe('contexts/SwapProvider', () => {
           const { getRate } = getSwapProvider();
 
           await expect(getRate(buildGetRateParams())).rejects.toThrow(
-            'Unsupported network',
+            swapUtils.swapError(CommonError.UnknownNetwork),
           );
         },
       );
@@ -227,7 +238,7 @@ describe('contexts/SwapProvider', () => {
         const { getRate } = getSwapProvider();
 
         await expect(getRate(buildGetRateParams())).rejects.toThrow(
-          'Account address missing',
+          swapUtils.swapError(CommonError.NoActiveAccount),
         );
       });
     });
@@ -318,7 +329,7 @@ describe('contexts/SwapProvider', () => {
         const { getRate } = getSwapProvider();
 
         await expect(getRate(buildGetRateParams())).rejects.toThrow(
-          'Invalid tokens',
+          swapUtils.swapError(CommonError.Unknown, new Error('Invalid tokens')),
         );
 
         expect(global.fetch).toHaveBeenCalledTimes(1);
@@ -389,7 +400,10 @@ describe('contexts/SwapProvider', () => {
       const { swap } = getSwapProvider();
 
       await expect(swap(params)).rejects.toThrow(
-        `Missing parameter: ${paramName}`,
+        swapUtils.swapError(
+          SwapErrorCode.MissingParams,
+          new Error(`Missing parameter: ${paramName}`),
+        ),
       );
     });