remove remove_dao_tx_count_of_address and remove_dao_tx_count_of_address

u2 · u2 · commit 655fe4c1a0d5 · 2025-10-27T14:03:00.000+08:00
diff --git a/app/models/address.rb b/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
diff --git a/app/models/address_block_snapshot.rb b/app/models/address_block_snapshot.rb
diff --git a/app/workers/calculate_address_info_worker.rb b/app/workers/calculate_address_info_worker.rb
@@ -29,8 +29,6 @@ def perform()
           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
         }
 
diff --git a/app/workers/update_address_info_worker.rb b/app/workers/update_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
diff --git a/db/migrate/20251027053353_remove_dao_tx_count_of_address.rb b/db/migrate/20251027053353_remove_dao_tx_count_of_address.rb
@@ -0,0 +1,5 @@
+class RemoveDaoTxCountOfAddress < ActiveRecord::Migration[7.0]
+  def change
+    remove_columns :addresses, :dao_transactions_count, type: :bigint
+  end
+end
diff --git a/db/migrate/20251027054232_remove_address_block_snapshot.rb b/db/migrate/20251027054232_remove_address_block_snapshot.rb
@@ -0,0 +1,5 @@
+class RemoveAddressBlockSnapshot < ActiveRecord::Migration[7.0]
+  def change
+    drop_table :address_block_snapshots, if_exists: true
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
@@ -1,3 +1,8 @@
+\restrict V8s7yzWY55LtWT8dJxqVvS1WjoR0TM2QsXaaB8DbB1Z9VB52I6EqVzTa1wJnm75
+
+-- Dumped from database version 16.10
+-- Dumped by pg_dump version 16.10
+
 SET statement_timeout = 0;
 SET lock_timeout = 0;
 SET idle_in_transaction_session_timeout = 0;
@@ -60,38 +65,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 +96,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 +2743,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 +3164,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 +4319,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: -
 --
@@ -5627,6 +5563,8 @@ ALTER TABLE ONLY public.udt_transactions
 -- PostgreSQL database dump complete
 --
 
+\unrestrict V8s7yzWY55LtWT8dJxqVvS1WjoR0TM2QsXaaB8DbB1Z9VB52I6EqVzTa1wJnm75
+
 SET search_path TO "$user", public;
 
 INSERT INTO "schema_migrations" (version) VALUES
@@ -6005,6 +5943,8 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20250827065749'),
 ('20250930015526'),
 ('20251011011714'),
-('20251013082609');
+('20251013082609'),
+('20251027053353'),
+('20251027054232');
 
 
diff --git a/lib/tasks/migration/check_address_info.rake b/lib/tasks/migration/check_address_info.rake
@@ -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
diff --git a/lib/tasks/migration/fill_dao_transactions_count_to_address.rake b/lib/tasks/migration/fill_dao_transactions_count_to_address.rake
diff --git a/lib/tasks/migration/fix_address_tx_count.rake b/lib/tasks/migration/fix_address_tx_count.rake
@@ -8,7 +8,6 @@ namespace :migration do
       local_tip_block = Block.recent.first
       address.update(
         ckb_transactions_count: AccountBook.where(address_id: address.id).where("block_number <= ?", local_tip_block.number).count,
-        dao_transactions_count: DaoEvent.processed.where(address_id: address.id).where("block_timestamp <= ?", local_tip_block.timestamp).distinct.count(:ckb_transaction_id),
         last_updated_block_number: local_tip_block.number,
       )
       AddressBlockSnapshot.where(address_id: address.id).delete_all
diff --git a/lib/tasks/migration/update_addresses_info.rake b/lib/tasks/migration/update_addresses_info.rake
@@ -5,8 +5,9 @@ namespace :migration do
 		  addr_attrs = []
 		  Address.where(id: block.address_ids).select(:id, :mined_blocks_count, :created_at).each do |addr|
 			  next if addr.mined_blocks_count > 0
-        addr_attrs << { id: addr.id, balance: addr.cell_outputs.live.sum(:capacity),ckb_transactions_count: addr.custom_ckb_transactions.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 }
+        addr_attrs << { id: addr.id, balance: addr.cell_outputs.live.sum(:capacity), 
+												ckb_transactions_count: addr.custom_ckb_transactions.count, live_cells_count: addr.cell_outputs.live.count,
+                        updated_at: Time.current }
 		  end
 		  Address.upsert_all(addr_attrs)
 		  puts "#{local_tip_block.number - block.number} blocks left"
diff --git a/lib/tasks/migration/update_miner_balance.rake b/lib/tasks/migration/update_miner_balance.rake
@@ -7,7 +7,7 @@ namespace :migration do
 
     Address.find_each do |addr|
       addr.update(balance: addr.cell_outputs.live.sum(:capacity), ckb_transactions_count: addr.custom_ckb_transactions.count,
-        live_cells_count: addr.cell_outputs.live.count, dao_transactions_count: addr.ckb_dao_transactions.count)
+        live_cells_count: addr.cell_outputs.live.count)
       progress_bar.increment
     end
 
diff --git a/test/controllers/api/v1/address_dao_transactions_controller_test.rb b/test/controllers/api/v1/address_dao_transactions_controller_test.rb
@@ -153,7 +153,6 @@ class AddressDaoTransactionsControllerTest < ActionDispatch::IntegrationTest
         address_dao_transactions = address.ckb_dao_transactions.recent.page(page).per(page_size)
 
         valid_get api_v1_address_dao_transaction_url(address.address_hash), params: { page: }
-        address.dao_transactions_count
         options = FastJsonapi::PaginationMetaGenerator.new(request:, records: address_dao_transactions, page:, page_size:).call
         response_transaction = CkbTransactionsSerializer.new(address_dao_transactions, options.merge(params: { previews: true })).serialized_json
 
@@ -170,7 +169,6 @@ class AddressDaoTransactionsControllerTest < ActionDispatch::IntegrationTest
 
         valid_get api_v1_address_dao_transaction_url(address.address_hash), params: { page_size: }
 
-        address.dao_transactions_count
         options = FastJsonapi::PaginationMetaGenerator.new(request:, records: address_dao_transactions, page:, page_size:).call
         response_transaction = CkbTransactionsSerializer.new(address_dao_transactions, options.merge(params: { previews: true })).serialized_json
 
@@ -187,7 +185,6 @@ class AddressDaoTransactionsControllerTest < ActionDispatch::IntegrationTest
 
         valid_get api_v1_address_dao_transaction_url(address.address_hash), params: { page:, page_size: }
 
-        address.dao_transactions_count
         options = FastJsonapi::PaginationMetaGenerator.new(request:, records: address_dao_transactions, page:, page_size:).call
         response_transaction = CkbTransactionsSerializer.new(address_dao_transactions, options.merge(params: { previews: true })).serialized_json
 
@@ -203,7 +200,6 @@ class AddressDaoTransactionsControllerTest < ActionDispatch::IntegrationTest
 
         valid_get api_v1_address_dao_transaction_url(address.address_hash), params: { page:, page_size: }
 
-        address.dao_transactions_count
         options = FastJsonapi::PaginationMetaGenerator.new(request:, records: address_dao_transactions, page:, page_size:).call
         response_transaction = CkbTransactionsSerializer.new(address_dao_transactions, options.merge(params: { previews: true })).serialized_json
 
diff --git a/test/factories/address_block_snapshot.rb b/test/factories/address_block_snapshot.rb
diff --git a/test/jobs/revert_block_job_test.rb b/test/jobs/revert_block_job_test.rb
@@ -15,7 +15,7 @@ class RevertBlockJobTest < ActiveJob::TestCase
     deposit_dao_event = create(:dao_event, block_id: first_block.id, block_timestamp: first_block.timestamp, ckb_transaction_id: tx.id, address_id: @address.id, value: 3000 * (10**8),
                                            event_type: "deposit_to_dao")
 
-    @address.update(balance: 6000 * (10**8), balance_occupied: 3000 * (10**8), live_cells_count: 4, ckb_transactions_count: 1, last_updated_block_number: first_block.number, dao_transactions_count: 1)
+    @address.update(balance: 6000 * (10**8), balance_occupied: 3000 * (10**8), live_cells_count: 4, ckb_transactions_count: 1, last_updated_block_number: first_block.number)
     @parent_block = create(:block, parent_hash: first_block.hash, address_ids: [@address.id], number: 11)
     parent_tx = create(:ckb_transaction, block: @parent_block)
     create(:cell_input, block_id: @parent_block.id, ckb_transaction: parent_tx, previous_cell_output_id: previous_cell_output1.id, index: 0)
@@ -31,7 +31,6 @@ class RevertBlockJobTest < ActiveJob::TestCase
     deposit_dao_event.update(consumed_block_timestamp: @parent_block.timestamp, consumed_transaction_id: parent_tx.id)
     create(:dao_event, block_id: @parent_block.id, block_timestamp: @parent_block.timestamp, ckb_transaction_id: parent_tx.id, address_id: @address.id, value: 3000 * (10**8),
                        event_type: "withdraw_from_dao")
-    @address.update(balance: 5000 * (10**8), balance_occupied: 3000 * (10**8), live_cells_count: 2, ckb_transactions_count: 2, last_updated_block_number: @parent_block.number,
-                    dao_transactions_count: 2)
+    @address.update(balance: 5000 * (10**8), balance_occupied: 3000 * (10**8), live_cells_count: 2, ckb_transactions_count: 2, last_updated_block_number: @parent_block.number)
   end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -402,7 +402,6 @@ def expected_ranking(address1, address2, address3)
 
 def fake_dao_deposit_transaction(dao_cell_count, address)
   block = create(:block, :with_block_hash)
-  address.update(dao_transactions_count: dao_cell_count)
   dao_cell_count.times do |number|
     if number % 2 == 0
       ckb_transaction1 = create(:ckb_transaction,
diff --git a/test/workers/clean_address_block_snapshot_worker_test.rb b/test/workers/clean_address_block_snapshot_worker_test.rb

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,6 @@ def perform()`
`29`	`29`	`balance_occupied: balance_occupied,`
`30`	`30`	`ckb_transactions_count: AccountBook.where(address_id: addr.id).count,`
`31`	`31`	`live_cells_count: addr.cell_outputs.live.count,`
`32`		`- dao_transactions_count: addr.ckb_dao_transactions.count,`
`33`		`- created_at: addr.created_at,`
`34`	`32`	`updated_at: Time.current`
`35`	`33`	`}`
`36`	`34`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,6 @@ def perform(block_number)`
`15`	`15`	`balance_occupied: balance_occupied,`
`16`	`16`	`ckb_transactions_count: AccountBook.where(address_id: addr.id).count,`
`17`	`17`	`live_cells_count: addr.cell_outputs.live.count,`
`18`		`- dao_transactions_count: addr.ckb_dao_transactions.count,`
`19`		`- created_at: addr.created_at,`
`20`	`18`	`updated_at: Time.current`
`21`	`19`	`}`
`22`	`20`	`end`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ namespace :migration do`
`8`	`8`	`local_tip_block = Block.recent.first`
`9`	`9`	`address.update(`
`10`	`10`	`ckb_transactions_count: AccountBook.where(address_id: address.id).where("block_number <= ?", local_tip_block.number).count,`
`11`		`- dao_transactions_count: DaoEvent.processed.where(address_id: address.id).where("block_timestamp <= ?", local_tip_block.timestamp).distinct.count(:ckb_transaction_id),`
`12`	`11`	`last_updated_block_number: local_tip_block.number,`
`13`	`12`	`)`
`14`	`13`	`AddressBlockSnapshot.where(address_id: address.id).delete_all`