feat: add new RPC starkNet_switchAccount

packages/starknet-snap/src/config.ts

@@ -36,6 +36,9 @@ export type SnapConfig = {
       txnsInLastNumOfDays: number;
     };
   };
+  account: {
+    maxAccountToCreate: number;
+  };
 };
 
 export enum DataClient {
@@ -61,6 +64,10 @@ export const Config: SnapConfig = {
     },
   },
 
+  account: {
+    maxAccountToCreate: 2,
+  },
+
   // eslint-disable-next-line no-restricted-globals
   rpcApiKey: process.env.DIN_API_KEY ?? '',
 

packages/starknet-snap/src/index.tsx

@@ -18,7 +18,6 @@ import { getErc20TokenBalance } from './getErc20TokenBalance';
 import { getStarkName } from './getStarkName';
 import { getStoredErc20Tokens } from './getStoredErc20Tokens';
 import { getStoredNetworks } from './getStoredNetworks';
-import { getStoredUserAccounts } from './getStoredUserAccounts';
 import { getValue } from './getValue';
 import { homePageController } from './on-home-page';
 import { recoverAccounts } from './recoverAccounts';
@@ -37,6 +36,10 @@ import type {
   GetAddrFromStarkNameParams,
   GetTransactionStatusParams,
   ListTransactionsParams,
+  AddAccountParams,
+  GetCurrentAccountParams,
+  ListAccountsParams,
+  SwitchAccountParams,
 } from './rpcs';
 import {
   displayPrivateKey,
@@ -53,6 +56,10 @@ import {
   getAddrFromStarkName,
   getTransactionStatus,
   listTransactions,
+  addAccount,
+  getCurrentAccount,
+  listAccounts,
+  switchAccount,
 } from './rpcs';
 import { signDeployAccountTransaction } from './signDeployAccountTransaction';
 import type {
@@ -164,7 +171,9 @@ export const onRpcRequest: OnRpcRequestHandler = async ({
         );
 
       case RpcMethod.ListAccounts:
-        return await getStoredUserAccounts(apiParams);
+        return await listAccounts.execute(
+          requestParams as unknown as ListAccountsParams,
+        );
 
       case RpcMethod.DisplayPrivateKey:
         return await displayPrivateKey.execute(
@@ -279,6 +288,21 @@ export const onRpcRequest: OnRpcRequestHandler = async ({
           apiParams.requestParams as unknown as GetAddrFromStarkNameParams,
         );
 
+      case RpcMethod.AddAccount:
+        return await addAccount.execute(
+          requestParams as unknown as AddAccountParams,
+        );
+
+      case RpcMethod.GetCurrentAccount:
+        return await getCurrentAccount.execute(
+          requestParams as unknown as GetCurrentAccountParams,
+        );
+
+      case RpcMethod.SwitchAccount:
+        return await switchAccount.execute(
+          requestParams as unknown as SwitchAccountParams,
+        );
+
       default:
         throw new MethodNotFoundError() as unknown as Error;
     }

packages/starknet-snap/src/rpcs/__tests__/helper.ts

@@ -1,16 +1,18 @@
 import { BigNumber } from 'ethers';
 import type { constants } from 'starknet';
 
-import type { StarknetAccount } from '../../__tests__/helper';
 import { generateAccounts, generateRandomValue } from '../../__tests__/helper';
 import { FeeTokenUnit } from '../../types/snapApi';
-import type { SnapState } from '../../types/snapState';
+import type { Network } from '../../types/snapState';
 import * as snapUiUtils from '../../ui/utils';
 import { getExplorerUrl, shortenAddress, toJson } from '../../utils';
 import { mockEstimateFeeBulkResponse } from '../../utils/__tests__/helper';
+import { STARKNET_SEPOLIA_TESTNET_NETWORK } from '../../utils/constants';
 import * as snapHelper from '../../utils/snap';
-import * as snapUtils from '../../utils/snapUtils';
 import * as starknetUtils from '../../utils/starknetUtils';
+import { AccountService, CairoAccountContract } from '../../wallet/account';
+import { createAccountObject } from '../../wallet/account/__test__/helper';
+import type { Account } from '../../wallet/account/account';
 
 /**
  *
@@ -24,36 +26,69 @@ export async function mockAccount(chainId: constants.StarknetChainId | string) {
 /**
  *
  * @param account
- * @param state
+ * @param account.accountObj
+ * @param account.network
+ * @param account.requireUpgrade
+ * @param account.requireDeploy
+ * @param account.isDeployed
  */
-export function prepareMockAccount(account: StarknetAccount, state: SnapState) {
-  const getStateDataSpy = jest.spyOn(snapHelper, 'getStateData');
-  const verifyIfAccountNeedUpgradeOrDeploySpy = jest.spyOn(
-    snapUtils,
-    'verifyIfAccountNeedUpgradeOrDeploy',
+export async function setupAccountController({
+  accountObj,
+  network = STARKNET_SEPOLIA_TESTNET_NETWORK,
+  requireUpgrade = false,
+  requireDeploy = false,
+  isDeployed = false,
+}: {
+  accountObj?: Account;
+  network?: Network;
+  requireUpgrade?: boolean;
+  requireDeploy?: boolean;
+  isDeployed?: boolean;
+}) {
+  const account = accountObj ?? (await createAccountObject(network)).accountObj;
+
+  // Mock the `accountContract` properties in the `Account` object
+  const isRequireUpgradeSpy = jest.spyOn(
+    CairoAccountContract.prototype,
+    'isRequireUpgrade',
+  );
+  const isRequireDeploySpy = jest.spyOn(
+    CairoAccountContract.prototype,
+    'isRequireDeploy',
   );
-  const getKeysFromAddressSpy = jest.spyOn(starknetUtils, 'getKeysFromAddress');
+  const isDeploySpy = jest.spyOn(CairoAccountContract.prototype, 'isDeployed');
 
-  getKeysFromAddressSpy.mockResolvedValue({
-    privateKey: account.privateKey,
-    publicKey: account.publicKey,
-    addressIndex: account.addressIndex,
-    derivationPath: account.derivationPath as unknown as any,
-  });
+  isRequireUpgradeSpy.mockResolvedValue(requireUpgrade);
+  isRequireDeploySpy.mockResolvedValue(requireDeploy);
+  isDeploySpy.mockResolvedValue(isDeployed);
+
+  const deriveAccountByAddressSpy = jest.spyOn(
+    AccountService.prototype,
+    'deriveAccountByAddress',
+  );
+
+  const deriveAccountByIndexSpy = jest.spyOn(
+    AccountService.prototype,
+    'deriveAccountByIndex',
+  );
 
-  verifyIfAccountNeedUpgradeOrDeploySpy.mockReturnThis();
-  getStateDataSpy.mockResolvedValue(state);
+  deriveAccountByAddressSpy.mockResolvedValue(account);
+  deriveAccountByIndexSpy.mockResolvedValue(account);
 
   return {
-    getKeysFromAddressSpy,
-    verifyIfAccountNeedUpgradeOrDeploySpy,
+    deriveAccountByAddressSpy,
+    deriveAccountByIndexSpy,
+    isRequireDeploySpy,
+    isRequireUpgradeSpy,
+    isDeploySpy,
+    account,
   };
 }
 
 /**
  *
  */
-export function prepareConfirmDialog() {
+export function mockConfirmDialog() {
   const confirmDialogSpy = jest.spyOn(snapHelper, 'confirmDialog');
   confirmDialogSpy.mockResolvedValue(true);
   return {
@@ -64,7 +99,7 @@ export function prepareConfirmDialog() {
 /**
  *
  */
-export function prepareRenderWatchAssetUI() {
+export function mockRenderWatchAssetUI() {
   const confirmDialogSpy = jest.spyOn(snapUiUtils, 'renderWatchAssetUI');
   confirmDialogSpy.mockResolvedValue(true);
   return {
@@ -75,7 +110,7 @@ export function prepareRenderWatchAssetUI() {
 /**
  *
  */
-export function prepareRenderSwitchNetworkUI() {
+export function mockRenderSwitchNetworkUI() {
   const confirmDialogSpy = jest.spyOn(snapUiUtils, 'renderSwitchNetworkUI');
   confirmDialogSpy.mockResolvedValue(true);
   return {
@@ -86,7 +121,7 @@ export function prepareRenderSwitchNetworkUI() {
 /**
  *
  */
-export function prepareRenderSignMessageUI() {
+export function mockRenderSignMessageUI() {
   const confirmDialogSpy = jest.spyOn(snapUiUtils, 'renderSignMessageUI');
   confirmDialogSpy.mockResolvedValue(true);
   return {
@@ -97,7 +132,7 @@ export function prepareRenderSignMessageUI() {
 /**
  *
  */
-export function prepareRenderSignTransactionUI() {
+export function mockRenderSignTransactionUI() {
   const confirmDialogSpy = jest.spyOn(snapUiUtils, 'renderSignTransactionUI');
   confirmDialogSpy.mockResolvedValue(true);
   return {
@@ -108,7 +143,7 @@ export function prepareRenderSignTransactionUI() {
 /**
  *
  */
-export function prepareRenderSignDeclareTransactionUI() {
+export function mockRenderSignDeclareTransactionUI() {
   const confirmDialogSpy = jest.spyOn(
     snapUiUtils,
     'renderSignDeclareTransactionUI',
@@ -122,7 +157,7 @@ export function prepareRenderSignDeclareTransactionUI() {
 /**
  *
  */
-export function prepareRenderDisplayPrivateKeyConfirmUI() {
+export function mockRenderDisplayPrivateKeyConfirmUI() {
   const confirmDialogSpy = jest.spyOn(
     snapUiUtils,
     'renderDisplayPrivateKeyConfirmUI',
@@ -136,7 +171,7 @@ export function prepareRenderDisplayPrivateKeyConfirmUI() {
 /**
  *
  */
-export function prepareRenderDisplayPrivateKeyAlertUI() {
+export function mockRenderDisplayPrivateKeyAlertUI() {
   const alertDialogSpy = jest.spyOn(
     snapUiUtils,
     'renderDisplayPrivateKeyAlertUI',
@@ -150,7 +185,7 @@ export function prepareRenderDisplayPrivateKeyAlertUI() {
  *
  * @param result
  */
-export function prepareConfirmDialogInteractiveUI(result = true) {
+export function mockConfirmDialogInteractiveUI(result = true) {
   const confirmDialogSpy = jest.spyOn(
     snapHelper,
     'createInteractiveConfirmDialog',
@@ -164,7 +199,7 @@ export function prepareConfirmDialogInteractiveUI(result = true) {
 /**
  *
  */
-export function prepareAlertDialog() {
+export function mockAlertDialog() {
   const alertDialogSpy = jest.spyOn(snapHelper, 'alertDialog');
   alertDialogSpy.mockResolvedValue(true);
   return {