Merge pull request #664 from nervosnetwork/rc/v0.9.8

Author: shaojunda

.github/workflows/ruby.yml

@@ -1,18 +1,27 @@
-name: Ruby
-
-on: [push]
+name: Explorer service
+on: push
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_PASSWORD: postgres
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
       redis:
         image: redis
         ports: ['6379:6379']
         options: --entrypoint redis-server
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Set up Ruby 2.6.4
         run: |
           sudo apt-get update
@@ -25,13 +34,6 @@ jobs:
       - name: Set up SECP256k1
         run: |
           git clone https://github.com/bitcoin-core/secp256k1.git && cd secp256k1 && ./autogen.sh && ./configure && make && ./tests && sudo make install && cd ..
-      - name: Set up PostgreSQL
-        run: |
-          sudo apt install postgresql postgresql-contrib
-          sudo sed -i 's/peer/trust/gI' /etc/postgresql/10/main/pg_hba.conf
-          sudo sed -i 's/md5/trust/gI' /etc/postgresql/10/main/pg_hba.conf
-          sudo systemctl restart postgresql.service
-          psql -c 'create database "ckb_explorer_test";' -U postgres
       - name: Build and test with Rake
         run: |
           source /usr/share/rvm/scripts/rvm

CHANGELOG.md

@@ -64,6 +64,8 @@ gem "kaminari"
 
 gem "ruby-progressbar", require: false
 
+gem "sentry-raven"
+
 # Deployment
 gem "mina", require: false
 gem "mina-multistage", require: false

Gemfile

@@ -24,58 +24,58 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.3.1)
-      actionpack (= 6.0.3.1)
+    actioncable (6.0.3.2)
+      actionpack (= 6.0.3.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.1)
-      actionpack (= 6.0.3.1)
-      activejob (= 6.0.3.1)
-      activerecord (= 6.0.3.1)
-      activestorage (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    actionmailbox (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activejob (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
+      activestorage (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       mail (>= 2.7.1)
-    actionmailer (6.0.3.1)
-      actionpack (= 6.0.3.1)
-      actionview (= 6.0.3.1)
-      activejob (= 6.0.3.1)
+    actionmailer (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      actionview (= 6.0.3.2)
+      activejob (= 6.0.3.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.1)
-      actionview (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    actionpack (6.0.3.2)
+      actionview (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.1)
-      actionpack (= 6.0.3.1)
-      activerecord (= 6.0.3.1)
-      activestorage (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    actiontext (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
+      activestorage (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3.1)
-      activesupport (= 6.0.3.1)
+    actionview (6.0.3.2)
+      activesupport (= 6.0.3.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.1)
-      activesupport (= 6.0.3.1)
+    activejob (6.0.3.2)
+      activesupport (= 6.0.3.2)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activerecord (6.0.3.1)
-      activemodel (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    activemodel (6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activerecord (6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
     activerecord-import (1.0.3)
       activerecord (>= 3.2)
-    activestorage (6.0.3.1)
-      actionpack (= 6.0.3.1)
-      activejob (= 6.0.3.1)
-      activerecord (= 6.0.3.1)
+    activestorage (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activejob (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
       marcel (~> 0.3.1)
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -155,6 +155,8 @@ GEM
     factory_bot_rails (5.0.2)
       factory_bot (~> 5.0.2)
       railties (>= 4.2.0)
+    faraday (1.0.1)
+      multipart-post (>= 1.2, < 3)
     fast_jsonapi (1.5)
       activesupport (>= 4.2)
     ffi (1.13.1)
@@ -165,7 +167,7 @@ GEM
       activesupport (>= 4.2.0)
     hashdiff (1.0.0)
     hiredis (0.6.3)
-    i18n (1.8.2)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.2)
     json (2.2.0)
@@ -185,7 +187,7 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    loofah (2.5.0)
+    loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -211,6 +213,7 @@ GEM
     mocha (1.8.0)
       metaclass (~> 0.0.1)
     msgpack (1.2.10)
+    multipart-post (2.1.1)
     net-http-persistent (3.0.1)
       connection_pool (~> 2.2)
     newrelic_rpm (6.4.0.356)
@@ -235,7 +238,7 @@ GEM
     puma (4.3.5)
       nio4r (~> 2.0)
     raabro (1.1.6)
-    rack (2.2.2)
+    rack (2.2.3)
     rack-attack (6.2.1)
       rack (>= 1.0, < 3)
     rack-cors (1.0.5)
@@ -244,29 +247,29 @@ GEM
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.3.1)
-      actioncable (= 6.0.3.1)
-      actionmailbox (= 6.0.3.1)
-      actionmailer (= 6.0.3.1)
-      actionpack (= 6.0.3.1)
-      actiontext (= 6.0.3.1)
-      actionview (= 6.0.3.1)
-      activejob (= 6.0.3.1)
-      activemodel (= 6.0.3.1)
-      activerecord (= 6.0.3.1)
-      activestorage (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    rails (6.0.3.2)
+      actioncable (= 6.0.3.2)
+      actionmailbox (= 6.0.3.2)
+      actionmailer (= 6.0.3.2)
+      actionpack (= 6.0.3.2)
+      actiontext (= 6.0.3.2)
+      actionview (= 6.0.3.2)
+      activejob (= 6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
+      activestorage (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       bundler (>= 1.3.0)
-      railties (= 6.0.3.1)
+      railties (= 6.0.3.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.3.1)
-      actionpack (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    railties (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -293,6 +296,8 @@ GEM
     ruby-progressbar (1.10.1)
     ruby_dep (1.5.0)
     safe_yaml (1.0.5)
+    sentry-raven (3.0.0)
+      faraday (>= 1.0)
     shoulda-context (1.2.2)
     shoulda-matchers (4.1.0)
       activesupport (>= 4.2.0)
@@ -326,7 +331,7 @@ GEM
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
       spring (>= 1.2, < 3.0)
-    sprockets (4.0.0)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -401,6 +406,7 @@ DEPENDENCIES
   rubocop-performance
   rubocop-rails
   ruby-progressbar
+  sentry-raven
   shoulda-context
   shoulda-matchers
   sidekiq

Gemfile.lock

@@ -9,8 +9,9 @@ def index
           blocks = Block.recent.limit(ENV["HOMEPAGE_BLOCK_RECORDS_COUNT"].to_i)
           options = {}
         else
-          blocks = Block.recent.page(@page).per(@page_size)
-          options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: blocks, page: @page, page_size: @page_size).call
+          block_timestamps = Block.recent.select(:timestamp).page(@page).per(@page_size)
+          blocks = Block.where(timestamp: block_timestamps.map { |block| block.timestamp }).select(:id, :miner_hash, :number, :timestamp, :reward, :ckb_transactions_count, :live_cell_changes)
+          options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: block_timestamps, page: @page, page_size: @page_size).call
         end
 
         render json: BlockListSerializer.new(blocks, options)

app/controllers/api/v1/blocks_controller.rb

@@ -1,5 +1,6 @@
 class ApplicationController < ActionController::API
-  before_action :check_header_info
+  before_action :check_header_info, :set_raven_context
+
   rescue_from Api::V1::Exceptions::Error, with: :api_error
   rescue_from ActionController::RoutingError do |exception|
     render json: { message: exception.message }, status: :not_found
@@ -15,6 +16,10 @@ def catch_404
 
   private
 
+  def set_raven_context
+    Raven.extra_context(params: params.to_unsafe_h, url: request.url)
+  end
+
   def api_error(error)
     render json: RequestErrorSerializer.new([error], message: error.title), status: error.status
   end

app/controllers/application_controller.rb

@@ -143,6 +143,8 @@ def invalid!
 #  live_cell_changes          :integer
 #  block_time                 :decimal(13, )
 #  block_size                 :integer
+#  proposal_reward            :decimal(30, )
+#  commit_reward              :decimal(30, )
 #
 # Indexes
 #

app/models/block.rb

@@ -4,7 +4,6 @@ class Cellbase
   def initialize(block)
     @block = block
     @target_block_number = @block.target_block.present? ? @block.target_block_number : 0
-    @cellbase_output_capacity_details = CkbSync::Api.instance.get_cellbase_output_capacity_details(block.block_hash)
   end
 
   def proposal_reward
@@ -33,5 +32,17 @@ def secondary_reward
 
   private
 
-  attr_reader :cellbase_output_capacity_details, :block
+  attr_reader :block
+
+  def cellbase_output_capacity_details
+    @cellbase_output_capacity_details ||=
+      begin
+        if block.target_block_reward_status == "issued"
+          target_block = block.target_block
+          OpenStruct.new(primary: target_block.primary_reward, secondary: target_block.secondary_reward, proposal_reward: target_block.proposal_reward, tx_fee: target_block.commit_reward)
+        else
+          CkbSync::Api.instance.get_cellbase_output_capacity_details(block.block_hash)
+        end
+      end
+  end
 end

app/models/cellbase.rb

@@ -2,7 +2,7 @@ module CkbSync
   class Api
     include Singleton
 
-    METHOD_NAMES = %w(system_script_out_point dry_run_transaction set_system_script_cell system_script_cell system_script_cell_hash genesis_block get_block_by_number genesis_block_hash get_block_hash get_block get_tip_header get_tip_block_number get_cells_by_lock_hash get_transaction get_live_cell local_node_info get_current_epoch get_epoch_by_number get_peers tx_pool_info get_blockchain_info get_peers_state compute_transaction_hash get_cellbase_output_capacity_details calculate_dao_maximum_withdraw compute_script_hash).freeze
+    METHOD_NAMES = %w(system_script_out_point dry_run_transaction set_system_script_cell system_script_cell system_script_cell_hash genesis_block get_block_by_number genesis_block_hash get_block_hash get_block get_tip_header get_tip_block_number get_cells_by_lock_hash get_transaction get_live_cell local_node_info get_current_epoch get_epoch_by_number get_peers tx_pool_info get_blockchain_info get_peers_state compute_transaction_hash get_cellbase_output_capacity_details calculate_dao_maximum_withdraw compute_script_hash get_block_economic_state).freeze
 
     def initialize
       @api = CKB::API.new(host: ENV["CKB_NODE_URL"])

app/models/ckb_sync/api.rb

@@ -78,7 +78,7 @@ def cellbase_display_outputs
     cellbase = Cellbase.new(block)
     cell_outputs_for_display.map do |output|
       consumed_tx_hash = output.live? ? nil : output.consumed_by.tx_hash
-      CkbUtils.hash_value_to_s({ id: output.id, capacity: output.capacity, address_hash: output.address_hash, target_block_number: cellbase.target_block_number, base_reward: cellbase.base_reward, commit_reward: cellbase.commit_reward, proposal_reward: cellbase.proposal_reward, secondary_reward: cellbase.secondary_reward, status: output.status, consumed_tx_hash: consumed_tx_hash })
+      CkbUtils.hash_value_to_s(id: output.id, capacity: output.capacity, address_hash: output.address_hash, target_block_number: cellbase.target_block_number, base_reward: cellbase.base_reward, commit_reward: cellbase.commit_reward, proposal_reward: cellbase.proposal_reward, secondary_reward: cellbase.secondary_reward, status: output.status, consumed_tx_hash: consumed_tx_hash)
     end
   end
 
@@ -119,7 +119,7 @@ def attributes_for_dao_input(nervos_dao_withdrawing_cell, is_phase2 = true)
 
   def cellbase_display_inputs
     cellbase = Cellbase.new(block)
-    [CkbUtils.hash_value_to_s({ id: nil, from_cellbase: true, capacity: nil, address_hash: nil, target_block_number: cellbase.target_block_number, generated_tx_hash: tx_hash })]
+    [CkbUtils.hash_value_to_s(id: nil, from_cellbase: true, capacity: nil, address_hash: nil, target_block_number: cellbase.target_block_number, generated_tx_hash: tx_hash)]
   end
 
   def recover_dead_cell