Merge pull request #2444 from nervosnetwork/testnet

Deploy to mainnet

Author: zmcNotafraid

app/controllers/api/v2/nft/transfers_controller.rb

@@ -3,50 +3,18 @@ module V2
     module NFT
       class TransfersController < BaseController
         def index
-          if params[:collection_id].present?
-            if /\A\d+\z/.match?(params[:collection_id])
-              collection = TokenCollection.find params[:collection_id]
-            else
-              collection = TokenCollection.find_by_sn params[:collection_id]
-            end
-          end
-
-          if collection && params[:token_id]
-            item = collection.items.find_by token_id: params[:token_id]
-          end
-
-          if item
-            scope = item.transfers
-          elsif collection
-            scope = collection.transfers
-          else
-            scope = TokenTransfer.all
-          end
+          scope = TokenTransfer.all
 
-          if params[:from]
-            scope = scope.where(from: find_address(params[:from]))
-          end
-          if params[:to]
-            scope = scope.where(to: find_address(params[:to]))
-          end
-          if params[:address_hash]
-            address = find_address(params[:address_hash])
-            scope = scope.where(from: address).or(scope.where(to: address))
-          end
-          if params[:transfer_action]
-            scope = scope.where(action: params[:transfer_action])
-          end
-          if params[:tx_hash]
-            scope = scope.includes(:ckb_transaction).where(ckb_transaction: { tx_hash: params[:tx_hash] })
+          if params[:collection_id].present?
+            collection = find_collection(params[:collection_id])
+            scope = collection.present? ? filtered_by_token_id(collection) : TokenTransfer.none
           end
 
+          scope = apply_filters(scope)
           scope = scope.order(transaction_id: :desc)
           pagy, token_transfers = pagy(scope)
 
-          render json: {
-            data: token_transfers,
-            pagination: pagy
-          }
+          render json: { data: token_transfers, pagination: pagy }
         end
 
         def show
@@ -64,6 +32,36 @@ def download_csv
 
         private
 
+        def find_collection(collection_id)
+          if /\A\d+\z/.match?(collection_id)
+            TokenCollection.find_by(id: collection_id)
+          else
+            TokenCollection.find_by(sn: collection_id)
+          end
+        end
+
+        def filtered_by_token_id(collection)
+          if params[:token_id].present?
+            item = collection.items.find_by(token_id: params[:token_id])
+            item.nil? ? TokenTransfer.none : item.transfers
+          else
+            collection.transfers
+          end
+        end
+
+        def apply_filters(scope)
+          scope = scope.where(from: find_address(params[:from])) if params[:from].present?
+          scope = scope.where(to: find_address(params[:to])) if params[:to].present?
+          if params[:address_hash].present?
+            address = find_address(params[:address_hash])
+            scope = scope.where(from: address).or(scope.where(to: address))
+          end
+          scope = scope.where(action: params[:transfer_action]) if params[:transfer_action].present?
+          scope = scope.includes(:ckb_transaction).where(ckb_transaction: { tx_hash: params[:tx_hash] }) if params[:tx_hash].present?
+
+          scope
+        end
+
         def find_address(address_hash)
           Address.find_by_address_hash(address_hash)
         end

app/controllers/api/v2/scripts_controller.rb

@@ -18,10 +18,19 @@ def ckb_transactions
 
         contract_ids = @contracts.map { |contract| contract.id }
         contract_cell_ids = CellDepsOutPoint.list_contract_cell_ids_by_contract(contract_ids)
-        base_query = CkbTransaction.joins(:cell_dependencies).
-          where(cell_dependencies: { contract_cell_id: contract_cell_ids }).
-          order("cell_dependencies.block_number DESC, cell_dependencies.tx_index DESC").
-          limit(Settings.query_default_limit)
+        restrict_query =
+          if params[:restrict] == "true"
+            CkbTransaction.joins(:cell_dependencies).
+              where(cell_dependencies: { contract_cell_id: contract_cell_ids, is_used: true })
+          else
+            CkbTransaction.joins(:cell_dependencies).
+              where(cell_dependencies: { contract_cell_id: contract_cell_ids })
+          end
+
+        base_query =
+          restrict_query.
+            order("cell_dependencies.block_number DESC, cell_dependencies.tx_index DESC").
+            limit(Settings.query_default_limit)
         @ckb_transactions = CkbTransaction.from("(#{base_query.to_sql}) AS ckb_transactions").
           order("block_number DESC, tx_index DESC").
           page(@page).

app/models/cell_dependency.rb

@@ -1,15 +1,10 @@
-# this is the ReferringCell model, parse from `cell_deps` of transaction raw hash
 class CellDependency < ApplicationRecord
   belongs_to :ckb_transaction
   belongs_to :cell_output, foreign_key: "contract_cell_id", class_name: "CellOutput"
   belongs_to :cell_deps_out_point, foreign_key: :contract_cell_id, primary_key: :contract_cell_id, optional: true
 
   enum :dep_type, %i[code dep_group]
 
-  def self.refresh_implicit
-    connection.execute "SELECT update_cell_dependencies_implicit();"
-  end
-
   def to_raw
     {
       out_point: {
@@ -26,22 +21,18 @@ def to_raw
 # Table name: cell_dependencies
 #
 #  id                 :bigint           not null, primary key
-#  contract_id        :bigint
 #  ckb_transaction_id :bigint           not null
 #  dep_type           :integer
 #  contract_cell_id   :bigint           not null
-#  script_id          :bigint
-#  implicit           :boolean          default(TRUE), not null
 #  block_number       :bigint
 #  tx_index           :integer
 #  contract_analyzed  :boolean          default(FALSE)
+#  is_used            :boolean          default(TRUE)
 #
 # Indexes
 #
 #  index_cell_dependencies_on_block_number_and_tx_index       (block_number,tx_index)
 #  index_cell_dependencies_on_contract_analyzed               (contract_analyzed)
-#  index_cell_dependencies_on_contract_id                     (contract_id)
-#  index_cell_dependencies_on_script_id                       (script_id)
 #  index_cell_dependencies_on_tx_id_and_cell_id_and_dep_type  (ckb_transaction_id,contract_cell_id,dep_type) UNIQUE
 #  index_on_cell_dependencies_contract_cell_block_tx          (contract_cell_id,block_number DESC,tx_index DESC)
 #

app/workers/analyze_contract_from_cell_dependency_worker.rb

@@ -10,10 +10,8 @@ def perform
     cell_deps_attrs = Set.new
     contract_roles = Hash.new { |hash, key| hash[key] = {} }
 
-    # 加载未分析的依赖数据
     dependencies = load_unanalyzed_dependencies
 
-    # 按事务分组并逐组处理
     dependencies.each do |ckb_transaction_id, cell_deps|
       ckb_transaction = CkbTransaction.find(ckb_transaction_id)
       lock_scripts, type_scripts = analyze_scripts(ckb_transaction)
@@ -29,61 +27,62 @@ def perform
       )
     end
 
-    # 持久化数据
     save_cell_deps_out_points(cell_deps_out_points_attrs)
     save_contracts(contract_attrs, contract_roles)
     save_cell_dependencies(cell_deps_attrs)
   end
 
   private
 
-  # 加载未分析的依赖数据
   def load_unanalyzed_dependencies
     CellDependency.where(contract_analyzed: false).
       where.not(block_number: nil).
       limit(200).
       group_by(&:ckb_transaction_id)
   end
 
-  # 分析脚本
   def analyze_scripts(ckb_transaction)
     lock_scripts = {}
     type_scripts = {}
 
     cell_outputs = ckb_transaction.cell_outputs.includes(:type_script).to_a
     cell_inputs = ckb_transaction.cell_inputs.includes(:previous_cell_output).map(&:previous_cell_output)
 
-    (cell_inputs + cell_outputs).each do |cell|
+    cell_inputs.each do |cell|
       lock_scripts[cell.lock_script.code_hash] = cell.lock_script.hash_type
       if cell.type_script
         type_scripts[cell.type_script.code_hash] = cell.type_script.hash_type
       end
     end
+    cell_outputs.each do |cell|
+      if cell.type_script
+        type_scripts[cell.type_script.code_hash] = cell.type_script.hash_type
+      end
+    end
 
     [lock_scripts, type_scripts]
   end
 
-  # 处理每个依赖
   def process_cell_dependencies(cell_deps, lock_scripts, type_scripts, out_points_attrs, contract_attrs, cell_deps_attrs, contract_roles)
     cell_deps.each do |cell_dep|
+      is_used =
+        case cell_dep.dep_type
+        when "code"
+          process_code_dep(cell_dep, lock_scripts, type_scripts, out_points_attrs, contract_attrs, contract_roles)
+        when "dep_group"
+          process_dep_group(cell_dep, lock_scripts, type_scripts, out_points_attrs, contract_attrs, contract_roles)
+        end
+
       cell_deps_attrs << {
         contract_analyzed: true,
+        is_used:,
         ckb_transaction_id: cell_dep.ckb_transaction_id,
         contract_cell_id: cell_dep.contract_cell_id,
         dep_type: cell_dep.dep_type,
       }
-      next if Contract.joins(:cell_deps_out_points).where(cell_deps_out_points: { contract_cell_id: cell_dep.contract_cell_id }).exists?
-
-      case cell_dep.dep_type
-      when "code"
-        process_code_dep(cell_dep, lock_scripts, type_scripts, out_points_attrs, contract_attrs, contract_roles)
-      when "dep_group"
-        process_dep_group(cell_dep, lock_scripts, type_scripts, out_points_attrs, contract_attrs, contract_roles)
-      end
     end
   end
 
-  # 处理 "code" 类型依赖
   def process_code_dep(cell_dep, lock_scripts, type_scripts, out_points_attrs, contract_attrs, contract_roles)
     cell_output = cell_dep.cell_output
     out_points_attrs << {
@@ -96,15 +95,18 @@ def process_code_dep(cell_dep, lock_scripts, type_scripts, out_points_attrs, con
     update_contract_roles(cell_output, lock_scripts, type_scripts, contract_roles)
 
     if contract_roles[cell_output.id][:is_lock_script] || contract_roles[cell_output.id][:is_type_script]
-      contract_attrs << build_contract_attr(cell_output, lock_scripts, type_scripts)
+      contract_attrs << build_contract_attr(cell_output)
+      true
+    else
+      false
     end
   end
 
-  # 处理 "dep_group" 类型依赖
   def process_dep_group(cell_dep, lock_scripts, type_scripts, out_points_attrs, contract_attrs, contract_roles)
     mid_cell = cell_dep.cell_output
     binary_data = mid_cell.binary_data
     out_points_count = binary_data[0, 4].unpack1("L<")
+    is_used = false
 
     0.upto(out_points_count - 1) do |i|
       part_tx_hash, cell_index = binary_data[4 + i * 36, 36].unpack("H64L<")
@@ -121,12 +123,13 @@ def process_dep_group(cell_dep, lock_scripts, type_scripts, out_points_attrs, co
       update_contract_roles(cell_output, lock_scripts, type_scripts, contract_roles)
 
       if contract_roles[cell_output.id][:is_lock_script] || contract_roles[cell_output.id][:is_type_script]
-        contract_attrs << build_contract_attr(cell_output, lock_scripts, type_scripts)
+        contract_attrs << build_contract_attr(cell_output)
+        is_used = is_used || true
       end
     end
+    is_used
   end
 
-  # 更新 contract_roles
   def update_contract_roles(cell_output, lock_scripts, type_scripts, contract_roles)
     is_lock_script = (lock_scripts[cell_output.data_hash] || lock_scripts[cell_output.type_script&.script_hash]).present?
     is_type_script = (type_scripts[cell_output.data_hash] || type_scripts[cell_output.type_script&.script_hash]).present?
@@ -137,8 +140,7 @@ def update_contract_roles(cell_output, lock_scripts, type_scripts, contract_role
     contract_roles[cell_output.id][:hash_type] ||= data_type
   end
 
-  # 构建单个合约属性
-  def build_contract_attr(cell_output, _lock_scripts, _type_scripts)
+  def build_contract_attr(cell_output)
     {
       type_hash: cell_output.type_script&.script_hash,
       data_hash: cell_output.data_hash,
@@ -147,7 +149,6 @@ def build_contract_attr(cell_output, _lock_scripts, _type_scripts)
     }
   end
 
-  # 保存数据
   def save_cell_deps_out_points(attrs)
     CellDepsOutPoint.upsert_all(attrs.to_a, unique_by: %i[contract_cell_id deployed_cell_output_id]) if attrs.any?
   end
@@ -160,6 +161,6 @@ def save_contracts(attrs, roles)
   end
 
   def save_cell_dependencies(attrs)
-    CellDependency.upsert_all(attrs.to_a, unique_by: %i[ckb_transaction_id contract_cell_id dep_type], update_only: :contract_analyzed) if attrs.any?
+    CellDependency.upsert_all(attrs.to_a, unique_by: %i[ckb_transaction_id contract_cell_id dep_type], update_only: %i[contract_analyzed is_used]) if attrs.any?
   end
 end

db/migrate/20250218062041_add_is_used_to_cell_dependencies.rb

@@ -0,0 +1,9 @@
+class AddIsUsedToCellDependencies < ActiveRecord::Migration[7.0]
+  def change
+    remove_column :cell_dependencies, :contract_id, :bigint
+    remove_column :cell_dependencies, :script_id, :bigint
+    remove_column :cell_dependencies, :implicit, :boolean
+
+    add_column :cell_dependencies, :is_used, :boolean, default: true
+  end
+end

db/structure.sql

@@ -1044,15 +1044,13 @@ ALTER SEQUENCE public.cell_data_cell_output_id_seq OWNED BY public.cell_data.cel
 
 CREATE TABLE public.cell_dependencies (
     id bigint NOT NULL,
-    contract_id bigint,
     ckb_transaction_id bigint NOT NULL,
     dep_type integer,
     contract_cell_id bigint NOT NULL,
-    script_id bigint,
-    implicit boolean DEFAULT true NOT NULL,
     block_number bigint,
     tx_index integer,
-    contract_analyzed boolean DEFAULT false
+    contract_analyzed boolean DEFAULT false,
+    is_used boolean DEFAULT true
 );
 
 
@@ -4970,20 +4968,6 @@ CREATE INDEX index_cell_dependencies_on_block_number_and_tx_index ON public.cell
 CREATE INDEX index_cell_dependencies_on_contract_analyzed ON public.cell_dependencies USING btree (contract_analyzed);
 
 
---
--- Name: index_cell_dependencies_on_contract_id; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX index_cell_dependencies_on_contract_id ON public.cell_dependencies USING btree (contract_id);
-
-
---
--- Name: index_cell_dependencies_on_script_id; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX index_cell_dependencies_on_script_id ON public.cell_dependencies USING btree (script_id);
-
-
 --
 -- Name: index_cell_dependencies_on_tx_id_and_cell_id_and_dep_type; Type: INDEX; Schema: public; Owner: -
 --
@@ -6379,6 +6363,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20241231022644'),
 ('20250103072945'),
 ('20250108053433'),
-('20250126022459');
+('20250126022459'),
+('20250218062041');