Merge branch 'master' into bitcoin-js

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ledger-live",
-  "version": "21.16.3",
+  "version": "21.18.0",
   "description": "ledger-live CLI version",
   "repository": {
     "type": "git",
@@ -28,16 +28,16 @@
     "@ledgerhq/hw-transport-node-ble": "5.7.0"
   },
   "dependencies": {
-    "@ledgerhq/cryptoassets": "6.15.1",
+    "@ledgerhq/cryptoassets": "6.17.0",
     "@ledgerhq/errors": "6.10.0",
-    "@ledgerhq/hw-app-btc": "6.15.1",
+    "@ledgerhq/hw-app-btc": "6.17.0",
     "@ledgerhq/hw-transport-http": "6.15.0",
     "@ledgerhq/hw-transport-mocker": "6.11.2",
     "@ledgerhq/hw-transport-node-ble": "^6.15.0",
     "@ledgerhq/hw-transport-node-hid": "6.11.2",
     "@ledgerhq/hw-transport-node-speculos": "6.11.2",
     "@ledgerhq/ledger-core": "6.14.5",
-    "@ledgerhq/live-common": "^21.16.3",
+    "@ledgerhq/live-common": "^21.18.0",
     "@ledgerhq/logs": "6.10.0",
     "@walletconnect/client": "^1.6.6",
     "asciichart": "^1.5.25",

cli/src/transaction.ts

@@ -45,6 +45,9 @@ export type InferTransactionsOpts = Partial<{
   amount: string;
   shuffle: boolean;
   "fees-strategy": string;
+  collection: string;
+  tokenIds: string;
+  quantities: string;
 }>;
 export const inferTransactionsOpts = uniqBy(
   [
@@ -74,6 +77,21 @@ export const inferTransactionsOpts = uniqBy(
       type: Boolean,
       desc: "if using multiple token or recipient, order will be randomized",
     },
+    {
+      name: "collection",
+      type: String,
+      desc: "collection of an NFT (in corelation with --tokenIds)",
+    },
+    {
+      name: "tokenIds",
+      type: String,
+      desc: "tokenId or list of tokenIds of an NFT separated by commas (order is kept in corelation with --quantities)",
+    },
+    {
+      name: "quantities",
+      type: String,
+      desc: "quantity or list of quantity of an ERC1155 NFT separated by commas (order is kept in corelation with --tokenIds)",
+    },
   ].concat(
     flatMap(Object.values(perFamily), (m: any) => (m && m.options) || [])
   ),
@@ -106,6 +124,16 @@ export async function inferTransactions(
       transaction.amount = transaction.useAllAmount
         ? new BigNumber(0)
         : inferAmount(account, opts.amount || "0");
+
+      // NFT collection and tokenId go by pair
+      if (opts.tokenIds && opts.collection) {
+        transaction.tokenIds = opts.tokenIds.split(",");
+        transaction.collection = opts.collection;
+        transaction.quantities = opts.quantities
+          ?.split(",")
+          ?.map((q) => new BigNumber(q));
+      }
+
       return {
         account,
         transaction,