Merge pull request #1584 from nervosnetwork/master

nervosnetwork · Jan 18, 2024 · b7572b7 · b7572b7
2 parents 5657e8c + b87ce81
commit b7572b7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 39 deletions.
diff --git a/app/models/ckb_sync/api.rb b/app/models/ckb_sync/api.rb
@@ -22,11 +22,13 @@ def chain_type
     end
 
     def mode
-      if chain_type == "ckb"
-        CKB::MODE::MAINNET
-      else
-        CKB::MODE::TESTNET
-      end
+      # if chain_type == "ckb"
+      #   CKB::MODE::MAINNET
+      # else
+      #   CKB::MODE::TESTNET
+      # end
+
+      ENV["CKB_NET_MODE"]
     end
 
     def issuer_script_code_hash

diff --git a/app/models/ckb_sync/new_node_data_processor.rb b/app/models/ckb_sync/new_node_data_processor.rb
@@ -107,27 +107,31 @@ def process_block(node_block, refresh_balance: true)
 
       local_block
     end
+
     add_transaction_tracer :process_block, category: :task
-    add_method_tracer :build_udts!, "Custom/build_udt!"
-    add_method_tracer :process_ckb_txs, "Custom/process_ckb_txs"
-    add_method_tracer :build_cells_and_locks!, "Custom/build_cells_and_locks!"
+    add_method_tracer :build_udts!, "OtherTransaction/build_udt!"
+    add_method_tracer :process_ckb_txs, "OtherTransaction/process_ckb_txs"
+    add_method_tracer :build_cells_and_locks!,
+                      "OtherTransaction/build_cells_and_locks!"
     add_method_tracer :update_ckb_txs_rel_and_fee,
-                      "Custom/update_ckb_txs_rel_and_fee"
-    add_method_tracer :update_block_info!, "Custom/update_block_info!"
+                      "OtherTransaction/update_ckb_txs_rel_and_fee"
+    add_method_tracer :update_block_info!, "OtherTransaction/update_block_info!"
     add_method_tracer :update_block_reward_info!,
-                      "Custom/update_block_reward_info!"
-    add_method_tracer :update_mining_info, "Custom/update_mining_info"
+                      "OtherTransaction/update_block_reward_info!"
+    add_method_tracer :update_mining_info, "OtherTransaction/update_mining_info"
     add_method_tracer :update_table_records_count,
-                      "Custom/update_table_records_count"
+                      "OtherTransaction/update_table_records_count"
     add_method_tracer :update_or_create_udt_accounts!,
-                      "Custom/update_or_create_udt_accounts!"
-    add_method_tracer :update_udt_info, "Custom/update_udt_info"
-    add_method_tracer :process_dao_events!, "Custom/process_dao_events!"
-    add_method_tracer :update_addresses_info, "Custom/update_addresses_info"
+                      "OtherTransaction/update_or_create_udt_accounts!"
+    add_method_tracer :update_udt_info, "OtherTransaction/update_udt_info"
+    add_method_tracer :process_dao_events!,
+                      "OtherTransaction/process_dao_events!"
+    add_method_tracer :update_addresses_info,
+                      "OtherTransaction/update_addresses_info"
     add_method_tracer :generate_statistics_data,
-                      "Custom/generate_statistics_data"
+                      "OtherTransaction/generate_statistics_data"
     add_method_tracer :generate_deployed_cells_and_referring_cells,
-                      "Custom/generate_deployed_cells_and_referring_cells"
+                      "OtherTransaction/generate_deployed_cells_and_referring_cells"
 
     def check_invalid_address(address)
       if (address.balance < 0) || (address.balance_occupied < 0)

diff --git a/app/utils/ckb_utils.rb b/app/utils/ckb_utils.rb
@@ -404,25 +404,6 @@ def self.decode_header_deps(raw_header_deps)
   # @param [String] output_data
   # @return [String] cell type
   def self.cell_type(type_script, output_data)
-    if type_script&.code_hash == CkbSync::Api.instance.xudt_code_hash &&
-      ((ENV["CKB_NET_MODE"] == CKB::MODE::TESTNET && type_script&.hash_type == "type") ||
-        (ENV["CKB_NET_MODE"] == CKB::MODE::MAINNET && type_script&.hash_type == "data1"))
-      str = Kredis.string type_script.compute_hash
-      unless str.value
-        if OmigaInscriptionInfo.exists?(udt_hash: type_script.compute_hash)
-          str.value ="omiga_inscription"
-        else
-          str.value = "xudt"
-        end
-      end
-
-      return str.value
-    end
-
-    if type_script&.code_hash == CkbSync::Api.instance.omiga_inscription_info_code_hash
-      return "omiga_inscription_info"
-    end
-
     return "normal" unless ([
       Settings.dao_code_hash, Settings.dao_type_hash, Settings.sudt_cell_type_hash, Settings.sudt1_cell_type_hash,
       CkbSync::Api.instance.issuer_script_code_hash, CkbSync::Api.instance.token_class_script_code_hash,
@@ -436,7 +417,7 @@ def self.cell_type(type_script, output_data)
         CkbSync::Api.instance.spore_cluster_code_hash,
         *CkbSync::Api.instance.spore_cell_code_hashes,
       ].include?(type_script&.code_hash) && type_script&.hash_type == "data1" ||
-      ENV["CKB_NET_MODE"] == CKB::MODE::MAINNET && [CkbSync::Api.instance.xudt_code_hash].include?(type_script&.code_hash) && type_script&.hash_type == "data1"
+      CkbSync::Api.instance.mode == CKB::MODE::MAINNET && [CkbSync::Api.instance.xudt_code_hash].include?(type_script&.code_hash) && type_script&.hash_type == "data1"
 
     case type_script&.code_hash
     when Settings.dao_code_hash, Settings.dao_type_hash