From 0a013c436fd082c20119a4d5ac16f758f0d6a2be Mon Sep 17 00:00:00 2001 From: shaojunda Date: Wed, 15 Jan 2020 10:45:35 +0800 Subject: [PATCH 01/28] feat: add new columns to daily statistic --- app/models/daily_statistic.rb | 6 ++++++ ...0200115020206_add_new_columns_to_daily_statistic.rb | 10 ++++++++++ db/schema.rb | 8 +++++++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20200115020206_add_new_columns_to_daily_statistic.rb diff --git a/app/models/daily_statistic.rb b/app/models/daily_statistic.rb index d097220c3..69c17e69e 100644 --- a/app/models/daily_statistic.rb +++ b/app/models/daily_statistic.rb @@ -22,4 +22,10 @@ class DailyStatistic < ApplicationRecord # mining_reward :string default("0") # deposit_compensation :string default("0") # treasury_amount :string default("0") +# live_cells_count :string default("0") +# dead_cells_count :string default("0") +# avg_hash_rate :string default("0") +# avg_difficulty :string default("0") +# uncle_rate :string default("0") +# total_depositors_count :string default("0") # diff --git a/db/migrate/20200115020206_add_new_columns_to_daily_statistic.rb b/db/migrate/20200115020206_add_new_columns_to_daily_statistic.rb new file mode 100644 index 000000000..2e709f5be --- /dev/null +++ b/db/migrate/20200115020206_add_new_columns_to_daily_statistic.rb @@ -0,0 +1,10 @@ +class AddNewColumnsToDailyStatistic < ActiveRecord::Migration[6.0] + def change + add_column :daily_statistics, :live_cells_count, :string, default: "0" + add_column :daily_statistics, :dead_cells_count, :string, default: "0" + add_column :daily_statistics, :avg_hash_rate, :string, default: "0" + add_column :daily_statistics, :avg_difficulty, :string, default: "0" + add_column :daily_statistics, :uncle_rate, :string, default: "0" + add_column :daily_statistics, :total_depositors_count, :string, default: "0" + end +end diff --git a/db/schema.rb b/db/schema.rb index bcb30a30f..d87511c58 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_01_10_123617) do +ActiveRecord::Schema.define(version: 2020_01_15_020206) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -172,6 +172,12 @@ t.string "mining_reward", default: "0" t.string "deposit_compensation", default: "0" t.string "treasury_amount", default: "0" + t.string "live_cells_count", default: "0" + t.string "dead_cells_count", default: "0" + t.string "avg_hash_rate", default: "0" + t.string "avg_difficulty", default: "0" + t.string "uncle_rate", default: "0" + t.string "total_depositors_count", default: "0" end create_table "dao_contracts", force: :cascade do |t| From 0e239b17a3458310fbb83707155d539dfb2ad02e Mon Sep 17 00:00:00 2001 From: shaojunda Date: Wed, 15 Jan 2020 19:05:11 +0800 Subject: [PATCH 02/28] feat: add more elements to daily chart --- app/models/block.rb | 2 +- app/models/daily_statistic.rb | 2 +- app/serializers/daily_statistic_serializer.rb | 20 +++++++ .../charts/daily_statistic_generator.rb | 53 ++++++++++++++++++- 4 files changed, 74 insertions(+), 3 deletions(-) diff --git a/app/models/block.rb b/app/models/block.rb index 1d6367d8a..78bf6b940 100644 --- a/app/models/block.rb +++ b/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 diff --git a/app/models/daily_statistic.rb b/app/models/daily_statistic.rb index 69c17e69e..bf1c11724 100644 --- a/app/models/daily_statistic.rb +++ b/app/models/daily_statistic.rb @@ -1,5 +1,5 @@ class DailyStatistic < ApplicationRecord - VALID_INDICATORS = %w(transactions_count addresses_count total_dao_deposit).freeze + VALID_INDICATORS = %w(transactions_count addresses_count total_dao_deposit live_cells_count dead_cells_count avg_hash_rate avg_difficulty uncle_rate).freeze end # == Schema Information diff --git a/app/serializers/daily_statistic_serializer.rb b/app/serializers/daily_statistic_serializer.rb index 9fece7ac4..a68c60386 100644 --- a/app/serializers/daily_statistic_serializer.rb +++ b/app/serializers/daily_statistic_serializer.rb @@ -16,4 +16,24 @@ class DailyStatisticSerializer attribute :total_dao_deposit, if: Proc.new { |_record, params| params && params[:indicator] == "total_dao_deposit" } + + attribute :live_cells_count, if: Proc.new { |_record, params| + params && params[:indicator] == "live_cells_count" + } + + attribute :dead_cells_count, if: Proc.new { |_record, params| + params && params[:indicator] == "dead_cells_count" + } + + attribute :avg_hash_rate, if: Proc.new { |_record, params| + params && params[:indicator] == "avg_hash_rate" + } + + attribute :avg_difficulty, if: Proc.new { |_record, params| + params && params[:indicator] == "avg_difficulty" + } + + attribute :uncle_rate, if: Proc.new { |_record, params| + params && params[:indicator] == "uncle_rate" + } end diff --git a/app/services/charts/daily_statistic_generator.rb b/app/services/charts/daily_statistic_generator.rb index 1400d49ba..4f506f339 100644 --- a/app/services/charts/daily_statistic_generator.rb +++ b/app/services/charts/daily_statistic_generator.rb @@ -11,6 +11,8 @@ def initialize(datetime = nil, from_scratch = false) def call daily_ckb_transactions_count = CkbTransaction.created_after(started_at).created_before(ended_at).count + return if daily_ckb_transactions_count.zero? + cell_outputs = CellOutput.where.not(cell_type: "normal") mining_reward = Block.where("timestamp <= ?", ended_at).sum(:secondary_reward) deposit_compensation = unclaimed_compensation(cell_outputs, current_tip_block) + claimed_compensation(cell_outputs) @@ -23,13 +25,62 @@ def call dao_depositors_count: dao_depositors_count, unclaimed_compensation: unclaimed_compensation(cell_outputs, current_tip_block), claimed_compensation: claimed_compensation(cell_outputs), average_deposit_time: average_deposit_time(cell_outputs), mining_reward: mining_reward, deposit_compensation: deposit_compensation, treasury_amount: treasury_amount(cell_outputs, current_tip_block), - estimated_apc: estimated_apc) + estimated_apc: estimated_apc, live_cells_count: live_cells_count, dead_cells_count: dead_cells_count, avg_hash_rate: avg_hash_rate, + avg_difficulty: avg_difficulty, uncle_rate: uncle_rate) end private attr_reader :datetime, :from_scratch + def live_cells_count + CellOutput.unconsumed_at(ended_at).count + end + + def dead_cells_count + CellOutput.consumed_before(ended_at).count + end + + def total_blocks_count + @total_blocks_count ||= Block.created_after(started_at).created_before(ended_at).count + end + + def first_blocks_of_each_epoch + Block.created_after(started_at).created_before(ended_at).select("distinct on (epoch) * ").order(:epoch, :number).to_a + end + + def avg_hash_rate + first_block_for_the_day = Block.created_after(started_at).created_before(ended_at).recent.last + last_block_for_the_day = Block.created_after(started_at).created_before(ended_at).recent.first + total_block_time = last_block_for_the_day.timestamp - first_block_for_the_day.timestamp + + BigDecimal(total_difficulties_for_the_day) / total_block_time + end + + def avg_difficulty + BigDecimal(total_difficulties_for_the_day) / total_blocks_count + end + + def total_difficulties_for_the_day + @total_difficulties ||= + first_blocks_of_each_epoch.each_with_index.reduce(0) do |memo, (block, index)| + case index + when 0 + last_block_number_in_epoch = block.number + block.length - 1 + block.difficulty * (last_block_number_in_epoch - block.number + 1) + when first_blocks_of_each_epoch.size - 1 + block.difficulty * (block.block_index_in_epoch + 1) + else + block.difficulty * block.length + end + end + end + + def uncle_rate + uncles_count = Block.created_after(started_at).created_before(ended_at).sum(:uncles_count) + BigDecimal(uncles_count) / total_blocks_count + end + def processed_addresses_count if from_scratch Address.created_before(ended_at).count From 7abdb16c056595748f0f4d2738300511c538131b Mon Sep 17 00:00:00 2001 From: shaojunda Date: Wed, 15 Jan 2020 19:11:30 +0800 Subject: [PATCH 03/28] chore: just return 90 records for epoch statistic --- app/controllers/api/v1/epoch_statistics_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/v1/epoch_statistics_controller.rb b/app/controllers/api/v1/epoch_statistics_controller.rb index 4073c5251..720353bc2 100644 --- a/app/controllers/api/v1/epoch_statistics_controller.rb +++ b/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 From 70f3efd1d77b1e49c5e2ff46a9262a89b92dbe40 Mon Sep 17 00:00:00 2001 From: shaojunda Date: Wed, 15 Jan 2020 19:28:00 +0800 Subject: [PATCH 04/28] chore: update daily statistic validations --- app/controllers/validations/daily_statistic.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/validations/daily_statistic.rb b/app/controllers/validations/daily_statistic.rb index dc98c6d19..69a5bf726 100644 --- a/app/controllers/validations/daily_statistic.rb +++ b/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("-").map { |item| item.in?(::DailyStatistic::VALID_INDICATORS) }.all?(true) errors.add(:query_key, "indicator name is invalid") end end From 1090c7ff3faca9ba17e967f7d3ec30c0797d8613 Mon Sep 17 00:00:00 2001 From: shaojunda Date: Wed, 15 Jan 2020 19:31:44 +0800 Subject: [PATCH 05/28] chore: adjust test --- test/services/charts/daily_statistic_generator_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/services/charts/daily_statistic_generator_test.rb b/test/services/charts/daily_statistic_generator_test.rb index 768e6c310..83d844443 100644 --- a/test/services/charts/daily_statistic_generator_test.rb +++ b/test/services/charts/daily_statistic_generator_test.rb @@ -4,7 +4,7 @@ module Charts class DailyStatisticGeneratorTest < ActiveSupport::TestCase test "should create daily statistic record" do block = create(:block, dao: "0xaff1568bbe49672f8a02516252ab2300df8c9e15dad428000035a1d671700007", timestamp: (Time.current - 1.day).end_of_day.to_i * 1000) - tx = create(:ckb_transaction, block: block) + tx = create(:ckb_transaction, block: block, block_timestamp: block.timestamp) create(:cell_output, cell_type: "nervos_dao_deposit", generated_by: tx, ckb_transaction: tx, block: block, capacity: 10**8 * 1000, block_timestamp: (Time.current - 1.day).end_of_day.to_i * 1000) assert_difference -> { ::DailyStatistic.count }, 1 do Charts::DailyStatisticGenerator.new.call From 8803845fa7f08dcce4fc0b946cfdc35f1cadae11 Mon Sep 17 00:00:00 2001 From: shaojunda Date: Wed, 15 Jan 2020 19:38:00 +0800 Subject: [PATCH 06/28] chore: update daily statistic serializer --- app/models/daily_statistic.rb | 2 +- app/serializers/daily_statistic_serializer.rb | 14 +++++++++----- app/services/charts/daily_statistic_generator.rb | 8 ++++++-- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/models/daily_statistic.rb b/app/models/daily_statistic.rb index bf1c11724..b189e9177 100644 --- a/app/models/daily_statistic.rb +++ b/app/models/daily_statistic.rb @@ -1,5 +1,5 @@ class DailyStatistic < ApplicationRecord - VALID_INDICATORS = %w(transactions_count addresses_count total_dao_deposit live_cells_count dead_cells_count avg_hash_rate avg_difficulty uncle_rate).freeze + VALID_INDICATORS = %w(transactions_count addresses_count total_dao_deposit live_cells_count dead_cells_count avg_hash_rate avg_difficulty uncle_rate total_depositors_count).freeze end # == Schema Information diff --git a/app/serializers/daily_statistic_serializer.rb b/app/serializers/daily_statistic_serializer.rb index a68c60386..88ddaec5b 100644 --- a/app/serializers/daily_statistic_serializer.rb +++ b/app/serializers/daily_statistic_serializer.rb @@ -18,22 +18,26 @@ class DailyStatisticSerializer } attribute :live_cells_count, if: Proc.new { |_record, params| - params && params[:indicator] == "live_cells_count" + params && params[:indicator].include?("live_cells_count") } attribute :dead_cells_count, if: Proc.new { |_record, params| - params && params[:indicator] == "dead_cells_count" + params && params[:indicator].include?("dead_cells_count") } attribute :avg_hash_rate, if: Proc.new { |_record, params| - params && params[:indicator] == "avg_hash_rate" + params && params[:indicator].include?("avg_hash_rate") } attribute :avg_difficulty, if: Proc.new { |_record, params| - params && params[:indicator] == "avg_difficulty" + params && params[:indicator].include?("avg_difficulty") } attribute :uncle_rate, if: Proc.new { |_record, params| - params && params[:indicator] == "uncle_rate" + params && params[:indicator].include?("uncle_rate") + } + + attribute :total_depositors_count, if: Proc.new { |_record, params| + params && params[:indicator].include?("total_depositors_count") } end diff --git a/app/services/charts/daily_statistic_generator.rb b/app/services/charts/daily_statistic_generator.rb index 4f506f339..9c1e72f86 100644 --- a/app/services/charts/daily_statistic_generator.rb +++ b/app/services/charts/daily_statistic_generator.rb @@ -26,7 +26,7 @@ def call claimed_compensation: claimed_compensation(cell_outputs), average_deposit_time: average_deposit_time(cell_outputs), mining_reward: mining_reward, deposit_compensation: deposit_compensation, treasury_amount: treasury_amount(cell_outputs, current_tip_block), estimated_apc: estimated_apc, live_cells_count: live_cells_count, dead_cells_count: dead_cells_count, avg_hash_rate: avg_hash_rate, - avg_difficulty: avg_difficulty, uncle_rate: uncle_rate) + avg_difficulty: avg_difficulty, uncle_rate: uncle_rate, total_depositors_count: total_depositors_count) end private @@ -107,7 +107,11 @@ def total_dao_deposit end def dao_depositors_count - DaoEvent.processed.new_dao_depositor.created_before(ended_at).count - DaoEvent.processed.take_away_all_deposit.created_before(ended_at).count + total_depositors_count - DaoEvent.processed.take_away_all_deposit.created_before(ended_at).count + end + + def total_depositors_count + @total_depositors_count ||= DaoEvent.processed.new_dao_depositor.created_before(ended_at).count end def to_be_counted_date From 36250cc1bc9a6ceecd933b42d7962ba062aa2713 Mon Sep 17 00:00:00 2001 From: shaojunda Date: Thu, 16 Jan 2020 12:54:50 +0800 Subject: [PATCH 07/28] chore: update live, dead cells count calculation --- app/services/charts/daily_statistic_generator.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/services/charts/daily_statistic_generator.rb b/app/services/charts/daily_statistic_generator.rb index 9c1e72f86..2cb690f0b 100644 --- a/app/services/charts/daily_statistic_generator.rb +++ b/app/services/charts/daily_statistic_generator.rb @@ -34,11 +34,11 @@ def call attr_reader :datetime, :from_scratch def live_cells_count - CellOutput.unconsumed_at(ended_at).count + CellOutput.generated_before(ended_at).unconsumed_at(ended_at).count end def dead_cells_count - CellOutput.consumed_before(ended_at).count + CellOutput.generated_before(ended_at).consumed_before(ended_at).count end def total_blocks_count @@ -143,7 +143,7 @@ def claimed_compensation(cell_outputs) end def phase1_dao_interests(cell_outputs) - cell_outputs.nervos_dao_withdrawing.generated_before(ended_at).unconsumed_at(ended_at).reduce(0) do |memo, nervos_dao_withdrawing_cell| + cell_outputs.nervos_dao_withdrawing.generated_before(ended_at).unconsumed_at(ended_at).or().reduce(0) do |memo, nervos_dao_withdrawing_cell| memo + CkbUtils.dao_interest(nervos_dao_withdrawing_cell) end end From 6c4b86db42702fc4951af3b7ce8bb40ede551dd5 Mon Sep 17 00:00:00 2001 From: shaojunda Date: Thu, 16 Jan 2020 12:57:36 +0800 Subject: [PATCH 08/28] chore: update daily statistic serializer --- app/serializers/daily_statistic_serializer.rb | 6 +++--- app/services/charts/daily_statistic_generator.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/serializers/daily_statistic_serializer.rb b/app/serializers/daily_statistic_serializer.rb index 88ddaec5b..d3aa9b91f 100644 --- a/app/serializers/daily_statistic_serializer.rb +++ b/app/serializers/daily_statistic_serializer.rb @@ -6,15 +6,15 @@ class DailyStatisticSerializer end attribute :transactions_count, if: Proc.new { |_record, params| - params && params[:indicator] == "transactions_count" + params && params[:indicator].include?("transactions_count") } attribute :addresses_count, if: Proc.new { |_record, params| - params && params[:indicator] == "addresses_count" + params && params[:indicator].include?("addresses_count") } attribute :total_dao_deposit, if: Proc.new { |_record, params| - params && params[:indicator] == "total_dao_deposit" + params && params[:indicator].include?("total_dao_deposit") } attribute :live_cells_count, if: Proc.new { |_record, params| diff --git a/app/services/charts/daily_statistic_generator.rb b/app/services/charts/daily_statistic_generator.rb index 2cb690f0b..f81bc96df 100644 --- a/app/services/charts/daily_statistic_generator.rb +++ b/app/services/charts/daily_statistic_generator.rb @@ -143,7 +143,7 @@ def claimed_compensation(cell_outputs) end def phase1_dao_interests(cell_outputs) - cell_outputs.nervos_dao_withdrawing.generated_before(ended_at).unconsumed_at(ended_at).or().reduce(0) do |memo, nervos_dao_withdrawing_cell| + cell_outputs.nervos_dao_withdrawing.generated_before(ended_at).unconsumed_at(ended_at).reduce(0) do |memo, nervos_dao_withdrawing_cell| memo + CkbUtils.dao_interest(nervos_dao_withdrawing_cell) end end From 482e074d45cc50fdb27e7bb54dbc613232d8afa2 Mon Sep 17 00:00:00 2001 From: shaojunda Date: Thu, 16 Jan 2020 18:32:29 +0800 Subject: [PATCH 09/28] chore: change total difficulties calculation --- .../charts/daily_statistic_generator.rb | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/app/services/charts/daily_statistic_generator.rb b/app/services/charts/daily_statistic_generator.rb index f81bc96df..fd4471438 100644 --- a/app/services/charts/daily_statistic_generator.rb +++ b/app/services/charts/daily_statistic_generator.rb @@ -45,8 +45,8 @@ def total_blocks_count @total_blocks_count ||= Block.created_after(started_at).created_before(ended_at).count end - def first_blocks_of_each_epoch - Block.created_after(started_at).created_before(ended_at).select("distinct on (epoch) * ").order(:epoch, :number).to_a + def epoch_numbers_for_the_day + Block.created_after(started_at).created_before(ended_at).distinct(:epoch).pluck(:epoch) end def avg_hash_rate @@ -63,16 +63,10 @@ def avg_difficulty def total_difficulties_for_the_day @total_difficulties ||= - first_blocks_of_each_epoch.each_with_index.reduce(0) do |memo, (block, index)| - case index - when 0 - last_block_number_in_epoch = block.number + block.length - 1 - block.difficulty * (last_block_number_in_epoch - block.number + 1) - when first_blocks_of_each_epoch.size - 1 - block.difficulty * (block.block_index_in_epoch + 1) - else - block.difficulty * block.length - end + epoch_numbers_for_the_day.reduce(0) do |memo, epoch_number| + first_block_of_the_epoch = Block.created_after(started_at).created_before(ended_at).where(epoch: epoch_number).recent.last + last_block_of_the_epoch = Block.created_after(started_at).created_before(ended_at).where(epoch: epoch_number).recent.first + memo + first_block_of_the_epoch.difficulty * (last_block_of_the_epoch.number - first_block_of_the_epoch.number + 1) end end @@ -123,7 +117,7 @@ def started_at end def ended_at - @ended_at ||= time_in_milliseconds(to_be_counted_date.end_of_day) + @ended_at ||= time_in_milliseconds(to_be_counted_date.end_of_day) - 1 end def unclaimed_compensation(cell_outputs, current_tip_block) From 288e165a76321c66632ccfd10300cbb35bd1f15b Mon Sep 17 00:00:00 2001 From: shaojunda Date: Fri, 17 Jan 2020 16:26:22 +0800 Subject: [PATCH 10/28] chore: support incremental update --- app/models/cell_output.rb | 1 + app/models/dao_event.rb | 1 + .../charts/daily_statistic_generator.rb | 65 +++++++++++++++---- 3 files changed, 55 insertions(+), 12 deletions(-) diff --git a/app/models/cell_output.rb b/app/models/cell_output.rb index 4245cda15..18907ba8c 100644 --- a/app/models/cell_output.rb +++ b/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) } diff --git a/app/models/dao_event.rb b/app/models/dao_event.rb index e26949a39..ed28753af 100644 --- a/app/models/dao_event.rb +++ b/app/models/dao_event.rb @@ -7,6 +7,7 @@ class DaoEvent < ApplicationRecord belongs_to :ckb_transaction belongs_to :address + scope :created_after, ->(block_timestamp) { where("block_timestamp >= ?", block_timestamp) } scope :created_before, ->(block_timestamp) { where("block_timestamp <= ?", block_timestamp) } end diff --git a/app/services/charts/daily_statistic_generator.rb b/app/services/charts/daily_statistic_generator.rb index fd4471438..132fd477d 100644 --- a/app/services/charts/daily_statistic_generator.rb +++ b/app/services/charts/daily_statistic_generator.rb @@ -34,11 +34,23 @@ def call attr_reader :datetime, :from_scratch def live_cells_count - CellOutput.generated_before(ended_at).unconsumed_at(ended_at).count + if from_scratch + CellOutput.generated_before(ended_at).unconsumed_at(ended_at).count + else + CellOutput.generated_after(started_at).generated_before(ended_at).count + yesterday_daily_statistic.live_cells_count.to_i - dead_cells_count_today + end + end + + def dead_cells_count_today + @dead_cells_count_today ||= CellOutput.consumed_after(started_at).consumed_before(ended_at).count end def dead_cells_count - CellOutput.generated_before(ended_at).consumed_before(ended_at).count + if from_scratch + CellOutput.generated_before(ended_at).consumed_before(ended_at).count + else + dead_cells_count_today + yesterday_daily_statistic.dead_cells_count.to_i + end end def total_blocks_count @@ -79,7 +91,7 @@ def processed_addresses_count if from_scratch Address.created_before(ended_at).count else - Address.created_after(started_at).created_before(ended_at).count + latest_daily_statistic.addresses_count.to_i + Address.created_after(started_at).created_before(ended_at).count + yesterday_daily_statistic.addresses_count.to_i end end @@ -95,17 +107,37 @@ def current_tip_block end def total_dao_deposit - deposit_amount = DaoEvent.processed.deposit_to_dao.created_before(ended_at).sum(:value) - withdraw_amount = DaoEvent.processed.withdraw_from_dao.created_before(ended_at).sum(:value) - deposit_amount - withdraw_amount + if from_scratch + deposit_amount = DaoEvent.processed.deposit_to_dao.created_before(ended_at).sum(:value) + withdraw_amount = DaoEvent.processed.withdraw_from_dao.created_before(ended_at).sum(:value) + deposit_amount - withdraw_amount + else + deposit_amount_today = DaoEvent.processed.deposit_to_dao.created_after(started_at).created_before(ended_at).sum(:value) + withdraw_amount_today = DaoEvent.processed.withdraw_from_dao.created_after(started_at).created_before(ended_at).sum(:value) + deposit_amount_today - withdraw_amount_today + yesterday_daily_statistic.total_dao_deposit.to_i + end end def dao_depositors_count - total_depositors_count - DaoEvent.processed.take_away_all_deposit.created_before(ended_at).count + if from_scratch + total_depositors_count - DaoEvent.processed.take_away_all_deposit.created_before(ended_at).count + else + withdrawals_today = DaoEvent.processed.take_away_all_deposit.created_after(started_at).created_before(ended_at).count + new_depositors_today = DaoEvent.processed.new_dao_depositor.created_after(started_at).created_before(ended_at).count + new_depositors_today - withdrawals_today + yesterday_daily_statistic.dao_depositors_count.to_i + end end def total_depositors_count - @total_depositors_count ||= DaoEvent.processed.new_dao_depositor.created_before(ended_at).count + @total_depositors_count ||= + begin + if from_scratch + DaoEvent.processed.new_dao_depositor.created_before(ended_at).count + else + new_depositors_count_today = DaoEvent.processed.new_dao_depositor.created_after(started_at).created_before(ended_at).count + new_depositors_count_today + yesterday_daily_statistic.total_depositors_count.to_i + end + end end def to_be_counted_date @@ -130,8 +162,17 @@ def unclaimed_compensation(cell_outputs, current_tip_block) def claimed_compensation(cell_outputs) @claimed_compensation ||= begin - cell_outputs.nervos_dao_withdrawing.consumed_before(ended_at).reduce(0) do |memo, nervos_dao_withdrawing_cell| - memo + CkbUtils.dao_interest(nervos_dao_withdrawing_cell) + if from_scratch + cell_outputs.nervos_dao_withdrawing.consumed_before(ended_at).reduce(0) do |memo, nervos_dao_withdrawing_cell| + memo + CkbUtils.dao_interest(nervos_dao_withdrawing_cell) + end + else + claimed_compensation_today = + cell_outputs.nervos_dao_withdrawing.consumed_after(started_at).consumed_before(ended_at).reduce(0) do |memo, nervos_dao_withdrawing_cell| + memo + CkbUtils.dao_interest(nervos_dao_withdrawing_cell) + end + + claimed_compensation_today + yesterday_daily_statistic.claimed_compensation.to_i end end end @@ -182,8 +223,8 @@ def time_in_milliseconds(time) (time.to_f * 1000).floor end - def latest_daily_statistic - ::DailyStatistic.order(created_at_unixtimestamp: :desc).first || OpenStruct.new(addresses_count: 0, total_dao_deposit: 0, dao_depositors_count: 0, unclaimed_compensation: 0, claimed_compensation: 0, average_deposit_time: 0, mining_reward: 0, deposit_compensation: 0, treasury_amount: 0) + def yesterday_daily_statistic + @yesterday_daily_statistic ||= ::DailyStatistic.find_by(created_at_unixtimestamp: to_be_counted_date.yesterday.beginning_of_day.to_i) || OpenStruct.new(addresses_count: 0, total_dao_deposit: 0, dao_depositors_count: 0, unclaimed_compensation: 0, claimed_compensation: 0, average_deposit_time: 0, mining_reward: 0, deposit_compensation: 0, treasury_amount: 0, total_depositors_count: 0, live_cells_count: 0, dead_cells_count: 0) end end end From 0326be760e1ad36b8041591f7c2be429071fdc3c Mon Sep 17 00:00:00 2001 From: shaojunda Date: Mon, 20 Jan 2020 14:38:20 +0800 Subject: [PATCH 11/28] Update app/controllers/validations/daily_statistic.rb Co-Authored-By: Quake Wang --- app/controllers/validations/daily_statistic.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/validations/daily_statistic.rb b/app/controllers/validations/daily_statistic.rb index 69a5bf726..c0e7f1c7c 100644 --- a/app/controllers/validations/daily_statistic.rb +++ b/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.split("-").map { |item| item.in?(::DailyStatistic::VALID_INDICATORS) }.all?(true) + if query_key.blank? || !(query_key.split("-") - ::DailyStatistic::VALID_INDICATORS).empty? errors.add(:query_key, "indicator name is invalid") end end From 268858db07f0ed07618e3778bb073f77d2ea3d67 Mon Sep 17 00:00:00 2001 From: shaojunda Date: Tue, 21 Jan 2020 16:38:05 +0800 Subject: [PATCH 12/28] feat: add claimed and unclaimed compensation --- app/models/ckb_sync/node_data_processor.rb | 4 ++-- app/models/dao_contract.rb | 9 +++------ app/serializers/dao_contract_serializer.rb | 3 +++ ...claimed_and_unclaimed_compensation_to_dao_contract.rb | 6 ++++++ db/schema.rb | 5 +++-- 5 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 db/migrate/20200121083529_add_claimed_and_unclaimed_compensation_to_dao_contract.rb diff --git a/app/models/ckb_sync/node_data_processor.rb b/app/models/ckb_sync/node_data_processor.rb index a8711144b..b94a13918 100644 --- a/app/models/ckb_sync/node_data_processor.rb +++ b/app/models/ckb_sync/node_data_processor.rb @@ -78,7 +78,7 @@ def process_take_away_all_deposit(dao_contract, dao_events) def process_issue_interest(dao_contract, dao_events) issue_interest_dao_events = dao_events.where(event_type: "issue_interest") issue_interest_dao_events.each do |event| - dao_contract.increment!(:interest_granted, event.value) + dao_contract.increment!(:claimed_compensation, event.value) address = event.address address.increment!(:interest, event.value) event.processed! @@ -190,7 +190,7 @@ def revert_take_away_all_deposit(dao_contract, dao_events) def revert_issue_interest(dao_contract, dao_events) issue_interest_dao_events = dao_events.where(event_type: "issue_interest") issue_interest_dao_events.each do |event| - dao_contract.decrement!(:interest_granted, event.value) + dao_contract.decrement!(:claimed_compensation, event.value) address = event.address address.decrement!(:interest, event.value) event.reverted! diff --git a/app/models/dao_contract.rb b/app/models/dao_contract.rb index a23aa2bdc..0bde7a612 100644 --- a/app/models/dao_contract.rb +++ b/app/models/dao_contract.rb @@ -1,5 +1,5 @@ class DaoContract < ApplicationRecord - validates :total_deposit, :interest_granted, :deposit_transactions_count, :withdraw_transactions_count, :depositors_count, :total_depositors_count, presence: true, numericality: { greater_than_or_equal_to: 0 } + validates :total_deposit, :claimed_compensation, :deposit_transactions_count, :withdraw_transactions_count, :depositors_count, :total_depositors_count, presence: true, numericality: { greater_than_or_equal_to: 0 } CONTRACT_NAME = "nervos_dao".freeze GENESIS_ISSUANCE = 336 * 10**8 ANNUAL_PRIMARY_ISSUANCE_BASE = GENESIS_ISSUANCE / 8 @@ -65,10 +65,6 @@ def unclaimed_compensation latest_daily_statistic.unclaimed_compensation end - def claimed_compensation - latest_daily_statistic.claimed_compensation - end - def average_deposit_time latest_daily_statistic.average_deposit_time end @@ -134,11 +130,12 @@ def secondary_issuance(start_epoch) # # id :bigint not null, primary key # total_deposit :decimal(30, ) default(0) -# interest_granted :decimal(30, ) default(0) +# claimed_compensation :decimal(30, ) default(0) # deposit_transactions_count :bigint default(0) # withdraw_transactions_count :bigint default(0) # depositors_count :integer default(0) # total_depositors_count :bigint default(0) # created_at :datetime not null # updated_at :datetime not null +# unclaimed_compensation :decimal(30, ) # diff --git a/app/serializers/dao_contract_serializer.rb b/app/serializers/dao_contract_serializer.rb index ef7080e21..bd449c532 100644 --- a/app/serializers/dao_contract_serializer.rb +++ b/app/serializers/dao_contract_serializer.rb @@ -40,4 +40,7 @@ class DaoContractSerializer attribute :estimated_apc do |object| object.estimated_apc.to_s end + attribute :claimed_compensation do |object| + object.claimed_compensation.to_s + end end diff --git a/db/migrate/20200121083529_add_claimed_and_unclaimed_compensation_to_dao_contract.rb b/db/migrate/20200121083529_add_claimed_and_unclaimed_compensation_to_dao_contract.rb new file mode 100644 index 000000000..d7eef62ce --- /dev/null +++ b/db/migrate/20200121083529_add_claimed_and_unclaimed_compensation_to_dao_contract.rb @@ -0,0 +1,6 @@ +class AddClaimedAndUnclaimedCompensationToDaoContract < ActiveRecord::Migration[6.0] + def change + rename_column :dao_contracts, :interest_granted, :claimed_compensation + add_column :dao_contracts, :unclaimed_compensation, :decimal, precision: 30, scale: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index d87511c58..688824b83 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_01_15_020206) do +ActiveRecord::Schema.define(version: 2020_01_21_083529) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -182,13 +182,14 @@ create_table "dao_contracts", force: :cascade do |t| t.decimal "total_deposit", precision: 30, default: "0" - t.decimal "interest_granted", precision: 30, default: "0" + t.decimal "claimed_compensation", precision: 30, default: "0" t.bigint "deposit_transactions_count", default: 0 t.bigint "withdraw_transactions_count", default: 0 t.integer "depositors_count", default: 0 t.bigint "total_depositors_count", default: 0 t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.decimal "unclaimed_compensation", precision: 30 end create_table "dao_events", force: :cascade do |t| From e00ca492a6f4afb1cd6d71368a984b6938952d0c Mon Sep 17 00:00:00 2001 From: shaojunda Date: Tue, 21 Jan 2020 17:30:06 +0800 Subject: [PATCH 13/28] chore: adjust tests --- test/models/ckb_sync/node_data_processor_test.rb | 8 ++++---- test/models/dao_contract_test.rb | 16 ++++------------ 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/test/models/ckb_sync/node_data_processor_test.rb b/test/models/ckb_sync/node_data_processor_test.rb index 90e0768e9..91e851c0f 100644 --- a/test/models/ckb_sync/node_data_processor_test.rb +++ b/test/models/ckb_sync/node_data_processor_test.rb @@ -761,7 +761,7 @@ class NodeDataProcessorTest < ActiveSupport::TestCase tx = fake_dao_withdraw_transaction(node_block) withdraw_amount = tx.cell_outputs.nervos_dao_withdrawing.first.capacity - assert_difference -> { DaoContract.default_contract.reload.interest_granted }, "0x174876ebe8".hex - withdraw_amount do + assert_difference -> { DaoContract.default_contract.reload.claimed_compensation }, "0x174876ebe8".hex - withdraw_amount do node_data_processor.process_block(node_block) end @@ -835,7 +835,7 @@ class NodeDataProcessorTest < ActiveSupport::TestCase init_deposit_transactions_count = 2 init_withdraw_transactions_count = 1 init_total_depositors_count = 2 - dao_contract.update(total_deposit: init_total_deposit, depositors_count: init_depositors_count, interest_granted: init_interest_granted, deposit_transactions_count: init_deposit_transactions_count, withdraw_transactions_count: init_withdraw_transactions_count, total_depositors_count: init_total_depositors_count) + dao_contract.update(total_deposit: init_total_deposit, depositors_count: init_depositors_count, claimed_compensation: init_interest_granted, deposit_transactions_count: init_deposit_transactions_count, withdraw_transactions_count: init_withdraw_transactions_count, total_depositors_count: init_total_depositors_count) prepare_node_data(HAS_UNCLES_BLOCK_NUMBER) local_block = Block.find_by(number: HAS_UNCLES_BLOCK_NUMBER) local_block.update(block_hash: "0x419c632366c8eb9635acbb39ea085f7552ae62e1fdd480893375334a0f37d1bx") @@ -845,7 +845,7 @@ class NodeDataProcessorTest < ActiveSupport::TestCase dao_contract.reload assert_equal init_total_deposit, dao_contract.total_deposit assert_equal init_depositors_count, dao_contract.depositors_count - assert_equal init_interest_granted, dao_contract.interest_granted + assert_equal init_interest_granted, dao_contract.claimed_compensation assert_equal init_deposit_transactions_count, dao_contract.deposit_transactions_count assert_equal init_withdraw_transactions_count, dao_contract.withdraw_transactions_count assert_equal init_total_depositors_count, dao_contract.total_depositors_count @@ -1086,7 +1086,7 @@ class NodeDataProcessorTest < ActiveSupport::TestCase local_block.update(block_hash: "0x419c632366c8eb9635acbb39ea085f7552ae62e1fdd480893375334a0f37d1bx") VCR.use_cassette("blocks/#{DEFAULT_NODE_BLOCK_NUMBER}", record: :new_episodes) do - assert_difference -> { DaoContract.default_contract.reload.interest_granted }, -1000 do + assert_difference -> { DaoContract.default_contract.reload.claimed_compensation }, -1000 do node_data_processor.call end diff --git a/test/models/dao_contract_test.rb b/test/models/dao_contract_test.rb index 23aa0cc49..6a624a843 100644 --- a/test/models/dao_contract_test.rb +++ b/test/models/dao_contract_test.rb @@ -5,8 +5,8 @@ class DaoContractTest < ActiveSupport::TestCase should validate_presence_of(:total_deposit) should validate_numericality_of(:total_deposit). is_greater_than_or_equal_to(0) - should validate_presence_of(:interest_granted) - should validate_numericality_of(:interest_granted). + should validate_presence_of(:claimed_compensation) + should validate_numericality_of(:claimed_compensation). is_greater_than_or_equal_to(0) should validate_presence_of(:deposit_transactions_count) should validate_numericality_of(:deposit_transactions_count). @@ -24,8 +24,8 @@ class DaoContractTest < ActiveSupport::TestCase test "should have correct columns" do dao_contract = create(:dao_contract) - expected_attributes = %w(created_at deposit_transactions_count depositors_count id interest_granted total_deposit total_depositors_count updated_at withdraw_transactions_count) - assert_equal expected_attributes, dao_contract.attributes.keys.sort + expected_attributes = %w(created_at deposit_transactions_count depositors_count id claimed_compensation total_deposit total_depositors_count updated_at withdraw_transactions_count unclaimed_compensation) + assert_equal expected_attributes.sort, dao_contract.attributes.keys.sort end test "estimated apc when deposit period is less than one year" do @@ -99,14 +99,6 @@ class DaoContractTest < ActiveSupport::TestCase assert_equal latest_daily_statistic.unclaimed_compensation, dao_contract.unclaimed_compensation end - test "claimed_compensation should return beginning of today value" do - dao_contract = create(:dao_contract, total_deposit: 10**21 * 100) - create(:daily_statistic) - latest_daily_statistic = DailyStatistic.order(id: :desc).first - - assert_equal latest_daily_statistic.claimed_compensation, dao_contract.claimed_compensation - end - test "average_deposit_time should return beginning of today value" do dao_contract = create(:dao_contract, total_deposit: 10**21 * 100) create(:daily_statistic) From ba0e1057059a461325951e25bd7ba82e2241731c Mon Sep 17 00:00:00 2001 From: shaojunda Date: Tue, 21 Jan 2020 17:49:33 +0800 Subject: [PATCH 14/28] feat: add unlaimed compenstaion generator worker --- ...ntract_unclaimed_compensation_generator.rb | 29 +++++++++++++++++++ config/schedule.yml | 6 +++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 app/workers/dao_contract_unclaimed_compensation_generator.rb diff --git a/app/workers/dao_contract_unclaimed_compensation_generator.rb b/app/workers/dao_contract_unclaimed_compensation_generator.rb new file mode 100644 index 000000000..791137d4b --- /dev/null +++ b/app/workers/dao_contract_unclaimed_compensation_generator.rb @@ -0,0 +1,29 @@ +class DaoContractUnclaimedCompensationGenerator + include Sidekiq::Worker + + def perform + DaoContract.default_contract.update(unclaimed_compensation: cal_unclaimed_compensation) + end + + private + + def cal_unclaimed_compensation + phase1_dao_interests + unmade_dao_interests + end + + def phase1_dao_interests + CellOutput.nervos_dao_withdrawing.generated_before(ended_at).unconsumed_at(ended_at).reduce(0) do |memo, nervos_dao_withdrawing_cell| + memo + CkbUtils.dao_interest(nervos_dao_withdrawing_cell) + end + end + + def unmade_dao_interests + CellOutput.nervos_dao_deposit.generated_before(ended_at).unconsumed_at(ended_at).reduce(0) do |memo, cell_output| + dao = cell_output.block.dao + tip_dao = current_tip_block.dao + parse_dao = CkbUtils.parse_dao(dao) + tip_parse_dao = CkbUtils.parse_dao(tip_dao) + memo + (cell_output.capacity * tip_parse_dao.ar_i / parse_dao.ar_i) - cell_output.capacity + end + end +end diff --git a/config/schedule.yml b/config/schedule.yml index 074dee849..a08a6cc9a 100644 --- a/config/schedule.yml +++ b/config/schedule.yml @@ -16,4 +16,8 @@ epoch_statistic: chart_forked_event_processor: cron: "30 0 * * *" class: "Charts::ForkedEventProcessor" - queue: critical \ No newline at end of file + queue: critical + +cal_unclaimed_compensation: + cron: "0 */1 * * *" + class: "DaoContractUnclaimedCompensationGenerator" From 62e534a96f28c0c3fef70da45633985de36cc05f Mon Sep 17 00:00:00 2001 From: shaojunda Date: Tue, 21 Jan 2020 17:51:54 +0800 Subject: [PATCH 15/28] refactor: remove unnecessary params --- .../charts/daily_statistic_generator.rb | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/app/services/charts/daily_statistic_generator.rb b/app/services/charts/daily_statistic_generator.rb index 132fd477d..d612d321c 100644 --- a/app/services/charts/daily_statistic_generator.rb +++ b/app/services/charts/daily_statistic_generator.rb @@ -13,18 +13,17 @@ def call daily_ckb_transactions_count = CkbTransaction.created_after(started_at).created_before(ended_at).count return if daily_ckb_transactions_count.zero? - cell_outputs = CellOutput.where.not(cell_type: "normal") mining_reward = Block.where("timestamp <= ?", ended_at).sum(:secondary_reward) - deposit_compensation = unclaimed_compensation(cell_outputs, current_tip_block) + claimed_compensation(cell_outputs) + deposit_compensation = unclaimed_compensation + claimed_compensation estimated_apc = DaoContract.default_contract.estimated_apc(current_tip_block.fraction_epoch) block_timestamp = Block.created_after(started_at).created_before(ended_at).recent.pick(:timestamp) addresses_count = processed_addresses_count daily_statistic = ::DailyStatistic.find_or_create_by!(created_at_unixtimestamp: to_be_counted_date.to_i) daily_statistic.update(block_timestamp: block_timestamp, transactions_count: daily_ckb_transactions_count, addresses_count: addresses_count, total_dao_deposit: total_dao_deposit, - dao_depositors_count: dao_depositors_count, unclaimed_compensation: unclaimed_compensation(cell_outputs, current_tip_block), - claimed_compensation: claimed_compensation(cell_outputs), average_deposit_time: average_deposit_time(cell_outputs), - mining_reward: mining_reward, deposit_compensation: deposit_compensation, treasury_amount: treasury_amount(cell_outputs, current_tip_block), + dao_depositors_count: dao_depositors_count, unclaimed_compensation: unclaimed_compensation, + claimed_compensation: claimed_compensation, average_deposit_time: average_deposit_time, + mining_reward: mining_reward, deposit_compensation: deposit_compensation, treasury_amount: treasury_amount, estimated_apc: estimated_apc, live_cells_count: live_cells_count, dead_cells_count: dead_cells_count, avg_hash_rate: avg_hash_rate, avg_difficulty: avg_difficulty, uncle_rate: uncle_rate, total_depositors_count: total_depositors_count) end @@ -152,23 +151,23 @@ def ended_at @ended_at ||= time_in_milliseconds(to_be_counted_date.end_of_day) - 1 end - def unclaimed_compensation(cell_outputs, current_tip_block) + def unclaimed_compensation @unclaimed_compensation ||= begin - phase1_dao_interests(cell_outputs) + unmade_dao_interests(cell_outputs, current_tip_block) + phase1_dao_interests + unmade_dao_interests end end - def claimed_compensation(cell_outputs) + def claimed_compensation @claimed_compensation ||= begin if from_scratch - cell_outputs.nervos_dao_withdrawing.consumed_before(ended_at).reduce(0) do |memo, nervos_dao_withdrawing_cell| + CellOutput.nervos_dao_withdrawing.consumed_before(ended_at).reduce(0) do |memo, nervos_dao_withdrawing_cell| memo + CkbUtils.dao_interest(nervos_dao_withdrawing_cell) end else claimed_compensation_today = - cell_outputs.nervos_dao_withdrawing.consumed_after(started_at).consumed_before(ended_at).reduce(0) do |memo, nervos_dao_withdrawing_cell| + CellOutput.nervos_dao_withdrawing.consumed_after(started_at).consumed_before(ended_at).reduce(0) do |memo, nervos_dao_withdrawing_cell| memo + CkbUtils.dao_interest(nervos_dao_withdrawing_cell) end @@ -177,16 +176,16 @@ def claimed_compensation(cell_outputs) end end - def phase1_dao_interests(cell_outputs) - cell_outputs.nervos_dao_withdrawing.generated_before(ended_at).unconsumed_at(ended_at).reduce(0) do |memo, nervos_dao_withdrawing_cell| + def phase1_dao_interests + CellOutput.nervos_dao_withdrawing.generated_before(ended_at).unconsumed_at(ended_at).reduce(0) do |memo, nervos_dao_withdrawing_cell| memo + CkbUtils.dao_interest(nervos_dao_withdrawing_cell) end end - def unmade_dao_interests(cell_outputs, current_tip_block) + def unmade_dao_interests @unmade_dao_interests ||= begin - cell_outputs.nervos_dao_deposit.generated_before(ended_at).unconsumed_at(ended_at).reduce(0) do |memo, cell_output| + CellOutput.nervos_dao_deposit.generated_before(ended_at).unconsumed_at(ended_at).reduce(0) do |memo, cell_output| dao = cell_output.block.dao tip_dao = current_tip_block.dao parse_dao = CkbUtils.parse_dao(dao) @@ -196,16 +195,16 @@ def unmade_dao_interests(cell_outputs, current_tip_block) end end - def average_deposit_time(cell_outputs) + def average_deposit_time interest_bearing_deposits = 0 uninterest_bearing_deposits = 0 - sum_interest_bearing = cell_outputs.nervos_dao_withdrawing.generated_before(ended_at).unconsumed_at(ended_at).reduce(0) do |memo, nervos_dao_withdrawing_cell| + sum_interest_bearing = CellOutput.nervos_dao_withdrawing.generated_before(ended_at).unconsumed_at(ended_at).reduce(0) do |memo, nervos_dao_withdrawing_cell| nervos_dao_withdrawing_cell_generated_tx = nervos_dao_withdrawing_cell.generated_by nervos_dao_deposit_cell = nervos_dao_withdrawing_cell_generated_tx.cell_inputs.order(:id)[nervos_dao_withdrawing_cell.cell_index].previous_cell_output interest_bearing_deposits += nervos_dao_deposit_cell.capacity memo + nervos_dao_deposit_cell.capacity * (nervos_dao_withdrawing_cell.block_timestamp - nervos_dao_deposit_cell.block_timestamp) / MILLISECONDS_IN_DAY end - sum_uninterest_bearing = cell_outputs.nervos_dao_deposit.generated_before(ended_at).unconsumed_at(ended_at).reduce(0) do |memo, nervos_dao_deposit_cell| + sum_uninterest_bearing = CellOutput.nervos_dao_deposit.generated_before(ended_at).unconsumed_at(ended_at).reduce(0) do |memo, nervos_dao_deposit_cell| uninterest_bearing_deposits += nervos_dao_deposit_cell.capacity memo + nervos_dao_deposit_cell.capacity * (ended_at - nervos_dao_deposit_cell.block_timestamp) / MILLISECONDS_IN_DAY @@ -214,9 +213,9 @@ def average_deposit_time(cell_outputs) (sum_interest_bearing + sum_uninterest_bearing) / (interest_bearing_deposits + uninterest_bearing_deposits) end - def treasury_amount(cell_outputs, current_tip_block) + def treasury_amount parse_dao = CkbUtils.parse_dao(current_tip_block.dao) - parse_dao.s_i - unmade_dao_interests(cell_outputs, current_tip_block) + parse_dao.s_i - unmade_dao_interests end def time_in_milliseconds(time) From e42b0722b002855052174a5423a17e681345b98c Mon Sep 17 00:00:00 2001 From: shaojunda Date: Wed, 22 Jan 2020 14:07:17 +0800 Subject: [PATCH 16/28] feat: add compensation and lock period --- app/models/ckb_transaction.rb | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/models/ckb_transaction.rb b/app/models/ckb_transaction.rb index bdbdf1834..4e2ed320b 100644 --- a/app/models/ckb_transaction.rb +++ b/app/models/ckb_transaction.rb @@ -89,21 +89,26 @@ def normal_tx_display_inputs(previews) previous_cell_output = cell_input.previous_cell_output display_input = { id: previous_cell_output.id, from_cellbase: false, capacity: previous_cell_output.capacity, address_hash: previous_cell_output.address_hash, generated_tx_hash: previous_cell_output.generated_by.tx_hash, cell_type: previous_cell_output.cell_type } display_input.merge!(attributes_for_dao_input(previous_cell_output)) if previous_cell_output.nervos_dao_withdrawing? - display_input.merge!(attributes_for_dao_input(cell_outputs[index])) if previous_cell_output.nervos_dao_deposit? + display_input.merge!(attributes_for_dao_input(cell_outputs[index]), false) if previous_cell_output.nervos_dao_deposit? CkbUtils.hash_value_to_s(display_input) end end end - def attributes_for_dao_input(nervos_dao_withdrawing_cell) + def attributes_for_dao_input(nervos_dao_withdrawing_cell, is_phase2 = true) nervos_dao_withdrawing_cell_generated_tx = nervos_dao_withdrawing_cell.generated_by nervos_dao_deposit_cell = nervos_dao_withdrawing_cell_generated_tx.cell_inputs.order(:id)[nervos_dao_withdrawing_cell.cell_index].previous_cell_output - started_block_number = Block.find(nervos_dao_deposit_cell.block.id).number - ended_block_number = Block.find(block_id).number + compensation_started_block = Block.select(:number, :timestamp).find(nervos_dao_deposit_cell.block.id) + compensation_ended_block = Block.select(:number, :timestamp).find(nervos_dao_withdrawing_cell_generated_tx.block_id) interest = CkbUtils.dao_interest(nervos_dao_withdrawing_cell) + attributes = { compensation_started_block_number: compensation_started_block.number, compensation_ended_block_number: compensation_ended_block.number, compensation_started_timestamp: compensation_ended_block.timestamp, compensation_ended_timestamp: compensation_started_timestamp.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 }) + end - CkbUtils.hash_value_to_s({ started_block_number: started_block_number, ended_block_number: ended_block_number, interest: interest, dao_type_hash: ENV["DAO_TYPE_HASH"] }) + CkbUtils.hash_value_to_s(attributes) end def cellbase_display_inputs From 81469df70fbd5d43a2b6f40aa5f49f3c78148876 Mon Sep 17 00:00:00 2001 From: shaojunda Date: Wed, 22 Jan 2020 14:27:59 +0800 Subject: [PATCH 17/28] feat: add average deposit time to address --- app/models/address.rb | 1 + .../20200122060907_add_average_deposit_time_to_address.rb | 5 +++++ db/schema.rb | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20200122060907_add_average_deposit_time_to_address.rb diff --git a/app/models/address.rb b/app/models/address.rb index 7d2baa0b4..ac8d023fa 100644 --- a/app/models/address.rb +++ b/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 # diff --git a/db/migrate/20200122060907_add_average_deposit_time_to_address.rb b/db/migrate/20200122060907_add_average_deposit_time_to_address.rb new file mode 100644 index 000000000..ab12e192f --- /dev/null +++ b/db/migrate/20200122060907_add_average_deposit_time_to_address.rb @@ -0,0 +1,5 @@ +class AddAverageDepositTimeToAddress < ActiveRecord::Migration[6.0] + def change + add_column :addresses, :average_deposit_time, :decimal + end +end diff --git a/db/schema.rb b/db/schema.rb index 688824b83..c4b54f25a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_01_21_083529) do +ActiveRecord::Schema.define(version: 2020_01_22_060907) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -38,6 +38,7 @@ t.boolean "visible", default: true t.decimal "live_cells_count", precision: 30, default: "0" t.integer "mined_blocks_count", default: 0 + t.decimal "average_deposit_time" t.index ["address_hash"], name: "index_addresses_on_address_hash" t.index ["lock_hash"], name: "index_addresses_on_lock_hash", unique: true end From 06181385c0da6118e851109ce09d31de367e6315 Mon Sep 17 00:00:00 2001 From: shaojunda Date: Wed, 22 Jan 2020 14:28:13 +0800 Subject: [PATCH 18/28] feat: add address average deposit time generator --- app/models/ckb_transaction.rb | 6 ++-- .../address_average_deposit_time_generator.rb | 34 +++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 app/workers/address_average_deposit_time_generator.rb diff --git a/app/models/ckb_transaction.rb b/app/models/ckb_transaction.rb index 4e2ed320b..bbfefc5f8 100644 --- a/app/models/ckb_transaction.rb +++ b/app/models/ckb_transaction.rb @@ -89,7 +89,7 @@ def normal_tx_display_inputs(previews) previous_cell_output = cell_input.previous_cell_output display_input = { id: previous_cell_output.id, from_cellbase: false, capacity: previous_cell_output.capacity, address_hash: previous_cell_output.address_hash, generated_tx_hash: previous_cell_output.generated_by.tx_hash, cell_type: previous_cell_output.cell_type } display_input.merge!(attributes_for_dao_input(previous_cell_output)) if previous_cell_output.nervos_dao_withdrawing? - display_input.merge!(attributes_for_dao_input(cell_outputs[index]), false) if previous_cell_output.nervos_dao_deposit? + display_input.merge!(attributes_for_dao_input(cell_outputs[index], false)) if previous_cell_output.nervos_dao_deposit? CkbUtils.hash_value_to_s(display_input) end @@ -102,10 +102,10 @@ def attributes_for_dao_input(nervos_dao_withdrawing_cell, is_phase2 = true) compensation_started_block = Block.select(:number, :timestamp).find(nervos_dao_deposit_cell.block.id) compensation_ended_block = Block.select(:number, :timestamp).find(nervos_dao_withdrawing_cell_generated_tx.block_id) interest = CkbUtils.dao_interest(nervos_dao_withdrawing_cell) - attributes = { compensation_started_block_number: compensation_started_block.number, compensation_ended_block_number: compensation_ended_block.number, compensation_started_timestamp: compensation_ended_block.timestamp, compensation_ended_timestamp: compensation_started_timestamp.timestamp, interest: interest } + attributes = { compensation_started_block_number: compensation_started_block.number, compensation_ended_block_number: compensation_ended_block.number, compensation_started_timestamp: compensation_ended_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.merge!({ locked_until_block_number: locked_until_block.number, locked_until_block_timestamp: locked_until_block.timestamp }) end CkbUtils.hash_value_to_s(attributes) diff --git a/app/workers/address_average_deposit_time_generator.rb b/app/workers/address_average_deposit_time_generator.rb new file mode 100644 index 000000000..5671d250b --- /dev/null +++ b/app/workers/address_average_deposit_time_generator.rb @@ -0,0 +1,34 @@ +class AddressAverageDepositTimeGenerator + include Sidekiq::Worker + + def perform(address_id) + address = Address.find(address_id) + address.update(average_deposit_time: average_deposit_time) + end + + private + + def average_deposit_time + interest_bearing_deposits = 0 + uninterest_bearing_deposits = 0 + milliseconds_in_day = BigDecimal(24 * 60 * 60 * 1000) + ended_at = time_in_milliseconds(Time.current) + sum_interest_bearing = address.cell_outputs.nervos_dao_withdrawing.unconsumed_at(ended_at).reduce(0) do |memo, nervos_dao_withdrawing_cell| + nervos_dao_withdrawing_cell_generated_tx = nervos_dao_withdrawing_cell.generated_by + nervos_dao_deposit_cell = nervos_dao_withdrawing_cell_generated_tx.cell_inputs.order(:id)[nervos_dao_withdrawing_cell.cell_index].previous_cell_output + interest_bearing_deposits += nervos_dao_deposit_cell.capacity + memo + nervos_dao_deposit_cell.capacity * (nervos_dao_withdrawing_cell.block_timestamp - nervos_dao_deposit_cell.block_timestamp) / milliseconds_in_day + end + sum_uninterest_bearing = address.cell_outputs.nervos_dao_deposit.unconsumed_at(ended_at).reduce(0) do |memo, nervos_dao_deposit_cell| + uninterest_bearing_deposits += nervos_dao_deposit_cell.capacity + + memo + nervos_dao_deposit_cell.capacity * (ended_at - nervos_dao_deposit_cell.block_timestamp) / milliseconds_in_day + end + + (sum_interest_bearing + sum_uninterest_bearing) / (interest_bearing_deposits + uninterest_bearing_deposits) + end + + def time_in_milliseconds(time) + (time.to_f * 1000).floor + end +end From dae8f24ff78231e4985e8e31f62a58d9bfb492db Mon Sep 17 00:00:00 2001 From: shaojunda Date: Wed, 22 Jan 2020 15:27:40 +0800 Subject: [PATCH 19/28] chore: update api doc --- doc/api.raml | 45 +++++++++++++++++++++++++++++++++++---------- public/api_doc.html | 28 +++++++++++++++++----------- 2 files changed, 52 insertions(+), 21 deletions(-) diff --git a/doc/api.raml b/doc/api.raml index 56882ecb1..668d9d967 100644 --- a/doc/api.raml +++ b/doc/api.raml @@ -127,9 +127,12 @@ types: }, "pending_reward_blocks_count": { "type": integer - } + }, "lock_info": { "type": lock_info_attributes + }, + "average_deposit_time": { + "type": string } } } @@ -222,12 +225,28 @@ types: "cell_type": { type: "string" }, - "started_block_number": { - type: integer, + "compensation_started_block_number": { + type: string, required: false }, - "ended_block_number": { - type: integer, + "compensation_ended_block_number": { + type: string, + required: false + }, + "compensation_started_timestamp": { + type: string, + required: false + }, + "compensation_ended_timestamp": { + type: string, + required: false + }, + "locked_until_block_number": { + type: string, + required: false + }, + "locked_until_block_timestamp": { + type: string, required: false }, "interest": { @@ -1259,8 +1278,12 @@ types: "address_hash": "0xddbd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323", "capacity": 100, "generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae321", - "started_block_number": 10, - "ended_block_number": 15, + "compensation_started_block_number": "10", + "compensation_ended_block_number": "15", + "compensation_started_timestamp": "1579592269056" + "compensation_ended_timestamp": "1579592269056", + "locked_until_block_number": "608395", + "locked_until_block_timestamp": "1579665264926", "interest": 100000, "cell_type": "dao", "dao_type_hash": "0xa20df8e80518e9b2eabc1a0efb0ebe1de83f8df9c867edf99d0c5895654fcde1", @@ -2022,7 +2045,8 @@ types: "epoch_number": "1000", "epoch_index": "789", "estimated_unlock_time": "1588259390000" - } + }, + "average_deposit_time": "35.780193591686053852850446361429702611876162589037114569656468227898621305950821369" } } } @@ -2502,7 +2526,8 @@ types: "code_hash": "0x0000000000000000000000000000000000000000000000000000000000000001" }, "dao_deposit": "10000", - "interest": "100" + "interest": "100", + "average_deposit_time": "35.780193591686053852850446361429702611876162589037114569656468227898621305950821369" } } } @@ -3320,4 +3345,4 @@ types: example: | { "25374730228.31050194" - } \ No newline at end of file + } diff --git a/public/api_doc.html b/public/api_doc.html index 56fb953c2..3e41a5f5a 100644 --- a/public/api_doc.html +++ b/public/api_doc.html @@ -371,7 +371,7 @@ "last": "https://explorer.nervos.org/api/v1/transactions?page=28909&page_size=15" } } -

get

get

Returns a transaction by transaction hash

Returns a transaction by transaction hash

URI Parameters

  • tx_hash: required(string - minLength: 66 - maxLength: 66)

    The transaction hash

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

Properties
  • data: required(object)
    • id: required(string)
    • type: required(string)
    • attributes: required(object)
      • block_number: required(string)
      • transaction_hash: required(string)
      • block_timestamp: required(string)
      • transaction_fee": required(string)
      • is_cellbase: required(boolean)
      • income: required(string)
      • version: required(string)
      • display_inputs: required(array of display_input)

        Items: display_input

        • from_cellbase: required(boolean)
        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • generated_tx_hash: required(string)
        • cell_type: required(string)
        • started_block_number: (integer)
        • ended_block_number: (integer)
        • interest: (integer)
        • dao_type_hash: required(string)
      • display_outputs: required(array of display_output)

        Items: display_output

        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • base_reward: (integer)
        • commit_reward: (integer)
        • proposal_reward: (integer)
        • secondary_reward: (integer)
        • consumed_by_tx_hash: (string)
        • status: required(one of live, dead)
        • cell_type": required(string)
        • dao_type_hash: required(string)
      • witnesses: required(array of string)
      • cell_deps: required(array of cell_dep)

        Items: cell_dep

        • dep_type: required(one of dep_group, code)
        • out_point: required(object)
          • index: required(integer)
          • tx_hash: required(string)
      • header_deps: required(array of string)

Example:

{
+

get

get

Returns a transaction by transaction hash

Returns a transaction by transaction hash

URI Parameters

  • tx_hash: required(string - minLength: 66 - maxLength: 66)

    The transaction hash

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

Properties
  • data: required(object)
    • id: required(string)
    • type: required(string)
    • attributes: required(object)
      • block_number: required(string)
      • transaction_hash: required(string)
      • block_timestamp: required(string)
      • transaction_fee": required(string)
      • is_cellbase: required(boolean)
      • income: required(string)
      • version: required(string)
      • display_inputs: required(array of display_input)

        Items: display_input

        • from_cellbase: required(boolean)
        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • generated_tx_hash: required(string)
        • cell_type: required(string)
        • compensation_started_block_number: (string)
        • compensation_ended_block_number: (string)
        • compensation_started_timestamp: (string)
        • compensation_ended_timestamp: (string)
        • locked_until_block_number: (string)
        • locked_until_block_timestamp: (string)
        • interest: (integer)
        • dao_type_hash: required(string)
      • display_outputs: required(array of display_output)

        Items: display_output

        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • base_reward: (integer)
        • commit_reward: (integer)
        • proposal_reward: (integer)
        • secondary_reward: (integer)
        • consumed_by_tx_hash: (string)
        • status: required(one of live, dead)
        • cell_type": required(string)
        • dao_type_hash: required(string)
      • witnesses: required(array of string)
      • cell_deps: required(array of cell_dep)

        Items: cell_dep

        • dep_type: required(one of dep_group, code)
        • out_point: required(object)
          • index: required(integer)
          • tx_hash: required(string)
      • header_deps: required(array of string)

Example:

{
   "data": {
     "id": 11,
     "type": "transaction",
@@ -430,8 +430,12 @@
           "address_hash": "0xddbd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae323",
           "capacity": 100,
           "generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae321",
-          "started_block_number": 10,
-          "ended_block_number": 15,
+          "compensation_started_block_number": "10",
+          "compensation_ended_block_number": "15",
+          "compensation_started_timestamp": "1579592269056"
+          "compensation_ended_timestamp": "1579592269056",
+          "locked_until_block_number": "608395",
+          "locked_until_block_timestamp": "1579665264926",
           "interest": 100000,
           "cell_type": "dao",
           "dao_type_hash": "0xa20df8e80518e9b2eabc1a0efb0ebe1de83f8df9c867edf99d0c5895654fcde1",
@@ -484,7 +488,7 @@
     }
   ]
 }
-

/address_transactions

get

get

Returns transactions related to an address

Returns transactions related to an address

URI Parameters

  • address_hash: required(string - minLength: 66 - maxLength: 66)

    The address hash

Query Parameters

  • page_size: required(integer - default: 10)
  • page: required(integer - default: 1)

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

Properties
  • meta: required(object)
    • total: required(integer)
  • data: required(array of transaction)

    Items: transaction

    • id: required(string)
    • type: required(string)
    • attributes: required(object)
      • block_number: required(string)
      • transaction_hash: required(string)
      • block_timestamp: required(string)
      • transaction_fee": required(string)
      • is_cellbase: required(boolean)
      • income: required(string)
      • version: required(string)
      • display_inputs: required(array of display_input)

        Items: display_input

        • from_cellbase: required(boolean)
        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • generated_tx_hash: required(string)
        • cell_type: required(string)
        • started_block_number: (integer)
        • ended_block_number: (integer)
        • interest: (integer)
        • dao_type_hash: required(string)
      • display_outputs: required(array of display_output)

        Items: display_output

        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • base_reward: (integer)
        • commit_reward: (integer)
        • proposal_reward: (integer)
        • secondary_reward: (integer)
        • consumed_by_tx_hash: (string)
        • status: required(one of live, dead)
        • cell_type": required(string)
        • dao_type_hash: required(string)
      • witnesses: required(array of string)
      • cell_deps: required(array of cell_dep)

        Items: cell_dep

        • dep_type: required(one of dep_group, code)
        • out_point: required(object)
          • index: required(integer)
          • tx_hash: required(string)
      • header_deps: required(array of string)
  • links: required(object)
    • self: required(string)
    • first: required(string)
    • prev: required(string)
    • next: required(string)
    • last: required(string)

Example:

{
+

/address_transactions

get

get

Returns transactions related to an address

Returns transactions related to an address

URI Parameters

  • address_hash: required(string - minLength: 66 - maxLength: 66)

    The address hash

Query Parameters

  • page_size: required(integer - default: 10)
  • page: required(integer - default: 1)

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

Properties
  • meta: required(object)
    • total: required(integer)
  • data: required(array of transaction)

    Items: transaction

    • id: required(string)
    • type: required(string)
    • attributes: required(object)
      • block_number: required(string)
      • transaction_hash: required(string)
      • block_timestamp: required(string)
      • transaction_fee": required(string)
      • is_cellbase: required(boolean)
      • income: required(string)
      • version: required(string)
      • display_inputs: required(array of display_input)

        Items: display_input

        • from_cellbase: required(boolean)
        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • generated_tx_hash: required(string)
        • cell_type: required(string)
        • compensation_started_block_number: (string)
        • compensation_ended_block_number: (string)
        • compensation_started_timestamp: (string)
        • compensation_ended_timestamp: (string)
        • locked_until_block_number: (string)
        • locked_until_block_timestamp: (string)
        • interest: (integer)
        • dao_type_hash: required(string)
      • display_outputs: required(array of display_output)

        Items: display_output

        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • base_reward: (integer)
        • commit_reward: (integer)
        • proposal_reward: (integer)
        • secondary_reward: (integer)
        • consumed_by_tx_hash: (string)
        • status: required(one of live, dead)
        • cell_type": required(string)
        • dao_type_hash: required(string)
      • witnesses: required(array of string)
      • cell_deps: required(array of cell_dep)

        Items: cell_dep

        • dep_type: required(one of dep_group, code)
        • out_point: required(object)
          • index: required(integer)
          • tx_hash: required(string)
      • header_deps: required(array of string)
  • links: required(object)
    • self: required(string)
    • first: required(string)
    • prev: required(string)
    • next: required(string)
    • last: required(string)

Example:

{
   "meta": {
     "total": 100
   },
@@ -665,7 +669,7 @@
     }
   ]
 }
-

/block_transactions

get

get

Returns transactions in the block

Returns transactions in the block

URI Parameters

  • block_hash: required(string - minLength: 66 - maxLength: 66)

    The block hash

Query Parameters

  • page_size: required(integer - default: 10)
  • page: required(integer - default: 1)

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

Properties
  • meta: required(object)
    • total: required(integer)
  • data: required(array of transaction)

    Items: transaction

    • id: required(string)
    • type: required(string)
    • attributes: required(object)
      • block_number: required(string)
      • transaction_hash: required(string)
      • block_timestamp: required(string)
      • transaction_fee": required(string)
      • is_cellbase: required(boolean)
      • income: required(string)
      • version: required(string)
      • display_inputs: required(array of display_input)

        Items: display_input

        • from_cellbase: required(boolean)
        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • generated_tx_hash: required(string)
        • cell_type: required(string)
        • started_block_number: (integer)
        • ended_block_number: (integer)
        • interest: (integer)
        • dao_type_hash: required(string)
      • display_outputs: required(array of display_output)

        Items: display_output

        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • base_reward: (integer)
        • commit_reward: (integer)
        • proposal_reward: (integer)
        • secondary_reward: (integer)
        • consumed_by_tx_hash: (string)
        • status: required(one of live, dead)
        • cell_type": required(string)
        • dao_type_hash: required(string)
      • witnesses: required(array of string)
      • cell_deps: required(array of cell_dep)

        Items: cell_dep

        • dep_type: required(one of dep_group, code)
        • out_point: required(object)
          • index: required(integer)
          • tx_hash: required(string)
      • header_deps: required(array of string)
  • links: required(object)
    • self: required(string)
    • first: required(string)
    • prev: required(string)
    • next: required(string)
    • last: required(string)

Example:

{
+

/block_transactions

get

get

Returns transactions in the block

Returns transactions in the block

URI Parameters

  • block_hash: required(string - minLength: 66 - maxLength: 66)

    The block hash

Query Parameters

  • page_size: required(integer - default: 10)
  • page: required(integer - default: 1)

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

Properties
  • meta: required(object)
    • total: required(integer)
  • data: required(array of transaction)

    Items: transaction

    • id: required(string)
    • type: required(string)
    • attributes: required(object)
      • block_number: required(string)
      • transaction_hash: required(string)
      • block_timestamp: required(string)
      • transaction_fee": required(string)
      • is_cellbase: required(boolean)
      • income: required(string)
      • version: required(string)
      • display_inputs: required(array of display_input)

        Items: display_input

        • from_cellbase: required(boolean)
        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • generated_tx_hash: required(string)
        • cell_type: required(string)
        • compensation_started_block_number: (string)
        • compensation_ended_block_number: (string)
        • compensation_started_timestamp: (string)
        • compensation_ended_timestamp: (string)
        • locked_until_block_number: (string)
        • locked_until_block_timestamp: (string)
        • interest: (integer)
        • dao_type_hash: required(string)
      • display_outputs: required(array of display_output)

        Items: display_output

        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • base_reward: (integer)
        • commit_reward: (integer)
        • proposal_reward: (integer)
        • secondary_reward: (integer)
        • consumed_by_tx_hash: (string)
        • status: required(one of live, dead)
        • cell_type": required(string)
        • dao_type_hash: required(string)
      • witnesses: required(array of string)
      • cell_deps: required(array of cell_dep)

        Items: cell_dep

        • dep_type: required(one of dep_group, code)
        • out_point: required(object)
          • index: required(integer)
          • tx_hash: required(string)
      • header_deps: required(array of string)
  • links: required(object)
    • self: required(string)
    • first: required(string)
    • prev: required(string)
    • next: required(string)
    • last: required(string)

Example:

{
   "meta": {
     "total": 100,
   },
@@ -986,7 +990,7 @@
     }
   ]
 }
-

/addresses

get

get

Returns address info

Returns address info

URI Parameters

  • address_hash: required(string - minLength: 66 - maxLength: 66)

    The address hash

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

Properties
  • data: required(object)
    • id: required(string)
    • type: required(string)
    • attributes: required(object)
      • address_hash: required(string)
      • balance: required(integer)
      • transactions_count: required(integer)
      • cell_consumed: required(integer)
      • lock_hash: required(object)
        • id: required(string)
        • type: required(string)
        • attributes: required(object)
          • code_hash: required(string)
          • args: required(array of string)
      • dao_deposit: required(string)
      • interest: required(string)
      • pending_reward_blocks_count: required(integer)
      • lock_info": required(object)
        • status: required(string "enum")
        • epoch_number: required(string)
        • epoch_index: required(string)
        • estimated_unlock_time": required(string)

Example:

{
+

/addresses

get

get

Returns address info

Returns address info

URI Parameters

  • address_hash: required(string - minLength: 66 - maxLength: 66)

    The address hash

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

Properties
  • data: required(object)
    • id: required(string)
    • type: required(string)
    • attributes: required(object)
      • address_hash: required(string)
      • balance: required(integer)
      • transactions_count: required(integer)
      • cell_consumed: required(integer)
      • lock_hash: required(object)
        • id: required(string)
        • type: required(string)
        • attributes: required(object)
          • code_hash: required(string)
          • args: required(array of string)
      • dao_deposit: required(string)
      • interest: required(string)
      • pending_reward_blocks_count: required(integer)
      • lock_info: required(object)
        • status: required(string "enum")
        • epoch_number: required(string)
        • epoch_index: required(string)
        • estimated_unlock_time": required(string)
      • average_deposit_time: required(string)

Example:

{
   "data": {
     "id": "1",
     "type": "address",
@@ -1007,7 +1011,8 @@
         "epoch_number": "1000",
         "epoch_index": "789",
         "estimated_unlock_time": "1588259390000"
-      }
+      },
+      "average_deposit_time": "35.780193591686053852850446361429702611876162589037114569656468227898621305950821369"
     }
   }
 }
@@ -1395,7 +1400,8 @@
         "code_hash": "0x0000000000000000000000000000000000000000000000000000000000000001"
       },
       "dao_deposit": "10000",
-      "interest": "100"
+      "interest": "100",
+      "average_deposit_time": "35.780193591686053852850446361429702611876162589037114569656468227898621305950821369"
     }
   }
 }
@@ -1412,7 +1418,7 @@
     }
   ]
 }
-

/contract_transactions

get

get

Returns transactions under the contract

Returns transactions under the contract

URI Parameters

  • contract_name: required(string)

    The contract name

Query Parameters

  • page_size: required(integer - default: 10)
  • page: required(integer - default: 1)

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

Properties
  • meta: required(object)
    • total: required(integer)
  • data: required(array of transaction)

    Items: transaction

    • id: required(string)
    • type: required(string)
    • attributes: required(object)
      • block_number: required(string)
      • transaction_hash: required(string)
      • block_timestamp: required(string)
      • transaction_fee": required(string)
      • is_cellbase: required(boolean)
      • income: required(string)
      • version: required(string)
      • display_inputs: required(array of display_input)

        Items: display_input

        • from_cellbase: required(boolean)
        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • generated_tx_hash: required(string)
        • cell_type: required(string)
        • started_block_number: (integer)
        • ended_block_number: (integer)
        • interest: (integer)
        • dao_type_hash: required(string)
      • display_outputs: required(array of display_output)

        Items: display_output

        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • base_reward: (integer)
        • commit_reward: (integer)
        • proposal_reward: (integer)
        • secondary_reward: (integer)
        • consumed_by_tx_hash: (string)
        • status: required(one of live, dead)
        • cell_type": required(string)
        • dao_type_hash: required(string)
      • witnesses: required(array of string)
      • cell_deps: required(array of cell_dep)

        Items: cell_dep

        • dep_type: required(one of dep_group, code)
        • out_point: required(object)
          • index: required(integer)
          • tx_hash: required(string)
      • header_deps: required(array of string)
  • links: required(object)
    • self: required(string)
    • first: required(string)
    • prev: required(string)
    • next: required(string)
    • last: required(string)

Example:

{
+

/contract_transactions

get

get

Returns transactions under the contract

Returns transactions under the contract

URI Parameters

  • contract_name: required(string)

    The contract name

Query Parameters

  • page_size: required(integer - default: 10)
  • page: required(integer - default: 1)

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

Properties
  • meta: required(object)
    • total: required(integer)
  • data: required(array of transaction)

    Items: transaction

    • id: required(string)
    • type: required(string)
    • attributes: required(object)
      • block_number: required(string)
      • transaction_hash: required(string)
      • block_timestamp: required(string)
      • transaction_fee": required(string)
      • is_cellbase: required(boolean)
      • income: required(string)
      • version: required(string)
      • display_inputs: required(array of display_input)

        Items: display_input

        • from_cellbase: required(boolean)
        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • generated_tx_hash: required(string)
        • cell_type: required(string)
        • compensation_started_block_number: (string)
        • compensation_ended_block_number: (string)
        • compensation_started_timestamp: (string)
        • compensation_ended_timestamp: (string)
        • locked_until_block_number: (string)
        • locked_until_block_timestamp: (string)
        • interest: (integer)
        • dao_type_hash: required(string)
      • display_outputs: required(array of display_output)

        Items: display_output

        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • base_reward: (integer)
        • commit_reward: (integer)
        • proposal_reward: (integer)
        • secondary_reward: (integer)
        • consumed_by_tx_hash: (string)
        • status: required(one of live, dead)
        • cell_type": required(string)
        • dao_type_hash: required(string)
      • witnesses: required(array of string)
      • cell_deps: required(array of cell_dep)

        Items: cell_dep

        • dep_type: required(one of dep_group, code)
        • out_point: required(object)
          • index: required(integer)
          • tx_hash: required(string)
      • header_deps: required(array of string)
  • links: required(object)
    • self: required(string)
    • first: required(string)
    • prev: required(string)
    • next: required(string)
    • last: required(string)

Example:

{
   "meta": {
     "total": 100,
   },
@@ -1620,7 +1626,7 @@
     }
   ]
 }
-

/dao_contract_transactions

get

get

Returns the transaction related to dao contract by given transaction hash

Returns the transaction related to dao contract by given transaction hash

URI Parameters

  • tx_hash: required(string)

    transaction hash

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

Properties
  • data: required(object)
    • id: required(string)
    • type: required(string)
    • attributes: required(object)
      • block_number: required(string)
      • transaction_hash: required(string)
      • block_timestamp: required(string)
      • transaction_fee": required(string)
      • is_cellbase: required(boolean)
      • income: required(string)
      • version: required(string)
      • display_inputs: required(array of display_input)

        Items: display_input

        • from_cellbase: required(boolean)
        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • generated_tx_hash: required(string)
        • cell_type: required(string)
        • started_block_number: (integer)
        • ended_block_number: (integer)
        • interest: (integer)
        • dao_type_hash: required(string)
      • display_outputs: required(array of display_output)

        Items: display_output

        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • base_reward: (integer)
        • commit_reward: (integer)
        • proposal_reward: (integer)
        • secondary_reward: (integer)
        • consumed_by_tx_hash: (string)
        • status: required(one of live, dead)
        • cell_type": required(string)
        • dao_type_hash: required(string)
      • witnesses: required(array of string)
      • cell_deps: required(array of cell_dep)

        Items: cell_dep

        • dep_type: required(one of dep_group, code)
        • out_point: required(object)
          • index: required(integer)
          • tx_hash: required(string)
      • header_deps: required(array of string)

Example:

{
+

/dao_contract_transactions

get

get

Returns the transaction related to dao contract by given transaction hash

Returns the transaction related to dao contract by given transaction hash

URI Parameters

  • tx_hash: required(string)

    transaction hash

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

Properties
  • data: required(object)
    • id: required(string)
    • type: required(string)
    • attributes: required(object)
      • block_number: required(string)
      • transaction_hash: required(string)
      • block_timestamp: required(string)
      • transaction_fee": required(string)
      • is_cellbase: required(boolean)
      • income: required(string)
      • version: required(string)
      • display_inputs: required(array of display_input)

        Items: display_input

        • from_cellbase: required(boolean)
        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • generated_tx_hash: required(string)
        • cell_type: required(string)
        • compensation_started_block_number: (string)
        • compensation_ended_block_number: (string)
        • compensation_started_timestamp: (string)
        • compensation_ended_timestamp: (string)
        • locked_until_block_number: (string)
        • locked_until_block_timestamp: (string)
        • interest: (integer)
        • dao_type_hash: required(string)
      • display_outputs: required(array of display_output)

        Items: display_output

        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • base_reward: (integer)
        • commit_reward: (integer)
        • proposal_reward: (integer)
        • secondary_reward: (integer)
        • consumed_by_tx_hash: (string)
        • status: required(one of live, dead)
        • cell_type": required(string)
        • dao_type_hash: required(string)
      • witnesses: required(array of string)
      • cell_deps: required(array of cell_dep)

        Items: cell_dep

        • dep_type: required(one of dep_group, code)
        • out_point: required(object)
          • index: required(integer)
          • tx_hash: required(string)
      • header_deps: required(array of string)

Example:

{
   "data": {
     "id": "1",
     "type": "transaction",
@@ -1711,7 +1717,7 @@
     }
   ]
 }
-

/address_dao_transactions

get

get

Returns transactions under the address by given address hash

Returns transactions under the address by given address hash

URI Parameters

  • address_hash: required(string)

    address hash

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

Properties
  • meta: required(object)
    • total: required(integer)
  • data: required(array of transaction)

    Items: transaction

    • id: required(string)
    • type: required(string)
    • attributes: required(object)
      • block_number: required(string)
      • transaction_hash: required(string)
      • block_timestamp: required(string)
      • transaction_fee": required(string)
      • is_cellbase: required(boolean)
      • income: required(string)
      • version: required(string)
      • display_inputs: required(array of display_input)

        Items: display_input

        • from_cellbase: required(boolean)
        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • generated_tx_hash: required(string)
        • cell_type: required(string)
        • started_block_number: (integer)
        • ended_block_number: (integer)
        • interest: (integer)
        • dao_type_hash: required(string)
      • display_outputs: required(array of display_output)

        Items: display_output

        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • base_reward: (integer)
        • commit_reward: (integer)
        • proposal_reward: (integer)
        • secondary_reward: (integer)
        • consumed_by_tx_hash: (string)
        • status: required(one of live, dead)
        • cell_type": required(string)
        • dao_type_hash: required(string)
      • witnesses: required(array of string)
      • cell_deps: required(array of cell_dep)

        Items: cell_dep

        • dep_type: required(one of dep_group, code)
        • out_point: required(object)
          • index: required(integer)
          • tx_hash: required(string)
      • header_deps: required(array of string)
  • links: required(object)
    • self: required(string)
    • first: required(string)
    • prev: required(string)
    • next: required(string)
    • last: required(string)

Example:

{
+

/address_dao_transactions

get

get

Returns transactions under the address by given address hash

Returns transactions under the address by given address hash

URI Parameters

  • address_hash: required(string)

    address hash

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

Properties
  • meta: required(object)
    • total: required(integer)
  • data: required(array of transaction)

    Items: transaction

    • id: required(string)
    • type: required(string)
    • attributes: required(object)
      • block_number: required(string)
      • transaction_hash: required(string)
      • block_timestamp: required(string)
      • transaction_fee": required(string)
      • is_cellbase: required(boolean)
      • income: required(string)
      • version: required(string)
      • display_inputs: required(array of display_input)

        Items: display_input

        • from_cellbase: required(boolean)
        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • generated_tx_hash: required(string)
        • cell_type: required(string)
        • compensation_started_block_number: (string)
        • compensation_ended_block_number: (string)
        • compensation_started_timestamp: (string)
        • compensation_ended_timestamp: (string)
        • locked_until_block_number: (string)
        • locked_until_block_timestamp: (string)
        • interest: (integer)
        • dao_type_hash: required(string)
      • display_outputs: required(array of display_output)

        Items: display_output

        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • base_reward: (integer)
        • commit_reward: (integer)
        • proposal_reward: (integer)
        • secondary_reward: (integer)
        • consumed_by_tx_hash: (string)
        • status: required(one of live, dead)
        • cell_type": required(string)
        • dao_type_hash: required(string)
      • witnesses: required(array of string)
      • cell_deps: required(array of cell_dep)

        Items: cell_dep

        • dep_type: required(one of dep_group, code)
        • out_point: required(object)
          • index: required(integer)
          • tx_hash: required(string)
      • header_deps: required(array of string)
  • links: required(object)
    • self: required(string)
    • first: required(string)
    • prev: required(string)
    • next: required(string)
    • last: required(string)

Example:

{
   "meta": {
     "total": 100
   },

From e949e314d524f8c343f8e03c0b6008df0b3f7175 Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Wed, 22 Jan 2020 15:47:03 +0800
Subject: [PATCH 20/28] chore: add average_deposit_time to address serializer

---
 app/serializers/address_serializer.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/serializers/address_serializer.rb b/app/serializers/address_serializer.rb
index 6df531110..e49e0ae93 100644
--- a/app/serializers/address_serializer.rb
+++ b/app/serializers/address_serializer.rb
@@ -26,4 +26,7 @@ class AddressSerializer
   attribute :mined_blocks_count do |object|
     object.mined_blocks_count.to_s
   end
+  attribute :average_deposit_time do |object|
+    object.average_deposit_time.to_s
+  end
 end

From 51ad3abe08864c5d261f8d124069d81deef87b9e Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Wed, 22 Jan 2020 16:20:11 +0800
Subject: [PATCH 21/28] chore: return specific columns for dao depositors

---
 app/controllers/api/v1/dao_depositors_controller.rb | 2 +-
 app/serializers/dao_depositor_serializer.rb         | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/dao_depositors_controller.rb b/app/controllers/api/v1/dao_depositors_controller.rb
index e4b377f2f..3e5fcc2b2 100644
--- a/app/controllers/api/v1/dao_depositors_controller.rb
+++ b/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
diff --git a/app/serializers/dao_depositor_serializer.rb b/app/serializers/dao_depositor_serializer.rb
index eb0fb697e..df52fc3c7 100644
--- a/app/serializers/dao_depositor_serializer.rb
+++ b/app/serializers/dao_depositor_serializer.rb
@@ -4,4 +4,7 @@ class DaoDepositorSerializer
   attribute :dao_deposit do |object|
     object.dao_deposit.to_s
   end
+  attribute :average_deposit_time do |object|
+    object.average_deposit_time.to_s
+  end
 end

From a613d57fb309864c4fed9a097e4b1dc477a10e2f Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Wed, 22 Jan 2020 17:09:16 +0800
Subject: [PATCH 22/28] chore: add task to fill average deposit time

---
 .../address_average_deposit_time_generator.rb |  4 ++--
 .../fill_average_deposit_time_to_address.rake | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 lib/tasks/migration/fill_average_deposit_time_to_address.rake

diff --git a/app/workers/address_average_deposit_time_generator.rb b/app/workers/address_average_deposit_time_generator.rb
index 5671d250b..da427b434 100644
--- a/app/workers/address_average_deposit_time_generator.rb
+++ b/app/workers/address_average_deposit_time_generator.rb
@@ -3,12 +3,12 @@ class AddressAverageDepositTimeGenerator
 
   def perform(address_id)
     address = Address.find(address_id)
-    address.update(average_deposit_time: average_deposit_time)
+    address.update(average_deposit_time: cal_average_deposit_time(address))
   end
 
   private
 
-  def average_deposit_time
+  def cal_average_deposit_time(address)
     interest_bearing_deposits = 0
     uninterest_bearing_deposits = 0
     milliseconds_in_day = BigDecimal(24 * 60 * 60 * 1000)
diff --git a/lib/tasks/migration/fill_average_deposit_time_to_address.rake b/lib/tasks/migration/fill_average_deposit_time_to_address.rake
new file mode 100644
index 000000000..5a7ee28d2
--- /dev/null
+++ b/lib/tasks/migration/fill_average_deposit_time_to_address.rake
@@ -0,0 +1,21 @@
+namespace :migration do
+  task fill_average_deposit_time_to_address: :environment do
+    addresses = Address.where("dao_deposit > 0").where(average_deposit_time: nil)
+    progress_bar = ProgressBar.create({
+      total: addresses.count,
+      format: "%e %B %p%% %c/%C"
+    })
+
+    values =
+      addresses.map do |address|
+        progress_bar.increment
+        generator = AddressAverageDepositTimeGenerator.new
+        [address.id, generator.send(:cal_average_deposit_time, address)]
+      end
+
+    columns = [:id, :average_deposit_time]
+    Address.import columns, values, on_duplicate_key_update: [:average_deposit_time]
+
+    puts "done"
+  end
+end

From 0922f7269ddcf9814b7823168fab37562c92f493 Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Wed, 22 Jan 2020 18:47:18 +0800
Subject: [PATCH 23/28] chore: update compensation changes calculation

---
 app/models/dao_contract.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/models/dao_contract.rb b/app/models/dao_contract.rb
index 0bde7a612..ef6affc74 100644
--- a/app/models/dao_contract.rb
+++ b/app/models/dao_contract.rb
@@ -54,11 +54,11 @@ def depositor_changes
   end
 
   def unclaimed_compensation_changes
-    latest_daily_statistic.unclaimed_compensation.to_d - penultimate_daily_statistic.unclaimed_compensation.to_d
+    unclaimed_compensation - latest_daily_statistic.unclaimed_compensation.to_d
   end
 
   def claimed_compensation_changes
-    latest_daily_statistic.claimed_compensation.to_d - penultimate_daily_statistic.claimed_compensation.to_d
+    claimed_compensation - latest_daily_statistic.claimed_compensation.to_d
   end
 
   def unclaimed_compensation
@@ -91,10 +91,6 @@ def latest_daily_statistic
     @latest_daily_statistic ||= DailyStatistic.order(created_at_unixtimestamp: :desc).first || OpenStruct.new(total_dao_deposit: 0, dao_depositors_count: 0, unclaimed_compensation: 0, claimed_compensation: 0, average_deposit_time: 0, mining_reward: 0, deposit_compensation: 0, treasury_amount: 0)
   end
 
-  def penultimate_daily_statistic
-    @penultimate_daily_statistic ||= DailyStatistic.order(created_at_unixtimestamp: :desc).second || OpenStruct.new(total_dao_deposit: 0, dao_depositors_count: 0, unclaimed_compensation: 0, claimed_compensation: 0, average_deposit_time: 0, mining_reward: 0, deposit_compensation: 0, treasury_amount: 0)
-  end
-
   def alpha(start_epoch_number)
     i = ((start_epoch_number + 1) / EPOCHS_IN_PERIOD).floor
     p = PRIMARY_ISSUANCE_PER_YEAR_BASE / 2 ** i / 2190

From 0d48f7c205af96869033b19f101403b489fbffe0 Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Wed, 22 Jan 2020 19:35:18 +0800
Subject: [PATCH 24/28] chore: adjust tests

---
 app/models/ckb_transaction.rb                 |  3 +-
 app/models/dao_contract.rb                    |  6 +---
 app/models/null_address.rb                    |  4 +++
 app/presenters/address_presenter.rb           |  4 +++
 ...ntract_unclaimed_compensation_generator.rb | 12 +++++++
 .../api/v1/addresses_controller_test.rb       |  2 +-
 .../api/v1/dao_depositors_controller_test.rb  |  2 +-
 test/factories/dao_contract.rb                |  2 +-
 test/models/ckb_transaction_test.rb           | 34 ++++++++++++-------
 test/models/dao_contract_test.rb              | 14 ++++----
 10 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/app/models/ckb_transaction.rb b/app/models/ckb_transaction.rb
index bbfefc5f8..f3041c06b 100644
--- a/app/models/ckb_transaction.rb
+++ b/app/models/ckb_transaction.rb
@@ -66,7 +66,6 @@ def normal_tx_display_outputs(previews)
       cell_outputs_for_display.map do |output|
         consumed_tx_hash = output.live? ? nil : output.consumed_by.tx_hash
         display_output = { id: output.id, capacity: output.capacity, address_hash: output.address_hash, status: output.status, consumed_tx_hash: consumed_tx_hash, cell_type: output.cell_type }
-        display_output[:dao_type_hash] = ENV["DAO_TYPE_HASH"] unless output.normal?
 
         CkbUtils.hash_value_to_s(display_output)
       end
@@ -102,7 +101,7 @@ def attributes_for_dao_input(nervos_dao_withdrawing_cell, is_phase2 = true)
     compensation_started_block = Block.select(:number, :timestamp).find(nervos_dao_deposit_cell.block.id)
     compensation_ended_block = Block.select(:number, :timestamp).find(nervos_dao_withdrawing_cell_generated_tx.block_id)
     interest = CkbUtils.dao_interest(nervos_dao_withdrawing_cell)
-    attributes = { compensation_started_block_number: compensation_started_block.number, compensation_ended_block_number: compensation_ended_block.number, compensation_started_timestamp: compensation_ended_block.timestamp, compensation_ended_timestamp: compensation_ended_block.timestamp, interest: interest }
+    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 })
diff --git a/app/models/dao_contract.rb b/app/models/dao_contract.rb
index ef6affc74..cdfa513f6 100644
--- a/app/models/dao_contract.rb
+++ b/app/models/dao_contract.rb
@@ -54,17 +54,13 @@ def depositor_changes
   end
 
   def unclaimed_compensation_changes
-    unclaimed_compensation - latest_daily_statistic.unclaimed_compensation.to_d
+    unclaimed_compensation.to_d - latest_daily_statistic.unclaimed_compensation.to_d
   end
 
   def claimed_compensation_changes
     claimed_compensation - latest_daily_statistic.claimed_compensation.to_d
   end
 
-  def unclaimed_compensation
-    latest_daily_statistic.unclaimed_compensation
-  end
-
   def average_deposit_time
     latest_daily_statistic.average_deposit_time
   end
diff --git a/app/models/null_address.rb b/app/models/null_address.rb
index 8be15966e..a02dfabb8 100644
--- a/app/models/null_address.rb
+++ b/app/models/null_address.rb
@@ -53,4 +53,8 @@ def lock_script
     script = parsed_address.script
     LockScript.new(code_hash: script.code_hash, args: script.args, hash_type: script.hash_type)
   end
+
+  def average_deposit_time
+    0
+  end
 end
diff --git a/app/presenters/address_presenter.rb b/app/presenters/address_presenter.rb
index e82228348..d998a9d22 100644
--- a/app/presenters/address_presenter.rb
+++ b/app/presenters/address_presenter.rb
@@ -58,6 +58,10 @@ def lock_info
     object.first.lock_script.lock_info
   end
 
+  def average_deposit_time
+    object.first.average_deposit_time
+  end
+
   private
 
   attr_reader :object
diff --git a/app/workers/dao_contract_unclaimed_compensation_generator.rb b/app/workers/dao_contract_unclaimed_compensation_generator.rb
index 791137d4b..b80af481e 100644
--- a/app/workers/dao_contract_unclaimed_compensation_generator.rb
+++ b/app/workers/dao_contract_unclaimed_compensation_generator.rb
@@ -26,4 +26,16 @@ def unmade_dao_interests
       memo + (cell_output.capacity * tip_parse_dao.ar_i / parse_dao.ar_i) - cell_output.capacity
     end
   end
+
+  def ended_at
+    @ended_at ||= time_in_milliseconds(Time.current)
+  end
+
+  def time_in_milliseconds(time)
+    (time.to_f * 1000).floor
+  end
+
+  def current_tip_block
+    Block.recent.first
+  end
 end
diff --git a/test/controllers/api/v1/addresses_controller_test.rb b/test/controllers/api/v1/addresses_controller_test.rb
index 282a6b203..8c5ef1dce 100644
--- a/test/controllers/api/v1/addresses_controller_test.rb
+++ b/test/controllers/api/v1/addresses_controller_test.rb
@@ -86,7 +86,7 @@ class AddressesControllerTest < ActionDispatch::IntegrationTest
 
         valid_get api_v1_address_url(address.address_hash)
 
-        assert_equal %w(address_hash balance transactions_count lock_script dao_deposit interest lock_info is_special live_cells_count mined_blocks_count).sort, json["data"]["attributes"].keys.sort
+        assert_equal %w(address_hash balance transactions_count lock_script dao_deposit interest lock_info is_special live_cells_count mined_blocks_count average_deposit_time).sort, json["data"]["attributes"].keys.sort
       end
 
       test "should return NullAddress when address no found by id" do
diff --git a/test/controllers/api/v1/dao_depositors_controller_test.rb b/test/controllers/api/v1/dao_depositors_controller_test.rb
index b479e2cfc..cb2338d5a 100644
--- a/test/controllers/api/v1/dao_depositors_controller_test.rb
+++ b/test/controllers/api/v1/dao_depositors_controller_test.rb
@@ -61,7 +61,7 @@ class DaoDepositorsControllerTest < ActionDispatch::IntegrationTest
 
         valid_get api_v1_dao_depositors_url
 
-        assert_equal %w(address_hash dao_deposit).sort, json["data"].first["attributes"].keys.sort
+        assert_equal %w(address_hash dao_deposit average_deposit_time).sort, json["data"].first["attributes"].keys.sort
       end
 
       test "should return up to 100 records" do
diff --git a/test/factories/dao_contract.rb b/test/factories/dao_contract.rb
index 3a20895fe..24906f78d 100644
--- a/test/factories/dao_contract.rb
+++ b/test/factories/dao_contract.rb
@@ -2,6 +2,6 @@
   factory :dao_contract do
     total_deposit { 10**8 * 1_000_000 }
     depositors_count { 1000 }
-
+    unclaimed_compensation { 0 }
   end
 end
diff --git a/test/models/ckb_transaction_test.rb b/test/models/ckb_transaction_test.rb
index 7d59beeed..dfcdde90c 100644
--- a/test/models/ckb_transaction_test.rb
+++ b/test/models/ckb_transaction_test.rb
@@ -121,14 +121,19 @@ class CkbTransactionTest < ActiveSupport::TestCase
     nervos_dao_withdrawing_cell = ckb_transaction.cell_inputs.first.previous_cell_output
     nervos_dao_withdrawing_cell_generated_tx = nervos_dao_withdrawing_cell.generated_by
     create(:cell_input, block: nervos_dao_withdrawing_cell_generated_tx.block, ckb_transaction: nervos_dao_withdrawing_cell_generated_tx, previous_output: { "tx_hash": "0x398315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e2", "index": "0" })
-    ended_block_number = Block.find(ckb_transaction.block_id).number
+    ended_block = Block.select(:number, :timestamp).find(nervos_dao_withdrawing_cell_generated_tx.block_id)
     nervos_dao_withdrawing_cell.update(cell_type: "nervos_dao_withdrawing")
     deposit_cell = create(:cell_output, ckb_transaction: nervos_dao_withdrawing_cell.generated_by, cell_index: 0, tx_hash: "0x398315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e2", generated_by: nervos_dao_withdrawing_cell.generated_by, block: nervos_dao_withdrawing_cell.generated_by.block, consumed_by: nervos_dao_withdrawing_cell.generated_by, cell_type: "nervos_dao_deposit", capacity: 10**8 * 1000, data: CKB::Utils.bin_to_hex("\x00" * 8))
     nervos_dao_deposit_cell = nervos_dao_withdrawing_cell_generated_tx.inputs.nervos_dao_deposit.first
-    started_block_number = Block.find(nervos_dao_deposit_cell.block_id).number
+    started_block = Block.select(:number, :timestamp).find(nervos_dao_deposit_cell.block_id)
     interest = CkbSync::Api.instance.calculate_dao_maximum_withdraw(deposit_cell, nervos_dao_deposit_cell).hex - deposit_cell.capacity.to_i
-    expected_display_input = CkbUtils.hash_value_to_s({ id: nervos_dao_withdrawing_cell.id, from_cellbase: false, capacity: nervos_dao_withdrawing_cell.capacity, address_hash: nervos_dao_withdrawing_cell.address_hash, generated_tx_hash: nervos_dao_withdrawing_cell.generated_by.tx_hash, started_block_number: started_block_number, ended_block_number: ended_block_number, interest: interest, cell_type: nervos_dao_withdrawing_cell.cell_type, dao_type_hash: ENV["DAO_TYPE_HASH"] }).sort
-    expected_attributes = %i(id from_cellbase capacity address_hash generated_tx_hash started_block_number ended_block_number interest cell_type dao_type_hash).sort
+    expected_display_input = CkbUtils.hash_value_to_s({ id: nervos_dao_withdrawing_cell.id, from_cellbase: false, capacity: nervos_dao_withdrawing_cell.capacity,
+      address_hash: nervos_dao_withdrawing_cell.address_hash, generated_tx_hash: nervos_dao_withdrawing_cell.generated_by.tx_hash,
+      compensation_started_block_number: started_block.number, compensation_ended_block_number: ended_block.number,
+      compensation_started_timestamp: started_block.timestamp, compensation_ended_timestamp: ended_block.timestamp,
+      locked_until_block_number: ckb_transaction.block.number, locked_until_block_timestamp: ckb_transaction.block.timestamp,
+      interest: interest, cell_type: nervos_dao_withdrawing_cell.cell_type }).sort
+    expected_attributes = %i(id from_cellbase capacity address_hash generated_tx_hash compensation_started_block_number compensation_ended_block_number compensation_started_timestamp compensation_ended_timestamp interest cell_type locked_until_block_number locked_until_block_timestamp).sort
 
     assert_equal expected_attributes, ckb_transaction.display_inputs.first.keys.sort
     assert_equal expected_display_input, ckb_transaction.display_inputs.first.sort
@@ -136,17 +141,22 @@ class CkbTransactionTest < ActiveSupport::TestCase
 
   test "#display_inputs should return dao display input when previous cell type is nervos_dao_deposit" do
     CkbSync::Api.any_instance.stubs(:calculate_dao_maximum_withdraw).returns("0x177825f000")
-    ckb_transaction = create(:ckb_transaction, tx_hash: "0xe8a116ec65f7d2d0d4748ba2bbcf8691cbd31202908ccfa3a975414fef801042")
+    block = create(:block, :with_block_hash, timestamp: Time.current.to_i)
+    ckb_transaction = create(:ckb_transaction, block: block, tx_hash: "0xe8a116ec65f7d2d0d4748ba2bbcf8691cbd31202908ccfa3a975414fef801042")
     deposit_output_cell = create(:cell_output, block: ckb_transaction.block, capacity: 138 * 10**8, tx_hash: "0xe8a116ec65f7d2d0d4748ba2bbcf8691cbd31202908ccfa3a975414fef801042", cell_index: 0, ckb_transaction: ckb_transaction, generated_by: ckb_transaction, consumed_by: ckb_transaction, cell_type: "nervos_dao_deposit", data: "0x0000000000000000")
-    phase1_block = create(:block, block_hash: "0x2ef70da7151f06c26810ea63afa133951e83eb80f85e001a408eac2f34366452")
+    phase1_block = create(:block, block_hash: "0x2ef70da7151f06c26810ea63afa133951e83eb80f85e001a408eac2f34366452", timestamp: Time.current.to_i)
     phase1_transaction = create(:ckb_transaction, block: phase1_block, header_deps: ["0xf85f8fe0d85a73a93e0a289ef14b4fb94228e47098a8da38986d6229c5606ea2"], is_cellbase: false, tx_hash: "0xf9aca16b49c7d037920ad9e5aecdac272412a5fbe0396f7d95b112bf790dd39f")
     create(:cell_input, block: phase1_transaction.block, ckb_transaction: phase1_transaction, previous_output: { index: 0, tx_hash: "0xe8a116ec65f7d2d0d4748ba2bbcf8691cbd31202908ccfa3a975414fef801042" }, from_cell_base: false)
     nervos_dao_withdrawing_cell = create(:cell_output, ckb_transaction: phase1_transaction, block: phase1_transaction.block, capacity: 13800000000, data: "0x7512000000000000", tx_hash: "0xf9aca16b49c7d037920ad9e5aecdac272412a5fbe0396f7d95b112bf790dd39f", cell_index: 0, generated_by: phase1_transaction, cell_type: "nervos_dao_withdrawing")
-    started_block_number = Block.find(deposit_output_cell.block_id).number
+    started_block = Block.select(:number, :timestamp).find(ckb_transaction.block_id)
     interest = CkbUtils.dao_interest(nervos_dao_withdrawing_cell)
-    ended_block_number = Block.find(phase1_transaction.block_id).number
-    expected_display_input = CkbUtils.hash_value_to_s({ id: deposit_output_cell.id, from_cellbase: false, capacity: deposit_output_cell.capacity, address_hash: deposit_output_cell.address_hash, generated_tx_hash: deposit_output_cell.generated_by.tx_hash, started_block_number: started_block_number, ended_block_number: ended_block_number, interest: interest, cell_type: deposit_output_cell.cell_type, dao_type_hash: ENV["DAO_TYPE_HASH"] }).sort
-    expected_attributes = %i(id from_cellbase capacity address_hash generated_tx_hash started_block_number ended_block_number interest cell_type dao_type_hash).sort
+    ended_block = Block.select(:number, :timestamp).find(phase1_transaction.block_id)
+    expected_display_input = CkbUtils.hash_value_to_s({ id: deposit_output_cell.id, from_cellbase: false, capacity: deposit_output_cell.capacity,
+      address_hash: deposit_output_cell.address_hash, generated_tx_hash: deposit_output_cell.generated_by.tx_hash,
+      compensation_started_block_number: started_block.number, compensation_ended_block_number: ended_block.number,
+      compensation_started_timestamp: started_block.timestamp, compensation_ended_timestamp: ended_block.timestamp,
+      interest: interest, cell_type: deposit_output_cell.cell_type }).sort
+    expected_attributes = %i(id from_cellbase capacity address_hash generated_tx_hash interest cell_type compensation_ended_block_number compensation_ended_timestamp compensation_started_block_number compensation_started_timestamp).sort
 
     assert_equal expected_attributes, phase1_transaction.display_inputs.first.keys.sort
     assert_equal expected_display_input, phase1_transaction.display_inputs.first.sort
@@ -156,9 +166,9 @@ class CkbTransactionTest < ActiveSupport::TestCase
     ckb_transaction = create(:ckb_transaction, :with_multiple_inputs_and_outputs)
     dao_output = ckb_transaction.outputs.first
     dao_output.update(cell_type: "nervos_dao_withdrawing")
-    expected_attributes = %i(id capacity address_hash status consumed_tx_hash cell_type dao_type_hash).sort
+    expected_attributes = %i(id capacity address_hash status consumed_tx_hash cell_type).sort
     consumed_tx_hash = dao_output.live? ? nil : dao_output.consumed_by.tx_hash
-    expected_display_output = CkbUtils.hash_value_to_s({ id: dao_output.id, capacity: dao_output.capacity, address_hash: dao_output.address_hash, status: dao_output.status, consumed_tx_hash: consumed_tx_hash, cell_type: dao_output.cell_type, dao_type_hash: ENV["DAO_TYPE_HASH"] }).sort
+    expected_display_output = CkbUtils.hash_value_to_s({ id: dao_output.id, capacity: dao_output.capacity, address_hash: dao_output.address_hash, status: dao_output.status, consumed_tx_hash: consumed_tx_hash, cell_type: dao_output.cell_type }).sort
 
     assert_equal expected_attributes, ckb_transaction.display_outputs.first.keys.sort
     assert_equal expected_display_output, ckb_transaction.display_outputs.first.sort
diff --git a/test/models/dao_contract_test.rb b/test/models/dao_contract_test.rb
index 6a624a843..0893cdf78 100644
--- a/test/models/dao_contract_test.rb
+++ b/test/models/dao_contract_test.rb
@@ -71,22 +71,20 @@ class DaoContractTest < ActiveSupport::TestCase
     assert_equal expected_depositor_changes, dao_contract.depositor_changes
   end
 
-  test "unclaimed_compensation_changes should return difference within 24 hours" do
-    dao_contract = create(:dao_contract, total_deposit: 10**21 * 100)
+  test "unclaimed_compensation_changes should return between beginning of today and current" do
+    dao_contract = create(:dao_contract, total_deposit: 10**21 * 100, unclaimed_compensation: 0)
     create_list(:daily_statistic, 2)
     latest_daily_statistic = DailyStatistic.order(id: :desc).first
-    penultimate_daily_statistic = DailyStatistic.order(id: :desc).second
-    expected_unclaimed_compensation_changes = penultimate_daily_statistic.unclaimed_compensation.to_d - latest_daily_statistic.unclaimed_compensation.to_d
+    expected_unclaimed_compensation_changes = dao_contract.unclaimed_compensation.to_d - latest_daily_statistic.unclaimed_compensation.to_d
 
     assert_equal expected_unclaimed_compensation_changes, dao_contract.unclaimed_compensation_changes
   end
 
-  test "claimed_compensation_changes should return difference within 24 hours" do
+  test "claimed_compensation_changes should return between beginning of today and current" do
     dao_contract = create(:dao_contract, total_deposit: 10**21 * 100)
     create_list(:daily_statistic, 2)
     latest_daily_statistic = DailyStatistic.order(id: :desc).first
-    penultimate_daily_statistic = DailyStatistic.order(id: :desc).second
-    expected_claimed_compensation_changes = penultimate_daily_statistic.claimed_compensation.to_d - latest_daily_statistic.claimed_compensation.to_d
+    expected_claimed_compensation_changes = dao_contract.claimed_compensation - latest_daily_statistic.claimed_compensation.to_d
 
     assert_equal expected_claimed_compensation_changes, dao_contract.claimed_compensation_changes
   end
@@ -96,7 +94,7 @@ class DaoContractTest < ActiveSupport::TestCase
     create(:daily_statistic)
     latest_daily_statistic = DailyStatistic.order(id: :desc).first
 
-    assert_equal latest_daily_statistic.unclaimed_compensation, dao_contract.unclaimed_compensation
+    assert_equal latest_daily_statistic.unclaimed_compensation.to_d, dao_contract.unclaimed_compensation
   end
 
   test "average_deposit_time should return beginning of today value" do

From 190d4fa0684ed7f6c111785dcdec8551e6b5971b Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Mon, 27 Jan 2020 10:22:31 +0800
Subject: [PATCH 25/28] chore: add addr avg deposit time generator to cron

---
 .../address_average_deposit_time_generator.rb        | 12 +++++++++---
 config/schedule.yml                                  |  6 +++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/workers/address_average_deposit_time_generator.rb b/app/workers/address_average_deposit_time_generator.rb
index da427b434..a277e5ca4 100644
--- a/app/workers/address_average_deposit_time_generator.rb
+++ b/app/workers/address_average_deposit_time_generator.rb
@@ -1,9 +1,15 @@
 class AddressAverageDepositTimeGenerator
   include Sidekiq::Worker
 
-  def perform(address_id)
-    address = Address.find(address_id)
-    address.update(average_deposit_time: cal_average_deposit_time(address))
+  def perform
+    addresses = Address.where("dao_deposit > 0")
+    values =
+      addresses.map do |address|
+        [address.id, cal_average_deposit_time(address)]
+      end
+    columns = [:id, :average_deposit_time]
+
+    Address.import! columns, values, validate: false, on_duplicate_key_update: [:average_deposit_time]
   end
 
   private
diff --git a/config/schedule.yml b/config/schedule.yml
index a08a6cc9a..c51d5c0f0 100644
--- a/config/schedule.yml
+++ b/config/schedule.yml
@@ -3,7 +3,7 @@ daily_statistic:
   class: "Charts::DailyStatistic"
   queue: critical
 
-blockstatistic:
+block_statistic:
   cron: "*/10 * * * *"
   class: "Charts::BlockStatistic"
   queue: critical
@@ -21,3 +21,7 @@ chart_forked_event_processor:
 cal_unclaimed_compensation:
   cron: "0 */1 * * *"
   class: "DaoContractUnclaimedCompensationGenerator"
+
+cal_address_average_deposit_time:
+  cron: "0 */6 * * *"
+  class: "AddressAverageDepositTimeGenerator"

From 32179c7e4f188e3ed4bd7785bd153ad04ea13fcd Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Fri, 31 Jan 2020 14:48:21 +0800
Subject: [PATCH 26/28] refactor: rename error

---
 app/controllers/application_controller.rb                 | 4 ++--
 app/lib/api/v1/exceptions.rb                              | 4 ++--
 .../api/v1/address_dao_transactions_controller_test.rb    | 4 ++--
 .../api/v1/address_transactions_controller_test.rb        | 4 ++--
 test/controllers/api/v1/addresses_controller_test.rb      | 4 ++--
 .../api/v1/block_statistics_controller_test.rb            | 4 ++--
 .../api/v1/block_transactions_controller_test.rb          | 4 ++--
 test/controllers/api/v1/blocks_controller_test.rb         | 8 ++++----
 .../controllers/api/v1/cell_input_data_controller_test.rb | 4 ++--
 .../api/v1/cell_input_lock_scripts_controller_test.rb     | 4 ++--
 .../api/v1/cell_input_type_scripts_controller_test.rb     | 4 ++--
 .../api/v1/cell_output_data_controller_test.rb            | 4 ++--
 .../api/v1/cell_output_lock_scripts_controller_test.rb    | 4 ++--
 .../api/v1/cell_output_type_scripts_controller_test.rb    | 4 ++--
 .../api/v1/ckb_transactions_controller_test.rb            | 8 ++++----
 .../api/v1/contract_transactions_controller_test.rb       | 4 ++--
 test/controllers/api/v1/contracts_controller_test.rb      | 4 ++--
 .../api/v1/daily_statistics_controller_test.rb            | 4 ++--
 .../api/v1/dao_contract_transactions_controller_test.rb   | 4 ++--
 test/controllers/api/v1/dao_depositors_controller_test.rb | 4 ++--
 .../api/v1/epoch_statistics_controller_test.rb            | 4 ++--
 test/controllers/api/v1/nets_controller_test.rb           | 4 ++--
 test/controllers/api/v1/statistics_controller_test.rb     | 4 ++--
 .../controllers/api/v1/suggest_queries_controller_test.rb | 4 ++--
 24 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6b93e5ece..e3e09ea43 100644
--- a/app/controllers/application_controller.rb
+++ b/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
diff --git a/app/lib/api/v1/exceptions.rb b/app/lib/api/v1/exceptions.rb
index 934958057..9a8b9295f 100644
--- a/app/lib/api/v1/exceptions.rb
+++ b/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
diff --git a/test/controllers/api/v1/address_dao_transactions_controller_test.rb b/test/controllers/api/v1/address_dao_transactions_controller_test.rb
index e0b35ebb6..6af27b167 100644
--- a/test/controllers/api/v1/address_dao_transactions_controller_test.rb
+++ b/test/controllers/api/v1/address_dao_transactions_controller_test.rb
@@ -18,7 +18,7 @@ class AddressDaoTransactionsControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Content-Type is wrong" do
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
         address = create(:address)
 
@@ -35,7 +35,7 @@ class AddressDaoTransactionsControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Accept is wrong" do
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
         address = create(:address)
 
diff --git a/test/controllers/api/v1/address_transactions_controller_test.rb b/test/controllers/api/v1/address_transactions_controller_test.rb
index 4208e9bbe..fed1c0123 100644
--- a/test/controllers/api/v1/address_transactions_controller_test.rb
+++ b/test/controllers/api/v1/address_transactions_controller_test.rb
@@ -29,7 +29,7 @@ class AddressTransactionsControllerTest < ActionDispatch::IntegrationTest
 
       test "should respond with error object when Content-Type is wrong" do
         address = create(:address, :with_transactions)
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_address_transaction_url(address.address_hash), headers: { "Content-Type": "text/plain" }
@@ -47,7 +47,7 @@ class AddressTransactionsControllerTest < ActionDispatch::IntegrationTest
 
       test "should respond with error object when Accept is wrong" do
         address = create(:address, :with_transactions)
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_address_transaction_url(address.address_hash), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
diff --git a/test/controllers/api/v1/addresses_controller_test.rb b/test/controllers/api/v1/addresses_controller_test.rb
index 282a6b203..7de93c26b 100644
--- a/test/controllers/api/v1/addresses_controller_test.rb
+++ b/test/controllers/api/v1/addresses_controller_test.rb
@@ -29,7 +29,7 @@ class AddressesControllerTest < ActionDispatch::IntegrationTest
 
       test "should respond with error object when Content-Type is wrong" do
         address = create(:address, :with_lock_script)
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_address_url(address.address_hash), headers: { "Content-Type": "text/plain" }
@@ -47,7 +47,7 @@ class AddressesControllerTest < ActionDispatch::IntegrationTest
 
       test "should respond with error object when Accept is wrong" do
         address = create(:address, :with_lock_script)
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_address_url(address.address_hash), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
diff --git a/test/controllers/api/v1/block_statistics_controller_test.rb b/test/controllers/api/v1/block_statistics_controller_test.rb
index e799783da..f79a72db6 100644
--- a/test/controllers/api/v1/block_statistics_controller_test.rb
+++ b/test/controllers/api/v1/block_statistics_controller_test.rb
@@ -16,7 +16,7 @@ class BlockStatisticsControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Content-Type is wrong" do
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_block_statistic_url("difficulty-hash_rate"), headers: { "Content-Type": "text/plain" }
@@ -31,7 +31,7 @@ class BlockStatisticsControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Accept is wrong" do
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_block_statistic_url("difficulty-hash_rate"), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
diff --git a/test/controllers/api/v1/block_transactions_controller_test.rb b/test/controllers/api/v1/block_transactions_controller_test.rb
index dcf4938e3..6e99989e2 100644
--- a/test/controllers/api/v1/block_transactions_controller_test.rb
+++ b/test/controllers/api/v1/block_transactions_controller_test.rb
@@ -29,7 +29,7 @@ class BlockTransactionsControllerTest < ActionDispatch::IntegrationTest
 
       test "should respond with error object when Content-Type is wrong" do
         block = create(:block, :with_ckb_transactions)
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_block_transaction_url(block.block_hash), headers: { "Content-Type": "text/plain" }
@@ -47,7 +47,7 @@ class BlockTransactionsControllerTest < ActionDispatch::IntegrationTest
 
       test "should respond with error object when Accept is wrong" do
         block = create(:block, :with_ckb_transactions)
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_block_transaction_url(block.block_hash), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
diff --git a/test/controllers/api/v1/blocks_controller_test.rb b/test/controllers/api/v1/blocks_controller_test.rb
index 09fa0e633..f68f785a8 100644
--- a/test/controllers/api/v1/blocks_controller_test.rb
+++ b/test/controllers/api/v1/blocks_controller_test.rb
@@ -22,7 +22,7 @@ class BlocksControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Content-Type is wrong" do
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_blocks_url, headers: { "Content-Type": "text/plain" }
@@ -37,7 +37,7 @@ class BlocksControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Accept is wrong" do
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_blocks_url, headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
@@ -238,7 +238,7 @@ class BlocksControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Content-Type is wrong when visit show" do
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_block_url(1), headers: { "Content-Type": "text/plain" }
@@ -253,7 +253,7 @@ class BlocksControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Accept is wrong when visit show" do
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_block_url(1), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
diff --git a/test/controllers/api/v1/cell_input_data_controller_test.rb b/test/controllers/api/v1/cell_input_data_controller_test.rb
index d3aec3b17..1f3a25501 100644
--- a/test/controllers/api/v1/cell_input_data_controller_test.rb
+++ b/test/controllers/api/v1/cell_input_data_controller_test.rb
@@ -29,7 +29,7 @@ class CellInputDataControllerTest < ActionDispatch::IntegrationTest
 
       test "should respond with error object when Content-Type is wrong" do
         cell_input = create(:cell_input, :with_full_transaction)
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_cell_input_datum_url(cell_input.id), headers: { "Content-Type": "text/plain" }
@@ -47,7 +47,7 @@ class CellInputDataControllerTest < ActionDispatch::IntegrationTest
 
       test "should respond with error object when Accept is wrong" do
         cell_input = create(:cell_input, :with_full_transaction)
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_cell_input_datum_url(cell_input.id), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
diff --git a/test/controllers/api/v1/cell_input_lock_scripts_controller_test.rb b/test/controllers/api/v1/cell_input_lock_scripts_controller_test.rb
index 90b34a34d..a36186665 100644
--- a/test/controllers/api/v1/cell_input_lock_scripts_controller_test.rb
+++ b/test/controllers/api/v1/cell_input_lock_scripts_controller_test.rb
@@ -29,7 +29,7 @@ class CellInputLockScriptsControllerTest < ActionDispatch::IntegrationTest
 
       test "should respond with error object when Content-Type is wrong" do
         cell_input = create(:cell_input, :with_full_transaction)
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_cell_input_lock_script_url(cell_input.id), headers: { "Content-Type": "text/plain" }
@@ -47,7 +47,7 @@ class CellInputLockScriptsControllerTest < ActionDispatch::IntegrationTest
 
       test "should respond with error object when Accept is wrong" do
         cell_input = create(:cell_input, :with_full_transaction)
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_cell_input_lock_script_url(cell_input.id), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
diff --git a/test/controllers/api/v1/cell_input_type_scripts_controller_test.rb b/test/controllers/api/v1/cell_input_type_scripts_controller_test.rb
index 4bc246d14..2487e0b74 100644
--- a/test/controllers/api/v1/cell_input_type_scripts_controller_test.rb
+++ b/test/controllers/api/v1/cell_input_type_scripts_controller_test.rb
@@ -29,7 +29,7 @@ class CellInputTypeScriptsControllerTest < ActionDispatch::IntegrationTest
 
       test "should respond with error object when Content-Type is wrong" do
         cell_input = create(:cell_input, :with_full_transaction)
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_cell_input_type_script_url(cell_input.id), headers: { "Content-Type": "text/plain" }
@@ -47,7 +47,7 @@ class CellInputTypeScriptsControllerTest < ActionDispatch::IntegrationTest
 
       test "should respond with error object when Accept is wrong" do
         cell_input = create(:cell_input, :with_full_transaction)
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_cell_input_type_script_url(cell_input.id), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
diff --git a/test/controllers/api/v1/cell_output_data_controller_test.rb b/test/controllers/api/v1/cell_output_data_controller_test.rb
index 8eecebef7..7c7fa34a8 100644
--- a/test/controllers/api/v1/cell_output_data_controller_test.rb
+++ b/test/controllers/api/v1/cell_output_data_controller_test.rb
@@ -29,7 +29,7 @@ class CellOutputDataControllerTest < ActionDispatch::IntegrationTest
 
       test "should respond with error object when Content-Type is wrong" do
         cell_output = create_cell_output
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_cell_output_datum_url(cell_output.id), headers: { "Content-Type": "text/plain" }
@@ -47,7 +47,7 @@ class CellOutputDataControllerTest < ActionDispatch::IntegrationTest
 
       test "should respond with error object when Accept is wrong" do
         cell_output = create_cell_output
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_cell_output_datum_url(cell_output.id), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
diff --git a/test/controllers/api/v1/cell_output_lock_scripts_controller_test.rb b/test/controllers/api/v1/cell_output_lock_scripts_controller_test.rb
index 256a1074d..260a059e4 100644
--- a/test/controllers/api/v1/cell_output_lock_scripts_controller_test.rb
+++ b/test/controllers/api/v1/cell_output_lock_scripts_controller_test.rb
@@ -29,7 +29,7 @@ class CellOutputLockScriptsControllerTest < ActionDispatch::IntegrationTest
 
       test "should respond with error object when Content-Type is wrong" do
         cell_output = create_cell_output
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_cell_output_lock_script_url(cell_output.id), headers: { "Content-Type": "text/plain" }
@@ -47,7 +47,7 @@ class CellOutputLockScriptsControllerTest < ActionDispatch::IntegrationTest
 
       test "should respond with error object when Accept is wrong" do
         cell_output = create_cell_output
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_cell_output_lock_script_url(cell_output.id), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
diff --git a/test/controllers/api/v1/cell_output_type_scripts_controller_test.rb b/test/controllers/api/v1/cell_output_type_scripts_controller_test.rb
index f68395099..33662845e 100644
--- a/test/controllers/api/v1/cell_output_type_scripts_controller_test.rb
+++ b/test/controllers/api/v1/cell_output_type_scripts_controller_test.rb
@@ -29,7 +29,7 @@ class CellOutputTypeScriptsControllerTest < ActionDispatch::IntegrationTest
 
       test "should respond with error object when Content-Type is wrong" do
         cell_output = create_cell_output
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_cell_output_type_script_url(cell_output.id), headers: { "Content-Type": "text/plain" }
@@ -47,7 +47,7 @@ class CellOutputTypeScriptsControllerTest < ActionDispatch::IntegrationTest
 
       test "should respond with error object when Accept is wrong" do
         cell_output = create_cell_output
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_cell_output_type_script_url(cell_output.id), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
diff --git a/test/controllers/api/v1/ckb_transactions_controller_test.rb b/test/controllers/api/v1/ckb_transactions_controller_test.rb
index 14a149190..55f280474 100644
--- a/test/controllers/api/v1/ckb_transactions_controller_test.rb
+++ b/test/controllers/api/v1/ckb_transactions_controller_test.rb
@@ -29,7 +29,7 @@ class CkbTransactionsControllerTest < ActionDispatch::IntegrationTest
 
       test "should respond with error object when Content-Type is wrong" do
         ckb_transaction = create(:ckb_transaction)
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_ckb_transaction_url(ckb_transaction.tx_hash), headers: { "Content-Type": "text/plain" }
@@ -47,7 +47,7 @@ class CkbTransactionsControllerTest < ActionDispatch::IntegrationTest
 
       test "should respond with error object when Accept is wrong" do
         ckb_transaction = create(:ckb_transaction)
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_ckb_transaction_url(ckb_transaction.tx_hash), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
@@ -148,7 +148,7 @@ class CkbTransactionsControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when call index and Content-Type is wrong" do
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_ckb_transactions_url, headers: { "Content-Type": "text/plain" }
@@ -163,7 +163,7 @@ class CkbTransactionsControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when  call index and Accept is wrong" do
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_ckb_transactions_url, headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
diff --git a/test/controllers/api/v1/contract_transactions_controller_test.rb b/test/controllers/api/v1/contract_transactions_controller_test.rb
index f433e3b65..90ac61859 100644
--- a/test/controllers/api/v1/contract_transactions_controller_test.rb
+++ b/test/controllers/api/v1/contract_transactions_controller_test.rb
@@ -16,7 +16,7 @@ class ContractTransactionsControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Content-Type is wrong" do
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME), headers: { "Content-Type": "text/plain" }
@@ -31,7 +31,7 @@ class ContractTransactionsControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Accept is wrong" do
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
diff --git a/test/controllers/api/v1/contracts_controller_test.rb b/test/controllers/api/v1/contracts_controller_test.rb
index 895166758..42f30d0f7 100644
--- a/test/controllers/api/v1/contracts_controller_test.rb
+++ b/test/controllers/api/v1/contracts_controller_test.rb
@@ -16,7 +16,7 @@ class ContractsControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Content-Type is wrong" do
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_contract_url(DaoContract::CONTRACT_NAME), headers: { "Content-Type": "text/plain" }
@@ -31,7 +31,7 @@ class ContractsControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Accept is wrong" do
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_contract_url(DaoContract::CONTRACT_NAME), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
diff --git a/test/controllers/api/v1/daily_statistics_controller_test.rb b/test/controllers/api/v1/daily_statistics_controller_test.rb
index a3e1b0c3e..2d1e6c288 100644
--- a/test/controllers/api/v1/daily_statistics_controller_test.rb
+++ b/test/controllers/api/v1/daily_statistics_controller_test.rb
@@ -16,7 +16,7 @@ class DailyStatisticsControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Content-Type is wrong" do
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_daily_statistic_url("transactions_count"), headers: { "Content-Type": "text/plain" }
@@ -31,7 +31,7 @@ class DailyStatisticsControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Accept is wrong" do
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_daily_statistic_url("transactions_count"), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
diff --git a/test/controllers/api/v1/dao_contract_transactions_controller_test.rb b/test/controllers/api/v1/dao_contract_transactions_controller_test.rb
index f2aa1cf38..87c680abe 100644
--- a/test/controllers/api/v1/dao_contract_transactions_controller_test.rb
+++ b/test/controllers/api/v1/dao_contract_transactions_controller_test.rb
@@ -21,7 +21,7 @@ class DaoContractTransactionsControllerTest < ActionDispatch::IntegrationTest
       test "should respond with error object when Content-Type is wrong" do
         ckb_transaction = create(:ckb_transaction)
 
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_dao_contract_transaction_url(ckb_transaction.tx_hash), headers: { "Content-Type": "text/plain" }
@@ -39,7 +39,7 @@ class DaoContractTransactionsControllerTest < ActionDispatch::IntegrationTest
 
       test "should respond with error object when Accept is wrong" do
         ckb_transaction = create(:ckb_transaction)
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_dao_contract_transaction_url(ckb_transaction.tx_hash), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
diff --git a/test/controllers/api/v1/dao_depositors_controller_test.rb b/test/controllers/api/v1/dao_depositors_controller_test.rb
index b479e2cfc..e1b0bcf35 100644
--- a/test/controllers/api/v1/dao_depositors_controller_test.rb
+++ b/test/controllers/api/v1/dao_depositors_controller_test.rb
@@ -16,7 +16,7 @@ class DaoDepositorsControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Content-Type is wrong" do
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_dao_depositors_url, headers: { "Content-Type": "text/plain" }
@@ -31,7 +31,7 @@ class DaoDepositorsControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Accept is wrong" do
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_dao_depositors_url, headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
diff --git a/test/controllers/api/v1/epoch_statistics_controller_test.rb b/test/controllers/api/v1/epoch_statistics_controller_test.rb
index 31422b57c..4c51fb52a 100644
--- a/test/controllers/api/v1/epoch_statistics_controller_test.rb
+++ b/test/controllers/api/v1/epoch_statistics_controller_test.rb
@@ -16,7 +16,7 @@ class EpochStatisticsControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Content-Type is wrong" do
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_epoch_statistic_url("difficulty-uncle_rate"), headers: { "Content-Type": "text/plain" }
@@ -31,7 +31,7 @@ class EpochStatisticsControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Accept is wrong" do
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_epoch_statistic_url("difficulty-uncle_rate"), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
diff --git a/test/controllers/api/v1/nets_controller_test.rb b/test/controllers/api/v1/nets_controller_test.rb
index 06903476e..17aba610d 100644
--- a/test/controllers/api/v1/nets_controller_test.rb
+++ b/test/controllers/api/v1/nets_controller_test.rb
@@ -36,7 +36,7 @@ class NetsControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Content-Type is wrong" do
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_nets_url, headers: { "Content-Type": "text/plain" }
@@ -51,7 +51,7 @@ class NetsControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Accept is wrong" do
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_nets_url, headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
diff --git a/test/controllers/api/v1/statistics_controller_test.rb b/test/controllers/api/v1/statistics_controller_test.rb
index 150fa34b8..42f8312f6 100644
--- a/test/controllers/api/v1/statistics_controller_test.rb
+++ b/test/controllers/api/v1/statistics_controller_test.rb
@@ -37,7 +37,7 @@ class StatisticsControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Content-Type is wrong" do
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_statistics_url, headers: { "Content-Type": "text/plain" }
@@ -52,7 +52,7 @@ class StatisticsControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Accept is wrong" do
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_statistics_url, headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
diff --git a/test/controllers/api/v1/suggest_queries_controller_test.rb b/test/controllers/api/v1/suggest_queries_controller_test.rb
index 186a25e16..1797d0d57 100644
--- a/test/controllers/api/v1/suggest_queries_controller_test.rb
+++ b/test/controllers/api/v1/suggest_queries_controller_test.rb
@@ -23,7 +23,7 @@ class SuggestQueriesControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Content-Type is wrong" do
-        error_object = Api::V1::Exceptions::WrongContentTypeError.new
+        error_object = Api::V1::Exceptions::InvalidContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_suggest_queries_url, params: { q: "12" }, headers: { "Content-Type": "text/plain" }
@@ -38,7 +38,7 @@ class SuggestQueriesControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should respond with error object when Accept is wrong" do
-        error_object = Api::V1::Exceptions::WrongAcceptError.new
+        error_object = Api::V1::Exceptions::InvalidAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
         get api_v1_suggest_queries_url, params: { q: "12" }, headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }

From acf64c5b879e0e3fddae0628bda3347ef6055276 Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Fri, 31 Jan 2020 18:12:22 +0800
Subject: [PATCH 27/28] chore: ignore TAGS

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index b235d79c5..bef4b1372 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 .vscode
 .idea/
+TAGS
 ckb-explorer.iml
 .generators
 .rakeTasks

From d8b182d1058d9f749cddf21ef793e42a1fe1067a Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Fri, 31 Jan 2020 18:16:45 +0800
Subject: [PATCH 28/28] Bump version to v0.9.2

---
 CHANGELOG.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1ee16ce1..a2d799493 100644
--- a/CHANGELOG.md
+++ b/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)