chore: modify according review

indexer/src/store.rs

@@ -318,13 +318,24 @@ impl<CS: ChainStore + 'static> DefaultIndexerStore<CS> {
             });
 
         // attach blocks until reach tip or batch limit
+        // need to check empty again because `remove_lock_hash` may be called during detach
         let mut lock_hash_index_states = self.get_lock_hash_index_states();
+        if lock_hash_index_states.is_empty() {
+            return;
+        }
         let min_block_number: BlockNumber = lock_hash_index_states
             .values()
             .min_by_key(|index_state| index_state.block_number)
             .expect("none empty index states")
             .block_number;
 
+        // should index genesis block also
+        let start_number = if min_block_number == 0 {
+            0
+        } else {
+            min_block_number + 1
+        };
+
         let (tip_number, tip_hash) = {
             let tip_header = self
                 .shared
@@ -334,7 +345,7 @@ impl<CS: ChainStore + 'static> DefaultIndexerStore<CS> {
             (tip_header.number(), tip_header.hash().to_owned())
         };
         self.commit_batch(|batch| {
-            (min_block_number + 1..=tip_number)
+            (start_number..=tip_number)
                 .take(BATCH_ATTACH_BLOCK_NUMS)
                 .for_each(|block_number| {
                     let index_lock_hashes = lock_hash_index_states

indexer/src/types.rs

@@ -70,11 +70,12 @@ impl LockHashIndex {
     }
 
     pub fn to_vec(&self) -> Vec<u8> {
-        let mut bytes = self.lock_hash.to_vec();
-        bytes.extend_from_slice(&self.block_number.to_be_bytes());
-        bytes.extend_from_slice(self.cell_out_point.tx_hash.as_bytes());
-        bytes.extend_from_slice(&self.cell_out_point.index.to_be_bytes());
-        bytes.to_vec()
+        let mut result = Vec::with_capacity(76);
+        result.extend_from_slice(self.lock_hash.as_bytes());
+        result.extend_from_slice(&self.block_number.to_be_bytes());
+        result.extend_from_slice(self.cell_out_point.tx_hash.as_bytes());
+        result.extend_from_slice(&self.cell_out_point.index.to_be_bytes());
+        result
     }
 }
 

rpc/README.md

@@ -798,7 +798,7 @@ http://localhost:8114
 
 ### `deindex_lock_hash`
 
-Remove index for live cells and transaction by the hash of lock script.
+Remove index for live cells and transaction by the hash of lock script. Returns empty array when the `lock_hash` not indexed yet.
 
 #### Parameters
 
@@ -933,7 +933,7 @@ http://localhost:8114
 
 ### `get_transactions_by_lock_hash`
 
-Returns the transactions collection by the hash of lock script.
+Returns the transactions collection by the hash of lock script. Returns empty array when the `lock_hash` not indexed yet.
 
 #### Parameters
 
@@ -991,7 +991,7 @@ Create index for live cells and transactions by the hash of lock script.
 
 #### Parameters
 
-    index_from - Create an index from starting block number, an optional parameter, null means starting from tip
+    index_from - Create an index from starting block number (exclusive), an optional parameter, null means starting from tip and 0 means starting from genesis
     lock_hash - Cell lock script hash
 
 #### Examples

rpc/json/rpc.json

@@ -644,7 +644,7 @@
         },
         "types": [
             {
-                "index_from": "Create an index from starting block number, an optional parameter, null means starting from tip"
+                "index_from": "Create an index from starting block number (exclusive), an optional parameter, null means starting from tip and 0 means starting from genesis"
             },
             {
                 "lock_hash": "Cell lock script hash"
@@ -723,7 +723,7 @@
         ]
     },
     {
-        "description": "Returns the transactions collection by the hash of lock script.",
+        "description": "Returns the transactions collection by the hash of lock script. Returns empty array when the `lock_hash` not indexed yet.",
         "method": "get_transactions_by_lock_hash",
         "module": "indexer",
         "params": [
@@ -765,7 +765,7 @@
         ]
     },
     {
-        "description": "Remove index for live cells and transaction by the hash of lock script.",
+        "description": "Remove index for live cells and transaction by the hash of lock script. Returns empty array when the `lock_hash` not indexed yet.",
         "method": "deindex_lock_hash",
         "module": "indexer",
         "params": [

util/app-config/src/app_config.rs

@@ -42,7 +42,7 @@ pub struct CKBAppConfig {
     pub block_assembler: Option<BlockAssemblerConfig>,
     #[serde(default)]
     pub db: DBConfig,
-    #[serde(skip)]
+    #[serde(default)]
     pub indexer_db: DBConfig,
     pub network: NetworkConfig,
     pub rpc: RpcConfig,