Merge pull request #2473 from nervosnetwork/testnet

Deploy to mainnet

Author: zmcNotafraid

app/models/fiber_graph_node.rb

@@ -46,6 +46,10 @@ def deleted_at_timestamp
 
     (deleted_at.to_f * 1000).to_i.to_s
   end
+
+  def created_timestamp
+    (created_at.to_f * 1000).to_i.to_s
+  end
 end
 
 # == Schema Information

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

@@ -1,6 +1,7 @@
 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, :last_updated_timestamp, :deleted_at_timestamp)
+    json.(node, :node_name, :node_id, :addresses, :peer_id, :timestamp, :chain_hash, :connected_node_ids, :open_channels_count,
+          :last_updated_timestamp, :deleted_at_timestamp, :created_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,5 +1,6 @@
 json.data do
-  json.(@node, :node_name, :node_id, :addresses, :peer_id, :timestamp, :chain_hash, :connected_node_ids, :last_updated_timestamp, :deleted_at_timestamp)
+  json.(@node, :node_name, :node_id, :addresses, :peer_id, :timestamp, :chain_hash, :connected_node_ids, :last_updated_timestamp,
+        :deleted_at_timestamp, :created_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

lib/tasks/migration/fill_account_book_block_number_and_tx_index.rake

@@ -1,25 +1,25 @@
 namespace :migration do
   desc "Usage: RAILS_ENV=production bundle exec rake migration:fill_account_book_block_number_and_tx_index[0,1000000]"
   task :fill_account_book_block_number_and_tx_index, %i[start_block end_block] => :environment do |_, args|
-    ActiveRecord::Base.connection.execute("SET statement_timeout = 0")
     $missed_tx_ids = []
     (args[:start_block].to_i..args[:end_block].to_i).to_a.each do |block_number|
       puts block_number
       attrs = Set.new
-      CkbTransaction.joins(:block).includes(:inputs, :outputs).where(block: { number: block_number }).where(is_cellbase: false).each do |tx|
+      CkbTransaction.joins(:block).includes(:inputs, :outputs).where(block: { number: block_number }).each do |tx|
         outputs = tx.outputs.pluck(:address_id, :capacity).group_by { |item| item[0] }.
           transform_values { |values| values.sum { |v| v[1] } }
         inputs = tx.inputs.pluck(:address_id, :capacity).group_by { |item| item[0] }.
           transform_values { |values| values.sum { |v| v[1] } }
         address_ids = (outputs.keys + inputs.keys).uniq
-        exists = ensure_all_data_exists(address_ids, tx.id)
-        if exists
-          address_ids.each do |address_id|
-            income = (outputs[address_id] || 0) - (inputs[address_id] || 0)
-            attrs << { address_id:, ckb_transaction_id: tx.id, income:, block_number: tx.block_number, tx_index: tx.tx_index }
+        if address_ids.present?
+          if ensure_all_data_exists(address_ids, tx.id)
+            address_ids.each do |address_id|
+              income = (outputs[address_id] || 0) - (inputs[address_id] || 0)
+              attrs << { address_id:, ckb_transaction_id: tx.id, income:, block_number: tx.block_number, tx_index: tx.tx_index }
+            end
+          else
+            $missed_tx_ids << tx.id
           end
-        else
-          $missed_tx_ids << tx.id
         end
       end
       AccountBook.upsert_all(attrs.to_a, unique_by: %i[address_id ckb_transaction_id]) if attrs.present?

lib/tasks/migration/fill_account_book_block_number_and_tx_index_for_cellbase.rake

@@ -0,0 +1,40 @@
+namespace :migration do
+  desc "Usage: RAILS_ENV=production bundle exec rake migration:fill_account_book_block_number_and_tx_index_for_cellbase[0,1000000]"
+  task :fill_account_book_block_number_and_tx_index_for_cellbase, %i[start_block end_block] => :environment do |_, args|
+    $missed_tx_ids = []
+    (args[:start_block].to_i..args[:end_block].to_i).to_a.each do |block_number|
+      puts block_number
+      attrs = Set.new
+      CkbTransaction.joins(:block).includes(:inputs, :outputs).where(block: { number: block_number }).where(is_cellbase: true).each do |tx|
+        outputs = tx.outputs.pluck(:address_id, :capacity).group_by { |item| item[0] }.
+          transform_values { |values| values.sum { |v| v[1] } }
+        inputs = tx.inputs.pluck(:address_id, :capacity).group_by { |item| item[0] }.
+          transform_values { |values| values.sum { |v| v[1] } }
+        address_ids = (outputs.keys + inputs.keys).uniq
+        if address_ids.present?
+          if ensure_all_data_exists(address_ids, tx.id)
+            address_ids.each do |address_id|
+              income = (outputs[address_id] || 0) - (inputs[address_id] || 0)
+              attrs << { address_id:, ckb_transaction_id: tx.id, income:, block_number: tx.block_number, tx_index: tx.tx_index }
+            end
+          else
+            $missed_tx_ids << tx.id
+          end
+        end
+      end
+      AccountBook.upsert_all(attrs.to_a, unique_by: %i[address_id ckb_transaction_id]) if attrs.present?
+    end
+
+    puts $missed_tx_ids.join(",")
+    puts "done"
+  end
+  def ensure_all_data_exists(address_ids, tx_id)
+    data =
+      address_ids.map do |address_id|
+        { address_id:, ckb_transaction_id: tx_id }
+      end
+    query_conditions = data.map { |d| "(address_id = #{d[:address_id]} AND ckb_transaction_id = #{d[:ckb_transaction_id]})" }.join(" OR ")
+    existing_records = AccountBook.where(query_conditions).pluck(:address_id, :ckb_transaction_id)
+    data.map(&:values).to_set.subset?(existing_records.to_set)
+  end
+end