Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/models/address.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 0 additions & 22 deletions app/models/address_block_snapshot.rb

This file was deleted.

2 changes: 0 additions & 2 deletions app/workers/calculate_address_info_worker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 0 additions & 2 deletions app/workers/update_address_info_worker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions db/migrate/20251027053353_remove_dao_tx_count_of_address.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class RemoveDaoTxCountOfAddress < ActiveRecord::Migration[7.0]
def change
remove_columns :addresses, :dao_transactions_count, type: :bigint
end
end
5 changes: 5 additions & 0 deletions db/migrate/20251027054232_remove_address_block_snapshot.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class RemoveAddressBlockSnapshot < ActiveRecord::Migration[7.0]
def change
drop_table :address_block_snapshots, if_exists: true
end
end
73 changes: 3 additions & 70 deletions db/structure.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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: -
--
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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: -
--
Expand Down Expand Up @@ -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: -
--
Expand Down Expand Up @@ -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: -
--
Expand Down Expand Up @@ -6005,6 +5936,8 @@ INSERT INTO "schema_migrations" (version) VALUES
('20250827065749'),
('20250930015526'),
('20251011011714'),
('20251013082609');
('20251013082609'),
('20251027053353'),
('20251027054232');


1 change: 0 additions & 1 deletion lib/tasks/migration/check_address_info.rake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 0 additions & 21 deletions lib/tasks/migration/fill_dao_transactions_count_to_address.rake

This file was deleted.

1 change: 0 additions & 1 deletion lib/tasks/migration/fix_address_tx_count.rake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions lib/tasks/migration/update_addresses_info.rake
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/tasks/migration/update_miner_balance.rake
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand Down
16 changes: 0 additions & 16 deletions test/factories/address_block_snapshot.rb

This file was deleted.

5 changes: 2 additions & 3 deletions test/jobs/revert_block_job_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
1 change: 0 additions & 1 deletion test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
11 changes: 0 additions & 11 deletions test/workers/clean_address_block_snapshot_worker_test.rb

This file was deleted.