Merge pull request #743 from nervosnetwork/rc/v0.12.0

Author: shaojunda

.env

@@ -31,3 +31,4 @@ CKB_NET_MODE="mainnet"
 HOMEPAGE_BLOCK_RECORDS_COUNT="15"
 HOMEPAGE_TRANSACTIONS_RECORDS_COUNT="15"
 SUDT_CELL_TYPE_HASH="0x5e7a36a77e68eecc013dfa2fe6a23f3b6c344b04005808694ae6dd45eea4cfd5"
+SUDT1_CELL_TYPE_HASH=""

.github/workflows/release.yml

@@ -0,0 +1,30 @@
+on:
+  push:
+    tags:
+      - 'v*'
+
+name: Create Release
+
+jobs:
+  release:
+    name: Create Release
+    runs-on: ubuntu-latest
+    outputs:
+      output1: ${{ steps.create_release.outputs.upload_url }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Get current date
+        id: current_date
+        run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }} (${{ steps.current_date.outputs.date }})
+          body_path: ./RELEASENOTES.md
+          draft: true
+          prerelease: false

CHANGELOG.md

@@ -1,4 +1,11 @@
-# [v0.11.2](https://github.com/shaojunda/ckb-explorer/compare/v0.11.1...v0.11.2) (2020-08-30)
+# [v0.12.0](https://github.com/nervosnetwork/ckb-explorer/compare/v0.11.2...v0.12.0) (2020-11-10)
+
+
+### Features
+
+* [#739](https://github.com/nervosnetwork/ckb-explorer/pull/739): support querying transactions in the transaction pool
+
+# [v0.11.2](https://github.com/nervosnetwork/ckb-explorer/compare/v0.11.1...v0.11.2) (2020-08-30)
 
 ### Features
 
@@ -9,7 +16,7 @@
 * [#721](https://github.com/nervosnetwork/ckb-explorer/pull/721): fix normal transactions counter
 
 
-# [v0.11.1](https://github.com/shaojunda/ckb-explorer/compare/v0.11.0...v0.11.1) (2020-08-12)
+# [v0.11.1](https://github.com/nervosnetwork/ckb-explorer/compare/v0.11.0...v0.11.1) (2020-08-12)
 
 ### Performance Improvements
 

Gemfile.lock

@@ -8,10 +8,10 @@ GIT
 
 GIT
   remote: https://github.com/nervosnetwork/ckb-sdk-ruby.git
-  revision: e1b2414561d8363b301f9480fab915e84f71b1c4
+  revision: dfe4c30f3be49f89d2c8d88170a199cfa053d4fe
   branch: develop
   specs:
-    ckb-sdk-ruby (0.35.0)
+    ckb-sdk-ruby (0.37.0)
       bitcoin-secp256k1 (~> 0.5.2)
       net-http-persistent (~> 3.1.0)
       rbnacl (~> 7.1.1)
@@ -224,7 +224,7 @@ GEM
     pry-nav (0.3.0)
       pry (>= 0.9.10, < 0.13.0)
     public_suffix (3.1.0)
-    puma (4.3.5)
+    puma (4.3.6)
       nio4r (~> 2.0)
     raabro (1.1.6)
     rack (2.2.3)

RELEASENOTES.md

@@ -0,0 +1,8 @@
+### Adapted CKB Version
+[ckb 0.25.1](https://github.com/nervosnetwork/ckb/releases/tag/v0.25.1) and above
+
+# [v0.12.0](https://github.com/nervosnetwork/ckb-explorer/compare/v0.11.2...v0.12.0) (2020-11-10)
+
+### Features
+
+* [#739](https://github.com/nervosnetwork/ckb-explorer/pull/739): support querying transactions in the transaction pool

app/controllers/api/v1/ckb_transactions_controller.rb

@@ -25,7 +25,7 @@ def index
       end
 
       def show
-        ckb_transaction = CkbTransaction.cached_find(params[:id])
+        ckb_transaction = CkbTransaction.cached_find(params[:id]) || PoolTransactionEntry.find_by(tx_hash: params[:id])
 
         raise Api::V1::Exceptions::CkbTransactionNotFoundError if ckb_transaction.blank?
 

app/models/cellbase.rb

@@ -41,7 +41,7 @@ def cellbase_output_capacity_details
           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)
+          CkbSync::Api.instance.get_cellbase_output_capacity_details(block.block_hash) || OpenStruct.new(primary: 0, secondary: 0, proposal_reward: 0, tx_fee: 0)
         end
       end
   end

app/models/ckb_sync/node_data_processor.rb

@@ -32,6 +32,7 @@ def process_block(node_block)
         local_block.ckb_transactions_count = ckb_transactions.size
         local_block.live_cell_changes = ckb_transactions.sum(&:live_cell_changes)
         CkbTransaction.import!(ckb_transactions, recursive: true, batch_size: 3500, validate: false)
+        update_pool_tx_status(ckb_transactions)
         input_capacities = ckb_transactions.reject(&:is_cellbase).pluck(:id).to_h { |id| [id, []] }
         update_tx_fee_related_data(local_block, input_capacities, udt_infos)
         calculate_tx_fee(local_block, ckb_transactions, input_capacities, outputs.group_by(&:ckb_transaction_id))
@@ -53,6 +54,10 @@ def process_block(node_block)
 
     private
 
+    def update_pool_tx_status(ckb_transactions)
+      PoolTransactionEntry.pool_transaction_pending.where(tx_hash: ckb_transactions.pluck(:tx_hash)).update_all(tx_status: "committed")
+    end
+
     def increase_records_count(ckb_transactions)
       block_counter = TableRecordCount.find_by(table_name: "blocks")
       block_counter.increment!(:count)
@@ -89,7 +94,7 @@ def update_udt_accounts(udt_infos, block_timestamp)
         if udt_account.present?
           udt_account.update!(amount: amount)
         else
-          udt = Udt.find_or_create_by!(type_hash: type_hash, code_hash: ENV["SUDT_CELL_TYPE_HASH"], udt_type: "sudt")
+          udt = Udt.find_or_create_by!(type_hash: type_hash, udt_type: "sudt")
           udt.update(block_timestamp: block_timestamp) if udt.block_timestamp.blank?
           if udt.issuer_address.blank?
             issuer_address = Address.where(lock_hash: udt_type_script.args).pick(:address_hash)
@@ -497,7 +502,7 @@ def build_cell_outputs(node_outputs, ckb_transaction, addresses, outputs_data, o
         if cell_output.udt?
           udt_infos << { type_script: output.type, address: address }
           tags << "udt"
-          udt = Udt.find_or_create_by!(type_hash: output.type.compute_hash, code_hash: ENV["SUDT_CELL_TYPE_HASH"], udt_type: "sudt")
+          udt = Udt.find_or_create_by!(type_hash: output.type.compute_hash, udt_type: "sudt")
           udt_ids << udt.id
           udt_address_ids << address.id
         end
@@ -540,7 +545,7 @@ def build_withdraw_dao_events(address_id, ckb_transaction_id, local_block, previ
     end
 
     def cell_type(type_script, output_data)
-      return "normal" unless [ENV["DAO_CODE_HASH"], ENV["DAO_TYPE_HASH"], ENV["SUDT_CELL_TYPE_HASH"]].include?(type_script&.code_hash)
+      return "normal" unless [ENV["DAO_CODE_HASH"], ENV["DAO_TYPE_HASH"], ENV["SUDT_CELL_TYPE_HASH"], ENV["SUDT1_CELL_TYPE_HASH"]].include?(type_script&.code_hash)
 
       case type_script&.code_hash
       when ENV["DAO_CODE_HASH"], ENV["DAO_TYPE_HASH"]
@@ -549,7 +554,7 @@ def cell_type(type_script, output_data)
         else
           "nervos_dao_withdrawing"
         end
-      when ENV["SUDT_CELL_TYPE_HASH"]
+      when ENV["SUDT_CELL_TYPE_HASH"], ENV["SUDT1_CELL_TYPE_HASH"]
         if CKB::Utils.hex_to_bin(output_data).bytesize >= CellOutput::MIN_SUDT_AMOUNT_BYTESIZE
           "udt"
         else
@@ -676,7 +681,7 @@ def update_ckb_transaction(consumed_tx, address_id, previous_cell_output, update
       consumed_tx.contained_address_ids << address_id
       if previous_cell_output.udt?
         consumed_tx.tags << "udt"
-        consumed_tx.contained_udt_ids << Udt.find_or_create_by!(type_hash: previous_cell_output.type_hash, code_hash: ENV["SUDT_CELL_TYPE_HASH"], udt_type: "sudt").id
+        consumed_tx.contained_udt_ids << Udt.find_or_create_by!(type_hash: previous_cell_output.type_hash, udt_type: "sudt").id
         consumed_tx.udt_address_ids << previous_cell_output.address_id
       end
       if previous_cell_output.nervos_dao_withdrawing?

app/models/ckb_transaction.rb

@@ -3,6 +3,8 @@ class CkbTransaction < ApplicationRecord
   paginates_per 10
   max_paginates_per MAX_PAGINATES_PER
 
+  enum tx_status: { pending: 0, proposed: 1, committed: 2 }, _prefix: :ckb_transaction
+
   belongs_to :block
   has_many :account_books, dependent: :destroy
   has_many :addresses, through: :account_books
@@ -62,6 +64,14 @@ def dao_transaction?
     inputs.where(cell_type: %w(nervos_dao_deposit nervos_dao_withdrawing)).exists? || outputs.where(cell_type: %w(nervos_dao_deposit nervos_dao_withdrawing)).exists?
   end
 
+  def tx_status
+    "committed"
+  end
+
+  def cell_info
+    nil
+  end
+
   private
 
   def normal_tx_display_outputs(previews)

app/models/pool_transaction_entry.rb

@@ -0,0 +1,52 @@
+class PoolTransactionEntry < ApplicationRecord
+  enum tx_status: { pending: 0, proposed: 1, committed: 2 }, _prefix: :pool_transaction
+
+  def is_cellbase
+    false
+  end
+
+  def income(address = nil)
+    nil
+  end
+
+  def display_outputs(previews: false)
+    self.attributes["display_outputs"]
+  end
+
+  def display_inputs(previews: false)
+    self.attributes["display_inputs"]
+  end
+
+  def proposal_short_id
+    tx_hash[0...12]
+  end
+end
+
+# == Schema Information
+#
+# Table name: pool_transaction_entries
+#
+#  id              :bigint           not null, primary key
+#  cell_deps       :jsonb
+#  tx_hash         :binary
+#  header_deps     :jsonb
+#  inputs          :jsonb
+#  outputs         :jsonb
+#  outputs_data    :jsonb
+#  version         :integer
+#  witnesses       :jsonb
+#  transaction_fee :decimal(30, )
+#  block_number    :decimal(30, )
+#  block_timestamp :decimal(30, )
+#  cycles          :decimal(30, )
+#  tx_size         :decimal(30, )
+#  display_inputs  :jsonb
+#  display_outputs :jsonb
+#  tx_status       :integer          default("pending")
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#
+# Indexes
+#
+#  index_pool_transaction_entries_on_tx_hash  (tx_hash) UNIQUE
+#