@ledgerhq/live-cli 24.26.1-nightly.0 → 24.26.1-nightly.1

package/lib/cli.js

@@ -515377,7 +515377,7 @@ var require_package7 = __commonJS({
     module2.exports = {
       name: "@ledgerhq/live-common",
       description: "Common ground for the Ledger Live apps",
-      version: "34.52.0-nightly.0",
+      version: "34.52.0-nightly.1",
       repository: {
         type: "git",
         url: "https://github.com/LedgerHQ/ledger-live.git"
@@ -515711,7 +515711,7 @@ var require_package8 = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@ledgerhq/live-cli",
-      version: "24.26.1-nightly.0",
+      version: "24.26.1-nightly.1",
       description: "ledger-live CLI version",
       repository: {
         type: "git",
@@ -575111,6 +575111,10 @@ var OP_EQUALVERIFY = 136;
 var OP_CHECKSIG = 172;
 var ZCASH_ACTIVATION_HEIGHTS = {
   // https://zcash.readthedocs.io/en/latest/rtd_pages/nu_dev_guide.html
+  //
+  // https://zips.z.cash/zip-0255
+  // https://github.com/zcash/zcash/releases/tag/v6.10.0
+  NU6_1: 3146400,
   // https://zips.z.cash/zip-0253
   NU6: 2726400,
   // https://zips.z.cash/zip-0252
@@ -576880,7 +576884,9 @@ var defaultsSignTransaction = {
 };
 var getZcashBranchId = (blockHeight) => {
   const branchId = Buffer.alloc(4);
-  if (!blockHeight || blockHeight >= ZCASH_ACTIVATION_HEIGHTS.NU6) {
+  if (!blockHeight || blockHeight >= ZCASH_ACTIVATION_HEIGHTS.NU6_1) {
+    branchId.writeUInt32LE(1307332080, 0);
+  } else if (blockHeight >= ZCASH_ACTIVATION_HEIGHTS.NU6) {
     branchId.writeUInt32LE(3370586197, 0);
   } else if (blockHeight >= ZCASH_ACTIVATION_HEIGHTS.NU5) {
     branchId.writeUInt32LE(3268858036, 0);
@@ -621482,11 +621488,13 @@ function extractType(asset, op) {
     return asset.parents[op.hash].type;
   return "NONE";
 }
-function computeValue(asset, op, type4) {
-  if (type4 === "FEES")
-    return BigInt(op.fee.toFixed(0));
-  if (asset.type === "native" && op.type === "OUT")
+function computeValue(asset, op) {
+  if (asset.type === "native" && ["OUT", "FEES"].includes(op.type)) {
     return BigInt(op.value.toFixed(0)) - BigInt(op.fee.toFixed(0));
+  }
+  if (asset.type === "token" && op.hash in asset.parents) {
+    return BigInt(asset.parents[op.hash].value.toFixed(0));
+  }
   return BigInt(op.value.toFixed(0));
 }
 function toOperation(asset, op) {
@@ -621497,7 +621505,7 @@ function toOperation(asset, op) {
     assetInfo.type = extractStandard(op);
   }
   const type4 = extractType(asset, op);
-  const value2 = computeValue(asset, op, type4);
+  const value2 = computeValue(asset, op);
   return {
     id: op.id,
     type: type4,
@@ -621515,8 +621523,16 @@ function toOperation(asset, op) {
       date: op.date
     },
     details: {
-      ledgerOpType: op.type,
-      ...asset.type === "token" ? { assetAmount: op.value.toFixed(0) } : {}
+      sequence: op.transactionSequenceNumber,
+      status: op.hasFailed ? "failed" : "success",
+      ...asset.type === "token" ? {
+        ledgerOpType: op.type,
+        assetAmount: op.value.toFixed(0),
+        assetSenders: op.senders,
+        assetRecipients: op.recipients,
+        parentSenders: asset.parents[op.hash]?.senders ?? [],
+        parentRecipients: asset.parents[op.hash]?.recipients ?? []
+      } : {}
     }
   };
 }
@@ -621524,16 +621540,22 @@ async function listOperations2(currency24, address3, minHeight) {
   const explorerApi2 = getExplorerApi(currency24);
   const { lastCoinOperations, lastTokenOperations, lastNftOperations } = await explorerApi2.getLastOperations(currency24, address3, `js:2:${currency24.id}:${address3}:`, minHeight);
   const isNativeOperation = (coinOperation) => ![...lastTokenOperations, ...lastNftOperations].map((op) => op.hash).includes(coinOperation.hash);
-  const isTokenOperation = (coinOperation) => lastTokenOperations.map((op) => op.hash).includes(coinOperation.hash);
+  const isTokenOperation = (coinOperation) => [...lastTokenOperations, ...lastNftOperations].map((op) => op.hash).includes(coinOperation.hash);
   const parents = Object.fromEntries(lastCoinOperations.filter(isTokenOperation).map((op) => [op.hash, op]));
   const nativeOperations = lastCoinOperations.filter(isNativeOperation).map((op) => toOperation({ type: "native" }, op));
-  const tokenOperations = lastTokenOperations.map((op) => toOperation({ type: "token", owner: address3, parents }, op));
-  const hasValidType = (operation) => ["NONE", "FEES", "IN", "OUT", "DELEGATE", "UNDELEGATE", "REDELEGATE"].includes(operation.type);
-  const isAlone = (operation) => ["NONE", "FEES"].includes(operation.type) && !("assetAmount" in (operation.details ?? {}));
-  return [
-    nativeOperations.concat(tokenOperations).filter((op) => hasValidType(op) && !isAlone(op)),
-    ""
-  ];
+  const tokenOperations = [...lastTokenOperations, ...lastNftOperations].map((op) => toOperation({ type: "token", owner: address3, parents }, op));
+  const hasValidType = (operation) => [
+    "NONE",
+    "FEES",
+    "IN",
+    "OUT",
+    "DELEGATE",
+    "UNDELEGATE",
+    "REDELEGATE",
+    "NFT_IN",
+    "NFT_OUT"
+  ].includes(operation.type);
+  return [nativeOperations.concat(tokenOperations).filter(hasValidType), ""];
 }
 
 // ../../libs/coin-modules/coin-evm/lib-es/logic/craftTransaction.js
@@ -850138,6 +850160,25 @@ function extractBalance(balances, type4) {
     value: 0n
   };
 }
+function isStringArray(value2) {
+  return Array.isArray(value2) && value2.every((item) => typeof item === "string");
+}
+function cleanedOperation(operation) {
+  if (!operation.extra)
+    return operation;
+  const extraToClean = /* @__PURE__ */ new Set([
+    "assetReference",
+    "assetAmount",
+    "assetOwner",
+    "assetSenders",
+    "assetRecipients",
+    "parentSenders",
+    "parentRecipients",
+    "ledgerOpType"
+  ]);
+  const cleanedExtra = Object.fromEntries(Object.entries(operation.extra).filter(([key2]) => !extraToClean.has(key2)));
+  return { ...operation, extra: cleanedExtra };
+}
 function adaptCoreOperationToLiveOperation(accountId2, op) {
   const opType = op.type;
   const extra = {};
@@ -850147,6 +850188,18 @@ function adaptCoreOperationToLiveOperation(accountId2, op) {
   if (op.details?.assetAmount !== void 0) {
     extra.assetAmount = op.details.assetAmount;
   }
+  if (isStringArray(op.details?.assetSenders)) {
+    extra.assetSenders = op.details?.assetSenders;
+  }
+  if (isStringArray(op.details?.assetRecipients)) {
+    extra.assetRecipients = op.details?.assetRecipients;
+  }
+  if (isStringArray(op.details?.parentSenders)) {
+    extra.parentSenders = op.details?.parentSenders;
+  }
+  if (isStringArray(op.details?.parentRecipients)) {
+    extra.parentRecipients = op.details?.parentRecipients;
+  }
   if (op.asset?.type !== "native") {
     extra.assetReference = "assetReference" in (op.asset ?? {}) ? op.asset.assetReference : "";
     extra.assetOwner = "assetOwner" in (op.asset ?? {}) ? op.asset.assetOwner : "";
@@ -850164,8 +850217,8 @@ function adaptCoreOperationToLiveOperation(accountId2, op) {
     fee: bnFees,
     blockHash: op.tx.block.hash,
     blockHeight: op.tx.block.height,
-    senders: op.senders,
-    recipients: op.recipients,
+    senders: extra.parentSenders ?? op.senders,
+    recipients: extra.parentRecipients ?? op.recipients,
     date: op.tx.date,
     transactionSequenceNumber: op.details?.sequence,
     hasFailed: op.details?.status === "failed",
@@ -850315,12 +850368,15 @@ function buildTokenAccount({ parentAccountId, assetBalance, token, operations: o
   const id7 = encodeTokenAccountId(parentAccountId, token);
   const balance2 = new import_bignumber356.default(assetBalance.value.toString() || "0");
   const spendableBalance = new import_bignumber356.default(assetBalance.value.toString()).minus(new import_bignumber356.default(assetBalance.locked?.toString() || "0"));
-  const tokenOperations = operations4.map((op) => ({
+  const tokenOperations = operations4.map((op) => cleanedOperation({
     ...op,
     id: encodeOperationId(id7, op.hash, op.extra?.ledgerOpType),
     accountId: id7,
     type: op.extra?.ledgerOpType,
-    value: op.extra?.assetAmount ? new import_bignumber356.default(op.extra?.assetAmount) : op.value
+    contract: token.contractAddress,
+    value: op.extra?.assetAmount ? new import_bignumber356.default(op.extra?.assetAmount) : op.value,
+    senders: op.extra?.assetSenders ?? op.senders,
+    recipients: op.extra?.assetRecipients ?? op.recipients
   }));
   return {
     type: "TokenAccount",
@@ -850338,15 +850394,14 @@ function buildTokenAccount({ parentAccountId, assetBalance, token, operations: o
     // calculated in the jsHelpers
   };
 }
-async function buildSubAccounts4({ currency: currency24, accountId: accountId2, allTokenAssetsBalances, syncConfig, operations: operations4, getTokenFromAsset: getTokenFromAsset3 }) {
+async function buildSubAccounts4({ accountId: accountId2, allTokenAssetsBalances, syncConfig, operations: operations4, getTokenFromAsset: getTokenFromAsset3 }) {
   const { blacklistedTokenIds = [] } = syncConfig;
-  const allTokens = listTokensForCryptoCurrency(currency24);
   const tokenAccounts = [];
-  if (allTokens.length === 0 || allTokenAssetsBalances.length === 0) {
+  if (allTokenAssetsBalances.length === 0 || !getTokenFromAsset3) {
     return tokenAccounts;
   }
   for (const balance2 of allTokenAssetsBalances) {
-    const token = getTokenFromAsset3 && await getTokenFromAsset3(balance2.asset);
+    const token = await getTokenFromAsset3(balance2.asset);
     if (token && !blacklistedTokenIds.includes(token.id)) {
       tokenAccounts.push(buildTokenAccount({
         parentAccountId: accountId2,
@@ -850358,8 +850413,35 @@ async function buildSubAccounts4({ currency: currency24, accountId: accountId2,
   }
   return tokenAccounts;
 }
+function mergeSubAccounts5(oldSubAccounts, newSubAccounts) {
+  if (!oldSubAccounts.length) {
+    return newSubAccounts;
+  }
+  const oldSubAccountsById = Object.fromEntries(oldSubAccounts.map((account3) => [account3.id, account3]));
+  const newSubAccountsToAdd = [];
+  for (const newSubAccount of newSubAccounts) {
+    const existingSubAccount = oldSubAccountsById[newSubAccount.id];
+    if (!existingSubAccount) {
+      newSubAccountsToAdd.push(newSubAccount);
+      continue;
+    }
+    const operations4 = mergeOps(existingSubAccount.operations, newSubAccount.operations);
+    oldSubAccountsById[newSubAccount.id] = {
+      ...existingSubAccount,
+      balance: newSubAccount.balance,
+      spendableBalance: newSubAccount.spendableBalance,
+      operations: operations4,
+      operationsCount: operations4.length
+    };
+  }
+  const updatedOldSubAccounts = Object.values(oldSubAccountsById);
+  return [...updatedOldSubAccounts, ...newSubAccountsToAdd];
+}
 
 // ../../libs/ledger-live-common/lib-es/bridge/generic-alpaca/getAccountShape.js
+function isNftCoreOp(operation) {
+  return typeof operation.details?.ledgerOpType === "string" && ["NFT_IN", "NFT_OUT"].includes(operation.details?.ledgerOpType);
+}
 function genericGetAccountShape(network, kind) {
   return async (info6, syncConfig) => {
     const { address: address3, initialAccount, currency: currency24, derivationMode } = info6;
@@ -850394,29 +850476,24 @@ function genericGetAccountShape(network, kind) {
       paginationParams.lastPagingToken = lastPagingToken;
     }
     const [newCoreOps] = await alpacaApi.listOperations(address3, paginationParams);
-    const newOps = newCoreOps.map((op) => adaptCoreOperationToLiveOperation(accountId2, op));
-    const mergedOps = mergeOps(oldOps, newOps);
-    const assetOperations = [];
-    mergedOps.forEach((operation) => {
-      if (operation?.extra?.assetReference && operation?.extra?.assetOwner && !["OPT_IN", "OPT_OUT"].includes(operation.type)) {
-        assetOperations.push(operation);
-      }
-    });
-    const subAccounts = await buildSubAccounts4({
-      currency: currency24,
+    const newOps = newCoreOps.filter((op) => !isNftCoreOp(op)).map((op) => adaptCoreOperationToLiveOperation(accountId2, op));
+    const newAssetOperations = newOps.filter((operation) => operation?.extra?.assetReference && operation?.extra?.assetOwner && !["OPT_IN", "OPT_OUT"].includes(operation.type));
+    const newSubAccounts = await buildSubAccounts4({
       accountId: accountId2,
       allTokenAssetsBalances,
       syncConfig,
-      operations: assetOperations,
+      operations: newAssetOperations,
       getTokenFromAsset: alpacaApi.getTokenFromAsset
     });
-    const operations4 = mergedOps.map((op) => {
-      const subOperations = inferSubOperations(op.hash, subAccounts);
-      return {
+    const subAccounts = mergeSubAccounts5(initialAccount?.subAccounts ?? [], newSubAccounts);
+    const newOpsWithSubs = newOps.map((op) => {
+      const subOperations = inferSubOperations(op.hash, newSubAccounts);
+      return cleanedOperation({
         ...op,
         subOperations
-      };
+      });
     });
+    const operations4 = mergeOps(oldOps, newOpsWithSubs);
     const res = {
       id: accountId2,
       xpub: address3,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/live-cli",
-  "version": "24.26.1-nightly.0",
+  "version": "24.26.1-nightly.1",
   "description": "ledger-live CLI version",
   "repository": {
     "type": "git",