From f7f6844f43dbeb66d4ca02d2e536dc9fa88a2ea9 Mon Sep 17 00:00:00 2001 From: shaojunda Date: Tue, 7 Jul 2020 14:01:56 +0800 Subject: [PATCH 01/10] feat: add maintenance info to statistic info --- app/models/statistic_info.rb | 4 ++++ app/serializers/statistic_serializer.rb | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/app/models/statistic_info.rb b/app/models/statistic_info.rb index f7bef85d9..7f36c52cc 100644 --- a/app/models/statistic_info.rb +++ b/app/models/statistic_info.rb @@ -81,6 +81,10 @@ def blockchain_info end end + def maintenance_info + Rails.cache.fetch("maintenance_info") + end + private attr_reader :hash_rate_statistical_interval, :average_block_time_interval diff --git a/app/serializers/statistic_serializer.rb b/app/serializers/statistic_serializer.rb index 6aabc795f..1cfe76c43 100644 --- a/app/serializers/statistic_serializer.rb +++ b/app/serializers/statistic_serializer.rb @@ -28,4 +28,8 @@ class StatisticSerializer attribute :address_balance_ranking, if: Proc.new { |_record, params| params && params[:info_name] == "address_balance_ranking" } + + attribute :maintenance_info, if: Proc.new { |_record, params| + params && params[:info_name] == "maintenance_info" + } end From d02720cccb7d2c9d50d7c3831b646557eba914e1 Mon Sep 17 00:00:00 2001 From: shaojunda Date: Tue, 7 Jul 2020 14:04:46 +0800 Subject: [PATCH 02/10] feat: add task to set maintenance info --- lib/tasks/set_maintenance_info.rake | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 lib/tasks/set_maintenance_info.rake diff --git a/lib/tasks/set_maintenance_info.rake b/lib/tasks/set_maintenance_info.rake new file mode 100644 index 000000000..24164a0c3 --- /dev/null +++ b/lib/tasks/set_maintenance_info.rake @@ -0,0 +1,19 @@ +desc "Usage: RAILS_ENV=production bundle exec rake 'set_maintenance_info[2020-06-09 00:00:00, nil]'" +task :set_maintenance_info, [:start_at, :end_at, :dry_run] => :environment do |_, args| + raise "please input start at" if args[:start_at].blank? + + start_at = Time.parse(args[:start_at]) + dry_run = args[:dry_run] || "true" + if args[:end_at] != "nil" + end_at = Time.parse(args[:end_at]) + else + end_at = start_at + 2.hours + end + if dry_run == "true" + puts "start_at: #{start_at}" + puts "end_at: #{end_at}" + else + info = { start_at: start_at, end_at: end_at } + Rails.cache.write("maintenance_info", info) + end +end From 6671907758d4d4e1899d3ed2ee1c557b3c7191f0 Mon Sep 17 00:00:00 2001 From: shaojunda Date: Tue, 7 Jul 2020 14:40:08 +0800 Subject: [PATCH 03/10] chore: use timestamp on maintenance info --- lib/tasks/set_maintenance_info.rake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/tasks/set_maintenance_info.rake b/lib/tasks/set_maintenance_info.rake index 24164a0c3..c7ba6a361 100644 --- a/lib/tasks/set_maintenance_info.rake +++ b/lib/tasks/set_maintenance_info.rake @@ -2,10 +2,10 @@ desc "Usage: RAILS_ENV=production bundle exec rake 'set_maintenance_info[2020-06 task :set_maintenance_info, [:start_at, :end_at, :dry_run] => :environment do |_, args| raise "please input start at" if args[:start_at].blank? - start_at = Time.parse(args[:start_at]) + start_at = Time.parse(args[:start_at]).utc dry_run = args[:dry_run] || "true" if args[:end_at] != "nil" - end_at = Time.parse(args[:end_at]) + end_at = Time.parse(args[:end_at]).utc else end_at = start_at + 2.hours end @@ -13,7 +13,8 @@ task :set_maintenance_info, [:start_at, :end_at, :dry_run] => :environment do |_ puts "start_at: #{start_at}" puts "end_at: #{end_at}" else - info = { start_at: start_at, end_at: end_at } + info = { start_at: start_at.to_i, end_at: end_at.to_i } + puts "inf: #{info}" Rails.cache.write("maintenance_info", info) end end From 8aa4fe7a40974df1237d1e8b7267af6ebd70c4d1 Mon Sep 17 00:00:00 2001 From: shaojunda Date: Tue, 7 Jul 2020 15:18:39 +0800 Subject: [PATCH 04/10] doc: add maintenance_info --- doc/api.raml | 28 ++++++++++++++++++++++++++++ public/api_doc.html | 14 +++++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/doc/api.raml b/doc/api.raml index 2a6130096..24953682b 100644 --- a/doc/api.raml +++ b/doc/api.raml @@ -546,6 +546,21 @@ types: "address_balance_ranking": { type: "address_balance_ranking" } + "maintenance_info": { + type: "maintenance_info" + } + } + } + + maintenance_info: { + type: object, + properties: { + "stat_at": { + type: "string" + }, + "end_at": { + type: "string" + } } } @@ -2475,6 +2490,19 @@ types: } } } + maintenance_info: | + { + "data": { + "id": "1594105429", + "type": "statistic", + "attributes": { + "maintenance_info": { + "start_at": "1591632000", + "end_at": "1591639200" + } + } + } + } 404: body: application/vnd.api+json: diff --git a/public/api_doc.html b/public/api_doc.html index 62071c180..1fd2f10a6 100644 --- a/public/api_doc.html +++ b/public/api_doc.html @@ -1083,7 +1083,7 @@ } ] } -

get

get

Returns the specific statistic info

Returns the specific statistic info

URI Parameters

  • info_name: required(string)

    The statistic info name

HTTP status code 200

Body

Media type: application/vnd.api+json

Type: object

Properties
  • data: required(object)
    • tip_block_number: required(string)
    • average_block_time: required(string)
    • current_epoch_difficulty: required(string)
    • hash_rate: required(string)
    • blockchain_info: required(object)
      • address_balance_ranking: required(object)
        • ranking: required(string)
        • address: required(string)
        • balance: required(string)

    Examples:

    tip_block_number:

    {
+

    get

    get

    Returns the specific statistic info

    Returns the specific statistic info

    URI Parameters

    • info_name: required(string)

      The statistic info name

    HTTP status code 200

    Body

    Media type: application/vnd.api+json

    Type: object

    Properties
    • data: required(object)
      • tip_block_number: required(string)
      • average_block_time: required(string)
      • current_epoch_difficulty: required(string)
      • hash_rate: required(string)
      • blockchain_info: required(object)
        • address_balance_ranking: required(object)
          • ranking: required(string)
          • address: required(string)
          • balance: required(string)
        • maintenance_info": required(object)
          • stat_at: required(string)
          • end_at: required(string)

      Examples:

      tip_block_number:

      {
   "data": {
     "id": "1",
     "type": "statistic_info",
@@ -1208,6 +1208,18 @@
     }
   }
 }
+

      maintenance_info:

      {
+  "data": {
+      "id": "1594105429",
+      "type": "statistic",
+      "attributes": {
+         "maintenance_info": {
+           "start_at": "1591632000",
+           "end_at": "1591639200"
+         }
+       }
+   }
+}

      HTTP status code 404

      Body

      Media type: application/vnd.api+json

      Type: object

      Properties
      • message: required(string)
      • errors: required(array of error)

        Items: error

        • id: required(string)

          A unique identifier for the specific instance of the error

        • code: required(string)

          an application-specific error code

        • status: required(string)

          the HTTP status code applicable to this problem

        • title: required(string)

          a short, human-readable summary of the problem

        • detail: required(string)

          A more in-depth, human-readable description of the error and how to resolve it

        • href: required(string)

          A URL that the developer can use to learn more about the issue

      Example:

      {
   "message": "Record Not Found",
   "errors": [

From 878c3b0bebb15302df31477cd2f0e8c082c1ce8b Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Tue, 7 Jul 2020 15:19:36 +0800
Subject: [PATCH 05/10] chore: convert maintenance into to string

---
 lib/tasks/set_maintenance_info.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/set_maintenance_info.rake b/lib/tasks/set_maintenance_info.rake
index c7ba6a361..d56ac5da4 100644
--- a/lib/tasks/set_maintenance_info.rake
+++ b/lib/tasks/set_maintenance_info.rake
@@ -13,7 +13,7 @@ task :set_maintenance_info, [:start_at, :end_at, :dry_run] => :environment do |_
     puts "start_at: #{start_at}"
     puts "end_at: #{end_at}"
   else
-    info = { start_at: start_at.to_i, end_at: end_at.to_i }
+    info = { start_at: start_at.to_i.to_s, end_at: end_at.to_i.to_s }
     puts "inf: #{info}"
     Rails.cache.write("maintenance_info", info)
   end

From 95a4eeb8472d07b0c24bc08c92c0b974eb9e93db Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Tue, 7 Jul 2020 16:21:06 +0800
Subject: [PATCH 06/10] feat: add flush cache info

---
 app/models/statistic_info.rb            | 4 ++++
 app/serializers/statistic_serializer.rb | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/app/models/statistic_info.rb b/app/models/statistic_info.rb
index 7f36c52cc..569122e8e 100644
--- a/app/models/statistic_info.rb
+++ b/app/models/statistic_info.rb
@@ -85,6 +85,10 @@ def maintenance_info
     Rails.cache.fetch("maintenance_info")
   end
 
+  def flush_cache_info
+    Rails.cache.realize("flush_cache_info") || []
+  end
+
   private
 
   attr_reader :hash_rate_statistical_interval, :average_block_time_interval
diff --git a/app/serializers/statistic_serializer.rb b/app/serializers/statistic_serializer.rb
index 1cfe76c43..bd02b4c27 100644
--- a/app/serializers/statistic_serializer.rb
+++ b/app/serializers/statistic_serializer.rb
@@ -25,6 +25,10 @@ class StatisticSerializer
     params && params[:info_name] == "blockchain_info"
   }
 
+  attribute :flush_cache_info, if: Proc.new { |_record, params|
+    params && params[:info_name] == "flush_cache_info"
+  }
+
   attribute :address_balance_ranking, if: Proc.new { |_record, params|
     params && params[:info_name] == "address_balance_ranking"
   }

From c5b5eedf0deaf66698880acd70f62c57c6443472 Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Tue, 7 Jul 2020 16:21:22 +0800
Subject: [PATCH 07/10] feat: add task to set flush cache info

---
 lib/tasks/set_flush_cache_info.rake | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 lib/tasks/set_flush_cache_info.rake

diff --git a/lib/tasks/set_flush_cache_info.rake b/lib/tasks/set_flush_cache_info.rake
new file mode 100644
index 000000000..6c9965e37
--- /dev/null
+++ b/lib/tasks/set_flush_cache_info.rake
@@ -0,0 +1,14 @@
+desc "Usage: RAILS_ENV=production bundle exec rake 'set_flush_cache_info[liquidity deposit_compensation, true]'"
+task :set_flush_cache_info, [:indicators, :dry_run] => :environment do |_, args|
+  raise "please input indicators" if args[:indicators].blank?
+  binding.pry
+
+  indicators = args[:indicators].split(" ")
+  dry_run = args[:dry_run] || "true"
+  if dry_run == "true"
+    puts "indicators: #{indicators.join(", ")}"
+  else
+    Rails.cache.write("flush_cache_info", indicators, expires_in: 1.day)
+    puts "done"
+  end
+end

From a5b74f048b60eab5febac8a351bc8d9d83460f9a Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Tue, 7 Jul 2020 16:25:41 +0800
Subject: [PATCH 08/10] doc: add flush cache info

---
 doc/api.raml        | 16 ++++++++++++++++
 public/api_doc.html | 14 +++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/doc/api.raml b/doc/api.raml
index 24953682b..cdc2df292 100644
--- a/doc/api.raml
+++ b/doc/api.raml
@@ -540,6 +540,9 @@ types:
       "hash_rate": {
         type: "string",
       },
+      "flush_cache_info": {
+        type: "string[]"
+      }
       "blockchain_info": {
         type: "object"
       },
@@ -2429,6 +2432,19 @@ types:
                          }
                      }
                   }
+                flush_cache_info: |
+                  {
+                    "data": {
+                      "id": "1594109792",
+                      "type": "statistic",
+                      "attributes": {
+                        "flush_cache_info": [
+                          "liquidity",
+                          "deposit_compensation"
+                        ]
+                      }
+                    }
+                  }
                 address_balance_ranking: |
                   {
                     "data": {
diff --git a/public/api_doc.html b/public/api_doc.html
index 1fd2f10a6..c8a5b2ca4 100644
--- a/public/api_doc.html
+++ b/public/api_doc.html
@@ -1083,7 +1083,7 @@
     }
   ]
 }
-

      get

      get

      Returns the specific statistic info

      Returns the specific statistic info

      URI Parameters

      • info_name: required(string)

        The statistic info name

      HTTP status code 200

      Body

      Media type: application/vnd.api+json

      Type: object

      Properties
      • data: required(object)
        • tip_block_number: required(string)
        • average_block_time: required(string)
        • current_epoch_difficulty: required(string)
        • hash_rate: required(string)
        • blockchain_info: required(object)
          • address_balance_ranking: required(object)
            • ranking: required(string)
            • address: required(string)
            • balance: required(string)
          • maintenance_info": required(object)
            • stat_at: required(string)
            • end_at: required(string)

        Examples:

        tip_block_number:

        {
+

        get

        get

        Returns the specific statistic info

        Returns the specific statistic info

        URI Parameters

        • info_name: required(string)

          The statistic info name

        HTTP status code 200

        Body

        Media type: application/vnd.api+json

        Type: object

        Properties
        • data: required(object)
          • tip_block_number: required(string)
          • average_block_time: required(string)
          • current_epoch_difficulty: required(string)
          • hash_rate: required(string)
          • flush_cache_info: required(array of string)
          • blockchain_info": required(object)
            • address_balance_ranking: required(object)
              • ranking: required(string)
              • address: required(string)
              • balance: required(string)
            • maintenance_info": required(object)
              • stat_at: required(string)
              • end_at: required(string)

          Examples:

          tip_block_number:

          {
   "data": {
     "id": "1",
     "type": "statistic_info",
@@ -1148,6 +1148,18 @@
        }
    }
 }
+

          flush_cache_info:

          {
+  "data": {
+    "id": "1594109792",
+    "type": "statistic",
+    "attributes": {
+      "flush_cache_info": [
+        "liquidity",
+        "deposit_compensation"
+      ]
+    }
+  }
+}

          address_balance_ranking:

          {
   "data": {
     "id": "1562726172",

From 600cc31d564b6d2de763fb88e6a37756a08cc120 Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Wed, 8 Jul 2020 19:21:48 +0800
Subject: [PATCH 09/10] chore: remove daily statistic limit

---
 app/controllers/api/v1/daily_statistics_controller.rb       | 2 +-
 test/controllers/api/v1/daily_statistics_controller_test.rb | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/api/v1/daily_statistics_controller.rb b/app/controllers/api/v1/daily_statistics_controller.rb
index 6eeec467a..9ba9ecdbf 100644
--- a/app/controllers/api/v1/daily_statistics_controller.rb
+++ b/app/controllers/api/v1/daily_statistics_controller.rb
@@ -4,7 +4,7 @@ class DailyStatisticsController < ApplicationController
       before_action :validate_query_params, only: :show
 
       def show
-        daily_statistics = DailyStatistic.order(:created_at_unixtimestamp).limit(365)
+        daily_statistics = DailyStatistic.order(:created_at_unixtimestamp)
         render json: DailyStatisticSerializer.new(daily_statistics, { params: { indicator: params[:id] } })
       end
 
diff --git a/test/controllers/api/v1/daily_statistics_controller_test.rb b/test/controllers/api/v1/daily_statistics_controller_test.rb
index a3e01fd85..a26e45243 100644
--- a/test/controllers/api/v1/daily_statistics_controller_test.rb
+++ b/test/controllers/api/v1/daily_statistics_controller_test.rb
@@ -48,7 +48,8 @@ class DailyStatisticsControllerTest < ActionDispatch::IntegrationTest
       end
 
       test "should return addresses count and timestamp" do
-        daily_statistic_data = create_list(:daily_statistic, 15)
+        create_list(:daily_statistic, 15)
+        daily_statistic_data = DailyStatistic.order(:created_at_unixtimestamp)
         valid_get api_v1_daily_statistic_url("addresses_count")
 
         assert_equal [%w(addresses_count created_at_unixtimestamp).sort], json.dig("data").map { |item| item.dig("attributes").keys.sort }.uniq

From 47e7bdede1fbdbb7601c644ddf947eb552535cc1 Mon Sep 17 00:00:00 2001
From: shaojunda 
Date: Thu, 9 Jul 2020 11:34:37 +0800
Subject: [PATCH 10/10] chore: Bump version to v0.9.9

---
 CHANGELOG.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12315b1f7..3a6c1ca7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,23 @@
+# [v0.9.9](https://github.com/nervosnetwork/ckb-explorer/compare/v0.9.8...v0.9.9) (2020-07-09)
+
+
+### Bug Fixes
+
+* [#669](https://github.com/nervosnetwork/ckb-explorer/pull/669): fix ActiveRecord::IrreversibleOrderError
+
+
+### Features
+
+* [#677](https://github.com/nervosnetwork/ckb-explorer/pull/677): update dao compensation logic to include the unclaimed compensation 
+* [#680](https://github.com/nervosnetwork/ckb-explorer/pull/680): add maintenance info API
+* [#682](https://github.com/nervosnetwork/ckb-explorer/pull/682): add flush front-end cache API
+
+### Performance Improvements
+
+* [#699](https://github.com/nervosnetwork/ckb-explorer/pull/669): use separate query and just select needed field
+* [#670](https://github.com/nervosnetwork/ckb-explorer/pull/670): use recent scope on block query
+* [#675](https://github.com/nervosnetwork/ckb-explorer/pull/675): add cache on blockchain info
+
 # [v0.9.8](https://github.com/nervosnetwork/ckb-explorer/compare/v0.9.7...v0.9.8) (2020-06-29)