@ledgerhq/live-cli 24.28.0-nightly.20251120135143 → 24.28.0-nightly.20251121023744

package/lib/cli.js

@@ -520455,7 +520455,7 @@ var require_package7 = __commonJS({
     module2.exports = {
       name: "@ledgerhq/live-common",
       description: "Common ground for the Ledger Live apps",
-      version: "34.53.0-nightly.20251120135143",
+      version: "34.53.0-nightly.20251121023744",
       repository: {
         type: "git",
         url: "https://github.com/LedgerHQ/ledger-live.git"
@@ -520808,7 +520808,7 @@ var require_package8 = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@ledgerhq/live-cli",
-      version: "24.28.0-nightly.20251120135143",
+      version: "24.28.0-nightly.20251121023744",
       description: "ledger-live CLI version",
       repository: {
         type: "git",
@@ -592807,6 +592807,55 @@ var handleDeviceErrors = (error) => {
   return null;
 };
 
+// ../../libs/coin-modules/coin-canton/lib-es/bridge/serialization.js
+function isCantonAccount(account3) {
+  return "cantonResources" in account3;
+}
+function isCantonAccountRaw(accountRaw) {
+  return "cantonResources" in accountRaw;
+}
+function toResourcesRaw2(r49) {
+  const { instrumentUtxoCounts, pendingTransferProposals } = r49;
+  return {
+    instrumentUtxoCounts,
+    pendingTransferProposals
+  };
+}
+function fromResourcesRaw2(r49) {
+  return {
+    instrumentUtxoCounts: r49.instrumentUtxoCounts,
+    pendingTransferProposals: r49.pendingTransferProposals
+  };
+}
+function assignToAccountRaw5(account3, accountRaw) {
+  if (isCantonAccount(account3) && isCantonAccountRaw(accountRaw)) {
+    if (account3.cantonResources) {
+      accountRaw.cantonResources = toResourcesRaw2(account3.cantonResources);
+    }
+  }
+}
+function assignFromAccountRaw5(accountRaw, account3) {
+  if (isCantonAccountRaw(accountRaw) && isCantonAccount(account3)) {
+    if (accountRaw.cantonResources) {
+      account3.cantonResources = fromResourcesRaw2(accountRaw.cantonResources);
+    }
+  }
+}
+
+// ../../libs/coin-modules/coin-canton/lib-es/helpers.js
+function isCantonAccountEmpty(account3) {
+  return account3.operationsCount === 0 && account3.balance.isZero() && !account3.subAccounts?.length && !account3.cantonResources?.pendingTransferProposals?.length;
+}
+function isAccountEmpty2(account3) {
+  if (account3.type !== "Account") {
+    return false;
+  }
+  if (!isCantonAccount(account3)) {
+    return false;
+  }
+  return isCantonAccountEmpty(account3);
+}
+
 // ../../libs/coin-modules/coin-canton/lib-es/bridge/sync.js
 var txInfoToOperationAdapter = (accountId2, partyId) => (txInfo) => {
   const { transaction_hash, uid, block: { height, hash: hash10 }, senders, recipients, transaction_timestamp, fee: { value: fee }, transfers: [{ value: transferValue, details }] } = txInfo;
@@ -592900,8 +592949,15 @@ function makeGetAccountShape3(signerContext4) {
       const newOperations = filterOperations(transactionData.operations, accountId2, xpubOrAddress);
       operations4 = mergeOps(oldOperations, newOperations);
     }
-    const isPreapproved = xpubOrAddress ? await isCantonCoinPreapproved(currency24, xpubOrAddress) : false;
-    const used = isPreapproved && totalBalance.gt(0);
+    const used = !isCantonAccountEmpty({
+      operationsCount: operations4.length,
+      balance: totalBalance,
+      subAccounts: initialAccount?.subAccounts ?? [],
+      cantonResources: {
+        instrumentUtxoCounts,
+        pendingTransferProposals
+      }
+    });
     const blockHeight = await getLedgerEnd(currency24);
     const creationDate = operations4.length > 0 ? new Date(Math.min(...operations4.map((op) => op.date.getTime()))) : /* @__PURE__ */ new Date();
     const shape = {
@@ -592940,41 +592996,6 @@ var buildTransferInstruction = (signerContext4) => async (currency24, deviceId,
   await submitTransferInstruction(currency24, partyId, preparedTransaction.serialized, signature5);
 };
 
-// ../../libs/coin-modules/coin-canton/lib-es/bridge/serialization.js
-function isCantonAccount(account3) {
-  return "cantonResources" in account3;
-}
-function isCantonAccountRaw(accountRaw) {
-  return "cantonResources" in accountRaw;
-}
-function toResourcesRaw2(r49) {
-  const { instrumentUtxoCounts, pendingTransferProposals } = r49;
-  return {
-    instrumentUtxoCounts,
-    pendingTransferProposals
-  };
-}
-function fromResourcesRaw2(r49) {
-  return {
-    instrumentUtxoCounts: r49.instrumentUtxoCounts,
-    pendingTransferProposals: r49.pendingTransferProposals
-  };
-}
-function assignToAccountRaw5(account3, accountRaw) {
-  if (isCantonAccount(account3) && isCantonAccountRaw(accountRaw)) {
-    if (account3.cantonResources) {
-      accountRaw.cantonResources = toResourcesRaw2(account3.cantonResources);
-    }
-  }
-}
-function assignFromAccountRaw5(accountRaw, account3) {
-  if (isCantonAccountRaw(accountRaw) && isCantonAccount(account3)) {
-    if (accountRaw.cantonResources) {
-      account3.cantonResources = fromResourcesRaw2(accountRaw.cantonResources);
-    }
-  }
-}
-
 // ../../libs/coin-modules/coin-canton/lib-es/bridge/index.js
 function createBridges6(signerContext4, coinConfig19) {
   config_default3.setCoinConfig(coinConfig19);
@@ -627066,7 +627087,7 @@ var getMainMessage = (messages) => {
   const sortedTypes = messages.filter((m111) => messagePriorities.includes(m111.type)).sort((a107, b23) => messagePriorities.indexOf(a107.type) - messagePriorities.indexOf(b23.type));
   return sortedTypes[0];
 };
-function isAccountEmpty2({ cosmosResources, balance: balance2 }) {
+function isAccountEmpty3({ cosmosResources, balance: balance2 }) {
   return cosmosResources.sequence === 0 && balance2.isZero();
 }
 
@@ -627119,7 +627140,7 @@ var getAccountShape6 = async (info6) => {
     operationsCount: operations4.length,
     blockHeight,
     cosmosResources,
-    used: !isAccountEmpty2({ balance: balance2, cosmosResources })
+    used: !isAccountEmpty3({ balance: balance2, cosmosResources })
   };
   if (shape.spendableBalance && shape.spendableBalance.lt(0)) {
     shape.spendableBalance = new import_bignumber158.BigNumber(0);
@@ -628393,7 +628414,6 @@ function toOperation(asset, op) {
     },
     details: {
       sequence: op.transactionSequenceNumber,
-      status: op.hasFailed ? "failed" : "success",
       ...asset.type === "token" ? {
         ledgerOpType: op.type,
         assetAmount: op.value.toFixed(0),
@@ -780764,7 +780784,7 @@ async function getTronResources2(acc, txs, cacheTransactionInfoById = {}) {
     cacheTransactionInfoById
   };
 }
-function isAccountEmpty3({ tronResources }) {
+function isAccountEmpty4({ tronResources }) {
   return tronResources.bandwidth.freeLimit.eq(0);
 }
 
@@ -781693,7 +781713,7 @@ var getAccountShape17 = async ({ initialAccount, currency: currency24, address:
     subAccounts: mergedSubAccounts,
     tronResources,
     blockHeight,
-    used: !isAccountEmpty3({ tronResources })
+    used: !isAccountEmpty4({ tronResources })
   };
 };
 var postSync5 = (initial, parent) => {
@@ -789466,7 +789486,7 @@ var estimateGas = async (clauses, origin3) => {
 };
 
 // ../../libs/coin-modules/coin-vechain/lib-es/common-logic/calculateGasFees.js
-var calculateGasFees = async (transaction, isTokenAccount2) => {
+var calculateGasFees = async (transaction, isTokenAccount2, originAddress) => {
   if (transaction.recipient && parseAddress(transaction.recipient)) {
     let clauses;
     if (isTokenAccount2) {
@@ -789474,7 +789494,7 @@ var calculateGasFees = async (transaction, isTokenAccount2) => {
     } else {
       clauses = await calculateClausesVet(transaction.recipient, transaction.amount);
     }
-    const gasEstimation = await estimateGas(clauses, transaction.recipient);
+    const gasEstimation = await estimateGas(clauses, originAddress);
     const thorClient = getThorClient();
     const body = await thorClient.transactions.buildTransactionBody(clauses, gasEstimation.totalGas, {});
     return {
@@ -789493,12 +789513,13 @@ var calculateGasFees = async (transaction, isTokenAccount2) => {
 };
 
 // ../../libs/coin-modules/coin-vechain/lib-es/common-logic/calculateTransactionInfo.js
+var getTokenAccount2 = (subAccountId, subAccounts) => subAccountId && subAccounts ? subAccounts.find((subAccount) => {
+  return subAccount.id === subAccountId;
+}) : void 0;
 var calculateTransactionInfo = async (account3, transaction, fixedMaxTokenFees) => {
   const { subAccounts } = account3;
   const { amount: oldAmount, subAccountId, useAllAmount } = transaction;
-  const tokenAccount = subAccountId && subAccounts ? subAccounts.find((subAccount) => {
-    return subAccount.id === subAccountId;
-  }) : void 0;
+  const tokenAccount = getTokenAccount2(subAccountId, subAccounts);
   const isTokenAccount2 = !!tokenAccount;
   let amount = oldAmount;
   let amountBackup;
@@ -789514,7 +789535,7 @@ var calculateTransactionInfo = async (account3, transaction, fixedMaxTokenFees)
     let iterations = 0;
     do {
       amountBackup = amount;
-      const estimatedGasAndFees = fixedMaxTokenFees || await calculateGasFees(tempTransaction, isTokenAccount2);
+      const estimatedGasAndFees = fixedMaxTokenFees || await calculateGasFees(tempTransaction, isTokenAccount2, account3.freshAddress);
       maxEstimatedGasFees = estimatedGasAndFees.estimatedGasFees;
       maxEstimatedGas = estimatedGasAndFees.estimatedGas;
       maxFeePerGas = estimatedGasAndFees.maxFeePerGas;
@@ -789611,14 +789632,22 @@ var getTransactionStatus22 = async (account3, transaction) => {
 
 // ../../libs/coin-modules/coin-vechain/lib-es/bridge/estimateMaxSpendable.js
 var import_bignumber303 = __toESM(require("bignumber.js"));
-var estimateMaxSpendable22 = async ({ account: account3, transaction }) => {
+var PATTERN_ADDRESS_IN_TOKEN_ACCOUNT_ID = /:(0x\w+):/;
+var getAddressFromTokenAccountId = (tokenAccountId) => PATTERN_ADDRESS_IN_TOKEN_ACCOUNT_ID.exec(tokenAccountId)?.[1];
+var estimateMaxSpendable22 = async ({ account: account3, parentAccount, transaction }) => {
   if (account3.type === "Account" || !transaction) {
     return account3.balance;
   }
-  const { estimatedGasFees: maxTokenFees } = await calculateGasFees(transaction, true);
-  const spendable = account3.balance.minus(maxTokenFees);
-  if (spendable.gt(0))
-    return account3.balance.minus(maxTokenFees);
+  if (account3.type === "TokenAccount") {
+    const originAddress = parentAccount?.freshAddress || getAddressFromTokenAccountId(account3.id);
+    if (originAddress) {
+      const { estimatedGasFees: maxTokenFees } = await calculateGasFees(transaction, true, originAddress);
+      const spendable = account3.balance.minus(maxTokenFees);
+      if (spendable.gt(0)) {
+        return spendable;
+      }
+    }
+  }
   return new import_bignumber303.default(0);
 };
 
@@ -789680,7 +789709,7 @@ var import_bignumber305 = require("bignumber.js");
 var import_eip558 = __toESM(require_eip55());
 
 // ../../libs/coin-modules/coin-vechain/lib-es/bridge/helpers.js
-function isAccountEmpty4(account3) {
+function isAccountEmpty5(account3) {
   const checkSubAccounts = account3.subAccounts && !account3.subAccounts[0].balance.isZero();
   return account3.operationsCount === 0 && account3.balance.isZero() && !checkSubAccounts;
 }
@@ -789745,7 +789774,7 @@ var getAccountShape18 = async (info6) => {
   };
   return {
     ...shape,
-    used: !isAccountEmpty4(shape)
+    used: !isAccountEmpty5(shape)
   };
 };
 
@@ -809742,8 +809771,7 @@ var convertToCoreOperation2 = (operation) => {
       sequence: operation.transactionSequenceNumber?.toString(),
       ledgerOpType: operation.extra.ledgerOpType,
       assetAmount: operation.extra.assetAmount ? operation.extra.assetAmount : operation.value.toString(),
-      memo: operation.extra.memo,
-      status: operation.hasFailed ? "failed" : "success"
+      memo: operation.extra.memo
     },
     type: operation.type,
     value: BigInt(operation.value.toString()),
@@ -830059,7 +830087,6 @@ function convertOperation(address3, operation) {
       counter: operation.counter,
       gasLimit: operation.gasLimit,
       storageLimit: operation.storageLimit,
-      status: hasFailed ? "failed" : operation.status,
       ledgerOpType: getLedgerOpType(operation, normalizedType)
     }
   };
@@ -830669,7 +830696,7 @@ function adaptCoreOperationToLiveOperation(accountId2, op) {
     extra.memo = op.details.memo;
   }
   const bnFees = new import_bignumber360.default(op.tx.fees.toString());
-  const hasFailed = op.details?.status === "failed";
+  const hasFailed = op.tx.failed;
   let value2;
   if (hasFailed) {
     value2 = bnFees;
@@ -831853,16 +831880,19 @@ function formatOperation2(account3) {
 }
 
 // ../../libs/ledger-live-common/lib-es/account/helpers.js
-var isAccountEmpty5 = (a107) => {
+var isAccountEmpty6 = (a107) => {
   if (a107.type === "Account") {
     if (isCosmosAccount(a107)) {
-      return isAccountEmpty2(a107);
+      return isAccountEmpty3(a107);
     }
     if (isTronAccount(a107)) {
-      return isAccountEmpty3(a107);
+      return isAccountEmpty4(a107);
     }
     if (a107.currency.family == "vechain") {
-      return isAccountEmpty4(a107);
+      return isAccountEmpty5(a107);
+    }
+    if (a107.currency.family == "canton") {
+      return isAccountEmpty2(a107);
     }
   }
   return isAccountEmpty(a107);
@@ -853480,7 +853510,7 @@ Please increase the account target to at least ${spec2.mutations.length + 1} acc
     reportLog(`Spec ${spec2.name} found ${accounts2.length} ${currency24.name} accounts${preloadStats}. Will use ${formatAppCandidate(appCandidate)}
 ${accounts2.map((a107) => formatAccount(a107, "head")).join("\n")}
 `);
-    if (accounts2.every(isAccountEmpty5)) {
+    if (accounts2.every(isAccountEmpty6)) {
       reportLog(`This SEED does not have ${currency24.name}. Please send funds to ${accounts2.map((a107) => a107.freshAddress).join(" or ")}
 `);
       appReport.accountsAfter = accounts2;
@@ -854715,7 +854745,7 @@ async function bot({ disabled, filter: filter27 } = {}) {
     console.error(`/!\\ ${errorCases.length} failures out of ${mutationReports.length} mutations. Check above!
 `);
   }
-  const specsWithoutFunds = results2.filter((s104) => !s104.fatalError && (s104.accountsBefore && s104.accountsBefore.every(isAccountEmpty5) || s104.mutations && s104.mutations.every((r49) => !r49.mutation)));
+  const specsWithoutFunds = results2.filter((s104) => !s104.fatalError && (s104.accountsBefore && s104.accountsBefore.every(isAccountEmpty6) || s104.mutations && s104.mutations.every((r49) => !r49.mutation)));
   const fullySuccessfulSpecs = results2.filter((s104) => !s104.fatalError && s104.mutations && !specsWithoutFunds.includes(s104) && s104.mutations.every((r49) => !r49.mutation || r49.operation));
   const specsWithErrors = results2.filter((s104) => !s104.fatalError && s104.mutations && !specsWithoutFunds.includes(s104) && s104.mutations.some((r49) => r49.error || r49.mutation && !r49.operation));
   const specsWithoutOperations = results2.filter((s104) => !s104.fatalError && !specsWithoutFunds.includes(s104) && !specsWithErrors.includes(s104) && s104.mutations && s104.mutations.every((r49) => !r49.operation));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/live-cli",
-  "version": "24.28.0-nightly.20251120135143",
+  "version": "24.28.0-nightly.20251121023744",
   "description": "ledger-live CLI version",
   "repository": {
     "type": "git",
@@ -59,7 +59,7 @@
     "tsup": "7.3.0",
     "yaml": "2.8.1",
     "@ledgerhq/types-cryptoassets": "^7.30.0",
-    "@ledgerhq/types-live": "^6.89.0-nightly.20251120135143"
+    "@ledgerhq/types-live": "^6.89.0-nightly.20251121023744"
   },
   "publishConfig": {
     "directory": "dist"