@ledgerhq/live-common 24.0.0-next.1 → 24.0.0-next.4

package/src/exchange/swap/getExchangeRates.test.ts

@@ -60,7 +60,6 @@ const transaction: Transaction = {
   family: "bitcoin",
   utxoStrategy: {
     strategy: 0,
-    pickUnconfirmedRBF: false,
     excludeUTXOs: [],
   },
   rbf: true,

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

@@ -32,7 +32,6 @@ const createTransaction = (): Transaction => ({
   rbf: false,
   utxoStrategy: {
     strategy: 0,
-    pickUnconfirmedRBF: false,
     excludeUTXOs: [],
   },
 });

package/src/families/bitcoin/cache.ts

@@ -15,9 +15,9 @@ const getCacheKeyForCalculateFees = ({
 }) =>
   `${a.id}_${a.blockHeight || 0}_${t.amount.toString()}_${String(
     t.useAllAmount
-  )}_${t.recipient}_${t.feePerByte ? t.feePerByte.toString() : ""}_${
-    t.utxoStrategy.pickUnconfirmedRBF ? 1 : 0
-  }_${t.utxoStrategy.strategy}_${String(t.rbf)}_${t.utxoStrategy.excludeUTXOs
+  )}_${t.recipient}_${t.feePerByte ? t.feePerByte.toString() : ""}_${0}_${
+    t.utxoStrategy.strategy
+  }_${String(t.rbf)}_${t.utxoStrategy.excludeUTXOs
     .map(({ hash, outputIndex }) => `${hash}@${outputIndex}`)
     .join("+")}`;
 

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

@@ -8,11 +8,6 @@ const options = [
     type: String,
     desc: "how much fee per byte",
   },
-  {
-    name: "pickUnconfirmedRBF",
-    type: Boolean,
-    desc: "also pick unconfirmed replaceable txs",
-  },
   {
     name: "excludeUTXO",
     alias: "E",
@@ -52,7 +47,6 @@ function inferTransactions(
       rbf: opts.rbf || false,
       utxoStrategy: {
         strategy: bitcoinPickingStrategy[opts["bitcoin-pick-strategy"]] || 0,
-        pickUnconfirmedRBF: opts.pickUnconfirmedRBF || false,
         excludeUTXOs: (opts.excludeUTXO || []).map((str) => {
           const [hash, index] = str.split("@");
           invariant(

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

@@ -47,7 +47,6 @@ const dataset: CurrenciesData<Transaction> = {
             rbf: false,
             utxoStrategy: {
               strategy: 0,
-              pickUnconfirmedRBF: false,
               excludeUTXOs: [],
             },
           }),
@@ -73,7 +72,6 @@ const dataset: CurrenciesData<Transaction> = {
             rbf: false,
             utxoStrategy: {
               strategy: 0,
-              pickUnconfirmedRBF: false,
               excludeUTXOs: [],
             },
           }),
@@ -99,7 +97,6 @@ const dataset: CurrenciesData<Transaction> = {
             rbf: false,
             utxoStrategy: {
               strategy: 0,
-              pickUnconfirmedRBF: false,
               excludeUTXOs: [],
             },
           }),

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

@@ -46,7 +46,6 @@ const dataset: CurrenciesData<Transaction> = {
             rbf: false,
             utxoStrategy: {
               strategy: 0,
-              pickUnconfirmedRBF: false,
               excludeUTXOs: [],
             },
           }),
@@ -69,7 +68,6 @@ const dataset: CurrenciesData<Transaction> = {
             rbf: false,
             utxoStrategy: {
               strategy: 0,
-              pickUnconfirmedRBF: false,
               excludeUTXOs: [],
             },
           }),
@@ -92,7 +90,6 @@ const dataset: CurrenciesData<Transaction> = {
             rbf: false,
             utxoStrategy: {
               strategy: 0,
-              pickUnconfirmedRBF: false,
               excludeUTXOs: [],
             },
           }),

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

@@ -47,7 +47,6 @@ const dataset: CurrenciesData<Transaction> = {
             rbf: false,
             utxoStrategy: {
               strategy: 0,
-              pickUnconfirmedRBF: false,
               excludeUTXOs: [],
             },
           }),
@@ -70,7 +69,6 @@ const dataset: CurrenciesData<Transaction> = {
             rbf: false,
             utxoStrategy: {
               strategy: 0,
-              pickUnconfirmedRBF: false,
               excludeUTXOs: [],
             },
           }),
@@ -93,7 +91,6 @@ const dataset: CurrenciesData<Transaction> = {
             rbf: false,
             utxoStrategy: {
               strategy: 0,
-              pickUnconfirmedRBF: false,
               excludeUTXOs: [],
             },
           }),

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

@@ -44,7 +44,6 @@ export const buildTransaction = async (
     walletAccount,
     transaction.feePerByte.toNumber(), //!\ wallet-btc handles fees as JS number
     transaction.utxoStrategy.excludeUTXOs,
-    transaction.utxoStrategy.pickUnconfirmedRBF,
     [transaction.recipient]
   );
   log("btcwallet", "building transaction", transaction);

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

@@ -12,7 +12,6 @@ const createTransaction = (): Transaction => {
     amount: new BigNumber(0),
     utxoStrategy: {
       strategy: 0,
-      pickUnconfirmedRBF: false,
       excludeUTXOs: [],
     },
     recipient: "",

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

@@ -30,7 +30,6 @@ const estimateMaxSpendable = async ({
     walletAccount,
     feePerByte.toNumber(), //!\ wallet-btc handles fees as JS number
     transaction?.utxoStrategy?.excludeUTXOs || [],
-    transaction?.utxoStrategy?.pickUnconfirmedRBF || false,
     transaction ? [transaction.recipient] : []
   );
   return maxSpendable.lt(0) ? new BigNumber(0) : maxSpendable;

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

@@ -53,7 +53,10 @@ const toWalletNetwork = (currencyId: string): "testnet" | "mainnet" => {
 };
 
 // Map wallet-btc's Output to LL's BitcoinOutput
-const fromWalletUtxo = (utxo: WalletOutput): BitcoinOutput => {
+const fromWalletUtxo = (
+  utxo: WalletOutput,
+  changeAddresses: Set<string>
+): BitcoinOutput => {
   return {
     hash: utxo.output_hash,
     outputIndex: utxo.output_index,
@@ -61,7 +64,7 @@ const fromWalletUtxo = (utxo: WalletOutput): BitcoinOutput => {
     address: utxo.address,
     value: new BigNumber(utxo.value),
     rbf: utxo.rbf,
-    isChange: false, // wallet-btc limitation: doesn't provide it
+    isChange: changeAddresses.has(utxo.address),
   };
 };
 
@@ -349,7 +352,7 @@ const getAccountShape: GetAccountShape = async (info) => {
   const newUniqueOperations = deduplicateOperations(newOperations);
   const operations = mergeOps(oldOperations, newUniqueOperations);
   const rawUtxos = await wallet.getAccountUnspentUtxos(walletAccount);
-  const utxos = rawUtxos.map(fromWalletUtxo);
+  const utxos = rawUtxos.map((utxo) => fromWalletUtxo(utxo, changeAddresses));
   return {
     id: accountId,
     xpub,

package/src/families/bitcoin/logic.ts

@@ -68,7 +68,7 @@ export const isValidRecipient = async (params: {
 type UTXOStatus =
   | {
       excluded: true;
-      reason: "pickUnconfirmedRBF" | "pickPendingNonRBF" | "userExclusion";
+      reason: "pickPendingUtxo" | "userExclusion";
     }
   | {
       excluded: false;
@@ -77,16 +77,11 @@ export const getUTXOStatus = (
   utxo: BitcoinOutput,
   utxoStrategy: UtxoStrategy
 ): UTXOStatus => {
-  if (!utxoStrategy.pickUnconfirmedRBF && utxo.rbf && !utxo.blockHeight) {
+  if (!utxo.blockHeight && !utxo.isChange) {
+    // exclude pending and not change utxo
     return {
       excluded: true,
-      reason: "pickUnconfirmedRBF",
-    };
-  }
-  if (!utxo.rbf && !utxo.blockHeight) {
-    return {
-      excluded: true,
-      reason: "pickPendingNonRBF",
+      reason: "pickPendingUtxo",
     };
   }
   if (

package/src/families/bitcoin/specs.ts

@@ -248,7 +248,6 @@ const bitcoinLikeMutations = ({
           {
             utxoStrategy: {
               ...transaction.utxoStrategy,
-              pickUnconfirmedRBF: true,
             },
           },
           {

package/src/families/bitcoin/transaction.ts

@@ -80,7 +80,7 @@ const formatNetworkInfo = (
 
 export const formatTransaction = (t: Transaction, account: Account): string => {
   const n = getEnv("DEBUG_UTXO_DISPLAY");
-  const { excludeUTXOs, strategy, pickUnconfirmedRBF } = t.utxoStrategy;
+  const { excludeUTXOs, strategy } = t.utxoStrategy;
   const displayAll = excludeUTXOs.length <= n;
   return `
 SEND ${
@@ -99,7 +99,7 @@ ${[
   Object.keys(bitcoinPickingStrategy).find(
     (k) => bitcoinPickingStrategy[k] === strategy
   ),
-  pickUnconfirmedRBF && "pick-unconfirmed",
+  "pick-unconfirmed",
   t.rbf && "RBF-enabled",
 ]
   .filter(Boolean)

package/src/families/bitcoin/types.ts

@@ -126,7 +126,6 @@ export type BitcoinPickingStrategy =
   typeof bitcoinPickingStrategy[keyof typeof bitcoinPickingStrategy];
 export type UtxoStrategy = {
   strategy: BitcoinPickingStrategy;
-  pickUnconfirmedRBF: boolean;
   excludeUTXOs: Array<{
     hash: string;
     outputIndex: number;

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

@@ -117,10 +117,12 @@ class BitcoinLikeWallet {
     account: Account,
     feePerByte: number,
     excludeUTXOs: Array<{ hash: string; outputIndex: number }>,
-    pickUnconfirmedRBF: boolean,
     outputAddresses: string[] = []
   ) {
     const addresses = await account.xpub.getXpubAddresses();
+    const changeAddresses = (await account.xpub.getAccountAddresses(1)).map(
+      (item) => item.address
+    );
     const utxos = flatten(
       await Promise.all(
         addresses.map((address) =>
@@ -139,7 +141,11 @@ class BitcoinLikeWallet {
             excludeUtxo.outputIndex === utxo.output_index
         )
       ) {
-        if ((pickUnconfirmedRBF && utxo.rbf) || utxo.block_height !== null) {
+        // we can use either non pending utxo or change utxo
+        if (
+          changeAddresses.includes(utxo.address) ||
+          utxo.block_height !== null
+        ) {
           usableUtxoCount++;
           balance = balance.plus(utxo.value);
         }

package/src/families/ethereum/modules/erc1155.ts

@@ -8,8 +8,8 @@ import {
 } from "@ledgerhq/errors";
 import { validateRecipient } from "../transaction";
 import type { ModeModule, Transaction } from "../types";
-import type { Account } from "../../../types";
 import { prepareTransaction } from "./erc721";
+import { Account } from "../../../types";
 
 const NotOwnedNft = createCustomErrorClass("NotOwnedNft");
 const NotEnoughNftOwned = createCustomErrorClass("NotEnoughNftOwned");
@@ -124,10 +124,17 @@ const erc1155Transfer: ModeModule = {
    */
   fillOptimisticOperation(a, t, op) {
     op.type = "FEES";
-    op.extra = {
-      ...op.extra,
-      approving: true, // workaround to track the status ENABLING
-    };
+    op.nftOperations = t.tokenIds?.map((tokenId, i) => ({
+      ...op,
+      id: "", // operation ID will be filled by patchOperationWithHash
+      type: "NFT_OUT",
+      senders: [eip55.encode(a.freshAddress)],
+      recipients: [eip55.encode(t.recipient)],
+      standard: "ERC1155",
+      contract: eip55.encode(t.collection ?? ""),
+      tokenId,
+      value: t.quantities?.[i] || new BigNumber(0),
+    }));
   },
 
   prepareTransaction,

package/src/families/ethereum/modules/erc721.ts

@@ -118,6 +118,17 @@ const erc721Transfer: ModeModule = {
    */
   fillOptimisticOperation(a, t, op) {
     op.type = "FEES";
+    op.nftOperations = t.tokenIds?.map((tokenId, i) => ({
+      ...op,
+      id: "", // operation ID will be filled by patchOperationWithHash
+      type: "NFT_OUT",
+      senders: [eip55.encode(a.freshAddress)],
+      recipients: [eip55.encode(t.recipient)],
+      standard: "ERC721",
+      contract: eip55.encode(t.collection ?? ""),
+      tokenId,
+      value: t.quantities?.[i] || new BigNumber(0),
+    }));
   },
 
   getResolutionConfig: () => ({ nft: true }),

package/src/families/ethereum/nft.unit.test.ts

@@ -13,6 +13,7 @@ import {
   nftsFromOperations,
 } from "../../nft";
 import { Transaction } from "./types";
+import { encodeERC1155OperationId } from "../../nft/nftOperationId";
 
 describe("nft merging", () => {
   const makeNFT = (
@@ -92,18 +93,21 @@ describe("nft merging", () => {
 describe("OpenSea lazy minting bs", () => {
   test("should have a correct on-chain nft amount even with OpenSea lazy minting", () => {
     const makeNftOperation = (
-      type: Operation["type"],
-      value: string | number,
-      dateOrder: number
+      params: [Operation["type"], number],
+      index: number
     ): Operation => {
+      const [type, value] = params;
+
       if (!["NFT_IN", "NFT_OUT"].includes(type)) {
         return {} as Operation;
       }
 
-      const id = encodeAccountId({
+      const now = Date.now() + index;
+      const currencyId = "polygon";
+      const accountId = encodeAccountId({
         type: "type",
-        currencyId: "polygon",
         xpubOrAddress: "0xbob",
+        currencyId,
         derivationMode: "",
         version: "1",
       });
@@ -112,11 +116,12 @@ describe("OpenSea lazy minting bs", () => {
       const contract = "0x0000000000000000000000000000000000000000";
       const fee = new BigNumber(0);
       const tokenId = "42069";
-      const hash = "FaKeHasH";
-      const date = new Date(Date.now() + dateOrder ?? 0);
+      const hash = "FaKeHasH" + now;
+      const date = new Date(now);
+      const nftId = encodeNftId(accountId, contract, tokenId, currencyId);
 
       return {
-        id,
+        id: encodeERC1155OperationId(nftId, hash, type),
         hash,
         senders: [sender],
         recipients: [receiver],
@@ -126,20 +131,22 @@ describe("OpenSea lazy minting bs", () => {
         tokenId,
         value: new BigNumber(value),
         type,
-        accountId: id,
+        accountId,
         date,
       } as Operation;
     };
 
     // scenario with bob lazy minting 10 NFTs
-    const ops = [
-      makeNftOperation("NFT_OUT", 5, 0), // lazy mint sending 5 NFT
-      makeNftOperation("NFT_IN", 1, 1), // receiving 1 of them back
-      makeNftOperation("NFT_IN", 2, 2), // receiving 2 of them back
-      makeNftOperation("NFT_OUT", 2, 3), // lazy mint sending 5 NFT (transformed by OpenSea in 2 txs) 1/2 (off-chain)
-      makeNftOperation("NFT_OUT", 3, 4), // lazy mint sending 5 NFT (transformed by OpenSea in 2 txs) 2/2 (on-chain)
-      makeNftOperation("NFT_IN", 1, 5), // receiving 1 back
-    ];
+    const ops = (
+      [
+        ["NFT_OUT", 5], // lazy mint sending 5 NFT
+        ["NFT_IN", 1], // receiving 1 of them back
+        ["NFT_IN", 2], // receiving 2 of them back
+        ["NFT_OUT", 2], // lazy mint sending 5 NFT (transformed by OpenSea in 2 txs) 1/2 (off-chain)
+        ["NFT_OUT", 3], // lazy mint sending 5 NFT (transformed by OpenSea in 2 txs) 2/2 (on-chain)
+        ["NFT_IN", 1], // receiving 1 back
+      ] as [Operation["type"], number][]
+    ).map((params, i) => makeNftOperation(params, i));
 
     // What happened for bob:
     //

package/src/families/ethereum/synchronisation.ts

@@ -20,6 +20,11 @@ import { API, apiForCurrency, Tx } from "../../api/Ethereum";
 import { digestTokenAccounts, prepareTokenAccounts } from "./modules";
 import { findTokenByAddressInCurrency } from "@ledgerhq/cryptoassets";
 import { encodeNftId, isNFTActive, nftsFromOperations } from "../../nft";
+import { encodeOperationId } from "../../operation";
+import {
+  encodeERC1155OperationId,
+  encodeERC721OperationId,
+} from "../../nft/nftOperationId";
 
 export const getAccountShape: GetAccountShape = async (
   infoInput,
@@ -167,7 +172,9 @@ export const getAccountShape: GetAccountShape = async (
   const nfts = isNFTActive(currency)
     ? mergeNfts(
         initialAccount?.nfts || [],
-        nftsFromOperations(operations).filter((n) => n.amount.gt(0))
+        nftsFromOperations(
+          mergeOps(operations, initialAccount?.pendingOperations || [])
+        ).filter((n) => n.amount.gt(0))
       )
     : undefined;
 
@@ -289,7 +296,7 @@ const txToOps =
           if (sending) {
             const type = "OUT";
             all.push({
-              id: `${accountId}-${hash}-${type}`,
+              id: encodeOperationId(accountId, hash, type),
               hash,
               type,
               value,
@@ -308,7 +315,7 @@ const txToOps =
           if (receiving) {
             const type = "IN";
             all.push({
-              id: `${accountId}-${hash}-${type}`,
+              id: encodeOperationId(accountId, hash, type),
               hash,
               type,
               value,
@@ -349,7 +356,7 @@ const txToOps =
             if (sending) {
               const type = "NFT_OUT";
               all.push({
-                id: `${nftId}-${hash}-${type}`,
+                id: encodeERC721OperationId(nftId, hash, type),
                 senders: [sender],
                 recipients: [receiver],
                 contract,
@@ -371,7 +378,7 @@ const txToOps =
             if (receiving) {
               const type = "NFT_IN";
               all.push({
-                id: `${nftId}-${hash}-${type}`,
+                id: encodeERC721OperationId(nftId, hash, type),
                 senders: [sender],
                 recipients: [receiver],
                 contract,
@@ -414,17 +421,12 @@ const txToOps =
             event.transfers.forEach((transfer, j) => {
               const tokenId = transfer.id;
               const value = new BigNumber(transfer.value);
-              const nftId = encodeNftId(
-                id,
-                event.contract,
-                tokenId,
-                currency.id
-              );
+              const nftId = encodeNftId(id, contract, tokenId, currency.id);
 
               if (sending) {
                 const type = "NFT_OUT";
                 all.push({
-                  id: `${nftId}-${hash}-${type}-i${i}_${j}`,
+                  id: encodeERC1155OperationId(nftId, hash, type, i, j),
                   senders: [sender],
                   recipients: [receiver],
                   contract,
@@ -447,7 +449,7 @@ const txToOps =
               if (receiving) {
                 const type = "NFT_IN";
                 all.push({
-                  id: `${nftId}-${hash}-${type}-i${i}_${j}`,
+                  id: encodeERC1155OperationId(nftId, hash, type, i, j),
                   senders: [sender],
                   recipients: [receiver],
                   contract,
@@ -481,7 +483,7 @@ const txToOps =
     if (sending) {
       const type = value.eq(0) ? "FEES" : "OUT";
       ops.push({
-        id: `${id}-${hash}-${type}`,
+        id: encodeOperationId(id, hash, type),
         hash,
         type,
         value: hasFailed ? new BigNumber(fee) : value.plus(fee),
@@ -502,10 +504,11 @@ const txToOps =
     }
 
     if (receiving) {
+      const type = "IN";
       ops.push({
-        id: `${id}-${hash}-IN`,
+        id: encodeOperationId(id, hash, type),
         hash: hash,
-        type: "IN",
+        type,
         value,
         fee,
         blockHeight,
@@ -531,10 +534,11 @@ const txToOps =
         subOperations.length ||
         nftOperations.length)
     ) {
+      const type = "NONE";
       ops.push({
-        id: `${id}-${hash}-NONE`,
+        id: encodeOperationId(id, hash, type),
         hash: hash,
-        type: "NONE",
+        type,
         value: new BigNumber(0),
         fee,
         blockHeight,

package/src/featureFlags/defaultFeatures.ts

@@ -61,4 +61,7 @@ export const defaultFeatures: DefaultFeatures = {
       support_email: "support@ledger.com",
     },
   },
+  counterValue: {
+    enabled: false,
+  },
 };

package/src/featureFlags/types.ts

@@ -4,6 +4,7 @@ export type FeatureId =
   | "pushNotifications"
   | "llmUsbFirmwareUpdate"
   | "ratings"
+  | "counterValue"
   | "buyDeviceFromLive"
   | string;
 

package/src/nft/hook.ts

@@ -0,0 +1,29 @@
+import type { ProtoNFT, CryptoCurrency, FloorPrice } from "../types";
+import { getEnv } from "../env";
+import network from "../network";
+
+const FLOOR_PRICE_CURRENCIES = new Set(["ethereum"]);
+
+export const getFloorPrice = async (
+  nft: ProtoNFT,
+  currency: CryptoCurrency
+): Promise<FloorPrice | null> => {
+  if (!FLOOR_PRICE_CURRENCIES.has(nft.currencyId)) {
+    return null;
+  }
+
+  try {
+    const { data } = await network({
+      method: "GET",
+      url: `${getEnv("NFT_ETH_METADATA_SERVICE")}/v1/marketdata/${
+        nft.currencyId
+      }/${currency?.ethereumLikeInfo?.chainId}/contract/${
+        nft.contract
+      }/floor-price`,
+    });
+
+    return data;
+  } catch (err: any) {
+    return null;
+  }
+};

package/src/nft/index.ts

@@ -1,4 +1,5 @@
 export * from "./nftId";
 export * from "./helpers";
 export * from "./support";
+export * from "./hook";
 export * from "./NftMetadataProvider";

package/src/nft/nftOperationId.ts

@@ -0,0 +1,47 @@
+export function encodeERC721OperationId(
+  nftId: string,
+  hash: string,
+  type: string
+): string {
+  return `${nftId}-${hash}-${type}`;
+}
+
+export function decodeERC721OperationId(id: string): {
+  nftId: string;
+  hash: string;
+  type: string;
+} {
+  const [nftId, hash, type] = id.split("-");
+  return {
+    nftId,
+    hash,
+    type,
+  };
+}
+
+export function encodeERC1155OperationId(
+  nftId: string,
+  hash: string,
+  type: string,
+  i = 0,
+  j = 0
+): string {
+  return `${nftId}-${hash}-${type}-i${i}_${j}`;
+}
+
+export function decodeERC1155OperationId(id: string): {
+  nftId: string;
+  hash: string;
+  type: string;
+  i: number;
+  j: number;
+} {
+  const [nftId, hash, type, i, j] = id.split("-");
+  return {
+    nftId,
+    hash,
+    type,
+    i: Number(i),
+    j: Number(j),
+  };
+}