Merge pull request #2450 from nervosnetwork/testnet

Deploy to mainnet

Author: zmcNotafraid

Gemfile

@@ -126,3 +126,4 @@ gem "jwt"
 
 gem "active_interaction", "~> 5.3"
 gem "bitcoinrb", require: "bitcoin"
+gem "paranoia", "~> 2.6.4"

Gemfile.lock

@@ -308,16 +308,14 @@ GEM
       net-protocol
     newrelic_rpm (8.12.0)
     nio4r (2.7.3)
-    nokogiri (1.17.1)
+    nokogiri (1.18.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.17.1-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.17.1-x86_64-linux)
-      racc (~> 1.4)
     pagy (5.10.1)
       activesupport
     parallel (1.22.1)
+    paranoia (2.6.4)
+      activerecord (>= 5.1, < 7.2)
     parser (3.2.2.0)
       ast (~> 2.4.1)
     pg (1.4.5)
@@ -348,7 +346,7 @@ GEM
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (2.2.10)
+    rack (2.2.13)
     rack-attack (6.6.1)
       rack (>= 1.0, < 3)
     rack-cache (1.13.0)
@@ -526,6 +524,7 @@ DEPENDENCIES
   net-smtp
   newrelic_rpm
   pagy
+  paranoia (~> 2.6.4)
   pg (>= 0.18, < 2.0)
   pry
   pry-byebug

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

@@ -7,22 +7,22 @@ def index
           @page_size = params.fetch(:page_size, FiberGraphNode.default_per_page)
           @nodes =
             if params[:q].present?
-              FiberGraphNode.where("node_name = :q or peer_id = :q or node_id = :q", q: params[:q]).page(@page).per(@page_size)
+              FiberGraphNode.with_deleted.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)
+              FiberGraphNode.with_deleted.page(@page).per(@page_size)
             end
         end
 
         def show
-          @node = FiberGraphNode.find_by(node_id: params[:node_id])
+          @node = FiberGraphNode.with_deleted.find_by(node_id: params[:node_id])
           raise Api::V2::Exceptions::FiberGraphNodeNotFoundError unless @node
 
-          @graph_channels = FiberGraphChannel.where(node1: params[:node_id]).or(
-            FiberGraphChannel.where(node2: params[:node_id]),
+          @graph_channels = FiberGraphChannel.with_deleted.where(node1: params[:node_id]).or(
+            FiberGraphChannel.with_deleted.where(node2: params[:node_id]),
           )
 
           if params[:status] == "closed"
-            @graph_channels = @graph_channels.where.not(closed_transaction_id: nil)
+            @graph_channels = @graph_channels.with_deleted.where.not(closed_transaction_id: nil)
           end
         end
 

app/models/fiber_graph_channel.rb

@@ -1,4 +1,6 @@
 class FiberGraphChannel < ApplicationRecord
+  acts_as_paranoid
+
   MAX_PAGINATES_PER = 100
   DEFAULT_PAGINATES_PER = 10
   paginates_per DEFAULT_PAGINATES_PER
@@ -45,6 +47,12 @@ def funding_cell
       lock_scripts: { code_hash: Settings.fiber_funding_code_hash },
     )
   end
+
+  def deleted_at_timestamp
+    return unless deleted_at
+
+    (deleted_at.to_f * 1000).to_i.to_s
+  end
 end
 
 # == Schema Information
@@ -67,8 +75,10 @@ def funding_cell
 #  last_updated_timestamp_of_node2 :bigint
 #  fee_rate_of_node1               :decimal(30, )    default(0)
 #  fee_rate_of_node2               :decimal(30, )    default(0)
+#  deleted_at                      :datetime
 #
 # Indexes
 #
 #  index_fiber_graph_channels_on_channel_outpoint  (channel_outpoint) UNIQUE
+#  index_fiber_graph_channels_on_deleted_at        (deleted_at)
 #

app/models/fiber_graph_node.rb

@@ -1,10 +1,12 @@
 class FiberGraphNode < ApplicationRecord
+  acts_as_paranoid
+
   MAX_PAGINATES_PER = 100
   DEFAULT_PAGINATES_PER = 10
   paginates_per DEFAULT_PAGINATES_PER
   max_paginates_per MAX_PAGINATES_PER
 
-  has_many :fiber_udt_cfg_infos, dependent: :delete_all
+  has_many :fiber_udt_cfg_infos, dependent: :destroy
 
   def channel_links
     FiberGraphChannel.where(node1: node_id).or(FiberGraphChannel.where(node2: node_id)).
@@ -27,6 +29,23 @@ def connected_node_ids
   def open_channels_count
     channel_links.count
   end
+
+  def last_updated_timestamp
+    node1_timestamps = FiberGraphChannel.where(node1: node_id).pluck(:last_updated_timestamp_of_node1)
+    node2_timestamps = FiberGraphChannel.where(node2: node_id).pluck(:last_updated_timestamp_of_node2)
+    closed_transaction_ids = FiberGraphChannel.where(node1: node_id).
+      or(FiberGraphChannel.where(node2: node_id)).
+      where.not(closed_transaction_id: nil).pluck(:closed_transaction_id)
+    block_timestamps = CkbTransaction.where(id: closed_transaction_ids).pluck(:block_timestamp)
+
+    [timestamp, *node1_timestamps, *node2_timestamps, *block_timestamps].compact.max.to_s
+  end
+
+  def deleted_at_timestamp
+    return unless deleted_at
+
+    (deleted_at.to_f * 1000).to_i.to_s
+  end
 end
 
 # == Schema Information
@@ -43,8 +62,10 @@ def open_channels_count
 #  created_at                         :datetime         not null
 #  updated_at                         :datetime         not null
 #  peer_id                            :string
+#  deleted_at                         :datetime
 #
 # Indexes
 #
-#  index_fiber_graph_nodes_on_node_id  (node_id) UNIQUE
+#  index_fiber_graph_nodes_on_deleted_at  (deleted_at)
+#  index_fiber_graph_nodes_on_node_id     (node_id) UNIQUE
 #

app/models/fiber_udt_cfg_info.rb

@@ -1,4 +1,6 @@
 class FiberUdtCfgInfo < ApplicationRecord
+  acts_as_paranoid
+
   belongs_to :fiber_graph_node
   belongs_to :udt
 
@@ -17,8 +19,10 @@ def udt_info
 #  auto_accept_amount  :decimal(64, 2)   default(0.0)
 #  created_at          :datetime         not null
 #  updated_at          :datetime         not null
+#  deleted_at          :datetime
 #
 # Indexes
 #
+#  index_fiber_udt_cfg_infos_on_deleted_at                      (deleted_at)
 #  index_fiber_udt_cfg_infos_on_fiber_graph_node_id_and_udt_id  (fiber_graph_node_id,udt_id) UNIQUE
 #

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, :node_name, :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, :last_updated_timestamp, :deleted_at_timestamp)
     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,12 +1,12 @@
 json.data do
-  json.(@node, :node_name, :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, :last_updated_timestamp, :deleted_at_timestamp)
   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
   json.udt_cfg_infos @node.udt_cfg_infos
 
   json.fiber_graph_channels @graph_channels do |channel|
-    json.(channel, :channel_outpoint, :node1, :node2, :chain_hash, :open_transaction_info, :closed_transaction_info, :udt_info)
+    json.(channel, :channel_outpoint, :node1, :node2, :chain_hash, :open_transaction_info, :closed_transaction_info, :udt_info, :deleted_at_timestamp)
     json.last_updated_timestamp_of_node1 channel.last_updated_timestamp_of_node1.to_s
     json.last_updated_timestamp_of_node2 channel.last_updated_timestamp_of_node2.to_s
     json.fee_rate_of_node1 channel.fee_rate_of_node1.to_s

app/workers/fiber_graph_detect_worker.rb

@@ -62,6 +62,7 @@ def upsert_node_with_cfg_info(node)
       chain_hash: node["chain_hash"],
       peer_id: extract_peer_id(node["addresses"]),
       auto_accept_min_ckb_funding_amount: node["auto_accept_min_ckb_funding_amount"],
+      deleted_at: nil,
     }
     @graph_node_ids << node_attributes[:node_id]
     fiber_graph_node = FiberGraphNode.upsert(node_attributes, unique_by: %i[node_id], returning: %i[id])
@@ -76,6 +77,7 @@ def upsert_node_with_cfg_info(node)
         fiber_graph_node_id: fiber_graph_node[0]["id"],
         udt_id: udt.id,
         auto_accept_amount: info["auto_accept_amount"].to_i(16),
+        deleted_at: nil,
       }
     end.compact
 
@@ -104,6 +106,7 @@ def build_channel_attributes(channel)
       chain_hash: channel["chain_hash"],
       open_transaction_id: open_transaction&.id,
       udt_id: udt&.id,
+      deleted_at: nil,
     }
   end
 

app/workers/pool_transaction_check_worker.rb

@@ -6,10 +6,10 @@ class PoolTransactionCheckWorker
 
   def perform
     pending_transactions = CkbTransaction.tx_pending.where("created_at < ?",
-                                                           5.minutes.ago).limit(100)
+                                                           10.minutes.ago).limit(100)
     pending_transactions.each do |tx|
       committed_tx = CkbTransaction.find_by(tx_hash: tx.tx_hash, tx_status: "committed")
-      if committed_tx
+      if committed_tx && tx.reload.tx_pending?
         tx.cell_inputs.delete_all
         tx.delete
       else