@ledgerhq/live-cli 24.18.4-nightly.4 → 24.18.4-nightly.6

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.4",
+      version: "34.35.0-nightly.6",
       repository: {
         type: "git",
         url: "https://github.com/LedgerHQ/ledger-live.git"
@@ -537083,7 +537083,7 @@ var require_package9 = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@ledgerhq/live-cli",
-      version: "24.18.4-nightly.4",
+      version: "24.18.4-nightly.6",
       description: "ledger-live CLI version",
       repository: {
         type: "git",
@@ -559660,6 +559660,10 @@ var modes = Object.freeze({
   solanaSub: {
     overridesDerivation: "44'/501'/<account>'"
   },
+  solanaBip44Change: {
+    overridesDerivation: "44'/501'/<account>'/0'",
+    mandatoryEmptyAccountSkip: 10
+  },
   hederaBip44: {
     overridesDerivation: "44/3030"
   },
@@ -559718,7 +559722,7 @@ var legacyDerivations = {
   ton: ["ton"],
   ethereum: ["ethM", "ethMM"],
   ethereum_classic: ["ethM", "ethMM", "etcM"],
-  solana: ["solanaMain", "solanaSub"],
+  solana: ["solanaMain", "solanaBip44Change", "solanaSub"],
   solana_devnet: ["solanaMain", "solanaSub"],
   solana_testnet: ["solanaMain", "solanaSub"],
   sui: ["sui"],
@@ -581541,7 +581545,11 @@ var DIRECTION;
   DIRECTION2["OUT"] = "OUT";
   DIRECTION2["UNKNOWN"] = "UNKNOWN";
 })(DIRECTION || (DIRECTION = {}));
-var SUPPORTED_TOKEN_TYPES = ["coin", "fungible_asset"];
+var TOKEN_TYPE;
+(function(TOKEN_TYPE2) {
+  TOKEN_TYPE2["COIN"] = "coin";
+  TOKEN_TYPE2["FUNGIBLE_ASSET"] = "fungible_asset";
+})(TOKEN_TYPE || (TOKEN_TYPE = {}));
 var DEFAULT_GAS = new import_bignumber52.default(200);
 var DEFAULT_GAS_PRICE = new import_bignumber52.default(100);
 
@@ -581722,7 +581730,7 @@ var detectType = (address4, tx, value5) => {
   return type4;
 };
 function transactionsToOperations(address4, txs) {
-  const operations = [[], []];
+  const operations = [];
   return txs.reduce((acc, tx) => {
     if (tx === null) {
       return acc;
@@ -581759,19 +581767,17 @@ function transactionsToOperations(address4, txs) {
     processRecipients(payload, address4, op, function_address);
     if (op.type !== DIRECTION.UNKNOWN && coin_id !== null) {
       if (coin_id === APTOS_ASSET_ID) {
-        acc[0].push(op);
+        acc.push(op);
         return acc;
       }
       const token = findTokenByAddressInCurrency(coin_id.toLowerCase(), "aptos");
       if (token !== void 0) {
-        acc[1].push(op);
-        if (op.type === DIRECTION.OUT) {
-          acc[0].push({
-            ...op,
-            value: op.tx.fees,
-            type: "FEES"
-          });
-        }
+        op.asset = {
+          type: "token",
+          standard: token.tokenType,
+          contractAddress: token.contractAddress
+        };
+        acc.push(op);
       }
     }
     return acc;
@@ -594748,7 +594754,7 @@ var AptosAPI = class {
   }
   async listOperations(address4, pagination) {
     const transactions3 = await this.getAccountInfo(address4, pagination.minHeight.toString());
-    const [newOperations, _15] = transactionsToOperations(address4, transactions3.transactions);
+    const newOperations = transactionsToOperations(address4, transactions3.transactions);
     return [newOperations, ""];
   }
   async fetchTransactions(address4, gt2) {
@@ -594816,7 +594822,7 @@ var AptosAPI = class {
       }
     });
     return response.map((x23) => ({
-      asset_type: x23.asset_type ?? "-",
+      contractAddress: x23.asset_type ?? "-",
       amount: (0, import_bignumber57.default)(x23.amount)
     }));
   }
@@ -594855,44 +594861,44 @@ function normalizeTransactionOptions(options22) {
 }
 
 // ../../libs/coin-modules/coin-aptos/lib-es/logic/buildTransaction.js
-var buildTransaction = async (account3, transaction, aptosClient2) => {
+var buildTransaction = async (account3, transaction, aptosClient2, contractAddress, tokenType) => {
   const subAccount = findSubAccountById(account3, transaction.subAccountId ?? "");
-  const txPayload = getPayload(subAccount, transaction);
+  const payloadContracAddress = subAccount ? subAccount.token.contractAddress : contractAddress;
+  const payloadTokenType = subAccount?.token?.tokenType ?? tokenType;
+  const txPayload = getPayload({
+    amount: transaction.amount,
+    recipient: transaction.recipient,
+    contractAddress: payloadContracAddress,
+    tokenType: payloadTokenType
+  });
   const txOptions = normalizeTransactionOptions(transaction.options);
   const tx = await aptosClient2.generateTransaction(account3.freshAddress, txPayload, txOptions);
   return tx;
 };
-var getPayload = (tokenAccount, transaction) => {
-  if (tokenAccount && isTokenAccount(tokenAccount)) {
-    const { tokenType } = tokenAccount.token;
-    if (!SUPPORTED_TOKEN_TYPES.includes(tokenType)) {
-      throw new Error(`Token type ${tokenType} not supported`);
-    }
-    if (tokenType === "fungible_asset") {
-      return {
-        function: `0x1::primary_fungible_store::transfer`,
-        typeArguments: ["0x1::fungible_asset::Metadata"],
-        functionArguments: [
-          tokenAccount.token.contractAddress,
-          transaction.recipient,
-          transaction.amount.toString()
-        ]
-      };
-    }
-    if (tokenType === "coin") {
-      return {
-        function: `0x1::aptos_account::transfer_coins`,
-        typeArguments: [tokenAccount.token.contractAddress],
-        functionArguments: [transaction.recipient, transaction.amount.toString()]
-      };
-    }
+var getPayload = (args3) => {
+  if (args3.tokenType !== void 0 && !isTokenType(args3.tokenType)) {
+    throw new Error(`Token type ${args3.tokenType} not supported`);
+  }
+  if (args3.tokenType === TOKEN_TYPE.FUNGIBLE_ASSET) {
+    return {
+      function: "0x1::primary_fungible_store::transfer",
+      typeArguments: ["0x1::fungible_asset::Metadata"],
+      functionArguments: [args3.contractAddress, args3.recipient, args3.amount.toString()]
+    };
+  }
+  let address4 = args3.contractAddress ?? "";
+  if (address4 === "") {
+    address4 = APTOS_ASSET_ID;
   }
   return {
     function: "0x1::aptos_account::transfer_coins",
-    typeArguments: [APTOS_ASSET_ID],
-    functionArguments: [transaction.recipient, transaction.amount.toString()]
+    typeArguments: [address4],
+    functionArguments: [args3.recipient, args3.amount.toString()]
   };
 };
+var isTokenType = (value5) => {
+  return Object.values(TOKEN_TYPE).includes(value5);
+};
 var buildTransaction_default = buildTransaction;
 
 // ../../libs/coin-modules/coin-aptos/lib-es/bridge/getFeesForTransaction.js
@@ -804712,13 +804718,13 @@ var estimateMaxSpendable19 = async ({ account: account3, parentAccount, transact
   if (balance.eq(0))
     return balance;
   const accountInfo = await fetchAccountInfo(mainAccount.freshAddress);
-  const isTokenType = isTokenAccount(account3);
+  const isTokenType2 = isTokenAccount(account3);
   if (transaction && !transaction.subAccountId) {
-    transaction.subAccountId = isTokenType ? account3.id : null;
+    transaction.subAccountId = isTokenType2 ? account3.id : null;
   }
   let tokenAccountTxn = false;
   let subAccount;
-  if (isTokenType) {
+  if (isTokenType2) {
     tokenAccountTxn = true;
     subAccount = account3;
   }
@@ -832398,9 +832404,13 @@ var SpeculosHttpTransport = class _SpeculosHttpTransport extends Transport {
     }).then((response) => {
       response.data.on("data", (chunk5) => {
         log2("speculos-event", chunk5.toString());
-        const split10 = chunk5.toString().replace("data: ", "");
-        const json2 = JSON.parse(split10);
-        transport.automationEvents.next(json2);
+        chunk5.toString().split("\n").forEach((line) => {
+          if (line.startsWith("data: ")) {
+            const jsonStr = line.slice("data: ".length);
+            const json2 = JSON.parse(jsonStr);
+            transport.automationEvents.next(json2);
+          }
+        });
       });
       response.data.on("close", () => {
         log2("speculos-event", "close");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/live-cli",
-  "version": "24.18.4-nightly.4",
+  "version": "24.18.4-nightly.6",
   "description": "ledger-live CLI version",
   "repository": {
     "type": "git",
@@ -56,7 +56,7 @@
     "ts-node": "10.9.2",
     "tsup": "7.3.0",
     "@ledgerhq/types-cryptoassets": "^7.23.0",
-    "@ledgerhq/types-live": "^6.71.0-nightly.2"
+    "@ledgerhq/types-live": "^6.71.0-nightly.3"
   },
   "publishConfig": {
     "directory": "dist"