Merge pull request #2630 from nervosnetwork/testnet

Deploy to mainnet

Author: zmcNotafraid

app/models/block.rb

@@ -328,33 +328,10 @@ def update_counter_for_ckb_node_version
       return
     end
 
-    # setup global ckb_node_version
-    name = "ckb_node_version_#{matched[0]}"
-    GlobalStatistic.increment(name)
-
     # update the current block's ckb_node_version
     self.ckb_node_version = matched[0]
     save!
   end
-
-  # NOTICE: this method would do a fresh calculate for all the block's ckb_node_version, it will:
-  # 1. delete all the existing ckb_node_version_x.yyy.z
-  # 2. do a fresh calculate from block number 1 to the latest block at the moment
-  #
-  # USAGE:
-  # ```bash
-  # $ bundle exec rails runner Block.set_ckb_node_versions_from_miner_message
-  # ```
-  #
-  # @param options [Hash]
-  def self.set_ckb_node_versions_from_miner_message(options = {})
-    GlobalStatistic.where("name like ?", "ckb_node_version_%").delete_all
-    to_block_number = options[:to_block_number] || Block.last.number
-    # we only need last 100k blocks updated.
-    Block.last(100000).each do |block|
-      block.update_counter_for_ckb_node_version
-    end
-  end
 end
 
 # == Schema Information

app/models/ckb_sync/new_node_data_processor.rb

@@ -97,7 +97,7 @@ def process_block(node_block, refresh_balance: true)
       detect_token_transfer(token_transfer_ckb_tx_ids)
       detect_bitcoin_transactions(local_block)
 
-      # local_block.update_counter_for_ckb_node_version
+      local_block.update_counter_for_ckb_node_version
       local_block
     end
 

test/controllers/api/v2/blocks_controller_test.rb

@@ -23,8 +23,6 @@ def setup
         witness = Witness.new data: "0x750000000c00000055000000490000001000000030000000310000009bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce801140000007164f48d7a5bf2298166f8d81b81ea4e908e16ad1c000000302e3130332e3020286537373133386520323032322d30342d313129"
         Block.any_instance.stubs(:cellbase).returns(cellbase)
         CkbTransaction.any_instance.stubs(:witnesses).returns([witness])
-
-        Block.set_ckb_node_versions_from_miner_message
       end
       test "should get ckb_node_versions " do
         assert_equal Block.all.size, 4

test/models/block_test.rb

@@ -286,29 +286,6 @@ class BlockTest < ActiveSupport::TestCase
     assert_equal result_last_7_days_ckb_node_version, result_sql
   end
 
-  test "it should update_counter_for_ckb_node_version" do
-    block1 = create(:block, block_hash: "001")
-    tx = create(:ckb_transaction, is_cellbase: true, block_id: block1.id,
-                                  witnesses: ["0x640000000c00000055000000490000001000000030000000310000009bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce801140000004a336470564d07ca7059b7980481c2d59809d6370b000000302e3130342e3120282029"])
-
-    block1.update_counter_for_ckb_node_version
-
-    assert_equal GlobalStatistic.find_by(name: "ckb_node_version_0.104.1").value, 1
-  end
-
-  test "it should update the block version" do
-    block2 = create(:block, :with_block_hash)
-    tx = create(:ckb_transaction, is_cellbase: true, block: block2,
-                                  witnesses: ["0x800000000c00000055000000490000001000000030000000310000009bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce80114000000dde7801c073dfb3464c7b1f05b806bb2bbb84e9927000000302e3130332e302028353161383134612d646972747920323032322d30342d3230292000000000"])
-    block3 = create(:block, :with_block_hash)
-    tx = create(:ckb_transaction, is_cellbase: true, block: block3,
-                                  witnesses: ["0x640000000c00000055000000490000001000000030000000310000009bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce801140000004a336470564d07ca7059b7980481c2d59809d6370b000000302e3130342e3120282029"])
-
-    Block.set_ckb_node_versions_from_miner_message
-    assert_equal GlobalStatistic.find_by(name: "ckb_node_version_0.104.1").value, 1
-    assert_equal GlobalStatistic.find_by(name: "ckb_node_version_0.103.0").value, 1
-  end
-
   test "cached_find not always return nil" do
     assert_nil Block.cached_find("111111")
     create(:block, number: 111111)