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

package/src/families/bitcoin/account.ts

@@ -1,12 +1,11 @@
-import type { Account } from "../../types";
-import type { BitcoinOutput, BitcoinInput } from "./types";
+import type { BitcoinOutput, BitcoinInput, BitcoinAccount } from "./types";
 import { formatCurrencyUnit } from "../../currencies";
 import { getEnv } from "../../env";
 import { perCoinLogic } from "./logic";
 
 const sortUTXO = (a, b) => b.value.minus(a.value).toNumber();
 
-function injectGetAddressParams(account: Account) {
+function injectGetAddressParams(account: BitcoinAccount) {
   const perCoin = perCoinLogic[account.currency.id];
 
   if (perCoin && perCoin.injectGetAddressParams) {
@@ -14,7 +13,10 @@ function injectGetAddressParams(account: Account) {
   }
 }
 
-export function formatInput(account: Account, input: BitcoinInput): string {
+export function formatInput(
+  account: BitcoinAccount,
+  input: BitcoinInput
+): string {
   return `${(input.value
     ? formatCurrencyUnit(account.unit, input.value, {
         showCode: false,
@@ -24,7 +26,10 @@ export function formatInput(account: Account, input: BitcoinInput): string {
     input.previousOutputIndex
   }`;
 }
-export function formatOutput(account: Account, o: BitcoinOutput): string {
+export function formatOutput(
+  account: BitcoinAccount,
+  o: BitcoinOutput
+): string {
   return [
     formatCurrencyUnit(account.unit, o.value, {
       showCode: false,
@@ -41,7 +46,7 @@ export function formatOutput(account: Account, o: BitcoinOutput): string {
     .join(" ");
 }
 
-function formatAccountSpecifics(account: Account): string {
+function formatAccountSpecifics(account: BitcoinAccount): string {
   if (!account.bitcoinResources) return "";
   const { utxos } = account.bitcoinResources;
   let str = `\n${utxos.length} UTXOs`;

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

@@ -1,4 +1,3 @@
-import type { AccountBridge, CurrencyBridge } from "../../../types/bridge";
 import type { Transaction } from "../types";
 import { sync, scanAccounts } from "../js-synchronisation";
 import createTransaction from "../js-createTransaction";
@@ -11,6 +10,7 @@ import { calculateFees } from "./../cache";
 import { perCoinLogic } from "../logic";
 import { makeAccountBridgeReceive } from "../../../bridge/jsHelpers";
 import * as explorerConfigAPI from "../../../api/explorerConfig";
+import { AccountBridge, CurrencyBridge } from "@ledgerhq/types-live";
 
 const receive = makeAccountBridgeReceive({
   injectGetAddressParams: (account) => {

package/src/families/bitcoin/bridge/mock.ts

@@ -6,7 +6,6 @@ import {
   FeeTooHigh,
 } from "@ledgerhq/errors";
 import type { Transaction } from "../types";
-import type { AccountBridge, CurrencyBridge } from "../../../types";
 import { getFeeItems } from "../../../api/FeesBitcoin";
 import {
   scanAccounts,
@@ -17,6 +16,7 @@ import {
 } from "../../../bridge/mockHelpers";
 import { getMainAccount } from "../../../account";
 import { makeAccountBridgeReceive } from "../../../bridge/mockHelpers";
+import type { AccountBridge, CurrencyBridge } from "@ledgerhq/types-live";
 const receive = makeAccountBridgeReceive();
 
 const defaultGetFees = (a, t: any) =>

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

@@ -1,7 +1,5 @@
 import "../../__tests__/test-helpers/setup";
 import { testBridge } from "../../__tests__/test-helpers/bridge";
-
-import type { DatasetTest } from "../../types";
 import type { Transaction } from "./types";
 import bitcoin_cash from "./datasets/bitcoin_cash";
 import bitcoin_gold from "./datasets/bitcoin_gold";
@@ -20,6 +18,7 @@ import stakenet from "./datasets/stakenet";
 import vertcoin from "./datasets/vertcoin";
 import viacoin from "./datasets/viacoin";
 import zcash from "./datasets/zcash";
+import { DatasetTest } from "@ledgerhq/types-live";
 
 const dataset: DatasetTest<Transaction> = {
   implementations: ["js", "mock"],

package/src/families/bitcoin/cache.ts

@@ -1,10 +1,11 @@
 import { RecipientRequired } from "@ledgerhq/errors";
 import { makeLRUCache } from "./../../cache";
-import type { Account, CryptoCurrency } from "./../../types";
 import type { Transaction } from "./types";
 import getFeesForTransaction from "./js-getFeesForTransaction";
 import { isValidRecipient } from "./logic";
 import { Currency, isTaprootAddress } from "./wallet-btc";
+import type { Account } from "@ledgerhq/types-live";
+import type { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
 
 const getCacheKeyForCalculateFees = ({
   a,

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

@@ -1,7 +1,8 @@
 import invariant from "invariant";
 import { BigNumber } from "bignumber.js";
-import type { Transaction, AccountLike } from "../../types";
+import type { Transaction } from "../../generated/types";
 import { bitcoinPickingStrategy } from "./types";
+import type { AccountLike } from "@ledgerhq/types-live";
 const options = [
   {
     name: "feePerByte",

package/src/families/bitcoin/datasets/bitcoin.ts

@@ -1,7 +1,7 @@
 import { BigNumber } from "bignumber.js";
 // import { FeeTooHigh } from "@ledgerhq/errors";
-import type { CurrenciesData } from "../../../types";
-import type { NetworkInfoRaw, Transaction } from "../types";
+import type { CurrenciesData } from "@ledgerhq/types-live";
+import type { BitcoinAccountRaw, NetworkInfoRaw, Transaction } from "../types";
 import { fromTransactionRaw } from "../transaction";
 import scanAccounts1 from "./bitcoin.scanAccounts.1";
 const networkInfo: NetworkInfoRaw = {
@@ -134,7 +134,11 @@ const dataset: CurrenciesData<Transaction> = {
         balance: "2757",
         blockHeight: 0,
         lastSyncDate: "",
-      },
+        xpub: "xpub6BuPWhjLqutPV8SF4RMrrn8c3t7uBZbz4CBbThpbg9GYjqRMncra9mjgSfWSK7uMDz37hhzJ8wvkbDDQQJt6VgwLoszvmPiSBtLA1bPLLSn",
+        bitcoinResources: {
+          utxos: [],
+        },
+      } as BitcoinAccountRaw,
     },
     {
       raw: {
@@ -159,7 +163,11 @@ const dataset: CurrenciesData<Transaction> = {
         unitMagnitude: 8,
         lastSyncDate: "",
         balance: "2717",
-      },
+        xpub: "xpub6DEHKg8fgKcb9at2u9Xhjtx4tXGyWqUPQAx2zNCzr41gQRyCqpCn7onSoJU4VS96GXyCtAhhFxErnG2pGVvVexaqF7DEfqGGnGk7Havn7C2",
+        bitcoinResources: {
+          utxos: [],
+        },
+      } as BitcoinAccountRaw,
     },
   ],
 };

package/src/families/bitcoin/datasets/bitcoin_cash.ts

@@ -1,4 +1,4 @@
-import type { CurrenciesData } from "../../../types";
+import type { CurrenciesData } from "@ledgerhq/types-live";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
   FIXME_ignoreAccountFields: [

package/src/families/bitcoin/datasets/bitcoin_gold.ts

@@ -1,4 +1,4 @@
-import type { CurrenciesData } from "../../../types";
+import type { CurrenciesData } from "@ledgerhq/types-live";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
   FIXME_ignoreAccountFields: [

package/src/families/bitcoin/datasets/dash.ts

@@ -1,4 +1,4 @@
-import type { CurrenciesData } from "../../../types";
+import type { CurrenciesData } from "@ledgerhq/types-live";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
   FIXME_ignoreAccountFields: [

package/src/families/bitcoin/datasets/decred.ts

@@ -1,4 +1,4 @@
-import type { CurrenciesData } from "../../../types";
+import type { CurrenciesData } from "@ledgerhq/types-live";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
   FIXME_ignoreAccountFields: [

package/src/families/bitcoin/datasets/digibyte.ts

@@ -1,5 +1,5 @@
 import { BigNumber } from "bignumber.js";
-import type { CurrenciesData } from "../../../types";
+import type { CurrenciesData } from "@ledgerhq/types-live";
 import type { NetworkInfoRaw, Transaction } from "../types";
 import { fromTransactionRaw } from "../transaction";
 import scanAccounts1 from "./digibyte.scanAccounts.1";

package/src/families/bitcoin/datasets/dogecoin.ts

@@ -1,4 +1,4 @@
-import type { CurrenciesData } from "../../../types";
+import type { CurrenciesData } from "@ledgerhq/types-live";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
   FIXME_ignoreAccountFields: [

package/src/families/bitcoin/datasets/komodo.ts

@@ -1,4 +1,4 @@
-import type { CurrenciesData } from "../../../types";
+import type { CurrenciesData } from "@ledgerhq/types-live";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
   FIXME_ignoreAccountFields: [

package/src/families/bitcoin/datasets/litecoin.ts

@@ -1,5 +1,5 @@
 import { BigNumber } from "bignumber.js";
-import type { CurrenciesData } from "../../../types";
+import type { CurrenciesData } from "@ledgerhq/types-live";
 import type { NetworkInfoRaw, Transaction } from "../types";
 import { fromTransactionRaw } from "../transaction";
 import scanAccounts1 from "./litecoin.scanAccounts.1";

package/src/families/bitcoin/datasets/peercoin.ts

@@ -1,4 +1,4 @@
-import type { CurrenciesData } from "../../../types";
+import type { CurrenciesData } from "@ledgerhq/types-live";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
   FIXME_ignoreAccountFields: [

package/src/families/bitcoin/datasets/pivx.ts

@@ -1,4 +1,4 @@
-import type { CurrenciesData } from "../../../types";
+import type { CurrenciesData } from "@ledgerhq/types-live";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
   FIXME_ignoreAccountFields: [

package/src/families/bitcoin/datasets/qtum.ts

@@ -1,4 +1,4 @@
-import type { CurrenciesData } from "../../../types";
+import type { CurrenciesData } from "@ledgerhq/types-live";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
   FIXME_ignoreAccountFields: [

package/src/families/bitcoin/datasets/stakenet.ts

@@ -1,4 +1,4 @@
-import type { CurrenciesData } from "../../../types";
+import type { CurrenciesData } from "@ledgerhq/types-live";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
   FIXME_ignoreAccountFields: [

package/src/families/bitcoin/datasets/vertcoin.ts

@@ -1,4 +1,4 @@
-import type { CurrenciesData } from "../../../types";
+import type { CurrenciesData } from "@ledgerhq/types-live";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
   FIXME_ignoreAccountFields: [

package/src/families/bitcoin/datasets/viacoin.ts

@@ -1,4 +1,4 @@
-import type { CurrenciesData } from "../../../types";
+import type { CurrenciesData } from "@ledgerhq/types-live";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
   FIXME_ignoreAccountFields: [

package/src/families/bitcoin/datasets/zcash.ts

@@ -1,4 +1,4 @@
-import type { CurrenciesData } from "../../../types";
+import type { CurrenciesData } from "@ledgerhq/types-live";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
   FIXME_ignoreAccountFields: [

package/src/families/bitcoin/datasets/zencash.ts

@@ -1,4 +1,4 @@
-import type { CurrenciesData } from "../../../types";
+import type { CurrenciesData } from "@ledgerhq/types-live";
 import type { Transaction } from "../types";
 const dataset: CurrenciesData<Transaction> = {
   FIXME_ignoreAccountFields: [

package/src/families/bitcoin/descriptor.ts

@@ -2,7 +2,7 @@ import { Observable, from, of, EMPTY } from "rxjs";
 import { concatMap } from "rxjs/operators";
 import invariant from "invariant";
 import bs58 from "bs58";
-import type { Account, DerivationMode, CryptoCurrency } from "../../types";
+import type { DerivationMode } from "../../derivation";
 import type { Result } from "../../hw/getAddress/types";
 import { hash256, hash160 } from "../../crypto";
 import {
@@ -13,6 +13,8 @@ import {
 } from "../../derivation";
 import { withDevice } from "../../hw/deviceAccess";
 import getAddress from "../../hw/getAddress";
+import type { Account } from "@ledgerhq/types-live";
+import type { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
 import { decodeAccountId } from "../../account/accountId";
 
 export type AccountDescriptor = {

package/src/families/bitcoin/deviceTransactionConfig.ts

@@ -1,6 +1,6 @@
-import type { AccountLike, Account, TransactionStatus } from "../../types";
-import type { Transaction } from "./types";
+import type { Transaction, TransactionStatus } from "./types";
 import type { DeviceTransactionField } from "../../transaction";
+import type { Account, AccountLike } from "@ledgerhq/types-live";
 
 function getDeviceTransactionConfig({
   status: { amount, estimatedFees },

package/src/families/bitcoin/fees.ts

@@ -1,4 +1,5 @@
-import type { CryptoCurrency } from "../../types";
+import type { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
+
 // correspond ~ to min relay fees but determined empirically for a tx to be accepted by network
 const minFees = {
   bitcoin: 1000,

package/src/families/bitcoin/getAccountNetworkInfo.ts

@@ -1,8 +1,8 @@
 import flow from "lodash/flow";
 import { BigNumber } from "bignumber.js";
-import type { Account } from "../../types";
 import type { NetworkInfo } from "./types";
 import { getWalletAccount } from "./wallet-btc";
+import { Account } from "@ledgerhq/types-live";
 const speeds = ["fast", "medium", "slow"];
 export function avoidDups(nums: Array<BigNumber>): Array<BigNumber> {
   nums = nums.slice(0);

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

@@ -1,5 +1,5 @@
+import type { Account, Operation, SignedOperation } from "@ledgerhq/types-live";
 import { patchOperationWithHash } from "./../../operation";
-import type { Account, Operation, SignedOperation } from "./../../types";
 import wallet, { getWalletAccount } from "./wallet-btc";
 
 /**

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

@@ -3,11 +3,11 @@ import { CoinSelect, DeepFirst, Merge } from "./wallet-btc";
 import type { TransactionInfo as WalletTxInfo } from "./wallet-btc";
 import { FeeNotLoaded } from "@ledgerhq/errors";
 
-import type { Account } from "../../types";
 import type { Transaction, UtxoStrategy } from "./types";
 import { bitcoinPickingStrategy } from "./types";
 import wallet, { getWalletAccount } from "./wallet-btc";
 import { log } from "@ledgerhq/logs";
+import { Account } from "@ledgerhq/types-live";
 
 const selectUtxoPickingStrategy = (
   walletAccount: WalletAccount,

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

@@ -1,9 +1,9 @@
 import { BigNumber } from "bignumber.js";
-import type { AccountLike, Account } from "../../types";
 import type { Transaction } from "./types";
 import { getMainAccount } from "../../account";
 import wallet, { getWalletAccount } from "./wallet-btc";
 import { getAccountNetworkInfo } from "./getAccountNetworkInfo";
+import type { Account, AccountLike } from "@ledgerhq/types-live";
 
 /**
  * Returns the maximum possible amount for transaction

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

@@ -1,8 +1,8 @@
 import { BigNumber } from "bignumber.js";
-import type { Account } from "./../../types";
 import type { Transaction } from "./types";
 import { buildTransaction } from "./js-buildTransaction";
 import { perCoinLogic } from "./logic";
+import type { Account } from "@ledgerhq/types-live";
 
 const getFeesForTransaction = async ({
   account,

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

@@ -7,10 +7,10 @@ import {
   FeeTooHigh,
   FeeRequired,
 } from "@ledgerhq/errors";
-import type { Account, TransactionStatus } from "./../../types";
-import type { Transaction } from "./types";
+import type { Transaction, TransactionStatus } from "./types";
 import { calculateFees, validateRecipient, isTaprootRecipient } from "./cache";
 import { TaprootNotActivated } from "./errors";
+import type { Account } from "@ledgerhq/types-live";
 
 const getTransactionStatus = async (
   a: Account,

package/src/families/bitcoin/js-prepareTransaction.ts

@@ -1,8 +1,8 @@
 import invariant from "invariant";
-import type { Account } from "../../types";
 import type { Transaction } from "./types";
 import { getAccountNetworkInfo } from "./getAccountNetworkInfo";
 import { inferFeePerByte } from "./logic";
+import { Account } from "@ledgerhq/types-live";
 
 const prepareTransaction = async (
   a: Account,

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

@@ -2,8 +2,7 @@ import { BigNumber } from "bignumber.js";
 import { Observable } from "rxjs";
 import Btc from "@ledgerhq/hw-app-btc";
 import { log } from "@ledgerhq/logs";
-import type { Account, Operation, SignOperationEvent } from "./../../types";
-import { isSegwitDerivationMode } from "./../../derivation";
+import { DerivationMode, isSegwitDerivationMode } from "./../../derivation";
 import { encodeOperationId } from "./../../operation";
 import { withDevice } from "../../hw/deviceAccess";
 import type { Transaction } from "./types";
@@ -12,6 +11,11 @@ import { buildTransaction } from "./js-buildTransaction";
 import { calculateFees } from "./cache";
 import wallet, { getWalletAccount } from "./wallet-btc";
 import { perCoinLogic } from "./logic";
+import type {
+  Account,
+  Operation,
+  SignOperationEvent,
+} from "@ledgerhq/types-live";
 
 const signOperation = ({
   account,
@@ -63,7 +67,9 @@ const signOperation = ({
           throw new Error("sigHashType should not be NaN");
         }
 
-        const segwit = isSegwitDerivationMode(account.derivationMode);
+        const segwit = isSegwitDerivationMode(
+          account.derivationMode as DerivationMode
+        );
 
         const hasTimestamp = currency.id === "peercoin";
         const initialTimestamp = hasTimestamp

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

@@ -4,7 +4,6 @@ import { BigNumber } from "bignumber.js";
 import Btc from "@ledgerhq/hw-app-btc";
 import { log } from "@ledgerhq/logs";
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets";
-import type { Account, Operation, DerivationMode } from "../../types";
 import type { GetAccountShape } from "../../bridge/jsHelpers";
 import { makeSync, makeScanAccounts, mergeOps } from "../../bridge/jsHelpers";
 import { findCurrencyExplorer } from "../../api/Ledger";
@@ -13,12 +12,14 @@ import {
   isSegwitDerivationMode,
   isNativeSegwitDerivationMode,
   isTaprootDerivationMode,
+  DerivationMode,
 } from "../../derivation";
-import { BitcoinOutput } from "./types";
+import { BitcoinAccount, BitcoinOutput } from "./types";
 import { perCoinLogic } from "./logic";
 import wallet from "./wallet-btc";
 import { getAddressWithBtcInstance } from "./hw-getAddress";
 import { mapTxToOperations } from "./logic";
+import { Account, Operation } from "@ledgerhq/types-live";
 import { decodeAccountId } from "../../account/accountId";
 import { startSpan } from "../../performance";
 
@@ -128,7 +129,9 @@ const getAccountShape: GetAccountShape = async (info) => {
   });
 
   const walletNetwork = toWalletNetwork(currency.id);
-  const walletDerivationMode = toWalletDerivationMode(derivationMode);
+  const walletDerivationMode = toWalletDerivationMode(
+    derivationMode as DerivationMode
+  );
   const explorer = findCurrencyExplorer(currency);
   if (!explorer) {
     throw new Error(`No explorer found for currency ${currency.name}`);
@@ -139,7 +142,7 @@ const getAccountShape: GetAccountShape = async (info) => {
 
   span = startSpan("sync", "generateAccount");
   const walletAccount =
-    initialAccount?.bitcoinResources?.walletAccount ||
+    (initialAccount as BitcoinAccount)?.bitcoinResources?.walletAccount ||
     (await wallet.generateAccount({
       xpub,
       path: rootPath,
@@ -226,36 +229,35 @@ const getAccountShape: GetAccountShape = async (info) => {
 const postSync = (initial: Account, synced: Account) => {
   log("bitcoin/postSync", "bitcoinResources");
   const perCoin = perCoinLogic[synced.currency.id];
-
+  const syncedBtc = synced as BitcoinAccount;
   if (perCoin) {
     const { postBuildBitcoinResources, syncReplaceAddress } = perCoin;
 
     if (postBuildBitcoinResources) {
-      synced.bitcoinResources = postBuildBitcoinResources(
-        synced,
-        synced.bitcoinResources
+      syncedBtc.bitcoinResources = postBuildBitcoinResources(
+        syncedBtc,
+        syncedBtc.bitcoinResources
       );
     }
 
     if (syncReplaceAddress) {
-      synced.freshAddress = syncReplaceAddress(synced.freshAddress);
-      synced.freshAddresses = synced.freshAddresses.map((a) => ({
+      syncedBtc.freshAddress = syncReplaceAddress(syncedBtc.freshAddress);
+      syncedBtc.freshAddresses = syncedBtc.freshAddresses.map((a) => ({
         ...a,
         address: syncReplaceAddress(a.address),
       }));
-      if (synced.bitcoinResources) {
-        synced.bitcoinResources.utxos = synced.bitcoinResources?.utxos.map(
-          (u) => ({
+      if (syncedBtc.bitcoinResources) {
+        syncedBtc.bitcoinResources.utxos =
+          syncedBtc.bitcoinResources?.utxos.map((u) => ({
             ...u,
             address: u.address && syncReplaceAddress(u.address),
-          })
-        );
+          }));
       }
     }
   }
 
   log("bitcoin/postSync", "bitcoinResources DONE");
-  return synced;
+  return syncedBtc;
 };
 
 const getAddressFn = (transport) => {

package/src/families/bitcoin/logic.ts

@@ -1,7 +1,6 @@
 import cashaddr from "cashaddrjs";
 import { Currency, isValidAddress } from "./wallet-btc";
 import { RecipientRequired, InvalidAddress } from "@ledgerhq/errors";
-import type { Account, CryptoCurrency, CryptoCurrencyIds } from "./../../types";
 import type {
   BitcoinOutput,
   BitcoinResources,
@@ -17,7 +16,9 @@ import type {
 } from "./wallet-btc";
 import { BigNumber } from "bignumber.js";
 import { encodeOperationId } from "../../operation";
-import type { Operation, OperationType } from "../../types";
+import type { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
+import type { Account, Operation, OperationType } from "@ledgerhq/types-live";
+import type { CryptoCurrencyIds } from "@ledgerhq/cryptoassets";
 
 // correspond ~ to min relay fees but determined empirically for a tx to be accepted by network
 const minFees = {

package/src/families/bitcoin/presync.ts

@@ -1,4 +1,4 @@
-import type { CryptoCurrency } from "../../types";
+import type { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
 import { requiresSatStackReady } from "./satstack";
 export default async function presync(currency: CryptoCurrency) {
   if (currency.id === "bitcoin") {

package/src/families/bitcoin/react.ts

@@ -1,5 +1,5 @@
+import type { Account, FeeStrategy } from "@ledgerhq/types-live";
 import type { NetworkInfo, Transaction } from "./types";
-import type { FeeStrategy, Account } from "../../types";
 export const useFeesStrategy = (a: Account, t: Transaction): FeeStrategy[] => {
   const networkInfo = t.networkInfo;
 

package/src/families/bitcoin/specs.ts

@@ -4,7 +4,12 @@ import invariant from "invariant";
 import bchaddrjs from "bchaddrjs";
 import sample from "lodash/sample";
 import { log } from "@ledgerhq/logs";
-import type { BitcoinOutput, BitcoinResources, Transaction } from "./types";
+import type {
+  BitcoinAccount,
+  BitcoinOutput,
+  BitcoinResources,
+  Transaction,
+} from "./types";
 import { getCryptoCurrencyById, parseCurrencyUnit } from "../../currencies";
 import { pickSiblings } from "../../bot/specs";
 import { bitcoinPickingStrategy } from "./types";
@@ -176,7 +181,7 @@ const bitcoinLikeMutations = ({
     transaction: ({ account, bridge, siblings, maxSpendable }) => {
       invariant(maxSpendable.gt(minimalAmount), "balance is too low");
       const sibling = pickSiblings(siblings, targetAccountSize);
-      const { bitcoinResources } = account;
+      const { bitcoinResources } = account as BitcoinAccount;
       invariant(bitcoinResources, "bitcoin resources");
       const transaction = bridge.createTransaction(account);
       const utxo = sample(
@@ -211,7 +216,8 @@ const bitcoinLikeMutations = ({
     recoverBadTransactionStatus,
     test: ({ accountBeforeTransaction, account, operation, transaction }) => {
       const utxo = (
-        accountBeforeTransaction.bitcoinResources?.utxos || []
+        (accountBeforeTransaction as BitcoinAccount).bitcoinResources?.utxos ||
+        []
       ).find(
         (utxo) =>
           !transaction.utxoStrategy.excludeUTXOs.some(
@@ -223,7 +229,7 @@ const bitcoinLikeMutations = ({
         senders: [(utxo as BitcoinOutput).address],
       });
       expect(
-        account.bitcoinResources?.utxos.find(
+        (account as BitcoinAccount).bitcoinResources?.utxos.find(
           (u) =>
             u.hash === (utxo as BitcoinOutput).hash &&
             u.outputIndex === (utxo as BitcoinOutput).outputIndex
@@ -259,7 +265,7 @@ const bitcoinLikeMutations = ({
     recoverBadTransactionStatus,
     test: ({ account }) => {
       expect(
-        account.bitcoinResources?.utxos
+        (account as BitcoinAccount).bitcoinResources?.utxos
           .filter(
             (u) => u.blockHeight && u.blockHeight < account.blockHeight - 10
           ) // Exclude pending UTXOs and the Utxos just written into new block (10 blocks time)