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

package/src/families/polkadot/logic.ts

@@ -1,6 +1,6 @@
 import { BigNumber } from "bignumber.js";
-import type { Account, OperationType } from "../../types";
-import type { Transaction } from "./types";
+import type { Account, OperationType } from "@ledgerhq/types-live";
+import type { PolkadotAccount, Transaction } from "./types";
 import { getCurrentPolkadotPreloadData } from "./preload";
 
 export const EXISTENTIAL_DEPOSIT = new BigNumber(10000000000);
@@ -15,9 +15,9 @@ export const FEES_SAFETY_BUFFER = new BigNumber(1000000000); // Arbitrary buffer
  * Returns true if account is a stash.
  * When the account is a stash, we have the information of which account is the controller
  *
- * @param {Account} a
+ * @param {PolkadotAccount} a
  */
-export const isStash = (a: Account): boolean => {
+export const isStash = (a: PolkadotAccount): boolean => {
   return !!a.polkadotResources?.controller;
 };
 
@@ -25,18 +25,18 @@ export const isStash = (a: Account): boolean => {
  * Returns true if account is a controller.
  * when account is a controller, we have the information of which stash it controls
  *
- * @param {Account} a
+ * @param {PolkadotAccount} a
  */
-export const isController = (a: Account): boolean => {
+export const isController = (a: PolkadotAccount): boolean => {
   return !!a.polkadotResources?.stash;
 };
 
 /**
  * Returns true if account is controlled by an external account (not self)
  *
- * @param {Account} a
+ * @param {PolkadotAccount} a
  */
-export const hasExternalController = (a: Account): boolean => {
+export const hasExternalController = (a: PolkadotAccount): boolean => {
   return a.polkadotResources?.controller
     ? a.polkadotResources?.controller !== a.freshAddress
     : false;
@@ -45,9 +45,9 @@ export const hasExternalController = (a: Account): boolean => {
 /**
  * Returns true if account controls an external stash (not self)
  *
- * @param {Account} a
+ * @param {PolkadotAccount} a
  */
-export const hasExternalStash = (a: Account): boolean => {
+export const hasExternalStash = (a: PolkadotAccount): boolean => {
   return a.polkadotResources?.stash
     ? a.polkadotResources?.stash !== a.freshAddress
     : false;
@@ -56,7 +56,7 @@ export const hasExternalStash = (a: Account): boolean => {
 /**
  * Must have the minimum balance to bond
  *
- * @param {Account} a
+ * @param {PolkadotAccount} a
  */
 export const canBond = (a: Account): boolean => {
   const { balance } = a;
@@ -66,10 +66,10 @@ export const canBond = (a: Account): boolean => {
 /**
  * Get the minimum bond amount required to bond/rebond
  *
- * @param {Account} a
+ * @param {PolkadotAccount} a
  */
 export const getMinimumAmountToBond = (
-  a: Account,
+  a: PolkadotAccount,
   minimumBondBalance: BigNumber | undefined
 ): BigNumber => {
   const currentlyBondedBalance = calculateMaxUnbond(a);
@@ -84,9 +84,9 @@ export const getMinimumAmountToBond = (
 /**
  * Return true if the account has at least the current minimum bonded balance required by the network
  *
- * @param {Account} a
+ * @param {PolkadotAccount} a
  */
-export const hasMinimumBondBalance = (a: Account): boolean => {
+export const hasMinimumBondBalance = (a: PolkadotAccount): boolean => {
   const { minimumBondBalance } = getCurrentPolkadotPreloadData();
   return (
     !a.polkadotResources ||
@@ -97,7 +97,7 @@ export const hasMinimumBondBalance = (a: Account): boolean => {
 /**
  * Return true if some operation with type is pending and not yet synchronized
  *
- * @param {Account} a
+ * @param {PolkadotAccount} a
  */
 export const hasPendingOperationType = (
   a: Account,
@@ -109,9 +109,9 @@ export const hasPendingOperationType = (
 /**
  * Retyrns true if has reached the maximum of unlocking slots
  *
- * @param {Account} a
+ * @param {PolkadotAccount} a
  */
-export const hasMaxUnlockings = (a: Account) => {
+export const hasMaxUnlockings = (a: PolkadotAccount) => {
   const { unlockings = [] } = a.polkadotResources || {};
   return (unlockings?.length || 0) >= MAX_UNLOCKINGS;
 };
@@ -119,9 +119,9 @@ export const hasMaxUnlockings = (a: Account) => {
 /**
  * Return true if account has enough Locked Balance to rebond
  *
- * @param {Account} a
+ * @param {PolkadotAccount} a
  */
-export const hasLockedBalance = (a: Account) => {
+export const hasLockedBalance = (a: PolkadotAccount) => {
   const {
     lockedBalance = new BigNumber(0),
     unlockingBalance = new BigNumber(0),
@@ -132,32 +132,32 @@ export const hasLockedBalance = (a: Account) => {
 /**
  * Must have locked Balance
  *
- * @param {Account} a
+ * @param {PolkadotAccount} a
  */
-export const canUnbond = (a: Account): boolean => {
+export const canUnbond = (a: PolkadotAccount): boolean => {
   return hasLockedBalance(a) && !hasMaxUnlockings(a);
 };
 
 /**
  * Returns true if an account can nominate
  *
- * @param {Account} a
+ * @param {PolkadotAccount} a
  */
-export const canNominate = (a: Account): boolean => isController(a);
+export const canNominate = (a: PolkadotAccount): boolean => isController(a);
 
 /**
  * Returns true if account must do a first bond - false for a bond extra
  *
  * @param {Account} a
  */
-export const isFirstBond = (a: Account): boolean => !isStash(a);
+export const isFirstBond = (a: PolkadotAccount): boolean => !isStash(a);
 
 /**
  * Returns nonce for an account
  *
  * @param {Account} a
  */
-export const getNonce = (a: Account): number => {
+export const getNonce = (a: PolkadotAccount): number => {
   const lastPendingOp = a.pendingOperations[0];
   const nonce = Math.max(
     a.polkadotResources?.nonce || 0,
@@ -175,7 +175,7 @@ export const getNonce = (a: Account): number => {
  * @param {*} a
  * @param {*} t
  */
-const calculateMaxBond = (a: Account, t: Transaction): BigNumber => {
+const calculateMaxBond = (a: PolkadotAccount, t: Transaction): BigNumber => {
   const amount = a.spendableBalance
     .minus(t.fees || 0)
     .minus(FEES_SAFETY_BUFFER);
@@ -187,7 +187,7 @@ const calculateMaxBond = (a: Account, t: Transaction): BigNumber => {
  *
  * @param {*} account
  */
-const calculateMaxUnbond = (a: Account): BigNumber => {
+const calculateMaxUnbond = (a: PolkadotAccount): BigNumber => {
   return (
     a.polkadotResources?.lockedBalance.minus(
       a.polkadotResources.unlockingBalance
@@ -200,7 +200,7 @@ const calculateMaxUnbond = (a: Account): BigNumber => {
  *
  * @param {*} account
  */
-const calculateMaxRebond = (a: Account): BigNumber => {
+const calculateMaxRebond = (a: PolkadotAccount): BigNumber => {
   return a.polkadotResources?.unlockingBalance ?? new BigNumber(0);
 };
 
@@ -224,7 +224,7 @@ export const calculateAmount = ({
   a,
   t,
 }: {
-  a: Account;
+  a: PolkadotAccount;
   t: Transaction;
 }): BigNumber => {
   let amount = t.amount;

package/src/families/polkadot/react.ts

@@ -1,6 +1,5 @@
 import { useState, useEffect, useMemo, useRef } from "react";
 import useMemoOnce from "../../hooks/useMemoOnce";
-import type { Account } from "../../types";
 import { useBridgeSync } from "../../bridge/react";
 import {
   getCurrentPolkadotPreloadData,
@@ -10,6 +9,7 @@ import type {
   PolkadotValidator,
   PolkadotNomination,
   PolkadotSearchFilter,
+  PolkadotAccount,
 } from "./types";
 const SYNC_REFRESH_RATE = 6000; // 6s - block time
 
@@ -62,7 +62,7 @@ export function useSortedValidators(
  *
  * @param {*} account
  */
-export function usePolkadotBondLoading(account: Account) {
+export function usePolkadotBondLoading(account: PolkadotAccount) {
   const controller = account.polkadotResources?.controller || null;
   const initialAccount = useRef(account);
   const [isLoading, setLoading] = useState(!controller);
@@ -79,6 +79,7 @@ export function usePolkadotBondLoading(account: Account) {
         type: "SYNC_ONE_ACCOUNT",
         priority: 10,
         accountId: initialAccount.current.id,
+        reason: "polkadot-bond-loading",
       });
     }, SYNC_REFRESH_RATE);
     return () => clearInterval(interval);

package/src/families/polkadot/specs.ts

@@ -4,6 +4,7 @@ import sampleSize from "lodash/sampleSize";
 import { BigNumber } from "bignumber.js";
 import { getCurrentPolkadotPreloadData } from "../../families/polkadot/preload";
 import type {
+  PolkadotAccount,
   PolkadotResources,
   Transaction,
 } from "../../families/polkadot/types";
@@ -53,7 +54,7 @@ const polkadot: AppSpec<Transaction> = {
       name: "send 50%~",
       maxRun: 2,
       transaction: ({ account, siblings, bridge }) => {
-        invariant(account.polkadotResources, "polkadot");
+        invariant((account as PolkadotAccount).polkadotResources, "polkadot");
         const sibling = pickSiblings(siblings, 2);
         let amount = account.spendableBalance
           .div(1.9 + 0.2 * Math.random())
@@ -86,16 +87,19 @@ const polkadot: AppSpec<Transaction> = {
       name: "bond - bondExtra",
       maxRun: 1,
       transaction: ({ account, bridge }) => {
-        invariant(account.polkadotResources, "polkadot");
+        invariant((account as PolkadotAccount).polkadotResources, "polkadot");
         invariant(canBond(account), "can't bond");
-        invariant(hasMinimumBondBalance(account), "not enough balance to bond");
+        invariant(
+          hasMinimumBondBalance(account as PolkadotAccount),
+          "not enough balance to bond"
+        );
         const options: {
           recipient?: string;
           rewardDestination?: string;
           amount?: BigNumber;
         }[] = [];
 
-        if (isFirstBond(account)) {
+        if (isFirstBond(account as PolkadotAccount)) {
           invariant(
             account.balance.gt(EXISTENTIAL_DEPOSIT.plus(POLKADOT_MIN_SAFE)),
             "cant cover fee + bonding amount"
@@ -132,9 +136,9 @@ const polkadot: AppSpec<Transaction> = {
       name: "unbond",
       maxRun: 2,
       transaction: ({ account, bridge }) => {
-        const { polkadotResources } = account;
+        const { polkadotResources } = account as PolkadotAccount;
         invariant(polkadotResources, "polkadot");
-        invariant(canUnbond(account), "can't unbond");
+        invariant(canUnbond(account as PolkadotAccount), "can't unbond");
         invariant(
           account.spendableBalance.gt(POLKADOT_MIN_SAFE),
           "can't cover fee"
@@ -159,7 +163,7 @@ const polkadot: AppSpec<Transaction> = {
       name: "rebond",
       maxRun: 1,
       transaction: ({ account, bridge }) => {
-        const { polkadotResources } = account;
+        const { polkadotResources } = account as PolkadotAccount;
         invariant(polkadotResources, "polkadot");
         invariant(
           polkadotResources?.unlockingBalance.gt(MIN_LOCKED_BALANCE_REQ),
@@ -190,8 +194,8 @@ const polkadot: AppSpec<Transaction> = {
       name: "nominate",
       maxRun: 1,
       transaction: ({ account, bridge }) => {
-        invariant(account.polkadotResources, "polkadot");
-        invariant(canNominate(account), "can't nominate");
+        invariant((account as PolkadotAccount).polkadotResources, "polkadot");
+        invariant(canNominate(account as PolkadotAccount), "can't nominate");
         invariant(
           account.spendableBalance.gt(POLKADOT_MIN_SAFE),
           "cant cover fee"
@@ -218,7 +222,7 @@ const polkadot: AppSpec<Transaction> = {
       name: "withdraw",
       maxRun: 2,
       transaction: ({ account, bridge }) => {
-        const { polkadotResources } = account;
+        const { polkadotResources } = account as PolkadotAccount;
         invariant(polkadotResources, "polkadot");
         invariant(
           polkadotResources?.unlockedBalance.gt(0),

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

@@ -1,5 +1,5 @@
 import type { DeviceAction } from "../../bot/types";
-import type { Transaction } from "./types";
+import type { PolkadotAccount, Transaction } from "./types";
 import { deviceActionFlow } from "../../bot/specs";
 import { formatCurrencyUnit } from "../../currencies";
 const acceptTransaction: DeviceAction<Transaction, any> = deviceActionFlow({
@@ -44,7 +44,7 @@ const acceptTransaction: DeviceAction<Transaction, any> = deviceActionFlow({
       title: "Nonce",
       button: "Rr",
       expectedValue: ({ account }) =>
-        (account.polkadotResources?.nonce || 0).toString(),
+        ((account as PolkadotAccount).polkadotResources?.nonce || 0).toString(),
     },
     {
       title: "Tip",

package/src/families/polkadot/transaction.ts

@@ -1,10 +1,13 @@
 import type { Transaction, TransactionRaw } from "./types";
 import { BigNumber } from "bignumber.js";
 import {
+  formatTransactionStatusCommon as formatTransactionStatus,
   fromTransactionCommonRaw,
+  fromTransactionStatusRawCommon as fromTransactionStatusRaw,
   toTransactionCommonRaw,
+  toTransactionStatusRawCommon as toTransactionStatusRaw,
 } from "../../transaction/common";
-import type { Account } from "../../types";
+import type { Account } from "@ledgerhq/types-live";
 import { getAccountUnit } from "../../account";
 import { formatCurrencyUnit } from "../../currencies";
 export const formatTransaction = (
@@ -50,8 +53,12 @@ export const toTransactionRaw = (t: Transaction): TransactionRaw => {
     numSlashingSpans: t.numSlashingSpans,
   };
 };
+
 export default {
   formatTransaction,
   fromTransactionRaw,
   toTransactionRaw,
+  fromTransactionStatusRaw,
+  toTransactionStatusRaw,
+  formatTransactionStatus,
 };

package/src/families/polkadot/types.ts

@@ -1,8 +1,12 @@
-import type { BigNumber } from "bignumber.js";
 import type {
+  Account,
+  AccountRaw,
   TransactionCommon,
   TransactionCommonRaw,
-} from "../../types/transaction";
+  TransactionStatusCommon,
+  TransactionStatusCommonRaw,
+} from "@ledgerhq/types-live";
+import type { BigNumber } from "bignumber.js";
 
 export type RewardDestinationType =
   | "Staked"
@@ -104,3 +108,11 @@ export type PolkadotPreloadData = {
 export type PolkadotSearchFilter = (
   query: string
 ) => (validator: PolkadotValidator) => boolean;
+export type PolkadotAccount = Account & {
+  polkadotResources: PolkadotResources;
+};
+export type PolkadotAccountRaw = AccountRaw & {
+  polkadotResources: PolkadotResourcesRaw;
+};
+export type TransactionStatus = TransactionStatusCommon;
+export type TransactionStatusRaw = TransactionStatusCommonRaw;

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

@@ -27,8 +27,14 @@ import { formatCurrencyUnit } from "../../../currencies";
 import signTransaction from "../../../hw/signTransaction";
 import { withDevice } from "../../../hw/deviceAccess";
 import { patchOperationWithHash } from "../../../operation";
-import type { Account, Operation, SignOperationEvent } from "../../../types";
-import type { AccountBridge, CurrencyBridge } from "../../../types/bridge";
+import type {
+  Account,
+  AccountBridge,
+  CurrencyBridge,
+  Operation,
+  SignOperationEvent,
+} from "@ledgerhq/types-live";
+
 import { scanAccounts, sync } from "../js-synchronization";
 import type { NetworkInfo, Transaction } from "../types";
 

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

@@ -9,7 +9,11 @@ import {
   FeeTooHigh,
 } from "@ledgerhq/errors";
 import type { Transaction } from "../types";
-import type { Account, AccountBridge, CurrencyBridge } from "../../../types";
+import type {
+  Account,
+  AccountBridge,
+  CurrencyBridge,
+} from "@ledgerhq/types-live";
 import { getMainAccount } from "../../../account";
 import {
   scanAccounts,

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

@@ -3,7 +3,7 @@ import { testBridge } from "../../__tests__/test-helpers/bridge";
 
 // import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets";
 import { BigNumber } from "bignumber.js";
-import type { DatasetTest } from "../../types";
+import type { DatasetTest } from "@ledgerhq/types-live";
 import {
   // NotEnoughSpendableBalance,
   // NotEnoughBalanceBecauseDestinationNotCreated,

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

@@ -1,6 +1,7 @@
+import type { AccountLike } from "@ledgerhq/types-live";
 import invariant from "invariant";
 import flatMap from "lodash/flatMap";
-import type { Transaction, AccountLike } from "../../types";
+import type { Transaction } from "../../generated/types";
 const options = [
   {
     name: "fee",

package/src/families/ripple/deviceTransactionConfig.ts

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

package/src/families/ripple/js-synchronization.ts

@@ -11,7 +11,7 @@ import {
   mergeOps,
 } from "../../bridge/jsHelpers";
 import { encodeOperationId } from "../../operation";
-import { Account, Operation } from "../../types";
+import { Account, Operation } from "@ledgerhq/types-live";
 import { encodeAccountId } from "../../account";
 import { NEW_ACCOUNT_ERROR_MESSAGE } from "./bridge/js";
 import { TxXRPL } from "./types.api";

package/src/families/ripple/transaction.ts

@@ -1,10 +1,13 @@
 import { BigNumber } from "bignumber.js";
 import type { Transaction, TransactionRaw } from "./types";
 import {
+  formatTransactionStatusCommon as formatTransactionStatus,
   fromTransactionCommonRaw,
+  fromTransactionStatusRawCommon as fromTransactionStatusRaw,
   toTransactionCommonRaw,
+  toTransactionStatusRawCommon as toTransactionStatusRaw,
 } from "../../transaction/common";
-import type { Account } from "../../types";
+import type { Account } from "@ledgerhq/types-live";
 import { getAccountUnit } from "../../account";
 import { formatCurrencyUnit } from "../../currencies";
 export const formatTransaction = (
@@ -62,8 +65,12 @@ export const toTransactionRaw = (t: Transaction): TransactionRaw => {
     },
   };
 };
+
 export default {
   formatTransaction,
   fromTransactionRaw,
   toTransactionRaw,
+  fromTransactionStatusRaw,
+  toTransactionStatusRaw,
+  formatTransactionStatus,
 };

package/src/families/ripple/types.ts

@@ -1,9 +1,11 @@
 import type { BigNumber } from "bignumber.js";
-import type { Unit } from "../../types";
+import type { Unit } from "@ledgerhq/types-cryptoassets";
 import type {
   TransactionCommon,
   TransactionCommonRaw,
-} from "../../types/transaction";
+  TransactionStatusCommon,
+  TransactionStatusCommonRaw,
+} from "@ledgerhq/types-live";
 
 export type NetworkInfo = {
   family: "ripple";
@@ -29,3 +31,5 @@ export type TransactionRaw = TransactionCommonRaw & {
   tag: number | null | undefined;
   feeCustomUnit: Unit | null | undefined;
 };
+export type TransactionStatus = TransactionStatusCommon;
+export type TransactionStatusRaw = TransactionStatusCommonRaw;

package/src/families/solana/bridge/bridge.ts

@@ -7,14 +7,12 @@ import {
 } from "../../../bridge/jsHelpers";
 import { makeLRUCache } from "../../../cache";
 import type {
-  Account,
   AccountBridge,
   AccountLike,
   BroadcastFnSignature,
-  CryptoCurrency,
   CurrencyBridge,
   SignOperationFnSignature,
-} from "../../../types";
+} from "@ledgerhq/types-live";
 import { ChainAPI, Config } from "../api";
 import { minutes } from "../api/cached";
 import { broadcastWithAPI } from "../js-broadcast";
@@ -25,12 +23,13 @@ import { hydrate, preloadWithAPI } from "../js-preload";
 import { prepareTransaction as prepareTransactionWithAPI } from "../js-prepareTransaction";
 import { signOperationWithAPI } from "../js-signOperation";
 import { getAccountShapeWithAPI } from "../js-synchronization";
-import type { Transaction } from "../types";
+import type { SolanaAccount, Transaction } from "../types";
 import { endpointByCurrencyId } from "../utils";
+import type { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
 
 function makePrepare(getChainAPI: (config: Config) => Promise<ChainAPI>) {
   async function prepareTransaction(
-    mainAccount: Account,
+    mainAccount: SolanaAccount,
     transaction: Transaction
   ) {
     const config: Config = {

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

@@ -1,8 +1,13 @@
 import "../../__tests__/test-helpers/setup";
 import { testBridge } from "../../__tests__/test-helpers/bridge";
 import BigNumber from "bignumber.js";
-import { CurrenciesData, DatasetTest, encodeAccountId } from "../../types";
-import { SolanaStake, Transaction, TransactionModel } from "./types";
+import {
+  SolanaAccount,
+  SolanaStake,
+  Transaction,
+  TransactionModel,
+  TransactionStatus,
+} from "./types";
 import scanAccounts1 from "./datasets/solana.scanAccounts.1";
 import {
   AmountRequired,
@@ -32,7 +37,6 @@ import createTransaction from "./js-createTransaction";
 import { compact } from "lodash/fp";
 import { assertUnreachable } from "./utils";
 import { getEnv } from "../../env";
-import { Account, TransactionStatus } from "../../types";
 import { ChainAPI } from "./api";
 import {
   SolanaStakeAccountIsNotDelegatable,
@@ -40,6 +44,12 @@ import {
 } from "./errors";
 import getTransactionStatus from "./js-getTransactionStatus";
 import { prepareTransaction } from "./js-prepareTransaction";
+import type {
+  Account,
+  CurrenciesData,
+  DatasetTest,
+} from "@ledgerhq/types-live";
+import { encodeAccountId } from "../../account";
 
 // do not change real properties or the test will break
 const testOnChainData = {
@@ -1051,7 +1061,7 @@ async function runStakeTest(stakeTestSpec: StakeTestSpec) {
     },
   } as ChainAPI;
 
-  const account: Account = {
+  const account: SolanaAccount = {
     ...baseAccount,
     solanaResources: {
       stakes: [

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

@@ -1,12 +1,12 @@
 import { findTokenById, findTokenByTicker } from "@ledgerhq/cryptoassets";
-import invariant from "invariant";
-import { getAccountCurrency } from "../../account";
 import type {
-  Transaction,
-  AccountLike,
   Account,
+  AccountLike,
   AccountLikeArray,
-} from "../../types";
+} from "@ledgerhq/types-live";
+import invariant from "invariant";
+import { getAccountCurrency } from "../../account";
+import type { Transaction } from "../../generated/types";
 import { Transaction as SolanaTransaction } from "./types";
 import { assertUnreachable } from "./utils";
 

package/src/families/solana/deviceTransactionConfig.ts

@@ -1,7 +1,7 @@
 import BigNumber from "bignumber.js";
 import { formatCurrencyUnit } from "../../currencies";
 import type { DeviceTransactionField } from "../../transaction";
-import type { Account, AccountLike } from "../../types";
+import type { Account, AccountLike } from "@ledgerhq/types-live";
 import type {
   CommandDescriptor,
   StakeCreateAccountCommand,

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

@@ -1,6 +1,6 @@
 import { log } from "@ledgerhq/logs";
 import { patchOperationWithHash } from "../../operation";
-import type { Account, Operation, SignedOperation } from "../../types";
+import type { Account, Operation, SignedOperation } from "@ledgerhq/types-live";
 import { ChainAPI } from "./api";
 import {
   SolanaTxConfirmationTimeout,

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

@@ -1,4 +1,4 @@
-import type { Account } from "../../types";
+import type { Account } from "@ledgerhq/types-live";
 import type { Command, Transaction } from "./types";
 import {
   buildTransferInstructions,

package/src/families/solana/js-createTransaction.ts

@@ -1,6 +1,6 @@
 import { BigNumber } from "bignumber.js";
 import type { Transaction /* TransactionMode */ } from "./types";
-import { Account } from "../../types";
+import { Account } from "@ledgerhq/types-live";
 
 const createTransaction = (_: Account): Transaction => {
   return {

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

@@ -1,4 +1,4 @@
-import type { AccountBridge } from "../../types";
+import type { AccountBridge } from "@ledgerhq/types-live";
 import type { Transaction } from "./types";
 import BigNumber from "bignumber.js";
 import { ChainAPI } from "./api";

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

@@ -1,6 +1,11 @@
 import { BigNumber } from "bignumber.js";
-import type { Account, TransactionStatus } from "../../types";
-import type { Command, CommandDescriptor, Transaction } from "./types";
+import type { Account } from "@ledgerhq/types-live";
+import type {
+  Command,
+  CommandDescriptor,
+  Transaction,
+  TransactionStatus,
+} from "./types";
 import { assertUnreachable } from "./utils";
 
 const getTransactionStatus = async (

package/src/families/solana/js-preload-data.ts

@@ -1,4 +1,4 @@
-import { CryptoCurrency } from "@ledgerhq/cryptoassets";
+import { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
 import { BehaviorSubject, Observable } from "rxjs";
 import { SolanaPreloadDataV1 } from "./types";