fix: svm-related typings issues

ava-labs · Feb 19, 2025 · e60c133 · e60c133
1 parent 77a2e80
commit e60c133
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 7 deletions.
diff --git a/src/background/connections/middlewares/ExtensionRequestHandlerMiddleware.ts b/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 {

diff --git a/src/background/services/accounts/AccountsService.test.ts b/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)

diff --git a/src/background/services/balances/BalancesService.ts b/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,

diff --git a/src/background/services/history/HistoryService.test.ts b/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';

diff --git a/src/background/services/networkFee/NetworkFeeService.ts b/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,

diff --git a/src/background/services/secrets/SecretsService.test.ts b/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);

diff --git a/src/background/services/secrets/SecretsService.ts b/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,
       };
     }