@ledgerhq/live-common 34.54.0-nightly.20251209023841 → 34.54.0

package/src/account/index.ts

@@ -16,9 +16,3 @@ export * from "./formatters";
 export * from "./helpers";
 export * from "./serialization";
 export * from "./support";
-export {
-  RecentAddressesStore,
-  getRecentAddressesStore,
-  setupRecentAddressesStore,
-  RecentAddressesCache,
-} from "./recentAddresses";

package/src/account/serialization.ts

@@ -99,7 +99,7 @@ const inferFamilyFromAccountId: (accountId: string) => string | null | undefined
     try {
       const { currencyId } = decodeAccountId(accountId);
       return getCryptoCurrencyById(currencyId).family;
-    } catch {
+    } catch (e) {
       return null;
     }
   },

package/src/account/support.ts

@@ -13,7 +13,7 @@ export function canSend(account: AccountLike, parentAccount: Account | null | un
       getMainAccount(account, parentAccount),
     );
     return true;
-  } catch {
+  } catch (e) {
     return false;
   }
 }

package/src/bridge/generic-alpaca/accountBridge.ts

@@ -1,4 +1,4 @@
-import type { AccountBridge } from "@ledgerhq/types-live";
+import { AccountBridge } from "@ledgerhq/types-live";
 import { makeSync } from "../jsHelpers";
 import { genericGetAccountShape } from "./getAccountShape";
 import {
@@ -16,7 +16,6 @@ import { genericBroadcast } from "./broadcast";
 import { genericSignOperation } from "./signOperation";
 import { genericSignRawOperation } from "./signRawOperation";
 import type { AlpacaSigner } from "./signer/types";
-import { postSync } from "./postSync";
 
 export function getAlpacaAccountBridge(
   network: string,
@@ -25,7 +24,7 @@ export function getAlpacaAccountBridge(
 ): AccountBridge<any> {
   const signer = customSigner ?? getSigner(network);
   return {
-    sync: makeSync({ getAccountShape: genericGetAccountShape(network, kind), postSync }),
+    sync: makeSync({ getAccountShape: genericGetAccountShape(network, kind) }),
     receive: makeAccountBridgeReceive(getAddressWrapper(signer.getAddress)),
     createTransaction: createTransaction,
     updateTransaction: updateTransaction<any>,

package/src/bridge/generic-alpaca/broadcast.ts

@@ -1,14 +1,11 @@
 import { AccountBridge, TransactionCommon } from "@ledgerhq/types-live";
-import { patchOperationWithHash } from "@ledgerhq/coin-framework/operation";
+import { patchOperationWithHash } from "../../operation";
 import { getAlpacaApi } from "./alpaca";
 
 export const genericBroadcast: (network, kind) => AccountBridge<TransactionCommon>["broadcast"] =
   (network, kind) =>
-  async ({ signedOperation: { signature, operation }, account, broadcastConfig }) => {
-    const hash = await getAlpacaApi(account.currency.id, kind).broadcast(
-      signature,
-      broadcastConfig,
-    );
+  async ({ signedOperation: { signature, operation }, account }) => {
+    const hash = await getAlpacaApi(account.currency.id, kind).broadcast(signature);
 
     return patchOperationWithHash(operation, hash);
   };

package/src/bridge/generic-alpaca/currencyBridge.ts

@@ -3,7 +3,6 @@ import { CurrencyBridge } from "@ledgerhq/types-live";
 import { genericGetAccountShape } from "./getAccountShape";
 import { getSigner } from "./signer";
 import type { AlpacaSigner } from "./signer/types";
-import { postSync } from "./postSync";
 
 export function getAlpacaCurrencyBridge(
   network: string,
@@ -13,11 +12,12 @@ export function getAlpacaCurrencyBridge(
   const signer = customSigner ?? getSigner(network);
   return {
     preload: () => Promise.resolve({}),
-    hydrate: () => undefined,
+    hydrate: () => {
+      return;
+    },
     scanAccounts: makeScanAccounts({
       getAccountShape: genericGetAccountShape(network, kind),
       getAddressFn: signer.getAddress.bind(signer),
-      postSync,
     }),
   };
 }

package/src/bridge/generic-alpaca/estimateMaxSpendable.ts

@@ -30,12 +30,11 @@ export function genericEstimateMaxSpendable(
         )
       ).value;
     }
-    // TODO Remove the call to `validateIntent` https://ledgerhq.atlassian.net/browse/LIVE-22229
     const { amount } = await alpacaApi.validateIntent(
       transactionToIntent(account, { ...draftTransaction }, alpacaApi.computeIntentType),
       { value: transaction?.fees ? BigInt(transaction.fees.toString()) : 0n },
     );
-    if (["stellar", "tezos", "evm"].includes(network)) {
+    if (["stellar", "tezos"].includes(network)) {
       return amount > 0 ? new BigNumber(amount.toString()) : new BigNumber(0);
     }
     const bnFee = BigNumber(fees.toString());

package/src/bridge/generic-alpaca/getAccountShape.ts

@@ -17,10 +17,6 @@ function isNftCoreOp(operation: Operation): boolean {
   );
 }
 
-function isInternalLiveOp(operation: OperationCommon): boolean {
-  return !!operation.extra?.internal;
-}
-
 export function genericGetAccountShape(network: string, kind: string): GetAccountShape {
   return async (info, syncConfig) => {
     const { address, initialAccount, currency, derivationMode } = info;
@@ -62,7 +58,7 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
 
     // Calculate minHeight for pagination
     const minHeight = syncFromScratch ? 0 : (oldOps[0]?.blockHeight ?? 0) + 1;
-    const paginationParams: Pagination = { minHeight, order: "desc" };
+    const paginationParams: Pagination = { minHeight, order: "asc" };
     if (lastPagingToken && !syncFromScratch) {
       paginationParams.lastPagingToken = lastPagingToken;
     }
@@ -78,7 +74,6 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
         operation?.extra?.assetOwner &&
         !["OPT_IN", "OPT_OUT"].includes(operation.type),
     );
-    const newInternalOperations = newOps.filter(isInternalLiveOp);
     const newSubAccounts = await buildSubAccounts({
       accountId,
       allTokenAssetsBalances,
@@ -90,29 +85,22 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
       ? newSubAccounts
       : mergeSubAccounts(initialAccount?.subAccounts ?? [], newSubAccounts);
 
-    const newOpsWithSubs = newOps
-      .filter(operation => !isInternalLiveOp(operation))
-      .map(op => {
-        const subOperations = inferSubOperations(op.hash, newSubAccounts);
-        const internalOperations = newInternalOperations.filter(it => it.hash === op.hash);
+    const newOpsWithSubs = newOps.map(op => {
+      const subOperations = inferSubOperations(op.hash, newSubAccounts);
 
-        return cleanedOperation({
-          ...op,
-          subOperations,
-          internalOperations,
-        });
+      return cleanedOperation({
+        ...op,
+        subOperations,
       });
-    // Try to refresh known pending operations (if not already updated)
-    // Useful for integrations without explorers
-    const operationsToRefresh = initialAccount?.pendingOperations.filter(
-      pendingOp => !newOpsWithSubs.some(newOp => pendingOp.hash === newOp.hash),
-    );
+    });
     const confirmedOperations =
-      alpacaApi.refreshOperations && operationsToRefresh?.length
-        ? await alpacaApi.refreshOperations(operationsToRefresh)
+      alpacaApi.refreshOperations && initialAccount?.pendingOperations.length
+        ? await alpacaApi.refreshOperations(initialAccount.pendingOperations)
         : [];
     const newOperations = [...confirmedOperations, ...newOpsWithSubs];
-    const operations = mergeOps(syncFromScratch ? [] : oldOps, newOperations) as OperationCommon[];
+    const operations = syncFromScratch
+      ? newOperations
+      : (mergeOps(oldOps, newOperations) as OperationCommon[]);
 
     const res: Partial<Account> = {
       id: accountId,

package/src/bridge/generic-alpaca/getTransactionStatus.ts

@@ -26,7 +26,6 @@ export function genericGetTransactionStatus(
       feesStrategy: transaction.feesStrategy,
       data: transaction.data,
       type: transaction.type,
-      sponsored: transaction.sponsored,
     };
 
     if (alpacaApi.getChainSpecificRules) {
@@ -38,24 +37,10 @@ export function genericGetTransactionStatus(
       }
     }
 
-    const fees = BigInt(transaction.fees?.toString() || "0");
-    const feesParameters = {
-      ...(transaction.gasLimit ? { gasLimit: BigInt(transaction.gasLimit.toFixed()) } : {}),
-      ...(transaction.gasPrice ? { gasPrice: BigInt(transaction.gasPrice.toFixed()) } : {}),
-      ...(transaction.maxFeePerGas
-        ? { maxFeePerGas: BigInt(transaction.maxFeePerGas.toFixed()) }
-        : {}),
-      ...(transaction.maxPriorityFeePerGas
-        ? { maxPriorityFeePerGas: BigInt(transaction.maxPriorityFeePerGas.toFixed()) }
-        : {}),
-      ...(transaction.additionalFees
-        ? { additionalFees: BigInt(transaction.additionalFees.toFixed()) }
-        : {}),
-    };
     const { errors, warnings, estimatedFees, amount, totalSpent, totalFees } =
       await alpacaApi.validateIntent(
         transactionToIntent(account, draftTransaction, alpacaApi.computeIntentType),
-        { value: fees, parameters: feesParameters },
+        { value: transaction.fees ? BigInt(transaction.fees.toString()) : 0n },
       );
 
     return {

package/src/bridge/generic-alpaca/prepareTransaction.ts

@@ -31,11 +31,6 @@ function propagateField(estimation: FeeEstimation, field: string, dest: GenericT
       dest[field] = Number(value.toString());
       return;
     case "storageLimit":
-    case "gasLimit":
-    case "gasPrice":
-    case "maxFeePerGas":
-    case "maxPriorityFeePerGas":
-    case "additionalFees":
       dest[field] = new BigNumber(value.toString());
       return;
     default:
@@ -56,37 +51,17 @@ export function genericPrepareTransaction(
       ? await getAssetInfos(transaction, account.freshAddress, getAssetFromToken)
       : assetInfosFallback(transaction);
     const customParametersFees = transaction.customFees?.parameters?.fees;
-
-    /**
-     * Ticking `useAllAmount` constantly resets the amount to 0. This is problematic
-     * because some Blockchain need the actual transaction amount to compute the fees
-     * (Example with EVM and ERC20 transactions)
-     * In case of `useAllAmount` and token transaction, we read the token account spendable
-     * balance instead.
-     */
-    let amount = transaction.amount;
-    if (transaction.useAllAmount && transaction.subAccountId) {
-      const subAccount = account.subAccounts?.find(acc => acc.id === transaction.subAccountId);
-      amount = subAccount?.spendableBalance ?? amount;
-    }
-
-    // Pass any parameters that help estimating fees
-    const intent = transactionToIntent(
-      account,
-      {
-        ...transaction,
-        amount,
-      },
-      computeIntentType,
-    );
     const estimation: FeeEstimation = customParametersFees
       ? { value: BigInt(customParametersFees.toFixed()) }
-      : await estimateFees(intent, {
-          gasPrice: transaction.gasPrice,
-          maxFeePerGas: transaction.maxFeePerGas,
-          maxPriorityFeePerGas: transaction.maxPriorityFeePerGas,
-          gasOptions: transaction.gasOptions,
-        });
+      : await estimateFees(
+          transactionToIntent(
+            account,
+            {
+              ...transaction,
+            },
+            computeIntentType,
+          ),
+        );
     const fees = new BigNumber(estimation.value.toString());
 
     if (!bnEq(transaction.fees, fees)) {
@@ -103,15 +78,7 @@ export function genericPrepareTransaction(
       };
 
       // Propagate needed fields
-      const fieldsToPropagate = [
-        "type",
-        "storageLimit",
-        "gasLimit",
-        "gasPrice",
-        "maxFeePerGas",
-        "maxPriorityFeePerGas",
-        "additionalFees",
-      ];
+      const fieldsToPropagate = ["type", "storageLimit"];
 
       for (const field of fieldsToPropagate) {
         propagateField(estimation, field, next);
@@ -119,7 +86,6 @@ export function genericPrepareTransaction(
 
       // align with stellar/xrp: when send max (or staking intents), reflect validated amount in UI
       if (transaction.useAllAmount || ["stake", "unstake"].includes(transaction.mode ?? "")) {
-        // TODO Remove the call to `validateIntent` https://ledgerhq.atlassian.net/browse/LIVE-22228
         const { amount } = await validateIntent(
           transactionToIntent(
             account,

package/src/bridge/generic-alpaca/signOperation.ts

@@ -86,19 +86,6 @@ export const genericSignOperation =
         const alpacaApi = getAlpacaApi(account.currency.id, kind);
         if (!transaction.fees) throw new FeeNotLoaded();
         const fees = BigInt(transaction.fees?.toString() || "0");
-        const feesParameters = {
-          ...(transaction.gasLimit ? { gasLimit: BigInt(transaction.gasLimit.toFixed()) } : {}),
-          ...(transaction.gasPrice ? { gasPrice: BigInt(transaction.gasPrice.toFixed()) } : {}),
-          ...(transaction.maxFeePerGas
-            ? { maxFeePerGas: BigInt(transaction.maxFeePerGas.toFixed()) }
-            : {}),
-          ...(transaction.maxPriorityFeePerGas
-            ? { maxPriorityFeePerGas: BigInt(transaction.maxPriorityFeePerGas.toFixed()) }
-            : {}),
-          ...(transaction.additionalFees
-            ? { additionalFees: BigInt(transaction.additionalFees.toFixed()) }
-            : {}),
-        };
         if (transaction.useAllAmount) {
           const draftTransaction = {
             mode: transaction.mode,
@@ -111,12 +98,10 @@ export const genericSignOperation =
             family: transaction.family,
             feesStrategy: transaction.feesStrategy,
             data: transaction.data,
-            type: transaction.type,
           };
-          // TODO Remove the call to `validateIntent` https://ledgerhq.atlassian.net/browse/LIVE-22227
           const { amount } = await alpacaApi.validateIntent(
             transactionToIntent(account, draftTransaction, alpacaApi.computeIntentType),
-            { value: fees, parameters: feesParameters },
+            { value: fees },
           );
           transaction.amount = new BigNumber(amount.toString());
         }
@@ -134,7 +119,7 @@ export const genericSignOperation =
           // Enrich with memo and asset information
           transactionIntent = enrichTransactionIntent(transactionIntent, transaction, publicKey);
 
-          if (typeof transactionIntent.sequence !== "bigint" || transactionIntent.sequence < 0n) {
+          if (typeof transactionIntent.sequence !== "bigint") {
             // TODO: should compute it and pass it down to craftTransaction (duplicate call right now)
             const sequenceNumber = await alpacaApi.getSequence(transactionIntent.sender);
             transactionIntent.sequence = sequenceNumber;
@@ -143,7 +128,6 @@ export const genericSignOperation =
           /* Craft unsigned blob via Alpaca */
           const { transaction: unsigned } = await alpacaApi.craftTransaction(transactionIntent, {
             value: fees,
-            parameters: feesParameters,
           });
 
           /* Notify UI that the device is now showing the tx */

package/src/bridge/generic-alpaca/signer/Eth.ts

@@ -1,6 +1,6 @@
 import { filter, firstValueFrom } from "rxjs";
 import { EvmAddress, EvmSignature, EvmSigner } from "@ledgerhq/coin-evm/types/signer";
-import { CreateSigner, executeWithSigner } from "../../setup";
+import { CreateSigner } from "../../setup";
 import { DeviceManagementKit } from "@ledgerhq/device-management-kit";
 import { DmkSignerEth, LegacySignerEth } from "@ledgerhq/live-signer-evm";
 import Transport from "@ledgerhq/hw-transport";
@@ -8,7 +8,6 @@ import { getEnv } from "@ledgerhq/live-env";
 import { ResolutionConfig, LoadConfig } from "@ledgerhq/hw-app-eth/lib/services/types";
 import { Signature } from "ethers";
 import type { DomainServiceResolution } from "@ledgerhq/types-live";
-import resolver from "@ledgerhq/coin-evm/hw-getAddress";
 
 export type Signer = {
   getAddress: (path: string) => Promise<EvmAddress>;
@@ -71,6 +70,3 @@ export const createSigner: CreateSigner<Signer> = (transport: Transport) => {
     },
   };
 };
-
-export const context = executeWithSigner(createSigner);
-export const getAddress = resolver(context);

package/src/bridge/generic-alpaca/signer/index.ts

@@ -10,7 +10,6 @@ import { AlpacaSigner } from "./types";
 import { DerivationType, LedgerSigner as TaquitoLedgerSigner } from "@taquito/ledger-signer";
 import tezosGetAddress from "@ledgerhq/coin-tezos/signer/getAddress";
 import Tezos from "@ledgerhq/hw-app-tezos";
-import { context as evmContext, getAddress as evmGetAddress } from "./Eth";
 
 const createSignerXrp: CreateSigner<Xrp> = (transport: Transport) => {
   return new Xrp(transport);
@@ -98,12 +97,6 @@ export function getSigner(network: string): AlpacaSigner {
         context: signerContextTezos,
       };
     }
-    case "evm": {
-      return {
-        getAddress: evmGetAddress,
-        context: evmContext,
-      };
-    }
   }
   throw new Error(`signer for ${network} not implemented`);
 }

package/src/bridge/generic-alpaca/tests/getAccountShape.test.ts

@@ -71,7 +71,7 @@ describe("genericGetAccountShape", () => {
         "sync-hash",
         {
           minHeight: 11,
-          order: "desc",
+          order: "asc",
           lastPagingToken: "pt1",
         },
         [
@@ -100,7 +100,7 @@ describe("genericGetAccountShape", () => {
         "outdated-sync-hash",
         {
           minHeight: 0,
-          order: "desc",
+          order: "asc",
         },
         [
           {

package/src/bridge/generic-alpaca/tests/prepareTransaction.test.ts

@@ -2,7 +2,6 @@ import { genericPrepareTransaction } from "../prepareTransaction";
 import { getAlpacaApi } from "../alpaca";
 import { transactionToIntent } from "../utils";
 import BigNumber from "bignumber.js";
-import { GenericTransaction } from "../types";
 
 jest.mock("../alpaca", () => ({
   getAlpacaApi: jest.fn(),
@@ -96,11 +95,6 @@ describe("genericPrepareTransaction", () => {
   it.each([
     ["type", 2, 2],
     ["storageLimit", 300n, new BigNumber(300)],
-    ["gasLimit", 300n, new BigNumber(300)],
-    ["gasPrice", 300n, new BigNumber(300)],
-    ["maxFeePerGas", 300n, new BigNumber(300)],
-    ["maxPriorityFeePerGas", 300n, new BigNumber(300)],
-    ["additionalFees", 300n, new BigNumber(300)],
   ])(
     "propagates %s from estimation parameters",
     async (parameterName, parameterValue, expectedValue) => {
@@ -128,30 +122,4 @@ describe("genericPrepareTransaction", () => {
       );
     },
   );
-
-  it("estimates using the token account spendable balance when sending all amount", async () => {
-    const estimateFees = jest.fn().mockResolvedValue({ value: new BigNumber(50) });
-    (transactionToIntent as jest.Mock).mockImplementation((_, transaction) => ({
-      amount: BigInt(transaction.amount.toFixed()),
-    }));
-    (getAlpacaApi as jest.Mock).mockReturnValue({
-      estimateFees,
-      validateIntent: intent => Promise.resolve({ amount: intent.amount }),
-    });
-    const prepareTransaction = genericPrepareTransaction(network, kind);
-
-    await prepareTransaction(
-      {
-        ...account,
-        subAccounts: [{ id: "test-sub-account", spendableBalance: new BigNumber(100) }],
-      },
-      {
-        subAccountId: "test-sub-account",
-        useAllAmount: true,
-        amount: new BigNumber(0),
-      } as GenericTransaction,
-    );
-
-    expect(estimateFees).toHaveBeenCalledWith(expect.objectContaining({ amount: 100n }), {});
-  });
 });

package/src/bridge/generic-alpaca/types.ts

@@ -70,9 +70,7 @@ export type GenericTransaction = TransactionCommon & {
   gasPrice?: BigNumber | null;
   maxFeePerGas?: BigNumber | null;
   maxPriorityFeePerGas?: BigNumber | null;
-  additionalFees?: BigNumber | null;
   gasOptions?: GasOptions;
-  sponsored?: boolean;
 };
 
 export type GenericTransactionRaw = TransactionCommonRaw & {
@@ -106,9 +104,7 @@ export type GenericTransactionRaw = TransactionCommonRaw & {
   gasPrice?: string | null;
   maxFeePerGas?: string | null;
   maxPriorityFeePerGas?: string | null;
-  additionalFees?: string | null;
   gasOptions?: GasOptionsRaw;
-  sponsored?: boolean;
 };
 
 export interface OperationCommon extends Operation {

package/src/bridge/generic-alpaca/utils.test.ts

@@ -166,12 +166,10 @@ describe("Alpaca utils", () => {
           },
           ...params,
         } as GenericTransaction,
-        3n,
       );
 
       expect(operation).toMatchObject({
         id: `parent-account-id--${expected.parentType}`,
-        transactionSequenceNumber: new BigNumber(3),
         type: expected.parentType,
         value: expected.parentValue,
         accountId: "parent-account-id",
@@ -196,12 +194,10 @@ describe("Alpaca utils", () => {
               subOperations: [
                 {
                   id: `sub-account-id--${expected.subType}`,
-                  transactionSequenceNumber: new BigNumber(3),
                   accountId: "sub-account-id",
                   type: expected.subType,
                   senders: ["account-address"],
                   recipients: ["recipient-address"],
-                  fee: new BigNumber(12),
                   value: new BigNumber(50),
                   blockHash: null,
                   blockHeight: null,

package/src/bridge/generic-alpaca/utils.ts

@@ -72,7 +72,6 @@ export function adaptCoreOperationToLiveOperation(accountId: string, op: CoreOpe
     parentRecipients?: string[];
     ledgerOpType?: string | undefined;
     memo?: string | undefined;
-    internal?: boolean;
   } = {};
 
   if (op.details?.ledgerOpType !== undefined) {
@@ -107,11 +106,6 @@ export function adaptCoreOperationToLiveOperation(accountId: string, op: CoreOpe
   if (op.details?.memo) {
     extra.memo = op.details.memo as string;
   }
-
-  if (op.details?.internal === true) {
-    extra.internal = op.details?.internal;
-  }
-
   const bnFees = new BigNumber(op.tx.fees.toString());
   const hasFailed = op.tx.failed;
 
@@ -220,7 +214,6 @@ export function transactionToIntent(
       transaction.nonce !== null && transaction.nonce !== undefined
         ? BigInt(transaction.nonce.toString())
         : undefined,
-    sponsored: transaction.sponsored,
   };
   if (transaction.assetReference && transaction.assetOwner) {
     const { subAccountId } = transaction;
@@ -272,11 +265,8 @@ function toGenericTransactionRaw(transaction: GenericTransaction): GenericTransa
     family: transaction.family,
   };
 
-  const booleanFieldsToPropagate = ["useAllAmount", "sponsored"] as const;
-  for (const field of booleanFieldsToPropagate) {
-    if (field in transaction) {
-      raw[field] = transaction[field];
-    }
+  if ("useAllAmount" in transaction) {
+    raw.useAllAmount = transaction.useAllAmount;
   }
 
   const stringFieldsToPropagate = [
@@ -306,7 +296,6 @@ function toGenericTransactionRaw(transaction: GenericTransaction): GenericTransa
     "gasPrice",
     "maxFeePerGas",
     "maxPriorityFeePerGas",
-    "additionalFees",
   ] as const;
   for (const field of bigNumberFieldsToPropagate) {
     if (field in transaction) {
@@ -418,12 +407,11 @@ export const buildOptimisticOperation = (
         hash: "",
         type,
         value: transaction.useAllAmount ? tokenAccount.balance : transaction.amount,
-        fee: new BigNumber(fees.toString()),
+        fee: new BigNumber(0),
         blockHash: null,
         blockHeight: null,
         senders: [account.freshAddress],
         recipients: [transaction.recipient],
-        transactionSequenceNumber: new BigNumber(sequenceNumber?.toString() ?? 0),
         accountId: subAccountId,
         date: new Date(),
         transactionRaw: toGenericTransactionRaw({

package/src/bridge/impl.ts

@@ -23,7 +23,6 @@ import { AddressesSanctionedError } from "@ledgerhq/coin-framework/sanction/erro
 // Removed: stores are now managed globally by @ledgerhq/cryptoassets/cal-client/store
 
 const alpacaized = {
-  evm: true,
   xrp: true,
   stellar: true,
   tezos: true,
@@ -36,13 +35,7 @@ const currencyBridgeCache: Record<string, CurrencyBridge> = {};
 export const getCurrencyBridge = (currency: CryptoCurrency): CurrencyBridge => {
   if (getEnv("MOCK")) {
     const mockBridge = mockBridges[currency.family];
-    // TODO Remove once we delete mock bridges tests
-    if (mockBridge) {
-      if (typeof mockBridge.loadCoinConfig === "function") {
-        mockBridge.loadCoinConfig();
-      }
-      return mockBridge.currencyBridge;
-    }
+    if (mockBridge) return mockBridge.currencyBridge;
     throw new CurrencyNotSupported("no mock implementation available for currency " + currency.id, {
       currencyName: currency.id,
     });
@@ -92,19 +85,13 @@ export function getAccountBridgeByFamily(family: string, accountId?: string): Ac
 
     if (type === "mock") {
       const mockBridge = mockBridges[family];
-      // TODO Remove once we delete mock bridges tests
-      if (mockBridge) {
-        if (typeof mockBridge.loadCoinConfig === "function") {
-          mockBridge.loadCoinConfig();
-        }
-        return wrapAccountBridge(mockBridge.accountBridge);
-      }
+      if (mockBridge) return wrapAccountBridge(mockBridge.accountBridge);
     }
   }
 
   if (alpacaized[family]) {
     if (!bridgeCache[family]) {
-      bridgeCache[family] = wrapAccountBridge(getAlpacaAccountBridge(family, "local"));
+      bridgeCache[family] = getAlpacaAccountBridge(family, "local");
     }
     return bridgeCache[family];
   }