Merge pull request #2891 from nervosnetwork/develop

Deploy to testnet

Author: u2

app/models/address.rb

@@ -222,7 +222,6 @@ def unmade_dao_interests
 #  average_deposit_time      :bigint
 #  unclaimed_compensation    :decimal(30, )
 #  is_depositor              :boolean          default(FALSE)
-#  dao_transactions_count    :bigint           default(0)
 #  lock_script_id            :bigint
 #  balance_occupied          :decimal(30, )    default(0)
 #  last_updated_block_number :bigint

app/models/address_block_snapshot.rb

@@ -8,7 +8,7 @@ class NewNodeDataProcessor
     include Redis::Objects
 
     value :reorg_started_at, global: true
-    attr_accessor :local_tip_block, :pending_raw_block, :ckb_txs, :target_block, :target_block_number, :addrs_changes,
+    attr_accessor :local_tip_block, :pending_raw_block, :ckb_txs, :target_block, :target_block_number,
                   :outputs, :inputs, :outputs_data, :udt_address_ids, :contained_address_ids,
                   :contained_udt_ids, :cell_datas, :enable_cota, :token_transfer_ckb_tx_ids, :addr_tx_changes, :redis_keys, :tx_previous_outputs
 
@@ -75,11 +75,10 @@ def process_block(node_block, refresh_balance: true)
 
         benchmark :process_ckb_txs, node_block, ckb_txs, contained_address_ids,
                   contained_udt_ids, tags, udt_address_ids
-        @addrs_changes = Hash.new { |hash, key| hash[key] = {} }
         @addr_tx_changes = Hash.new { |h, k| h[k] = Hash.new(0) }
 
         input_capacities, output_capacities = benchmark :build_cells_and_locks!, local_block, node_block, ckb_txs, inputs, outputs,
-                                                        tags, udt_address_ids, contained_udt_ids, contained_address_ids, addrs_changes, token_transfer_ckb_tx_ids, cell_deps
+                                                        tags, udt_address_ids, contained_udt_ids, contained_address_ids, token_transfer_ckb_tx_ids, cell_deps
 
         # update explorer data
         benchmark :update_ckb_txs_rel_and_fee, ckb_txs, tags, input_capacities, output_capacities, udt_address_ids,
@@ -91,7 +90,6 @@ def process_block(node_block, refresh_balance: true)
         benchmark :update_or_create_udt_accounts!, local_block
         # maybe can be changed to asynchronous update
         benchmark :process_dao_events!, local_block
-        # benchmark :update_addresses_info, addrs_changes, local_block, refresh_balance
       end
 
       async_update_udt_infos(local_block)
@@ -732,7 +730,7 @@ def update_ckb_txs_rel_and_fee(
 
     def build_cells_and_locks!(
       local_block, node_block, ckb_txs, inputs, outputs, tags, udt_address_ids,
-       contained_udt_ids, contained_addr_ids, addrs_changes, token_transfer_ckb_tx_ids, cell_deps
+       contained_udt_ids, contained_addr_ids, token_transfer_ckb_tx_ids, cell_deps
     )
       cell_outputs_attributes = []
       cell_inputs_attributes = []
@@ -755,7 +753,7 @@ def build_cells_and_locks!(
       build_addresses!(outputs, local_block)
 
       build_cell_outputs!(node_block, outputs, ckb_txs, local_block, cell_outputs_attributes, output_capacities, tags,
-                          udt_address_ids, contained_udt_ids, contained_addr_ids, addrs_changes, token_transfer_ckb_tx_ids)
+                          udt_address_ids, contained_udt_ids, contained_addr_ids, token_transfer_ckb_tx_ids)
       if cell_outputs_attributes.present?
         tx_hashes = cell_outputs_attributes.pluck(:tx_hash)
         binary_hashes = CkbUtils.hexes_to_bins_sql(tx_hashes)
@@ -812,7 +810,7 @@ def build_cells_and_locks!(
       prev_outputs = nil
       build_cell_inputs(inputs, ckb_txs, local_block.id, cell_inputs_attributes, prev_cell_outputs_attributes,
                         input_capacities, tags, udt_address_ids, contained_udt_ids, contained_addr_ids,
-                        prev_outputs, addrs_changes, token_transfer_ckb_tx_ids)
+                        prev_outputs, token_transfer_ckb_tx_ids)
 
       CellInput.import cell_inputs_attributes, validate: false, batch_size: 500
       if prev_cell_outputs_attributes.present?
@@ -920,7 +918,7 @@ def script_attributes(script, script_hash)
 
     def build_cell_inputs(
       inputs, ckb_txs, local_block_id, cell_inputs_attributes, prev_cell_outputs_attributes,
-input_capacities, tags, udt_address_ids, contained_udt_ids, contained_addr_ids, prev_outputs, addrs_changes, token_transfer_ckb_tx_ids
+input_capacities, tags, udt_address_ids, contained_udt_ids, contained_addr_ids, prev_outputs, token_transfer_ckb_tx_ids
     )
       conditions = []
 
@@ -960,7 +958,6 @@ def build_cell_inputs(
           # attributes[2] is previous_cell_output capacity
           # attributes[3] is previous_cell_output type_hash
           # attributes[4] is previous_cell address_id
-          # attributes[5] is previous_cell data
           attributes = cell_input_attributes(item, ckb_txs[tx_index]["id"],
                                              local_block_id, prev_outputs, index)
           cell_inputs_attributes << attributes[:cell_input]
@@ -969,28 +966,13 @@ def build_cell_inputs(
             address_id = attributes[:address_id]
             capacity = attributes[:capacity]
             type_hash = attributes[:type_hash]
-            data = attributes[:data]
-            change_rec = addrs_changes[address_id]
-
             addr_tx_changes[tx_index][address_id] -= capacity
-            change_rec[:balance_diff] ||= 0
-            change_rec[:balance_diff]  -= capacity
-            change_rec[:balance_occupied_diff] ||= 0
-            change_rec[:balance_occupied_diff] -= capacity if occupied?(
-              type_hash, data
-            )
-            change_rec[:cells_diff] ||= 0
-            change_rec[:cells_diff] -= 1
-            change_rec[:ckb_txs] ||= Set.new
-            change_rec[:ckb_txs] << ckb_txs[tx_index]["tx_hash"]
 
             prev_cell_outputs_attributes << previous_output
             contained_addr_ids[tx_index] << address_id
             cell_type = previous_output[:cell_type].to_s
             if cell_type.in?(%w(nervos_dao_withdrawing))
               tags[tx_index] << "dao"
-              change_rec[:dao_txs] ||= Set.new
-              change_rec[:dao_txs] << ckb_txs[tx_index]["tx_hash"]
             elsif cell_type.in?(%w(m_nft_token nrc_721_token spore_cell did_cell))
               token_transfer_ckb_tx_ids << ckb_txs[tx_index]["id"]
             end
@@ -1038,7 +1020,7 @@ def build_cell_inputs(
 
     def build_cell_outputs!(
       node_block, outputs, ckb_txs, local_block, cell_outputs_attributes, output_capacities,
-tags, udt_address_ids, contained_udt_ids, contained_addr_ids, addrs_changes, token_transfer_ckb_tx_ids
+tags, udt_address_ids, contained_udt_ids, contained_addr_ids, token_transfer_ckb_tx_ids
     )
       outputs.each do |tx_index, items|
         cell_index = 0
@@ -1061,24 +1043,9 @@ def build_cell_outputs!(
               @redis_keys << key
             end
           end
-          cell_data = node_block.transactions[tx_index].outputs_data[cell_index]
-          change_rec = addrs_changes[address_id]
+          
           addr_tx_changes[tx_index][address_id] += item.capacity
-
-          change_rec[:balance_diff] ||= 0
-          change_rec[:balance_diff] += item.capacity
-
-          change_rec[:balance_occupied_diff] ||= 0
           type_script_hash = item.type&.compute_hash
-          change_rec[:balance_occupied_diff] += item.capacity if occupied?(
-            type_script_hash, cell_data
-          )
-
-          change_rec[:cells_diff] ||= 0
-          change_rec[:cells_diff] += 1
-
-          change_rec[:ckb_txs] ||= Set.new
-          change_rec[:ckb_txs] << ckb_txs[tx_index]["tx_hash"]
 
           contained_addr_ids[tx_index] << address_id
           attr = cell_output_attributes(item, address_id, ckb_txs[tx_index], local_block, cell_index,
@@ -1087,8 +1054,6 @@ def build_cell_outputs!(
 
           if attr[:cell_type].in?(%w(nervos_dao_deposit nervos_dao_withdrawing))
             tags[tx_index] << "dao"
-            change_rec[:dao_txs] ||= Set.new
-            change_rec[:dao_txs] << ckb_txs[tx_index]["tx_hash"]
           end
 
           if attr[:cell_type] == "udt"
@@ -1131,10 +1096,6 @@ def build_cell_outputs!(
       end
     end
 
-    def occupied?(type_hash, cell_data)
-      (cell_data.present? && cell_data != "0x") || type_hash.present?
-    end
-
     def cell_output_attributes(output, address_id, ckb_transaction, local_block, cell_index, output_data)
       lock_script_hash = output.lock.compute_hash
       key = "lock_script_hash_#{lock_script_hash}"
@@ -1246,7 +1207,6 @@ def cell_input_attributes(input, ckb_transaction_id, local_block_id,
           capacity: previous_output.capacity,
           type_hash: previous_output.type_hash,
           address_id: previous_output.address_id,
-          # data: previous_output.data
         }
       end
     end

app/models/ckb_sync/new_node_data_processor.rb

@@ -16,20 +16,19 @@ def perform()
     end
     Rails.cache.write(key, local_tip_block.id)
 
-    Address.where(id: contained_address_ids).find_in_batches do |group|
-      sleep(50) # Make sure it doesn't get too crowded in there!
+    Address.where(id: contained_address_ids).find_in_batches(batch_size: 100).with_index do |group, batch|
+      puts "Processing group ##{batch}"
       address_attributes = []
 
       group.each do |addr|
+        # puts addr.id
         balance, balance_occupied = addr.cal_balance
         address_attributes << {
           id: addr.id,
           balance: balance,
           balance_occupied: balance_occupied,
           ckb_transactions_count: AccountBook.where(address_id: addr.id).count,
           live_cells_count: addr.cell_outputs.live.count,
-          dao_transactions_count: addr.ckb_dao_transactions.count,
-          created_at: addr.created_at,
           updated_at: Time.current
         }
 

app/workers/calculate_address_info_worker.rb

@@ -15,8 +15,6 @@ def perform(block_number)
         balance_occupied: balance_occupied,
         ckb_transactions_count: AccountBook.where(address_id: addr.id).count,
         live_cells_count: addr.cell_outputs.live.count,
-        dao_transactions_count: addr.ckb_dao_transactions.count,
-        created_at: addr.created_at,
         updated_at: Time.current
       }
     end

app/workers/update_address_info_worker.rb

@@ -0,0 +1,5 @@
+class RemoveDaoTxCountOfAddress < ActiveRecord::Migration[7.0]
+  def change
+    remove_columns :addresses, :dao_transactions_count, type: :bigint
+  end
+end

db/migrate/20251027053353_remove_dao_tx_count_of_address.rb

@@ -0,0 +1,5 @@
+class RemoveAddressBlockSnapshot < ActiveRecord::Migration[7.0]
+  def change
+    drop_table :address_block_snapshots, if_exists: true
+  end
+end

db/migrate/20251027054232_remove_address_block_snapshot.rb

@@ -60,38 +60,6 @@ CREATE SEQUENCE public.account_books_id_seq
 ALTER SEQUENCE public.account_books_id_seq OWNED BY public.account_books.id;
 
 
---
--- Name: address_block_snapshots; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.address_block_snapshots (
-    id bigint NOT NULL,
-    address_id bigint,
-    block_id bigint,
-    block_number bigint,
-    final_state jsonb
-);
-
-
---
--- Name: address_block_snapshots_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.address_block_snapshots_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: address_block_snapshots_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.address_block_snapshots_id_seq OWNED BY public.address_block_snapshots.id;
-
-
 --
 -- Name: address_udt_transactions; Type: TABLE; Schema: public; Owner: -
 --
@@ -123,7 +91,6 @@ CREATE TABLE public.addresses (
     average_deposit_time bigint,
     unclaimed_compensation numeric(30,0),
     is_depositor boolean DEFAULT false,
-    dao_transactions_count bigint DEFAULT 0.0,
     lock_script_id bigint,
     balance_occupied numeric(30,0) DEFAULT 0.0,
     last_updated_block_number bigint
@@ -2771,13 +2738,6 @@ ALTER TABLE ONLY public.ckb_transactions ATTACH PARTITION public.ckb_transaction
 ALTER TABLE ONLY public.account_books ALTER COLUMN id SET DEFAULT nextval('public.account_books_id_seq'::regclass);
 
 
---
--- Name: address_block_snapshots id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.address_block_snapshots ALTER COLUMN id SET DEFAULT nextval('public.address_block_snapshots_id_seq'::regclass);
-
-
 --
 -- Name: addresses id; Type: DEFAULT; Schema: public; Owner: -
 --
@@ -3199,14 +3159,6 @@ ALTER TABLE ONLY public.account_books
     ADD CONSTRAINT account_books_pkey PRIMARY KEY (id);
 
 
---
--- Name: address_block_snapshots address_block_snapshots_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.address_block_snapshots
-    ADD CONSTRAINT address_block_snapshots_pkey PRIMARY KEY (id);
-
-
 --
 -- Name: addresses addresses_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
@@ -4362,27 +4314,6 @@ CREATE INDEX index_account_books_on_block_number_and_tx_index ON public.account_
 CREATE INDEX index_account_books_on_ckb_transaction_id ON public.account_books USING btree (ckb_transaction_id);
 
 
---
--- Name: index_address_block_snapshots_on_address_id; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX index_address_block_snapshots_on_address_id ON public.address_block_snapshots USING btree (address_id);
-
-
---
--- Name: index_address_block_snapshots_on_block_id; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX index_address_block_snapshots_on_block_id ON public.address_block_snapshots USING btree (block_id);
-
-
---
--- Name: index_address_block_snapshots_on_block_id_and_address_id; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE UNIQUE INDEX index_address_block_snapshots_on_block_id_and_address_id ON public.address_block_snapshots USING btree (block_id, address_id);
-
-
 --
 -- Name: index_address_udt_transactions_on_ckb_transaction_id; Type: INDEX; Schema: public; Owner: -
 --
@@ -6005,6 +5936,8 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20250827065749'),
 ('20250930015526'),
 ('20251011011714'),
-('20251013082609');
+('20251013082609'),
+('20251027053353'),
+('20251027054232');
 
 

db/structure.sql

@@ -115,6 +115,10 @@ def call_worker(clz)
   call_worker ContractStatisticWorker
 end
 
+s.every "10h" overlap: false do
+  call_worker CalculateAddressInfoWorker
+end
+
 s.cron "0,30 * * * *" do
   BitcoinStatistic.refresh
 end

lib/scheduler.rb

@@ -9,7 +9,6 @@ namespace :migration do
         address.last_updated_block_number = local_tip_block.number
         address.live_cells_count = address.cell_outputs.live.where("block_timestamp <= ?", local_tip_block.timestamp).count
         address.ckb_transactions_count = AccountBook.where(address_id: address.id).where("block_number <= ?", local_tip_block.number).count
-        address.dao_transactions_count = DaoEvent.processed.where(address_id: address.id).where("block_timestamp <= ?", local_tip_block.timestamp).distinct.count(:ckb_transaction_id)
         address.cal_balance!
         address.save!
       end