Merge pull request #642 from nervosnetwork/rc/v0.9.7

Author: shaojunda

CHANGELOG.md

@@ -1,3 +1,16 @@
+# [v0.9.7](https://github.com/shaojunda/ckb-explorer/compare/v0.9.6...v0.9.7) (2020-06-05)
+
+
+### Features
+
+* #[635](https://github.com/nervosnetwork/ckb-explorer/pull/635): add udts api
+
+
+### Performance Improvements
+
+* #[625](https://github.com/nervosnetwork/ckb-explorer/pull/625): address dao and udt transactions api
+
+
 # [v0.9.6](https://github.com/shaojunda/ckb-explorer/compare/v0.9.5...v0.9.6) (2020-06-01)
 
 

app/controllers/api/v1/address_dao_transactions_controller.rb

@@ -8,8 +8,7 @@ def show
         address = Address.find_address!(params[:id])
         raise Api::V1::Exceptions::AddressNotFoundError if address.is_a?(NullAddress)
 
-        presented_address = AddressPresenter.new(address)
-        ckb_dao_transactions = presented_address.ckb_dao_transactions.recent.distinct.page(@page).per(@page_size)
+        ckb_dao_transactions = address.ckb_dao_transactions.recent.page(@page).per(@page_size)
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: ckb_dao_transactions, page: @page, page_size: @page_size).call
 
         render json: CkbTransactionSerializer.new(ckb_dao_transactions, options.merge({ params: { previews: true } }))

app/controllers/api/v1/address_transactions_controller.rb

@@ -8,8 +8,7 @@ def show
         @address = Address.find_address!(params[:id])
         raise Api::V1::Exceptions::AddressNotFoundError if @address.is_a?(NullAddress)
 
-        presented_address = AddressPresenter.new(@address)
-        @ckb_transactions = presented_address.ckb_transactions.recent.distinct.page(@page).per(@page_size)
+        @ckb_transactions = @address.custom_ckb_transactions.recent.page(@page).per(@page_size)
         @options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: @ckb_transactions, page: @page, page_size: @page_size).call
 
         render json: json_result

app/controllers/api/v1/address_udt_transactions_controller.rb

@@ -12,8 +12,7 @@ def show
         udt = Udt.find_by(type_hash: params[:type_hash], published: true)
         raise Api::V1::Exceptions::UdtNotFoundError if udt.blank?
 
-        presented_address = AddressPresenter.new(address)
-        ckb_dao_transactions = presented_address.ckb_udt_transactions(params[:type_hash]).recent.distinct.page(@page).per(@page_size)
+        ckb_dao_transactions = address.ckb_udt_transactions(params[:type_hash]).recent.page(@page).per(@page_size)
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: ckb_dao_transactions, page: @page, page_size: @page_size).call
 
         render json: CkbTransactionSerializer.new(ckb_dao_transactions, options.merge({ params: { previews: true } }))

app/controllers/api/v1/addresses_controller.rb

@@ -26,7 +26,7 @@ def json_response(address)
         if QueryKeyUtils.valid_hex?(params[:id])
           LockHashSerializer.new(address)
         else
-          presented_address = address.is_a?(NullAddress) ? NullAddress.new(params[:id]) : AddressPresenter.new(address)
+          presented_address = address.is_a?(NullAddress) ? NullAddress.new(params[:id]) : address
           AddressSerializer.new(presented_address)
         end
       end

app/controllers/api/v1/udt_transactions_controller.rb

@@ -4,7 +4,7 @@ class Api::V1::UdtTransactionsController < ApplicationController
 
   def show
     udt = Udt.find_by!(type_hash: params[:id], published: true)
-    ckb_transactions = udt.ckb_transactions.recent.distinct.page(@page).per(@page_size)
+    ckb_transactions = udt.ckb_transactions.recent.page(@page).per(@page_size)
     options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: ckb_transactions, page: @page, page_size: @page_size).call
 
     render json: CkbTransactionSerializer.new(ckb_transactions, options.merge({ params: { previews: true } }))

app/controllers/api/v1/udts_controller.rb

@@ -1,6 +1,11 @@
 class Api::V1::UdtsController < ApplicationController
   before_action :validate_query_params, only: :show
 
+  def index
+    udts = Udt.order(addresses_count: :desc).limit(1000)
+    render json: UdtSerializer.new(udts)
+  end
+
   def show
     udt = Udt.find_by!(type_hash: params[:id], published: true)
 

app/controllers/validations/distribution_data.rb

@@ -25,9 +25,15 @@ def error_object
     attr_accessor :query_key
 
     def query_key_format_must_be_correct
-      if query_key.blank? || !(query_key.split("-") - ::DistributionData::VALID_INDICATORS).empty?
+      if query_key.blank? || !query_key_valid?
         errors.add(:query_key, "indicator name is invalid")
       end
     end
+
+    def query_key_valid?
+      query_keys = query_key.split("-")
+      extra_keys = query_keys - ::DistributionData::VALID_INDICATORS
+      extra_keys.blank? || extra_keys.size == 1 && /^miner_address_distribution(\d+)$/ =~ extra_keys.first
+    end
   end
 end

app/controllers/validations/monetary_data.rb

@@ -33,7 +33,7 @@ def query_key_format_must_be_correct
     def query_key_valid?
       query_keys = query_key.split("-")
       extra_keys = query_keys - ::MonetaryData::VALID_INDICATORS
-      extra_keys.blank? || extra_keys.size == 1 && extra_keys.first =~ /^nominal_apc(\d+)$/
+      extra_keys.blank? || extra_keys.size == 1 && /^nominal_apc(\d+)$/ =~ extra_keys.first
     end
   end
 end

app/models/address.rb

@@ -17,6 +17,53 @@ class Address < ApplicationRecord
 
   attr_accessor :query_address
 
+  def custom_ckb_transactions
+    ckb_transaction_ids = account_books.select(:ckb_transaction_id).distinct
+    CkbTransaction.where(id: ckb_transaction_ids)
+  end
+
+  def ckb_dao_transactions
+    ckb_transaction_ids = cell_outputs.where(cell_type: %w(nervos_dao_deposit nervos_dao_withdrawing)).select("ckb_transaction_id").distinct
+    CkbTransaction.where(id: ckb_transaction_ids)
+  end
+
+  def ckb_udt_transactions(type_hash)
+    sql =
+      <<-SQL
+        SELECT
+          generated_by_id ckb_transaction_id
+        FROM
+          cell_outputs
+        WHERE
+          address_id = #{id}
+          AND
+          cell_type = #{CellOutput::cell_types['udt']}
+          AND
+          type_hash = '#{type_hash}'
+
+        UNION
+
+        SELECT
+          consumed_by_id ckb_transaction_id
+        FROM
+          cell_outputs
+        WHERE
+          address_id = #{id}
+          AND
+          cell_type = #{CellOutput::cell_types['udt']}
+          AND
+          type_hash = '#{type_hash}'
+          AND
+          consumed_by_id is not null
+      SQL
+    ckb_transaction_ids = CellOutput.select("ckb_transaction_id").from("(#{sql}) as cell_outputs")
+    CkbTransaction.where(id: ckb_transaction_ids.distinct)
+  end
+
+  def lock_info
+    lock_script.lock_info
+  end
+
   def lock_script
     LockScript.where(address: self).first
   end