Merge pull request #2610 from nervosnetwork/testnet

zmcNotafraid · web-flow · commit 3a0a5631f288 · 2025-07-08T10:56:03.000Z
Deploy to mainnet
diff --git a/app/jobs/revert_block_job.rb b/app/jobs/revert_block_job.rb
@@ -144,7 +144,7 @@ def revert_withdraw_from_dao(dao_events)
     withdraw_from_dao_events = dao_events.includes(:address).withdraw_from_dao
 
     ids = withdraw_from_dao_events.pluck(:ckb_transaction_id)
-    DaoEvent.processed.where(withdrawn_transaction_id: ids).update_all(withdrawn_transaction_id: nil)
+    DaoEvent.processed.where(consumed_transaction_id: ids).update_all(consumed_transaction_id: nil)
 
     redundant_total_deposit = 0
     address_attrs = {}
diff --git a/app/models/ckb_sync/new_node_data_processor.rb b/app/models/ckb_sync/new_node_data_processor.rb
@@ -223,8 +223,12 @@ def process_withdraw_dao_events!(local_block, dao_contract)
             addrs_withdraw_info[address.id][:is_depositor] = false
           end
 
-          updated_deposit_dao_events_attributes << { block_id: previous_cell_output.block_id, ckb_transaction_id: previous_cell_output.ckb_transaction_id, cell_index: dao_input.index, event_type: "deposit_to_dao",
-                                                     withdrawn_transaction_id: dao_input.ckb_transaction_id }
+          updated_deposit_dao_events_attributes << { block_id: previous_cell_output.block_id,
+                                                     ckb_transaction_id: previous_cell_output.ckb_transaction_id,
+                                                     cell_index: previous_cell_output.cell_index,
+                                                     event_type: "deposit_to_dao",
+                                                     consumed_transaction_id: dao_input.ckb_transaction_id,
+                                                     consumed_block_timestamp: local_block.timestamp }
           dao_events_attributes << {
             ckb_transaction_id: dao_input.ckb_transaction_id,
             cell_index: dao_input.index,
@@ -242,7 +246,7 @@ def process_withdraw_dao_events!(local_block, dao_contract)
         DaoEvent.upsert_all(dao_events_attributes, unique_by: %i[block_id ckb_transaction_id cell_index event_type]) if dao_events_attributes.present?
         if updated_deposit_dao_events_attributes.present?
           DaoEvent.upsert_all(updated_deposit_dao_events_attributes, unique_by: %i[block_id ckb_transaction_id cell_index event_type],
-                                                                     update_only: :withdrawn_transaction_id)
+                                                                     update_only: %i[consumed_transaction_id consumed_block_timestamp])
         end
       end
 
@@ -263,6 +267,7 @@ def process_interest_dao_events!(local_block, dao_contract)
       local_block.cell_inputs.nervos_dao_withdrawing.select(:id, :ckb_transaction_id, :block_id, :index,
                                                             :previous_cell_output_id).find_in_batches do |dao_inputs|
         dao_events_attributes = []
+        updated_withdraw_dao_events_attributes = []
         dao_inputs.each do |dao_input|
           previous_cell_output = CellOutput.
             where(id: dao_input.previous_cell_output_id).
@@ -277,6 +282,13 @@ def process_interest_dao_events!(local_block, dao_contract)
               interest: address.interest.to_i + interest,
             }
           end
+          updated_withdraw_dao_events_attributes << { block_id: previous_cell_output.block_id,
+                                                      ckb_transaction_id: previous_cell_output.ckb_transaction_id,
+                                                      cell_index: previous_cell_output.cell_index,
+                                                      event_type: "withdraw_from_dao",
+                                                      consumed_transaction_id: dao_input.ckb_transaction_id,
+                                                      consumed_block_timestamp: local_block.timestamp }
+
           # addrs_withdraw_info[address.id][:dao_deposit] = 0 if addrs_withdraw_info[address.id][:dao_deposit] < 0
           dao_events_attributes << {
             ckb_transaction_id: dao_input.ckb_transaction_id,
@@ -292,6 +304,10 @@ def process_interest_dao_events!(local_block, dao_contract)
           claimed_compensation += interest
         end
         DaoEvent.upsert_all(dao_events_attributes, unique_by: %i[block_id ckb_transaction_id cell_index event_type]) if dao_events_attributes.present?
+        if updated_withdraw_dao_events_attributes.present?
+          DaoEvent.upsert_all(updated_withdraw_dao_events_attributes, unique_by: %i[block_id ckb_transaction_id cell_index event_type],
+                                                                      update_only: %i[consumed_transaction_id consumed_block_timestamp])
+        end
       end
       # update dao contract info
       dao_contract.update!(
@@ -326,6 +342,7 @@ def process_deposit_dao_events!(local_block, dao_contract)
           dao_events_attributes << {
             ckb_transaction_id: dao_output.ckb_transaction_id,
             cell_index: dao_output.cell_index,
+            cell_output_id: dao_output.id,
             block_id: local_block.id,
             address_id: address.id,
             event_type: "deposit_to_dao",
diff --git a/app/models/daily_statistic.rb b/app/models/daily_statistic.rb
@@ -46,7 +46,7 @@ def liquidity
   end
 
   define_logic :block_timestamp do
-    blocks_in_current_period.recent.pick(:timestamp)
+    current_tip_block.timestamp
   end
 
   define_logic :total_dao_deposit do
@@ -151,8 +151,8 @@ def liquidity
   end
 
   define_logic :avg_hash_rate do
-    first_block_for_the_day = blocks_in_current_period.order("timestamp asc").first
-    last_block_for_the_day = blocks_in_current_period.recent.first
+    first_block_for_the_day = current_start_block
+    last_block_for_the_day = current_tip_block
     total_block_time = last_block_for_the_day.timestamp - first_block_for_the_day.timestamp
 
     BigDecimal(total_difficulties_for_the_day) / total_block_time
@@ -440,12 +440,29 @@ def ended_at
     @ended_at ||= CkbUtils.time_in_milliseconds(to_be_counted_date.end_of_day) - 1
   end
 
+  def current_start_block
+    @current_start_block ||=
+      begin
+        end_at = started_at + (1 * 60 * 1000)
+        start_block = Block.created_between(started_at, end_at).order("number asc").first
+        unless start_block
+          end_at = started_at + (10 * 60 * 1000)
+          start_block = Block.created_between(started_at, end_at).order("number asc").first
+        end
+        start_block || Block.first
+      end
+  end
+
   def current_tip_block
     @current_tip_block ||=
-      if from_scratch
-        Block.created_before(ended_at).recent.first
-      else
-        blocks_in_current_period.recent.first || Block.recent.first
+      begin
+        start_at = ended_at - (1 * 60 * 1000)
+        tip_block = Block.created_between(start_at, ended_at).recent.first
+        unless tip_block
+          start_at = ended_at - (10 * 60 * 1000)
+          tip_block = Block.created_between(start_at, ended_at).recent.first
+        end
+        tip_block || Block.recent.first
       end
   end
 
diff --git a/app/models/dao_event.rb b/app/models/dao_event.rb
@@ -14,8 +14,10 @@ class DaoEvent < ApplicationRecord
   belongs_to :block
   belongs_to :ckb_transaction
   belongs_to :address
+  belongs_to :consumed_transaction, class_name: "CkbTransaction", optional: true
+  belongs_to :cell_output, optional: true
 
-  scope :depositor, -> { processed.where(event_type: "deposit_to_dao", withdrawn_transaction_id: nil) }
+  scope :depositor, -> { processed.where(event_type: "deposit_to_dao", consumed_transaction_id: nil) }
   scope :created_after, ->(block_timestamp) { where("block_timestamp >= ?", block_timestamp) }
   scope :created_before, ->(block_timestamp) { where("block_timestamp <= ?", block_timestamp) }
   scope :created_between, ->(start_block_timestamp, end_block_timestamp) {
@@ -38,8 +40,10 @@ class DaoEvent < ApplicationRecord
 #  created_at               :datetime         not null
 #  updated_at               :datetime         not null
 #  block_timestamp          :decimal(30, )
-#  withdrawn_transaction_id :bigint
+#  consumed_transaction_id  :bigint
 #  cell_index               :integer
+#  consumed_block_timestamp :decimal(20, )
+#  cell_output_id           :bigint
 #
 # Indexes
 #
diff --git a/db/migrate/20250708075759_add_consumed_block_timestamp_to_dao_events.rb b/db/migrate/20250708075759_add_consumed_block_timestamp_to_dao_events.rb
@@ -0,0 +1,7 @@
+class AddConsumedBlockTimestampToDaoEvents < ActiveRecord::Migration[7.0]
+  def change
+    rename_column :dao_events, :withdrawn_transaction_id, :consumed_transaction_id
+    add_column :dao_events, :consumed_block_timestamp, :decimal, precision: 20, scale: 0
+    add_column :dao_events, :cell_output_id, :bigint
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
@@ -174,7 +174,7 @@ begin
         insert into account_books (ckb_transaction_id, address_id)
         values (row.id, i) ON CONFLICT DO NOTHING;
         end loop;
-    END LOOP;    
+    END LOOP;
     close c;
 end
 $$;
@@ -196,21 +196,21 @@ DECLARE
    if new.contained_address_ids is null then
    	new.contained_address_ids := array[]::int[];
 	end if;
-	if old is null 
+	if old is null
 	then
 		to_add := new.contained_address_ids;
 		to_remove := array[]::int[];
 	else
-	
+
 	   to_add := array_subtract(new.contained_address_ids, old.contained_address_ids);
-	   to_remove := array_subtract(old.contained_address_ids, new.contained_address_ids);	
+	   to_remove := array_subtract(old.contained_address_ids, new.contained_address_ids);
 	end if;
 
    if to_add is not null then
 	   FOREACH i IN ARRAY to_add
-	   LOOP 
+	   LOOP
 	   	RAISE NOTICE 'ckb_tx_addr_id(%)', i;
-			insert into account_books (ckb_transaction_id, address_id) 
+			insert into account_books (ckb_transaction_id, address_id)
 			values (new.id, i);
 	   END LOOP;
 	end if;
@@ -1647,8 +1647,10 @@ CREATE TABLE public.dao_events (
     created_at timestamp(6) without time zone NOT NULL,
     updated_at timestamp(6) without time zone NOT NULL,
     block_timestamp numeric(30,0),
-    withdrawn_transaction_id bigint,
-    cell_index integer
+    consumed_transaction_id bigint,
+    cell_index integer,
+    consumed_block_timestamp numeric(20,0),
+    cell_output_id bigint
 );
 
 
@@ -6528,6 +6530,5 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20250513034909'),
 ('20250617013030'),
 ('20250617051653'),
-('20250625024348');
-
-
+('20250625024348'),
+('20250708075759');
diff --git a/test/models/ckb_sync/dao_events_test.rb b/test/models/ckb_sync/dao_events_test.rb
diff --git a/test/models/dao_event_test.rb b/test/models/dao_event_test.rb
diff --git a/test/services/charts/daily_statistic_generator_test.rb b/test/services/charts/daily_statistic_generator_test.rb
