Merge pull request #2864 from nervosnetwork/testnet

Deploy to mainnet

Author: u2

app/controllers/api/v1/address_dao_transactions_controller.rb

@@ -8,8 +8,9 @@ def show
         address = Address.find_address!(params[:id])
         raise Api::V1::Exceptions::AddressNotFoundError if address.is_a?(NullAddress)
 
+        includes = { :cell_inputs => {:previous_cell_output => {:type_script => [], :bitcoin_vout => [], :lock_script => [] }, :block => []}, :cell_outputs => {}, :bitcoin_annotation => [], :account_books => {} }
         ckb_dao_transactions = address.ckb_dao_transactions
-          .includes(:cell_inputs => [:previous_cell_output], :cell_outputs => [], :bitcoin_annotation => [])
+          .includes(includes)
           .select(select_fields)
           .recent.page(@page).per(@page_size)
 

app/controllers/api/v1/address_udt_transactions_controller.rb

@@ -12,8 +12,9 @@ def show
         udt = Udt.find_by(type_hash: params[:type_hash], published: true)
         raise Api::V1::Exceptions::UdtNotFoundError if udt.blank?
 
+        includes = { :cell_inputs => {:previous_cell_output => {:type_script => [], :bitcoin_vout => [], :lock_script => [] }, :block => []}, :cell_outputs => {}, :bitcoin_annotation => [], :account_books => {} }
         ckb_udt_transactions = address.ckb_udt_transactions(udt.id)
-          .includes(:cell_inputs => [:previous_cell_output], :cell_outputs => [], :bitcoin_annotation => [])
+          .includes(includes)
           .select(select_fields)
           .recent.page(@page).per(@page_size).fast_page
         json =

app/controllers/api/v1/block_transactions_controller.rb

@@ -18,10 +18,12 @@ def show
             where(account_books: { address_id: address.id })
         end
 
+        includes = { :cell_inputs => {:previous_cell_output => {:type_script => [], :bitcoin_vout => [], :lock_script => [] }, :block => []}, :cell_outputs => {}, :bitcoin_annotation => [], :account_books => {} }
+
         if stale?(ckb_transactions)
           expires_in 10.seconds, public: true, must_revalidate: true, stale_while_revalidate: 5.seconds
           ckb_transactions = ckb_transactions
-              .includes(:cell_inputs => [:previous_cell_output], :cell_outputs => [], :bitcoin_annotation => [])
+              .includes(includes)
               .page(@page).per(@page_size).fast_page
 
           options = FastJsonapi::PaginationMetaGenerator.new(

app/controllers/api/v1/ckb_transactions_controller.rb

@@ -83,7 +83,9 @@ def query
             total_count = TableRecordCount.find_by(table_name: "ckb_transactions")&.count
             CkbTransaction.recent.normal.page(@page).per(@page_size).fast_page
           end
-        ckb_transactions = ckb_transactions.select(:id, :tx_hash, :block_id, :tags,
+
+        includes = { :cell_inputs => {:previous_cell_output => {:type_script => [], :bitcoin_vout => [], :lock_script => [] }, :block => []}, :cell_outputs => {}, :bitcoin_annotation => [], :account_books => {} }
+        ckb_transactions = ckb_transactions.includes(includes).select(:id, :tx_hash, :block_id, :tags,
                                                    :block_number, :block_timestamp, :is_cellbase, :updated_at, :created_at)
         json =
           Rails.cache.realize(ckb_transactions.cache_key,

app/controllers/api/v1/contract_transactions_controller.rb

@@ -25,8 +25,10 @@ def show
               where(account_books: { address_id: address.id })
           end
 
+          includes = { :cell_inputs => {:previous_cell_output => {:type_script => [], :bitcoin_vout => [], :lock_script => [] }, :block => []}, :cell_outputs => {}, :bitcoin_annotation => [], :account_books => {} }
+
           ckb_transactions = ckb_transactions
-                    .includes(:cell_inputs => [:previous_cell_output], :cell_outputs => [], :bitcoin_annotation => [])
+                    .includes(includes)
                     .select(select_fields)
                     .page(@page).per(@page_size).fast_page
           options = FastJsonapi::PaginationMetaGenerator.new(request:, records: ckb_transactions,

app/interactions/addresses/ckb_transactions.rb

@@ -37,7 +37,7 @@ def execute
 
       ckb_transaction_ids = account_books.map(&:ckb_transaction_id)
 
-      includes = { :cell_inputs => [:previous_cell_output], :cell_outputs => {}, :bitcoin_annotation => [], :account_books => {} }
+      includes = { :cell_inputs => {:previous_cell_output => {:type_script => [], :bitcoin_vout => [], :lock_script => [] }, :block => []}, :cell_outputs => {}, :bitcoin_annotation => [], :account_books => {} }
       includes[:bitcoin_transfers] = {} if is_bitcoin
 
       records = CkbTransaction.where(id: ckb_transaction_ids)

app/interactions/udts/ckb_transactions.rb

@@ -30,8 +30,10 @@ def execute
           where(account_books: { address_id: address.map(&:id) }).distinct
       end
 
+      includes = { :cell_inputs => {:previous_cell_output => {:type_script => [], :bitcoin_vout => [], :lock_script => [] }, :block => []}, :cell_outputs => {}, :bitcoin_annotation => [], :account_books => {} }
+
       records = ckb_transactions
-                  .includes(:cell_inputs => [:previous_cell_output], :cell_outputs => [], :bitcoin_annotation => [])
+                  .includes(includes)
                   .select(select_fields)
                   .page(page).per(page_size)
       options = FastJsonapi::PaginationMetaGenerator.new(

app/models/concerns/ckb_transactions/display_cells.rb

@@ -9,8 +9,8 @@ def display_inputs(previews: false)
         if is_cellbase
           cellbase_display_inputs
         else
-          cell_inputs_for_display = cell_inputs.order(id: :asc)
-          cell_inputs_for_display = cell_inputs_for_display.limit(10) if previews
+          cell_inputs_for_display = cell_inputs.sort_by(&:id)
+          cell_inputs_for_display = cell_inputs_for_display.first(10) if previews
           normal_tx_display_inputs(cell_inputs_for_display)
         end
       end
@@ -19,8 +19,8 @@ def display_outputs(previews: false)
         if is_cellbase
           cellbase_display_outputs
         else
-          cell_outputs_for_display = cell_outputs.order(id: :asc)
-          cell_outputs_for_display = cell_outputs_for_display.limit(10) if previews
+          cell_outputs_for_display = cell_outputs.sort_by(&:id)
+          cell_outputs_for_display = cell_outputs_for_display.first(10) if previews
           normal_tx_display_outputs(cell_outputs_for_display)
         end
       end
@@ -41,7 +41,7 @@ def cellbase_display_inputs
       end
 
       def cellbase_display_outputs
-        cell_outputs_for_display = cell_outputs.order(id: :asc)
+        cell_outputs_for_display = cell_outputs.sort_by(&:id)
         cellbase = Cellbase.new(block)
         cell_outputs_for_display.map do |output|
           consumed_tx_hash = output.live? ? nil : output.consumed_by.tx_hash
@@ -104,7 +104,7 @@ def normal_tx_display_inputs(cell_inputs_for_display)
             display_input.merge!(attributes_for_dao_input(previous_cell_output))
           end
           if previous_cell_output.nervos_dao_deposit?
-            display_input.merge!(attributes_for_dao_input(cell_outputs.order(:cell_index)[cell_input.index], false))
+            display_input.merge!(attributes_for_dao_input(cell_outputs.sort_by(&:cell_index)[cell_input.index], false))
           end
           if previous_cell_output.udt?
             display_input.merge!(attributes_for_udt_cell(previous_cell_output))