@ledgerhq/live-cli 24.26.0-nightly.4 → 24.26.0-nightly.5

package/lib/cli.js

@@ -519675,7 +519675,7 @@ var require_package7 = __commonJS({
     module2.exports = {
       name: "@ledgerhq/live-common",
       description: "Common ground for the Ledger Live apps",
-      version: "34.51.0-nightly.4",
+      version: "34.51.0-nightly.5",
       repository: {
         type: "git",
         url: "https://github.com/LedgerHQ/ledger-live.git"
@@ -520012,7 +520012,7 @@ var require_package8 = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@ledgerhq/live-cli",
-      version: "24.26.0-nightly.4",
+      version: "24.26.0-nightly.5",
       description: "ledger-live CLI version",
       repository: {
         type: "git",
@@ -590281,6 +590281,13 @@ async function submitPreApprovalTransaction(currency24, partyId, { serialized },
     updateId: data12.update_id
   };
 }
+async function getTransferPreApproval(currency24, partyId) {
+  const { data: data12 } = await gatewayNetwork({
+    method: "GET",
+    url: `${getGatewayUrl(currency24)}/v1/node/${getNodeId(currency24)}/party/${partyId}/transfer-preapproval`
+  });
+  return data12;
+}
 
 // ../../libs/coin-modules/coin-canton/lib-es/common-logic/transaction/broadcast.js
 var useGateway = (currency24) => config_default3.getCoinConfig(currency24).useGateway === true;
@@ -590593,8 +590600,12 @@ var isAccountOnboarded = async (currency24, publicKey3) => {
     return { isOnboarded: false };
   }
 };
-var isAccountAuthorized = async (operations4, partyId) => {
-  return operations4.some((operation) => operation.senders.includes(partyId));
+var isAccountAuthorized = async (currency24, partyId) => {
+  const { expires_at, receiver: receiver2 } = await getTransferPreApproval(currency24, partyId);
+  const isReceiver = receiver2 === partyId;
+  const isExpired = new Date(expires_at) < /* @__PURE__ */ new Date();
+  const isAuthorized = !isExpired && isReceiver;
+  return isAuthorized;
 };
 var buildOnboardAccount = (signerContext4) => (currency24, deviceId, account3) => new import_rxjs17.Observable((o41) => {
   async function main2() {
@@ -590627,7 +590638,7 @@ var buildOnboardAccount = (signerContext4) => (currency24, deviceId, account3) =
 var buildAuthorizePreapproval = (signerContext4) => (currency24, deviceId, account3, partyId) => new import_rxjs17.Observable((o41) => {
   async function main2() {
     o41.next({ status: AuthorizeStatus.INIT });
-    const isAuthorized = await isAccountAuthorized(account3.operations, partyId);
+    const isAuthorized = await isAccountAuthorized(currency24, partyId);
     if (!isAuthorized) {
       o41.next({ status: AuthorizeStatus.PREPARE });
       const preparedTransaction = await preparePreApprovalTransaction(currency24, partyId);
@@ -590749,7 +590760,7 @@ function makeGetAccountShape3(signerContext4) {
       const newOperations = filterOperations(transactionData.operations, accountId2, xpubOrAddress);
       operations4 = mergeOps(oldOperations, newOperations);
     }
-    const isAuthorized = await isAccountAuthorized(operations4, xpubOrAddress);
+    const isAuthorized = await isAccountAuthorized(currency24, xpubOrAddress);
     const used = isAuthorized && totalBalance.gt(0);
     const blockHeight = await getLedgerEnd(currency24);
     const creationDate = operations4.length > 0 ? new Date(Math.min(...operations4.map((op) => op.date.getTime()))) : /* @__PURE__ */ new Date();
@@ -775336,7 +775347,8 @@ var createDummyTokenTransferTx = (address3) => {
           recipientDescriptor: {
             walletAddress: randomAddresses[1],
             tokenAccAddress: randomAddresses[2],
-            shouldCreateAsAssociatedTokenAccount: true
+            shouldCreateAsAssociatedTokenAccount: true,
+            userInputType: "sol"
           },
           tokenProgram: PARSED_PROGRAMS.SPL_TOKEN
         },
@@ -775359,7 +775371,8 @@ var createDummyTokenApproveTx = (address3) => {
           recipientDescriptor: {
             walletAddress: randomAddresses[1],
             tokenAccAddress: randomAddresses[2],
-            shouldCreateAsAssociatedTokenAccount: true
+            shouldCreateAsAssociatedTokenAccount: true,
+            userInputType: "sol"
           },
           owner: address3,
           amount: 0,
@@ -775611,7 +775624,8 @@ var deriveTokenTransferCommandDescriptor = async (mainAccount, tx, model, api7)
   const defaultRecipientDescriptor = {
     shouldCreateAsAssociatedTokenAccount: false,
     tokenAccAddress: "",
-    walletAddress: ""
+    walletAddress: "",
+    userInputType: "sol"
   };
   const tokenRecipientOrError = errors.recipient ? errors.recipient : await getTokenRecipient(tx.recipient, mintAddress, tokenProgram, api7);
   if (!errors.recipient && tokenRecipientOrError instanceof Error) {
@@ -775708,7 +775722,8 @@ async function getTokenRecipient(recipientAddress, mintAddress, tokenProgram, ap
       descriptor: {
         walletAddress: recipientAddress,
         shouldCreateAsAssociatedTokenAccount,
-        tokenAccAddress: recipientAssociatedTokenAccountAddress
+        tokenAccAddress: recipientAssociatedTokenAccountAddress,
+        userInputType: "sol"
       },
       recipientAccInfo: associatedTokenAccount
     };
@@ -775724,7 +775739,8 @@ async function getTokenRecipient(recipientAddress, mintAddress, tokenProgram, ap
     descriptor: {
       walletAddress: recipientTokenAccount.owner.toBase58(),
       shouldCreateAsAssociatedTokenAccount: false,
-      tokenAccAddress: recipientAddress
+      tokenAccAddress: recipientAddress,
+      userInputType: "ata"
     },
     recipientAccInfo: recipientTokenAccount
   };
@@ -775823,7 +775839,8 @@ async function deriveCreateApproveCommandDescriptor(mainAccount, tx, model, api7
   const defaultRecipientDescriptor = {
     shouldCreateAsAssociatedTokenAccount: false,
     tokenAccAddress: "",
-    walletAddress: ""
+    walletAddress: "",
+    userInputType: "sol"
   };
   const tokenRecipientOrError = errors.recipient ? errors.recipient : await getTokenRecipient(tx.recipient, mintAddress, tokenProgram, api7);
   if (!errors.recipient && tokenRecipientOrError instanceof Error) {
@@ -777908,14 +777925,16 @@ function getResolution(transaction, deviceModelId, certificateSignatureKind) {
           createATA: {
             address: command4.recipientDescriptor.walletAddress,
             mintAddress: command4.mintAddress
-          }
+          },
+          userInputType: command4.recipientDescriptor.userInputType
         };
       }
       return {
         deviceModelId,
         certificateSignatureKind,
         tokenInternalId: command4.tokenId,
-        tokenAddress: command4.recipientDescriptor.tokenAccAddress
+        tokenAddress: command4.recipientDescriptor.tokenAccAddress,
+        userInputType: command4.recipientDescriptor.userInputType
       };
     }
     case "token.createATA": {
@@ -778800,6 +778819,7 @@ var P1_CONFIRM4 = 1;
 var P2_INIT = 0;
 var P2_EXTEND = 1;
 var P2_MORE5 = 2;
+var P2_USER_INPUT_ATA = 8;
 var MAX_PAYLOAD = 255;
 var LEDGER_CLA3 = 224;
 var INS8 = {
@@ -778862,18 +778882,20 @@ var Solana = class {
    *
    * @param path a BIP32 path
    * @param txBuffer serialized transaction
+   * @param userInputType optional user input type (ata or sol, for the case of token transfers)
    *
    * @returns an object with the signature field
    *
    * @example
    * solana.signTransaction("44'/501'/0'", txBuffer).then(r => r.signature)
    */
-  async signTransaction(path4, txBuffer) {
+  async signTransaction(path4, txBuffer, userInputType) {
     const pathBuffer = this.pathToBuffer(path4);
     const pathsCountBuffer = Buffer.alloc(1);
     pathsCountBuffer.writeUInt8(1, 0);
     const payload = Buffer.concat([pathsCountBuffer, pathBuffer, txBuffer]);
-    const signatureBuffer = await this.sendToDevice(INS8.SIGN, P1_CONFIRM4, payload);
+    const p2Flag = userInputType === "ata" ? P2_USER_INPUT_ATA : void 0;
+    const signatureBuffer = await this.sendToDevice(INS8.SIGN, P1_CONFIRM4, payload, p2Flag);
     return {
       signature: signatureBuffer
     };
@@ -778955,9 +778977,8 @@ var Solana = class {
     return buf2;
   }
   // send chunked if payload size exceeds maximum for a call
-  async sendToDevice(instruction, p1, payload) {
+  async sendToDevice(instruction, p1, payload, p210 = P2_INIT) {
     const acceptStatusList = [StatusCodes.OK, EXTRA_STATUS_CODES.BLIND_SIGNATURE_REQUIRED];
-    let p210 = P2_INIT;
     let payload_offset = 0;
     if (payload.length > MAX_PAYLOAD) {
       while (payload.length - payload_offset > MAX_PAYLOAD) {
@@ -779664,7 +779685,7 @@ var LegacySignerSolana = class {
         }
       }
     }
-    return this.signer.signTransaction(path4, tx);
+    return this.signer.signTransaction(path4, tx, resolution?.userInputType);
   }
   signMessage(path4, messageHex) {
     return this.signer.signOffchainMessage(path4, Buffer.from(messageHex, "hex"));
@@ -822852,19 +822873,19 @@ async function withApi2(execute2) {
 var getAllBalancesCached = makeLRUCache(async (owner) => withApi2(async (api7) => await api7.getAllBalances({
   owner
 })), (owner) => owner, minutes(1));
-function isMoveCallWithFunction(functionName, block2) {
+function hasMoveCallWithFunction(functionName, block2) {
   if (block2?.kind === "ProgrammableTransaction") {
-    const move = block2.transactions.find((item) => "MoveCall" in item);
-    return move?.MoveCall.function === functionName;
+    const move = block2.transactions.find((item) => "MoveCall" in item && item["MoveCall"].function === functionName);
+    return Boolean(move);
   } else {
     return false;
   }
 }
 function isStaking(block2) {
-  return isMoveCallWithFunction("request_add_stake", block2);
+  return hasMoveCallWithFunction("request_add_stake", block2);
 }
 function isUnstaking(block2) {
-  return isMoveCallWithFunction("request_withdraw_stake", block2);
+  return hasMoveCallWithFunction("request_withdraw_stake", block2);
 }
 var getAccountBalances = async (addr) => {
   const balances = await getAllBalancesCached(addr);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/live-cli",
-  "version": "24.26.0-nightly.4",
+  "version": "24.26.0-nightly.5",
   "description": "ledger-live CLI version",
   "repository": {
     "type": "git",
@@ -58,7 +58,7 @@
     "tsup": "7.3.0",
     "yaml": "2.8.1",
     "@ledgerhq/types-cryptoassets": "^7.29.0-nightly.0",
-    "@ledgerhq/types-live": "^6.87.0-nightly.1"
+    "@ledgerhq/types-live": "^6.87.0-nightly.2"
   },
   "publishConfig": {
     "directory": "dist"