Merge pull request #2797 from nervosnetwork/develop

Deploy to testnet

Author: u2

app/controllers/api/v1/ckb_transactions_controller.rb

@@ -73,12 +73,12 @@ def query
               AccountBook.tx_committed.where(
                 address_id: @address.id,
               ).order(
-                "block_number desc, tx_index desc",
+                "ckb_transaction_id desc",
               ).select(
                 "ckb_transaction_id",
               ).page(@page).per(@page_size).fast_page
             total_count = @tx_ids.total_count
-            CkbTransaction.where(id: @tx_ids.map(&:ckb_transaction_id)).order(block_number: :desc, tx_index: :desc)
+            CkbTransaction.where(id: @tx_ids.map(&:ckb_transaction_id)).order(id: :desc)
           else
             total_count = TableRecordCount.find_by(table_name: "ckb_transactions")&.count
             CkbTransaction.recent.normal.page(@page).per(@page_size).fast_page

app/controllers/api/v2/scripts_controller.rb

@@ -37,11 +37,12 @@ def ckb_transactions
           if @contracts.length == 1 && @contracts.first.type_hash == Contract::ZERO_LOCK_HASH
             address_ids = LockScript.zero_lock.select(:address_id)
             tx_ids = AccountBook.where(address_id: address_ids).
-              order("block_number DESC, tx_index DESC").
+              order("ckb_transaction_id DESC").
               select(:ckb_transaction_id).
-              limit(Settings.query_default_limit)
+              page(@page).per(@page_size)
+
             CkbTransaction.where(id: tx_ids).
-              order("block_number DESC, tx_index DESC").
+              order("id DESC").
               page(@page).per(@page_size)
           else
             contract_ids = @contracts.map { |contract| contract.id }

app/interactions/users/ckb_transactions.rb

@@ -51,7 +51,7 @@ def filter_account_books
 
     def sort_account_books(records)
       sorting, ordering = sort.split(".", 2)
-      sorting = "ckb_transactions.block_timestamp" if sorting == "time"
+      sorting = "ckb_transactions.id" if sorting == "time"
 
       if ordering.nil? || !ordering.match?(/^(asc|desc)$/i)
         ordering = "asc"