diff --git a/app/controllers/api/v1/contract_transactions_controller.rb b/app/controllers/api/v1/contract_transactions_controller.rb index 49a8eeab5..b2a9a38ac 100644 --- a/app/controllers/api/v1/contract_transactions_controller.rb +++ b/app/controllers/api/v1/contract_transactions_controller.rb @@ -4,7 +4,7 @@ class ContractTransactionsController < ApplicationController before_action :validate_pagination_params, :pagination_params def show - raise Api::V1::Exceptions::ContractNotFoundError if params[:id] != "dao" + raise Api::V1::Exceptions::ContractNotFoundError if params[:id] != DaoContract::CONTRACT_NAME dao_contract = DaoContract.default_contract ckb_transactions = dao_contract.ckb_transactions.distinct.recent.page(@page).per(@page_size) options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: ckb_transactions, page: @page, page_size: @page_size).call diff --git a/app/controllers/api/v1/contracts_controller.rb b/app/controllers/api/v1/contracts_controller.rb index 76dae0573..61d3a706a 100644 --- a/app/controllers/api/v1/contracts_controller.rb +++ b/app/controllers/api/v1/contracts_controller.rb @@ -2,7 +2,7 @@ module Api module V1 class ContractsController < ApplicationController def show - raise Api::V1::Exceptions::ContractNotFoundError if params[:id] != "dao" + raise Api::V1::Exceptions::ContractNotFoundError if params[:id] != DaoContract::CONTRACT_NAME render json: DaoContractSerializer.new(DaoContract.default_contract) end diff --git a/app/models/address.rb b/app/models/address.rb index f5ad553de..e20a21978 100644 --- a/app/models/address.rb +++ b/app/models/address.rb @@ -5,7 +5,7 @@ class Address < ApplicationRecord has_many :cell_outputs has_many :account_books has_many :ckb_transactions, through: :account_books - validates :balance, :cell_consumed, :ckb_transactions_count, :subsidy, :dao_deposit, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true + validates :balance, :cell_consumed, :ckb_transactions_count, :interest, :dao_deposit, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true after_commit :flush_cache @@ -24,7 +24,7 @@ def self.find_address!(query_key) end def self.cached_find(query_key) - Rails.cache.fetch([name, query_key], race_condition_ttl: 3.seconds) do + Rails.cache.realize([name, query_key], race_condition_ttl: 3.seconds) do if QueryKeyUtils.valid_hex?(query_key) find_by(lock_hash: query_key) else @@ -34,7 +34,7 @@ def self.cached_find(query_key) end def cached_lock_script - Rails.cache.fetch([self.class.name, "lock_script", lock_hash], race_condition_ttl: 3.seconds) do + Rails.cache.realize([self.class.name, "lock_script", lock_hash], race_condition_ttl: 3.seconds) do lock_script.to_node_lock end end @@ -59,7 +59,7 @@ def flush_cache # lock_hash :binary # pending_reward_blocks_count :integer default(0) # dao_deposit :decimal(30, ) default(0) -# subsidy :decimal(30, ) default(0) +# interest :decimal(30, ) default(0) # # Indexes # diff --git a/app/models/block.rb b/app/models/block.rb index 977c9fa10..81a7de651 100644 --- a/app/models/block.rb +++ b/app/models/block.rb @@ -59,7 +59,7 @@ def self.find_block!(query_key) end def self.cached_find(query_key) - Rails.cache.fetch([name, query_key], race_condition_ttl: 3.seconds) do + Rails.cache.realize([name, query_key], race_condition_ttl: 3.seconds) do if QueryKeyUtils.valid_hex?(query_key) block = where(block_hash: query_key).first else diff --git a/app/models/cell_input.rb b/app/models/cell_input.rb index a48afce72..dcd9286ec 100644 --- a/app/models/cell_input.rb +++ b/app/models/cell_input.rb @@ -5,13 +5,13 @@ class CellInput < ApplicationRecord after_commit :flush_cache def find_lock_script! - Rails.cache.fetch(["CellInput", id, "lock_script"], race_condition_ttl: 3.seconds) do + Rails.cache.realize(["CellInput", id, "lock_script"], race_condition_ttl: 3.seconds) do previous_cell_output!.lock_script end end def find_type_script! - Rails.cache.fetch(["CellInput", id, "type_script"], race_condition_ttl: 3.seconds) do + Rails.cache.realize(["CellInput", id, "type_script"], race_condition_ttl: 3.seconds) do previous_cell_output!.type_script end end @@ -30,7 +30,7 @@ def previous_cell_output end def self.cached_find(id) - Rails.cache.fetch([name, id], race_condition_ttl: 3.seconds) { find(id) } + Rails.cache.realize([name, id], race_condition_ttl: 3.seconds) { find(id) } end def flush_cache @@ -46,7 +46,7 @@ def previous_cell_output! tx_hash = previous_output["tx_hash"] cell_index = previous_output["index"].to_i - Rails.cache.fetch("previous_cell_output/#{tx_hash}/#{cell_index}", race_condition_ttl: 3.seconds) do + Rails.cache.realize("previous_cell_output/#{tx_hash}/#{cell_index}", race_condition_ttl: 3.seconds) do CellOutput.find_by!(tx_hash: tx_hash, cell_index: cell_index) end end diff --git a/app/models/cell_output.rb b/app/models/cell_output.rb index 4ad5e3be2..c0d78af6d 100644 --- a/app/models/cell_output.rb +++ b/app/models/cell_output.rb @@ -2,7 +2,7 @@ class CellOutput < ApplicationRecord SYSTEM_TX_HASH = "0x0000000000000000000000000000000000000000000000000000000000000000".freeze enum status: { live: 0, dead: 1 } - enum cell_type: { normal: 0, dao: 1 } + enum cell_type: { normal: 0, nervos_dao_deposit: 1, nervos_dao_withdrawing: 2 } belongs_to :ckb_transaction belongs_to :generated_by, class_name: "CkbTransaction" diff --git a/app/models/ckb_sync/node_data_processor.rb b/app/models/ckb_sync/node_data_processor.rb index 5dc2da1df..cc13d1f3c 100644 --- a/app/models/ckb_sync/node_data_processor.rb +++ b/app/models/ckb_sync/node_data_processor.rb @@ -59,7 +59,7 @@ def update_dao_contract_related_info(local_block) process_deposit_to_dao(dao_contract, dao_events) process_new_dao_depositor(dao_contract, dao_events) process_withdraw_from_dao(dao_contract, dao_events) - process_issue_subsidy(dao_contract, dao_events) + process_issue_interest(dao_contract, dao_events) process_take_away_all_deposit(dao_contract, dao_events) end @@ -71,12 +71,12 @@ def process_take_away_all_deposit(dao_contract, dao_events) end end - def process_issue_subsidy(dao_contract, dao_events) - issue_subsidy_dao_events = dao_events.where(event_type: "issue_subsidy") - issue_subsidy_dao_events.each do |event| - dao_contract.increment!(:subsidy_granted, event.value) + def process_issue_interest(dao_contract, dao_events) + issue_interest_dao_events = dao_events.where(event_type: "issue_interest") + issue_interest_dao_events.each do |event| + dao_contract.increment!(:interest_granted, event.value) address = event.address - address.increment!(:subsidy, event.value) + address.increment!(:interest, event.value) event.processed! end end @@ -170,7 +170,7 @@ def revert_dao_contract_related_operations(dao_contract, dao_events) revert_deposit_to_dao(dao_contract, dao_events) revert_new_dao_depositor(dao_contract, dao_events) revert_withdraw_from_dao(dao_contract, dao_events) - revert_issue_subsidy(dao_contract, dao_events) + revert_issue_interest(dao_contract, dao_events) revert_take_away_all_deposit(dao_contract, dao_events) end @@ -182,12 +182,12 @@ def revert_take_away_all_deposit(dao_contract, dao_events) end end - def revert_issue_subsidy(dao_contract, dao_events) - issue_subsidy_dao_events = dao_events.where(event_type: "issue_subsidy") - issue_subsidy_dao_events.each do |event| - dao_contract.decrement!(:subsidy_granted, event.value) + def revert_issue_interest(dao_contract, dao_events) + issue_interest_dao_events = dao_events.where(event_type: "issue_interest") + issue_interest_dao_events.each do |event| + dao_contract.decrement!(:interest_granted, event.value) address = event.address - address.decrement!(:subsidy, event.value) + address.decrement!(:interest, event.value) event.reverted! end end @@ -374,7 +374,7 @@ def build_cell_outputs(node_outputs, ckb_transaction, addresses, outputs_data, o end def build_deposit_dao_events(address, cell_output, ckb_transaction, new_dao_depositor_events) - if cell_output.dao? + if cell_output.nervos_dao_deposit? dao_contract = DaoContract.find_or_create_by(id: 1) ckb_transaction.dao_events.build(block: ckb_transaction.block, address_id: address.id, event_type: "deposit_to_dao", value: cell_output.capacity, contract_id: dao_contract.id) if address.dao_deposit.zero? && !new_dao_depositor_events.key?(address.id) @@ -384,14 +384,12 @@ def build_deposit_dao_events(address, cell_output, ckb_transaction, new_dao_depo end def build_withdraw_dao_events(address_id, ckb_transaction_id, local_block, previous_cell_output) - if previous_cell_output.dao? + if previous_cell_output.nervos_dao_withdrawing? withdraw_amount = previous_cell_output.capacity ckb_transaction = CkbTransaction.find(ckb_transaction_id) ckb_transaction.dao_events.create!(block: local_block, address_id: address_id, event_type: "withdraw_from_dao", value: withdraw_amount, contract_id: DaoContract.default_contract.id) - header_deps = ckb_transaction.header_deps - witnesses = ckb_transaction.witnesses - subsidy = CkbUtils.dao_subsidy(previous_cell_output, header_deps, witnesses) - ckb_transaction.dao_events.create!(block: local_block, address_id: address_id, event_type: "issue_subsidy", value: subsidy, contract_id: DaoContract.default_contract.id) + interest = CkbUtils.dao_interest(previous_cell_output) + ckb_transaction.dao_events.create!(block: local_block, address_id: address_id, event_type: "issue_interest", value: interest, contract_id: DaoContract.default_contract.id) address = Address.find(address_id) if (address.dao_deposit - withdraw_amount).zero? ckb_transaction.dao_events.create!(block: local_block, address_id: address_id, event_type: "take_away_all_deposit", value: 1, contract_id: DaoContract.default_contract.id) @@ -399,10 +397,14 @@ def build_withdraw_dao_events(address_id, ckb_transaction_id, local_block, previ end end - def cell_type(type_script) - return "normal" if type_script.blank? + def cell_type(type_script, output_data) + return "normal" unless [ENV["DAO_CODE_HASH"], ENV["DAO_TYPE_HASH"]].include?(type_script&.code_hash) - [ENV["DAO_CODE_HASH"], ENV["DAO_TYPE_HASH"]].include?(type_script.code_hash) ? "dao" : "normal" + if output_data == CKB::Utils.bin_to_hex("\x00" * 8) + "nervos_dao_deposit" + else + "nervos_dao_withdrawing" + end end def build_cell_output(ckb_transaction, output, address, cell_index, output_data) @@ -414,7 +416,7 @@ def build_cell_output(ckb_transaction, output, address, cell_index, output_data) tx_hash: ckb_transaction.tx_hash, cell_index: cell_index, generated_by: ckb_transaction, - cell_type: cell_type(output.type) + cell_type: cell_type(output.type, output_data) ) end diff --git a/app/models/ckb_transaction.rb b/app/models/ckb_transaction.rb index 4856d0bc7..8159278f6 100644 --- a/app/models/ckb_transaction.rb +++ b/app/models/ckb_transaction.rb @@ -21,7 +21,7 @@ class CkbTransaction < ApplicationRecord after_commit :flush_cache def self.cached_find(query_key) - Rails.cache.fetch([name, query_key], race_condition_ttl: 3.seconds) do + Rails.cache.realize([name, query_key], race_condition_ttl: 3.seconds) do find_by(tx_hash: query_key) end end @@ -51,18 +51,18 @@ def income(address) end def dao_transaction? - inputs.dao.present? || outputs.dao.present? + inputs.where(cell_type: %w(nervos_dao_deposit nervos_dao_withdrawing)) end private def normal_tx_display_outputs(previews) - Rails.cache.fetch("normal_tx_display_outputs_previews_#{previews}_#{id}", race_condition_ttl: 3.seconds) do + Rails.cache.realize("normal_tx_display_outputs_previews_#{previews}_#{id}", race_condition_ttl: 3.seconds) do cell_outputs_for_display = previews ? outputs.limit(10) : outputs cell_outputs_for_display.order(:id).map do |output| consumed_tx_hash = output.live? ? nil : output.consumed_by.tx_hash display_output = { id: output.id, capacity: output.capacity, address_hash: output.address_hash, status: output.status, consumed_tx_hash: consumed_tx_hash, cell_type: output.cell_type } - display_output.merge!({ dao_type_hash: ENV["DAO_TYPE_HASH"] }) if output.dao? + display_output.merge!({ dao_type_hash: ENV["DAO_TYPE_HASH"] }) unless output.normal? display_output end @@ -79,12 +79,12 @@ def cellbase_display_outputs end def normal_tx_display_inputs(previews) - Rails.cache.fetch("normal_tx_display_inputs_previews_#{previews}_#{id}", race_condition_ttl: 3.seconds) do + Rails.cache.realize("normal_tx_display_inputs_previews_#{previews}_#{id}", race_condition_ttl: 3.seconds) do cell_inputs_for_display = previews ? cell_inputs.limit(10) : cell_inputs cell_inputs_for_display.order(:id).map do |cell_input| previous_cell_output = cell_input.previous_cell_output display_input = { id: previous_cell_output.id, from_cellbase: false, capacity: previous_cell_output.capacity, address_hash: previous_cell_output.address_hash, generated_tx_hash: previous_cell_output.generated_by.tx_hash, cell_type: previous_cell_output.cell_type } - display_input.merge!(attributes_for_dao_input(previous_cell_output)) if previous_cell_output.dao? + display_input.merge!(attributes_for_dao_input(previous_cell_output)) if previous_cell_output.nervos_dao_withdrawing? display_input end @@ -92,14 +92,13 @@ def normal_tx_display_inputs(previews) end def attributes_for_dao_input(input) - witness = witnesses[input.cell_index] - header_deps_index = CKB::Utils.bin_to_hex(CKB::Utils.hex_to_bin(witness)[-8..-1]).hex - withdraw_block_hash = header_deps[header_deps_index] - started_block_number = Block.find(input.block_id).number + withdraw_block_hash = input.block.block_hash + nervos_dao_withdrawing_cell_generated_tx = input.generated_by + started_block_number = Block.find(nervos_dao_withdrawing_cell_generated_tx.block.id).number ended_block_number = Block.find_by(block_hash: withdraw_block_hash).number - subsidy = CkbUtils.dao_subsidy(input, header_deps, witnesses) + interest = CkbUtils.dao_interest(input) - { started_block_number: started_block_number, ended_block_number: ended_block_number, subsidy: subsidy, dao_type_hash: ENV["DAO_TYPE_HASH"] } + { started_block_number: started_block_number, ended_block_number: ended_block_number, interest: interest, dao_type_hash: ENV["DAO_TYPE_HASH"] } end def cellbase_display_inputs diff --git a/app/models/dao_contract.rb b/app/models/dao_contract.rb index dbc331f9a..e6b857c6d 100644 --- a/app/models/dao_contract.rb +++ b/app/models/dao_contract.rb @@ -1,12 +1,13 @@ class DaoContract < ApplicationRecord - validates :total_deposit, :subsidy_granted, :deposit_transactions_count, :withdraw_transactions_count, :depositors_count, :total_depositors_count, presence: true, numericality: { greater_than_or_equal_to: 0 } + validates :total_deposit, :interest_granted, :deposit_transactions_count, :withdraw_transactions_count, :depositors_count, :total_depositors_count, presence: true, numericality: { greater_than_or_equal_to: 0 } + CONTRACT_NAME = "nervos_dao" def self.default_contract find_or_create_by(id: 1) end def ckb_transactions - ckb_transaction_ids = CellOutput.dao.select("ckb_transaction_id") + ckb_transaction_ids = CellOutput.where(cell_type: %w(nervos_dao_deposit nervos_dao_withdrawing)).select("ckb_transaction_id") CkbTransaction.where(id: ckb_transaction_ids) end end @@ -17,7 +18,7 @@ def ckb_transactions # # id :bigint not null, primary key # total_deposit :decimal(30, ) default(0) -# subsidy_granted :decimal(30, ) default(0) +# interest_granted :decimal(30, ) default(0) # deposit_transactions_count :bigint default(0) # withdraw_transactions_count :bigint default(0) # depositors_count :integer default(0) diff --git a/app/models/dao_event.rb b/app/models/dao_event.rb index 53c90fa5d..98cdd2380 100644 --- a/app/models/dao_event.rb +++ b/app/models/dao_event.rb @@ -1,5 +1,5 @@ class DaoEvent < ApplicationRecord - enum event_type: { deposit_to_dao: 0, new_dao_depositor: 1, withdraw_from_dao: 2, issue_subsidy: 3, take_away_all_deposit: 4 } + enum event_type: { deposit_to_dao: 0, new_dao_depositor: 1, withdraw_from_dao: 2, issue_interest: 3, take_away_all_deposit: 4 } enum status: { pending: 0, processed: 1, reverted: 2 } validates :value, presence: true, numericality: { greater_than_or_equal_to: 0 } diff --git a/app/models/miner_ranking.rb b/app/models/miner_ranking.rb index 9c03d9689..f31840b09 100644 --- a/app/models/miner_ranking.rb +++ b/app/models/miner_ranking.rb @@ -9,7 +9,7 @@ def id def ranking(limit = nil) limit = limit.presence || DEFAULT_LIMIT - Rails.cache.fetch("miner_ranking", expires_in: 1.hour, race_condition_ttl: 10.seconds) do + Rails.cache.realize("miner_ranking", expires_in: 1.hour, race_condition_ttl: 10.seconds) do ranking_infos.take(limit) end end diff --git a/app/models/net_info.rb b/app/models/net_info.rb index 847bb174e..e36f662d0 100644 --- a/app/models/net_info.rb +++ b/app/models/net_info.rb @@ -20,7 +20,7 @@ def version end def local_node_info - Rails.cache.fetch("local_node_info") do + Rails.cache.realize("local_node_info") do CkbSync::Api.instance.local_node_info end end diff --git a/app/models/statistic_info_chart.rb b/app/models/statistic_info_chart.rb index 214caa1d1..06444d079 100644 --- a/app/models/statistic_info_chart.rb +++ b/app/models/statistic_info_chart.rb @@ -9,7 +9,7 @@ def id def hash_rate to = Rails.cache.read("hash_rate_to") - Rails.cache.fetch("hash_rate_chart_data_#{to}")&.uniq || [] + Rails.cache.realize("hash_rate_chart_data_#{to}")&.uniq || [] end def uncle_rate @@ -23,7 +23,7 @@ def uncle_rate def difficulty current_epoch_number = CkbSync::Api.instance.get_current_epoch.number - Rails.cache.fetch("statistic_info_difficulty_#{current_epoch_number}", expires_in: 10.minutes, race_condition_ttl: 10.seconds) do + Rails.cache.realize("statistic_info_difficulty_#{current_epoch_number}", expires_in: 10.minutes, race_condition_ttl: 10.seconds) do from = Block.where(epoch: 0).recent.first&.number.to_i to = Block.maximum(:number).to_i hash_rate_block_numbers = (from + 1).step(to, 100).to_a @@ -37,8 +37,8 @@ def difficulty def calculate_hash_rate max_block_number = Block.maximum(:number).to_i - from = Rails.cache.fetch("hash_rate_from") { last_epoch0_block_number } - to = Rails.cache.fetch("hash_rate_to") { max_block_number } + from = Rails.cache.realize("hash_rate_from") { last_epoch0_block_number } + to = Rails.cache.realize("hash_rate_to") { max_block_number } epoch_first_block_numbers = Block.order(:epoch, :timestamp).select("distinct on (epoch) number").to_a.pluck(:number) result = diff --git a/app/presenters/address_presenter.rb b/app/presenters/address_presenter.rb index d58998b81..0bdfa2c58 100644 --- a/app/presenters/address_presenter.rb +++ b/app/presenters/address_presenter.rb @@ -15,6 +15,14 @@ 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 lock_script object.first.cached_lock_script end @@ -34,7 +42,7 @@ def ckb_transactions def ckb_dao_transactions address_ids = object.pluck(:id) - ckb_transaction_ids = CellOutput.where(address_id: address_ids).dao.select("ckb_transaction_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 diff --git a/app/serializers/address_serializer.rb b/app/serializers/address_serializer.rb index 95d310688..3ab195bb1 100644 --- a/app/serializers/address_serializer.rb +++ b/app/serializers/address_serializer.rb @@ -11,4 +11,10 @@ class AddressSerializer attribute :pending_reward_blocks_count do |object| object.pending_reward_blocks_count.to_s end + attribute :dao_deposit do |object| + object.dao_deposit.to_s + end + attribute :interest do |object| + object.interest.to_s + end end diff --git a/app/serializers/dao_contract_serializer.rb b/app/serializers/dao_contract_serializer.rb index f52640449..e2faa3779 100644 --- a/app/serializers/dao_contract_serializer.rb +++ b/app/serializers/dao_contract_serializer.rb @@ -1,6 +1,9 @@ class DaoContractSerializer include FastJsonapi::ObjectSerializer - set_type :dao - attributes :total_deposit, :subsidy_granted, :deposit_transactions_count, :withdraw_transactions_count, + set_type :nervos_dao + attributes :total_deposit, :interest_granted, :deposit_transactions_count, :withdraw_transactions_count, :depositors_count, :total_depositors_count + attribute :dao_type_hash do + ENV["DAO_TYPE_HASH"] + end end diff --git a/app/serializers/lock_hash_serializer.rb b/app/serializers/lock_hash_serializer.rb index 2082a4883..b86ffed49 100644 --- a/app/serializers/lock_hash_serializer.rb +++ b/app/serializers/lock_hash_serializer.rb @@ -16,4 +16,10 @@ class LockHashSerializer attribute :balance do |object| object.balance.to_s end + attribute :dao_deposit do |object| + object.dao_deposit.to_s + end + attribute :interest do |object| + object.interest.to_s + end end diff --git a/app/utils/ckb_utils.rb b/app/utils/ckb_utils.rb index 34786cf31..dcb7f4558 100644 --- a/app/utils/ckb_utils.rb +++ b/app/utils/ckb_utils.rb @@ -160,7 +160,7 @@ def self.parse_epoch_info(header) end def self.ckb_transaction_fee(ckb_transaction, input_capacities, output_capacities) - if ckb_transaction.inputs.dao.present? + if ckb_transaction.inputs.where(cell_type: "nervos_dao_withdrawing").present? dao_withdraw_tx_fee(ckb_transaction) else normal_tx_fee(input_capacities, output_capacities) @@ -235,20 +235,18 @@ def self.normal_tx_fee(input_capacities, output_capacities) end def self.dao_withdraw_tx_fee(ckb_transaction) - dao_cells = ckb_transaction.inputs.dao - witnesses = ckb_transaction.witnesses - header_deps = ckb_transaction.header_deps - interests = dao_cells.reduce(0) { |memo, dao_cell| memo + dao_subsidy(dao_cell, header_deps, witnesses) } + nervos_dao_withdrawing_cells = ckb_transaction.inputs.nervos_dao_withdrawing + interests = nervos_dao_withdrawing_cells.reduce(0) { |memo, nervos_dao_withdrawing_cell| memo + dao_interest(nervos_dao_withdrawing_cell) } ckb_transaction.inputs.sum(:capacity) + interests - ckb_transaction.outputs.sum(:capacity) end - def self.dao_subsidy(dao_cell, header_deps, witnesses) - witness = witnesses[dao_cell.cell_index] - header_deps_index = CKB::Utils.bin_to_hex(CKB::Utils.hex_to_bin(witness)[-8..-1]).hex - block_hash = header_deps[header_deps_index] - out_point = CKB::Types::OutPoint.new(tx_hash: dao_cell.tx_hash, index: dao_cell.cell_index) - CkbSync::Api.instance.calculate_dao_maximum_withdraw(out_point, block_hash).hex - dao_cell.capacity.to_i + def self.dao_interest(nervos_dao_withdrawing_cell) + nervos_dao_withdrawing_cell_generated_tx = nervos_dao_withdrawing_cell.generated_by + nervos_dao_deposit_cell = nervos_dao_withdrawing_cell_generated_tx.inputs.where(cell_index: nervos_dao_withdrawing_cell.cell_index).first + deposit_out_point = CKB::Types::OutPoint.new(tx_hash: nervos_dao_deposit_cell.tx_hash, index: nervos_dao_deposit_cell.cell_index) + withdrawing_dao_cell_block_hash = nervos_dao_withdrawing_cell.block.block_hash + CkbSync::Api.instance.calculate_dao_maximum_withdraw(deposit_out_point, withdrawing_dao_cell_block_hash).hex - nervos_dao_deposit_cell.capacity.to_i rescue CKB::RPCError 0 end diff --git a/config/initializers/monkey_patches.rb b/config/initializers/monkey_patches.rb new file mode 100644 index 000000000..b25a25f9a --- /dev/null +++ b/config/initializers/monkey_patches.rb @@ -0,0 +1,9 @@ +module CacheRealizer + def realize(key, *args, &block) + fetch(key, *args, &block).tap do |result| + delete(key) if result.nil? + end + end +end + +Rails.cache.extend(CacheRealizer) \ No newline at end of file diff --git a/db/migrate/20191108023656_rename_subsidy_to_interest.rb b/db/migrate/20191108023656_rename_subsidy_to_interest.rb new file mode 100644 index 000000000..4dcd854ae --- /dev/null +++ b/db/migrate/20191108023656_rename_subsidy_to_interest.rb @@ -0,0 +1,6 @@ +class RenameSubsidyToInterest < ActiveRecord::Migration[6.0] + def change + rename_column :addresses, :subsidy, :interest + rename_column :dao_contracts, :subsidy_granted, :interest_granted + end +end diff --git a/db/schema.rb b/db/schema.rb index e160b55f4..d555a699b 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: 2019_10_09_083202) do +ActiveRecord::Schema.define(version: 2019_11_08_023656) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -34,7 +34,7 @@ t.binary "lock_hash" t.integer "pending_reward_blocks_count", default: 0 t.decimal "dao_deposit", precision: 30, default: "0" - t.decimal "subsidy", precision: 30, default: "0" + t.decimal "interest", precision: 30, default: "0" t.index ["address_hash"], name: "index_addresses_on_address_hash" t.index ["lock_hash"], name: "index_addresses_on_lock_hash", unique: true end @@ -136,7 +136,7 @@ create_table "dao_contracts", force: :cascade do |t| t.decimal "total_deposit", precision: 30, default: "0" - t.decimal "subsidy_granted", precision: 30, default: "0" + t.decimal "interest_granted", precision: 30, default: "0" t.bigint "deposit_transactions_count", default: 0 t.bigint "withdraw_transactions_count", default: 0 t.integer "depositors_count", default: 0 diff --git a/doc/api.raml b/doc/api.raml index 55c9984bc..a6a9f7bab 100644 --- a/doc/api.raml +++ b/doc/api.raml @@ -102,6 +102,12 @@ types: "lock_hash": { "type": script }, + "dao_deposit": { + "type": string + }, + "interest": { + "type": string + }, "pending_reward_blocks_count": { "type": integer } @@ -185,7 +191,7 @@ types: type: integer, required: false }, - "subsidy": { + "interest": { type: integer, required: false }, @@ -883,7 +889,7 @@ types: "generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae321", "started_block_number": 10, "ended_block_number": 15, - "subsidy": 100000, + "interest": 100000, "cell_type": "dao", "dao_type_hash": "0xa20df8e80518e9b2eabc1a0efb0ebe1de83f8df9c867edf99d0c5895654fcde1", } @@ -1544,6 +1550,8 @@ types: "args": [], "code_hash": "0x0000000000000000000000000000000000000000000000000000000000000001" }, + "dao_deposit": "10000", + "interest": "100", "pending_reward_blocks_count": 3 } } @@ -1929,7 +1937,9 @@ types: "lock_script": { "args": [], "code_hash": "0x0000000000000000000000000000000000000000000000000000000000000001" - } + }, + "dao_deposit": "10000", + "interest": "100" } } } @@ -2130,7 +2140,7 @@ types: "type": "dao_contract", "attributes": { "total_deposit": 1000000, - "subsidy_granted": 1000, + "interest_granted": 1000, "deposit_transactions_count": 10, "withdraw_transactions_count": 1, "depositors_count": 3, diff --git a/public/api_doc.html b/public/api_doc.html index 733a595b5..8746cb476 100644 --- a/public/api_doc.html +++ b/public/api_doc.html @@ -321,7 +321,7 @@ } ] } -

/transactions

get

get

Returns a transaction by transaction hash

Returns a transaction by transaction hash

URI Parameters

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

    The transaction hash

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

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

        Items: display_input

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

        Items: display_output

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

Example:

{
+

/transactions

get

get

Returns a transaction by transaction hash

Returns a transaction by transaction hash

URI Parameters

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

    The transaction hash

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

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

        Items: display_input

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

        Items: display_output

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

Example:

{
   "data": {
     "id": 11,
     "type": "transaction",
@@ -359,7 +359,7 @@
           "generated_tx_hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae321",
           "started_block_number": 10,
           "ended_block_number": 15,
-          "subsidy": 100000,
+          "interest": 100000,
           "cell_type": "dao",
           "dao_type_hash": "0xa20df8e80518e9b2eabc1a0efb0ebe1de83f8df9c867edf99d0c5895654fcde1",
         }
@@ -411,7 +411,7 @@
     }
   ]
 }
-

/address_transactions

get

get

Returns transactions related to an address

Returns transactions related to an address

URI Parameters

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

    The address hash

Query Parameters

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

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

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

    Items: transaction

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

        Items: display_input

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

        Items: display_output

        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • base_reward: (integer)
        • commit_reward: (integer)
        • proposal_reward: (integer)
        • secondary_reward: (integer)
        • consumed_by_tx_hash: (string)
        • status: required(one of live, dead)
        • cell_type": required(string)
        • dao_type_hash: required(string)
  • links: required(object)
    • self: required(string)
    • first: required(string)
    • prev: required(string)
    • next: required(string)
    • last: required(string)

Example:

{
+

/address_transactions

get

get

Returns transactions related to an address

Returns transactions related to an address

URI Parameters

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

    The address hash

Query Parameters

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

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

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

    Items: transaction

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

        Items: display_input

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

        Items: display_output

        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • base_reward: (integer)
        • commit_reward: (integer)
        • proposal_reward: (integer)
        • secondary_reward: (integer)
        • consumed_by_tx_hash: (string)
        • status: required(one of live, dead)
        • cell_type": required(string)
        • dao_type_hash: required(string)
  • links: required(object)
    • self: required(string)
    • first: required(string)
    • prev: required(string)
    • next: required(string)
    • last: required(string)

Example:

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

/block_transactions

get

get

Returns transactions in the block

Returns transactions in the block

URI Parameters

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

    The block hash

Query Parameters

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

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

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

    Items: transaction

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

        Items: display_input

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

        Items: display_output

        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • base_reward: (integer)
        • commit_reward: (integer)
        • proposal_reward: (integer)
        • secondary_reward: (integer)
        • consumed_by_tx_hash: (string)
        • status: required(one of live, dead)
        • cell_type": required(string)
        • dao_type_hash: required(string)
  • links: required(object)
    • self: required(string)
    • first: required(string)
    • prev: required(string)
    • next: required(string)
    • last: required(string)

Example:

{
+

/block_transactions

get

get

Returns transactions in the block

Returns transactions in the block

URI Parameters

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

    The block hash

Query Parameters

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

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

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

    Items: transaction

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

        Items: display_input

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

        Items: display_output

        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • base_reward: (integer)
        • commit_reward: (integer)
        • proposal_reward: (integer)
        • secondary_reward: (integer)
        • consumed_by_tx_hash: (string)
        • status: required(one of live, dead)
        • cell_type": required(string)
        • dao_type_hash: required(string)
  • links: required(object)
    • self: required(string)
    • first: required(string)
    • prev: required(string)
    • next: required(string)
    • last: required(string)

Example:

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

/addresses

get

get

Returns address info

Returns address info

URI Parameters

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

    The address hash

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

Properties
  • data: required(object)
    • id: required(string)
    • type: required(string)
    • attributes: required(object)
      • address_hash: required(string)
      • balance: required(integer)
      • transactions_count: required(integer)
      • cell_consumed: required(integer)
      • lock_hash: required(object)
        • id: required(string)
        • type: required(string)
        • attributes: required(object)
          • code_hash: required(string)
          • args: required(array of string)
      • pending_reward_blocks_count: required(integer)

Example:

{
+

/addresses

get

get

Returns address info

Returns address info

URI Parameters

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

    The address hash

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

Properties
  • data: required(object)
    • id: required(string)
    • type: required(string)
    • attributes: required(object)
      • address_hash: required(string)
      • balance: required(integer)
      • transactions_count: required(integer)
      • cell_consumed: required(integer)
      • lock_hash: required(object)
        • id: required(string)
        • type: required(string)
        • attributes: required(object)
          • code_hash: required(string)
          • args: required(array of string)
      • dao_deposit: required(string)
      • interest: required(string)
      • pending_reward_blocks_count: required(integer)

Example:

{
   "data": {
     "id": "1",
     "type": "address",
@@ -834,6 +834,8 @@
         "args": [],
         "code_hash": "0x0000000000000000000000000000000000000000000000000000000000000001"
       },
+      "dao_deposit": "10000",
+      "interest": "100",
       "pending_reward_blocks_count": 3
     }
   }
@@ -1128,7 +1130,9 @@
       "lock_script": {
         "args": [],
         "code_hash": "0x0000000000000000000000000000000000000000000000000000000000000001"
-      }
+      },
+      "dao_deposit": "10000",
+      "interest": "100"
     }
   }
 }
@@ -1145,7 +1149,7 @@
     }
   ]
 }
-

/contract_transactions

get

get

Returns transactions under the contract

Returns transactions under the contract

URI Parameters

  • contract_name: required(string)

    The contract name

Query Parameters

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

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

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

    Items: transaction

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

        Items: display_input

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

        Items: display_output

        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • base_reward: (integer)
        • commit_reward: (integer)
        • proposal_reward: (integer)
        • secondary_reward: (integer)
        • consumed_by_tx_hash: (string)
        • status: required(one of live, dead)
        • cell_type": required(string)
        • dao_type_hash: required(string)
  • links: required(object)
    • self: required(string)
    • first: required(string)
    • prev: required(string)
    • next: required(string)
    • last: required(string)

Example:

{
+

/contract_transactions

get

get

Returns transactions under the contract

Returns transactions under the contract

URI Parameters

  • contract_name: required(string)

    The contract name

Query Parameters

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

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

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

    Items: transaction

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

        Items: display_input

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

        Items: display_output

        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • base_reward: (integer)
        • commit_reward: (integer)
        • proposal_reward: (integer)
        • secondary_reward: (integer)
        • consumed_by_tx_hash: (string)
        • status: required(one of live, dead)
        • cell_type": required(string)
        • dao_type_hash: required(string)
  • links: required(object)
    • self: required(string)
    • first: required(string)
    • prev: required(string)
    • next: required(string)
    • last: required(string)

Example:

{
   "meta": {
     "total": 100,
   },
@@ -1280,7 +1284,7 @@
     "type": "dao_contract",
     "attributes": {
       "total_deposit": 1000000,
-      "subsidy_granted": 1000,
+      "interest_granted": 1000,
       "deposit_transactions_count": 10,
       "withdraw_transactions_count": 1,
       "depositors_count": 3,
@@ -1300,7 +1304,7 @@
     }
   ]
 }
-

/dao_contract_transactions

get

get

Returns the transaction related to dao contract by given transaction hash

Returns the transaction related to dao contract by given transaction hash

URI Parameters

  • tx_hash: required(string)

    transaction hash

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

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

        Items: display_input

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

        Items: display_output

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

Example:

{
+

/dao_contract_transactions

get

get

Returns the transaction related to dao contract by given transaction hash

Returns the transaction related to dao contract by given transaction hash

URI Parameters

  • tx_hash: required(string)

    transaction hash

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

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

        Items: display_input

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

        Items: display_output

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

Example:

{
   "data": {
     "id": "1",
     "type": "transaction",
@@ -1368,7 +1372,7 @@
     }
   ]
 }
-

/address_dao_transactions

get

get

Returns transactions under the address by given address hash

Returns transactions under the address by given address hash

URI Parameters

  • address_hash: required(string)

    address hash

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

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

    Items: transaction

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

        Items: display_input

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

        Items: display_output

        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • base_reward: (integer)
        • commit_reward: (integer)
        • proposal_reward: (integer)
        • secondary_reward: (integer)
        • consumed_by_tx_hash: (string)
        • status: required(one of live, dead)
        • cell_type": required(string)
        • dao_type_hash: required(string)
  • links: required(object)
    • self: required(string)
    • first: required(string)
    • prev: required(string)
    • next: required(string)
    • last: required(string)

Example:

{
+

/address_dao_transactions

get

get

Returns transactions under the address by given address hash

Returns transactions under the address by given address hash

URI Parameters

  • address_hash: required(string)

    address hash

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

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

    Items: transaction

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

        Items: display_input

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

        Items: display_output

        • id: required(string)
        • address_hash: required(string)
        • capacity: required(integer)
        • target_block_number: (integer)
        • base_reward: (integer)
        • commit_reward: (integer)
        • proposal_reward: (integer)
        • secondary_reward: (integer)
        • consumed_by_tx_hash: (string)
        • status: required(one of live, dead)
        • cell_type": required(string)
        • dao_type_hash: required(string)
  • links: required(object)
    • self: required(string)
    • first: required(string)
    • prev: required(string)
    • next: required(string)
    • last: required(string)

Example:

{
   "meta": {
     "total": 100
   },
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 ce3c82654..36f29de6a 100644
--- a/test/controllers/api/v1/address_dao_transactions_controller_test.rb
+++ b/test/controllers/api/v1/address_dao_transactions_controller_test.rb
@@ -257,7 +257,7 @@ def fake_dao_deposit_transaction(dao_cell_count, address)
           ckb_transaction1 = create(:ckb_transaction, tx_hash: "0x#{SecureRandom.hex(32)}", block: block, address: address)
           ckb_transaction2 = create(:ckb_transaction, tx_hash: "0x#{SecureRandom.hex(32)}", block: block, address: address)
           generated_by = number % 2 == 0 ? ckb_transaction2 : ckb_transaction1
-          create(:cell_output, ckb_transaction: generated_by, cell_index: number, tx_hash: "0x498315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", generated_by: generated_by, block: block, capacity: 10**8 * 1000, cell_type: "dao", address: address)
+          create(:cell_output, ckb_transaction: generated_by, cell_index: number, tx_hash: "0x498315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", generated_by: generated_by, block: block, capacity: 10**8 * 1000, cell_type: "nervos_dao_deposit", address: address)
         end
       end
     end
diff --git a/test/controllers/api/v1/addresses_controller_test.rb b/test/controllers/api/v1/addresses_controller_test.rb
index b93839f45..46c1a5b63 100644
--- a/test/controllers/api/v1/addresses_controller_test.rb
+++ b/test/controllers/api/v1/addresses_controller_test.rb
@@ -86,7 +86,7 @@ class AddressesControllerTest < ActionDispatch::IntegrationTest
 
         valid_get api_v1_address_url(address.address_hash)
 
-        assert_equal %w(address_hash balance transactions_count lock_script pending_reward_blocks_count).sort, json["data"]["attributes"].keys.sort
+        assert_equal %w(address_hash balance transactions_count lock_script pending_reward_blocks_count dao_deposit interest).sort, json["data"]["attributes"].keys.sort
       end
 
       test "should return error object when no cell output found by id" do
diff --git a/test/controllers/api/v1/contract_transactions_controller_test.rb b/test/controllers/api/v1/contract_transactions_controller_test.rb
index 4d469bc40..7d44855d6 100644
--- a/test/controllers/api/v1/contract_transactions_controller_test.rb
+++ b/test/controllers/api/v1/contract_transactions_controller_test.rb
@@ -4,13 +4,13 @@ module Api
   module V1
     class ContractTransactionsControllerTest < ActionDispatch::IntegrationTest
       test "should set right content type when call index" do
-        valid_get api_v1_contract_transaction_url("dao")
+        valid_get api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME)
 
         assert_equal "application/vnd.api+json", response.media_type
       end
 
       test "should respond with 415 Unsupported Media Type when Content-Type is wrong" do
-        get api_v1_contract_transaction_url("dao"), headers: { "Content-Type": "text/plain" }
+        get api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME), headers: { "Content-Type": "text/plain" }
 
         assert_equal 415, response.status
       end
@@ -19,13 +19,13 @@ class ContractTransactionsControllerTest < ActionDispatch::IntegrationTest
         error_object = Api::V1::Exceptions::WrongContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
-        get api_v1_contract_transaction_url("dao"), headers: { "Content-Type": "text/plain" }
+        get api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME), headers: { "Content-Type": "text/plain" }
 
         assert_equal response_json, response.body
       end
 
       test "should respond with 406 Not Acceptable when Accept is wrong" do
-        get api_v1_contract_transaction_url("dao"), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
+        get api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
 
         assert_equal 406, response.status
       end
@@ -34,7 +34,7 @@ class ContractTransactionsControllerTest < ActionDispatch::IntegrationTest
         error_object = Api::V1::Exceptions::WrongAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
-        get api_v1_contract_transaction_url("dao"), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
+        get api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
 
         assert_equal response_json, response.body
       end
@@ -45,7 +45,7 @@ class ContractTransactionsControllerTest < ActionDispatch::IntegrationTest
         dao_contract = DaoContract.default_contract
         ckb_transactions = dao_contract.ckb_transactions.order(block_timestamp: :desc).page(page).per(page_size)
 
-        valid_get api_v1_contract_transaction_url("dao")
+        valid_get api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME)
 
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: ckb_transactions, page: page, page_size: page_size).call
 
@@ -54,7 +54,7 @@ class ContractTransactionsControllerTest < ActionDispatch::IntegrationTest
 
       test "should contain right keys in the serialized transaction when call show" do
         fake_dao_deposit_transaction(5)
-        valid_get api_v1_contract_transaction_url("dao")
+        valid_get api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME)
 
         response_tx_transaction = json["data"].first
 
@@ -74,7 +74,7 @@ class ContractTransactionsControllerTest < ActionDispatch::IntegrationTest
         error_object = Api::V1::Exceptions::PageParamError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
-        valid_get api_v1_contract_transaction_url("dao"), params: { page: "aaa" }
+        valid_get api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME), params: { page: "aaa" }
 
         assert_equal response_json, response.body
       end
@@ -83,7 +83,7 @@ class ContractTransactionsControllerTest < ActionDispatch::IntegrationTest
         error_object = Api::V1::Exceptions::PageSizeParamError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
-        valid_get api_v1_contract_transaction_url("dao"), params: { page_size: "aaa" }
+        valid_get api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME), params: { page_size: "aaa" }
 
         assert_equal response_json, response.body
       end
@@ -94,14 +94,14 @@ class ContractTransactionsControllerTest < ActionDispatch::IntegrationTest
         errors << Api::V1::Exceptions::PageSizeParamError.new
         response_json = RequestErrorSerializer.new(errors, message: errors.first.title).serialized_json
 
-        valid_get api_v1_contract_transaction_url("dao"), params: { page: "bbb", page_size: "aaa" }
+        valid_get api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME), params: { page: "bbb", page_size: "aaa" }
 
         assert_equal response_json, response.body
       end
 
       test "should return 10 records when page and page_size are not set" do
         fake_dao_deposit_transaction(30)
-        valid_get api_v1_contract_transaction_url("dao")
+        valid_get api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME)
 
         assert_equal 10, json["data"].size
       end
@@ -113,7 +113,7 @@ class ContractTransactionsControllerTest < ActionDispatch::IntegrationTest
         dao_contract = DaoContract.default_contract
         contract_ckb_transactions = dao_contract.ckb_transactions.recent.page(page).per(page_size)
 
-        valid_get api_v1_contract_transaction_url("dao"), params: { page: page }
+        valid_get api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME), params: { page: page }
 
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: contract_ckb_transactions, page: page, page_size: page_size).call
         response_transaction = CkbTransactionSerializer.new(contract_ckb_transactions, options).serialized_json
@@ -129,7 +129,7 @@ class ContractTransactionsControllerTest < ActionDispatch::IntegrationTest
         dao_contract = DaoContract.default_contract
         contract_ckb_transactions = dao_contract.ckb_transactions.recent.page(page).per(page_size)
 
-        valid_get api_v1_contract_transaction_url("dao"), params: { page_size: page_size }
+        valid_get api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME), params: { page_size: page_size }
 
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: contract_ckb_transactions, page: page, page_size: page_size).call
         response_transaction = CkbTransactionSerializer.new(contract_ckb_transactions, options).serialized_json
@@ -145,7 +145,7 @@ class ContractTransactionsControllerTest < ActionDispatch::IntegrationTest
         dao_contract = DaoContract.default_contract
         contract_ckb_transactions = dao_contract.ckb_transactions.recent.page(page).per(page_size)
 
-        valid_get api_v1_contract_transaction_url("dao"), params: { page: page, page_size: page_size }
+        valid_get api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME), params: { page: page, page_size: page_size }
 
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: contract_ckb_transactions, page: page, page_size: page_size).call
         response_transaction = CkbTransactionSerializer.new(contract_ckb_transactions, options).serialized_json
@@ -159,7 +159,7 @@ class ContractTransactionsControllerTest < ActionDispatch::IntegrationTest
         dao_contract = DaoContract.default_contract
         contract_ckb_transactions = dao_contract.ckb_transactions.recent.page(page).per(page_size)
 
-        valid_get api_v1_contract_transaction_url("dao"), params: { page: page, page_size: page_size }
+        valid_get api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME), params: { page: page, page_size: page_size }
 
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: contract_ckb_transactions, page: page, page_size: page_size).call
         response_transaction = CkbTransactionSerializer.new(contract_ckb_transactions, options).serialized_json
@@ -174,14 +174,14 @@ class ContractTransactionsControllerTest < ActionDispatch::IntegrationTest
         page_size = 3
 
         links = {
-          self: "#{api_v1_contract_transaction_url("dao")}?page=2&page_size=3",
-          first: "#{api_v1_contract_transaction_url("dao")}?page_size=3",
-          prev: "#{api_v1_contract_transaction_url("dao")}?page_size=3",
-          next: "#{api_v1_contract_transaction_url("dao")}?page=3&page_size=3",
-          last: "#{api_v1_contract_transaction_url("dao")}?page=10&page_size=3"
+          self: "#{api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME)}?page=2&page_size=3",
+          first: "#{api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME)}?page_size=3",
+          prev: "#{api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME)}?page_size=3",
+          next: "#{api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME)}?page=3&page_size=3",
+          last: "#{api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME)}?page=10&page_size=3"
         }
 
-        valid_get api_v1_contract_transaction_url("dao"), params: { page: page, page_size: page_size }
+        valid_get api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME), params: { page: page, page_size: page_size }
 
         assert_equal links.stringify_keys.sort, json["links"].sort
       end
@@ -189,17 +189,17 @@ class ContractTransactionsControllerTest < ActionDispatch::IntegrationTest
       test "should return meta that contained total in response body" do
         fake_dao_deposit_transaction(3)
 
-        valid_get api_v1_contract_transaction_url("dao")
+        valid_get api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME)
 
         assert_equal 3, json.dig("meta", "total")
       end
 
       test "should return pagination links that only contain self in response bod when there is no transactions" do
         links = {
-          self: "#{api_v1_contract_transaction_url("dao")}?page_size=10"
+          self: "#{api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME)}?page_size=10"
         }
 
-        valid_get api_v1_contract_transaction_url("dao")
+        valid_get api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME)
         assert_equal links.stringify_keys.sort, json["links"].sort
       end
 
@@ -211,7 +211,7 @@ def fake_dao_deposit_transaction(dao_cell_count)
           ckb_transaction1 = create(:ckb_transaction, tx_hash: "0x#{SecureRandom.hex(32)}", block: block)
           ckb_transaction2 = create(:ckb_transaction, tx_hash: "0x#{SecureRandom.hex(32)}", block: block)
           generated_by = number % 2 == 0 ? ckb_transaction2 : ckb_transaction1
-          create(:cell_output, ckb_transaction: generated_by, cell_index: number, tx_hash: "0x498315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", generated_by: generated_by, block: block, capacity: 10**8 * 1000, cell_type: "dao")
+          create(:cell_output, ckb_transaction: generated_by, cell_index: number, tx_hash: "0x498315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", generated_by: generated_by, block: block, capacity: 10**8 * 1000, cell_type: "nervos_dao_deposit")
         end
       end
     end
diff --git a/test/controllers/api/v1/contracts_controller_test.rb b/test/controllers/api/v1/contracts_controller_test.rb
index 1a004944d..a1750c093 100644
--- a/test/controllers/api/v1/contracts_controller_test.rb
+++ b/test/controllers/api/v1/contracts_controller_test.rb
@@ -4,13 +4,13 @@ module Api
   module V1
     class ContractsControllerTest < ActionDispatch::IntegrationTest
       test "should set right content type when call index" do
-        valid_get api_v1_contract_url("dao")
+        valid_get api_v1_contract_url(DaoContract::CONTRACT_NAME)
 
         assert_equal "application/vnd.api+json", response.media_type
       end
 
       test "should respond with 415 Unsupported Media Type when Content-Type is wrong" do
-        get api_v1_contract_url("dao"), headers: { "Content-Type": "text/plain" }
+        get api_v1_contract_url(DaoContract::CONTRACT_NAME), headers: { "Content-Type": "text/plain" }
 
         assert_equal 415, response.status
       end
@@ -19,13 +19,13 @@ class ContractsControllerTest < ActionDispatch::IntegrationTest
         error_object = Api::V1::Exceptions::WrongContentTypeError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
-        get api_v1_contract_url("dao"), headers: { "Content-Type": "text/plain" }
+        get api_v1_contract_url(DaoContract::CONTRACT_NAME), headers: { "Content-Type": "text/plain" }
 
         assert_equal response_json, response.body
       end
 
       test "should respond with 406 Not Acceptable when Accept is wrong" do
-        get api_v1_contract_url("dao"), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
+        get api_v1_contract_url(DaoContract::CONTRACT_NAME), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
 
         assert_equal 406, response.status
       end
@@ -34,33 +34,33 @@ class ContractsControllerTest < ActionDispatch::IntegrationTest
         error_object = Api::V1::Exceptions::WrongAcceptError.new
         response_json = RequestErrorSerializer.new([error_object], message: error_object.title).serialized_json
 
-        get api_v1_contract_url("dao"), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
+        get api_v1_contract_url(DaoContract::CONTRACT_NAME), headers: { "Content-Type": "application/vnd.api+json", "Accept": "application/json" }
 
         assert_equal response_json, response.body
       end
 
       test "should get success code when call show" do
-        valid_get api_v1_contract_url("dao")
+        valid_get api_v1_contract_url(DaoContract::CONTRACT_NAME)
 
         assert_response :success
       end
 
       test "the returned dao contract when param is dao_contract" do
-        valid_get api_v1_contract_url("dao")
+        valid_get api_v1_contract_url(DaoContract::CONTRACT_NAME)
 
-        assert_equal "dao", json.dig("data", "type")
+        assert_equal DaoContract::CONTRACT_NAME, json.dig("data", "type")
       end
 
       test "should contain right keys in the serialized object when visit show" do
-        valid_get api_v1_contract_url("dao")
+        valid_get api_v1_contract_url(DaoContract::CONTRACT_NAME)
 
         response_contract = json["data"]
-        assert_equal %w(total_deposit subsidy_granted deposit_transactions_count withdraw_transactions_count
+        assert_equal %w(dao_type_hash total_deposit interest_granted deposit_transactions_count withdraw_transactions_count
            depositors_count total_depositors_count).sort, response_contract["attributes"].keys.sort
       end
 
       test "should return corresponding contract with given contract name" do
-        valid_get api_v1_contract_url("dao")
+        valid_get api_v1_contract_url(DaoContract::CONTRACT_NAME)
 
         assert_equal JSON.parse(DaoContractSerializer.new(DaoContract.default_contract).serialized_json), json
       end
diff --git a/test/controllers/api/v1/dao_contract_transactions_controller_test.rb b/test/controllers/api/v1/dao_contract_transactions_controller_test.rb
index 07a2f6458..6e54d761c 100644
--- a/test/controllers/api/v1/dao_contract_transactions_controller_test.rb
+++ b/test/controllers/api/v1/dao_contract_transactions_controller_test.rb
@@ -76,7 +76,7 @@ class DaoContractTransactionsControllerTest < ActionDispatch::IntegrationTest
 
       test "should return corresponding ckb transaction with given transaction hash" do
         ckb_transaction = create(:ckb_transaction)
-        create(:cell_output, ckb_transaction: ckb_transaction, cell_index: 0, tx_hash: "0x498315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", generated_by: ckb_transaction, block: ckb_transaction.block, capacity: 10**8 * 1000, cell_type: "dao")
+        create(:cell_output, ckb_transaction: ckb_transaction, cell_index: 0, tx_hash: "0x498315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", generated_by: ckb_transaction, block: ckb_transaction.block, capacity: 10**8 * 1000, cell_type: "nervos_dao_deposit")
 
         valid_get api_v1_dao_contract_transaction_url(ckb_transaction.tx_hash)
 
@@ -86,7 +86,7 @@ class DaoContractTransactionsControllerTest < ActionDispatch::IntegrationTest
       test "should contain right keys in the serialized object when call show" do
         prepare_node_data(8)
         ckb_transaction = create(:ckb_transaction)
-        create(:cell_output, ckb_transaction: ckb_transaction, cell_index: 0, tx_hash: "0x498315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", generated_by: ckb_transaction, block: ckb_transaction.block, capacity: 10**8 * 1000, cell_type: "dao")
+        create(:cell_output, ckb_transaction: ckb_transaction, cell_index: 0, tx_hash: "0x498315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", generated_by: ckb_transaction, block: ckb_transaction.block, capacity: 10**8 * 1000, cell_type: "nervos_dao_withdrawing")
 
         valid_get api_v1_dao_contract_transaction_url(ckb_transaction.tx_hash)
 
diff --git a/test/models/ckb_sync/node_data_processor_test.rb b/test/models/ckb_sync/node_data_processor_test.rb
index 15a57b8d7..2f032989c 100644
--- a/test/models/ckb_sync/node_data_processor_test.rb
+++ b/test/models/ckb_sync/node_data_processor_test.rb
@@ -326,25 +326,39 @@ class NodeDataProcessorTest < ActiveSupport::TestCase
       end
     end
 
-    test "#process_block created cell_outputs's cell_type should be equal to dao when cell is dao cell and use dao code hash" do
+    test "#process_block created cell_outputs's cell_type should be equal to nervos_dao_deposit_cell when cell is dao cell, output data is 8 byte 0 and use dao code hash" do
       VCR.use_cassette("blocks/#{DEFAULT_NODE_BLOCK_NUMBER}") do
         node_block = CkbSync::Api.instance.get_block_by_number(DEFAULT_NODE_BLOCK_NUMBER)
         node_output = node_block.transactions.first.outputs.first
         node_output.type = CKB::Types::Script.new(code_hash: ENV["DAO_CODE_HASH"], args: "0xb2e61ff569acf041b3c2c17724e2379c581eeac3")
+        node_block.transactions.first.outputs_data[0] = CKB::Utils.bin_to_hex("\x00" * 8)
         local_block = node_data_processor.process_block(node_block)
 
-        assert_equal ["dao"], local_block.cell_outputs.pluck(:cell_type).uniq
+        assert_equal ["nervos_dao_deposit"], local_block.cell_outputs.pluck(:cell_type).uniq
       end
     end
 
-    test "#process_block created cell_outputs's cell_type should be equal to dao when cell is dao cell and use dao type hash" do
+    test "#process_block created cell_outputs's cell_type should be equal to nervos_dao_deposit when cell is dao cell, output data is 8 byte 0 and use dao type hash" do
       VCR.use_cassette("blocks/#{DEFAULT_NODE_BLOCK_NUMBER}") do
         node_block = CkbSync::Api.instance.get_block_by_number(DEFAULT_NODE_BLOCK_NUMBER)
         node_output = node_block.transactions.first.outputs.first
         node_output.type = CKB::Types::Script.new(code_hash: ENV["DAO_TYPE_HASH"], args: "0xb2e61ff569acf041b3c2c17724e2379c581eeac3")
+        node_block.transactions.first.outputs_data[0] = CKB::Utils.bin_to_hex("\x00" * 8)
         local_block = node_data_processor.process_block(node_block)
 
-        assert_equal ["dao"], local_block.cell_outputs.pluck(:cell_type).uniq
+        assert_equal ["nervos_dao_deposit"], local_block.cell_outputs.pluck(:cell_type).uniq
+      end
+    end
+
+    test "#process_block created cell_outputs's cell_type should be equal to nervos_dao_withdrawing when cell is dao cell, output data is 8 byte non-zero number and use dao type hash" do
+      VCR.use_cassette("blocks/#{DEFAULT_NODE_BLOCK_NUMBER}") do
+        node_block = CkbSync::Api.instance.get_block_by_number(DEFAULT_NODE_BLOCK_NUMBER)
+        node_output = node_block.transactions.first.outputs.first
+        node_output.type = CKB::Types::Script.new(code_hash: ENV["DAO_TYPE_HASH"], args: "0xb2e61ff569acf041b3c2c17724e2379c581eeac3")
+        node_block.transactions.first.outputs_data[0] = CKB::Utils.bin_to_hex("\x02" * 8)
+        local_block = node_data_processor.process_block(node_block)
+
+        assert_equal ["nervos_dao_withdrawing"], local_block.cell_outputs.pluck(:cell_type).uniq
       end
     end
 
@@ -582,7 +596,7 @@ class NodeDataProcessorTest < ActiveSupport::TestCase
       output1.type = CKB::Types::Script.new(args: "0xb2e61ff569acf041b3c2c17724e2379c581eeac3", hash_type: "type", code_hash: ENV["DAO_TYPE_HASH"])
       output1.capacity = 10**8 * 1000
       tx1.outputs << output1
-      tx1.outputs_data << "0x"
+      tx1.outputs_data << CKB::Utils.bin_to_hex("\x00" * 8)
 
       assert_difference -> { DaoContract.default_contract.total_depositors_count }, 1 do
         node_data_processor.process_block(node_block)
@@ -603,7 +617,7 @@ class NodeDataProcessorTest < ActiveSupport::TestCase
       output1.type = CKB::Types::Script.new(args: "0xb2e61ff569acf041b3c2c17724e2379c581eeac3", hash_type: "type", code_hash: ENV["DAO_TYPE_HASH"])
       output1.capacity = 10**8 * 1000
       tx1.outputs << output1
-      tx1.outputs_data << "0x"
+      tx1.outputs_data << CKB::Utils.bin_to_hex("\x00" * 8)
 
       assert_difference -> { DaoContract.default_contract.depositors_count }, 1 do
         node_data_processor.process_block(node_block)
@@ -625,22 +639,22 @@ class NodeDataProcessorTest < ActiveSupport::TestCase
       end
     end
 
-    test "#process_block should create dao_event which event_type is issue subsidy when previous output is a dao cell" do
+    test "#process_block should create dao_event which event_type is issue interest when previous output is a dao cell" do
       CkbSync::Api.any_instance.stubs(:calculate_dao_maximum_withdraw).returns("0x174876ebe8")
       node_block = fake_node_block("0x3307186493c5da8b91917924253a5ffd35231151649d0c7e2941aa8801815063")
       VCR.use_cassette("blocks/#{DEFAULT_NODE_BLOCK_NUMBER}") do
         fake_dao_withdraw_transaction(node_block)
 
-        assert_difference -> { DaoEvent.where(event_type: "issue_subsidy").count }, 1 do
+        assert_difference -> { DaoEvent.where(event_type: "issue_interest").count }, 1 do
           node_data_processor.process_block(node_block)
         end
 
-        deposit_to_dao_events = Block.find_by(number: node_block.header.number).dao_events.where(event_type: "issue_subsidy")
+        deposit_to_dao_events = Block.find_by(number: node_block.header.number).dao_events.where(event_type: "issue_interest")
         assert_equal ["processed"], deposit_to_dao_events.pluck(:status).uniq
       end
     end
 
-    test "#process_block should create dao_event which event_type is take away all deposit when previous output is a dao cell and address subsidy change to zero" do
+    test "#process_block should create dao_event which event_type is take away all deposit when previous output is a dao cell and address interest change to zero" do
       CkbSync::Api.any_instance.stubs(:calculate_dao_maximum_withdraw).returns("0x174876ebe8")
       node_block = fake_node_block("0x3307186493c5da8b91917924253a5ffd35231151649d0c7e2941aa8801815063")
       VCR.use_cassette("blocks/#{DEFAULT_NODE_BLOCK_NUMBER}") do
@@ -673,12 +687,12 @@ class NodeDataProcessorTest < ActiveSupport::TestCase
       end
     end
 
-    test "#process_block should decrease dao contract total deposit when previous output is a dao cell" do
+    test "#process_block should decrease dao contract total deposit when previous output is a withdrawing cell" do
       CkbSync::Api.any_instance.stubs(:calculate_dao_maximum_withdraw).returns("0x174876ebe8")
       node_block = fake_node_block("0x3307186493c5da8b91917924253a5ffd35231151649d0c7e2941aa8801815063")
       VCR.use_cassette("blocks/#{DEFAULT_NODE_BLOCK_NUMBER}") do
         tx = fake_dao_withdraw_transaction(node_block)
-        withdraw_amount = tx.cell_outputs.dao.first.capacity
+        withdraw_amount = tx.cell_outputs.nervos_dao_withdrawing.first.capacity
         DaoContract.default_contract.update(total_deposit: withdraw_amount)
 
         assert_difference -> { DaoContract.default_contract.total_deposit }, -withdraw_amount do
@@ -690,23 +704,23 @@ class NodeDataProcessorTest < ActiveSupport::TestCase
       end
     end
 
-    test "#process_block should increase dao contract subsidy granted when previous output is a dao cell" do
+    test "#process_block should increase dao contract interest granted when previous output is a withdrawing cell" do
       CkbSync::Api.any_instance.stubs(:calculate_dao_maximum_withdraw).returns("0x174876ebe8")
       node_block = fake_node_block("0x3307186493c5da8b91917924253a5ffd35231151649d0c7e2941aa8801815063")
       VCR.use_cassette("blocks/#{DEFAULT_NODE_BLOCK_NUMBER}") do
         tx = fake_dao_withdraw_transaction(node_block)
-        withdraw_amount = tx.cell_outputs.dao.first.capacity
+        withdraw_amount = tx.cell_outputs.nervos_dao_withdrawing.first.capacity
 
-        assert_difference -> { DaoContract.default_contract.reload.subsidy_granted }, "0x174876ebe8".hex - withdraw_amount do
+        assert_difference -> { DaoContract.default_contract.reload.interest_granted }, "0x174876ebe8".hex - withdraw_amount do
           node_data_processor.process_block(node_block)
         end
 
-        deposit_to_dao_events = Block.find_by(number: node_block.header.number).dao_events.where(event_type: "issue_subsidy")
+        deposit_to_dao_events = Block.find_by(number: node_block.header.number).dao_events.where(event_type: "issue_interest")
         assert_equal ["processed"], deposit_to_dao_events.pluck(:status).uniq
       end
     end
 
-    test "#process_block should decrease dao contract depositors count when previous output is a dao cell and address subsidy change to zero" do
+    test "#process_block should decrease dao contract depositors count when previous output is a dao cell and address interest change to zero" do
       CkbSync::Api.any_instance.stubs(:calculate_dao_maximum_withdraw).returns("0x174876ebe8")
       node_block = fake_node_block("0x3307186493c5da8b91917924253a5ffd35231151649d0c7e2941aa8801815063")
       VCR.use_cassette("blocks/#{DEFAULT_NODE_BLOCK_NUMBER}") do
@@ -743,21 +757,21 @@ class NodeDataProcessorTest < ActiveSupport::TestCase
       end
     end
 
-    test "#process_block should increase address subsidy when previous output is a dao cell" do
+    test "#process_block should increase address interest when previous output is a withdrawing cell" do
       CkbSync::Api.any_instance.stubs(:calculate_dao_maximum_withdraw).returns("0x174876ebe8")
       node_block = fake_node_block("0x3307186493c5da8b91917924253a5ffd35231151649d0c7e2941aa8801815063")
       VCR.use_cassette("blocks/#{DEFAULT_NODE_BLOCK_NUMBER}") do
         tx = fake_dao_withdraw_transaction(node_block)
-        withdraw_amount = tx.cell_outputs.dao.first.capacity
+        withdraw_amount = tx.cell_outputs.nervos_dao_withdrawing.first.capacity
         output = tx.cell_outputs.first
         address = output.address
         address.update(dao_deposit: output.capacity)
 
-        assert_difference -> { address.reload.subsidy }, "0x174876ebe8".hex - withdraw_amount do
+        assert_difference -> { address.reload.interest }, "0x174876ebe8".hex - withdraw_amount do
           node_data_processor.process_block(node_block)
         end
 
-        deposit_to_dao_events = Block.find_by(number: node_block.header.number).dao_events.where(event_type: "issue_subsidy")
+        deposit_to_dao_events = Block.find_by(number: node_block.header.number).dao_events.where(event_type: "issue_interest")
         assert_equal ["processed"], deposit_to_dao_events.pluck(:status).uniq
       end
     end
@@ -766,11 +780,11 @@ class NodeDataProcessorTest < ActiveSupport::TestCase
       dao_contract = DaoContract.default_contract
       init_total_deposit = 10**8 * 10000
       init_depositors_count = 3
-      init_subsidy_granted = 10**8 * 100
+      init_interest_granted = 10**8 * 100
       init_deposit_transactions_count = 2
       init_withdraw_transactions_count = 1
       init_total_depositors_count = 2
-      dao_contract.update(total_deposit: init_total_deposit, depositors_count: init_depositors_count, subsidy_granted: init_subsidy_granted, deposit_transactions_count: init_deposit_transactions_count, withdraw_transactions_count: init_withdraw_transactions_count, total_depositors_count: init_total_depositors_count)
+      dao_contract.update(total_deposit: init_total_deposit, depositors_count: init_depositors_count, interest_granted: init_interest_granted, deposit_transactions_count: init_deposit_transactions_count, withdraw_transactions_count: init_withdraw_transactions_count, total_depositors_count: init_total_depositors_count)
       prepare_node_data(HAS_UNCLES_BLOCK_NUMBER)
       local_block = Block.find_by(number: HAS_UNCLES_BLOCK_NUMBER)
       local_block.update(block_hash: "0x419c632366c8eb9635acbb39ea085f7552ae62e1fdd480893375334a0f37d1bx")
@@ -780,7 +794,7 @@ class NodeDataProcessorTest < ActiveSupport::TestCase
         dao_contract.reload
         assert_equal init_total_deposit, dao_contract.total_deposit
         assert_equal init_depositors_count, dao_contract.depositors_count
-        assert_equal init_subsidy_granted, dao_contract.subsidy_granted
+        assert_equal init_interest_granted, dao_contract.interest_granted
         assert_equal init_deposit_transactions_count, dao_contract.deposit_transactions_count
         assert_equal init_withdraw_transactions_count, dao_contract.withdraw_transactions_count
         assert_equal init_total_depositors_count, dao_contract.total_depositors_count
@@ -792,14 +806,14 @@ class NodeDataProcessorTest < ActiveSupport::TestCase
       local_block = Block.find_by(number: HAS_UNCLES_BLOCK_NUMBER)
       addresses = local_block.contained_addresses
       dao_deposits = addresses.map(&:dao_deposit)
-      dao_subsidies = addresses.map(&:subsidy)
+      dao_subsidies = addresses.map(&:interest)
       local_block.update(block_hash: "0x419c632366c8eb9635acbb39ea085f7552ae62e1fdd480893375334a0f37d1bx")
 
       VCR.use_cassette("blocks/#{HAS_UNCLES_BLOCK_NUMBER}", record: :new_episodes) do
         local_block = node_data_processor.call
 
         assert_equal dao_deposits, local_block.contained_addresses.map(&:dao_deposit)
-        assert_equal dao_subsidies, local_block.contained_addresses.map(&:subsidy)
+        assert_equal dao_subsidies, local_block.contained_addresses.map(&:interest)
       end
     end
 
@@ -989,7 +1003,7 @@ class NodeDataProcessorTest < ActiveSupport::TestCase
       end
     end
 
-    test "should decrease dao contract subsidy_granted when block is invalid and previous output is a dao cell" do
+    test "should decrease dao contract interest_granted when block is invalid and previous output is a dao cell" do
       CkbSync::Api.any_instance.stubs(:calculate_dao_maximum_withdraw).returns("0x174876ebe8")
       node_block = fake_node_block("0x3307186493c5da8b91917924253a5ffd35231151649d0c7e2941aa8801815063")
       VCR.use_cassette("blocks/#{DEFAULT_NODE_BLOCK_NUMBER}") do
@@ -1005,16 +1019,16 @@ class NodeDataProcessorTest < ActiveSupport::TestCase
       local_block.update(block_hash: "0x419c632366c8eb9635acbb39ea085f7552ae62e1fdd480893375334a0f37d1bx")
 
       VCR.use_cassette("blocks/#{DEFAULT_NODE_BLOCK_NUMBER}", record: :new_episodes) do
-        assert_difference -> { DaoContract.default_contract.reload.subsidy_granted }, -1000 do
+        assert_difference -> { DaoContract.default_contract.reload.interest_granted }, -1000 do
           node_data_processor.call
         end
 
-        deposit_to_dao_events = local_block.dao_events.where(event_type: "issue_subsidy")
+        deposit_to_dao_events = local_block.dao_events.where(event_type: "issue_interest")
         assert_equal ["reverted"], deposit_to_dao_events.pluck(:status).uniq
       end
     end
 
-    test "should decrease address subsidy when block is invalid and previous output is a dao cell" do
+    test "should decrease address interest when block is invalid and previous output is a dao cell" do
       CkbSync::Api.any_instance.stubs(:calculate_dao_maximum_withdraw).returns("0x174876ebe8")
       node_block = fake_node_block("0x3307186493c5da8b91917924253a5ffd35231151649d0c7e2941aa8801815063")
       target_address = nil
@@ -1031,11 +1045,11 @@ class NodeDataProcessorTest < ActiveSupport::TestCase
       local_block.update(block_hash: "0x419c632366c8eb9635acbb39ea085f7552ae62e1fdd480893375334a0f37d1bx")
 
       VCR.use_cassette("blocks/#{DEFAULT_NODE_BLOCK_NUMBER}", record: :new_episodes) do
-        assert_difference -> { target_address.reload.subsidy }, -1000 do
+        assert_difference -> { target_address.reload.interest }, -1000 do
           node_data_processor.call
         end
 
-        deposit_to_dao_events = local_block.dao_events.where(event_type: "issue_subsidy")
+        deposit_to_dao_events = local_block.dao_events.where(event_type: "issue_interest")
         assert_equal ["reverted"], deposit_to_dao_events.pluck(:status).uniq
       end
     end
@@ -1600,8 +1614,10 @@ def fake_dao_withdraw_transaction(node_block)
       block = create(:block, :with_block_hash)
       ckb_transaction1 = create(:ckb_transaction, tx_hash: "0x498315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", block: block)
       ckb_transaction2 = create(:ckb_transaction, tx_hash: "0x598315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", block: block)
-      create(:cell_output, ckb_transaction: ckb_transaction1, cell_index: 1, tx_hash: "0x498315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", generated_by: ckb_transaction2, block: block, cell_type: "dao", capacity: 10 ** 8 * 1000)
+      create(:cell_output, ckb_transaction: ckb_transaction1, cell_index: 1, tx_hash: "0x498315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", generated_by: ckb_transaction2, block: block, cell_type: "nervos_dao_withdrawing", capacity: 10 ** 8 * 1000, data: CKB::Utils.bin_to_hex("\x02" * 8))
+      create(:cell_output, ckb_transaction: ckb_transaction2, cell_index: 1, tx_hash: "0x398315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e2", generated_by: ckb_transaction1, block: block, consumed_by: ckb_transaction2, cell_type: "nervos_dao_deposit", capacity: 10**8 * 1000, data: CKB::Utils.bin_to_hex("\x00" * 8))
       create(:cell_output, ckb_transaction: ckb_transaction2, cell_index: 2, tx_hash: "0x598315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", generated_by: ckb_transaction1, block: block)
+
       tx = node_block.transactions.last
       tx.header_deps = ["0x0b3e980e4e5e59b7d478287e21cd89ffdc3ff5916ee26cf2aa87910c6a504d61"]
       tx.witnesses = %w(0x8ae8061ec879d66c0f3996ab60d7c2a21094b8739817beddaea1e28d3620a70a21497a692581ca352631a67f3f6659a7c47d9a0c6c2def79d3e39440918a66fef 0x4e52933358ae2f26863b8c1c71bf20f17489328820f8f2cd84a070069f10ceef784bc3693c3c51b93475a7b5dbf652ba6532d0580ecc1faf909f9fd53c5f6405000000000000000000)
@@ -1618,6 +1634,7 @@ def fake_dao_deposit_transaction(node_block)
       tx = node_block.transactions.first
       output = tx.outputs.first
       output.type = CKB::Types::Script.new(args: "0xb2e61ff569acf041b3c2c17724e2379c581eeac3", hash_type: "type", code_hash: ENV["DAO_TYPE_HASH"])
+      tx.outputs_data[0] = CKB::Utils.bin_to_hex("\x00" * 8)
       output.capacity = 10**8 * 1000
 
       tx
diff --git a/test/models/ckb_transaction_test.rb b/test/models/ckb_transaction_test.rb
index f3d2f25bb..5202e7661 100644
--- a/test/models/ckb_transaction_test.rb
+++ b/test/models/ckb_transaction_test.rb
@@ -115,21 +115,22 @@ class CkbTransactionTest < ActiveSupport::TestCase
     assert_equal expected_output_is, ckb_transaction.display_inputs.map{ |display_input| display_input[:id] }
   end
 
-  test "#display_inputs should return dao display input when cell type is dao" do
+  test "#display_inputs should return dao display input when cell type is nervos_dao_withdrawing" do
     prepare_node_data
-    CkbSync::Api.any_instance.stubs(:calculate_dao_maximum_withdraw).returns("0x2faf0be8")
+    CkbSync::Api.any_instance.stubs(:calculate_dao_maximum_withdraw).returns("0x177825f000")
     ckb_transaction = create(:ckb_transaction, :with_multiple_inputs_and_outputs, header_deps: [DEFAULT_NODE_BLOCK_HASH, "0xf85f8fe0d85a73a93e0a289ef14b4fb94228e47098a8da38986d6229c5606ea2"])
     dao_input = ckb_transaction.cell_inputs.first.previous_cell_output
     witness = ckb_transaction.witnesses[dao_input.cell_index]
     started_block_number = Block.find(dao_input.block_id).number
     ended_block_hash = ckb_transaction.header_deps[witness.hex]
     ended_block_number = Block.find_by(block_hash: ended_block_hash).number
-    dao_input.update(cell_type: "dao")
+    dao_input.update(cell_type: "nervos_dao_withdrawing")
+    deposit_cell = create(:cell_output, ckb_transaction: dao_input.generated_by, cell_index: 0, tx_hash: "0x398315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e2", generated_by: dao_input.generated_by, block: dao_input.generated_by.block, consumed_by: dao_input.generated_by, cell_type: "nervos_dao_deposit", capacity: 10**8 * 1000, data: CKB::Utils.bin_to_hex("\x00" * 8))
     out_point = CKB::Types::OutPoint.new(tx_hash: dao_input.tx_hash, index: dao_input.cell_index)
-    subsidy = CkbSync::Api.instance.calculate_dao_maximum_withdraw(out_point, ended_block_hash).hex - dao_input.capacity.to_i
+    interest = CkbSync::Api.instance.calculate_dao_maximum_withdraw(out_point, ended_block_hash).hex - deposit_cell.capacity.to_i
 
-    expected_display_input = { id: dao_input.id, from_cellbase: false, capacity: dao_input.capacity, address_hash: dao_input.address_hash, generated_tx_hash: dao_input.generated_by.tx_hash, started_block_number: started_block_number, ended_block_number: ended_block_number, subsidy: subsidy, cell_type: dao_input.cell_type, dao_type_hash: ENV["DAO_TYPE_HASH"] }.sort
-    expected_attributes = %i(id from_cellbase capacity address_hash generated_tx_hash started_block_number ended_block_number subsidy cell_type dao_type_hash).sort
+    expected_display_input = { id: dao_input.id, from_cellbase: false, capacity: dao_input.capacity, address_hash: dao_input.address_hash, generated_tx_hash: dao_input.generated_by.tx_hash, started_block_number: started_block_number, ended_block_number: ended_block_number, interest: interest, cell_type: dao_input.cell_type, dao_type_hash: ENV["DAO_TYPE_HASH"] }.sort
+    expected_attributes = %i(id from_cellbase capacity address_hash generated_tx_hash started_block_number ended_block_number interest cell_type dao_type_hash).sort
 
     assert_equal expected_attributes, ckb_transaction.display_inputs.first.keys.sort
     assert_equal expected_display_input, ckb_transaction.display_inputs.first.sort
@@ -138,7 +139,7 @@ class CkbTransactionTest < ActiveSupport::TestCase
   test "#display_outputs should contain dao attributes for dao transaction" do
     ckb_transaction = create(:ckb_transaction, :with_multiple_inputs_and_outputs)
     dao_output = ckb_transaction.outputs.first
-    dao_output.update(cell_type: "dao")
+    dao_output.update(cell_type: "nervos_dao_withdrawing")
     expected_attributes = %i(id capacity address_hash status consumed_tx_hash cell_type dao_type_hash).sort
     consumed_tx_hash = dao_output.live? ? nil : dao_output.consumed_by.tx_hash
     expected_display_output = { id: dao_output.id, capacity: dao_output.capacity, address_hash: dao_output.address_hash, status: dao_output.status, consumed_tx_hash: consumed_tx_hash, cell_type: dao_output.cell_type, dao_type_hash: ENV["DAO_TYPE_HASH"] }.sort
diff --git a/test/models/dao_contract_test.rb b/test/models/dao_contract_test.rb
index 2af2a800c..54e9c0d32 100644
--- a/test/models/dao_contract_test.rb
+++ b/test/models/dao_contract_test.rb
@@ -5,8 +5,8 @@ class DaoContractTest < ActiveSupport::TestCase
     should validate_presence_of(:total_deposit)
     should validate_numericality_of(:total_deposit).
       is_greater_than_or_equal_to(0)
-    should validate_presence_of(:subsidy_granted)
-    should validate_numericality_of(:subsidy_granted).
+    should validate_presence_of(:interest_granted)
+    should validate_numericality_of(:interest_granted).
       is_greater_than_or_equal_to(0)
     should validate_presence_of(:deposit_transactions_count)
     should validate_numericality_of(:deposit_transactions_count).
@@ -24,7 +24,7 @@ class DaoContractTest < ActiveSupport::TestCase
 
   test "should have correct columns" do
     dao_contract = create(:dao_contract)
-    expected_attributes = %w(created_at deposit_transactions_count depositors_count id subsidy_granted total_deposit total_depositors_count updated_at withdraw_transactions_count)
+    expected_attributes = %w(created_at deposit_transactions_count depositors_count id interest_granted total_deposit total_depositors_count updated_at withdraw_transactions_count)
     assert_equal expected_attributes, dao_contract.attributes.keys.sort
   end
 end
diff --git a/test/utils/ckb_utils_test.rb b/test/utils/ckb_utils_test.rb
index dffcf05e9..6ed7bb5ac 100644
--- a/test/utils/ckb_utils_test.rb
+++ b/test/utils/ckb_utils_test.rb
@@ -183,13 +183,14 @@ class CkbUtilsTest < ActiveSupport::TestCase
   end
 
   test ".ckb_transaction_fee should return right tx_fee when tx is dao withdraw tx" do
-    CkbSync::Api.any_instance.stubs(:calculate_dao_maximum_withdraw).returns("0x2faf0be8")
+    CkbSync::Api.any_instance.stubs(:calculate_dao_maximum_withdraw).returns("0x177825f000")
     node_block = fake_node_block("0x3307186493c5da8b91917924253a5ffd35231151649d0c7e2941aa8801815063")
     VCR.use_cassette("blocks/#{DEFAULT_NODE_BLOCK_NUMBER}") do
       block = create(:block, :with_block_hash)
       ckb_transaction1 = create(:ckb_transaction, tx_hash: "0x498315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", block: block)
       ckb_transaction2 = create(:ckb_transaction, tx_hash: "0x598315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", block: block)
-      create(:cell_output, ckb_transaction: ckb_transaction1, cell_index: 1, tx_hash: "0x498315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", generated_by: ckb_transaction2, block: block, cell_type: "dao")
+      create(:cell_output, ckb_transaction: ckb_transaction1, cell_index: 1, tx_hash: "0x498315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", generated_by: ckb_transaction2, block: block, cell_type: "nervos_dao_withdrawing")
+      create(:cell_output, ckb_transaction: ckb_transaction2, cell_index: 1, tx_hash: "0x398315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e2", generated_by: ckb_transaction1, block: block, consumed_by: ckb_transaction2, cell_type: "nervos_dao_deposit", capacity: 10**8 * 1000, data: CKB::Utils.bin_to_hex("\x00" * 8))
       create(:cell_output, ckb_transaction: ckb_transaction2, cell_index: 2, tx_hash: "0x598315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", generated_by: ckb_transaction1, block: block)
       tx = node_block.transactions.last
       tx.header_deps = ["0x0b3e980e4e5e59b7d478287e21cd89ffdc3ff5916ee26cf2aa87910c6a504d61"]
@@ -202,19 +203,20 @@ class CkbUtilsTest < ActiveSupport::TestCase
       input_capacities = { ckb_transaction.id => [800000000] }
       output_capacities = { ckb_transaction.id => [500000000] }
 
-      assert_equal 10**8 * 3 + 1000, CkbUtils.ckb_transaction_fee(ckb_transaction, input_capacities[ckb_transaction.id].sum, output_capacities[ckb_transaction.id].sum)
+      assert_equal 10**8 * 3 + 10**8 * 8, CkbUtils.ckb_transaction_fee(ckb_transaction, input_capacities[ckb_transaction.id].sum, output_capacities[ckb_transaction.id].sum)
     end
   end
 
   test ".ckb_transaction_fee should return right tx_fee when tx is dao withdraw tx and have multiple dao cell" do
-    CkbSync::Api.any_instance.stubs(:calculate_dao_maximum_withdraw).returns("0x2faf0be8")
+    CkbSync::Api.any_instance.stubs(:calculate_dao_maximum_withdraw).returns("0x177825f000")
     node_block = fake_node_block("0x3307186493c5da8b91917924253a5ffd35231151649d0c7e2941aa8801815063")
     VCR.use_cassette("blocks/#{DEFAULT_NODE_BLOCK_NUMBER}") do
       block = create(:block, :with_block_hash)
       ckb_transaction1 = create(:ckb_transaction, tx_hash: "0x498315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", block: block)
       ckb_transaction2 = create(:ckb_transaction, tx_hash: "0x598315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", block: block)
       create(:cell_output, ckb_transaction: ckb_transaction1, cell_index: 0, tx_hash: "0x498315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", generated_by: ckb_transaction1, block: block)
-      create(:cell_output, ckb_transaction: ckb_transaction1, cell_index: 1, tx_hash: "0x498315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", generated_by: ckb_transaction2, block: block, cell_type: "dao")
+      create(:cell_output, ckb_transaction: ckb_transaction1, cell_index: 1, tx_hash: "0x498315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", generated_by: ckb_transaction2, block: block, cell_type: "nervos_dao_withdrawing")
+      create(:cell_output, ckb_transaction: ckb_transaction2, cell_index: 1, tx_hash: "0x398315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e2", generated_by: ckb_transaction1, block: block, consumed_by: ckb_transaction2, cell_type: "nervos_dao_deposit", capacity: 10**8 * 1000, data: CKB::Utils.bin_to_hex("\x00" * 8))
       create(:cell_output, ckb_transaction: ckb_transaction2, cell_index: 2, tx_hash: "0x598315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", generated_by: ckb_transaction1, block: block)
       tx = node_block.transactions.last
       input = CKB::Types::Input.new(previous_output: CKB::Types::OutPoint.new(tx_hash: "0x498315db9c7ba144cca74d2e9122ac9b3a3da1641b2975ae321d91ec34f1c0e3", index: "0x0"))
@@ -228,7 +230,7 @@ class CkbUtilsTest < ActiveSupport::TestCase
       ckb_transaction = CkbTransaction.find_by(tx_hash: node_tx.hash)
       input_capacities = { ckb_transaction.id => [800000000] }
       output_capacities = { ckb_transaction.id => [500000000] }
-      expected_tx_fee = 10**8 * 16 + 1000 * 1 - 10**8 * 5
+      expected_tx_fee = 10**8 * 16 + 10**8 * 8 - 10**8 * 5
 
       assert_equal expected_tx_fee, CkbUtils.ckb_transaction_fee(ckb_transaction, input_capacities, output_capacities)
     end