Merge pull request #2590 from nervosnetwork/develop

Deploy to testnet

Author: zmcNotafraid

app/controllers/api/v1/address_live_cells_controller.rb

@@ -8,7 +8,7 @@ def show
 
         json = Addresses::LiveCells.run!(
           { request:,
-            key: params[:id], sort: params[:sort], bound_status: params[:bound_status],
+            key: params[:id], sort: params[:sort], bound_status: params[:bound_status], tag: params[:tag],
             page: params[:page], page_size: params[:page_size] },
         )
         render json:

app/interactions/addresses/live_cells.rb

@@ -8,20 +8,15 @@ class LiveCells < ActiveInteraction::Base
     string :sort, default: "block_timestamp.desc"
     integer :page, default: 1
     integer :page_size, default: CellOutput.default_per_page
+    string :tag, default: nil
 
     def execute
       address = Explore.run!(key:)
       raise AddressNotFoundError if address.is_a?(NullAddress)
 
       order_by, asc_or_desc = live_cells_ordering
-      if bound_status
-        bitcoin_vouts = BitcoinVout.where(address_id: address.map(&:id), status: bound_status)
-        records = CellOutput.live.where(id: bitcoin_vouts.map(&:cell_output_id)).order(order_by => asc_or_desc).
-          page(page).per(page_size).fast_page
-      else
-        records = CellOutput.live.where(address_id: address.map(&:id)).order(order_by => asc_or_desc).
-          page(page).per(page_size).fast_page
-      end
+      records = fetch_cell_output_scope(address)
+      records = records.order(order_by => asc_or_desc).page(page).per(page_size).fast_page
 
       options = FastJsonapi::PaginationMetaGenerator.new(request:, records:, page:, page_size:).call
       CellOutputSerializer.new(records, options).serialized_json
@@ -37,5 +32,42 @@ def live_cells_ordering
 
       [sort_by, sort_order]
     end
+
+    def fetch_cell_output_scope(address)
+      address_ids = address.map(&:id)
+
+      scope =
+        if bound_status
+          vout_ids = BitcoinVout.where(address_id: address_ids, status: bound_status).pluck(:cell_output_id)
+          CellOutput.live.where(id: vout_ids)
+        else
+          CellOutput.live.where(address_id: address_ids)
+        end
+
+      tag.present? ? filter_by_tag(scope) : scope
+    end
+
+    def filter_by_tag(scope)
+      case tag
+      when "fiber"
+        lock_script_ids = scope.where.not(lock_script_id: nil).distinct.pluck(:lock_script_id)
+        filtered_ids = LockScript.where(id: lock_script_ids, code_hash: Settings.fiber_funding_code_hash).pluck(:id)
+        scope.where(lock_script_id: filtered_ids)
+      when "multisig"
+        lock_script_ids = scope.where.not(lock_script_id: nil).distinct.pluck(:lock_script_id)
+        filtered_ids = LockScript.where(id: lock_script_ids).where(
+          "(code_hash = ? AND hash_type = ?) OR (code_hash = ? AND hash_type = ?)",
+          Settings.multisig_code_hash, "data1",
+          Settings.secp_multisig_cell_type_hash, "type"
+        ).pluck(:id)
+        scope.where(lock_script_id: filtered_ids)
+      when "deployment"
+        scope_ids = scope.pluck(:id)
+        matched_ids = Contract.where(deployed_cell_output_id: scope_ids).pluck(:deployed_cell_output_id)
+        scope.where(id: matched_ids)
+      else
+        CellOutput.none
+      end
+    end
   end
 end

lib/tasks/migration/check_cell_output_data.rake

@@ -8,17 +8,16 @@ namespace :migration do
                           write_timeout: 1
                         })
     (args[:start_block].to_i..args[:end_block].to_i).to_a.each_slice(100).to_a.each do |range|
-      compare_output(range, 0)
+      check_output(range, 0)
     end
-    nil
 
     puts "=============="
     puts "retry IDS:"
     puts $retry_ids.join(",")
     puts "done"
   end
 
-  def compare_output(range, retry_count)
+  def check_output(range, retry_count)
     request_body =
       range.map do |number|
         ["get_block_by_number", number]