chore: update bitcoin txid query (#1687)

nervosnetwork · Mar 19, 2024 · b3c7109 · b3c7109
1 parent bced8c5
commit b3c7109
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/app/controllers/validations/suggest_query.rb b/app/controllers/validations/suggest_query.rb
@@ -28,8 +28,7 @@ def query_key_format_must_be_correct
       query_key_invalid =
         !QueryKeyUtils.integer_string?(query_key) &&
         !QueryKeyUtils.valid_hex?(query_key) &&
-        !QueryKeyUtils.valid_address?(query_key) &&
-        !QueryKeyUtils.valid_bitcoin_txid?(query_key)
+        !QueryKeyUtils.valid_address?(query_key)
 
       if query_key.blank? || query_key_invalid
         errors.add(:query_key, "query key is invalid")

diff --git a/app/models/suggest_query.rb b/app/models/suggest_query.rb
@@ -19,8 +19,6 @@ def find_record_by_query_key!
         find_by_hex
       elsif QueryKeyUtils.valid_address?(query_key)
         find_cached_address
-      elsif QueryKeyUtils.valid_bitcoin_txid?(query_key)
-        find_bitcoin_transaction_by_txid
       end
 
     raise ActiveRecord::RecordNotFound if result.blank?
@@ -67,11 +65,13 @@ def find_by_hex
       find_ckb_transaction_by_hash ||
       find_address_by_lock_hash ||
       find_udt_by_type_hash ||
-      find_type_script_by_type_id
+      find_type_script_by_type_id ||
+      find_bitcoin_transaction_by_txid
   end
 
   def find_bitcoin_transaction_by_txid
-    bitcoin_transaction = BitcoinTransaction.find_by(txid: query_key)
+    txid = query_key.delete_prefix(Settings.default_hash_prefix)
+    bitcoin_transaction = BitcoinTransaction.find_by(txid:)
     BitcoinTransactionSerializer.new(bitcoin_transaction) if bitcoin_transaction
   end
 end
diff --git a/app/utils/query_key_utils.rb b/app/utils/query_key_utils.rb
@@ -25,9 +25,5 @@ def valid_address?(query_key)
     rescue StandardError
       nil
     end
-
-    def valid_bitcoin_txid?(query_key)
-      BitcoinTransaction.exists?(txid: query_key)
-    end
   end
 end