diff --git a/.changeset/cyan-points-obey.md b/.changeset/cyan-points-obey.md new file mode 100644 index 00000000000..e9b54b821f7 --- /dev/null +++ b/.changeset/cyan-points-obey.md @@ -0,0 +1,11 @@ +--- +"@ledgerhq/coin-algorand": patch +"@ledgerhq/coin-polkadot": patch +"@ledgerhq/coin-bitcoin": patch +"@ledgerhq/coin-near": patch +"@ledgerhq/coin-evm": patch +"@ledgerhq/live-common": patch +"@ledgerhq/coin-framework": patch +--- + +Reorganize coin serializaiton code diff --git a/libs/coin-framework/.unimportedrc.json b/libs/coin-framework/.unimportedrc.json index 80ca93e9080..1ac0f439546 100644 --- a/libs/coin-framework/.unimportedrc.json +++ b/libs/coin-framework/.unimportedrc.json @@ -5,7 +5,6 @@ "src/bot/specs.ts", "src/bot/formatters.ts", "src/bridge/jsHelpers.ts", - "src/cache.ts", "src/currencies/index.ts", "src/derivation.ts", "src/mocks/helpers.ts", @@ -13,6 +12,9 @@ "src/network.ts", "src/nft/helpers.ts", "src/nft/support.ts", + "src/cache.ts", + "src/formatters.ts", + "src/index.ts", "src/operation.ts", "src/signer.ts", "src/transaction/common.ts" diff --git a/libs/coin-framework/package.json b/libs/coin-framework/package.json index 60a58f286db..289e0af53df 100644 --- a/libs/coin-framework/package.json +++ b/libs/coin-framework/package.json @@ -20,33 +20,23 @@ }, "typesVersions": { "*": { - "*.json": [ - "*.json" - ], - "*": [ - "lib/*" - ], "lib/*": [ "lib/*" ], "lib-es/*": [ "lib-es/*" + ], + "serialization": [ + "lib/serialization/index" + ], + "*": [ + "lib/*" ] } }, "exports": { "./lib/*": "./lib/*.js", - "./lib/*.js": "./lib/*.js", "./lib-es/*": "./lib-es/*.js", - "./lib-es/*.js": "./lib-es/*.js", - "./*": { - "require": "./lib/*.js", - "default": "./lib-es/*.js" - }, - "./*.js": { - "require": "./lib/*.js", - "default": "./lib-es/*.js" - }, "./account/*": { "require": "./lib/account/*.js", "default": "./lib-es/account/*.js" @@ -71,10 +61,18 @@ "require": "./lib/nft/*.js", "default": "./lib-es/nft/*.js" }, + "./serialization": { + "require": "./lib/serialization/index.js", + "default": "./lib-es/serialization/index.js" + }, "./transaction/*": { "require": "./lib/transaction/*.js", "default": "./lib-es/transaction/*.js" }, + "./*": { + "require": "./lib/*.js", + "default": "./lib-es/*.js" + }, "./package.json": "./package.json" }, "license": "Apache-2.0", diff --git a/libs/coin-framework/src/formatters.ts b/libs/coin-framework/src/formatters.ts new file mode 100644 index 00000000000..82e18e3551b --- /dev/null +++ b/libs/coin-framework/src/formatters.ts @@ -0,0 +1,49 @@ +import type { Account, TransactionCommon, TransactionStatusCommon } from "@ledgerhq/types-live"; +import { getAccountUnit } from "./account"; +import { formatCurrencyUnit } from "./currencies"; + +const formatErrorSmall = (e: Error): string => (e.name === "Error" ? e.message : e.name); + +export const formatTransactionStatus = ( + t: TransactionCommon, + { errors, warnings, estimatedFees, amount, totalSpent }: TransactionStatusCommon, + mainAccount: Account, +): string => { + let str = ""; + const account = + (t.subAccountId && (mainAccount.subAccounts || []).find(a => a.id === t.subAccountId)) || + mainAccount; + + str += + "\n amount: " + + formatCurrencyUnit(getAccountUnit(account), amount, { + showCode: true, + disableRounding: true, + }); + str += + "\n estimated fees: " + + formatCurrencyUnit(getAccountUnit(mainAccount), estimatedFees, { + showCode: true, + disableRounding: true, + }); + str += + "\n total spent: " + + formatCurrencyUnit(getAccountUnit(account), totalSpent, { + showCode: true, + disableRounding: true, + }); + + str += + "\n" + + `errors: ${Object.entries(errors) + .map(([key, error]) => `${key} ${formatErrorSmall(error)}`) + .join(", ")}`; + + str += + "\n" + + `warnings: ${Object.entries(warnings) + .map(([key, warning]) => `${key} ${formatErrorSmall(warning)}`) + .join(", ")}`; + + return str; +}; diff --git a/libs/coin-framework/src/index.ts b/libs/coin-framework/src/index.ts new file mode 100644 index 00000000000..eac267b9bda --- /dev/null +++ b/libs/coin-framework/src/index.ts @@ -0,0 +1,5 @@ +import * as serialization from "./serialization"; + +export default { + serialization, +}; diff --git a/libs/coin-framework/src/serialization/index.ts b/libs/coin-framework/src/serialization/index.ts index 63ab8c99293..8424fdf7bda 100644 --- a/libs/coin-framework/src/serialization/index.ts +++ b/libs/coin-framework/src/serialization/index.ts @@ -1,3 +1,4 @@ export { fromAccountRaw, toAccountRaw } from "./account"; export * from "./nft"; export * from "./operation"; +export * from "./transaction"; diff --git a/libs/coin-framework/src/serialization/transaction.ts b/libs/coin-framework/src/serialization/transaction.ts new file mode 100644 index 00000000000..51ec8fd41b7 --- /dev/null +++ b/libs/coin-framework/src/serialization/transaction.ts @@ -0,0 +1,79 @@ +import { deserializeError, serializeError } from "@ledgerhq/errors"; +import type { + TransactionCommon, + TransactionCommonRaw, + TransactionStatusCommon, + TransactionStatusCommonRaw, +} from "@ledgerhq/types-live"; +import { BigNumber } from "bignumber.js"; +import mapValues from "lodash/mapValues"; + +export const fromTransactionCommonRaw = (raw: TransactionCommonRaw): TransactionCommon => { + const common: TransactionCommon = { + amount: new BigNumber(raw.amount), + recipient: raw.recipient, + }; + + if ("useAllAmount" in raw) { + common.useAllAmount = raw.useAllAmount; + } + + if ("subAccountId" in raw) { + common.subAccountId = raw.subAccountId; + } + + if ("recipientDomain" in raw) { + common.recipientDomain = raw.recipientDomain; + } + + return common; +}; + +export const toTransactionCommonRaw = (raw: TransactionCommon): TransactionCommonRaw => { + const common: TransactionCommonRaw = { + amount: raw.amount.toString(), + recipient: raw.recipient, + }; + + if ("useAllAmount" in raw) { + common.useAllAmount = raw.useAllAmount; + } + + if ("subAccountId" in raw) { + common.subAccountId = raw.subAccountId; + } + + if ("recipientDomain" in raw) { + common.recipientDomain = raw.recipientDomain; + } + + return common; +}; + +const fromErrorRaw = (raw: string): Error => { + return deserializeError(JSON.parse(raw)) || new Error("unknown reason"); +}; + +const toErrorRaw = (raw: Error): string => JSON.stringify(serializeError(raw)) || "{}"; + +export const fromTransactionStatusRawCommon = ( + ts: TransactionStatusCommonRaw, +): TransactionStatusCommon => ({ + errors: mapValues(ts.errors, fromErrorRaw), + warnings: mapValues(ts.warnings, fromErrorRaw), + estimatedFees: new BigNumber(ts.estimatedFees), + amount: new BigNumber(ts.amount), + totalSpent: new BigNumber(ts.totalSpent), + recipientIsReadOnly: ts.recipientIsReadOnly, +}); + +export const toTransactionStatusRawCommon = ( + ts: TransactionStatusCommon, +): TransactionStatusCommonRaw => ({ + errors: mapValues, string>(ts.errors, toErrorRaw), + warnings: mapValues, string>(ts.warnings, toErrorRaw), + estimatedFees: ts.estimatedFees.toString(), + amount: ts.amount.toString(), + totalSpent: ts.totalSpent.toString(), + recipientIsReadOnly: ts.recipientIsReadOnly, +}); diff --git a/libs/coin-framework/src/transaction/common.ts b/libs/coin-framework/src/transaction/common.ts index 3e30527c886..33bf6b1d62d 100644 --- a/libs/coin-framework/src/transaction/common.ts +++ b/libs/coin-framework/src/transaction/common.ts @@ -1,16 +1,3 @@ -import { deserializeError, serializeError } from "@ledgerhq/errors"; -import type { - Account, - TransactionCommon, - TransactionCommonRaw, - TransactionStatusCommon, - TransactionStatusCommonRaw, -} from "@ledgerhq/types-live"; -import { BigNumber } from "bignumber.js"; -import mapValues from "lodash/mapValues"; -import { getAccountUnit } from "../account"; -import { formatCurrencyUnit } from "../currencies"; - type tooltipArgs = Record; export type CommonDeviceTransactionField = | { @@ -33,119 +20,3 @@ export type CommonDeviceTransactionField = tooltipI18nKey?: string; tooltipI18nArgs?: tooltipArgs; }; - -export const fromTransactionCommonRaw = (raw: TransactionCommonRaw): TransactionCommon => { - const common: TransactionCommon = { - amount: new BigNumber(raw.amount), - recipient: raw.recipient, - }; - - if ("useAllAmount" in raw) { - common.useAllAmount = raw.useAllAmount; - } - - if ("subAccountId" in raw) { - common.subAccountId = raw.subAccountId; - } - - if ("recipientDomain" in raw) { - common.recipientDomain = raw.recipientDomain; - } - - return common; -}; - -export const toTransactionCommonRaw = (raw: TransactionCommon): TransactionCommonRaw => { - const common: TransactionCommonRaw = { - amount: raw.amount.toString(), - recipient: raw.recipient, - }; - - if ("useAllAmount" in raw) { - common.useAllAmount = raw.useAllAmount; - } - - if ("subAccountId" in raw) { - common.subAccountId = raw.subAccountId; - } - - if ("recipientDomain" in raw) { - common.recipientDomain = raw.recipientDomain; - } - - return common; -}; - -const fromErrorRaw = (raw: string): Error => { - return deserializeError(JSON.parse(raw)) || new Error("unknown reason"); -}; - -const toErrorRaw = (raw: Error): string => JSON.stringify(serializeError(raw)) || "{}"; - -export const fromTransactionStatusRawCommon = ( - ts: TransactionStatusCommonRaw, -): TransactionStatusCommon => ({ - errors: mapValues(ts.errors, fromErrorRaw), - warnings: mapValues(ts.warnings, fromErrorRaw), - estimatedFees: new BigNumber(ts.estimatedFees), - amount: new BigNumber(ts.amount), - totalSpent: new BigNumber(ts.totalSpent), - recipientIsReadOnly: ts.recipientIsReadOnly, -}); - -export const toTransactionStatusRawCommon = ( - ts: TransactionStatusCommon, -): TransactionStatusCommonRaw => ({ - errors: mapValues, string>(ts.errors, toErrorRaw), - warnings: mapValues, string>(ts.warnings, toErrorRaw), - estimatedFees: ts.estimatedFees.toString(), - amount: ts.amount.toString(), - totalSpent: ts.totalSpent.toString(), - recipientIsReadOnly: ts.recipientIsReadOnly, -}); - -const formatErrorSmall = (e: Error): string => (e.name === "Error" ? e.message : e.name); - -export const formatTransactionStatusCommon = ( - t: TransactionCommon, - { errors, warnings, estimatedFees, amount, totalSpent }: TransactionStatusCommon, - mainAccount: Account, -): string => { - let str = ""; - const account = - (t.subAccountId && (mainAccount.subAccounts || []).find(a => a.id === t.subAccountId)) || - mainAccount; - - str += - "\n amount: " + - formatCurrencyUnit(getAccountUnit(account), amount, { - showCode: true, - disableRounding: true, - }); - str += - "\n estimated fees: " + - formatCurrencyUnit(getAccountUnit(mainAccount), estimatedFees, { - showCode: true, - disableRounding: true, - }); - str += - "\n total spent: " + - formatCurrencyUnit(getAccountUnit(account), totalSpent, { - showCode: true, - disableRounding: true, - }); - - str += - "\n" + - `errors: ${Object.entries(errors) - .map(([key, error]) => `${key} ${formatErrorSmall(error)}`) - .join(", ")}`; - - str += - "\n" + - `errors: ${Object.entries(warnings) - .map(([key, warning]) => `${key} ${formatErrorSmall(warning)}`) - .join(", ")}`; - - return str; -}; diff --git a/libs/coin-modules/coin-algorand/src/transaction.ts b/libs/coin-modules/coin-algorand/src/transaction.ts index f960ca1ab27..7bd944b997b 100644 --- a/libs/coin-modules/coin-algorand/src/transaction.ts +++ b/libs/coin-modules/coin-algorand/src/transaction.ts @@ -1,12 +1,12 @@ import { getAccountUnit } from "@ledgerhq/coin-framework/account/index"; import { formatCurrencyUnit } from "@ledgerhq/coin-framework/currencies/index"; +import { formatTransactionStatus } from "@ledgerhq/coin-framework/formatters"; import { - formatTransactionStatusCommon as formatTransactionStatus, fromTransactionCommonRaw, fromTransactionStatusRawCommon as fromTransactionStatusRaw, toTransactionCommonRaw, toTransactionStatusRawCommon as toTransactionStatusRaw, -} from "@ledgerhq/coin-framework/transaction/common"; +} from "@ledgerhq/coin-framework/serialization"; import type { Account } from "@ledgerhq/types-live"; import { BigNumber } from "bignumber.js"; import type { AlgorandTransaction, AlgorandTransactionRaw } from "./types"; diff --git a/libs/coin-modules/coin-bitcoin/src/transaction.ts b/libs/coin-modules/coin-bitcoin/src/transaction.ts index 375a37f5d26..e827734c6d1 100644 --- a/libs/coin-modules/coin-bitcoin/src/transaction.ts +++ b/libs/coin-modules/coin-bitcoin/src/transaction.ts @@ -10,13 +10,13 @@ import type { } from "./types"; import { bitcoinPickingStrategy } from "./types"; import { getEnv } from "@ledgerhq/live-env"; +import { formatTransactionStatus as formatTransactionStatusCommon } from "@ledgerhq/coin-framework/formatters"; import { - formatTransactionStatusCommon, fromTransactionCommonRaw, fromTransactionStatusRawCommon, toTransactionCommonRaw, toTransactionStatusRawCommon, -} from "@ledgerhq/coin-framework/transaction/common"; +} from "@ledgerhq/coin-framework/serialization"; import { getAccountUnit } from "@ledgerhq/coin-framework/account/index"; import { formatCurrencyUnit } from "@ledgerhq/coin-framework/currencies/index"; import type { Account } from "@ledgerhq/types-live"; diff --git a/libs/coin-modules/coin-evm/src/transaction.ts b/libs/coin-modules/coin-evm/src/transaction.ts index 7ff9000d06a..8899efedc79 100644 --- a/libs/coin-modules/coin-evm/src/transaction.ts +++ b/libs/coin-modules/coin-evm/src/transaction.ts @@ -1,13 +1,13 @@ import { ethers } from "ethers"; import { BigNumber } from "bignumber.js"; import type { Account } from "@ledgerhq/types-live"; +import { formatTransactionStatus } from "@ledgerhq/coin-framework/formatters"; import { - formatTransactionStatusCommon as formatTransactionStatus, fromTransactionCommonRaw, fromTransactionStatusRawCommon as fromTransactionStatusRaw, toTransactionCommonRaw, toTransactionStatusRawCommon as toTransactionStatusRaw, -} from "@ledgerhq/coin-framework/transaction/common"; +} from "@ledgerhq/coin-framework/serialization/index"; import { getAccountUnit } from "@ledgerhq/coin-framework/account/index"; import { formatCurrencyUnit } from "@ledgerhq/coin-framework/currencies/index"; import { transactionToEthersTransaction } from "./adapters"; diff --git a/libs/coin-modules/coin-near/src/transaction.ts b/libs/coin-modules/coin-near/src/transaction.ts index 4e9db764fc3..c0ae783ad0b 100644 --- a/libs/coin-modules/coin-near/src/transaction.ts +++ b/libs/coin-modules/coin-near/src/transaction.ts @@ -1,12 +1,12 @@ import type { Transaction, TransactionRaw } from "./types"; import { BigNumber } from "bignumber.js"; +import { formatTransactionStatus } from "@ledgerhq/coin-framework/formatters"; import { - formatTransactionStatusCommon as formatTransactionStatus, fromTransactionCommonRaw, fromTransactionStatusRawCommon as fromTransactionStatusRaw, toTransactionCommonRaw, toTransactionStatusRawCommon as toTransactionStatusRaw, -} from "@ledgerhq/coin-framework/transaction/common"; +} from "@ledgerhq/coin-framework/serialization"; import type { Account } from "@ledgerhq/types-live"; import { getAccountUnit } from "@ledgerhq/coin-framework/account/index"; import { formatCurrencyUnit } from "@ledgerhq/coin-framework/currencies/index"; diff --git a/libs/coin-modules/coin-polkadot/src/bridge/transaction.ts b/libs/coin-modules/coin-polkadot/src/bridge/transaction.ts index da900241357..076bf843a7c 100644 --- a/libs/coin-modules/coin-polkadot/src/bridge/transaction.ts +++ b/libs/coin-modules/coin-polkadot/src/bridge/transaction.ts @@ -1,12 +1,12 @@ import type { Transaction, TransactionRaw } from "../types"; import { BigNumber } from "bignumber.js"; +import { formatTransactionStatus } from "@ledgerhq/coin-framework/formatters"; import { - formatTransactionStatusCommon as formatTransactionStatus, fromTransactionCommonRaw, fromTransactionStatusRawCommon as fromTransactionStatusRaw, toTransactionCommonRaw, toTransactionStatusRawCommon as toTransactionStatusRaw, -} from "@ledgerhq/coin-framework/transaction/common"; +} from "@ledgerhq/coin-framework/serialization"; import type { Account } from "@ledgerhq/types-live"; import { getAccountUnit } from "@ledgerhq/coin-framework/account/index"; import { formatCurrencyUnit } from "@ledgerhq/coin-framework/currencies/index"; diff --git a/libs/ledger-live-common/src/families/cardano/transaction.ts b/libs/ledger-live-common/src/families/cardano/transaction.ts index f3c6bb0eea9..562ba0dfbe7 100644 --- a/libs/ledger-live-common/src/families/cardano/transaction.ts +++ b/libs/ledger-live-common/src/families/cardano/transaction.ts @@ -1,12 +1,12 @@ import type { Transaction, TransactionRaw } from "./types"; import { BigNumber } from "bignumber.js"; +import { formatTransactionStatus } from "@ledgerhq/coin-framework/formatters"; import { - formatTransactionStatusCommon as formatTransactionStatus, fromTransactionCommonRaw, fromTransactionStatusRawCommon as fromTransactionStatusRaw, toTransactionCommonRaw, toTransactionStatusRawCommon as toTransactionStatusRaw, -} from "@ledgerhq/coin-framework/transaction/common"; +} from "@ledgerhq/coin-framework/serialization"; import { getAccountUnit } from "../../account"; import { formatCurrencyUnit } from "../../currencies"; import type { Account } from "@ledgerhq/types-live"; diff --git a/libs/ledger-live-common/src/families/casper/transaction.ts b/libs/ledger-live-common/src/families/casper/transaction.ts index 2132fa7da30..85c38966096 100644 --- a/libs/ledger-live-common/src/families/casper/transaction.ts +++ b/libs/ledger-live-common/src/families/casper/transaction.ts @@ -1,11 +1,11 @@ import type { Transaction, TransactionRaw } from "./types"; +import { formatTransactionStatus } from "@ledgerhq/coin-framework/formatters"; import { - formatTransactionStatusCommon as formatTransactionStatus, fromTransactionCommonRaw, fromTransactionStatusRawCommon as fromTransactionStatusRaw, toTransactionCommonRaw, toTransactionStatusRawCommon as toTransactionStatusRaw, -} from "@ledgerhq/coin-framework/transaction/common"; +} from "@ledgerhq/coin-framework/serialization"; import type { Account } from "@ledgerhq/types-live"; import { getAccountUnit } from "../../account"; import { formatCurrencyUnit } from "../../currencies"; diff --git a/libs/ledger-live-common/src/families/celo/transaction.ts b/libs/ledger-live-common/src/families/celo/transaction.ts index da56dcc291f..995a3e70dbd 100644 --- a/libs/ledger-live-common/src/families/celo/transaction.ts +++ b/libs/ledger-live-common/src/families/celo/transaction.ts @@ -1,12 +1,12 @@ import type { Transaction, TransactionRaw } from "./types"; import { BigNumber } from "bignumber.js"; +import { formatTransactionStatus } from "@ledgerhq/coin-framework/formatters"; import { - formatTransactionStatusCommon as formatTransactionStatus, fromTransactionCommonRaw, fromTransactionStatusRawCommon as fromTransactionStatusRaw, toTransactionCommonRaw, toTransactionStatusRawCommon as toTransactionStatusRaw, -} from "@ledgerhq/coin-framework/transaction/common"; +} from "@ledgerhq/coin-framework/serialization"; import { getAccountUnit } from "../../account"; import { formatCurrencyUnit } from "../../currencies"; import { Account } from "@ledgerhq/types-live"; diff --git a/libs/ledger-live-common/src/families/cosmos/transaction.ts b/libs/ledger-live-common/src/families/cosmos/transaction.ts index 62f869546a6..9fc638312c8 100644 --- a/libs/ledger-live-common/src/families/cosmos/transaction.ts +++ b/libs/ledger-live-common/src/families/cosmos/transaction.ts @@ -1,12 +1,12 @@ import { BigNumber } from "bignumber.js"; import type { Transaction, TransactionRaw } from "./types"; +import { formatTransactionStatus } from "@ledgerhq/coin-framework/formatters"; import { - formatTransactionStatusCommon as formatTransactionStatus, fromTransactionCommonRaw, fromTransactionStatusRawCommon as fromTransactionStatusRaw, toTransactionCommonRaw, toTransactionStatusRawCommon as toTransactionStatusRaw, -} from "@ledgerhq/coin-framework/transaction/common"; +} from "@ledgerhq/coin-framework/serialization"; import { getAccountUnit } from "../../account"; import { formatCurrencyUnit } from "../../currencies"; import { Account } from "@ledgerhq/types-live"; diff --git a/libs/ledger-live-common/src/families/crypto_org/transaction.ts b/libs/ledger-live-common/src/families/crypto_org/transaction.ts index 056b865b268..9021297bf50 100644 --- a/libs/ledger-live-common/src/families/crypto_org/transaction.ts +++ b/libs/ledger-live-common/src/families/crypto_org/transaction.ts @@ -1,12 +1,12 @@ import type { Transaction, TransactionRaw } from "./types"; import { BigNumber } from "bignumber.js"; +import { formatTransactionStatus } from "@ledgerhq/coin-framework/formatters"; import { - formatTransactionStatusCommon as formatTransactionStatus, fromTransactionCommonRaw, fromTransactionStatusRawCommon as fromTransactionStatusRaw, toTransactionCommonRaw, toTransactionStatusRawCommon as toTransactionStatusRaw, -} from "@ledgerhq/coin-framework/transaction/common"; +} from "@ledgerhq/coin-framework/serialization"; import type { Account } from "@ledgerhq/types-live"; import { getAccountUnit } from "../../account"; import { formatCurrencyUnit } from "../../currencies"; diff --git a/libs/ledger-live-common/src/families/elrond/transaction.ts b/libs/ledger-live-common/src/families/elrond/transaction.ts index f47312f4834..3690a218083 100644 --- a/libs/ledger-live-common/src/families/elrond/transaction.ts +++ b/libs/ledger-live-common/src/families/elrond/transaction.ts @@ -1,12 +1,12 @@ import type { Transaction, TransactionRaw } from "./types"; import { BigNumber } from "bignumber.js"; +import { formatTransactionStatus } from "@ledgerhq/coin-framework/formatters"; import { - formatTransactionStatusCommon as formatTransactionStatus, fromTransactionCommonRaw, fromTransactionStatusRawCommon as fromTransactionStatusRaw, toTransactionCommonRaw, toTransactionStatusRawCommon as toTransactionStatusRaw, -} from "@ledgerhq/coin-framework/transaction/common"; +} from "@ledgerhq/coin-framework/serialization"; import type { Account } from "@ledgerhq/types-live"; import { getAccountUnit } from "../../account"; import { formatCurrencyUnit } from "../../currencies"; diff --git a/libs/ledger-live-common/src/families/filecoin/transaction.ts b/libs/ledger-live-common/src/families/filecoin/transaction.ts index 98dafc12f49..0ffa0ccc09c 100644 --- a/libs/ledger-live-common/src/families/filecoin/transaction.ts +++ b/libs/ledger-live-common/src/families/filecoin/transaction.ts @@ -1,11 +1,11 @@ import type { Transaction, TransactionRaw } from "./types"; +import { formatTransactionStatus } from "@ledgerhq/coin-framework/formatters"; import { - formatTransactionStatusCommon as formatTransactionStatus, fromTransactionCommonRaw, fromTransactionStatusRawCommon as fromTransactionStatusRaw, toTransactionCommonRaw, toTransactionStatusRawCommon as toTransactionStatusRaw, -} from "@ledgerhq/coin-framework/transaction/common"; +} from "@ledgerhq/coin-framework/serialization"; import type { Account } from "@ledgerhq/types-live"; import { getAccountUnit } from "../../account"; import { formatCurrencyUnit } from "../../currencies"; diff --git a/libs/ledger-live-common/src/families/hedera/transaction.ts b/libs/ledger-live-common/src/families/hedera/transaction.ts index bb5d577a8ec..1285ad7f404 100644 --- a/libs/ledger-live-common/src/families/hedera/transaction.ts +++ b/libs/ledger-live-common/src/families/hedera/transaction.ts @@ -1,11 +1,11 @@ import type { Transaction, TransactionRaw } from "./types"; +import { formatTransactionStatus } from "@ledgerhq/coin-framework/formatters"; import { - formatTransactionStatusCommon as formatTransactionStatus, fromTransactionCommonRaw, fromTransactionStatusRawCommon as fromTransactionStatusRaw, toTransactionCommonRaw, toTransactionStatusRawCommon as toTransactionStatusRaw, -} from "@ledgerhq/coin-framework/transaction/common"; +} from "@ledgerhq/coin-framework/serialization"; import type { Account } from "@ledgerhq/types-live"; import { getAccountUnit } from "../../account"; import { formatCurrencyUnit } from "../../currencies"; diff --git a/libs/ledger-live-common/src/families/internet_computer/transaction.ts b/libs/ledger-live-common/src/families/internet_computer/transaction.ts index 310d250d762..2c2007d6a98 100644 --- a/libs/ledger-live-common/src/families/internet_computer/transaction.ts +++ b/libs/ledger-live-common/src/families/internet_computer/transaction.ts @@ -1,11 +1,11 @@ import type { Transaction, TransactionRaw } from "./types"; +import { formatTransactionStatus } from "@ledgerhq/coin-framework/formatters"; import { - formatTransactionStatusCommon as formatTransactionStatus, fromTransactionCommonRaw, fromTransactionStatusRawCommon as fromTransactionStatusRaw, toTransactionCommonRaw, toTransactionStatusRawCommon as toTransactionStatusRaw, -} from "@ledgerhq/coin-framework/transaction/common"; +} from "@ledgerhq/coin-framework/serialization"; import type { Account } from "@ledgerhq/types-live"; import { getAccountUnit } from "../../account"; import { formatCurrencyUnit } from "../../currencies"; diff --git a/libs/ledger-live-common/src/families/ripple/transaction.ts b/libs/ledger-live-common/src/families/ripple/transaction.ts index dfaa3ca19c6..0ecdaba4be7 100644 --- a/libs/ledger-live-common/src/families/ripple/transaction.ts +++ b/libs/ledger-live-common/src/families/ripple/transaction.ts @@ -1,12 +1,12 @@ import { BigNumber } from "bignumber.js"; import type { Transaction, TransactionRaw } from "./types"; +import { formatTransactionStatus } from "@ledgerhq/coin-framework/formatters"; import { - formatTransactionStatusCommon as formatTransactionStatus, fromTransactionCommonRaw, fromTransactionStatusRawCommon as fromTransactionStatusRaw, toTransactionCommonRaw, toTransactionStatusRawCommon as toTransactionStatusRaw, -} from "@ledgerhq/coin-framework/transaction/common"; +} from "@ledgerhq/coin-framework/serialization"; import type { Account } from "@ledgerhq/types-live"; import { getAccountUnit } from "../../account"; import { formatCurrencyUnit } from "../../currencies"; diff --git a/libs/ledger-live-common/src/families/solana/transaction.ts b/libs/ledger-live-common/src/families/solana/transaction.ts index 12451f4087a..5db57033fc4 100644 --- a/libs/ledger-live-common/src/families/solana/transaction.ts +++ b/libs/ledger-live-common/src/families/solana/transaction.ts @@ -12,13 +12,13 @@ import type { TransactionRaw, TransferCommand, } from "./types"; +import { formatTransactionStatus } from "@ledgerhq/coin-framework/formatters"; import { - formatTransactionStatusCommon as formatTransactionStatus, fromTransactionCommonRaw, fromTransactionStatusRawCommon as fromTransactionStatusRaw, toTransactionCommonRaw, toTransactionStatusRawCommon as toTransactionStatusRaw, -} from "@ledgerhq/coin-framework/transaction/common"; +} from "@ledgerhq/coin-framework/serialization"; import type { Account } from "@ledgerhq/types-live"; import { findSubAccountById, getAccountUnit } from "../../account"; import { formatCurrencyUnit, getTokenById } from "../../currencies"; diff --git a/libs/ledger-live-common/src/families/stacks/transaction.ts b/libs/ledger-live-common/src/families/stacks/transaction.ts index 701249cfddd..c3cf2ffa818 100644 --- a/libs/ledger-live-common/src/families/stacks/transaction.ts +++ b/libs/ledger-live-common/src/families/stacks/transaction.ts @@ -3,13 +3,13 @@ import { StacksNetwork } from "./bridge/utils/api.types"; import type { Account } from "@ledgerhq/types-live"; import type { Transaction, TransactionRaw } from "./types"; +import { formatTransactionStatus } from "@ledgerhq/coin-framework/formatters"; import { - formatTransactionStatusCommon as formatTransactionStatus, fromTransactionCommonRaw, fromTransactionStatusRawCommon as fromTransactionStatusRaw, toTransactionCommonRaw, toTransactionStatusRawCommon as toTransactionStatusRaw, -} from "@ledgerhq/coin-framework/transaction/common"; +} from "@ledgerhq/coin-framework/serialization"; import { getAccountUnit } from "../../account"; import { formatCurrencyUnit } from "../../currencies"; diff --git a/libs/ledger-live-common/src/families/stellar/transaction.ts b/libs/ledger-live-common/src/families/stellar/transaction.ts index e5e38486410..9c636c6a998 100644 --- a/libs/ledger-live-common/src/families/stellar/transaction.ts +++ b/libs/ledger-live-common/src/families/stellar/transaction.ts @@ -1,13 +1,13 @@ import { BigNumber } from "bignumber.js"; import type { Transaction, TransactionRaw } from "./types"; import { getAssetCodeIssuer } from "./logic"; +import { formatTransactionStatus } from "@ledgerhq/coin-framework/formatters"; import { - formatTransactionStatusCommon as formatTransactionStatus, fromTransactionCommonRaw, fromTransactionStatusRawCommon as fromTransactionStatusRaw, toTransactionCommonRaw, toTransactionStatusRawCommon as toTransactionStatusRaw, -} from "@ledgerhq/coin-framework/transaction/common"; +} from "@ledgerhq/coin-framework/serialization"; import type { Account } from "@ledgerhq/types-live"; import { getAccountUnit } from "../../account"; import { formatCurrencyUnit } from "../../currencies"; diff --git a/libs/ledger-live-common/src/families/tezos/transaction.ts b/libs/ledger-live-common/src/families/tezos/transaction.ts index 44f24d95971..ea670d3df14 100644 --- a/libs/ledger-live-common/src/families/tezos/transaction.ts +++ b/libs/ledger-live-common/src/families/tezos/transaction.ts @@ -1,12 +1,12 @@ import { BigNumber } from "bignumber.js"; import type { Transaction, TransactionRaw } from "./types"; +import { formatTransactionStatus } from "@ledgerhq/coin-framework/formatters"; import { - formatTransactionStatusCommon as formatTransactionStatus, fromTransactionCommonRaw, fromTransactionStatusRawCommon as fromTransactionStatusRaw, toTransactionCommonRaw, toTransactionStatusRawCommon as toTransactionStatusRaw, -} from "@ledgerhq/coin-framework/transaction/common"; +} from "@ledgerhq/coin-framework/serialization"; import type { Account } from "@ledgerhq/types-live"; import { getAccountUnit } from "../../account"; import { formatCurrencyUnit } from "../../currencies"; diff --git a/libs/ledger-live-common/src/families/tron/transaction.ts b/libs/ledger-live-common/src/families/tron/transaction.ts index c3c6a6368a8..70cab18765f 100644 --- a/libs/ledger-live-common/src/families/tron/transaction.ts +++ b/libs/ledger-live-common/src/families/tron/transaction.ts @@ -1,12 +1,12 @@ import { BigNumber } from "bignumber.js"; import type { Transaction, TransactionRaw } from "./types"; +import { formatTransactionStatus } from "@ledgerhq/coin-framework/formatters"; import { - formatTransactionStatusCommon as formatTransactionStatus, fromTransactionCommonRaw, fromTransactionStatusRawCommon as fromTransactionStatusRaw, toTransactionCommonRaw, toTransactionStatusRawCommon as toTransactionStatusRaw, -} from "@ledgerhq/coin-framework/transaction/common"; +} from "@ledgerhq/coin-framework/serialization"; import type { Account } from "@ledgerhq/types-live"; import { getAccountUnit } from "../../account"; import { formatCurrencyUnit } from "../../currencies"; diff --git a/libs/ledger-live-common/src/families/vechain/transaction.ts b/libs/ledger-live-common/src/families/vechain/transaction.ts index f5af8fe1a47..a713c0b9fe6 100644 --- a/libs/ledger-live-common/src/families/vechain/transaction.ts +++ b/libs/ledger-live-common/src/families/vechain/transaction.ts @@ -1,11 +1,11 @@ import type { Transaction, TransactionRaw, TransactionStatus, TransactionStatusRaw } from "./types"; +import { formatTransactionStatus } from "@ledgerhq/coin-framework/formatters"; import { - formatTransactionStatusCommon as formatTransactionStatus, fromTransactionCommonRaw, fromTransactionStatusRawCommon, toTransactionCommonRaw, toTransactionStatusRawCommon, -} from "@ledgerhq/coin-framework/transaction/common"; +} from "@ledgerhq/coin-framework/serialization"; import type { Account } from "@ledgerhq/types-live"; import { getAccountUnit } from "../../account"; import { formatCurrencyUnit } from "../../currencies";