Merge pull request #1771 from nervosnetwork/develop

Deploy to testnet

app/interactions/addresses/live_cells.rb

@@ -13,9 +13,15 @@ def execute
       raise AddressNotFoundError if address.is_a?(NullAddress)
 
       order_by, asc_or_desc = live_cells_ordering
-      records = CellOutput.live.where(address_id: address.map(&:id)).
-        order(order_by => asc_or_desc).
-        page(page).per(page_size).fast_page
+      records =
+        if order_by == "block_timestamp"
+          ids = CellOutput.live.where(address_id: address.map(&:id)).pluck(:id)
+          CellOutput.where(id: ids).order(order_by => asc_or_desc).page(page).per(page_size).fast_page
+        else
+          CellOutput.live.where(address_id: address.map(&:id)).
+            order(order_by => asc_or_desc).
+            page(page).per(page_size).fast_page
+        end
       options = FastJsonapi::PaginationMetaGenerator.new(
         request:, records:, page:, page_size:,
       ).call

app/interactions/rgb_transactions/index.rb

@@ -13,11 +13,11 @@ def execute
       if leap_direction.present?
         transactions = transactions.where(
           "CASE
-           WHEN (SELECT COUNT(*) FROM bitcoin_vins WHERE ckb_transaction_id = ckb_transactions.id) >
-                (SELECT COUNT(*) FROM bitcoin_vouts WHERE ckb_transaction_id = ckb_transactions.id)
-           THEN 'in'
            WHEN (SELECT COUNT(*) FROM bitcoin_vins WHERE ckb_transaction_id = ckb_transactions.id) <
-                (SELECT COUNT(*) FROM bitcoin_vouts WHERE ckb_transaction_id = ckb_transactions.id)
+                (SELECT COUNT(*) FROM bitcoin_vouts WHERE ckb_transaction_id = ckb_transactions.id AND op_return = false)
+           THEN 'in'
+           WHEN (SELECT COUNT(*) FROM bitcoin_vins WHERE ckb_transaction_id = ckb_transactions.id) >
+                (SELECT COUNT(*) FROM bitcoin_vouts WHERE ckb_transaction_id = ckb_transactions.id AND op_return = false)
            THEN 'out'
            ELSE 'equal'
            END = ?", leap_direction

app/jobs/import_bitcoin_utxo_job.rb

@@ -15,7 +15,7 @@ def perform(cell_id)
       Rails.logger.info("Importing bitcoin utxo #{txid} out_index #{out_index}")
       vout_attributes = []
       # build bitcoin transaction
-      raw_tx = fetch_raw_transaction(txid)
+      raw_tx = rpc.getrawtransaction(txid, 2)
       tx = build_transaction!(raw_tx)
       # build op_returns
       op_returns = build_op_returns!(raw_tx, tx, cell_output.ckb_transaction, vout_attributes)
@@ -36,14 +36,16 @@ def build_transaction!(raw_tx)
     tx = BitcoinTransaction.find_by(txid: raw_tx["txid"])
     return tx if tx
 
-    # avoid making multiple RPC requests
-    block_header = rpc.getblockheader(raw_tx["blockhash"])
+    # raw transactions may not include the block hash
+    if raw_tx["blockhash"].present?
+      block_header = rpc.getblockheader(raw_tx["blockhash"])
+    end
     BitcoinTransaction.create!(
       txid: raw_tx["txid"],
       tx_hash: raw_tx["hash"],
       time: raw_tx["time"],
       block_hash: raw_tx["blockhash"],
-      block_height: block_header["height"],
+      block_height: block_header&.dig("height") || 0,
     )
   end
 
@@ -103,14 +105,6 @@ def build_address!(address_hash, cell_output)
     bitcoin_address
   end
 
-  def fetch_raw_transaction(txid)
-    Rails.cache.fetch("bitcoin_transactions/#{txid}", expires_in: 1.hour) do
-      rpc.getrawtransaction(txid, 2)
-    rescue StandardError => e
-      raise ArgumentError, "get bitcoin raw transaction #{txid} failed: #{e}"
-    end
-  end
-
   def rpc
     @rpc ||= Bitcoin::Rpc.instance
   end

app/models/bitcoin_statistic.rb

@@ -4,7 +4,7 @@ class BitcoinStatistic < ApplicationRecord
   def self.refresh
     transaction do
       current_time = Time.current
-      start_time = Time.new(current_time.year, current_time.month, current_time.day, current_time.hour, current_time.min < 30 ? 0 : 30)
+      start_time = Time.zone.local(current_time.year, current_time.month, current_time.day, current_time.hour, current_time.min < 30 ? 0 : 30)
       end_time = start_time + 30.minutes
 
       # Count the number of newly generated addresses within half an hour before the current time point

app/models/bitcoin_transaction.rb

@@ -12,13 +12,23 @@ def confirmations
         nil
       end
 
+    refresh_block_height! if block_hash.blank?
     tip_block_height ? tip_block_height - block_height : 0
   end
 
   def ckb_transaction_hash
     ckb_transaction = bitcoin_vouts&.take&.ckb_transaction
     return ckb_transaction.tx_hash if ckb_transaction
   end
+
+  def refresh_block_height!
+    rpc = Bitcoin::Rpc.instance
+    raw_transaction = rpc.getrawtransaction(txid, 2)
+    block_header = rpc.getblockheader(raw_transaction["blockhash"])
+    update(block_hash: raw_transaction["blockhash"], block_height: block_header["height"])
+  rescue StandardError => e
+    Rails.logger.error "refresh block height error: #{e.message}"
+  end
 end
 
 # == Schema Information

app/models/bitcoin_vout.rb

@@ -5,6 +5,8 @@ class BitcoinVout < ApplicationRecord
   belongs_to :cell_output, optional: true
   belongs_to :ckb_address, class_name: "Address", optional: true
 
+  scope :without_op_return, -> { where(op_return: false) }
+
   def commitment
     return unless op_return?
 

app/models/concerns/ckb_transactions/bitcoin.rb

@@ -28,16 +28,16 @@ def rgb_txid
       def leap_direction
         return unless rgb_transaction?
 
-        return "in" if bitcoin_vins.count > bitcoin_vouts.count
-        return "out" if bitcoin_vins.count < bitcoin_vouts.count
+        return "in" if bitcoin_vins.count < bitcoin_vouts.without_op_return.count
+        return "out" if bitcoin_vins.count > bitcoin_vouts.without_op_return.count
 
         nil
       end
 
       def rgb_cell_changes
         return 0 unless rgb_transaction?
 
-        bitcoin_vouts.count - bitcoin_vins.count
+        bitcoin_vouts.without_op_return.count - bitcoin_vins.count
       end
 
       def bitcoin_transaction