Merge released refs/heads/master into develop (#1573)

* feat: adjust halving miner reward (#1505) * fix: xudt mainnet hash_type was data1 Signed-off-by: Miles Zhang <[email protected]> --------- Signed-off-by: Miles Zhang <[email protected]> Co-authored-by: Miles Zhang <[email protected]> Co-authored-by: NanZhang <[email protected]>
nervosnetwork · Jan 16, 2024 · 9b711fb · 9b711fb
1 parent a8fa7ac
commit 9b711fb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/utils/ckb_utils.rb b/app/utils/ckb_utils.rb
@@ -416,7 +416,8 @@ 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"
+      ].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