@ledgerhq/live-cli 24.18.4-next.0 → 24.18.4-next.1

package/lib/cli.js

@@ -530283,7 +530283,7 @@ var require_package8 = __commonJS({
     module2.exports = {
       name: "@ledgerhq/live-common",
       description: "Common ground for the Ledger Live apps",
-      version: "34.35.0-next.0",
+      version: "34.35.0-next.1",
       repository: {
         type: "git",
         url: "https://github.com/LedgerHQ/ledger-live.git"
@@ -537082,7 +537082,7 @@ var require_package9 = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@ledgerhq/live-cli",
-      version: "24.18.4-next.0",
+      version: "24.18.4-next.1",
       description: "ledger-live CLI version",
       repository: {
         type: "git",
@@ -804282,6 +804282,10 @@ async function estimateFee(address4, body, initCode, initData) {
 async function broadcastTx4(bocBase64) {
   return (await send2("/message", { boc: bocBase64 })).message_hash;
 }
+async function fetchAdjacentTransactions(txHash, dir = "in") {
+  const url4 = `/adjacentTransactions?hash=${encodeURIComponent(txHash)}&direction=${dir}`;
+  return await fetch13(url4);
+}
 
 // ../../libs/coin-modules/coin-ton/lib-es/broadcast.js
 var broadcast22 = async ({ signedOperation: { signature: signature3, operation } }) => {
@@ -804911,7 +804915,6 @@ function mapTxToOps5(accountId2, addr, addressBook) {
       ops.push({
         id: encodeOperationId(accountId2, hash12, "OUT"),
         hash: tx.out_msgs[0].hash,
-        // this hash matches with in_msg.hash of IN transaction
         type: "OUT",
         value: (0, import_bignumber272.default)(tx.out_msgs[0].value ?? 0),
         fee: (0, import_bignumber272.default)(tx.total_fees),
@@ -804935,7 +804938,7 @@ function mapTxToOps5(accountId2, addr, addressBook) {
     return ops;
   };
 }
-function mapJettonTxToOps(accountId2, addr, addressBook) {
+function mapJettonTxToOps(accountId2, addr, addressBook, jettonTxMessageHashesMap2) {
   return (tx) => {
     const accountAddr = import_core19.Address.parse(addr).toString({ urlSafe: true, bounceable: false });
     if (accountAddr !== addr)
@@ -804981,8 +804984,9 @@ function mapJettonTxToOps(accountId2, addr, addressBook) {
       });
     }
     if (isSending) {
+      const hash_message = jettonTxMessageHashesMap2 ? jettonTxMessageHashesMap2.get(hash12) ?? hash12 : hash12;
       ops.push({
-        id: encodeOperationId(tokenAccountId, hash12, "OUT"),
+        id: encodeOperationId(tokenAccountId, hash_message, "OUT"),
         hash: hash12,
         type: "OUT",
         value: (0, import_bignumber272.default)(tx.amount),
@@ -805064,6 +805068,7 @@ function getSyncHash2(currency24, blacklistedList) {
 }
 
 // ../../libs/coin-modules/coin-ton/lib-es/synchronisation.js
+var jettonTxMessageHashesMap = /* @__PURE__ */ new Map();
 var getAccountShape17 = async (info6, { blacklistedTokenIds }) => {
   const { address: address4, rest, currency: currency24, derivationMode, initialAccount } = info6;
   const publicKey3 = reconciliatePubkey(rest?.publicKey, initialAccount);
@@ -805103,8 +805108,22 @@ var getAccountShape17 = async (info6, { blacklistedTokenIds }) => {
       }
     }
   }
+  for (const tx of newJettonTxs) {
+    const hash12 = tx.transaction_hash;
+    try {
+      if (!jettonTxMessageHashesMap.has(hash12)) {
+        const res = await fetchAdjacentTransactions(hash12);
+        const hash_message = res.transactions.at(0)?.in_msg?.hash;
+        if (hash_message) {
+          jettonTxMessageHashesMap.set(hash12, hash_message);
+        }
+      }
+    } catch (error) {
+      console.error(`Error processing ton jetton hash ${hash12}:`, error);
+    }
+  }
   const newOps = (0, import_flatMap19.default)(newTxs.transactions, mapTxToOps5(accountId2, address4, newTxs.address_book));
-  const newJettonOps = (0, import_flatMap19.default)(newJettonTxs, mapJettonTxToOps(accountId2, address4, newTxs.address_book));
+  const newJettonOps = (0, import_flatMap19.default)(newJettonTxs, mapJettonTxToOps(accountId2, address4, newTxs.address_book, jettonTxMessageHashesMap));
   const operations = shouldSyncFromScratch ? newOps : mergeOps(oldOps, newOps);
   const subAccounts = await getSubAccounts3(info6, accountId2, newJettonOps, blacklistedTokenIds, shouldSyncFromScratch);
   const toReturn = {
@@ -805145,7 +805164,7 @@ var getSubAccountShape3 = async (info6, parentId, token, ops, shouldSyncFromScra
     creationDate: operations.length > 0 ? operations[operations.length - 1].date : /* @__PURE__ */ new Date(),
     balanceHistoryCache: emptyHistoryCache,
     // calculated in the jsHelpers
-    swapHistory: [],
+    swapHistory: maybeExistingSubAccount ? maybeExistingSubAccount.swapHistory : [],
     jettonWallet
     // Address of the jetton wallet contract that holds the token balance and handles transfers
   };

package/package.json

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