Merge pull request #2398 from nervosnetwork/testnet

Deploy to mainnet

Author: zmcNotafraid

app/controllers/api/v2/fiber/graph_nodes_controller.rb

@@ -7,7 +7,7 @@ def index
           @page_size = params.fetch(:page_size, FiberGraphNode.default_per_page)
           @nodes =
             if params[:q].present?
-              FiberGraphNode.where("alias = :q or peer_id = :q or node_id = :q", q: params[:q]).page(@page).per(@page_size)
+              FiberGraphNode.where("node_name = :q or peer_id = :q or node_id = :q", q: params[:q]).page(@page).per(@page_size)
             else
               FiberGraphNode.all.page(@page).per(@page_size)
             end

app/models/block.rb

@@ -285,10 +285,15 @@ def invalid!
     uncle_blocks.delete_all
     # delete_address_txs_cache
     ckb_transaction_ids = ckb_transactions.pluck(:id)
+    tx_hashes = ckb_transactions.pluck(:tx_hash)
     CellOutput.where(ckb_transaction_id: ckb_transaction_ids).delete_all
     CellInput.where(ckb_transaction_id: ckb_transaction_ids).delete_all
     AccountBook.where(ckb_transaction_id: ckb_transaction_ids).delete_all
     CellDependency.where(ckb_transaction_id: ckb_transaction_ids).delete_all
+    cell_deps = CellDepsOutPoint.where(tx_hash: tx_hashes).select(:tx_hash, :cell_index)
+    cell_deps.each do |cell_dep|
+      Rails.cache.delete(["cell_output", cell_dep.tx_hash, cell_dep.cell_index])
+    end
     HeaderDependency.where(ckb_transaction_id: ckb_transaction_ids).delete_all
     TokenTransfer.where(transaction_id: ckb_transaction_ids).delete_all
     Witness.where(ckb_transaction_id: ckb_transaction_ids).delete_all

app/models/daily_statistic.rb

@@ -1,5 +1,5 @@
 # TODO
-# remove dao_depositors_count daily_dao_withdraw nodes_distribution nodes_count average_block_time columns
+# remove daily_dao_withdraw nodes_distribution nodes_count average_block_time columns
 class DailyStatistic < ApplicationRecord
   include AttrLogics
 
@@ -216,6 +216,10 @@ def liquidity
                                                                select(:address_id)).distinct.count(:address_id)
   end
 
+  define_logic :dao_depositors_count do
+    DaoEvent.depositor.created_before(ended_at).distinct.count(:address_id)
+  end
+
   define_logic :circulation_ratio do
     total_dao_deposit.to_i / circulating_supply
   end
@@ -512,7 +516,7 @@ def yesterday_daily_statistic
         if to_be_counted_date.beginning_of_day.to_i == Time.at(GENESIS_TIMESTAMP / 1000).in_time_zone.beginning_of_day.to_i \
           || aggron_first_day? \
           || yesterday_statistic.blank?
-          OpenStruct.new(addresses_count: 0, total_dao_deposit: 0,
+          OpenStruct.new(addresses_count: 0, total_dao_deposit: 0, dao_depositors_count: 0,
                          unclaimed_compensation: 0, claimed_compensation: 0,
                          average_deposit_time: 0, mining_reward: 0, deposit_compensation: 0,
                          treasury_amount: 0, total_depositors_count: 0,

app/models/fiber_graph_node.rb

@@ -34,7 +34,7 @@ def open_channels_count
 # Table name: fiber_graph_nodes
 #
 #  id                                 :bigint           not null, primary key
-#  alias                              :string
+#  node_name                          :string
 #  node_id                            :string
 #  addresses                          :string           default([]), is an Array
 #  timestamp                          :bigint

app/models/suggest_query.rb

@@ -163,7 +163,7 @@ def find_fiber_graph_nodes
       else
         query_key
       end
-    fiber_graph_nodes = FiberGraphNode.where("alias = :query_key or peer_id = :query_key or node_id = :query_key", query_key: normalized_key)
+    fiber_graph_nodes = FiberGraphNode.where("node_name = :query_key or peer_id = :query_key or node_id = :query_key", query_key: normalized_key)
     FiberGraphNodeSerializer.new(fiber_graph_nodes) if fiber_graph_nodes.present?
   end
 end

app/serializers/fiber_graph_node_serializer.rb

@@ -1,6 +1,6 @@
 class FiberGraphNodeSerializer
   include FastJsonapi::ObjectSerializer
 
-  attributes :id, :alias, :node_id, :peer_id, :addresses, :timestamp, :chain_hash,
+  attributes :id, :node_name, :node_id, :peer_id, :addresses, :timestamp, :chain_hash,
              :auto_accept_min_ckb_funding_amount
 end

app/services/charts/daily_statistic_generator.rb

@@ -30,7 +30,7 @@ def updated_attrs
         daily_dao_depositors_count total_depositors_count unclaimed_compensation claimed_compensation deposit_compensation daily_dao_deposit total_dao_deposit circulating_supply circulation_ratio
       }
       others = %i{
-        block_timestamp transactions_count addresses_count
+        dao_depositors_count block_timestamp transactions_count addresses_count
         average_deposit_time mining_reward knowledge_size
         treasury_amount estimated_apc live_cells_count dead_cells_count avg_hash_rate
         avg_difficulty uncle_rate address_balance_distribution

app/views/api/v2/fiber/graph_nodes/index.jbuilder

@@ -1,6 +1,6 @@
 json.data do
   json.fiber_graph_nodes @nodes do |node|
-    json.(node, :alias, :node_id, :addresses, :peer_id, :timestamp, :chain_hash, :connected_node_ids, :open_channels_count)
+    json.(node, :node_name, :node_id, :addresses, :peer_id, :timestamp, :chain_hash, :connected_node_ids, :open_channels_count)
     json.timestamp node.timestamp.to_s
     json.auto_accept_min_ckb_funding_amount node.auto_accept_min_ckb_funding_amount.to_s
     json.total_capacity node.total_capacity.to_s

app/views/api/v2/fiber/graph_nodes/show.jbuilder

@@ -1,5 +1,5 @@
 json.data do
-  json.(@node, :alias, :node_id, :addresses, :peer_id, :timestamp, :chain_hash, :connected_node_ids)
+  json.(@node, :node_name, :node_id, :addresses, :peer_id, :timestamp, :chain_hash, :connected_node_ids)
   json.timestamp @node.timestamp.to_s
   json.auto_accept_min_ckb_funding_amount @node.auto_accept_min_ckb_funding_amount.to_s
   json.total_capacity @node.total_capacity.to_s

app/workers/fiber_graph_detect_worker.rb

@@ -14,7 +14,6 @@ def perform
     FiberGraphNode.where.not(node_id: @graph_node_ids).destroy_all
     # purge outdated graph channels
     FiberGraphChannel.where.not(channel_outpoint: @graph_channel_outpoints).destroy_all
-
     # check channel is closed
     FiberGraphChannel.open_channels.each do |channel|
       funding_cell = channel.funding_cell
@@ -62,7 +61,7 @@ def fetch_channels(last_cursor)
 
   def upsert_node_with_cfg_info(node)
     node_attributes = {
-      alias: node["alias"],
+      node_name: node["node_name"],
       node_id: node["node_id"],
       addresses: node["addresses"],
       timestamp: node["timestamp"].to_i(16),