@ledgerhq/live-cli 24.18.0-nightly.3 → 24.18.0-nightly.4

package/lib/cli.js

@@ -537781,7 +537781,7 @@ var require_package8 = __commonJS({
     module2.exports = {
       name: "@ledgerhq/live-common",
       description: "Common ground for the Ledger Live apps",
-      version: "34.32.0-nightly.3",
+      version: "34.32.0-nightly.4",
       repository: {
         type: "git",
         url: "https://github.com/LedgerHQ/ledger-live.git"
@@ -544582,7 +544582,7 @@ var require_package9 = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@ledgerhq/live-cli",
-      version: "24.18.0-nightly.3",
+      version: "24.18.0-nightly.4",
       description: "ledger-live CLI version",
       repository: {
         type: "git",
@@ -619650,17 +619650,17 @@ var BaseContract = class {
       }
     }
   }
-  queryFilter(event, fromBlockOrBlockhash, toBlock) {
+  queryFilter(event, fromBlockOrBlockhash, toBlock2) {
     const runningEvent = this._getRunningEvent(event);
     const filter26 = shallowCopy2(runningEvent.filter);
     if (typeof fromBlockOrBlockhash === "string" && isHexString2(fromBlockOrBlockhash, 32)) {
-      if (toBlock != null) {
-        logger20.throwArgumentError("cannot specify toBlock with blockhash", "toBlock", toBlock);
+      if (toBlock2 != null) {
+        logger20.throwArgumentError("cannot specify toBlock with blockhash", "toBlock", toBlock2);
       }
       filter26.blockHash = fromBlockOrBlockhash;
     } else {
       filter26.fromBlock = fromBlockOrBlockhash != null ? fromBlockOrBlockhash : 0;
-      filter26.toBlock = toBlock != null ? toBlock : "latest";
+      filter26.toBlock = toBlock2 != null ? toBlock2 : "latest";
     }
     return this.provider.getLogs(filter26).then((logs) => {
       return logs.map((log5) => this._wrapEvent(runningEvent, log5, null));
@@ -630509,7 +630509,7 @@ async function fetchWithRetries2(params, retries = DEFAULT_RETRIES_API2) {
     throw e38;
   }
 }
-var getLastCoinOperations = async (currency24, address4, accountId2, fromBlock, toBlock) => {
+var getLastCoinOperations = async (currency24, address4, accountId2, fromBlock, toBlock2) => {
   const config4 = getCoinConfig(currency24).info;
   const { explorer } = config4 || /* istanbul ignore next */
   {};
@@ -630524,12 +630524,12 @@ var getLastCoinOperations = async (currency24, address4, accountId2, fromBlock,
       page: 1,
       sort: "desc",
       startBlock: fromBlock,
-      endBlock: toBlock
+      endBlock: toBlock2
     }
   });
   return ops.map((tx) => etherscanOperationToOperations(accountId2, tx)).flat();
 };
-var getLastTokenOperations = async (currency24, address4, accountId2, fromBlock, toBlock) => {
+var getLastTokenOperations = async (currency24, address4, accountId2, fromBlock, toBlock2) => {
   const config4 = getCoinConfig(currency24).info;
   const { explorer } = config4 || /* istanbul ignore next */
   {};
@@ -630544,7 +630544,7 @@ var getLastTokenOperations = async (currency24, address4, accountId2, fromBlock,
       page: 1,
       sort: "desc",
       startBlock: fromBlock,
-      endBlock: toBlock
+      endBlock: toBlock2
     }
   });
   const opsByHash = {};
@@ -630556,7 +630556,7 @@ var getLastTokenOperations = async (currency24, address4, accountId2, fromBlock,
   }
   return Object.values(opsByHash).map((events2) => events2.map((event, index) => etherscanERC20EventToOperations(accountId2, event, index))).flat(2);
 };
-var getLastERC721Operations = async (currency24, address4, accountId2, fromBlock, toBlock) => {
+var getLastERC721Operations = async (currency24, address4, accountId2, fromBlock, toBlock2) => {
   const config4 = getCoinConfig(currency24).info;
   const { explorer } = config4 || /* istanbul ignore next */
   {};
@@ -630571,7 +630571,7 @@ var getLastERC721Operations = async (currency24, address4, accountId2, fromBlock
       page: 1,
       sort: "desc",
       startBlock: fromBlock,
-      endBlock: toBlock
+      endBlock: toBlock2
     }
   });
   const opsByHash = {};
@@ -630583,7 +630583,7 @@ var getLastERC721Operations = async (currency24, address4, accountId2, fromBlock
   }
   return Object.values(opsByHash).map((events2) => events2.map((event, index) => etherscanERC721EventToOperations(accountId2, event, index))).flat(2);
 };
-var getLastERC1155Operations = async (currency24, address4, accountId2, fromBlock, toBlock) => {
+var getLastERC1155Operations = async (currency24, address4, accountId2, fromBlock, toBlock2) => {
   const config4 = getCoinConfig(currency24).info;
   const { explorer } = config4 || /* istanbul ignore next */
   {};
@@ -630601,7 +630601,7 @@ var getLastERC1155Operations = async (currency24, address4, accountId2, fromBloc
       page: 1,
       sort: "desc",
       startBlock: fromBlock,
-      endBlock: toBlock
+      endBlock: toBlock2
     }
   });
   const opsByHash = {};
@@ -630613,15 +630613,15 @@ var getLastERC1155Operations = async (currency24, address4, accountId2, fromBloc
   }
   return Object.values(opsByHash).map((events2) => events2.map((event, index) => etherscanERC1155EventToOperations(accountId2, event, index))).flat(2);
 };
-var getLastNftOperations = async (currency24, address4, accountId2, fromBlock, toBlock) => {
-  const erc721Ops = await getLastERC721Operations(currency24, address4, accountId2, fromBlock, toBlock);
-  const erc1155Ops = await getLastERC1155Operations(currency24, address4, accountId2, fromBlock, toBlock);
+var getLastNftOperations = async (currency24, address4, accountId2, fromBlock, toBlock2) => {
+  const erc721Ops = await getLastERC721Operations(currency24, address4, accountId2, fromBlock, toBlock2);
+  const erc1155Ops = await getLastERC1155Operations(currency24, address4, accountId2, fromBlock, toBlock2);
   return [...erc721Ops, ...erc1155Ops].sort(
     // sorting DESC order
     (a62, b19) => b19.date.getTime() - a62.date.getTime()
   );
 };
-var getLastInternalOperations = async (currency24, address4, accountId2, fromBlock, toBlock) => {
+var getLastInternalOperations = async (currency24, address4, accountId2, fromBlock, toBlock2) => {
   const config4 = getCoinConfig(currency24).info;
   const { explorer } = config4 || /* istanbul ignore next */
   {};
@@ -630636,7 +630636,7 @@ var getLastInternalOperations = async (currency24, address4, accountId2, fromBlo
       page: 1,
       sort: "desc",
       startBlock: fromBlock,
-      endBlock: toBlock
+      endBlock: toBlock2
     }
   });
   const opsByHash = {};
@@ -630648,12 +630648,12 @@ var getLastInternalOperations = async (currency24, address4, accountId2, fromBlo
   }
   return Object.values(opsByHash).map((internalTxs) => internalTxs.map((internalTx, index) => etherscanInternalTransactionToOperations(accountId2, internalTx, index))).flat(2);
 };
-var getLastOperations = makeLRUCache(async (currency24, address4, accountId2, fromBlock, toBlock) => {
+var getLastOperations = makeLRUCache(async (currency24, address4, accountId2, fromBlock, toBlock2) => {
   try {
-    const lastCoinOperations = await getLastCoinOperations(currency24, address4, accountId2, fromBlock, toBlock);
-    const lastInternalOperations = await getLastInternalOperations(currency24, address4, accountId2, fromBlock, toBlock);
-    const lastTokenOperations = await getLastTokenOperations(currency24, address4, accountId2, fromBlock, toBlock);
-    const lastNftOperations = isNFTActive(currency24) ? await getLastNftOperations(currency24, address4, accountId2, fromBlock, toBlock) : [];
+    const lastCoinOperations = await getLastCoinOperations(currency24, address4, accountId2, fromBlock, toBlock2);
+    const lastInternalOperations = await getLastInternalOperations(currency24, address4, accountId2, fromBlock, toBlock2);
+    const lastTokenOperations = await getLastTokenOperations(currency24, address4, accountId2, fromBlock, toBlock2);
+    const lastNftOperations = isNFTActive(currency24) ? await getLastNftOperations(currency24, address4, accountId2, fromBlock, toBlock2) : [];
     return {
       lastCoinOperations,
       lastTokenOperations,
@@ -630664,7 +630664,7 @@ var getLastOperations = makeLRUCache(async (currency24, address4, accountId2, fr
     log2("EVM getLastOperations", "Error while fetching data from Etherscan like API", err);
     throw new InvalidExplorerResponse("", { currencyName: currency24.name });
   }
-}, (currency24, address4, accountId2, fromBlock, toBlock) => accountId2 + fromBlock + toBlock, { ttl: ETHERSCAN_TIMEOUT });
+}, (currency24, address4, accountId2, fromBlock, toBlock2) => accountId2 + fromBlock + toBlock2, { ttl: ETHERSCAN_TIMEOUT });
 var explorerApi = {
   getLastOperations
 };
@@ -657526,17 +657526,17 @@ var BaseContract2 = class _BaseContract {
    *  %%fromBlock%% (default: ``0``) to %%toBlock%% (default: ``"latest"``)
    *  inclusive.
    */
-  async queryFilter(event, fromBlock, toBlock) {
+  async queryFilter(event, fromBlock, toBlock2) {
     if (fromBlock == null) {
       fromBlock = 0;
     }
-    if (toBlock == null) {
-      toBlock = "latest";
+    if (toBlock2 == null) {
+      toBlock2 = "latest";
     }
     const { addr, addrPromise } = getInternal(this);
     const address4 = addr ? addr : await addrPromise;
     const { fragment, topics } = await getSubInfo(this, event);
-    const filter26 = { address: address4, topics, fromBlock, toBlock };
+    const filter26 = { address: address4, topics, fromBlock, toBlock: toBlock2 };
     const provider = getProvider(this.runner);
     assert3(provider, "contract runner does not have a provider", "UNSUPPORTED_OPERATION", { operation: "queryFilter" });
     return (await provider.getLogs(filter26)).map((log5) => {
@@ -659575,7 +659575,7 @@ var AbstractProvider = class {
       return t59.toLowerCase();
     });
     const blockHash = "blockHash" in filter26 ? filter26.blockHash : void 0;
-    const resolve = (_address, fromBlock2, toBlock2) => {
+    const resolve = (_address, fromBlock2, toBlock3) => {
       let address5 = void 0;
       switch (_address.length) {
         case 0:
@@ -659588,7 +659588,7 @@ var AbstractProvider = class {
           address5 = _address;
       }
       if (blockHash) {
-        if (fromBlock2 != null || toBlock2 != null) {
+        if (fromBlock2 != null || toBlock3 != null) {
           throw new Error("invalid filter");
         }
       }
@@ -659602,8 +659602,8 @@ var AbstractProvider = class {
       if (fromBlock2) {
         filter27.fromBlock = fromBlock2;
       }
-      if (toBlock2) {
-        filter27.toBlock = toBlock2;
+      if (toBlock3) {
+        filter27.toBlock = toBlock3;
       }
       if (blockHash) {
         filter27.blockHash = blockHash;
@@ -659624,16 +659624,16 @@ var AbstractProvider = class {
     if ("fromBlock" in filter26) {
       fromBlock = this._getBlockTag(filter26.fromBlock);
     }
-    let toBlock = void 0;
+    let toBlock2 = void 0;
     if ("toBlock" in filter26) {
-      toBlock = this._getBlockTag(filter26.toBlock);
+      toBlock2 = this._getBlockTag(filter26.toBlock);
     }
-    if (address4.filter((a62) => typeof a62 !== "string").length || fromBlock != null && typeof fromBlock !== "string" || toBlock != null && typeof toBlock !== "string") {
-      return Promise.all([Promise.all(address4), fromBlock, toBlock]).then((result2) => {
+    if (address4.filter((a62) => typeof a62 !== "string").length || fromBlock != null && typeof fromBlock !== "string" || toBlock2 != null && typeof toBlock2 !== "string") {
+      return Promise.all([Promise.all(address4), fromBlock, toBlock2]).then((result2) => {
         return resolve(result2[0], result2[1], result2[2]);
       });
     }
-    return resolve(address4, fromBlock, toBlock);
+    return resolve(address4, fromBlock, toBlock2);
   }
   /**
    *  Returns or resolves to a transaction for %%request%%, resolving
@@ -810919,11 +810919,18 @@ async function fetchTronAccount(addr) {
 }
 async function getLastBlock4() {
   const data6 = await fetch14(`/wallet/getnowblock`);
-  return {
+  return toBlock(data6);
+}
+function toBlock(data6) {
+  const timestamp = data6.block_header.raw_data.timestamp;
+  const ret2 = {
     height: data6.block_header.raw_data.number,
-    hash: data6.blockID,
-    time: new Date(data6.block_header.raw_data.timestamp)
+    hash: data6.blockID
   };
+  if (timestamp) {
+    ret2.time = new Date(timestamp);
+  }
+  return ret2;
 }
 async function fetchTronTxDetail(txId) {
   const { fee, blockNumber, withdraw_amount, unfreeze_amount } = await fetch14(`/wallet/gettransactioninfobyid?value=${encodeURIComponent(txId)}`);
@@ -810968,8 +810975,13 @@ var getTrc20 = async (url4) => {
     nextUrl: transactions3.meta.links?.next?.replace(/https:\/\/api(\.[a-z]*)?.trongrid.io/, getBaseApiUrl2())
   };
 };
-async function fetchTronAccountTxs(addr, shouldFetchMoreTxs, cacheTransactionInfoById) {
-  const entireTxs = (await getAllTransactions(`${getBaseApiUrl2()}/v1/accounts/${addr}/transactions?limit=100`, shouldFetchMoreTxs, getTransactions4(cacheTransactionInfoById))).filter((tx) => isTransactionTronAPI(tx)).filter((tx) => {
+var defaultFetchParams = {
+  limit: 100,
+  minTimestamp: 0
+};
+async function fetchTronAccountTxs(addr, shouldFetchMoreTxs, cacheTransactionInfoById, params) {
+  const queryParamsNativeTxs = `limit=${params.limit}&min_timestamp=${params.minTimestamp}`;
+  const nativeTxs = (await getAllTransactions(`${getBaseApiUrl2()}/v1/accounts/${addr}/transactions?${queryParamsNativeTxs}`, shouldFetchMoreTxs, getTransactions4(cacheTransactionInfoById))).filter(isTransactionTronAPI).filter((tx) => {
     const hasInternalTxs = tx.txID && tx.internal_transactions && tx.internal_transactions.length > 0;
     const isDuplicated = tx.tx_id;
     const type5 = tx.raw_data.contract[0].type;
@@ -810978,8 +810990,9 @@ async function fetchTronAccountTxs(addr, shouldFetchMoreTxs, cacheTransactionInf
     }
     return !isDuplicated && !hasInternalTxs && type5 !== "TriggerSmartContract";
   }).map((tx) => formatTrongridTxResponse(tx));
-  const entireTrc20Txs = (await getAllTransactions(`${getBaseApiUrl2()}/v1/accounts/${addr}/transactions/trc20?get_detail=true`, shouldFetchMoreTxs, getTrc20)).map((tx) => formatTrongridTrc20TxResponse(tx));
-  const txInfos = (0, import_compact5.default)(entireTxs.concat(entireTrc20Txs)).sort((a62, b19) => b19.date.getTime() - a62.date.getTime());
+  const queryParamsTrc20Txs = `limit=${params.limit}&min_timestamp=${params.minTimestamp}`;
+  const trc20Txs = (await getAllTransactions(`${getBaseApiUrl2()}/v1/accounts/${addr}/transactions/trc20?${queryParamsTrc20Txs}&get_detail=true`, shouldFetchMoreTxs, getTrc20)).map((tx) => formatTrongridTrc20TxResponse(tx));
+  const txInfos = (0, import_compact5.default)(nativeTxs.concat(trc20Txs)).sort((a62, b19) => b19.date.getTime() - a62.date.getTime());
   return txInfos;
 }
 var getContractUserEnergyRatioConsumption = async (address4) => {
@@ -812270,7 +812283,7 @@ var getAccountShape18 = async ({ initialAccount, currency: currency24, address:
     ...initialAccount?.tronResources?.cacheTransactionInfoById || {}
   } : {};
   const operationsPageSize = Math.min(1e3, getOperationsPageSize(initialAccount && initialAccount.id, syncConfig));
-  const txs = await fetchTronAccountTxs(address4, (txs2) => txs2.length < operationsPageSize, cacheTransactionInfoById);
+  const txs = await fetchTronAccountTxs(address4, (txs2) => txs2.length < operationsPageSize, cacheTransactionInfoById, defaultFetchParams);
   const tronResources = await getTronResources2(acc, txs, cacheTransactionInfoById);
   const spendableBalance = acc.balance ? new import_bignumber286.default(acc.balance) : new import_bignumber286.default(0);
   const balance = computeBalanceBridge(acc);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/live-cli",
-  "version": "24.18.0-nightly.3",
+  "version": "24.18.0-nightly.4",
   "description": "ledger-live CLI version",
   "repository": {
     "type": "git",
@@ -55,8 +55,8 @@
     "@types/ws": "8.5.10",
     "ts-node": "10.9.2",
     "tsup": "7.3.0",
-    "@ledgerhq/types-live": "^6.69.0-nightly.1",
-    "@ledgerhq/types-cryptoassets": "^7.23.0-nightly.0"
+    "@ledgerhq/types-cryptoassets": "^7.23.0-nightly.0",
+    "@ledgerhq/types-live": "^6.69.0-nightly.2"
   },
   "publishConfig": {
     "directory": "dist"