Merge pull request #2832 from nervosnetwork/testnet

Deploy to mainnet

Author: u2

app/interactions/addresses/ckb_transactions.rb

@@ -10,25 +10,31 @@ class CkbTransactions < ActiveInteraction::Base
 
     def execute
       is_bitcoin = BitcoinUtils.valid_address?(key)
-      address = Explore.run!(key:)
-      raise AddressNotFoundError if address.is_a?(NullAddress)
 
-      address_id = address.map(&:id)
-      account_books = AccountBook.tx_committed.where(address_id:).
-        order(account_books_ordering).
-        select(:ckb_transaction_id).
-        distinct.page(page).per(page_size)
+      if is_bitcoin
+        account_books = BtcAccountBook.includes(:bitcoin_address).
+          where(bitcoin_address: { address_hash: key }).
+          order(account_books_ordering).
+          page(page).per(page_size)
+      else
+        address = Explore.run!(key:)
+        raise AddressNotFoundError if address.is_a?(NullAddress)
+
+        address_id = address.map(&:id)
+        account_books = AccountBook.tx_committed.where(address_id:).
+          order(account_books_ordering).
+          select(:ckb_transaction_id).
+          page(page).per(page_size)
+      end
+
+      ckb_transaction_ids = account_books.map(&:ckb_transaction_id)
 
       includes = { :cell_inputs => [:previous_cell_output], :outputs => {}, :bitcoin_annotation => [] }
       includes[:bitcoin_transfers] = {} if is_bitcoin
 
-      records = CkbTransaction.where(id: account_books.map(&:ckb_transaction_id))
+      records = CkbTransaction.where(id: ckb_transaction_ids)
             .includes(includes)
-            # .select(select_fields + ["COUNT(cell_inputs.id) AS cell_inputs_count", "COUNT(cell_outputs.id) AS cell_outputs_count"])
             .select(select_fields)
-            # .joins("LEFT JOIN cell_inputs ON cell_inputs.ckb_transaction_id = ckb_transactions.id")
-            # .joins("LEFT JOIN cell_outputs ON cell_outputs.ckb_transaction_id = ckb_transactions.id")
-            # .group(select_fields.join(','))
             .order(transactions_ordering)
 
       options = paginate_options(records, address_id)

app/jobs/import_rgbpp_cells_job.rb

@@ -172,6 +172,8 @@ def build_address!(address_hash, cell_output)
       create_with(bitcoin_address_id: bitcoin_address.id).
       find_or_create_by!(ckb_address_id: cell_output.address_id)
 
+    BtcAccountBook.find_or_create_by!(ckb_transaction_id: cell_output.ckb_transaction_id, bitcoin_address_id: bitcoin_address.id)
+
     bitcoin_address
   end
 

app/models/btc_account_book.rb

@@ -0,0 +1,16 @@
+class BtcAccountBook < ApplicationRecord
+  belongs_to :bitcoin_address
+end
+
+# == Schema Information
+#
+# Table name: btc_account_books
+#
+#  id                 :bigint           not null, primary key
+#  ckb_transaction_id :bigint
+#  bitcoin_address_id :bigint
+#
+# Indexes
+#
+#  index_btc_account_books_on_bitcoin_address_id  (bitcoin_address_id)
+#

db/migrate/20251011011714_create_btc_account_books.rb

@@ -0,0 +1,10 @@
+class CreateBtcAccountBooks < ActiveRecord::Migration[7.0]
+  def change
+    create_table :btc_account_books do |t|
+      t.bigint :ckb_transaction_id
+      t.bigint :bitcoin_address_id
+    end
+
+    add_index :btc_account_books, :bitcoin_address_id
+  end
+end

db/structure.sql

@@ -627,6 +627,36 @@ CREATE SEQUENCE public.blocks_id_seq
 ALTER SEQUENCE public.blocks_id_seq OWNED BY public.blocks.id;
 
 
+--
+-- Name: btc_account_books; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE public.btc_account_books (
+    id bigint NOT NULL,
+    ckb_transaction_id bigint,
+    bitcoin_address_id bigint
+);
+
+
+--
+-- Name: btc_account_books_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE public.btc_account_books_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: btc_account_books_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE public.btc_account_books_id_seq OWNED BY public.btc_account_books.id;
+
+
 --
 -- Name: cell_data; Type: TABLE; Schema: public; Owner: -
 --
@@ -2832,6 +2862,13 @@ ALTER TABLE ONLY public.block_statistics ALTER COLUMN id SET DEFAULT nextval('pu
 ALTER TABLE ONLY public.blocks ALTER COLUMN id SET DEFAULT nextval('public.blocks_id_seq'::regclass);
 
 
+--
+-- Name: btc_account_books id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.btc_account_books ALTER COLUMN id SET DEFAULT nextval('public.btc_account_books_id_seq'::regclass);
+
+
 --
 -- Name: cell_data cell_output_id; Type: DEFAULT; Schema: public; Owner: -
 --
@@ -3274,6 +3311,14 @@ ALTER TABLE ONLY public.blocks
     ADD CONSTRAINT blocks_pkey PRIMARY KEY (id);
 
 
+--
+-- Name: btc_account_books btc_account_books_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.btc_account_books
+    ADD CONSTRAINT btc_account_books_pkey PRIMARY KEY (id);
+
+
 --
 -- Name: cell_data cell_data_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
@@ -4527,6 +4572,13 @@ CREATE INDEX index_blocks_on_number ON public.blocks USING btree (number);
 CREATE INDEX index_blocks_on_timestamp ON public.blocks USING btree ("timestamp" DESC NULLS LAST);
 
 
+--
+-- Name: index_btc_account_books_on_bitcoin_address_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_btc_account_books_on_bitcoin_address_id ON public.btc_account_books USING btree (bitcoin_address_id);
+
+
 --
 -- Name: index_cell_dependencies_on_block_number_and_tx_index; Type: INDEX; Schema: public; Owner: -
 --
@@ -5937,6 +5989,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20250715043211'),
 ('20250826022054'),
 ('20250827065749'),
-('20250930015526');
+('20250930015526'),
+('20251011011714');
 
 

lib/tasks/migration/fill_btc_account_book.rake

@@ -0,0 +1,17 @@
+namespace :migration do
+  task fill_btc_account_book: :environment do
+    BitcoinAddressMapping.find_in_batches.with_index do |group, batch|
+      puts "Processing group ##{batch}"
+      group.each do |address_mapping|
+        ckb_address_id = address_mapping.ckb_address_id
+        bitcoin_address_id = address_mapping.bitcoin_address_id
+        limit = AccountBook.where(address_id: ckb_address_id).count
+        ckb_transaction_ids = AccountBook.where(address_id: ckb_address_id).limit(limit).map(&:ckb_transaction_id)
+        ckb_transaction_ids.each do |ckb_transaction_id|
+          BtcAccountBook.find_or_create_by!(ckb_transaction_id: ckb_transaction_id, bitcoin_address_id: bitcoin_address_id)
+        end
+        Rails.cache.write("fill_btc_account_book_job", address_mapping.id)
+      end
+    end
+  end
+end

test/factories/btc_account_books.rb

@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :btc_account_book do
+    
+  end
+end

test/models/btc_account_book_test.rb

@@ -0,0 +1,7 @@
+require "test_helper"
+
+class BtcAccountBookTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end