Merge pull request #566 from nervosnetwork/rc/v0.9.4

[ᚬmaster] Rc/v0.9.4

Author: shaojunda

.rubocop.yml

@@ -40,7 +40,7 @@ Style/TrailingCommaInHashLiteral:
 Metrics/LineLength:
   Enabled: false
 
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
 
 Style/BracesAroundHashParameters:

.rubocop_thoughtbot.yml

@@ -289,7 +289,7 @@ Style/PerlBackrefs:
 Naming/PredicateName:
   Description: 'Check the names of predicate methods.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#bool-methods-qmark'
-  NamePrefixBlacklist:
+  ForbiddenPrefixes:
     - is_
   Exclude:
     - spec/**/*
@@ -403,7 +403,7 @@ Style/WordArray:
 
 # Layout
 
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   Description: 'Here we check if the parameters on a multi-line method call or definition are aligned.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-double-indent'
   Enabled: false
@@ -471,7 +471,7 @@ Lint/DeprecatedClassMethods:
   Description: 'Check for deprecated class method calls.'
   Enabled: false
 
-Lint/DuplicatedKey:
+Lint/DuplicateHashKey:
   Description: 'Check for duplicate keys in hash literals.'
   Enabled: false
 
@@ -487,7 +487,7 @@ Lint/FormatParameterMismatch:
   Description: 'The number of parameters to format/sprint must match the fields.'
   Enabled: false
 
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Description: "Don't suppress exception."
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions'
   Enabled: false
@@ -533,7 +533,7 @@ Lint/UnderscorePrefixedVariableName:
   Description: 'Do not use prefix `_` for a variable that is used.'
   Enabled: false
 
-Lint/UnneededCopDisableDirective:
+Lint/RedundantCopDisableDirective:
   Description: >-
                  Checks for rubocop:disable comments that can be removed.
                  Note: this cop is not disabled when disabling all cops.

CHANGELOG.md

@@ -5,14 +5,14 @@ class AddressTransactionsController < ApplicationController
       before_action :validate_pagination_params, :pagination_params
 
       def show
-        address = Address.find_address!(params[:id])
-        raise Api::V1::Exceptions::AddressNotFoundError if address.is_a?(NullAddress)
+        @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)
-        options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: ckb_transactions, page: @page, page_size: @page_size).call
+        presented_address = AddressPresenter.new(@address)
+        @ckb_transactions = presented_address.ckb_transactions.recent.distinct.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, address: address } }))
+        render json: json_result
       end
 
       private
@@ -32,6 +32,20 @@ def pagination_params
         @page = params[:page] || 1
         @page_size = params[:page_size] || CkbTransaction.default_per_page
       end
+
+      def json_result
+        ckb_transaction_serializer = CkbTransactionSerializer.new(@ckb_transactions, @options.merge({ params: { previews: true, address: @address } }))
+
+        if QueryKeyUtils.valid_address?(params[:id])
+          if @address.address_hash == @address.query_address
+            ckb_transaction_serializer
+          else
+            ckb_transaction_serializer.serialized_json.gsub(@address.address_hash, @address.query_address)
+          end
+        else
+          ckb_transaction_serializer
+        end
+      end
     end
   end
 end

app/controllers/api/v1/address_transactions_controller.rb

@@ -14,6 +14,8 @@ class Address < ApplicationRecord
 
   after_commit :flush_cache
 
+  attr_accessor :query_address
+
   def lock_script
     LockScript.where(address: self).first
   end
@@ -36,7 +38,14 @@ def self.cached_find(query_key)
       if QueryKeyUtils.valid_hex?(query_key)
         find_by(lock_hash: query_key)
       else
-        where(address_hash: query_key).to_a.presence || NullAddress.new(query_key)
+        lock_hash = CkbUtils.parse_address(query_key).script.compute_hash
+        address = find_by(lock_hash: lock_hash)
+        if address.present?
+          address.query_address = query_key
+          address
+        else
+          NullAddress.new(query_key)
+        end
       end
     end
   end

app/models/address.rb

@@ -16,11 +16,11 @@ class CellOutput < ApplicationRecord
 
   attribute :tx_hash, :ckb_hash
 
-  scope :consumed_after, -> (block_timestamp) { where("consumed_block_timestamp >= ?", block_timestamp) }
-  scope :consumed_before, -> (block_timestamp) { where("consumed_block_timestamp <= ?", block_timestamp) }
-  scope :unconsumed_at, -> (block_timestamp) { where("consumed_block_timestamp > ? or consumed_block_timestamp is null", block_timestamp) }
-  scope :generated_after, -> (block_timestamp) { where("block_timestamp >= ?", block_timestamp) }
-  scope :generated_before, -> (block_timestamp) { where("block_timestamp <= ?", block_timestamp) }
+  scope :consumed_after, ->(block_timestamp) { where("consumed_block_timestamp >= ?", block_timestamp) }
+  scope :consumed_before, ->(block_timestamp) { where("consumed_block_timestamp <= ?", block_timestamp) }
+  scope :unconsumed_at, ->(block_timestamp) { where("consumed_block_timestamp > ? or consumed_block_timestamp is null", block_timestamp) }
+  scope :generated_after, ->(block_timestamp) { where("block_timestamp >= ?", block_timestamp) }
+  scope :generated_before, ->(block_timestamp) { where("block_timestamp <= ?", block_timestamp) }
 
   after_commit :flush_cache
 
@@ -35,11 +35,12 @@ def node_output
   end
 
   def cache_keys
-    %W(previous_cell_output/#{tx_hash}/#{cell_index} normal_tx_display_inputs_previews_true_#{ckb_transaction_id}
-        normal_tx_display_inputs_previews_false_#{ckb_transaction_id} normal_tx_display_inputs_previews_true_#{consumed_by_id}
-        normal_tx_display_inputs_previews_false_#{consumed_by_id} normal_tx_display_outputs_previews_true_#{ckb_transaction_id}
-        normal_tx_display_outputs_previews_false_#{ckb_transaction_id} normal_tx_display_outputs_previews_true_#{consumed_by_id}
-        normal_tx_display_outputs_previews_false_#{consumed_by_id}
+    %W(
+      previous_cell_output/#{tx_hash}/#{cell_index} normal_tx_display_inputs_previews_true_#{ckb_transaction_id}
+      normal_tx_display_inputs_previews_false_#{ckb_transaction_id} normal_tx_display_inputs_previews_true_#{consumed_by_id}
+      normal_tx_display_inputs_previews_false_#{consumed_by_id} normal_tx_display_outputs_previews_true_#{ckb_transaction_id}
+      normal_tx_display_outputs_previews_false_#{ckb_transaction_id} normal_tx_display_outputs_previews_true_#{consumed_by_id}
+      normal_tx_display_outputs_previews_false_#{consumed_by_id}
     )
   end
 

app/models/cell_output.rb

@@ -18,8 +18,8 @@ class CkbTransaction < ApplicationRecord
   scope :recent, -> { order(block_timestamp: :desc) }
   scope :cellbase, -> { where(is_cellbase: true) }
   scope :normal, -> { where(is_cellbase: false) }
-  scope :created_after, -> (block_timestamp) { where("block_timestamp >= ?", block_timestamp) }
-  scope :created_before, -> (block_timestamp) { where("block_timestamp <= ?", block_timestamp) }
+  scope :created_after, ->(block_timestamp) { where("block_timestamp >= ?", block_timestamp) }
+  scope :created_before, ->(block_timestamp) { where("block_timestamp <= ?", block_timestamp) }
 
   after_commit :flush_cache
   before_destroy :recover_dead_cell
@@ -104,7 +104,8 @@ def attributes_for_dao_input(nervos_dao_withdrawing_cell, is_phase2 = true)
     attributes = { compensation_started_block_number: compensation_started_block.number, compensation_ended_block_number: compensation_ended_block.number, compensation_started_timestamp: compensation_started_block.timestamp, compensation_ended_timestamp: compensation_ended_block.timestamp, interest: interest }
     if is_phase2
       locked_until_block = Block.select(:number, :timestamp).find(block_id)
-      attributes.merge!({ locked_until_block_number: locked_until_block.number, locked_until_block_timestamp: locked_until_block.timestamp })
+      attributes[:locked_until_block_number] = locked_until_block.number
+      attributes[:locked_until_block_timestamp] = locked_until_block.timestamp
     end
 
     CkbUtils.hash_value_to_s(attributes)

app/models/ckb_transaction.rb

@@ -35,12 +35,13 @@ def estimated_apc(deposit_epoch = tip_block_fraction_epoch, deposited_epochs = E
     checkpoints.unshift(start_epoch_number.to_i) if checkpoints.empty? || checkpoints[0] > start_epoch_number
     checkpoints.push(scaled_end_epoch_number.to_i) if checkpoints.last < scaled_end_epoch_number
     end_epoch_numbers = checkpoints[1..-1]
-    rates = end_epoch_numbers.each_with_index.map do |inner_end_epoch_number, index|
-      epoch_index = deposit_epoch.index * 1800 / deposit_epoch.length
-      start_epoch = OpenStruct.new(number: checkpoints[index], index: epoch_index, length: 1800)
-      end_epoch = OpenStruct.new(number: inner_end_epoch_number, index: epoch_index, length: 1800)
-      rate(start_epoch, end_epoch)
-    end
+    rates =
+      end_epoch_numbers.each_with_index.map do |inner_end_epoch_number, index|
+        epoch_index = deposit_epoch.index * 1800 / deposit_epoch.length
+        start_epoch = OpenStruct.new(number: checkpoints[index], index: epoch_index, length: 1800)
+        end_epoch = OpenStruct.new(number: inner_end_epoch_number, index: epoch_index, length: 1800)
+        rate(start_epoch, end_epoch)
+      end
     rate = rates.reduce(1) { |memo, rate| memo * (1 + rate) } - 1
     (rate * 100) / ratio
   end
@@ -89,7 +90,7 @@ def latest_daily_statistic
 
   def alpha(start_epoch_number)
     i = ((start_epoch_number + 1) / EPOCHS_IN_PERIOD).floor
-    p = PRIMARY_ISSUANCE_PER_YEAR_BASE / 2 ** i / 2190
+    p = PRIMARY_ISSUANCE_PER_YEAR_BASE / 2**i / 2190
     p / SECONDARY_ISSUANCE_PER_EPOCH
   end
 
@@ -105,8 +106,8 @@ def total_issuance(start_epoch)
 
   def primary_issuance(start_epoch)
     epochs = (start_epoch.number / EPOCHS_IN_PERIOD).floor
-    epochs.times.reduce(GENESIS_ISSUANCE) { |memo, item| memo + (ANNUAL_PRIMARY_ISSUANCE_BASE * YEARS_IN_PERIOD) / 2 ** item } \
-      + (ANNUAL_PRIMARY_ISSUANCE_BASE * ((start_epoch.number + 1 - epochs * EPOCHS_IN_PERIOD) / EPOCHS_IN_ONE_NATURAL_YEAR)) / 2 ** epochs
+    epochs.times.reduce(GENESIS_ISSUANCE) { |memo, item| memo + (ANNUAL_PRIMARY_ISSUANCE_BASE * YEARS_IN_PERIOD) / 2**item } \
+      + (ANNUAL_PRIMARY_ISSUANCE_BASE * ((start_epoch.number + 1 - epochs * EPOCHS_IN_PERIOD) / EPOCHS_IN_ONE_NATURAL_YEAR)) / 2**epochs
   end
 
   def secondary_issuance(start_epoch)

app/models/dao_contract.rb

@@ -8,7 +8,7 @@ def id
   end
 
   def address_hash
-    object.first.address_hash
+    object.first.query_address
   end
 
   def balance

app/presenters/address_presenter.rb

@@ -17,6 +17,7 @@ def call
     end
 
     private
+
     attr_reader :block_number
   end
 end