From ad546815c51a72eefa56acfe6c3053f3fc26b0b6 Mon Sep 17 00:00:00 2001 From: shaojunda Date: Tue, 2 Jun 2020 12:00:32 +0800 Subject: [PATCH 01/23] chore: support last 90 miner distribution --- app/models/distribution_data.rb | 9 ++++++--- app/serializers/distribution_data_serializer.rb | 8 +++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/models/distribution_data.rb b/app/models/distribution_data.rb index f1e632250..a4578d7c0 100644 --- a/app/models/distribution_data.rb +++ b/app/models/distribution_data.rb @@ -77,9 +77,12 @@ def transaction_propagation_delay_history TransactionPropagationDelay.connection.select_all(sql) end - def miner_address_distribution - Rails.cache.realize("miner_address_distribution", expires_in: 1.day) do - result = Block.where("timestamp >= ?", CkbUtils.time_in_milliseconds(7.days.ago.to_i)).group(:miner_hash).order("count(miner_hash) desc").count.to_a + def miner_address_distribution(checkpoint = 7) + supported_checkpoints = [7, 90] + return unless checkpoint.in?(supported_checkpoints) + + Rails.cache.realize("miner_address_distribution_#{checkpoint}", expires_in: 1.day) do + result = Block.where("timestamp >= ?", CkbUtils.time_in_milliseconds(checkpoint.days.ago.to_i)).group(:miner_hash).order("count(miner_hash) desc").count.to_a if result.present? (result[0..9].map{ |item| [item[0], item[1].to_s] } + [["other", result[10..-1].map { |item| item[1] }.reduce(:+).to_s]]).to_h else diff --git a/app/serializers/distribution_data_serializer.rb b/app/serializers/distribution_data_serializer.rb index 136a5c0a1..5c81fc2ce 100644 --- a/app/serializers/distribution_data_serializer.rb +++ b/app/serializers/distribution_data_serializer.rb @@ -51,5 +51,11 @@ class DistributionDataSerializer attribute :miner_address_distribution, if: Proc.new { |_record, params| params && params[:indicator].include?("miner_address_distribution") - } + } do |object, params| + if rs = params[:indicator].match(/(\d+)/) + object.miner_address_distribution(rs[1].to_i) + else + object.miner_address_distribution + end + end end From c3db35fa58ae46e86c2edc08cf3f30b8adf17bbf Mon Sep 17 00:00:00 2001 From: shaojunda Date: Tue, 2 Jun 2020 12:14:15 +0800 Subject: [PATCH 02/23] chore: update distribution data validator --- app/controllers/validations/distribution_data.rb | 8 +++++++- app/controllers/validations/monetary_data.rb | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/validations/distribution_data.rb b/app/controllers/validations/distribution_data.rb index a6e55bcc6..3139643c3 100644 --- a/app/controllers/validations/distribution_data.rb +++ b/app/controllers/validations/distribution_data.rb @@ -25,9 +25,15 @@ def error_object attr_accessor :query_key def query_key_format_must_be_correct - if query_key.blank? || !(query_key.split("-") - ::DistributionData::VALID_INDICATORS).empty? + if query_key.blank? || !query_key_valid? errors.add(:query_key, "indicator name is invalid") end end + + def query_key_valid? + query_keys = query_key.split("-") + extra_keys = query_keys - ::DistributionData::VALID_INDICATORS + extra_keys.blank? || extra_keys.size == 1 && /^miner_address_distribution(\d+)$/ =~ extra_keys.first + end end end diff --git a/app/controllers/validations/monetary_data.rb b/app/controllers/validations/monetary_data.rb index bb1444249..1a1da42d6 100644 --- a/app/controllers/validations/monetary_data.rb +++ b/app/controllers/validations/monetary_data.rb @@ -33,7 +33,7 @@ def query_key_format_must_be_correct def query_key_valid? query_keys = query_key.split("-") extra_keys = query_keys - ::MonetaryData::VALID_INDICATORS - extra_keys.blank? || extra_keys.size == 1 && extra_keys.first =~ /^nominal_apc(\d+)$/ + extra_keys.blank? || extra_keys.size == 1 && /^nominal_apc(\d+)$/ =~ extra_keys.first end end end From 59b68d5c4b15b0af49183cd6589f57d3b23572ff Mon Sep 17 00:00:00 2001 From: shaojunda Date: Tue, 2 Jun 2020 18:29:54 +0800 Subject: [PATCH 03/23] chore: set checkpoint to miner distribution --- app/models/distribution_data.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/distribution_data.rb b/app/models/distribution_data.rb index a4578d7c0..5f32c3868 100644 --- a/app/models/distribution_data.rb +++ b/app/models/distribution_data.rb @@ -83,8 +83,9 @@ def miner_address_distribution(checkpoint = 7) Rails.cache.realize("miner_address_distribution_#{checkpoint}", expires_in: 1.day) do result = Block.where("timestamp >= ?", CkbUtils.time_in_milliseconds(checkpoint.days.ago.to_i)).group(:miner_hash).order("count(miner_hash) desc").count.to_a + cut_off_point = (result.count * 0.7).ceil if result.present? - (result[0..9].map{ |item| [item[0], item[1].to_s] } + [["other", result[10..-1].map { |item| item[1] }.reduce(:+).to_s]]).to_h + (result[0..cut_off_point].map{ |item| [item[0], item[1].to_s] } + [["other", result[(cut_off_point + 1)..-1].map { |item| item[1] }.reduce(:+).to_s]]).to_h else result end From 0c167fec662f1ebaa3e2644e88b0b8a4acd48836 Mon Sep 17 00:00:00 2001 From: shaojunda Date: Mon, 1 Jun 2020 15:14:27 +0800 Subject: [PATCH 04/23] test: status code and header info for index action --- .../api/v1/udts_controller_test.rb | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/test/controllers/api/v1/udts_controller_test.rb b/test/controllers/api/v1/udts_controller_test.rb index b237c89cb..ac15b7579 100644 --- a/test/controllers/api/v1/udts_controller_test.rb +++ b/test/controllers/api/v1/udts_controller_test.rb @@ -108,6 +108,58 @@ class UdtsControllerTest < ActionDispatch::IntegrationTest response_tx_transaction = json["data"] assert_equal %w(symbol full_name total_amount addresses_count decimal icon_file).sort, response_tx_transaction["attributes"].keys.sort end + + test "should get success code when call index" do + udt = create(:udt, published: true) + + valid_get api_v1_udts_url(udt.type_hash) + + assert_response :success + end + + test "should set right content type when call index" do + udt = create(:udt) + + valid_get api_v1_udts_url(udt.type_hash) + + assert_equal "application/vnd.api+json", response.media_type + end + + test "should respond with 415 Unsupported Media Type when Content-Type is wrong when call index" do + udt = create(:udt) + + get api_v1_udts_url(udt.type_hash), headers: { "Content-Type": "text/plain" } + + assert_equal 415, response.status + end + + test "should respond with error object when Content-Type is wrong when call index" do + udt = create(:udt) + error_object = Api::V1::Exceptions::InvalidContentTypeError.new + response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json + + get api_v1_udts_url(udt.type_hash), headers: { "Content-Type": "text/plain" } + + assert_equal response_json, response.body + end + + test "should respond with 406 Not Acceptable when Accept is wrong when call index" do + udt = create(:udt) + + get api_v1_udts_url(udt.type_hash), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" } + + assert_equal 406, response.status + end + + test "should respond with error object when Accept is wrong when call index" do + udt = create(:udt) + error_object = Api::V1::Exceptions::InvalidAcceptError.new + response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json + + get api_v1_udts_url(udt.type_hash), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" } + + assert_equal response_json, response.body + end end end end From fb12617426f466434b6871386db2327b5953957c Mon Sep 17 00:00:00 2001 From: shaojunda Date: Mon, 1 Jun 2020 15:14:45 +0800 Subject: [PATCH 05/23] feat: add udt index action --- app/controllers/api/v1/udts_controller.rb | 4 ++++ config/routes.rb | 2 +- .../api/v1/udts_controller_test.rb | 22 +++++-------------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/app/controllers/api/v1/udts_controller.rb b/app/controllers/api/v1/udts_controller.rb index 6b28451b5..b4ddbf4b5 100644 --- a/app/controllers/api/v1/udts_controller.rb +++ b/app/controllers/api/v1/udts_controller.rb @@ -1,6 +1,10 @@ class Api::V1::UdtsController < ApplicationController before_action :validate_query_params, only: :show + def index + render json: {} + end + def show udt = Udt.find_by!(type_hash: params[:id], published: true) diff --git a/config/routes.rb b/config/routes.rb index 050022217..b046b4a1b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -38,7 +38,7 @@ resources :block_statistics, only: :show resources :epoch_statistics, only: :show resources :market_data, only: :show - resources :udts, only: :show + resources :udts, only: %i(index show) resources :udt_transactions, only: :show resources :address_udt_transactions, only: :show resources :distribution_data, only: :show diff --git a/test/controllers/api/v1/udts_controller_test.rb b/test/controllers/api/v1/udts_controller_test.rb index ac15b7579..51e3470db 100644 --- a/test/controllers/api/v1/udts_controller_test.rb +++ b/test/controllers/api/v1/udts_controller_test.rb @@ -110,53 +110,43 @@ class UdtsControllerTest < ActionDispatch::IntegrationTest end test "should get success code when call index" do - udt = create(:udt, published: true) - - valid_get api_v1_udts_url(udt.type_hash) + valid_get api_v1_udts_url assert_response :success end test "should set right content type when call index" do - udt = create(:udt) - - valid_get api_v1_udts_url(udt.type_hash) + valid_get api_v1_udts_url assert_equal "application/vnd.api+json", response.media_type end test "should respond with 415 Unsupported Media Type when Content-Type is wrong when call index" do - udt = create(:udt) - - get api_v1_udts_url(udt.type_hash), headers: { "Content-Type": "text/plain" } + get api_v1_udts_url, headers: { "Content-Type": "text/plain" } assert_equal 415, response.status end test "should respond with error object when Content-Type is wrong when call index" do - udt = create(:udt) error_object = Api::V1::Exceptions::InvalidContentTypeError.new response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json - get api_v1_udts_url(udt.type_hash), headers: { "Content-Type": "text/plain" } + get api_v1_udts_url, headers: { "Content-Type": "text/plain" } assert_equal response_json, response.body end test "should respond with 406 Not Acceptable when Accept is wrong when call index" do - udt = create(:udt) - - get api_v1_udts_url(udt.type_hash), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" } + get api_v1_udts_url, headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" } assert_equal 406, response.status end test "should respond with error object when Accept is wrong when call index" do - udt = create(:udt) error_object = Api::V1::Exceptions::InvalidAcceptError.new response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json - get api_v1_udts_url(udt.type_hash), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" } + get api_v1_udts_url, headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" } assert_equal response_json, response.body end From a411feaa8846a6fe5829c2bf08c3171cafd0e808 Mon Sep 17 00:00:00 2001 From: shaojunda Date: Mon, 1 Jun 2020 20:13:28 +0800 Subject: [PATCH 06/23] test: udt index action logic --- .../api/v1/udts_controller_test.rb | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/test/controllers/api/v1/udts_controller_test.rb b/test/controllers/api/v1/udts_controller_test.rb index 51e3470db..7bd3638f4 100644 --- a/test/controllers/api/v1/udts_controller_test.rb +++ b/test/controllers/api/v1/udts_controller_test.rb @@ -150,6 +150,37 @@ class UdtsControllerTest < ActionDispatch::IntegrationTest assert_equal response_json, response.body end + + test "should get empty array when there are no udts" do + valid_get api_v1_udts_url + + assert_empty json["data"] + end + + test "should return udts in order of descending addresses count" do + udt1 = create(:udt, addresses_count: 1, published: true) + udt2 = create(:udt, addresses_count: 2) + udt3 = create(:udt, addresses_count: 3) + + valid_get api_v1_udts_url + + expected_udts = UdtSerializer.new([udt3, udt2, udt1]).serialized_json + + assert_equal expected_udts, response.body + end + + test "unpublished udt symbol field should show args last 2 bytes" do + udt1 = create(:udt, addresses_count: 1, published: true) + udt2 = create(:udt, addresses_count: 2, args: "0x94bbc8327e16d195de87815c391e7b9131e80419c51a405a0b21227c6ee05129") + + valid_get api_v1_udts_url + + expected_published_udt_name = udt1.symbol + expected_unpublished_udt_name = udt2.args + + assert_equal expected_unpublished_udt_name, json["data"][0] + assert_equal expected_published_udt_name, json["data"][1] + end end end end From 067c4c4ec99848a326a042394cac9d14c5ae110d Mon Sep 17 00:00:00 2001 From: shaojunda Date: Mon, 1 Jun 2020 20:15:39 +0800 Subject: [PATCH 07/23] chore: return udts order by addresses count desc --- app/controllers/api/v1/udts_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/v1/udts_controller.rb b/app/controllers/api/v1/udts_controller.rb index b4ddbf4b5..8b259a22e 100644 --- a/app/controllers/api/v1/udts_controller.rb +++ b/app/controllers/api/v1/udts_controller.rb @@ -2,7 +2,8 @@ class Api::V1::UdtsController < ApplicationController before_action :validate_query_params, only: :show def index - render json: {} + udts = Udt.order(addresses_count: :desc).limit(1000) + render json: UdtSerializer.new(udts) end def show From 7e451ee641ac0f523a9ab430bded5ebb1d641bae Mon Sep 17 00:00:00 2001 From: shaojunda Date: Mon, 1 Jun 2020 20:24:45 +0800 Subject: [PATCH 08/23] feat: add block_timestamp to udt --- app/models/udt.rb | 1 + db/migrate/20200601121842_add_block_timestamp_to_udts.rb | 5 +++++ db/schema.rb | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20200601121842_add_block_timestamp_to_udts.rb diff --git a/app/models/udt.rb b/app/models/udt.rb index 46dc2f85b..b25f599c4 100644 --- a/app/models/udt.rb +++ b/app/models/udt.rb @@ -36,6 +36,7 @@ def ckb_transactions # published :boolean default(FALSE) # created_at :datetime not null # updated_at :datetime not null +# block_timestamp :decimal(30, ) # # Indexes # diff --git a/db/migrate/20200601121842_add_block_timestamp_to_udts.rb b/db/migrate/20200601121842_add_block_timestamp_to_udts.rb new file mode 100644 index 000000000..a9d0eaf88 --- /dev/null +++ b/db/migrate/20200601121842_add_block_timestamp_to_udts.rb @@ -0,0 +1,5 @@ +class AddBlockTimestampToUdts < ActiveRecord::Migration[6.0] + def change + add_column :udts, :block_timestamp, :decimal, precision: 30 + end +end diff --git a/db/schema.rb b/db/schema.rb index 52ae6c958..a6083dd0a 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_05_25_100826) do +ActiveRecord::Schema.define(version: 2020_06_01_121842) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -388,6 +388,7 @@ t.boolean "published", default: false t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.decimal "block_timestamp", precision: 30 t.index ["type_hash"], name: "index_udts_on_type_hash", unique: true end From 18933d776414da7041d81152b2aac0c75a85fafc Mon Sep 17 00:00:00 2001 From: shaojunda Date: Mon, 1 Jun 2020 20:25:10 +0800 Subject: [PATCH 09/23] chore: save block timestamp to udt --- app/models/ckb_sync/node_data_processor.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/ckb_sync/node_data_processor.rb b/app/models/ckb_sync/node_data_processor.rb index c90e64eb3..d045ac8e9 100644 --- a/app/models/ckb_sync/node_data_processor.rb +++ b/app/models/ckb_sync/node_data_processor.rb @@ -39,7 +39,7 @@ def process_block(node_block) update_current_block_mining_info(local_block) update_block_contained_address_info(local_block) update_block_reward_info(local_block) - update_udt_accounts(udt_infos) + update_udt_accounts(udt_infos, local_block.timestamp) update_udt_info(udt_infos) dao_events = build_new_dao_depositor_events(new_dao_depositor_events) DaoEvent.import!(dao_events, validate: false) @@ -67,7 +67,7 @@ def update_udt_info(udt_infos) Udt.import columns, import_values, validate: false, on_duplicate_key_update: { conflict_target: [:type_hash], columns: [:total_amount, :addresses_count] } end - def update_udt_accounts(udt_infos) + def update_udt_accounts(udt_infos, block_timestamp) return if udt_infos.blank? udt_infos.each do |udt_output| @@ -78,7 +78,7 @@ def update_udt_accounts(udt_infos) if udt_account.present? udt_account.update!(amount: amount) else - udt = Udt.find_or_create_by!(type_hash: udt_output[:type_hash], code_hash: ENV["SUDT_CELL_TYPE_HASH"], udt_type: "sudt") + udt = Udt.find_or_create_by!(type_hash: udt_output[:type_hash], code_hash: ENV["SUDT_CELL_TYPE_HASH"], udt_type: "sudt", block_timestamp: block_timestamp) address.udt_accounts.create!(udt_type: udt.udt_type, full_name: udt.full_name, symbol: udt.symbol, decimal: udt.decimal, published: udt.published, code_hash: udt.code_hash, type_hash: udt.type_hash, amount: amount, udt: udt) end end From bfa41a1f56521269fc8ff2b805eabd8094a350e9 Mon Sep 17 00:00:00 2001 From: shaojunda Date: Mon, 1 Jun 2020 20:31:59 +0800 Subject: [PATCH 10/23] feat: add h24_ckb_transactions_count to udt --- app/models/udt.rb | 6 ++++++ app/serializers/udt_serializer.rb | 3 +++ 2 files changed, 9 insertions(+) diff --git a/app/models/udt.rb b/app/models/udt.rb index b25f599c4..6ac3bd7fe 100644 --- a/app/models/udt.rb +++ b/app/models/udt.rb @@ -13,6 +13,12 @@ def ckb_transactions ckb_transaction_ids = CellOutput.udt.where(type_hash: type_hash).pluck("generated_by_id") + CellOutput.udt.where(type_hash: type_hash).pluck("consumed_by_id").compact CkbTransaction.where(id: ckb_transaction_ids.uniq) end + + def h24_ckb_transactions_count + Rails.cache.realize("udt_h24_ckb_transactions_count_#{id}", expires_in: 1.hour) do + ckb_transactions.where("block_timestamp >= ?", CkbUtils.time_in_milliseconds(24.hours.ago)).count + end + end end # == Schema Information diff --git a/app/serializers/udt_serializer.rb b/app/serializers/udt_serializer.rb index 0d3b9a176..536983468 100644 --- a/app/serializers/udt_serializer.rb +++ b/app/serializers/udt_serializer.rb @@ -12,4 +12,7 @@ class UdtSerializer attribute :decimal do |object| object.decimal.to_s end + attribute :h24_ckb_transactions_count do |object| + object.h24_ckb_transactions_count.to_s + end end From f781bc15473bea54faae2358292be87f65781a6a Mon Sep 17 00:00:00 2001 From: shaojunda Date: Mon, 1 Jun 2020 20:36:31 +0800 Subject: [PATCH 11/23] chore: add task to fill block timestamp to udt --- .../fill_block_timestamp_to_udt.rake | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 lib/tasks/migration/fill_block_timestamp_to_udt.rake diff --git a/lib/tasks/migration/fill_block_timestamp_to_udt.rake b/lib/tasks/migration/fill_block_timestamp_to_udt.rake new file mode 100644 index 000000000..e2f21586c --- /dev/null +++ b/lib/tasks/migration/fill_block_timestamp_to_udt.rake @@ -0,0 +1,20 @@ +namespace :migration do + task fill_block_timestamp_to_udt: :environment do + udts = Udt.all + progress_bar = ProgressBar.create({ + total: udts.count, + format: "%e %B %p%% %c/%C" + }) + + values = + udts.map do |udt| + progress_bar.increment + cell_output = CellOutput.find_by(type_hash: udt.type_hash) + { id: udt.id, block_timestamp: cell_output.block_timestamp, created_at: udt.created_at, updated_at: Time.current } + end + + Udt.upsert_all(values) + + puts "done" + end +end From 592715dedd543f3ee73787da0ca4c679d9854a61 Mon Sep 17 00:00:00 2001 From: shaojunda Date: Tue, 2 Jun 2020 11:09:32 +0800 Subject: [PATCH 12/23] chore: adjust tests --- test/controllers/api/v1/udts_controller_test.rb | 15 +-------------- test/models/ckb_sync/node_data_processor_test.rb | 12 ++++++------ 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/test/controllers/api/v1/udts_controller_test.rb b/test/controllers/api/v1/udts_controller_test.rb index 7bd3638f4..728b8f918 100644 --- a/test/controllers/api/v1/udts_controller_test.rb +++ b/test/controllers/api/v1/udts_controller_test.rb @@ -106,7 +106,7 @@ class UdtsControllerTest < ActionDispatch::IntegrationTest valid_get api_v1_udt_url(udt.type_hash) response_tx_transaction = json["data"] - assert_equal %w(symbol full_name total_amount addresses_count decimal icon_file).sort, response_tx_transaction["attributes"].keys.sort + assert_equal %w(symbol full_name total_amount addresses_count decimal icon_file h24_ckb_transactions_count).sort, response_tx_transaction["attributes"].keys.sort end test "should get success code when call index" do @@ -168,19 +168,6 @@ class UdtsControllerTest < ActionDispatch::IntegrationTest assert_equal expected_udts, response.body end - - test "unpublished udt symbol field should show args last 2 bytes" do - udt1 = create(:udt, addresses_count: 1, published: true) - udt2 = create(:udt, addresses_count: 2, args: "0x94bbc8327e16d195de87815c391e7b9131e80419c51a405a0b21227c6ee05129") - - valid_get api_v1_udts_url - - expected_published_udt_name = udt1.symbol - expected_unpublished_udt_name = udt2.args - - assert_equal expected_unpublished_udt_name, json["data"][0] - assert_equal expected_published_udt_name, json["data"][1] - end end end end diff --git a/test/models/ckb_sync/node_data_processor_test.rb b/test/models/ckb_sync/node_data_processor_test.rb index cf76c5f60..5cf9a71df 100644 --- a/test/models/ckb_sync/node_data_processor_test.rb +++ b/test/models/ckb_sync/node_data_processor_test.rb @@ -1822,7 +1822,7 @@ class NodeDataProcessorTest < ActiveSupport::TestCase create(:block, :with_block_hash, number: node_block.header.number - 1) node_output = node_block.transactions.first.outputs.first node_output.type = CKB::Types::Script.new(code_hash: ENV["SUDT_CELL_TYPE_HASH"], args: "0xb2e61ff569acf041b3c2c17724e2379c581eeac3") - create(:udt, code_hash: ENV["SUDT_CELL_TYPE_HASH"], type_hash: node_output.type.compute_hash) + create(:udt, code_hash: ENV["SUDT_CELL_TYPE_HASH"], type_hash: node_output.type.compute_hash, block_timestamp: node_block.header.timestamp) local_block = node_data_processor.process_block(node_block) assert_equal ["udt"], local_block.cell_outputs.pluck(:cell_type).uniq @@ -1836,7 +1836,7 @@ class NodeDataProcessorTest < ActiveSupport::TestCase create(:block, :with_block_hash, number: node_block.header.number - 1) node_output = node_block.transactions.first.outputs.first node_output.type = CKB::Types::Script.new(code_hash: ENV["SUDT_CELL_TYPE_HASH"], args: "0xb2e61ff569acf041b3c2c17724e2379c581eeac3") - create(:udt, code_hash: ENV["SUDT_CELL_TYPE_HASH"], type_hash: node_output.type.compute_hash) + create(:udt, code_hash: ENV["SUDT_CELL_TYPE_HASH"], type_hash: node_output.type.compute_hash, block_timestamp: node_block.header.timestamp) address_hash = CkbUtils.generate_address(node_output.lock) address = Address.find_by(address_hash: address_hash) @@ -1923,7 +1923,7 @@ class NodeDataProcessorTest < ActiveSupport::TestCase new_node_output.type = CKB::Types::Script.new(code_hash: ENV["SUDT_CELL_TYPE_HASH"], args: "0xb2e61ff569acf041b3c2c17724e2379c581eeac2") new_node_output.lock = CKB::Types::Script.new(code_hash: ENV["SECP_CELL_TYPE_HASH"], args: "0xc2e61ff569acf041b3c2c17724e2379c581eeac2") node_output.type = CKB::Types::Script.new(code_hash: ENV["SUDT_CELL_TYPE_HASH"], args: "0xb2e61ff569acf041b3c2c17724e2379c581eeac2") - udt = create(:udt, code_hash: ENV["SUDT_CELL_TYPE_HASH"], type_hash: node_output.type.compute_hash, published: true) + udt = create(:udt, code_hash: ENV["SUDT_CELL_TYPE_HASH"], type_hash: node_output.type.compute_hash, published: true, block_timestamp: node_block.header.timestamp) node_block.transactions.first.outputs_data[0] = "0x000050ad321ea12e0000000000000000" node_block.transactions.first.outputs_data[1] = "0x0000909dceda82370000000000000000" address_hash = CkbUtils.generate_address(node_output.lock) @@ -1977,7 +1977,7 @@ class NodeDataProcessorTest < ActiveSupport::TestCase node_output = node_block.transactions.first.outputs.first node_output.type = CKB::Types::Script.new(code_hash: ENV["SUDT_CELL_TYPE_HASH"], args: "0xb2e61ff569acf041b3c2c17724e2379c581eeac3") node_block.transactions.first.outputs_data[0] = "0x000050ad321ea12e0000000000000000" - create(:udt, code_hash: ENV["SUDT_CELL_TYPE_HASH"], type_hash: node_output.type.compute_hash) + create(:udt, code_hash: ENV["SUDT_CELL_TYPE_HASH"], type_hash: node_output.type.compute_hash, block_timestamp: node_block.header.timestamp) node_data_processor.process_block(node_block) block = Block.find_by(number: 21) block.update(block_hash: "0x419c632366c8eb9635acbb39ea085f7552ae62e1fdd480893375334a0f37d1bx") @@ -2006,8 +2006,8 @@ class NodeDataProcessorTest < ActiveSupport::TestCase node_output.type = CKB::Types::Script.new(code_hash: ENV["SUDT_CELL_TYPE_HASH"], args: "0xb2e61ff569acf041b3c2c17724e2379c581eeac3") node_block.transactions.first.outputs_data[0] = "0x000050ad321ea12e0000000000000000" node_block.transactions.first.outputs_data[1] = "0x0000909dceda82370000000000000000" - create(:udt, code_hash: ENV["SUDT_CELL_TYPE_HASH"], type_hash: node_output.type.compute_hash) - create(:udt, code_hash: ENV["SUDT_CELL_TYPE_HASH"], type_hash: new_node_output.type.compute_hash) + create(:udt, code_hash: ENV["SUDT_CELL_TYPE_HASH"], type_hash: node_output.type.compute_hash, block_timestamp: node_block.header.timestamp) + create(:udt, code_hash: ENV["SUDT_CELL_TYPE_HASH"], type_hash: new_node_output.type.compute_hash, block_timestamp: node_block.header.timestamp) node_data_processor.process_block(node_block) block = Block.find_by(number: 21) block.update(block_hash: "0x419c632366c8eb9635acbb39ea085f7552ae62e1fdd480893375334a0f37d1bx") From 71b743c161db12f58fc9361bb0aff3cf082199a7 Mon Sep 17 00:00:00 2001 From: shaojunda Date: Tue, 2 Jun 2020 19:07:51 +0800 Subject: [PATCH 13/23] chore: return more fields on udt --- app/serializers/udt_serializer.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/serializers/udt_serializer.rb b/app/serializers/udt_serializer.rb index 536983468..09dc5e886 100644 --- a/app/serializers/udt_serializer.rb +++ b/app/serializers/udt_serializer.rb @@ -1,7 +1,7 @@ class UdtSerializer include FastJsonapi::ObjectSerializer - attributes :symbol, :full_name, :icon_file + attributes :symbol, :full_name, :icon_file, :published, :description attribute :total_amount do |object| object.total_amount.to_s @@ -15,4 +15,7 @@ class UdtSerializer attribute :h24_ckb_transactions_count do |object| object.h24_ckb_transactions_count.to_s end + attributes :created_at do |object| + object.block_timestamp.to_s + end end From ecdd60a864f4a9a1ce76fb18f9e61fa7f20090ae Mon Sep 17 00:00:00 2001 From: shaojunda Date: Tue, 2 Jun 2020 19:17:54 +0800 Subject: [PATCH 14/23] chore: update api doc --- doc/api.raml | 78 +++++++++++++++++++++++++++++++++++++++++++++ public/api_doc.html | 53 +++++++++++++++++++++++++++++- 2 files changed, 130 insertions(+), 1 deletion(-) diff --git a/doc/api.raml b/doc/api.raml index 0cdfef5b0..2a6130096 100644 --- a/doc/api.raml +++ b/doc/api.raml @@ -779,6 +779,15 @@ types: }, "icon_file": { type: "string" + }, + "description": { + type: "string" + }, + "created_at": { + type: "string" + }, + "published": { + type: "boolean" } } } @@ -1014,6 +1023,15 @@ types: } } + udts_response: { + type: object, + properties: { + "data": { + "type": "udt[]", + } + } + } + index_statistic_response: { type: object, properties: { @@ -3690,6 +3708,66 @@ types: } /udts: + get: + description: Returns udts in reverse chronological order by addresses count. + responses: + 200: + body: + application/vnd.api+json: + type: udts_response + example: | + { + "data": [ + { + "id": "1", + "type": "udt", + "attributes": { + "symbol": "kfc", + "full_name": "Kingdom Fly Coin", + "icon_file": "data:image/png;base64,/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAQDAwQDAwQEAwQFBAQFBgoHBgYGBg0JCggKDw0QEA8NDw4RExgUERIXEg4PFRwVFxkZGxsbEBQdHx0aHxgaGxr/2wBDAQQFBQYFBgwHBwwaEQ8RGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhr/wAARCAAoACgDASIAAhEBAxEB/8QAGwAAAgIDAQAAAAAAAAAAAAAAAAYEBwEFCAP/xAAtEAABAgUCBAUEAwAAAAAAAAABAgQAAwUREgYTFCExUSJBYXHwBxUygRaRwf/EABoBAAIDAQEAAAAAAAAAAAAAAAACAwUGBAf/xAAiEQABAwQCAgMAAAAAAAAAAAABAAIRAwQhMUFRBhMiQoH/2gAMAwEAAhEDEQA/AO83TtDWVnM6eXeFhzWJ7hRCV4pvyANvn7vGKu6LlyoXOKPCB8+c4pmhUKo6Zq8qq1yTw1PkZ7kwzQvHIEDkCT1IhXOhVd5ePtH0wKZc1xyeGjGTjWZzGlbW4c872Ve94nNa1ObqSCvNPmFG/wA/UUt9QdQU+tCn/anO+ZRmblkqTa+NuoHYxpadpOt1NtJdsmxmt5hulW8kXsbHkT6GENTMAKmr+QOFy6hbUfbHLTPXQOphdWNHct5KEyUfcdoIVqM6LV0hJJwX4VD5/f6giVa1QJmQUTMvl53ipdQfUEVqlOaf9vMgzbDc3srWUD0t6RdFYaqbuZhIOK7qSf8APnaOfdJ06RU9Rtmz+SZreYZmSTcA2SSOY9oiqE4A5WS8gr3LXUbag6PbLT+wOjG+F76T0mNTh2S7LXhyjpLzyyv6jtDKNUjRJTQOEL7hbDf3NvLLxfjY2tlbr5QaqvokNP4ungi7Kt8AbmWNrfle1sj07xsqDQafqalN6rXG3Ev54O7NKlIviogcgQByAhACMDaqrS0fbPNpaENuGj5O20tOYEznLfqNHPbvLyuDLvl5WgifR2hcOkGxCEG6j7QR0L0JNDtpLeSjLmj2PaFZ3R3DVRKZe4i/JSReCCBCgbaivAgFV7RsGdHcuFC6DLRfmoi0EECE0NGktnKEuUPc94IIIEL/2Q==", + "total_amount": "10000000000", + "addresses_count": "3", + "decimal": "6", + "h24_ckb_transactions_count": "0", + "published": true, + "description": "Kingdom Fly Coin", + "created_at": "1591096409" + } + }, + { + "id": "4", + "type": "udt", + "attributes": { + "symbol": null, + "full_name": null, + "icon_file": null, + "total_amount": "100000000000000000000", + "addresses_count": "3", + "decimal": "", + "h24_ckb_transactions_count": "0", + "published": false, + "description": "", + "created_at": "1591096409" + } + }, + { + "id": "14", + "type": "udt", + "attributes": { + "symbol": null, + "full_name": null, + "icon_file": null, + "total_amount": "9999900000", + "addresses_count": "1", + "decimal": "", + "h24_ckb_transactions_count": "0", + "published": false, + "description": "", + "created_at": "1591096409" + } + }] + } + /{type_hash}: uriParameters: type_hash: diff --git a/public/api_doc.html b/public/api_doc.html index 67b351a84..62071c180 100644 --- a/public/api_doc.html +++ b/public/api_doc.html @@ -2150,7 +2150,58 @@

/market_data

get

get

Returns market data by given indicator

Returns market data by given indicator

URI Parameters

  • indicator: required(one of total_supply, circulating_supply)

    market indicator name

HTTP status code 200

Body

Media type: application/json

Type: string

Example:

{
   "25374730228.31050194"
 }
-

/udts

get

get

Returns a UDT by type hash

Returns a UDT by type hash

URI Parameters

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

    The UDT type script hash

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

Properties
  • data: required(object)
    • symbol: required(string)
    • full_name: required(string)
    • total_amount: required(string)
    • addresses_count: required(string)
    • decimal: required(string)
    • icon_file: required(string)

Example:

{
+

/udts

get

get

Returns udts in reverse chronological order by addresses count.

get

get

Returns a UDT by type hash

Returns a UDT by type hash

URI Parameters

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

    The UDT type script hash

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

Properties
  • data: required(object)
    • symbol: required(string)
    • full_name: required(string)
    • total_amount: required(string)
    • addresses_count: required(string)
    • decimal: required(string)
    • icon_file: required(string)
    • description: required(string)
    • created_at: required(string)
    • published: required(boolean)

Example:

{
   "data": {
     "id": "1",
     "type": "udt",

From b72eb7f781ccd7109cd995757d50bc65779ea3e3 Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Wed, 3 Jun 2020 17:49:04 +0800
Subject: [PATCH 15/23] chore: add type_hash to udt serializer

---
 app/serializers/udt_serializer.rb               | 2 +-
 test/controllers/api/v1/udts_controller_test.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/serializers/udt_serializer.rb b/app/serializers/udt_serializer.rb
index 09dc5e886..4acaa756c 100644
--- a/app/serializers/udt_serializer.rb
+++ b/app/serializers/udt_serializer.rb
@@ -1,7 +1,7 @@
 class UdtSerializer
   include FastJsonapi::ObjectSerializer
 
-  attributes :symbol, :full_name, :icon_file, :published, :description
+  attributes :symbol, :full_name, :icon_file, :published, :description, :type_hash
 
   attribute :total_amount do |object|
     object.total_amount.to_s
diff --git a/test/controllers/api/v1/udts_controller_test.rb b/test/controllers/api/v1/udts_controller_test.rb
index 728b8f918..ee775c6fd 100644
--- a/test/controllers/api/v1/udts_controller_test.rb
+++ b/test/controllers/api/v1/udts_controller_test.rb
@@ -106,7 +106,7 @@ class UdtsControllerTest < ActionDispatch::IntegrationTest
         valid_get api_v1_udt_url(udt.type_hash)
 
         response_tx_transaction = json["data"]
-        assert_equal %w(symbol full_name total_amount addresses_count decimal icon_file h24_ckb_transactions_count).sort, response_tx_transaction["attributes"].keys.sort
+        assert_equal %w(symbol full_name total_amount addresses_count decimal icon_file h24_ckb_transactions_count created_at description published type_hash).sort, response_tx_transaction["attributes"].keys.sort
       end
 
       test "should get success code when call index" do

From c447d245064d9403e844ad3918c4b3abe7344ea1 Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Fri, 15 May 2020 15:49:21 +0800
Subject: [PATCH 16/23] chore: remove AddressPresenter

---
 .../v1/address_dao_transactions_controller.rb |  3 +-
 .../api/v1/address_transactions_controller.rb |  3 +-
 .../v1/address_udt_transactions_controller.rb |  3 +-
 .../api/v1/addresses_controller.rb            |  2 +-
 app/models/address.rb                         | 14 ++++
 app/models/suggest_query.rb                   |  5 +-
 app/presenters/address_presenter.rb           | 78 -------------------
 7 files changed, 19 insertions(+), 89 deletions(-)
 delete mode 100644 app/presenters/address_presenter.rb

diff --git a/app/controllers/api/v1/address_dao_transactions_controller.rb b/app/controllers/api/v1/address_dao_transactions_controller.rb
index f6a88cabc..88e88907c 100644
--- a/app/controllers/api/v1/address_dao_transactions_controller.rb
+++ b/app/controllers/api/v1/address_dao_transactions_controller.rb
@@ -8,8 +8,7 @@ def show
         address = Address.find_address!(params[:id])
         raise Api::V1::Exceptions::AddressNotFoundError if address.is_a?(NullAddress)
 
-        presented_address = AddressPresenter.new(address)
-        ckb_dao_transactions = presented_address.ckb_dao_transactions.recent.distinct.page(@page).per(@page_size)
+        ckb_dao_transactions = address.ckb_dao_transactions.recent.distinct.page(@page).per(@page_size)
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: ckb_dao_transactions, page: @page, page_size: @page_size).call
 
         render json: CkbTransactionSerializer.new(ckb_dao_transactions, options.merge({ params: { previews: true } }))
diff --git a/app/controllers/api/v1/address_transactions_controller.rb b/app/controllers/api/v1/address_transactions_controller.rb
index 482829afd..f4a8a5c61 100644
--- a/app/controllers/api/v1/address_transactions_controller.rb
+++ b/app/controllers/api/v1/address_transactions_controller.rb
@@ -8,8 +8,7 @@ def show
         @address = Address.find_address!(params[:id])
         raise Api::V1::Exceptions::AddressNotFoundError if @address.is_a?(NullAddress)
 
-        presented_address = AddressPresenter.new(@address)
-        @ckb_transactions = presented_address.ckb_transactions.recent.distinct.page(@page).per(@page_size)
+        @ckb_transactions = @address.ckb_transactions.recent.distinct.page(@page).per(@page_size)
         @options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: @ckb_transactions, page: @page, page_size: @page_size).call
 
         render json: json_result
diff --git a/app/controllers/api/v1/address_udt_transactions_controller.rb b/app/controllers/api/v1/address_udt_transactions_controller.rb
index 3f35d962b..f8a760b0f 100644
--- a/app/controllers/api/v1/address_udt_transactions_controller.rb
+++ b/app/controllers/api/v1/address_udt_transactions_controller.rb
@@ -12,8 +12,7 @@ def show
         udt = Udt.find_by(type_hash: params[:type_hash], published: true)
         raise Api::V1::Exceptions::UdtNotFoundError if udt.blank?
 
-        presented_address = AddressPresenter.new(address)
-        ckb_dao_transactions = presented_address.ckb_udt_transactions(params[:type_hash]).recent.distinct.page(@page).per(@page_size)
+        ckb_dao_transactions = address.ckb_udt_transactions(params[:type_hash]).recent.distinct.page(@page).per(@page_size)
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: ckb_dao_transactions, page: @page, page_size: @page_size).call
 
         render json: CkbTransactionSerializer.new(ckb_dao_transactions, options.merge({ params: { previews: true } }))
diff --git a/app/controllers/api/v1/addresses_controller.rb b/app/controllers/api/v1/addresses_controller.rb
index 46414ad90..851ce7637 100644
--- a/app/controllers/api/v1/addresses_controller.rb
+++ b/app/controllers/api/v1/addresses_controller.rb
@@ -26,7 +26,7 @@ def json_response(address)
         if QueryKeyUtils.valid_hex?(params[:id])
           LockHashSerializer.new(address)
         else
-          presented_address = address.is_a?(NullAddress) ? NullAddress.new(params[:id]) : AddressPresenter.new(address)
+          presented_address = address.is_a?(NullAddress) ? NullAddress.new(params[:id]) : address
           AddressSerializer.new(presented_address)
         end
       end
diff --git a/app/models/address.rb b/app/models/address.rb
index 65c0cc9b0..57fec9f86 100644
--- a/app/models/address.rb
+++ b/app/models/address.rb
@@ -17,6 +17,20 @@ class Address < ApplicationRecord
 
   attr_accessor :query_address
 
+  def ckb_dao_transactions
+    ckb_transaction_ids = cell_outputs.where(cell_type: %w(nervos_dao_deposit nervos_dao_withdrawing)).select("ckb_transaction_id")
+    CkbTransaction.where(id: ckb_transaction_ids)
+  end
+
+  def ckb_udt_transactions(type_hash)
+    ckb_transaction_ids = cell_outputs.udt.where(type_hash: type_hash).pluck("generated_by_id") + cell_outputs.udt.where(type_hash: type_hash).pluck("consumed_by_id").compact
+    CkbTransaction.where(id: ckb_transaction_ids.uniq)
+  end
+
+  def lock_info
+    lock_script.lock_info
+  end
+
   def lock_script
     LockScript.where(address: self).first
   end
diff --git a/app/models/suggest_query.rb b/app/models/suggest_query.rb
index b754a60b2..d53e613ef 100644
--- a/app/models/suggest_query.rb
+++ b/app/models/suggest_query.rb
@@ -47,10 +47,7 @@ def find_cached_address
     address = Address.cached_find(query_key)
     raise Api::V1::Exceptions::AddressNotFoundError if address.blank?
 
-    return AddressSerializer.new(address) if address.is_a?(NullAddress)
-
-    presented_address = AddressPresenter.new(address)
-    AddressSerializer.new(presented_address)
+    AddressSerializer.new(address)
   end
 
   def find_udt_by_type_hash
diff --git a/app/presenters/address_presenter.rb b/app/presenters/address_presenter.rb
deleted file mode 100644
index 184e52cff..000000000
--- a/app/presenters/address_presenter.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-class AddressPresenter
-  def initialize(object)
-    @object = object.is_a?(Array) ? object : [object]
-  end
-
-  def id
-    object.first.id
-  end
-
-  def address_hash
-    object.first.query_address
-  end
-
-  def balance
-    object.reduce(0) { |sum, addr| sum + addr.balance.to_i }
-  end
-
-  def dao_deposit
-    object.reduce(0) { |sum, addr| sum + addr.dao_deposit.to_i }
-  end
-
-  def interest
-    object.reduce(0) { |sum, addr| sum + addr.interest.to_i }
-  end
-
-  def live_cells_count
-    object.reduce(0) { |sum, addr| sum + addr.live_cells_count.to_i }
-  end
-
-  def mined_blocks_count
-    object.reduce(0) { |sum, addr| sum + addr.mined_blocks_count.to_i }
-  end
-
-  def lock_script
-    object.first.cached_lock_script
-  end
-
-  def ckb_transactions_count
-    ckb_transactions.count
-  end
-
-  def special?
-    object.first.special?
-  end
-
-  def ckb_transactions
-    ckb_transaction_ids = AccountBook.where(address_id: object.pluck(:id)).select(:ckb_transaction_id).distinct
-    CkbTransaction.where(id: ckb_transaction_ids).recent
-  end
-
-  def ckb_dao_transactions
-    address_ids = object.pluck(:id)
-    ckb_transaction_ids = CellOutput.where(address_id: address_ids).where(cell_type: %w(nervos_dao_deposit nervos_dao_withdrawing)).select("ckb_transaction_id")
-    CkbTransaction.where(id: ckb_transaction_ids)
-  end
-
-  def ckb_udt_transactions(type_hash)
-    address_ids = object.pluck(:id)
-    ckb_transaction_ids = CellOutput.udt.where(address_id: address_ids, type_hash: type_hash).pluck("generated_by_id") + CellOutput.udt.where(address_id: address_ids, type_hash: type_hash).pluck("consumed_by_id").compact
-    CkbTransaction.where(id: ckb_transaction_ids.uniq)
-  end
-
-  def lock_info
-    object.first.lock_script.lock_info
-  end
-
-  def average_deposit_time
-    object.first.average_deposit_time
-  end
-
-  def udt_accounts
-    object.first.udt_accounts
-  end
-
-  private
-
-  attr_reader :object
-end

From a0c797dedd85551346baec0a33f9a8368144949f Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Fri, 15 May 2020 15:49:42 +0800
Subject: [PATCH 17/23] chore: adjust tests

---
 ...ddress_dao_transactions_controller_test.rb | 30 +++++++-----------
 ...ddress_udt_transactions_controller_test.rb | 25 ++++++---------
 .../api/v1/addresses_controller_test.rb       |  9 ++----
 .../v1/daily_statistics_controller_test.rb    |  6 ++--
 .../api/v1/suggest_queries_controller_test.rb |  9 ++----
 .../v1/udt_transactions_controller_test.rb    | 10 +++---
 test/models/suggest_query_test.rb             |  3 +-
 test/presenters/address_presenter_tests.rb    | 31 -------------------
 8 files changed, 37 insertions(+), 86 deletions(-)
 delete mode 100644 test/presenters/address_presenter_tests.rb

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 6af27b167..84893d814 100644
--- a/test/controllers/api/v1/address_dao_transactions_controller_test.rb
+++ b/test/controllers/api/v1/address_dao_transactions_controller_test.rb
@@ -58,14 +58,13 @@ class AddressDaoTransactionsControllerTest < ActionDispatch::IntegrationTest
         page_size = 10
         address = create(:address, :with_transactions)
         fake_dao_deposit_transaction(3, address)
-        presented_address = AddressPresenter.new(address)
-        ckb_dao_transactions = presented_address.ckb_dao_transactions.order(block_timestamp: :desc).page(page).per(page_size)
+        ckb_dao_transactions = address.ckb_dao_transactions.order(block_timestamp: :desc).page(page).per(page_size)
 
         valid_get api_v1_address_dao_transaction_url(address.address_hash)
 
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: ckb_dao_transactions, page: page, page_size: page_size).call
 
-        assert_equal CkbTransactionSerializer.new(ckb_dao_transactions, options.merge({ params: { previews: true } })).serialized_json, response.body
+        assert_equal CkbTransactionSerializer.new(ckb_dao_transactions, options.merge(params: {previews: true})).serialized_json, response.body
       end
 
       test "should return corresponding ckb transactions with given lock hash" do
@@ -73,14 +72,13 @@ class AddressDaoTransactionsControllerTest < ActionDispatch::IntegrationTest
         page_size = 10
         address = create(:address, :with_transactions)
         fake_dao_deposit_transaction(3, address)
-        presented_address = AddressPresenter.new(address)
-        ckb_dao_transactions = presented_address.ckb_dao_transactions.order(block_timestamp: :desc).page(page).per(page_size)
+        ckb_dao_transactions = address.ckb_dao_transactions.order(block_timestamp: :desc).page(page).per(page_size)
 
         valid_get api_v1_address_dao_transaction_url(address.lock_hash)
 
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: ckb_dao_transactions, page: page, page_size: page_size).call
 
-        assert_equal CkbTransactionSerializer.new(ckb_dao_transactions, options.merge({ params: { previews: true } })).serialized_json, response.body
+        assert_equal CkbTransactionSerializer.new(ckb_dao_transactions, options.merge(params: {previews: true})).serialized_json, response.body
       end
 
       test "should contain right keys in the serialized object when call show" do
@@ -149,13 +147,12 @@ class AddressDaoTransactionsControllerTest < ActionDispatch::IntegrationTest
         page_size = 10
         address = create(:address, :with_transactions, transactions_count: 30)
         fake_dao_deposit_transaction(30, address)
-        presented_address = AddressPresenter.new(address)
-        address_dao_transactions = presented_address.ckb_dao_transactions.order(block_timestamp: :desc).page(page).per(page_size)
+        address_dao_transactions = address.ckb_dao_transactions.order(block_timestamp: :desc).page(page).per(page_size)
 
         valid_get api_v1_address_dao_transaction_url(address.address_hash), params: { page: page }
 
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: address_dao_transactions, page: page, page_size: page_size).call
-        response_transaction = CkbTransactionSerializer.new(address_dao_transactions, options.merge({ params: { previews: true } })).serialized_json
+        response_transaction = CkbTransactionSerializer.new(address_dao_transactions, options.merge(params: {previews: true})).serialized_json
 
         assert_equal response_transaction, response.body
         assert_equal page_size, json["data"].size
@@ -166,13 +163,12 @@ class AddressDaoTransactionsControllerTest < ActionDispatch::IntegrationTest
         page_size = 12
         address = create(:address, :with_transactions, transactions_count: 15)
         fake_dao_deposit_transaction(15, address)
-        presented_address = AddressPresenter.new(address)
-        address_dao_transactions = presented_address.ckb_dao_transactions.order(block_timestamp: :desc).page(page).per(page_size)
+        address_dao_transactions = address.ckb_dao_transactions.order(block_timestamp: :desc).page(page).per(page_size)
 
         valid_get api_v1_address_dao_transaction_url(address.address_hash), params: { page_size: page_size }
 
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: address_dao_transactions, page: page, page_size: page_size).call
-        response_transaction = CkbTransactionSerializer.new(address_dao_transactions, options.merge({ params: { previews: true } })).serialized_json
+        response_transaction = CkbTransactionSerializer.new(address_dao_transactions, options.merge(params: {previews: true})).serialized_json
 
         assert_equal response_transaction, response.body
         assert_equal page_size, json["data"].size
@@ -183,12 +179,11 @@ class AddressDaoTransactionsControllerTest < ActionDispatch::IntegrationTest
         page_size = 5
         address = create(:address, :with_transactions, transactions_count: 30)
         fake_dao_deposit_transaction(30, address)
-        presented_address = AddressPresenter.new(address)
-        address_dao_transactions = presented_address.ckb_dao_transactions.order(block_timestamp: :desc).page(page).per(page_size)
+        address_dao_transactions = address.ckb_dao_transactions.order(block_timestamp: :desc).page(page).per(page_size)
 
         valid_get api_v1_address_dao_transaction_url(address.address_hash), params: { page: page, page_size: page_size }
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: address_dao_transactions, page: page, page_size: page_size).call
-        response_transaction = CkbTransactionSerializer.new(address_dao_transactions, options.merge({ params: { previews: true } })).serialized_json
+        response_transaction = CkbTransactionSerializer.new(address_dao_transactions, options.merge(params: {previews: true})).serialized_json
 
         assert_equal response_transaction, response.body
       end
@@ -198,13 +193,12 @@ class AddressDaoTransactionsControllerTest < ActionDispatch::IntegrationTest
         page_size = 5
         address = create(:address, :with_transactions)
         fake_dao_deposit_transaction(3, address)
-        presented_address = AddressPresenter.new(address)
-        address_dao_transactions = presented_address.ckb_dao_transactions.order(block_timestamp: :desc).page(page).per(page_size)
+        address_dao_transactions = address.ckb_dao_transactions.order(block_timestamp: :desc).page(page).per(page_size)
 
         valid_get api_v1_address_dao_transaction_url(address.address_hash), params: { page: page, page_size: page_size }
 
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: address_dao_transactions, page: page, page_size: page_size).call
-        response_transaction = CkbTransactionSerializer.new(address_dao_transactions, options.merge({ params: { previews: true } })).serialized_json
+        response_transaction = CkbTransactionSerializer.new(address_dao_transactions, options.merge(params: {previews: true})).serialized_json
 
         assert_equal [], json["data"]
         assert_equal response_transaction, response.body
diff --git a/test/controllers/api/v1/address_udt_transactions_controller_test.rb b/test/controllers/api/v1/address_udt_transactions_controller_test.rb
index 9f8be9192..1368afdba 100644
--- a/test/controllers/api/v1/address_udt_transactions_controller_test.rb
+++ b/test/controllers/api/v1/address_udt_transactions_controller_test.rb
@@ -77,14 +77,13 @@ class AddressUdtTransactionsControllerTest < ActionDispatch::IntegrationTest
         page_size = 10
         udt = create(:udt, published: true)
         address = create(:address, :with_udt_transactions, udt: udt)
-        presented_address = AddressPresenter.new(address)
-        ckb_udt_transactions = presented_address.ckb_udt_transactions(udt.type_hash).order(block_timestamp: :desc).page(page).per(page_size)
+        ckb_udt_transactions = address.ckb_udt_transactions(udt.type_hash).order(block_timestamp: :desc).page(page).per(page_size)
 
         valid_get api_v1_address_udt_transaction_url(address.address_hash, type_hash: udt.type_hash)
 
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: ckb_udt_transactions, page: page, page_size: page_size).call
 
-        assert_equal CkbTransactionSerializer.new(ckb_udt_transactions, options.merge({ params: { previews: true } })).serialized_json, response.body
+        assert_equal CkbTransactionSerializer.new(ckb_udt_transactions, options.merge(params: { previews: true })).serialized_json, response.body
       end
 
       test "should contain right keys in the serialized object when call show" do
@@ -169,13 +168,12 @@ class AddressUdtTransactionsControllerTest < ActionDispatch::IntegrationTest
         udt = create(:udt, published: true)
         address = create(:address, :with_udt_transactions, transactions_count: 30, udt: udt)
 
-        presented_address = AddressPresenter.new(address)
-        address_udt_transactions = presented_address.ckb_udt_transactions(udt.type_hash).order(block_timestamp: :desc).page(page).per(page_size)
+        address_udt_transactions = address.ckb_udt_transactions(udt.type_hash).order(block_timestamp: :desc).page(page).per(page_size)
 
         valid_get api_v1_address_udt_transaction_url(address.address_hash, type_hash: udt.type_hash), params: { page: page }
 
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: address_udt_transactions, page: page, page_size: page_size).call
-        response_transaction = CkbTransactionSerializer.new(address_udt_transactions, options.merge({ params: { previews: true } })).serialized_json
+        response_transaction = CkbTransactionSerializer.new(address_udt_transactions, options.merge(params: { previews: true })).serialized_json
 
         assert_equal response_transaction, response.body
         assert_equal page_size, json["data"].size
@@ -186,13 +184,12 @@ class AddressUdtTransactionsControllerTest < ActionDispatch::IntegrationTest
         page_size = 12
         udt = create(:udt, published: true)
         address = create(:address, :with_udt_transactions, transactions_count: 15, udt: udt)
-        presented_address = AddressPresenter.new(address)
-        address_udt_transactions = presented_address.ckb_udt_transactions(udt.type_hash).order(block_timestamp: :desc).page(page).per(page_size)
+        address_udt_transactions = address.ckb_udt_transactions(udt.type_hash).order(block_timestamp: :desc).page(page).per(page_size)
 
         valid_get api_v1_address_udt_transaction_url(address.address_hash, type_hash: udt.type_hash), params: { page_size: page_size }
 
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: address_udt_transactions, page: page, page_size: page_size).call
-        response_transaction = CkbTransactionSerializer.new(address_udt_transactions, options.merge({ params: { previews: true } })).serialized_json
+        response_transaction = CkbTransactionSerializer.new(address_udt_transactions, options.merge(params: { previews: true })).serialized_json
 
         assert_equal response_transaction, response.body
         assert_equal page_size, json["data"].size
@@ -203,12 +200,11 @@ class AddressUdtTransactionsControllerTest < ActionDispatch::IntegrationTest
         page_size = 5
         udt = create(:udt, published: true)
         address = create(:address, :with_udt_transactions, transactions_count: 30, udt: udt)
-        presented_address = AddressPresenter.new(address)
-        address_udt_transactions = presented_address.ckb_udt_transactions(udt.type_hash).order(block_timestamp: :desc).page(page).per(page_size)
+        address_udt_transactions = address.ckb_udt_transactions(udt.type_hash).order(block_timestamp: :desc).page(page).per(page_size)
 
         valid_get api_v1_address_udt_transaction_url(address.address_hash, type_hash: udt.type_hash), params: { page: page, page_size: page_size }
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: address_udt_transactions, page: page, page_size: page_size).call
-        response_transaction = CkbTransactionSerializer.new(address_udt_transactions, options.merge({ params: { previews: true } })).serialized_json
+        response_transaction = CkbTransactionSerializer.new(address_udt_transactions, options.merge(params: { previews: true })).serialized_json
 
         assert_equal response_transaction, response.body
       end
@@ -219,13 +215,12 @@ class AddressUdtTransactionsControllerTest < ActionDispatch::IntegrationTest
         udt = create(:udt, published: true)
         address = create(:address, :with_udt_transactions, udt: udt)
 
-        presented_address = AddressPresenter.new(address)
-        address_udt_transactions = presented_address.ckb_udt_transactions(udt.type_hash).order(block_timestamp: :desc).page(page).per(page_size)
+        address_udt_transactions = address.ckb_udt_transactions(udt.type_hash).order(block_timestamp: :desc).page(page).per(page_size)
 
         valid_get api_v1_address_udt_transaction_url(address.address_hash, type_hash: udt.type_hash), params: { page: page, page_size: page_size }
 
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: address_udt_transactions, page: page, page_size: page_size).call
-        response_transaction = CkbTransactionSerializer.new(address_udt_transactions, options.merge({ params: { previews: true } })).serialized_json
+        response_transaction = CkbTransactionSerializer.new(address_udt_transactions, options.merge(params: { previews: true })).serialized_json
 
         assert_equal [], json["data"]
         assert_equal response_transaction, response.body
diff --git a/test/controllers/api/v1/addresses_controller_test.rb b/test/controllers/api/v1/addresses_controller_test.rb
index 752d7c64c..a95892329 100644
--- a/test/controllers/api/v1/addresses_controller_test.rb
+++ b/test/controllers/api/v1/addresses_controller_test.rb
@@ -67,11 +67,10 @@ class AddressesControllerTest < ActionDispatch::IntegrationTest
       test "should return corresponding data with given address hash" do
         address = create(:address, :with_lock_script)
         address.query_address = address.address_hash
-        presented_address = AddressPresenter.new(address)
 
         valid_get api_v1_address_url(address.address_hash)
 
-        assert_equal AddressSerializer.new(presented_address).serialized_json, response.body
+        assert_equal AddressSerializer.new(address).serialized_json, response.body
       end
 
       test "should return corresponding data with given lock hash" do
@@ -119,20 +118,18 @@ class AddressesControllerTest < ActionDispatch::IntegrationTest
         address = create(:address, :with_lock_script, address_hash: "ckb1qyqt8xaupvm8837nv3gtc9x0ekkj64vud3jqfwyw5v")
         query_key = "ckb1qjda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xw3vumhs9nvu786dj9p0q5elx66t24n3kxgj53qks"
         address.query_address = query_key
-        presented_address = AddressPresenter.new(address)
         valid_get api_v1_address_url(query_key)
 
-        assert_equal AddressSerializer.new(presented_address).serialized_json, response.body
+        assert_equal AddressSerializer.new(address).serialized_json, response.body
       end
 
       test "should support short address query when full address's lock script exists" do
         address = create(:address, :with_lock_script, address_hash: "ckb1qjda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xw3vumhs9nvu786dj9p0q5elx66t24n3kxgj53qks")
         query_key = "ckb1qyqt8xaupvm8837nv3gtc9x0ekkj64vud3jqfwyw5v"
         address.query_address = query_key
-        presented_address = AddressPresenter.new(address)
         valid_get api_v1_address_url(query_key)
 
-        assert_equal AddressSerializer.new(presented_address).serialized_json, response.body
+        assert_equal AddressSerializer.new(address).serialized_json, response.body
       end
 
       test "should return published udt accounts with given address hash" do
diff --git a/test/controllers/api/v1/daily_statistics_controller_test.rb b/test/controllers/api/v1/daily_statistics_controller_test.rb
index 2d1e6c288..a5abfa1b2 100644
--- a/test/controllers/api/v1/daily_statistics_controller_test.rb
+++ b/test/controllers/api/v1/daily_statistics_controller_test.rb
@@ -44,7 +44,7 @@ class DailyStatisticsControllerTest < ActionDispatch::IntegrationTest
         valid_get api_v1_daily_statistic_url("transactions_count")
 
         assert_equal [%w(transactions_count created_at_unixtimestamp).sort], json.dig("data").map { |item| item.dig("attributes").keys.sort }.uniq
-        assert_equal DailyStatisticSerializer.new(daily_statistic_data, { params: { indicator: "transactions_count" } }).serialized_json, response.body
+        assert_equal DailyStatisticSerializer.new(daily_statistic_data, params: {indicator: "transactions_count"}).serialized_json, response.body
       end
 
       test "should return addresses count and timestamp" do
@@ -52,7 +52,7 @@ class DailyStatisticsControllerTest < ActionDispatch::IntegrationTest
         valid_get api_v1_daily_statistic_url("addresses_count")
 
         assert_equal [%w(addresses_count created_at_unixtimestamp).sort], json.dig("data").map { |item| item.dig("attributes").keys.sort }.uniq
-        assert_equal DailyStatisticSerializer.new(daily_statistic_data, { params: { indicator: "addresses_count" } }).serialized_json, response.body
+        assert_equal DailyStatisticSerializer.new(daily_statistic_data, params: {indicator: "addresses_count"}).serialized_json, response.body
       end
 
       test "should return total dao deposit and timestamp" do
@@ -60,7 +60,7 @@ class DailyStatisticsControllerTest < ActionDispatch::IntegrationTest
         valid_get api_v1_daily_statistic_url("total_dao_deposit")
 
         assert_equal [%w(total_dao_deposit created_at_unixtimestamp).sort], json.dig("data").map { |item| item.dig("attributes").keys.sort }.uniq
-        assert_equal DailyStatisticSerializer.new(daily_statistic_data, { params: { indicator: "total_dao_deposit" } }).serialized_json, response.body
+        assert_equal DailyStatisticSerializer.new(daily_statistic_data, params: {indicator: "total_dao_deposit"}).serialized_json, response.body
       end
 
       test "should respond with error object when indicator name is invalid" do
diff --git a/test/controllers/api/v1/suggest_queries_controller_test.rb b/test/controllers/api/v1/suggest_queries_controller_test.rb
index 9baef84eb..e252ddfad 100644
--- a/test/controllers/api/v1/suggest_queries_controller_test.rb
+++ b/test/controllers/api/v1/suggest_queries_controller_test.rb
@@ -111,8 +111,7 @@ class SuggestQueriesControllerTest < ActionDispatch::IntegrationTest
       test "should return address when query key is a exist address hash" do
         address = create(:address, :with_lock_script)
         address.query_address = address.address_hash
-        presented_address = AddressPresenter.new(address)
-        response_json = AddressSerializer.new(presented_address).serialized_json
+        response_json = AddressSerializer.new(address).serialized_json
 
         valid_get api_v1_suggest_queries_url, params: { q: address.address_hash }
 
@@ -152,20 +151,18 @@ class SuggestQueriesControllerTest < ActionDispatch::IntegrationTest
         address = create(:address, :with_lock_script, address_hash: "ckb1qyqt8xaupvm8837nv3gtc9x0ekkj64vud3jqfwyw5v")
         query_key = "ckb1qjda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xw3vumhs9nvu786dj9p0q5elx66t24n3kxgj53qks"
         address.query_address = query_key
-        presented_address = AddressPresenter.new(address)
         valid_get api_v1_suggest_queries_url, params: { q: query_key }
 
-        assert_equal AddressSerializer.new(presented_address).serialized_json, response.body
+        assert_equal AddressSerializer.new(address).serialized_json, response.body
       end
 
       test "should support short address query when full address's lock script exists" do
         address = create(:address, :with_lock_script, address_hash: "ckb1qjda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xw3vumhs9nvu786dj9p0q5elx66t24n3kxgj53qks")
         query_key = "ckb1qyqt8xaupvm8837nv3gtc9x0ekkj64vud3jqfwyw5v"
         address.query_address = query_key
-        presented_address = AddressPresenter.new(address)
         valid_get api_v1_address_url(query_key)
 
-        assert_equal AddressSerializer.new(presented_address).serialized_json, response.body
+        assert_equal AddressSerializer.new(address).serialized_json, response.body
       end
 
       test "should return a udt when query key is a exist udt type hash" do
diff --git a/test/controllers/api/v1/udt_transactions_controller_test.rb b/test/controllers/api/v1/udt_transactions_controller_test.rb
index 257503c04..b323f34da 100644
--- a/test/controllers/api/v1/udt_transactions_controller_test.rb
+++ b/test/controllers/api/v1/udt_transactions_controller_test.rb
@@ -72,7 +72,7 @@ class Api::V1::UdtTransactionsControllerTest < ActionDispatch::IntegrationTest
 
     options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: ckb_transactions, page: page, page_size: page_size).call
 
-    assert_equal CkbTransactionSerializer.new(ckb_transactions, options.merge({ params: { previews: true } })).serialized_json, response.body
+    assert_equal CkbTransactionSerializer.new(ckb_transactions, options.merge(params: {previews: true})).serialized_json, response.body
   end
 
   test "should contain right keys in the serialized object when call show" do
@@ -153,7 +153,7 @@ class Api::V1::UdtTransactionsControllerTest < ActionDispatch::IntegrationTest
     valid_get api_v1_udt_transaction_url(udt.type_hash), params: { page: page }
 
     options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: udt_ckb_transactions, page: page, page_size: page_size).call
-    response_transaction = CkbTransactionSerializer.new(udt_ckb_transactions, options.merge({ params: { previews: true } })).serialized_json
+    response_transaction = CkbTransactionSerializer.new(udt_ckb_transactions, options.merge(params: {previews: true})).serialized_json
 
     assert_equal response_transaction, response.body
     assert_equal page_size, json["data"].size
@@ -168,7 +168,7 @@ class Api::V1::UdtTransactionsControllerTest < ActionDispatch::IntegrationTest
     valid_get api_v1_udt_transaction_url(udt.type_hash), params: { page_size: page_size }
 
     options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: udt_ckb_transactions, page: page, page_size: page_size).call
-    response_transaction = CkbTransactionSerializer.new(udt_ckb_transactions, options.merge({ params: { previews: true } })).serialized_json
+    response_transaction = CkbTransactionSerializer.new(udt_ckb_transactions, options.merge(params: {previews: true})).serialized_json
 
     assert_equal response_transaction, response.body
     assert_equal page_size, json["data"].size
@@ -182,7 +182,7 @@ class Api::V1::UdtTransactionsControllerTest < ActionDispatch::IntegrationTest
 
     valid_get api_v1_udt_transaction_url(udt.type_hash), params: { page: page, page_size: page_size }
     options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: udt_ckb_transactions, page: page, page_size: page_size).call
-    response_transaction = CkbTransactionSerializer.new(udt_ckb_transactions, options.merge({ params: { previews: true } })).serialized_json
+    response_transaction = CkbTransactionSerializer.new(udt_ckb_transactions, options.merge(params: {previews: true})).serialized_json
 
     assert_equal response_transaction, response.body
   end
@@ -196,7 +196,7 @@ class Api::V1::UdtTransactionsControllerTest < ActionDispatch::IntegrationTest
     valid_get api_v1_udt_transaction_url(udt.type_hash), params: { page: page, page_size: page_size }
 
     options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: udt_ckb_transactions, page: page, page_size: page_size).call
-    response_transaction = CkbTransactionSerializer.new(udt_ckb_transactions, options.merge({ params: { previews: true } })).serialized_json
+    response_transaction = CkbTransactionSerializer.new(udt_ckb_transactions, options.merge(params: {previews: true})).serialized_json
 
     assert_equal [], json["data"]
     assert_equal response_transaction, response.body
diff --git a/test/models/suggest_query_test.rb b/test/models/suggest_query_test.rb
index a8c83725f..6203fa9a7 100644
--- a/test/models/suggest_query_test.rb
+++ b/test/models/suggest_query_test.rb
@@ -30,9 +30,8 @@ class SuggestQueryTest < ActiveSupport::TestCase
   test "should return Address by query key when query key is a exist address hash" do
     address = create(:address, :with_lock_script)
     address.query_address = address.address_hash
-    presented_address = AddressPresenter.new(address)
 
-    assert_equal AddressSerializer.new(presented_address).serialized_json, SuggestQuery.new(presented_address.address_hash).find!.serialized_json
+    assert_equal AddressSerializer.new(address).serialized_json, SuggestQuery.new(address.address_hash).find!.serialized_json
   end
 
   test "should raise BlockNotFoundError when query key is a block number that doesn't exist" do
diff --git a/test/presenters/address_presenter_tests.rb b/test/presenters/address_presenter_tests.rb
deleted file mode 100644
index cdc579888..000000000
--- a/test/presenters/address_presenter_tests.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require "test_helper"
-
-class AddressPresenterTest < ActiveSupport::TestCase
-  test "#transactions_count should return correct transactions count" do
-    script_type1 = CKB::Types::Script.new(code_hash: ENV["SECP_CELL_TYPE_HASH"], args: ["0xac33e9ca6965beb166204d0c6bf427dcab3b6f4b"], hash_type: "type")
-    script_type2 = CKB::Types::Script.new(code_hash: ENV["SECP_CELL_TYPE_HASH"], args: ["0xac33e9ca6965beb166204d0c6bf427dcab3b6f4b"], hash_type: "data")
-    script_data1 = CKB::Types::Script.new(code_hash: ENV["CODE_HASH"], args: ["0xac33e9ca6965beb166204d0c6bf427dcab3b6f4b"], hash_type: "data")
-    script_data2 = CKB::Types::Script.new(code_hash: ENV["CODE_HASH"], args: ["0xac33e9ca6965beb166204d0c6bf427dcab3b6f4b"], hash_type: "type")
-
-    address_hash1 = CkbUtils.generate_address(script_type1)
-    address_hash2 = CkbUtils.generate_address(script_type2)
-    address_hash3 = CkbUtils.generate_address(script_data1)
-    address_hash4 = CkbUtils.generate_address(script_data2)
-
-    addr1 = create(:address, address_hash: address_hash1, lock_hash: script_type1.compute_hash)
-    addr2 = create(:address, address_hash: address_hash2, lock_hash: script_type2.compute_hash)
-    addr3 = create(:address, address_hash: address_hash3, lock_hash: script_data1.compute_hash)
-    addr4 = create(:address, address_hash: address_hash4, lock_hash: script_data2.compute_hash)
-    block = create(:block, :with_block_hash)
-    transactions = create_list(:ckb_transaction, 8, block: block)
-    [addr1, addr2, addr3, addr4].each_with_index do |addr, index|
-      addr.ckb_transactions << transactions[index..index + 1]
-      addr.ckb_transactions << transactions[index * 2..index * 2 + 1]
-    end
-    [addr1, addr2, addr3, addr4].map { |addr| addr.update(ckb_transactions_count: addr.ckb_transactions.distinct.count) }
-    address = Address.find_address!(address_hash1)
-    presented_address = AddressPresenter.new(address)
-
-    assert_equal presented_address.ckb_transactions.count, presented_address.transactions_count
-  end
-end

From 98340ae44ba4f364aa27bfb3950276bf74151dab Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Thu, 4 Jun 2020 22:37:26 +0800
Subject: [PATCH 18/23] chore: override ckb_transactions on address

---
 app/controllers/api/v1/address_transactions_controller.rb | 2 +-
 app/models/address.rb                                     | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/api/v1/address_transactions_controller.rb b/app/controllers/api/v1/address_transactions_controller.rb
index f4a8a5c61..e72e0413a 100644
--- a/app/controllers/api/v1/address_transactions_controller.rb
+++ b/app/controllers/api/v1/address_transactions_controller.rb
@@ -8,7 +8,7 @@ def show
         @address = Address.find_address!(params[:id])
         raise Api::V1::Exceptions::AddressNotFoundError if @address.is_a?(NullAddress)
 
-        @ckb_transactions = @address.ckb_transactions.recent.distinct.page(@page).per(@page_size)
+        @ckb_transactions = @address.ckb_transactions.recent.page(@page).per(@page_size)
         @options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: @ckb_transactions, page: @page, page_size: @page_size).call
 
         render json: json_result
diff --git a/app/models/address.rb b/app/models/address.rb
index 57fec9f86..88a45cb37 100644
--- a/app/models/address.rb
+++ b/app/models/address.rb
@@ -4,7 +4,6 @@ class Address < ApplicationRecord
 
   has_many :cell_outputs, dependent: :destroy
   has_many :account_books, dependent: :destroy
-  has_many :ckb_transactions, through: :account_books
   has_many :mining_infos
   has_many :udt_accounts
   validates :balance, :cell_consumed, :ckb_transactions_count, :interest, :dao_deposit, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true
@@ -17,6 +16,11 @@ class Address < ApplicationRecord
 
   attr_accessor :query_address
 
+  def ckb_transactions
+    ckb_transaction_ids = account_books.select(:ckb_transaction_id).distinct
+    CkbTransaction.where(id: ckb_transaction_ids)
+  end
+
   def ckb_dao_transactions
     ckb_transaction_ids = cell_outputs.where(cell_type: %w(nervos_dao_deposit nervos_dao_withdrawing)).select("ckb_transaction_id")
     CkbTransaction.where(id: ckb_transaction_ids)

From 4b23248e643749c1b42237425c78a40378972d8f Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Thu, 4 Jun 2020 23:07:09 +0800
Subject: [PATCH 19/23] chore: adjust tests

---
 app/controllers/api/v1/address_transactions_controller.rb   | 2 +-
 app/models/address.rb                                       | 3 ++-
 test/controllers/api/v1/daily_statistics_controller_test.rb | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/controllers/api/v1/address_transactions_controller.rb b/app/controllers/api/v1/address_transactions_controller.rb
index e72e0413a..ac8113d3c 100644
--- a/app/controllers/api/v1/address_transactions_controller.rb
+++ b/app/controllers/api/v1/address_transactions_controller.rb
@@ -8,7 +8,7 @@ def show
         @address = Address.find_address!(params[:id])
         raise Api::V1::Exceptions::AddressNotFoundError if @address.is_a?(NullAddress)
 
-        @ckb_transactions = @address.ckb_transactions.recent.page(@page).per(@page_size)
+        @ckb_transactions = @address.custom_ckb_transactions.recent.page(@page).per(@page_size)
         @options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: @ckb_transactions, page: @page, page_size: @page_size).call
 
         render json: json_result
diff --git a/app/models/address.rb b/app/models/address.rb
index 88a45cb37..cb48627ba 100644
--- a/app/models/address.rb
+++ b/app/models/address.rb
@@ -4,6 +4,7 @@ class Address < ApplicationRecord
 
   has_many :cell_outputs, dependent: :destroy
   has_many :account_books, dependent: :destroy
+  has_many :ckb_transactions, through: :account_books
   has_many :mining_infos
   has_many :udt_accounts
   validates :balance, :cell_consumed, :ckb_transactions_count, :interest, :dao_deposit, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true
@@ -16,7 +17,7 @@ class Address < ApplicationRecord
 
   attr_accessor :query_address
 
-  def ckb_transactions
+  def custom_ckb_transactions
     ckb_transaction_ids = account_books.select(:ckb_transaction_id).distinct
     CkbTransaction.where(id: ckb_transaction_ids)
   end
diff --git a/test/controllers/api/v1/daily_statistics_controller_test.rb b/test/controllers/api/v1/daily_statistics_controller_test.rb
index a5abfa1b2..a3e01fd85 100644
--- a/test/controllers/api/v1/daily_statistics_controller_test.rb
+++ b/test/controllers/api/v1/daily_statistics_controller_test.rb
@@ -44,7 +44,7 @@ class DailyStatisticsControllerTest < ActionDispatch::IntegrationTest
         valid_get api_v1_daily_statistic_url("transactions_count")
 
         assert_equal [%w(transactions_count created_at_unixtimestamp).sort], json.dig("data").map { |item| item.dig("attributes").keys.sort }.uniq
-        assert_equal DailyStatisticSerializer.new(daily_statistic_data, params: {indicator: "transactions_count"}).serialized_json, response.body
+        assert_equal DailyStatisticSerializer.new(daily_statistic_data, params: { indicator: "transactions_count" }).serialized_json, response.body
       end
 
       test "should return addresses count and timestamp" do
@@ -52,7 +52,7 @@ class DailyStatisticsControllerTest < ActionDispatch::IntegrationTest
         valid_get api_v1_daily_statistic_url("addresses_count")
 
         assert_equal [%w(addresses_count created_at_unixtimestamp).sort], json.dig("data").map { |item| item.dig("attributes").keys.sort }.uniq
-        assert_equal DailyStatisticSerializer.new(daily_statistic_data, params: {indicator: "addresses_count"}).serialized_json, response.body
+        assert_equal DailyStatisticSerializer.new(daily_statistic_data, params: { indicator: "addresses_count" }).serialized_json, response.body
       end
 
       test "should return total dao deposit and timestamp" do
@@ -60,7 +60,7 @@ class DailyStatisticsControllerTest < ActionDispatch::IntegrationTest
         valid_get api_v1_daily_statistic_url("total_dao_deposit")
 
         assert_equal [%w(total_dao_deposit created_at_unixtimestamp).sort], json.dig("data").map { |item| item.dig("attributes").keys.sort }.uniq
-        assert_equal DailyStatisticSerializer.new(daily_statistic_data, params: {indicator: "total_dao_deposit"}).serialized_json, response.body
+        assert_equal DailyStatisticSerializer.new(daily_statistic_data, params: { indicator: "total_dao_deposit" }).serialized_json, response.body
       end
 
       test "should respond with error object when indicator name is invalid" do

From c5e05d7fa39e4c5e8aff582187a0d29ae8d896f0 Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Thu, 4 Jun 2020 23:47:14 +0800
Subject: [PATCH 20/23] chore: adapt testnet

---
 app/models/distribution_data.rb |  2 +-
 app/models/market_data.rb       | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/models/distribution_data.rb b/app/models/distribution_data.rb
index 5f32c3868..9dd542653 100644
--- a/app/models/distribution_data.rb
+++ b/app/models/distribution_data.rb
@@ -83,7 +83,7 @@ def miner_address_distribution(checkpoint = 7)
 
     Rails.cache.realize("miner_address_distribution_#{checkpoint}", expires_in: 1.day) do
       result = Block.where("timestamp >= ?", CkbUtils.time_in_milliseconds(checkpoint.days.ago.to_i)).group(:miner_hash).order("count(miner_hash) desc").count.to_a
-      cut_off_point = (result.count * 0.7).ceil
+      cut_off_point = (result.count * 0.7).floor
       if result.present?
         (result[0..cut_off_point].map{ |item| [item[0], item[1].to_s] } + [["other", result[(cut_off_point + 1)..-1].map { |item| item[1] }.reduce(:+).to_s]]).to_h
       else
diff --git a/app/models/market_data.rb b/app/models/market_data.rb
index 19a81d170..03ea03d86 100644
--- a/app/models/market_data.rb
+++ b/app/models/market_data.rb
@@ -102,7 +102,7 @@ def first_released_timestamp_may
     @first_released_timestamp_may ||=
       begin
         lock_address = Address.find_by(address_hash: "ckb1q3w9q60tppt7l3j7r09qcp7lxnp3vcanvgha8pmvsa3jplykxn323t90gna20lusyshreg32qee4fhkt9jj2t6qrqzzqxzq8yqt8kmd9")
-        lock_address.present? ? lock_address.lock_script.lock_info[:estimated_unlock_time].to_i : Time.find_zone("UTC").parse("2020-05-01").to_i
+        lock_address.present? ? lock_address.lock_script.lock_info[:estimated_unlock_time].to_i : CkbUtils.time_in_milliseconds(Time.find_zone("UTC").parse("2020-05-01"))
       end
   end
 
@@ -111,7 +111,7 @@ def second_released_timestamp_may
     @second_released_timestamp_may ||=
       begin
         lock_address = Address.find_by(address_hash: "ckb1q3w9q60tppt7l3j7r09qcp7lxnp3vcanvgha8pmvsa3jplykxn323crn7nscet5sfwxjkzhexymfa4zntzt8vasvqzzqxzq8yq92pgkg")
-        lock_address.present? ? lock_address.lock_script.lock_info[:estimated_unlock_time].to_i : Time.find_zone("UTC").parse("2021-05-01").to_i
+        lock_address.present? ? lock_address.lock_script.lock_info[:estimated_unlock_time].to_i : CkbUtils.time_in_milliseconds(Time.find_zone("UTC").parse("2021-05-01"))
       end
   end
 
@@ -120,7 +120,7 @@ def third_released_timestamp_may
     @third_released_timestamp_may ||=
       begin
         lock_address = Address.find_by(address_hash: "ckb1q3w9q60tppt7l3j7r09qcp7lxnp3vcanvgha8pmvsa3jplykxn32sl0qgva2l78fcnjt6x8kr8sln4lqs4twcpq4qzzqxzq8yq7hpadu")
-        lock_address.present? ? lock_address.lock_script.lock_info[:estimated_unlock_time].to_i : Time.find_zone("UTC").parse("2022-05-01").to_i
+        lock_address.present? ? lock_address.lock_script.lock_info[:estimated_unlock_time].to_i : CkbUtils.time_in_milliseconds(Time.find_zone("UTC").parse("2022-05-01"))
       end
   end
 
@@ -129,7 +129,7 @@ def first_released_timestamp_other
     @first_released_timestamp_other ||=
       begin
         lock_address = Address.find_by(address_hash: "ckb1q3w9q60tppt7l3j7r09qcp7lxnp3vcanvgha8pmvsa3jplykxn32s3y29vjv73cfm8qax220dwwmpdccl4upy4s9qzzqxzq8yqyd09am")
-        lock_address.present? ? lock_address.lock_script.lock_info[:estimated_unlock_time].to_i : Time.find_zone("UTC").parse("2020-07-01").to_i
+        lock_address.present? ? lock_address.lock_script.lock_info[:estimated_unlock_time].to_i : CkbUtils.time_in_milliseconds(Time.find_zone("UTC").parse("2020-07-01"))
       end
   end
 
@@ -138,7 +138,7 @@ def second_released_timestamp_other
     @second_released_timestamp_other ||=
       begin
         lock_address = Address.find_by(address_hash: "ckb1q3w9q60tppt7l3j7r09qcp7lxnp3vcanvgha8pmvsa3jplykxn32sn23uga5m8u5v87q98vr29qa8tl0ruu84gqfqzzqxzq8yqc2dxk6")
-        lock_address.present? ? lock_address.lock_script.lock_info[:estimated_unlock_time].to_i : Time.find_zone("UTC").parse("2020-12-31").to_i
+        lock_address.present? ? lock_address.lock_script.lock_info[:estimated_unlock_time].to_i : CkbUtils.time_in_milliseconds(Time.find_zone("UTC").parse("2020-12-31"))
       end
   end
 
@@ -147,7 +147,7 @@ def third_released_timestamp_other
     @third_released_timestamp_other ||=
       begin
         lock_address = Address.find_by(address_hash: "ckb1q3w9q60tppt7l3j7r09qcp7lxnp3vcanvgha8pmvsa3jplykxn32sdufwedw7a0w9dkvhpsah4mdk2gkfq63e0q6qzzqxzq8yqnqq85p")
-        lock_address.present? ? lock_address.lock_script.lock_info[:estimated_unlock_time].to_i : Time.find_zone("UTC").parse("2022-12-31").to_i
+        lock_address.present? ? lock_address.lock_script.lock_info[:estimated_unlock_time].to_i : CkbUtils.time_in_milliseconds(Time.find_zone("UTC").parse("2022-12-31"))
       end
   end
 

From e07e409e2db50b9bf50002431c22bf0177c8c4d0 Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Fri, 5 Jun 2020 20:23:05 +0800
Subject: [PATCH 21/23] perf: address dao and udt transactions api

---
 .../v1/address_dao_transactions_controller.rb |  2 +-
 .../v1/address_udt_transactions_controller.rb |  2 +-
 .../api/v1/udt_transactions_controller.rb     |  2 +-
 app/models/address.rb                         | 34 +++++++++++++++++--
 app/models/udt.rb                             | 29 ++++++++++++++--
 5 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/app/controllers/api/v1/address_dao_transactions_controller.rb b/app/controllers/api/v1/address_dao_transactions_controller.rb
index 88e88907c..634dab64a 100644
--- a/app/controllers/api/v1/address_dao_transactions_controller.rb
+++ b/app/controllers/api/v1/address_dao_transactions_controller.rb
@@ -8,7 +8,7 @@ def show
         address = Address.find_address!(params[:id])
         raise Api::V1::Exceptions::AddressNotFoundError if address.is_a?(NullAddress)
 
-        ckb_dao_transactions = address.ckb_dao_transactions.recent.distinct.page(@page).per(@page_size)
+        ckb_dao_transactions = address.ckb_dao_transactions.recent.page(@page).per(@page_size)
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: ckb_dao_transactions, page: @page, page_size: @page_size).call
 
         render json: CkbTransactionSerializer.new(ckb_dao_transactions, options.merge({ params: { previews: true } }))
diff --git a/app/controllers/api/v1/address_udt_transactions_controller.rb b/app/controllers/api/v1/address_udt_transactions_controller.rb
index f8a760b0f..28830feef 100644
--- a/app/controllers/api/v1/address_udt_transactions_controller.rb
+++ b/app/controllers/api/v1/address_udt_transactions_controller.rb
@@ -12,7 +12,7 @@ def show
         udt = Udt.find_by(type_hash: params[:type_hash], published: true)
         raise Api::V1::Exceptions::UdtNotFoundError if udt.blank?
 
-        ckb_dao_transactions = address.ckb_udt_transactions(params[:type_hash]).recent.distinct.page(@page).per(@page_size)
+        ckb_dao_transactions = address.ckb_udt_transactions(params[:type_hash]).recent.page(@page).per(@page_size)
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: ckb_dao_transactions, page: @page, page_size: @page_size).call
 
         render json: CkbTransactionSerializer.new(ckb_dao_transactions, options.merge({ params: { previews: true } }))
diff --git a/app/controllers/api/v1/udt_transactions_controller.rb b/app/controllers/api/v1/udt_transactions_controller.rb
index a31928b2a..f3f6fab1d 100644
--- a/app/controllers/api/v1/udt_transactions_controller.rb
+++ b/app/controllers/api/v1/udt_transactions_controller.rb
@@ -4,7 +4,7 @@ class Api::V1::UdtTransactionsController < ApplicationController
 
   def show
     udt = Udt.find_by!(type_hash: params[:id], published: true)
-    ckb_transactions = udt.ckb_transactions.recent.distinct.page(@page).per(@page_size)
+    ckb_transactions = udt.ckb_transactions.recent.page(@page).per(@page_size)
     options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: ckb_transactions, page: @page, page_size: @page_size).call
 
     render json: CkbTransactionSerializer.new(ckb_transactions, options.merge({ params: { previews: true } }))
diff --git a/app/models/address.rb b/app/models/address.rb
index cb48627ba..f9b18be65 100644
--- a/app/models/address.rb
+++ b/app/models/address.rb
@@ -23,13 +23,41 @@ def custom_ckb_transactions
   end
 
   def ckb_dao_transactions
-    ckb_transaction_ids = cell_outputs.where(cell_type: %w(nervos_dao_deposit nervos_dao_withdrawing)).select("ckb_transaction_id")
+    ckb_transaction_ids = cell_outputs.where(cell_type: %w(nervos_dao_deposit nervos_dao_withdrawing)).select("ckb_transaction_id").distinct
     CkbTransaction.where(id: ckb_transaction_ids)
   end
 
   def ckb_udt_transactions(type_hash)
-    ckb_transaction_ids = cell_outputs.udt.where(type_hash: type_hash).pluck("generated_by_id") + cell_outputs.udt.where(type_hash: type_hash).pluck("consumed_by_id").compact
-    CkbTransaction.where(id: ckb_transaction_ids.uniq)
+    sql =
+      <<-SQL
+        SELECT
+          generated_by_id ckb_transaction_id
+        FROM
+          cell_outputs
+        WHERE
+          address_id = #{id}
+          AND
+          cell_type = #{CellOutput::cell_types['udt']}
+          AND
+          type_hash = '#{type_hash}'
+
+        UNION
+
+        SELECT
+          consumed_by_id ckb_transaction_id
+        FROM
+          cell_outputs
+        WHERE
+          address_id = #{id}
+          AND
+          cell_type = #{CellOutput::cell_types['udt']}
+          AND
+          type_hash = '#{type_hash}'
+          AND
+          consumed_by_id is not null
+      SQL
+    ckb_transaction_ids = CellOutput.select("ckb_transaction_id").from("(#{sql}) as cell_outputs")
+    CkbTransaction.where(id: ckb_transaction_ids.distinct)
   end
 
   def lock_info
diff --git a/app/models/udt.rb b/app/models/udt.rb
index 46dc2f85b..23a25b7b5 100644
--- a/app/models/udt.rb
+++ b/app/models/udt.rb
@@ -10,8 +10,33 @@ class Udt < ApplicationRecord
   attribute :code_hash, :ckb_hash
 
   def ckb_transactions
-    ckb_transaction_ids = CellOutput.udt.where(type_hash: type_hash).pluck("generated_by_id") + CellOutput.udt.where(type_hash: type_hash).pluck("consumed_by_id").compact
-    CkbTransaction.where(id: ckb_transaction_ids.uniq)
+    type_hash = "0xe3be4fb98ec914886c6525abac97e1f8769c59492636a1d35955e9163ef46efa"
+    sql =
+      <<-SQL
+        SELECT
+          generated_by_id ckb_transaction_id
+        FROM
+          cell_outputs
+        WHERE
+          cell_type = #{CellOutput::cell_types['udt']}
+          AND
+          type_hash = '#{type_hash}'
+
+        UNION
+
+        SELECT
+          consumed_by_id ckb_transaction_id
+        FROM
+          cell_outputs
+        WHERE
+          cell_type = #{CellOutput::cell_types['udt']}
+          AND
+          type_hash = '#{type_hash}'
+          AND
+          consumed_by_id is not null
+      SQL
+    ckb_transaction_ids = CellOutput.select("ckb_transaction_id").from("(#{sql}) as cell_outputs")
+    CkbTransaction.where(id: ckb_transaction_ids.distinct)
   end
 end
 

From eb5ad57c5fdfe12a54b4cfe5fe7eb45a83a0f740 Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Fri, 5 Jun 2020 21:16:35 +0800
Subject: [PATCH 22/23] chore: adjust tests

---
 app/models/udt.rb                                      |  1 -
 .../api/v1/udt_transactions_controller_test.rb         | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/models/udt.rb b/app/models/udt.rb
index 23a25b7b5..6cd9bb290 100644
--- a/app/models/udt.rb
+++ b/app/models/udt.rb
@@ -10,7 +10,6 @@ class Udt < ApplicationRecord
   attribute :code_hash, :ckb_hash
 
   def ckb_transactions
-    type_hash = "0xe3be4fb98ec914886c6525abac97e1f8769c59492636a1d35955e9163ef46efa"
     sql =
       <<-SQL
         SELECT
diff --git a/test/controllers/api/v1/udt_transactions_controller_test.rb b/test/controllers/api/v1/udt_transactions_controller_test.rb
index b323f34da..ece88f3d0 100644
--- a/test/controllers/api/v1/udt_transactions_controller_test.rb
+++ b/test/controllers/api/v1/udt_transactions_controller_test.rb
@@ -72,7 +72,7 @@ class Api::V1::UdtTransactionsControllerTest < ActionDispatch::IntegrationTest
 
     options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: ckb_transactions, page: page, page_size: page_size).call
 
-    assert_equal CkbTransactionSerializer.new(ckb_transactions, options.merge(params: {previews: true})).serialized_json, response.body
+    assert_equal CkbTransactionSerializer.new(ckb_transactions, options.merge(params: { previews: true })).serialized_json, response.body
   end
 
   test "should contain right keys in the serialized object when call show" do
@@ -153,7 +153,7 @@ class Api::V1::UdtTransactionsControllerTest < ActionDispatch::IntegrationTest
     valid_get api_v1_udt_transaction_url(udt.type_hash), params: { page: page }
 
     options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: udt_ckb_transactions, page: page, page_size: page_size).call
-    response_transaction = CkbTransactionSerializer.new(udt_ckb_transactions, options.merge(params: {previews: true})).serialized_json
+    response_transaction = CkbTransactionSerializer.new(udt_ckb_transactions, options.merge(params: { previews: true })).serialized_json
 
     assert_equal response_transaction, response.body
     assert_equal page_size, json["data"].size
@@ -168,7 +168,7 @@ class Api::V1::UdtTransactionsControllerTest < ActionDispatch::IntegrationTest
     valid_get api_v1_udt_transaction_url(udt.type_hash), params: { page_size: page_size }
 
     options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: udt_ckb_transactions, page: page, page_size: page_size).call
-    response_transaction = CkbTransactionSerializer.new(udt_ckb_transactions, options.merge(params: {previews: true})).serialized_json
+    response_transaction = CkbTransactionSerializer.new(udt_ckb_transactions, options.merge(params: { previews: true })).serialized_json
 
     assert_equal response_transaction, response.body
     assert_equal page_size, json["data"].size
@@ -182,7 +182,7 @@ class Api::V1::UdtTransactionsControllerTest < ActionDispatch::IntegrationTest
 
     valid_get api_v1_udt_transaction_url(udt.type_hash), params: { page: page, page_size: page_size }
     options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: udt_ckb_transactions, page: page, page_size: page_size).call
-    response_transaction = CkbTransactionSerializer.new(udt_ckb_transactions, options.merge(params: {previews: true})).serialized_json
+    response_transaction = CkbTransactionSerializer.new(udt_ckb_transactions, options.merge(params: { previews: true })).serialized_json
 
     assert_equal response_transaction, response.body
   end
@@ -196,7 +196,7 @@ class Api::V1::UdtTransactionsControllerTest < ActionDispatch::IntegrationTest
     valid_get api_v1_udt_transaction_url(udt.type_hash), params: { page: page, page_size: page_size }
 
     options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: udt_ckb_transactions, page: page, page_size: page_size).call
-    response_transaction = CkbTransactionSerializer.new(udt_ckb_transactions, options.merge(params: {previews: true})).serialized_json
+    response_transaction = CkbTransactionSerializer.new(udt_ckb_transactions, options.merge(params: { previews: true })).serialized_json
 
     assert_equal [], json["data"]
     assert_equal response_transaction, response.body

From b1eb350a9459546b461f2a6a677715820ae993d9 Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Fri, 5 Jun 2020 21:40:54 +0800
Subject: [PATCH 23/23] chore: Bump version to v0.9.7

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e1326654..62763f902 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+# [v0.9.7](https://github.com/shaojunda/ckb-explorer/compare/v0.9.6...v0.9.7) (2020-06-05)
+
+
+### Features
+
+* #[635](https://github.com/nervosnetwork/ckb-explorer/pull/635): add udts api
+
+
+### Performance Improvements
+
+* #[625](https://github.com/nervosnetwork/ckb-explorer/pull/625): address dao and udt transactions api
+
+
 # [v0.9.6](https://github.com/shaojunda/ckb-explorer/compare/v0.9.5...v0.9.6) (2020-06-01)