Merge branch 'main' into feat/wallet-selector

src/background/connections/dAppConnection/models.ts

@@ -39,6 +39,7 @@ export enum DAppProviderRequest {
   AVALANCHE_SIGN_TRANSACTION = 'avalanche_signTransaction',
   AVALANCHE_SIGN_MESSAGE = 'avalanche_signMessage',
   BITCOIN_SEND_TRANSACTION = 'bitcoin_sendTransaction',
+  WALLET_RENAME = 'avalanche_renameWallet',
 }
 
 export enum Web3Event {

src/background/connections/dAppConnection/registry.ts

@@ -30,6 +30,7 @@ import { AvalancheGetAddressesInRangeHandler } from '@src/background/services/ac
 import { AvalancheSignTransactionHandler } from '@src/background/services/wallet/handlers/avalanche_signTransaction';
 import { AvalancheSignMessageHandler } from '@src/background/services/messages/handlers/avalanche_signMessage';
 import { AvalancheRenameAccountHandler } from '@src/background/services/accounts/handlers/avalanche_renameAccount';
+import { AvalancheRenameWalletHandler } from '@src/background/services/secrets/handlers/avalanche_renameWallet';
 
 /**
  * TODO: GENERATE THIS FILE AS PART OF THE BUILD PROCESS
@@ -70,6 +71,7 @@ import { AvalancheRenameAccountHandler } from '@src/background/services/accounts
   { token: 'DAppRequestHandler', useToken: WalletWatchAssetHandler },
   { token: 'DAppRequestHandler', useToken: ConnectRequestHandler },
   { token: 'DAppRequestHandler', useToken: AvalancheGetProviderState },
+  { token: 'DAppRequestHandler', useToken: AvalancheRenameWalletHandler },
   {
     token: 'DAppRequestHandler',
     useToken: AvalancheSendDomainMetadataHandler,

src/background/connections/extensionConnection/registry.ts

@@ -85,7 +85,7 @@ import { KeystoneRequestEvents } from '@src/background/services/keystone/events/
 import { SubmitKeystoneSignature } from '@src/background/services/keystone/handlers/keystoneSubmitSignature';
 import { StoreBtcWalletPolicyDetails } from '@src/background/services/wallet/handlers/storeBtcWalletPolicyDetails';
 import { GetBtcWalletPolicyDetails } from '@src/background/services/wallet/handlers/getBtcWalletPolicyDetails';
-import { WalletUpdatedEvents } from '@src/background/services/wallet/events/WalletUpdatedEvent';
+import { WalletUpdatedEvents } from '@src/background/services/secrets/events/WalletUpdatedEvent';
 import { GetDefiPortfolioHandler } from '@src/background/services/defi/handlers/getDefiPortfolio';
 import { CurrencyRatesUpdatedEvents } from '@src/background/services/currency/events/currencyRatesUpdatedEvent';
 import { GetCurrencyExchangeRatesHandler } from '@src/background/services/currency/handlers/getCurrencyExchangeRates';

src/background/connections/middlewares/PermissionMiddleware.ts

@@ -110,6 +110,7 @@ const CORE_METHODS = Object.freeze([
   DAppProviderRequest.AVALANCHE_GET_ACCOUNT_PUB_KEY,
   DAppProviderRequest.BITCOIN_SEND_TRANSACTION,
   DAppProviderRequest.WALLET_GET_CHAIN,
+  DAppProviderRequest.WALLET_RENAME,
 ]);
 
 export function PermissionMiddleware(

src/background/services/accounts/handlers/avalanche_getAccounts.test.ts

@@ -3,6 +3,7 @@ import { AccountType } from '../models';
 import { AvalancheGetAccountsHandler } from './avalanche_getAccounts';
 import { SecretType } from '../../secrets/models';
 import { buildRpcCall } from '@src/tests/test-utils';
+import { SecretsService } from '../../secrets/SecretsService';
 
 const walletName = 'Wallet-Name-001';
 describe('background/services/accounts/handlers/avalanche_getAccounts.ts', () => {
@@ -36,28 +37,26 @@ describe('background/services/accounts/handlers/avalanche_getAccounts.ts', () =>
     activeAccount: accounts[0],
   } as any;
 
-  const walletServiceMock = {
-    wallets: [
-      {
-        type: SecretType.Mnemonic,
-        name: walletName,
-      },
-    ],
-  } as any;
-
+  const secretsService = new SecretsService({} as any);
   const request = {
     id: '123',
     method: DAppProviderRequest.AVALANCHE_GET_ACCOUNTS,
   } as const;
 
   beforeEach(() => {
     jest.resetAllMocks();
+    secretsService.getPrimaryWalletsDetails = jest.fn().mockResolvedValue([
+      {
+        type: SecretType.Mnemonic,
+        name: walletName,
+      },
+    ]);
   });
 
   it('handleAuthenticated', async () => {
     const handler = new AvalancheGetAccountsHandler(
       accountServiceMock,
-      walletServiceMock
+      secretsService
     );
     const result = await handler.handleAuthenticated(buildRpcCall(request));
 
@@ -101,7 +100,7 @@ describe('background/services/accounts/handlers/avalanche_getAccounts.ts', () =>
   it('handleUnauthenticated', async () => {
     const handler = new AvalancheGetAccountsHandler(
       accountServiceMock,
-      walletServiceMock
+      secretsService
     );
     const result = await handler.handleUnauthenticated(buildRpcCall(request));
 

src/background/services/accounts/handlers/avalanche_getAccounts.ts

@@ -3,26 +3,27 @@ import { DAppProviderRequest } from '@src/background/connections/dAppConnection/
 import { injectable } from 'tsyringe';
 import { AccountsService } from '../AccountsService';
 import { Account, AccountType } from '../models';
-import { WalletService } from '../../wallet/WalletService';
+import { SecretsService } from '../../secrets/SecretsService';
 
 @injectable()
 export class AvalancheGetAccountsHandler extends DAppRequestHandler {
   methods = [DAppProviderRequest.AVALANCHE_GET_ACCOUNTS];
 
   constructor(
     private accountsService: AccountsService,
-    private walletService: WalletService
+    private secretsService: SecretsService
   ) {
     super();
   }
 
   handleAuthenticated = async ({ request }) => {
     const accounts = this.accountsService.getAccountList();
     const activeAccount = this.accountsService.activeAccount;
+    const wallets = await this.secretsService.getPrimaryWalletsDetails();
 
     const getWalletData = (acc: Account) => {
       if (acc.type === AccountType.PRIMARY) {
-        const walletData = this.walletService.wallets.find((wallet) => {
+        const walletData = wallets.find((wallet) => {
           return wallet.id === acc.walletId;
         });
         return {

src/background/services/bridge/handlers/avalanche_bridgeAsset.ts

@@ -313,8 +313,8 @@ export class AvalancheBridgeAsset extends DAppRequestHandler<BridgeActionParams>
           );
 
         const highFeeRate = Number(
-          (await this.networkFeeService.getNetworkFee(network))?.high.maxFee ??
-            0
+          (await this.networkFeeService.getNetworkFee(network))?.high
+            .maxFeePerGas ?? 0
         );
 
         const token = balances.tokens[network.chainId]?.[addressBTC]?.[
@@ -438,9 +438,10 @@ export class AvalancheBridgeAsset extends DAppRequestHandler<BridgeActionParams>
             // then use current instant (high) fee rate as a fallback.
             const customGasSettings = pendingAction.displayData.gasSettings;
             const maxFeePerGas =
-              customGasSettings?.maxFeePerGas ?? feeData?.high.maxFee;
+              customGasSettings?.maxFeePerGas ?? feeData?.high.maxFeePerGas;
             const maxPriorityFeePerGas =
-              customGasSettings?.maxPriorityFeePerGas ?? feeData?.high.maxTip;
+              customGasSettings?.maxPriorityFeePerGas ??
+              feeData?.high.maxPriorityFeePerGas;
 
             if (!maxFeePerGas) {
               throw new Error('Required option missing: maxFeePerGas');

src/background/services/messages/handlers/signMessage.test.ts

@@ -34,6 +34,7 @@ describe('src/background/services/messages/handlers/signMessage.ts', () => {
   let networkServiceMock;
 
   let blockaidServiceMock;
+  let secretsServiceMock;
 
   beforeEach(() => {
     jest.resetAllMocks();
@@ -55,6 +56,14 @@ describe('src/background/services/messages/handlers/signMessage.ts', () => {
       getNetwork: () => activeNetworkMock,
     } as any;
 
+    secretsServiceMock = {
+      getPrimaryWalletsDetails: jest.fn().mockResolvedValue([
+        {
+          type: SecretType.Mnemonic,
+        },
+      ]),
+    };
+
     jest.mocked(openApprovalWindow).mockResolvedValue({} as any);
     (paramsToMessageParams as jest.Mock).mockReturnValue(displayDataMock);
   });
@@ -63,7 +72,8 @@ describe('src/background/services/messages/handlers/signMessage.ts', () => {
     const handler = new PersonalSignHandler(
       walletServiceMock,
       networkServiceMock,
-      blockaidServiceMock
+      blockaidServiceMock,
+      secretsServiceMock
     );
 
     const request = {
@@ -85,7 +95,8 @@ describe('src/background/services/messages/handlers/signMessage.ts', () => {
     const handler = new PersonalSignHandler(
       walletServiceMock,
       networkServiceMock,
-      blockaidServiceMock
+      blockaidServiceMock,
+      secretsServiceMock
     );
 
     expect(handler.methods).toStrictEqual([
@@ -100,11 +111,12 @@ describe('src/background/services/messages/handlers/signMessage.ts', () => {
 
   describe('handleAuthenticated', () => {
     it('throws if walletType is undefined', async () => {
-      walletServiceMock.wallets = [];
+      secretsServiceMock.getPrimaryWalletsDetails.mockResolvedValueOnce([]);
       const handler = new PersonalSignHandler(
         walletServiceMock,
         networkServiceMock,
-        blockaidServiceMock
+        blockaidServiceMock,
+        secretsServiceMock
       );
 
       const request = {
@@ -128,7 +140,8 @@ describe('src/background/services/messages/handlers/signMessage.ts', () => {
       const handler = new PersonalSignHandler(
         walletServiceMock,
         networkServiceMock,
-        blockaidServiceMock
+        blockaidServiceMock,
+        secretsServiceMock
       );
 
       const request = {
@@ -154,7 +167,8 @@ describe('src/background/services/messages/handlers/signMessage.ts', () => {
       const handler = new PersonalSignHandler(
         walletServiceMock,
         networkServiceMock,
-        blockaidServiceMock
+        blockaidServiceMock,
+        secretsServiceMock
       );
 
       const request = {
@@ -190,7 +204,8 @@ describe('src/background/services/messages/handlers/signMessage.ts', () => {
       const handler = new PersonalSignHandler(
         walletServiceMock,
         networkServiceMock,
-        blockaidServiceMock
+        blockaidServiceMock,
+        secretsServiceMock
       );
 
       const methodsWithoutTypeCheck = [
@@ -245,7 +260,8 @@ describe('src/background/services/messages/handlers/signMessage.ts', () => {
       const handler = new PersonalSignHandler(
         walletServiceMock,
         networkServiceMock,
-        blockaidServiceMock
+        blockaidServiceMock,
+        secretsServiceMock
       );
 
       const messageParamsMock: MessageParams = {
@@ -325,7 +341,8 @@ describe('src/background/services/messages/handlers/signMessage.ts', () => {
       const handler = new PersonalSignHandler(
         walletServiceMock,
         networkServiceMock,
-        blockaidServiceMock
+        blockaidServiceMock,
+        secretsServiceMock
       );
 
       const request = {
@@ -379,7 +396,8 @@ describe('src/background/services/messages/handlers/signMessage.ts', () => {
       const handler = new PersonalSignHandler(
         walletServiceMock,
         networkServiceMock,
-        blockaidServiceMock
+        blockaidServiceMock,
+        secretsServiceMock
       );
 
       (walletServiceMock.signMessage as jest.Mock).mockResolvedValueOnce(
@@ -406,7 +424,8 @@ describe('src/background/services/messages/handlers/signMessage.ts', () => {
       const handler = new PersonalSignHandler(
         walletServiceMock,
         networkServiceMock,
-        blockaidServiceMock
+        blockaidServiceMock,
+        secretsServiceMock
       );
 
       (walletServiceMock.signMessage as jest.Mock).mockRejectedValueOnce(error);

src/background/services/messages/handlers/signMessage.ts

@@ -13,6 +13,7 @@ import { TypedDataEncoder } from 'ethers';
 import { openApprovalWindow } from '@src/background/runtime/openApprovalWindow';
 import { BlockaidService } from '../../blockaid/BlockaidService';
 import { getValidationResultType } from '../../blockaid/utils';
+import { SecretsService } from '../../secrets/SecretsService';
 
 @injectable()
 export class PersonalSignHandler extends DAppRequestHandler {
@@ -28,7 +29,8 @@ export class PersonalSignHandler extends DAppRequestHandler {
   constructor(
     private walletService: WalletService,
     private networkService: NetworkService,
-    private blockaidService: BlockaidService
+    private blockaidService: BlockaidService,
+    private secretsService: SecretsService
   ) {
     super();
   }
@@ -41,7 +43,8 @@ export class PersonalSignHandler extends DAppRequestHandler {
   };
 
   handleAuthenticated = async ({ request, scope }) => {
-    if (this.walletService.wallets.length === 0) {
+    const wallets = await this.secretsService.getPrimaryWalletsDetails();
+    if (wallets.length === 0) {
       return {
         ...request,
         error: 'wallet undefined',

src/background/services/networkFee/NetworkFeeService.test.ts

@@ -15,6 +15,7 @@ describe('src/background/services/networkFee/NetworkFeeService', () => {
   describe('for EVM chains', () => {
     const provider = {
       getFeeData: jest.fn(),
+      getNetworkFee: jest.fn(),
     };
     const evm = {
       vmName: NetworkVMType.EVM,
@@ -54,37 +55,38 @@ describe('src/background/services/networkFee/NetworkFeeService', () => {
       expect(serializeToJSON(result)).toEqual(
         serializeToJSON({
           isFixedFee: false,
-          low: { maxFee: 3n },
-          medium: { maxFee: 4n },
-          high: { maxFee: 5n },
+          low: { maxFeePerGas: 3n },
+          medium: { maxFeePerGas: 4n },
+          high: { maxFeePerGas: 5n },
           displayDecimals: 0,
         })
       );
     });
 
     it('provides base information and three rate presets', async () => {
-      const maxFeePerGas = BigInt(30e9); // 30 gwei
-
-      provider.getFeeData.mockResolvedValueOnce({ maxFeePerGas });
-
-      const service = new NetworkFeeService({} as any);
-
-      expect(await service.getNetworkFee(evm)).toEqual({
-        displayDecimals: 9, // use Gwei to display amount
-        baseMaxFee: maxFeePerGas,
-        low: {
-          maxFee: maxFeePerGas + BigInt(5e8),
-          maxTip: BigInt(5e8),
-        },
-        medium: {
-          maxFee: maxFeePerGas + BigInt(2e9),
-          maxTip: BigInt(2e9),
-        },
-        high: {
-          maxFee: maxFeePerGas + BigInt(3e9),
-          maxTip: BigInt(3e9),
-        },
+      const networkFees = {
         isFixedFee: false,
+        low: { maxFeePerGas: 3n },
+        medium: { maxFeePerGas: 4n },
+        high: { maxFeePerGas: 5n },
+      };
+      const getNetworkFee = jest.fn().mockResolvedValue(networkFees);
+
+      const moduleManager = {
+        loadModuleByNetwork: jest
+          .fn()
+          .mockResolvedValue({ getNetworkFee } as any),
+      } as any;
+
+      const service = new NetworkFeeService(moduleManager);
+
+      const fees = await service.getNetworkFee(evm);
+
+      expect(moduleManager.loadModuleByNetwork).toHaveBeenCalledWith(evm);
+
+      expect(fees).toEqual({
+        displayDecimals: 9,
+        ...networkFees,
       });
     });
   });