Merge pull request #2859 from nervosnetwork/develop

Deploy to testnet

Author: u2

app/controllers/api/v1/address_dao_transactions_controller.rb

@@ -9,11 +9,7 @@ def show
         raise Api::V1::Exceptions::AddressNotFoundError if address.is_a?(NullAddress)
 
         ckb_dao_transactions = address.ckb_dao_transactions
-          .includes(:cell_inputs => [:previous_cell_output], :outputs => [], :bitcoin_annotation => [])
-          # .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(','))
-          # .select(select_fields + ["COUNT(cell_inputs.id) AS cell_inputs_count", "COUNT(cell_outputs.id) AS cell_outputs_count"])
+          .includes(:cell_inputs => [:previous_cell_output], :cell_outputs => [], :bitcoin_annotation => [])
           .select(select_fields)
           .recent.page(@page).per(@page_size)
 

app/controllers/api/v1/address_udt_transactions_controller.rb

@@ -13,11 +13,7 @@ def show
         raise Api::V1::Exceptions::UdtNotFoundError if udt.blank?
 
         ckb_udt_transactions = address.ckb_udt_transactions(udt.id)
-          .includes(:cell_inputs => [:previous_cell_output], :outputs => [], :bitcoin_annotation => [])
-          # .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(','))
-          # .select(select_fields + ["COUNT(cell_inputs.id) AS cell_inputs_count", "COUNT(cell_outputs.id) AS cell_outputs_count"])
+          .includes(:cell_inputs => [:previous_cell_output], :cell_outputs => [], :bitcoin_annotation => [])
           .select(select_fields)
           .recent.page(@page).per(@page_size).fast_page
         json =

app/controllers/api/v1/block_transactions_controller.rb

@@ -21,10 +21,7 @@ def show
         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], :outputs => [], :bitcoin_annotation => [])
-              # .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(','))
+              .includes(:cell_inputs => [:previous_cell_output], :cell_outputs => [], :bitcoin_annotation => [])
               .page(@page).per(@page_size).fast_page
 
           options = FastJsonapi::PaginationMetaGenerator.new(

app/controllers/api/v1/contract_transactions_controller.rb

@@ -26,11 +26,7 @@ def show
           end
 
           ckb_transactions = ckb_transactions
-                    .includes(:cell_inputs => [:previous_cell_output], :outputs => [], :bitcoin_annotation => [])
-                    # .select(select_fields + ["COUNT(cell_inputs.id) AS cell_inputs_count", "COUNT(cell_outputs.id) AS cell_outputs_count"])
-                    # .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(','))
+                    .includes(:cell_inputs => [:previous_cell_output], :cell_outputs => [], :bitcoin_annotation => [])
                     .select(select_fields)
                     .page(@page).per(@page_size).fast_page
           options = FastJsonapi::PaginationMetaGenerator.new(request:, records: ckb_transactions,

app/controllers/api/v2/ckb_transactions_controller.rb

@@ -3,11 +3,14 @@ module V2
     class CkbTransactionsController < BaseController
       include CellDataComparator
 
-      before_action :set_ckb_transaction
       before_action :set_pagination_params, only: %i[display_inputs display_outputs]
 
       def details
         expires_in 10.seconds, public: true, must_revalidate: true
+
+        @ckb_transaction = CkbTransaction.includes(:cell_inputs => [:previous_cell_output], :cell_outputs => {}).find_by(tx_hash: params[:id])
+        return head :not_found unless @ckb_transaction
+
         transfers = compare_cells(@ckb_transaction)
 
         render json: { data: transfers }
@@ -16,6 +19,9 @@ def details
       def display_inputs
         expires_in 15.seconds, public: true, must_revalidate: true
 
+        @ckb_transaction = CkbTransaction.includes(:cell_inputs => [:previous_cell_output]).find_by(tx_hash: params[:id])
+        return head :not_found unless @ckb_transaction
+
         if @ckb_transaction.is_cellbase
           cell_inputs = @ckb_transaction.cellbase_display_inputs
           total_count = cell_inputs.count
@@ -35,12 +41,15 @@ def display_inputs
       def display_outputs
         expires_in 15.seconds, public: true, must_revalidate: true
 
+        @ckb_transaction = CkbTransaction.includes(:cell_outputs => {}).find_by(tx_hash: params[:id])
+        return head :not_found unless @ckb_transaction
+
         if @ckb_transaction.is_cellbase
           cell_outputs = @ckb_transaction.cellbase_display_outputs.sort_by { |output| output[:id].to_i }
           cell_outputs = Kaminari.paginate_array(cell_outputs).page(@page).per(@page_size)
           total_count = cell_outputs.total_count
         else
-          cell_outputs = @ckb_transaction.outputs.order(id: :asc).
+          cell_outputs = @ckb_transaction.cell_outputs.order(id: :asc).
             page(@page).per(@page_size).fast_page
           total_count = cell_outputs.total_count
           cell_outputs = @ckb_transaction.normal_tx_display_outputs(cell_outputs)
@@ -55,6 +64,9 @@ def display_outputs
       def rgb_digest
         expires_in 10.seconds, public: true, must_revalidate: true
 
+        @ckb_transaction = CkbTransaction.includes(:cell_inputs => [:previous_cell_output], :cell_outputs => {}).find_by(tx_hash: params[:id])
+        return head :not_found unless @ckb_transaction
+
         transfers = [].tap do |res|
           combine_transfers(@ckb_transaction).each do |address_id, transfers|
             vout = BitcoinVout.includes(:bitcoin_address).find_by(address_id:)
@@ -92,11 +104,6 @@ def rgb_digest
 
       private
 
-      def set_ckb_transaction
-        @ckb_transaction = CkbTransaction.find_by(tx_hash: params[:id])
-        return head :not_found unless @ckb_transaction
-      end
-
       def set_pagination_params
         @page = params.fetch(:page, 1)
         @page_size = params.fetch(:page_size, CkbTransaction.default_per_page)

app/controllers/api/v2/dao_events_controller.rb

@@ -14,7 +14,7 @@ def index
 
       total = ckb_transactions.count
       ckb_transactions = ckb_transactions
-            .includes(:cell_inputs => [:previous_cell_output], :outputs => [], :bitcoin_annotation => [])
+            .includes(:cell_inputs => [:previous_cell_output], :cell_outputs => [], :bitcoin_annotation => [])
             .page(page).per(page_size).fast_page
 
       activities = CkbTransactionsSerializer.new(ckb_transactions).serializable_hash

app/controllers/api/v2/nft/collections_controller.rb

@@ -3,7 +3,7 @@ module V2
     module NFT
       class CollectionsController < BaseController
         def index
-          scope = TokenCollection.includes(:items, :creator, :type_script)
+          scope = TokenCollection.includes(:items, :creator, :type_script, :cell)
           if params[:type].present?
             scope = scope.where(standard: params[:type])
           end

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], :outputs => {}, :bitcoin_annotation => [] }
+      includes = { :cell_inputs => [:previous_cell_output], :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

@@ -31,7 +31,7 @@ def execute
       end
 
       records = ckb_transactions
-                  .includes(:cell_inputs, :outputs, :bitcoin_annotation => [])
+                  .includes(:cell_inputs => [:previous_cell_output], :cell_outputs => [], :bitcoin_annotation => [])
                   .select(select_fields)
                   .page(page).per(page_size)
       options = FastJsonapi::PaginationMetaGenerator.new(

app/models/concerns/ckb_transactions/display_cells.rb

@@ -19,7 +19,7 @@ def display_outputs(previews: false)
         if is_cellbase
           cellbase_display_outputs
         else
-          cell_outputs_for_display = outputs.order(id: :asc)
+          cell_outputs_for_display = cell_outputs.order(id: :asc)
           cell_outputs_for_display = cell_outputs_for_display.limit(10) if previews
           normal_tx_display_outputs(cell_outputs_for_display)
         end
@@ -41,7 +41,7 @@ def cellbase_display_inputs
       end
 
       def cellbase_display_outputs
-        cell_outputs_for_display = outputs.order(id: :asc)
+        cell_outputs_for_display = cell_outputs.order(id: :asc)
         cellbase = Cellbase.new(block)
         cell_outputs_for_display.map do |output|
           consumed_tx_hash = output.live? ? nil : output.consumed_by.tx_hash
@@ -89,7 +89,7 @@ def normal_tx_display_inputs(cell_inputs_for_display)
             capacity: previous_cell_output.capacity,
             occupied_capacity: previous_cell_output.occupied_capacity,
             address_hash: previous_cell_output.address_hash,
-            generated_tx_hash: previous_cell_output.ckb_transaction.tx_hash,
+            generated_tx_hash: previous_cell_output.tx_hash,
             cell_index: previous_cell_output.cell_index,
             cell_type: previous_cell_output.cell_type,
             since: {
@@ -218,14 +218,11 @@ def attributes_for_omiga_inscription_cell(omiga_inscription_cell)
       end
 
       def attributes_for_dao_input(nervos_dao_withdrawing_cell, is_phase2 = true)
-        nervos_dao_withdrawing_cell_generated_tx = nervos_dao_withdrawing_cell.ckb_transaction
-        nervos_dao_deposit_cell = nervos_dao_withdrawing_cell_generated_tx.
-          cell_inputs.order("index asc")[nervos_dao_withdrawing_cell.cell_index].previous_cell_output
+        block_number = CKB::Utils.hex_to_bin(nervos_dao_withdrawing_cell.data).unpack("Q<").pack("Q>").unpack1("H*").hex
         # start block: the block contains the transaction which generated the deposit cell output
-        compensation_started_block = Block.select(:number, :timestamp).find(nervos_dao_deposit_cell.block.id)
+        compensation_started_block = Block.select(:number, :timestamp).find_by_number(block_number)
         # end block: the block contains the transaction which generated the withdrawing cell
-        compensation_ended_block = Block.select(:number, :timestamp).
-          find(nervos_dao_withdrawing_cell_generated_tx.block_id)
+        compensation_ended_block = Block.select(:number, :timestamp).find(nervos_dao_withdrawing_cell.block_id)
         interest = CkbUtils.dao_interest(nervos_dao_withdrawing_cell)
 
         attributes = {