@ledgerhq/live-cli 24.29.0-nightly.20251127103328 → 24.29.0-nightly.20251128023740

package/lib/cli.js

@@ -536952,15 +536952,19 @@ var require_picomatch2 = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/micromatch@4.0.7/node_modules/micromatch/index.js
+// ../../node_modules/.pnpm/micromatch@4.0.8/node_modules/micromatch/index.js
 var require_micromatch = __commonJS({
-  "../../node_modules/.pnpm/micromatch@4.0.7/node_modules/micromatch/index.js"(exports2, module2) {
+  "../../node_modules/.pnpm/micromatch@4.0.8/node_modules/micromatch/index.js"(exports2, module2) {
     "use strict";
     var util10 = require("util");
     var braces = require_braces();
     var picomatch = require_picomatch2();
     var utils6 = require_utils50();
-    var isEmptyString = (val) => val === "" || val === "./";
+    var isEmptyString = (v64) => v64 === "" || v64 === "./";
+    var hasBraces = (v64) => {
+      const index = v64.indexOf("{");
+      return index > -1 && v64.indexOf("}", index) > -1;
+    };
     var micromatch = (list2, patterns, options24) => {
       patterns = [].concat(patterns);
       list2 = [].concat(list2);
@@ -537100,7 +537104,7 @@ var require_micromatch = __commonJS({
     micromatch.braces = (pattern, options24) => {
       if (typeof pattern !== "string")
         throw new TypeError("Expected a string");
-      if (options24 && options24.nobrace === true || !/\{.*\}/.test(pattern)) {
+      if (options24 && options24.nobrace === true || !hasBraces(pattern)) {
         return [pattern];
       }
       return braces(pattern, options24);
@@ -537110,6 +537114,7 @@ var require_micromatch = __commonJS({
         throw new TypeError("Expected a string");
       return micromatch.braces(pattern, { ...options24, expand: true });
     };
+    micromatch.hasBraces = hasBraces;
     module2.exports = micromatch;
   }
 });
@@ -543581,7 +543586,7 @@ var require_package8 = __commonJS({
     module2.exports = {
       name: "@ledgerhq/live-common",
       description: "Common ground for the Ledger Live apps",
-      version: "34.54.0-nightly.20251127103328",
+      version: "34.54.0-nightly.20251128023740",
       repository: {
         type: "git",
         url: "https://github.com/LedgerHQ/ledger-live.git"
@@ -543934,7 +543939,7 @@ var require_package9 = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@ledgerhq/live-cli",
-      version: "24.29.0-nightly.20251127103328",
+      version: "24.29.0-nightly.20251128023740",
       description: "ledger-live CLI version",
       repository: {
         type: "git",
@@ -589064,9 +589069,8 @@ var getMaxSendBalance = (account3, parentAccount, gas, gasPrice) => {
   gas = gas ?? (0, import_bignumber58.default)(DEFAULT_GAS);
   gasPrice = gasPrice ?? (0, import_bignumber58.default)(DEFAULT_GAS_PRICE);
   const totalGas = gas.multipliedBy(gasPrice);
-  return parentAccount ? getMaxSendBalanceFromTokenAccount(account3, totalGas) : getMaxSendBalanceFromAccount(account3, totalGas);
+  return parentAccount ? account3.spendableBalance : getMaxSendBalanceFromAccount(account3, totalGas);
 };
-var getMaxSendBalanceFromTokenAccount = (tokenAccount, totalGas) => tokenAccount.spendableBalance.gt(totalGas) ? tokenAccount.spendableBalance.minus(totalGas) : new import_bignumber58.default(0);
 var getMaxSendBalanceFromAccount = (account3, totalGas) => account3.spendableBalance.gt(totalGas) ? account3.spendableBalance.minus(totalGas) : new import_bignumber58.default(0);
 var getBlankOperation = (tx, id5) => ({
   id: "",
@@ -602142,7 +602146,6 @@ var AptosAPI = class {
     return {
       value: BigInt(expectedGas.toString()),
       parameters: {
-        storageLimit: BigInt(0),
         gasLimit: BigInt(gasLimit.toString()),
         gasPrice: BigInt(gasPrice.toString())
       }
@@ -602385,17 +602388,12 @@ var getFee = async (account3, transaction, aptosClient2) => {
   };
   let gasLimit = DEFAULT_GAS;
   let gasPrice = DEFAULT_GAS_PRICE;
-  transaction.options = {
-    maxGasAmount: gasLimit.toString(),
-    gasUnitPrice: gasPrice.toString()
-  };
   if (account3.xpub) {
     try {
       const publicKeyEd = new f5(account3.xpub);
       const tx = await buildTransaction_default(account3, transaction, aptosClient2);
       const [completedTx] = await aptosClient2.simulateTransaction(publicKeyEd, tx);
-      const gasMultiplier = STAKING_TX_MODES.includes(transaction.mode) ? ESTIMATE_GAS_MUL_FOR_STAKING : ESTIMATE_GAS_MUL;
-      gasLimit = new import_bignumber62.default(completedTx.gas_used).multipliedBy(gasMultiplier).integerValue();
+      gasLimit = new import_bignumber62.default(completedTx.gas_used).multipliedBy(getGasMultiplier(transaction)).integerValue();
       gasPrice = new import_bignumber62.default(completedTx.gas_unit_price);
       const expectedGas = gasPrice.multipliedBy(gasLimit);
       if (!completedTx.success) {
@@ -602408,6 +602406,10 @@ var getFee = async (account3, transaction, aptosClient2) => {
       res.fees = expectedGas;
       res.estimate.maxGasAmount = gasLimit.toString();
       res.estimate.gasUnitPrice = completedTx.gas_unit_price;
+      transaction.options = {
+        maxGasAmount: gasLimit.toString(),
+        gasUnitPrice: completedTx.gas_unit_price
+      };
     } catch (error) {
       log2(error.message);
       throw error;
@@ -602422,6 +602424,9 @@ var CACHE = makeLRUCache(getFee, (account3, transaction) => {
 var getEstimatedGas = async (account3, transaction, aptosClient2) => {
   return await CACHE(account3, transaction, aptosClient2);
 };
+var getGasMultiplier = (transaction) => {
+  return STAKING_TX_MODES.includes(transaction.mode) ? ESTIMATE_GAS_MUL_FOR_STAKING : ESTIMATE_GAS_MUL;
+};
 
 // ../../libs/coin-modules/coin-aptos/lib-es/bridge/estimateMaxSpendable.js
 var estimateMaxSpendable2 = async ({ account: account3, parentAccount, transaction }) => {
@@ -602430,7 +602435,8 @@ var estimateMaxSpendable2 = async ({ account: account3, parentAccount, transacti
   let maxGasAmount = new import_bignumber63.BigNumber(DEFAULT_GAS);
   let gasUnitPrice = new import_bignumber63.BigNumber(DEFAULT_GAS_PRICE);
   if (transaction) {
-    const { estimate: estimate5 } = await getEstimatedGas(mainAccount, transaction, aptosClient2);
+    const amount = transaction.amount.isZero() ? account3.spendableBalance : transaction.amount;
+    const { estimate: estimate5 } = await getEstimatedGas(mainAccount, { ...transaction, amount }, aptosClient2);
     maxGasAmount = (0, import_bignumber63.BigNumber)(estimate5.maxGasAmount);
     gasUnitPrice = (0, import_bignumber63.BigNumber)(estimate5.gasUnitPrice);
   }
@@ -602470,16 +602476,19 @@ var prepareTransaction2 = async (account3, transaction) => {
   }
   const aptosClient2 = new AptosAPI(account3.currency.id);
   const tokenAccount = findSubAccountById(account3, transaction?.subAccountId ?? "");
+  const { fees: fees2, estimate: estimate5, errors: errors2 } = await getEstimatedGas(account3, transaction, aptosClient2);
+  const gas = (0, import_bignumber64.default)(estimate5.maxGasAmount);
+  const gasPrice = (0, import_bignumber64.default)(estimate5.gasUnitPrice);
   if (transaction.useAllAmount) {
+    const maxAmount = tokenAccount ? getMaxSendBalance(tokenAccount, account3, gas, gasPrice) : getMaxSendBalance(account3, void 0, gas, gasPrice);
     if (transaction.mode === "send") {
-      transaction.amount = getMaxSendBalance(tokenAccount || account3, account3);
+      transaction.amount = maxAmount;
     } else if (transaction.mode === "restake" || transaction.mode === "unstake" || transaction.mode === "withdraw") {
       transaction.amount = getDelegationOpMaxAmount(account3, transaction.recipient, transaction.mode);
     } else if (transaction.mode === "stake") {
-      transaction.amount = getMaxSendBalance(tokenAccount || account3, account3).minus(APTOS_DELEGATION_RESERVE_IN_OCTAS);
+      transaction.amount = maxAmount.minus(APTOS_DELEGATION_RESERVE_IN_OCTAS);
     }
   }
-  const { fees: fees2, estimate: estimate5, errors: errors2 } = await getEstimatedGas(account3, transaction, aptosClient2);
   transaction.fees = fees2;
   transaction.options = estimate5;
   transaction.errors = errors2;
@@ -615776,7 +615785,11 @@ function makeGetAccountShape3(signerContext4) {
     const balances = xpubOrAddress ? await getBalance2(currency24, xpubOrAddress) : [];
     const pendingTransferProposals = xpubOrAddress ? await getPendingTransferProposals(currency24, xpubOrAddress) : [];
     const balancesData = (balances || []).reduce((acc, balance2) => {
-      acc[balance2.instrumentId] = balance2;
+      if (balance2.locked) {
+        acc[`Locked${balance2.instrumentId}`] = balance2;
+      } else {
+        acc[balance2.instrumentId] = balance2;
+      }
       return acc;
     }, {});
     const unlockedAmount = new import_bignumber118.default(balancesData[nativeInstrumentId]?.value.toString() || "0");
@@ -853677,6 +853690,7 @@ function getMemorySpeculosDeviceInternal(id5) {
 var modelMap = {
   stax: DeviceModelId.stax,
   flex: DeviceModelId.europa,
+  apex_p: DeviceModelId.apex,
   nanos: DeviceModelId.nanoS,
   "nanos+": DeviceModelId.nanoSP,
   nanox: DeviceModelId.nanoX,
@@ -853686,6 +853700,16 @@ var reverseModelMap = {};
 for (const k26 in modelMap) {
   reverseModelMap[modelMap[k26]] = k26;
 }
+var getSpeculosModel = (model) => {
+  switch (model) {
+    case DeviceModelId.europa:
+      return "flex";
+    case DeviceModelId.apex:
+      return "apex_p";
+    default:
+      return model.toLowerCase();
+  }
+};
 async function releaseSpeculosDevice(id5) {
   log2("speculos", "release " + id5);
   const obj2 = data5[id5];
@@ -853763,7 +853787,7 @@ async function createSpeculosDevice(arg, maxRetry = 3) {
     `${speculosID}`,
     process.env.SPECULOS_IMAGE_TAG ?? "ghcr.io/ledgerhq/speculos:sha-e262a0c",
     "--model",
-    model.toLowerCase() === "europa" ? "flex" : model.toLowerCase(),
+    getSpeculosModel(model),
     appPath,
     ...dependency ? [
       "-l",
@@ -853898,6 +853922,7 @@ async function createSpeculosDevice(arg, maxRetry = 3) {
 
 // ../../libs/ledger-live-common/lib-es/load/speculos.js
 var modelMapPriority = {
+  apex_p: 7,
   flex: 6,
   stax: 5,
   nanos: 4,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/live-cli",
-  "version": "24.29.0-nightly.20251127103328",
+  "version": "24.29.0-nightly.20251128023740",
   "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.90.0-nightly.20251127103328"
+    "@ledgerhq/types-live": "^6.90.0-nightly.20251128023740"
   },
   "publishConfig": {
     "directory": "dist"