Merge pull request #2850 from nervosnetwork/testnet

Deploy to mainnet

Author: u2

app/models/address.rb

@@ -228,8 +228,10 @@ def unmade_dao_interests
 #
 # Indexes
 #
-#  index_addresses_on_address_hash  (address_hash) USING hash
-#  index_addresses_on_is_depositor  (is_depositor) WHERE (is_depositor = true)
-#  index_addresses_on_lock_hash     (lock_hash) USING hash
-#  unique_lock_hash                 (lock_hash) UNIQUE
+#  index_addresses_on_address_hash     (address_hash) USING hash
+#  index_addresses_on_balance          (balance)
+#  index_addresses_on_block_timestamp  (block_timestamp)
+#  index_addresses_on_is_depositor     (is_depositor) WHERE (is_depositor = true)
+#  index_addresses_on_lock_hash        (lock_hash) USING hash
+#  unique_lock_hash                    (lock_hash) UNIQUE
 #

app/models/daily_statistic.rb

@@ -76,9 +76,23 @@ def liquidity
     else
       claimed_compensation_today = 0
 
-      DaoEvent.processed.withdraw_from_dao.consumed_between(started_at,
-                                                            ended_at).find_each do |dao_event|
-        nervos_dao_withdrawing_cell = CellOutput.find_by(ckb_transaction_id: dao_event.ckb_transaction_id, cell_index: dao_event.cell_index)
+      events = DaoEvent.processed.withdraw_from_dao.consumed_between(started_at, ended_at).select(:ckb_transaction_id, :cell_index).all
+
+      results = if events.blank?
+        []
+      else
+        pairs = events.map{|e| [e.ckb_transaction_id, e.cell_index] }
+        conditions = pairs.map do |tx_id, cell_idx|
+          ["ckb_transaction_id = #{tx_id} AND cell_index = #{cell_idx}"]
+        end
+        query = conditions.map do |cond|
+          "(#{cond[0]})"
+        end.join(" OR ")
+        CellOutput.where(query)
+      end
+
+
+      results.each do |nervos_dao_withdrawing_cell|
         claimed_compensation_today += CkbUtils.dao_interest(nervos_dao_withdrawing_cell)
       end
 
@@ -92,13 +106,16 @@ def liquidity
     sum_interest_bearing = 0
     sum_uninterest_bearing = 0
 
-    DaoEvent.processed.withdraw_from_dao.created_before(ended_at).unconsumed_at(ended_at).find_each do |nervos_dao_withdrawing_cell|
-      nervos_dao_deposit_cell = CellInput.find_by(ckb_transaction_id: nervos_dao_withdrawing_cell.ckb_transaction_id, index: nervos_dao_withdrawing_cell.cell_index).previous_cell_output
-      interest_bearing_deposits += nervos_dao_deposit_cell.capacity
-      sum_interest_bearing += nervos_dao_deposit_cell.capacity * (nervos_dao_withdrawing_cell.block_timestamp - nervos_dao_deposit_cell.block_timestamp) / MILLISECONDS_IN_DAY
+    phase1_cells.each do |nervos_dao_withdrawing_cell|
+      interest_bearing_deposits += nervos_dao_withdrawing_cell.capacity
+
+      block_number = CKB::Utils.hex_to_bin(nervos_dao_withdrawing_cell.data).unpack("Q<").pack("Q>").unpack1("H*").hex
+      nervos_dao_deposit_block_timestamp = Block.find_by_number(block_number).timestamp
+
+      sum_interest_bearing += nervos_dao_withdrawing_cell.capacity * (nervos_dao_withdrawing_cell.block_timestamp - nervos_dao_deposit_block_timestamp) / MILLISECONDS_IN_DAY
     end
 
-    DaoEvent.includes(:cell_output).processed.deposit_to_dao.created_before(ended_at).unconsumed_at(ended_at).find_each do |dao_event|
+    unmaed_cells.each do |dao_event|
       nervos_dao_deposit_cell = dao_event.cell_output
       uninterest_bearing_deposits += nervos_dao_deposit_cell.capacity
 
@@ -139,8 +156,7 @@ def liquidity
     if from_scratch
       CellOutput.generated_before(ended_at).unconsumed_at(ended_at).count
     else
-      CellOutput.generated_between(started_at, ended_at).count +
-        yesterday_daily_statistic.live_cells_count.to_i - dead_cells_count_today
+      CellOutput.generated_between(started_at, ended_at).count + yesterday_daily_statistic.live_cells_count.to_i - dead_cells_count_today
     end
   end
 
@@ -188,19 +204,27 @@ def liquidity
         end
       end
 
-    ranges.each_with_index.map do |range, index|
+    counts = ranges.each_with_index.map do |range, index|
       begin_value = range[0] * (10**8)
       end_value = range[1] * (10**8)
       if index == max_n - 1
         addresses_count = Address.visible.where("balance > ?", begin_value).count
-        total_addresses_count = Address.visible.where("balance > 0").count
       else
         addresses_count = Address.visible.where("balance > ? and balance <= ?", begin_value, end_value).count
-        total_addresses_count = Address.visible.where("balance > 0 and balance <= ?", end_value).count
       end
 
-      [range[1], addresses_count, total_addresses_count]
+      [range[1], addresses_count]
     end
+
+    total_addresses_count = 0
+    
+    results = []
+    counts.each do |c|
+      total_addresses_count += c[1]
+      results << [c[0], c[1], total_addresses_count]
+    end
+
+    results
   end
 
   define_logic :total_tx_fee do
@@ -480,22 +504,40 @@ def phase1_dao_interests
     @phase1_dao_interests ||=
       begin
         total = 0
-        DaoEvent.processed.withdraw_from_dao.
-          created_before(ended_at).unconsumed_at(ended_at).find_each do |dao_event|
-          nervos_dao_withdrawing_cell = CellOutput.find_by(ckb_transaction_id: dao_event.ckb_transaction_id, cell_index: dao_event.cell_index)
+        phase1_cells.each do |nervos_dao_withdrawing_cell|
           total += CkbUtils.dao_interest(nervos_dao_withdrawing_cell)
         end
         total
       end
   end
 
+  def phase1_cells
+    return @phase1_cells if @phase1_cells
+    events = DaoEvent.processed.withdraw_from_dao.created_before(ended_at).unconsumed_at(ended_at).select(:ckb_transaction_id, :cell_index).all
+    if events.blank?
+      return @phase1_cells = []
+    end
+
+    pairs = events.map{|e| [e.ckb_transaction_id, e.cell_index] }
+    conditions = pairs.map do |tx_id, cell_idx|
+      ["ckb_transaction_id = #{tx_id} AND cell_index = #{cell_idx}"]
+    end
+    query = conditions.map do |cond|
+      "(#{cond[0]})"
+    end.join(" OR ")
+    @phase1_cells = CellOutput.where(query).to_a
+  end
+
+  def unmaed_cells
+    @unmaed_cells ||= DaoEvent.includes(:cell_output).processed.deposit_to_dao.created_before(ended_at).unconsumed_at(ended_at).to_a
+  end
+
   def unmade_dao_interests
     @unmade_dao_interests ||=
       begin
         tip_dao = current_tip_block.dao
         total = 0
-        DaoEvent.includes(:cell_output).processed.deposit_to_dao.
-          created_before(ended_at).unconsumed_at(ended_at).find_each do |dao_event|
+        unmaed_cells.each do |dao_event|
           total += DaoCompensationCalculator.new(dao_event.cell_output, tip_dao).call
         end
         total

db/migrate/20251013082609_add_index_to_address.rb

@@ -0,0 +1,19 @@
+class AddIndexToAddress < ActiveRecord::Migration[7.0]
+  def change
+    table_name = :addresses
+    column_name = :balance
+    index_name = "index_#{table_name}_on_#{column_name}".to_sym
+    unless index_exists?(table_name, column_name)
+      execute('SET statement_timeout = 0;')
+      add_index table_name, column_name, name: index_name
+    end
+
+    table_name = :addresses
+    column_name = :block_timestamp
+    index_name = "index_#{table_name}_on_#{column_name}".to_sym
+    unless index_exists?(table_name, column_name)
+      execute('SET statement_timeout = 0;')
+      add_index table_name, column_name, name: index_name
+    end
+  end
+end

db/structure.sql

@@ -4397,6 +4397,20 @@ CREATE INDEX index_address_udt_transactions_on_ckb_transaction_id ON public.addr
 CREATE INDEX index_addresses_on_address_hash ON public.addresses USING hash (address_hash);
 
 
+--
+-- Name: index_addresses_on_balance; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_addresses_on_balance ON public.addresses USING btree (balance);
+
+
+--
+-- Name: index_addresses_on_block_timestamp; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_addresses_on_block_timestamp ON public.addresses USING btree (block_timestamp);
+
+
 --
 -- Name: index_addresses_on_is_depositor; Type: INDEX; Schema: public; Owner: -
 --
@@ -5990,6 +6004,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20250826022054'),
 ('20250827065749'),
 ('20250930015526'),
-('20251011011714');
+('20251011011714'),
+('20251013082609');