Merge pull request #2484 from nervosnetwork/testnet

Deploy to mainnet

Author: zmcNotafraid

app/controllers/api/v1/ckb_transactions_controller.rb

@@ -71,14 +71,14 @@ def query
         ckb_transactions =
           if @address
             records_counter = @tx_ids =
-              AccountBook.where(
+              AccountBook.tx_committed.where(
                 address_id: @address.id,
               ).order(
-                "ckb_transaction_id" => :desc,
+                "block_number desc, tx_index desc",
               ).select(
                 "ckb_transaction_id",
               ).page(@page).per(@page_size).fast_page
-            CkbTransaction.where(id: @tx_ids.map(&:ckb_transaction_id)).order(id: :desc)
+            CkbTransaction.where(id: @tx_ids.map(&:ckb_transaction_id)).order(block_number: :desc, tx_index: :desc)
           else
             records_counter = RecordCounters::Transactions.new
             CkbTransaction.recent.normal.page(@page).per(@page_size).fast_page
@@ -97,7 +97,7 @@ def query
             ).call
             CkbTransactionsSerializer.new(ckb_transactions,
                                           options.merge(params: {
-                                                          previews: true, address: @address
+                                                          previews: true, address_id: @address.id
                                                         })).serialized_json
           end
         render json:

app/interactions/addresses/ckb_transactions.rb

@@ -13,10 +13,14 @@ def execute
       raise AddressNotFoundError if address.is_a?(NullAddress)
 
       address_id = address.map(&:id)
-      account_books = AccountBook.where(address_id:).order("ckb_transaction_id desc").select(:ckb_transaction_id).distinct.limit(Settings.query_default_limit)
-      records = CkbTransaction.where(tx_status: :committed, id: account_books.map(&:ckb_transaction_id)).order(transactions_ordering).page(page).per(page_size)
+      account_books = AccountBook.tx_committed.where(address_id:).
+        order("block_number desc, tx_index desc").
+        select(:ckb_transaction_id, :block_number, :tx_index).
+        distinct.
+        limit(Settings.query_default_limit)
+      records = CkbTransaction.includes(:account_books).where(id: account_books.map(&:ckb_transaction_id)).select(select_fields).order(transactions_ordering).page(page).per(page_size)
       options = paginate_options(records, address_id)
-      options.merge!(params: { previews: true, address: })
+      options.merge!(params: { previews: true, address_id: })
 
       result = CkbTransactionsSerializer.new(records, options)
       wrap_result(result, address)
@@ -33,7 +37,7 @@ def transactions_ordering
     end
 
     def paginate_options(records, address_id)
-      total_count = AccountBook.where(address_id:).distinct.count
+      total_count = Address.where(id: address_id).sum(:ckb_transactions_count)
       FastJsonapi::PaginationMetaGenerator.new(
         request:, records:, page:, page_size:, total_pages: records.total_pages, total_count:,
       ).call

app/interactions/addresses/pending_transactions.rb

@@ -12,16 +12,17 @@ def execute
       address = Explore.run!(key:)
       raise AddressNotFoundError if address.is_a?(NullAddress)
 
+      address_id = address.map(&:id)
       records =
-        CkbTransaction.joins(:account_books).where(ckb_transactions: { tx_status: :pending }, account_books: { address_id: address.map(&:id) }).
+        CkbTransaction.joins(:account_books).where(ckb_transactions: { tx_status: :pending }, account_books: { address_id: }).
           select(select_fields).
           order(transactions_ordering).
           page(page).per(page_size)
 
       options = FastJsonapi::PaginationMetaGenerator.new(
         request:, records:, page:, page_size:,
       ).call
-      options.merge!(params: { previews: true, address: })
+      options.merge!(params: { previews: true, address_id: })
 
       result = CkbTransactionsSerializer.new(records, options)
       wrap_result(result, address)

app/interactions/users/ckb_transactions.rb

@@ -24,7 +24,7 @@ def execute
         page:,
         page_size:,
       ).call
-      options[:params] = { previews: true, address: user.addresses }
+      options[:params] = { previews: true, address_id: user.addresses.map(&:id) }
 
       transactions_serializer = CkbTransactionsSerializer.new(transactions, options)
       transactions_serializer.serialized_json

app/jobs/csv_exportable/export_address_transactions_job.rb

@@ -6,8 +6,8 @@ def perform(args)
 
       tx_ids = AccountBook.joins(:ckb_transaction).
         where(address_id: args[:address_id]).
-        order(ckb_transaction_id: :asc).
-        limit(5000)
+        order(block_number: :desc, tx_index: :desc).
+        limit(Settings.query_default_limit)
 
       if args[:start_date].present?
         start_date = BigDecimal(args[:start_date])

app/jobs/csv_exportable/export_block_transactions_job.rb

@@ -18,7 +18,7 @@ def perform(args)
 
       blocks = blocks.where("number >= ?", args[:start_number]) if args[:start_number].present?
       blocks = blocks.where("number <= ?", args[:end_number]) if args[:end_number].present?
-      blocks = blocks.order(number: :desc).last(5000)
+      blocks = blocks.order(number: :desc).last(Settings.query_default_limit)
 
       rows = []
       blocks.each do |block|
@@ -43,7 +43,7 @@ def generate_row(block)
         block.timestamp,
         reward,
         block.miner_hash,
-        datetime
+        datetime,
       ]
     end
   end

app/jobs/csv_exportable/export_contract_transactions_job.rb

@@ -45,7 +45,7 @@ def fetch_transaction_rows(start_date, end_date)
 
       dao_contract = DaoContract.default_contract
       dao_contract.ckb_transactions.includes(dao_events: [:address]).tx_committed.where(sql).
-        order("block_timestamp desc nulls last, id desc").limit(5000).find_in_batches(batch_size: 500) do |transactions|
+        order("block_timestamp desc nulls last, id desc").limit(Settings.query_default_limit).find_in_batches(batch_size: 500) do |transactions|
         transactions.each do |transaction|
           row = generate_row(transaction)
           next if row.blank?

app/jobs/csv_exportable/export_nft_transactions_job.rb

@@ -27,7 +27,7 @@ def perform(args)
                                                 args[:end_number])
       end
 
-      token_transfers = token_transfers.order("token_transfers.id desc").limit(5000)
+      token_transfers = token_transfers.order("token_transfers.id desc").limit(Settings.query_default_limit)
 
       rows = []
       token_transfers.find_in_batches(batch_size: 1000, order: :desc) do |transfers|
@@ -67,7 +67,7 @@ def generate_row(transfer)
         transfer.from&.address_hash || "/",
         transfer.to&.address_hash || "/",
         fee,
-        datetime
+        datetime,
       ]
     end
 

app/jobs/csv_exportable/export_omiga_inscription_transactions_job.rb

@@ -36,7 +36,7 @@ def perform(args)
       end
 
       ckb_transactions = ckb_transactions.includes(:inputs, :outputs).
-        order(block_timestamp: :desc).limit(5000)
+        order(block_timestamp: :desc).limit(Settings.query_default_limit)
 
       rows = []
       ckb_transactions.find_in_batches(batch_size: 1000,

app/jobs/csv_exportable/export_portfolio_transactions_job.rb

@@ -5,7 +5,7 @@ def perform(args)
         select("DISTINCT ON (ckb_transaction_id) account_books.*").
         where(address_id: args[:address_ids]).
         order(ckb_transaction_id: :asc).
-        limit(5000)
+        limit(Settings.query_default_limit)
 
       if args[:start_date].present?
         start_date = BigDecimal(args[:start_date])
@@ -62,11 +62,11 @@ def generate_row(transaction, inputs, outputs)
       rows = []
       units = input_info.keys | output_info.keys
       units.each_with_index do |unit, index|
-        if unit == "CKB"
-          data = build_ckb_data(input_info[unit], output_info[unit])
-        else
-          data = build_udt_data(input_info[unit], output_info[unit])
-        end
+        data = if unit == "CKB"
+                 build_ckb_data(input_info[unit], output_info[unit])
+               else
+                 build_udt_data(input_info[unit], output_info[unit])
+               end
 
         display_fee =
           if units.include?("CKB")
@@ -86,7 +86,7 @@ def generate_row(transaction, inputs, outputs)
           data[:token_out],
           data[:balance_diff],
           (display_fee ? fee : "/"),
-          datetime
+          datetime,
         ]
       end