Merge pull request #2658 from nervosnetwork/testnet

Deploy to mainnet

Author: u2

app/models/block.rb

@@ -81,8 +81,10 @@ def self.fetch_transaction_fee_rate_from_cache(date_string)
   end
 
   def self.last_7_days_ckb_node_version
-    from = 7.days.ago.to_i * 1000
-    sql = "select ckb_node_version, count(*) from blocks where timestamp >= #{from} group by ckb_node_version order by 1 asc;"
+    # for better query performance, we use epoch instead of timestamp here, it will utilize the index of `blocks.epoch`.
+    # one epoch is 4 hours approximately, so we can get the last 42 epochs
+    from = self.tip_block.epoch - 42
+    sql = "select ckb_node_version, count(*) from blocks where epoch >= #{from} group by ckb_node_version order by 1 asc;"
     connection.execute(sql).values
   end
 

test/models/block_test.rb

@@ -277,15 +277,6 @@ class BlockTest < ActiveSupport::TestCase
                  block.proposals
   end
 
-  test "it should get last_7_days_ckb_node_version" do
-    result_last_7_days_ckb_node_version = Block.last_7_days_ckb_node_version
-    from = 7.days.ago.to_i * 1000
-    sql = "select ckb_node_version, count(*) from blocks where timestamp >= #{from} group by ckb_node_version;"
-    result_sql = ActiveRecord::Base.connection.execute(sql).values
-
-    assert_equal result_last_7_days_ckb_node_version, result_sql
-  end
-
   test "cached_find not always return nil" do
     assert_nil Block.cached_find("111111")
     create(:block, number: 111111)