@ledgerhq/live-cli 24.18.4-nightly.0 → 24.18.4-nightly.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-nightly.0",
+      version: "34.35.0-nightly.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-nightly.0",
+      version: "24.18.4-nightly.1",
       description: "ledger-live CLI version",
       repository: {
         type: "git",
@@ -581498,8 +581498,6 @@ var import_bignumber53 = __toESM(require("bignumber.js"));
 
 // ../../libs/coin-modules/coin-aptos/lib-es/constants.js
 var import_bignumber52 = __toESM(require("bignumber.js"));
-var DEFAULT_GAS = new import_bignumber52.default(200);
-var DEFAULT_GAS_PRICE = new import_bignumber52.default(100);
 var ESTIMATE_GAS_MUL = new import_bignumber52.default(1);
 var TX_STATUS;
 (function(TX_STATUS2) {
@@ -581532,6 +581530,8 @@ var DIRECTION;
   DIRECTION2["UNKNOWN"] = "UNKNOWN";
 })(DIRECTION || (DIRECTION = {}));
 var SUPPORTED_TOKEN_TYPES = ["coin", "fungible_asset"];
+var DEFAULT_GAS = new import_bignumber52.default(200);
+var DEFAULT_GAS_PRICE = new import_bignumber52.default(100);
 
 // ../../libs/coin-modules/coin-aptos/lib-es/bridge/logic.js
 var CLEAN_HEX_REGEXP = /^0x0*|^0+/;
@@ -581544,13 +581544,6 @@ var getMaxSendBalance = (gas, gasPrice, account3, transaction) => {
   const totalGas = gas.multipliedBy(gasPrice);
   return fromTokenAccount ? tokenAccount.spendableBalance : account3.spendableBalance.gt(totalGas) ? account3.spendableBalance.minus(totalGas) : new import_bignumber53.default(0);
 };
-function normalizeTransactionOptions(options22) {
-  const check3 = (v37) => (v37 ?? "").toString().trim() ? v37 : void 0;
-  return {
-    maxGasAmount: check3(options22.maxGasAmount),
-    gasUnitPrice: check3(options22.gasUnitPrice)
-  };
-}
 var getBlankOperation = (tx, id5) => ({
   id: "",
   hash: tx.hash,
@@ -581794,6 +581787,15 @@ var getTransactionStatus_default = getTransactionStatus2;
 // ../../libs/coin-modules/coin-aptos/lib-es/bridge/estimateMaxSpendable.js
 var import_bignumber57 = require("bignumber.js");
 
+// ../../libs/coin-modules/coin-aptos/lib-es/logic/combine.js
+function combineSignedTransaction(txRaw, signature3, pubkey) {
+  const authenticator = new u12(pubkey, signature3);
+  return wn({
+    transaction: { rawTransaction: txRaw },
+    senderAuthenticator: authenticator
+  });
+}
+
 // ../../node_modules/.pnpm/@apollo+client@3.12.6_graphql@16.10.0_react@18.3.1/node_modules/@apollo/client/core/ApolloClient.js
 init_tslib_es6();
 
@@ -594541,15 +594543,14 @@ var AptosAPI = class {
       options: options22
     });
   }
-  async broadcast(signature3) {
-    const txBytes = Uint8Array.from(Buffer.from(signature3, "hex"));
-    const pendingTx = await o5({
-      contentType: g7.BCS_SIGNED_TRANSACTION,
+  async broadcast(tx) {
+    const txBytes = a.fromHexString(tx).toUint8Array();
+    const pendingTx = await q2({
       aptosConfig: this.aptosClient.config,
       body: txBytes,
       path: "transactions",
-      type: t17.FULLNODE,
-      originMethod: ""
+      originMethod: "",
+      contentType: g7.BCS_SIGNED_TRANSACTION
     });
     return pendingTx.data.hash;
   }
@@ -594699,20 +594700,25 @@ async function signTransaction2(signerContext3, account3, deviceId, rawTxn) {
     rawTransaction: rawTxn
   });
   const response = await signerContext3(deviceId, async (signer) => await signer.signTransaction(derivationPath, Buffer.from(signingMessage)));
-  const sigHexStr = a.fromHexString(response.signature.toString("hex"));
-  const signature3 = new h9(sigHexStr.toUint8Array());
-  const authenticator = new u12(new f6(publicKey3.toString("hex")), signature3);
-  return wn({
-    transaction: { rawTransaction: rawTxn },
-    senderAuthenticator: authenticator
-  });
+  const signature3 = new h9(response.signature.toString("hex"));
+  const pubkey = new f6(publicKey3.toString("hex"));
+  return combineSignedTransaction(rawTxn, signature3, pubkey);
 }
 
 // ../../libs/coin-modules/coin-aptos/lib-es/bridge/getFeesForTransaction.js
 init_lib_es2();
 var import_bignumber56 = __toESM(require("bignumber.js"));
 
-// ../../libs/coin-modules/coin-aptos/lib-es/bridge/buildTransaction.js
+// ../../libs/coin-modules/coin-aptos/lib-es/logic/normalizeTransactionOptions.js
+function normalizeTransactionOptions(options22) {
+  const check3 = (v37) => (v37 ?? "").toString().trim() ? v37 : void 0;
+  return {
+    maxGasAmount: check3(options22.maxGasAmount),
+    gasUnitPrice: check3(options22.gasUnitPrice)
+  };
+}
+
+// ../../libs/coin-modules/coin-aptos/lib-es/logic/buildTransaction.js
 var buildTransaction = async (account3, transaction, aptosClient2) => {
   const subAccount = findSubAccountById(account3, transaction.subAccountId ?? "");
   const txPayload = getPayload(subAccount, transaction);
@@ -594845,21 +594851,6 @@ var prepareTransaction2 = async (account3, transaction) => {
 };
 var prepareTransaction_default = prepareTransaction2;
 
-// ../../libs/coin-modules/coin-aptos/lib-es/bridge/createTransaction.js
-var import_bignumber59 = __toESM(require("bignumber.js"));
-var createTransaction2 = () => ({
-  family: "aptos",
-  mode: "send",
-  amount: (0, import_bignumber59.default)(0),
-  recipient: "",
-  useAllAmount: false,
-  options: {
-    maxGasAmount: DEFAULT_GAS.toString(),
-    gasUnitPrice: DEFAULT_GAS_PRICE.toString()
-  }
-});
-var createTransaction_default2 = createTransaction2;
-
 // ../../libs/coin-modules/coin-aptos/lib-es/bridge/synchronisation.js
 var updatableSubAccountProperties = [
   { name: "balance", isOps: false },
@@ -594981,7 +594972,7 @@ var getAccountShape2 = async (info6) => {
 
 // ../../libs/coin-modules/coin-aptos/lib-es/bridge/signOperation.js
 var import_rxjs10 = require("rxjs");
-var import_bignumber60 = __toESM(require("bignumber.js"));
+var import_bignumber59 = __toESM(require("bignumber.js"));
 var buildSignOperation2 = (signerContext3) => ({ account: account3, transaction, deviceId }) => new import_rxjs10.Observable((o47) => {
   async function main2() {
     o47.next({ type: "device-signature-requested" });
@@ -594993,7 +594984,7 @@ var buildSignOperation2 = (signerContext3) => ({ account: account3, transaction,
     const accountId2 = account3.id;
     const hash12 = "";
     const type4 = "OUT";
-    const fee = transaction.fees || new import_bignumber60.default(0);
+    const fee = transaction.fees || new import_bignumber59.default(0);
     const extra = {};
     const senders = [];
     const recipients = [];
@@ -595050,6 +595041,21 @@ var broadcast3 = async ({ signedOperation, account: account3 }) => {
 };
 var broadcast_default = broadcast3;
 
+// ../../libs/coin-modules/coin-aptos/lib-es/logic/createTransaction.js
+var import_bignumber60 = __toESM(require("bignumber.js"));
+var createTransaction2 = () => ({
+  family: "aptos",
+  mode: "send",
+  amount: (0, import_bignumber60.default)(0),
+  recipient: "",
+  useAllAmount: false,
+  options: {
+    maxGasAmount: DEFAULT_GAS.toString(),
+    gasUnitPrice: DEFAULT_GAS_PRICE.toString()
+  }
+});
+var createTransaction_default2 = createTransaction2;
+
 // ../../libs/coin-modules/coin-aptos/lib-es/bridge/index.js
 function buildCurrencyBridge2(signerContext3) {
   const getAddress12 = signer_default(signerContext3);
@@ -699644,15 +699650,30 @@ async function getAccountsForPublicKey(publicKey3) {
   }
   return accounts2;
 }
+async function getAccountTransactions2(address4, since) {
+  const transactions3 = [];
+  const params = new URLSearchParams({
+    "account.id": address4,
+    order: "desc",
+    limit: "100"
+  });
+  if (since) {
+    params.append("timestamp", `gt:${since}`);
+  }
+  let nextUrl = `/api/v1/transactions?${params.toString()}`;
+  while (nextUrl) {
+    const res = await fetch5(nextUrl);
+    const newTransactions = res.data.transactions;
+    if (newTransactions.length === 0)
+      break;
+    transactions3.push(...newTransactions);
+    nextUrl = res.data.links.next;
+  }
+  return transactions3;
+}
 async function getOperationsForAccount(ledgerAccountId, address4, latestOperationTimestamp) {
+  const rawOperations = await getAccountTransactions2(address4, latestOperationTimestamp);
   const operations = [];
-  let r38 = await fetch5(`/api/v1/transactions?account.id=${address4}&timestamp=gt:${latestOperationTimestamp}`);
-  const rawOperations = r38.data.transactions;
-  while (r38.data.links.next) {
-    r38 = await fetch5(r38.data.links.next);
-    const newOperations = r38.data.transactions;
-    rawOperations.push(...newOperations);
-  }
   for (const raw of rawOperations) {
     const { consensus_timestamp } = raw;
     const timestamp = new Date(parseInt(consensus_timestamp.split(".")[0], 10) * 1e3);
@@ -699727,8 +699748,8 @@ var getAccountShape7 = async (info6) => {
   });
   const accountBalance = await getAccountBalance(address4);
   const oldOperations = initialAccount?.operations ?? [];
-  const latestOperationTimestamp = oldOperations[0] ? Math.floor(oldOperations[0].date.getTime() / 1e3) : 0;
-  const newOperations = await getOperationsForAccount(liveAccountId, address4, new import_bignumber166.BigNumber(latestOperationTimestamp).toString());
+  const latestOperationTimestamp = oldOperations[0] ? new import_bignumber166.BigNumber(Math.floor(oldOperations[0].date.getTime() / 1e3)) : null;
+  const newOperations = await getOperationsForAccount(liveAccountId, address4, latestOperationTimestamp ? latestOperationTimestamp.toString() : null);
   const operations = mergeOps(oldOperations, newOperations);
   return {
     id: liveAccountId,
@@ -804282,6 +804303,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 +804936,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 +804959,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 +805005,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 +805089,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 +805129,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 +805185,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-nightly.0",
+  "version": "24.18.4-nightly.1",
   "description": "ledger-live CLI version",
   "repository": {
     "type": "git",