[ᚬmaster] Rc/v0.9.2 (#558)

[ᚬmaster] Rc/v0.9.2

Author: shaojunda

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 .vscode
 .idea/
+TAGS
 ckb-explorer.iml
 .generators
 .rakeTasks

CHANGELOG.md

@@ -1,3 +1,18 @@
+# [0.9.2](https://github.com/shaojunda/ckb-explorer/compare/v0.9.1...v0.9.2) (2020-01-31)
+
+
+### Features
+
+* add address average deposit time generator ([0618138](https://github.com/shaojunda/ckb-explorer/commit/0618138))
+* add average deposit time to address ([81469df](https://github.com/shaojunda/ckb-explorer/commit/81469df))
+* add claimed and unclaimed compensation ([268858d](https://github.com/shaojunda/ckb-explorer/commit/268858d))
+* add compensation and lock period ([e42b072](https://github.com/shaojunda/ckb-explorer/commit/e42b072))
+* add more elements to daily chart ([0e239b1](https://github.com/shaojunda/ckb-explorer/commit/0e239b1))
+* add new columns to daily statistic ([0a013c4](https://github.com/shaojunda/ckb-explorer/commit/0a013c4))
+* add unlaimed compenstaion generator worker ([ba0e105](https://github.com/shaojunda/ckb-explorer/commit/ba0e105))
+
+
+
 # [0.9.1](https://github.com/shaojunda/ckb-explorer/compare/v0.8.4...v0.9.0) (2020-01-13)
 
 

app/controllers/api/v1/dao_depositors_controller.rb

@@ -2,7 +2,7 @@ module Api
   module V1
     class DaoDepositorsController < ApplicationController
       def index
-        addresses = Address.where("dao_deposit > 0").order(dao_deposit: :desc).limit(100)
+        addresses = Address.select(:id, :address_hash, :dao_deposit, :average_deposit_time).where("dao_deposit > 0").order(dao_deposit: :desc).limit(100)
 
         render json: DaoDepositorSerializer.new(addresses)
       end

app/controllers/api/v1/epoch_statistics_controller.rb

@@ -4,7 +4,7 @@ class EpochStatisticsController < ApplicationController
       before_action :validate_query_params
 
       def show
-        epoch_statistics = EpochStatistic.order(id: :desc).reverse
+        epoch_statistics = EpochStatistic.order(epoch_number: :desc).limit(90).reverse
         render json: EpochStatisticSerializer.new(epoch_statistics, { params: { indicator: params[:id] } })
       end
 

app/controllers/application_controller.rb

@@ -20,8 +20,8 @@ def api_error(error)
   end
 
   def check_header_info
-    raise Api::V1::Exceptions::WrongContentTypeError if request.headers["Content-Type"] != "application/vnd.api+json"
-    raise Api::V1::Exceptions::WrongAcceptError if request.headers["Accept"] != "application/vnd.api+json"
+    raise Api::V1::Exceptions::InvalidContentTypeError if request.headers["Content-Type"] != "application/vnd.api+json"
+    raise Api::V1::Exceptions::InvalidAcceptError if request.headers["Accept"] != "application/vnd.api+json"
   end
 
   def validate_pagination_params

app/controllers/validations/daily_statistic.rb

@@ -25,7 +25,7 @@ def error_object
     attr_accessor :query_key
 
     def query_key_format_must_be_correct
-      if query_key.blank? || !query_key.in?(::DailyStatistic::VALID_INDICATORS)
+      if query_key.blank? || !(query_key.split("-") - ::DailyStatistic::VALID_INDICATORS).empty?
         errors.add(:query_key, "indicator name is invalid")
       end
     end

app/lib/api/v1/exceptions.rb

@@ -13,13 +13,13 @@ def initialize(code:, status:, title:, detail:, href:)
         end
       end
 
-      class WrongContentTypeError < Error
+      class InvalidContentTypeError < Error
         def initialize
           super code: 1001, status: 415, title: "Unsupported Media Type", detail: "Content Type must be application/vnd.api+json", href: "https://nervosnetwork.github.io/ckb-explorer/public/api_doc.html"
         end
       end
 
-      class WrongAcceptError < Error
+      class InvalidAcceptError < Error
         def initialize
           super code: 1002, status: 406, title: "Not Acceptable", detail: "Accept must be application/vnd.api+json", href: "https://nervosnetwork.github.io/ckb-explorer/public/api_doc.html"
         end

app/models/address.rb

@@ -80,6 +80,7 @@ def special?
 #  visible                :boolean          default(TRUE)
 #  live_cells_count       :decimal(30, )    default(0)
 #  mined_blocks_count     :integer          default(0)
+#  average_deposit_time   :decimal(, )
 #
 # Indexes
 #

app/models/block.rb

@@ -57,7 +57,7 @@ def difficulty
   end
 
   def block_index_in_epoch
-     number - start_number
+    number - start_number
   end
 
   def fraction_epoch

app/models/cell_output.rb

@@ -16,6 +16,7 @@ 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) }