Merge pull request #152 from ckb-cell/develop

Merge develop to main branch (v2.1.1)

Author: ahonn

package.json

@@ -1,6 +1,6 @@
 {
   "name": "btc-assets-api",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "title": "Bitcoin/RGB++ Assets API",
   "description": "",
   "main": "index.js",

src/routes/bitcoin/address.ts

@@ -43,8 +43,10 @@ const addressRoutes: FastifyPluginCallback<Record<never, never>, Server, ZodType
       const { min_satoshi, no_cache } = request.query;
 
       let utxosCache = null;
-      if (env.UTXO_SYNC_DATA_CACHE_ENABLE && no_cache !== 'true') {
-        utxosCache = await fastify.utxoSyncer.getUTXOsFromCache(address);
+      if (env.UTXO_SYNC_DATA_CACHE_ENABLE) {
+        if (no_cache !== 'true') {
+          utxosCache = await fastify.utxoSyncer.getUTXOsFromCache(address);
+        }
         await fastify.utxoSyncer.enqueueSyncJob(address);
       }
       const utxos = utxosCache ? utxosCache : await fastify.bitcoin.getAddressTxsUtxo({ address });
@@ -103,8 +105,10 @@ const addressRoutes: FastifyPluginCallback<Record<never, never>, Server, ZodType
       const { only_confirmed, min_satoshi, no_cache } = request.query;
 
       let utxosCache = null;
-      if (env.UTXO_SYNC_DATA_CACHE_ENABLE && no_cache !== 'true') {
-        utxosCache = await fastify.utxoSyncer.getUTXOsFromCache(address);
+      if (env.UTXO_SYNC_DATA_CACHE_ENABLE) {
+        if (no_cache !== 'true') {
+          utxosCache = await fastify.utxoSyncer.getUTXOsFromCache(address);
+        }
         await fastify.utxoSyncer.enqueueSyncJob(address);
       }
       let utxos = utxosCache ? utxosCache : await fastify.bitcoin.getAddressTxsUtxo({ address });

src/routes/rgbpp/address.ts

@@ -64,15 +64,19 @@ const addressRoutes: FastifyPluginCallback<Record<never, never>, Server, ZodType
       }
 
       let utxosCache = null;
-      if (env.UTXO_SYNC_DATA_CACHE_ENABLE && no_cache !== 'true') {
-        utxosCache = await fastify.utxoSyncer.getUTXOsFromCache(btc_address);
+      if (env.UTXO_SYNC_DATA_CACHE_ENABLE) {
+        if (no_cache !== 'true') {
+          utxosCache = await fastify.utxoSyncer.getUTXOsFromCache(btc_address);
+        }
         await fastify.utxoSyncer.enqueueSyncJob(btc_address);
       }
       const utxos = utxosCache ? utxosCache : await fastify.bitcoin.getAddressTxsUtxo({ address: btc_address });
 
       let rgbppCache = null;
-      if (env.RGBPP_COLLECT_DATA_CACHE_ENABLE && no_cache !== 'true') {
-        rgbppCache = await fastify.rgbppCollector.getRgbppCellsFromCache(btc_address);
+      if (env.RGBPP_COLLECT_DATA_CACHE_ENABLE) {
+        if (no_cache !== 'true') {
+          rgbppCache = await fastify.rgbppCollector.getRgbppCellsFromCache(btc_address);
+        }
         await fastify.rgbppCollector.enqueueCollectJob(btc_address, utxos);
       }
 

src/services/utxo.ts

@@ -172,7 +172,7 @@ export default class UTXOSyncer extends BaseQueueWorker<IUTXOSyncRequest, IUTXOS
       }
 
       const txs = await this.cradle.bitcoin.getAddressTxs({ address: btcAddress });
-      const txsHash = sha256(Buffer.from(txs.map((tx) => tx.txid).join(','))).toString();
+      const txsHash = sha256(Buffer.from(txs.map((tx) => tx.txid + JSON.stringify(tx.status)).join(','))).toString();
 
       // check if the data is updated
       const cached = await this.dataCache.get(btcAddress);