chore: fix suggest query param validation (#1671)

nervosnetwork · Mar 12, 2024 · 76bc5fe · 76bc5fe
1 parent 5c56865
commit 76bc5fe
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/app/controllers/api/v2/ckb_transactions_controller.rb b/app/controllers/api/v2/ckb_transactions_controller.rb
@@ -54,19 +54,19 @@ def display_outputs
       def rgb_digest
         expires_in 10.seconds, public: true, must_revalidate: true
 
-        transfers = combine_transfers(@transaction).map do |address_id, transfers|
-          vout = BitcoinVout.include(:bitcoin_address).find_by(address_id:)
+        transfers = combine_transfers(@ckb_transaction).map do |address_id, transfers|
+          vout = BitcoinVout.includes(:bitcoin_address).find_by(address_id:)
           next unless vout
 
           { address: vout.bitcoin_address.address_hash, transfers: }
         end
-        vout = @transaction.bitcoin_vouts.find_by(op_return: true)
+        vout = @ckb_transaction.bitcoin_vouts.find_by(op_return: true)
 
         render json: {
           data: {
-            txid: vout.bitcoin_transaction.txid,
-            confirmations: vout.bitcoin_transaction.confirmations,
-            commitment: vout.bitcoin_transaction.commitment,
+            txid: vout&.bitcoin_transaction&.txid,
+            confirmations: vout&.bitcoin_transaction&.confirmations,
+            commitment: vout&.commitment,
             transfers:,
           },
         }

diff --git a/app/controllers/validations/suggest_query.rb b/app/controllers/validations/suggest_query.rb
@@ -15,7 +15,7 @@ def error_object
         api_errors << Api::V1::Exceptions::SuggestQueryKeyInvalidError.new if :query_key.in?(errors.attribute_names)
         {
           status: api_errors.first.status,
-          errors: RequestErrorSerializer.new(api_errors, message: api_errors.first.title)
+          errors: RequestErrorSerializer.new(api_errors, message: api_errors.first.title),
         }
       end
     end
@@ -25,7 +25,13 @@ def error_object
     attr_accessor :query_key
 
     def query_key_format_must_be_correct
-      if query_key.blank? || (!QueryKeyUtils.integer_string?(query_key) && !QueryKeyUtils.valid_hex?(query_key) && !QueryKeyUtils.valid_address?(query_key))
+      query_key_invalid =
+        !QueryKeyUtils.integer_string?(query_key) &&
+        !QueryKeyUtils.valid_hex?(query_key) &&
+        !QueryKeyUtils.valid_address?(query_key) &&
+        !QueryKeyUtils.valid_bitcoin_txid?(query_key)
+
+      if query_key.blank? || query_key_invalid
         errors.add(:query_key, "query key is invalid")
       end
     end

diff --git a/app/workers/bitcoin_transaction_detect_worker.rb b/app/workers/bitcoin_transaction_detect_worker.rb
@@ -76,7 +76,7 @@ def build_vouts!
 
     return if vout_attributes.blank?
 
-    `BitcoinVout`.upsert_all(vout_attributes, unique_by: %i[bitcoin_transaction_id index])
+    BitcoinVout.upsert_all(vout_attributes, unique_by: %i[bitcoin_transaction_id index])
   end
 
   def build_tx!(raw_tx)