@ledgerhq/live-common 25.1.0 → 25.2.0-next.0

package/src/families/bitcoin/transaction.ts

@@ -4,16 +4,29 @@ import type {
   TransactionRaw,
   FeeItems,
   FeeItemsRaw,
+  TransactionStatusRaw,
+  TransactionStatus,
+  BitcoinAccount,
 } from "./types";
-import type { Account } from "../../types";
 import { bitcoinPickingStrategy } from "./types";
 import { getEnv } from "../../env";
 import {
+  formatTransactionStatusCommon,
   fromTransactionCommonRaw,
+  fromTransactionStatusRawCommon,
   toTransactionCommonRaw,
+  toTransactionStatusRawCommon,
 } from "../../transaction/common";
 import { getAccountUnit } from "../../account";
 import { formatCurrencyUnit } from "../../currencies";
+import type { Account } from "@ledgerhq/types-live";
+import {
+  fromBitcoinInputRaw,
+  fromBitcoinOutputRaw,
+  toBitcoinInputRaw,
+  toBitcoinOutputRaw,
+} from "./serialization";
+import { formatInput, formatOutput } from "./account";
 
 const fromFeeItemsRaw = (fir: FeeItemsRaw): FeeItems => ({
   items: fir.items.map((fi) => ({
@@ -64,6 +77,60 @@ export const toTransactionRaw = (t: Transaction): TransactionRaw => {
   };
 };
 
+const fromTransactionStatusRaw = (
+  tr: TransactionStatusRaw
+): TransactionStatus => {
+  const common = fromTransactionStatusRawCommon(tr);
+  return {
+    ...common,
+    txInputs: tr.txInputs ? tr.txInputs.map(fromBitcoinInputRaw) : undefined,
+    txOutputs: tr.txOutputs
+      ? tr.txOutputs.map(fromBitcoinOutputRaw)
+      : undefined,
+  };
+};
+
+const toTransactionStatusRaw = (t: TransactionStatus): TransactionStatusRaw => {
+  const common = toTransactionStatusRawCommon(t);
+  return {
+    ...common,
+    txInputs: t.txInputs ? t.txInputs.map(toBitcoinInputRaw) : undefined,
+    txOutputs: t.txOutputs ? t.txOutputs.map(toBitcoinOutputRaw) : undefined,
+  };
+};
+
+export const formatTransactionStatus = (
+  t: Transaction,
+  ts: TransactionStatus,
+  mainAccount: Account
+): string => {
+  let str = "";
+  const txInputs = ts.txInputs || [];
+  const txOutputs = ts.txOutputs || [];
+  const n = getEnv("DEBUG_UTXO_DISPLAY");
+  const displayAll = txInputs.length <= n;
+  str +=
+    `\nTX INPUTS (${txInputs.length}):\n` +
+    txInputs
+      .slice(0, displayAll ? txInputs.length : n)
+      .map((o) => formatInput(mainAccount as BitcoinAccount, o))
+      .join("\n");
+
+  if (!displayAll) {
+    str += "\n...";
+  }
+
+  str +=
+    `\nTX OUTPUTS (${txOutputs.length}):\n` +
+    txOutputs
+      .map((o) => formatOutput(mainAccount as BitcoinAccount, o))
+      .join("\n");
+
+  str += formatTransactionStatusCommon(t, ts, mainAccount);
+
+  return str;
+};
+
 const formatNetworkInfo = (
   networkInfo:
     | {
@@ -113,4 +180,7 @@ export default {
   fromTransactionRaw,
   toTransactionRaw,
   formatTransaction,
+  formatTransactionStatus,
+  fromTransactionStatusRaw,
+  toTransactionStatusRaw,
 };

package/src/families/bitcoin/types.ts

@@ -3,11 +3,14 @@ import type {
   Account as WalletAccount,
   SerializedAccount as WalletAccountRaw,
 } from "./wallet-btc";
-
-import type {
+import {
+  Account,
+  AccountRaw,
   TransactionCommon,
   TransactionCommonRaw,
-} from "../../types/transaction";
+  TransactionStatusCommon,
+  TransactionStatusCommonRaw,
+} from "@ledgerhq/types-live";
 
 export type BitcoinInput = {
   address: string | null | undefined;
@@ -145,3 +148,15 @@ export type TransactionRaw = TransactionCommonRaw & {
   feePerByte: string | null | undefined;
   networkInfo: NetworkInfoRaw | null | undefined;
 };
+export type TransactionStatus = TransactionStatusCommon & {
+  txInputs?: BitcoinInput[];
+  txOutputs?: BitcoinOutput[];
+};
+export type TransactionStatusRaw = TransactionStatusCommonRaw & {
+  txInputs?: BitcoinInputRaw[];
+  txOutputs?: BitcoinOutputRaw[];
+};
+export type BitcoinAccount = Account & { bitcoinResources: BitcoinResources };
+export type BitcoinAccountRaw = AccountRaw & {
+  bitcoinResources: BitcoinResourcesRaw;
+};

package/src/families/bitcoin/wallet-btc/index.ts

@@ -14,8 +14,9 @@ import { Merge } from "./pickingstrategies/Merge";
 import { isValidAddress, isTaprootAddress } from "./utils";
 
 import type { Account as WalletAccount } from "./account";
-import type { Account as LiveAccount } from "./../../../types";
+import type { Account as LiveAccount } from "@ledgerhq/types-live";
 import { AccountNeedResync } from "../../../errors";
+import { BitcoinAccount } from "../types";
 
 export {
   BitcoinLikeWallet,
@@ -39,7 +40,8 @@ export {
 let wallet: BitcoinLikeWallet | null = null;
 
 export const getWalletAccount = (account: LiveAccount): WalletAccount => {
-  const walletAccount = account.bitcoinResources?.walletAccount;
+  const walletAccount = (account as BitcoinAccount).bitcoinResources
+    ?.walletAccount;
   if (account.id.startsWith("libcore") || !walletAccount) {
     throw new AccountNeedResync();
   }

package/src/families/cardano/address.unit.test.ts

@@ -0,0 +1,35 @@
+import { isValidAddress } from "./logic";
+import { NetworkId } from "./types";
+
+describe("address validation", () => {
+  it("should check for invalid address", () => {
+    const isValid = isValidAddress(
+      "bnb136ns6lfw4zs5hg4n85vdthaad7hq5m4gtkgf23",
+      NetworkId.mainnet
+    );
+    expect(isValid).toEqual(false);
+  });
+
+  it("should check for valid byron address", () => {
+    const isValidByronAddress1 = isValidAddress(
+      "Ae2tdPwUPEZFBgKrLT9pn8JPJVbefcL4kuznpQxQpxKfTVuHJ9gLAmxKk4w",
+      NetworkId.mainnet
+    );
+    expect(isValidByronAddress1).toEqual(true);
+
+    const isValidByronAddress2 = isValidAddress(
+      "DdzFFzCqrhst6mdc3hmFeWu77FZdYNjV7tTGVtEBXQzE3iCqyZWn9SSWCBrjRbbhj94VHAyGU96khi8qGM1B29nGs1jZRZEWKg2MwbVb",
+      NetworkId.mainnet
+    );
+    expect(isValidByronAddress2).toEqual(true);
+  });
+
+  it("should check for valid shelley address", () => {
+    const isValidShelleyAddress = isValidAddress(
+      "addr1q8mgw8geggkl2hs0m6rq3pgt69uxttpqcgu6euxje5tt6plxjtjrnskhhtt03g6l3sr98p9t8mtlajr26vmwjzep77pqxn8cms",
+      NetworkId.mainnet
+    );
+
+    expect(isValidShelleyAddress).toEqual(true);
+  });
+});

package/src/families/cardano/api/getNetworkInfo.ts

@@ -1,11 +1,12 @@
 import network from "../../../network";
-import { Account, CryptoCurrency } from "../../../types";
 import { APINetworkInfo } from "./api-types";
 import { getEpoch, isTestnet } from "../logic";
 import {
   CARDANO_API_ENDPOINT,
   CARDANO_TESTNET_API_ENDPOINT,
 } from "../constants";
+import { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
+import { CardanoAccount } from "../types";
 
 async function fetchNetworkInfo(
   currency: CryptoCurrency
@@ -20,7 +21,7 @@ async function fetchNetworkInfo(
 }
 
 export async function getNetworkInfo(
-  a: Account | undefined,
+  a: CardanoAccount | undefined,
   currency: CryptoCurrency
 ): Promise<APINetworkInfo> {
   if (a && a.cardanoResources) {

package/src/families/cardano/api/getTransactions.ts

@@ -1,7 +1,7 @@
 import network from "../../../network";
 import * as ApiTypes from "./api-types";
 import { Bip32PublicKey } from "@stricahq/bip32ed25519";
-import { PaymentChain, PaymentCredential } from "../types";
+import { CardanoAccount, PaymentChain, PaymentCredential } from "../types";
 import { getEnv } from "../../../env";
 import {
   getBipPath,
@@ -11,12 +11,12 @@ import {
 } from "../logic";
 import range from "lodash/range";
 import chunk from "lodash/chunk";
-import { Account, CryptoCurrency } from "../../../types";
 import { APITransaction } from "./api-types";
 import {
   CARDANO_API_ENDPOINT,
   CARDANO_TESTNET_API_ENDPOINT,
 } from "../constants";
+import { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
 
 async function fetchTransactions(
   paymentKeys: Array<string>,
@@ -186,7 +186,7 @@ async function getSyncedTransactionsByChain(
 export async function getTransactions(
   xpub: string,
   accountIndex: number,
-  initialAccount: Account | undefined,
+  initialAccount: CardanoAccount | undefined,
   blockHeight: number,
   currency: CryptoCurrency
 ): Promise<{

package/src/families/cardano/api/submitTransaction.ts

@@ -1,4 +1,4 @@
-import { CryptoCurrency } from "@ledgerhq/cryptoassets";
+import type { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
 import network from "../../../network";
 import {
   CARDANO_API_ENDPOINT,

package/src/families/cardano/bridge/js.ts

@@ -1,5 +1,4 @@
 import type { Transaction } from "../types";
-import type { AccountBridge, CurrencyBridge } from "../../../types";
 import { scanAccounts, sync } from "../js-synchronisation";
 import estimateMaxSpendable from "../js-estimateMaxSpendable";
 import {
@@ -11,6 +10,7 @@ import getTransactionStatus from "../js-getTransactionStatus";
 import signOperation from "../js-signOperation";
 import broadcast from "../js-broadcast";
 import { makeAccountBridgeReceive } from "../../../bridge/jsHelpers";
+import type { AccountBridge, CurrencyBridge } from "@ledgerhq/types-live";
 
 const receive = makeAccountBridgeReceive();
 

package/src/families/cardano/bridge.integration.test.ts

@@ -2,12 +2,12 @@ import { NotEnoughBalance } from "@ledgerhq/errors";
 import "../../__tests__/test-helpers/setup";
 import { testBridge } from "../../__tests__/test-helpers/bridge";
 import BigNumber from "bignumber.js";
-import type { DatasetTest } from "../../types";
 import { cardanoRawAccount1 } from "./datasets/rawAccount.1";
 import { cardanoScanAccounts } from "./datasets/scanAccounts";
 import { CardanoMinAmountError } from "./errors";
 import { fromTransactionRaw } from "./transaction";
 import type { Transaction } from "./types";
+import type { DatasetTest } from "@ledgerhq/types-live";
 
 const dataset: DatasetTest<Transaction> = {
   implementations: ["js"],

package/src/families/cardano/buildSubAccounts.ts

@@ -1,6 +1,5 @@
 import BigNumber from "bignumber.js";
 import { encodeOperationId } from "../../operation";
-import { Account, CryptoCurrency, Operation, TokenAccount } from "../../types";
 import { APITransaction } from "./api/api-types";
 import { getAccountChange, getMemoFromTx, isHexString } from "./logic";
 import { PaymentCredential, Token } from "./types";
@@ -13,6 +12,8 @@ import {
 } from "../../account";
 import { groupBy, keyBy } from "lodash";
 import { mergeOps } from "../../bridge/jsHelpers";
+import type { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
+import type { Account, Operation, TokenAccount } from "@ledgerhq/types-live";
 
 export const getTokenAssetId = ({
   policyId,

package/src/families/cardano/cli-transaction.ts

@@ -1,9 +1,9 @@
+import { Account, AccountLike } from "@ledgerhq/types-live";
 import invariant from "invariant";
 import flatMap from "lodash/flatMap";
 import { getAccountCurrency } from "../../account";
-import type { AccountLike, Account } from "../../types";
 import { TokenAccount } from "../solana/api/chain/account/token";
-import { Transaction } from "./types";
+import { CardanoAccount, Transaction } from "./types";
 
 const options = [
   {
@@ -59,7 +59,10 @@ function inferTransactions(
       throw new Error("transaction is not of type cardano");
     }
 
-    if (account.type === "Account" && !account.cardanoResources) {
+    if (
+      account.type === "Account" &&
+      !(account as CardanoAccount).cardanoResources
+    ) {
       throw new Error("unactivated account");
     }
 

package/src/families/cardano/datasets/rawAccount.1.ts

@@ -1,4 +1,4 @@
-import { AccountRaw } from "../../../types";
+import type { AccountRaw } from "@ledgerhq/types-live";
 
 export const cardanoRawAccount1: AccountRaw = {
   id: "js:2:cardano_testnet:a902bc61a79256e1d5858d2ba49cab7011a26ad49580daace7412e255e818b1c1eba2defa321ff2937deba397f639f5bbabb0f0064516301fa4d08663c83f5b2:",

package/src/families/cardano/deviceTransactionConfig.ts

@@ -2,9 +2,9 @@ import BigNumber from "bignumber.js";
 import { getAccountUnit, getMainAccount } from "../../account";
 import { formatCurrencyUnit } from "../../currencies";
 import { DeviceTransactionField } from "../../transaction";
-import { Account, AccountLike, TransactionStatus } from "../../types";
+import { Account, AccountLike } from "@ledgerhq/types-live";
 import { decodeTokenAssetId, decodeTokenCurrencyId } from "./buildSubAccounts";
-import { CardanoResources, Transaction } from "./types";
+import { CardanoAccount, Transaction, TransactionStatus } from "./types";
 import { utils as TyphonUtils } from "@stricahq/typhonjs";
 import { decodeTokenName } from "./logic";
 
@@ -24,7 +24,7 @@ function getDeviceTransactionConfig({
 
   if (mode === "send") {
     if (account.type === "TokenAccount") {
-      const cardanoResources = mainAccount.cardanoResources as CardanoResources;
+      const cardanoResources = (mainAccount as CardanoAccount).cardanoResources;
 
       const { assetId } = decodeTokenCurrencyId(account.token.id);
       const { policyId, assetName } = decodeTokenAssetId(assetId);

package/src/families/cardano/js-broadcast.ts

@@ -1,4 +1,4 @@
-import type { BroadcastFnSignature } from "../../types";
+import type { BroadcastFnSignature } from "@ledgerhq/types-live";
 import { patchOperationWithHash } from "../../operation";
 import { submitTransaction } from "./api/submitTransaction";
 

package/src/families/cardano/js-buildTransaction.ts

@@ -1,11 +1,12 @@
 import {
+  CardanoAccount,
   CardanoOutput,
   CardanoResources,
   PaymentCredential,
   Token,
   Transaction,
 } from "./types";
-import type { Account, TokenAccount } from "../../types";
+import type { TokenAccount } from "@ledgerhq/types-live";
 import {
   Transaction as TyphonTransaction,
   types as TyphonTypes,
@@ -49,7 +50,7 @@ const buildSendTokenTransaction = async ({
   receiverAddress,
   changeAddress,
 }: {
-  a: Account;
+  a: CardanoAccount;
   t: Transaction;
   tokenAccount: TokenAccount;
   typhonTx: TyphonTransaction;
@@ -137,7 +138,7 @@ const buildSendAdaTransaction = async ({
   receiverAddress,
   changeAddress,
 }: {
-  a: Account;
+  a: CardanoAccount;
   t: Transaction;
   typhonTx: TyphonTransaction;
   receiverAddress: TyphonTypes.CardanoAddress;
@@ -213,13 +214,13 @@ const buildSendAdaTransaction = async ({
 
 /**
  *
- * @param {Account} a
+ * @param {CardanoAccount} a
  * @param {Transaction} t
  *
  * @returns {TyphonTransaction}
  */
 export const buildTransaction = async (
-  a: Account,
+  a: CardanoAccount,
   t: Transaction
 ): Promise<TyphonTransaction> => {
   const cardanoResources = a.cardanoResources as CardanoResources;

package/src/families/cardano/js-estimateMaxSpendable.ts

@@ -1,10 +1,7 @@
 import { BigNumber } from "bignumber.js";
-
-import type { AccountLike, Account } from "../../types";
+import type { AccountLike, Account } from "@ledgerhq/types-live";
 import { getMainAccount } from "../../account";
-
-import type { Transaction } from "./types";
-
+import type { CardanoAccount, Transaction } from "./types";
 import { createTransaction } from "./js-transaction";
 import {
   address as TyphonAddress,
@@ -43,7 +40,7 @@ const estimateMaxSpendable = async ({
   };
   let typhonTransaction;
   try {
-    typhonTransaction = await buildTransaction(a, t);
+    typhonTransaction = await buildTransaction(a as CardanoAccount, t);
   } catch (error) {
     return new BigNumber(0);
   }

package/src/families/cardano/js-getFeesForTransaction.ts

@@ -1,21 +1,18 @@
 import { BigNumber } from "bignumber.js";
-
-import type { Account } from "../../types";
-import type { Transaction } from "./types";
-
+import type { CardanoAccount, Transaction } from "./types";
 import { buildTransaction } from "./js-buildTransaction";
 
 /**
  * Fetch the transaction fees for a transaction
  *
- * @param {Account} a
+ * @param {CardanoAccount} a
  * @param {Transaction} t
  */
 const getEstimatedFees = async ({
   a,
   t,
 }: {
-  a: Account;
+  a: CardanoAccount;
   t: Transaction;
 }): Promise<BigNumber> => {
   const unsigned = await buildTransaction(a, t);

package/src/families/cardano/js-getTransactionStatus.ts

@@ -5,8 +5,13 @@ import {
   InvalidAddress,
   AmountRequired,
 } from "@ledgerhq/errors";
-import type { Account, TransactionStatus } from "../../types";
-import type { CardanoResources, Token, Transaction } from "./types";
+import type {
+  CardanoAccount,
+  CardanoResources,
+  Token,
+  Transaction,
+  TransactionStatus,
+} from "./types";
 import { isValidAddress } from "./logic";
 import { utils as TyphonUtils } from "@stricahq/typhonjs";
 import { CardanoMinAmountError, CardanoNotEnoughFunds } from "./errors";
@@ -17,7 +22,7 @@ import estimateMaxSpendable from "./js-estimateMaxSpendable";
 import { buildTransaction } from "./js-buildTransaction";
 
 const getTransactionStatus = async (
-  a: Account,
+  a: CardanoAccount,
   t: Transaction
 ): Promise<TransactionStatus> => {
   const errors: Record<string, Error> = {};

package/src/families/cardano/js-signOperation.ts

@@ -2,13 +2,7 @@ import { BigNumber } from "bignumber.js";
 import { Observable } from "rxjs";
 import { FeeNotLoaded } from "@ledgerhq/errors";
 
-import type { CardanoResources, Transaction } from "./types";
-import type {
-  Account,
-  Operation,
-  SignedOperation,
-  SignOperationEvent,
-} from "../../types";
+import type { CardanoAccount, CardanoResources, Transaction } from "./types";
 
 import { withDevice } from "../../hw/deviceAccess";
 import { encodeOperationId } from "../../operation";
@@ -36,9 +30,15 @@ import {
 import ShelleyTypeAddress from "@stricahq/typhonjs/dist/address/ShelleyTypeAddress";
 import { getNetworkParameters } from "./networks";
 import { MEMO_LABEL } from "./constants";
+import {
+  Account,
+  Operation,
+  SignedOperation,
+  SignOperationEvent,
+} from "@ledgerhq/types-live";
 
 const buildOptimisticOperation = (
-  account: Account,
+  account: CardanoAccount,
   transaction: TyphonTransaction,
   t: Transaction
 ): Operation => {
@@ -184,7 +184,7 @@ const signOperation = ({
           }
 
           const unsignedTransaction = await buildTransaction(
-            account,
+            account as CardanoAccount,
             transaction
           );
 
@@ -246,7 +246,7 @@ const signOperation = ({
           o.next({ type: "device-signature-granted" });
 
           const operation = buildOptimisticOperation(
-            account,
+            account as CardanoAccount,
             unsignedTransaction,
             transaction
           );

package/src/families/cardano/js-synchronisation.ts

@@ -1,4 +1,3 @@
-import type { Operation, TokenAccount } from "../../types";
 import {
   GetAccountShape,
   makeScanAccounts,
@@ -12,7 +11,7 @@ import Ada from "@cardano-foundation/ledgerjs-hw-app-cardano";
 import { str_to_path } from "@cardano-foundation/ledgerjs-hw-app-cardano/dist/utils";
 import { utils as TyphonUtils } from "@stricahq/typhonjs";
 import { APITransaction } from "./api/api-types";
-import { CardanoOutput, PaymentCredential } from "./types";
+import { CardanoAccount, CardanoOutput, PaymentCredential } from "./types";
 import {
   getAccountChange,
   getAccountStakeCredential,
@@ -29,6 +28,7 @@ import { getNetworkInfo } from "./api/getNetworkInfo";
 import uniqBy from "lodash/uniqBy";
 import postSyncPatch from "./postSyncPatch";
 import { getTransactions } from "./api/getTransactions";
+import type { Operation, TokenAccount } from "@ledgerhq/types-live";
 import { buildSubAccounts } from "./buildSubAccounts";
 import { calculateMinUtxoAmount } from "@stricahq/typhonjs/dist/utils/utils";
 import { listTokensForCryptoCurrency } from "../../currencies";
@@ -191,7 +191,7 @@ export const getAccountShape: GetAccountShape = async (
   } = await getTransactions(
     xpub,
     accountIndex,
-    initialAccount,
+    initialAccount as CardanoAccount,
     syncFromBlockHeight,
     currency
   );
@@ -211,9 +211,9 @@ export const getAccountShape: GetAccountShape = async (
     }
   });
 
-  const stableUtxos = (initialAccount?.cardanoResources?.utxos || []).filter(
-    (u) => stableOperationsByIds[u.hash]
-  );
+  const stableUtxos = (
+    (initialAccount as CardanoAccount)?.cardanoResources?.utxos || []
+  ).filter((u) => stableOperationsByIds[u.hash]);
 
   const utxos = prepareUtxos(
     newTransactions,
@@ -255,7 +255,10 @@ export const getAccountShape: GetAccountShape = async (
         stakeCred: stakeCredential,
       }).getBech32(),
     }));
-  const cardanoNetworkInfo = await getNetworkInfo(initialAccount, currency);
+  const cardanoNetworkInfo = await getNetworkInfo(
+    initialAccount as CardanoAccount,
+    currency
+  );
   const minAdaBalanceForTokens = tokenBalance.length
     ? calculateMinUtxoAmount(
         tokenBalance,

package/src/families/cardano/js-transaction.ts

@@ -1,6 +1,5 @@
 import { BigNumber } from "bignumber.js";
-import type { Account } from "../../types";
-import { Transaction } from "./types";
+import { CardanoAccount, Transaction } from "./types";
 import {
   types as TyphonTypes,
   address as TyphonAddress,
@@ -40,7 +39,7 @@ export const updateTransaction = (
  * @param {Transaction} t
  */
 export const prepareTransaction = async (
-  a: Account,
+  a: CardanoAccount,
   t: Transaction
 ): Promise<Transaction> => {
   let transaction;

package/src/families/cardano/logic.ts

@@ -31,11 +31,12 @@ import {
 import { Bip32PublicKey } from "@stricahq/bip32ed25519";
 import BigNumber from "bignumber.js";
 import { getNetworkParameters } from "./networks";
-import { CryptoCurrency, OperationType } from "../../types";
 import groupBy from "lodash/groupBy";
 import { APITransaction } from "./api/api-types";
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets";
 import ShelleyTypeAddress from "@stricahq/typhonjs/dist/address/ShelleyTypeAddress";
+import type { OperationType } from "@ledgerhq/types-live";
+import type { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
 
 /**
  *  returns BipPath object with account, chain and index field for cardano

package/src/families/cardano/postSyncPatch.ts

@@ -2,7 +2,7 @@
  *  Code reference taken from src/families/ethereum/postSyncPatch.ts
  */
 
-import type { AccountLike, Account, Operation } from "../../types";
+import type { AccountLike, Account, Operation } from "@ledgerhq/types-live";
 
 // we need to preserve ADA pendingOperations because there is no mempool to do this
 // we assume we need to preserve until:

package/src/families/cardano/specs.ts

@@ -1,6 +1,6 @@
 import expect from "expect";
 import type { AppSpec } from "../../bot/types";
-import type { CardanoResources, Transaction } from "./types";
+import type { CardanoAccount, CardanoResources, Transaction } from "./types";
 import { pickSiblings } from "../../bot/specs";
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets";
 import { DeviceModelId } from "@ledgerhq/devices";
@@ -9,7 +9,7 @@ import invariant from "invariant";
 import { utils as TyphonUtils } from "@stricahq/typhonjs";
 import { mergeTokens } from "./logic";
 import { parseCurrencyUnit } from "../../currencies";
-import { SubAccount } from "../../types";
+import { SubAccount } from "@ledgerhq/types-live";
 
 const currency = getCryptoCurrencyById("cardano");
 const minBalanceRequired = parseCurrencyUnit(currency.units[0], "2.2");
@@ -82,8 +82,8 @@ const cardano: AppSpec<Transaction> = {
         };
       },
       test: ({ accountBeforeTransaction, operation }): void => {
-        const cardanoResources =
-          accountBeforeTransaction.cardanoResources as CardanoResources;
+        const cardanoResources = (accountBeforeTransaction as CardanoAccount)
+          .cardanoResources as CardanoResources;
         const utxoTokens = cardanoResources.utxos.map((u) => u.tokens).flat();
         const tokenBalance = mergeTokens(utxoTokens);
         const requiredAdaForTokens = tokenBalance.length

package/src/families/cardano/speculos-deviceActions.ts

@@ -2,7 +2,7 @@ import type { DeviceAction } from "../../bot/types";
 import type { Transaction } from "./types";
 import { formatCurrencyUnit } from "../../currencies";
 import { deviceActionFlow } from "../../bot/specs";
-import { Unit } from "@ledgerhq/cryptoassets";
+import type { Unit } from "@ledgerhq/types-cryptoassets";
 import BigNumber from "bignumber.js";
 
 function expectedValue(unit: Unit, value: BigNumber) {