Merge pull request #2595 from nervosnetwork/testnet

Deploy to mainnet

Author: zmcNotafraid

app/controllers/api/v2/scripts_controller.rb

@@ -7,7 +7,7 @@ class ScriptsController < BaseController
       before_action :set_contracts, excepts: [:index]
 
       def index
-        scope = Contract.where(verified: true)
+        scope = Contract.uniq_verified
         if params[:script_type].present?
           script_types = params[:script_type].split(",").map(&:strip)
           if script_types.include?("lock")

app/models/contract.rb

@@ -6,7 +6,7 @@ class Contract < ApplicationRecord
   belongs_to :contract_cell, class_name: "CellOutput", optional: true
 
   scope :active, -> { where("addresses_count != 0 and total_referring_cells_capacity != 0 and ckb_transactions_count != 0") }
-  scope :verified, -> { where(verified: true) }
+  scope :uniq_verified, -> { where(verified: true, deprecated: false) }
   scope :primary, -> { where(is_primary: true) }
 
   enum dep_type: { code: 0, dep_group: 1 }

app/models/lock_script.rb

@@ -67,7 +67,7 @@ def lock_info
         tip_epoch = tip_epoch(tip_block)
 
         epoch_number, since_value_index = set_since_epoch_number_and_index(since_value)
-        block_interval = (epoch_number * 1800 + since_value_index * 1800 / since_value.length) - (tip_epoch.number * 1800 + tip_epoch.index * 1800 / tip_epoch.length)
+        block_interval = ((epoch_number * 1800) + (since_value_index * 1800 / since_value.length)) - ((tip_epoch.number * 1800) + (tip_epoch.index * 1800 / tip_epoch.length))
 
         if block_interval.negative?
           block = Block.where(epoch: since_value.number).order(number: :desc).select(:start_number, :length)[0]
@@ -101,9 +101,9 @@ def calculate_bytesize
 
   def verified_script
     if hash_type == "type"
-      Contract.where(verified: true, type_hash: code_hash)&.first
+      Contract.uniq_verified.where(type_hash: code_hash)&.first
     else
-      Contract.where(verified: true, data_hash: code_hash)&.first
+      Contract.uniq_verified.where(data_hash: code_hash)&.first
     end
   end
 

app/models/type_script.rb

@@ -67,9 +67,9 @@ def calculate_bytesize
 
   def verified_script
     if hash_type == "type"
-      Contract.where(verified: true, type_hash: code_hash)&.first
+      Contract.uniq_verified.where(type_hash: code_hash)&.first
     else
-      Contract.where(verified: true, data_hash: code_hash)&.first
+      Contract.uniq_verified.where(data_hash: code_hash)&.first
     end
   end
 end

app/workers/analyze_contract_from_cell_dependency_worker.rb

@@ -148,6 +148,7 @@ def build_contract_attr(cell_output)
       deployed_cell_output_id: cell_output.id,
       deployed_block_timestamp: cell_output.block_timestamp,
       deployed_args: cell_output.type_script&.args,
+      deprecated: cell_output.dead?,
     }
   end
 

app/workers/contract_statistic_worker.rb

@@ -5,7 +5,7 @@ class ContractStatisticWorker
   def perform
     h24_tx_ids = CkbTransaction.h24.pluck(:id)
     ActiveRecord::Base.connection.execute("SET statement_timeout = 0")
-    Contract.where(verified: true).find_each do |contract|
+    Contract.uniq_verified.find_each do |contract|
       contract_cell_ids = CellDepsOutPoint.list_contract_cell_ids_by_contract([contract.id])
       ckb_transactions_count = CellDependency.where(contract_cell_id: contract_cell_ids).select(:ckb_transaction_id).distinct.count
       h24_ckb_transactions_count = CellDependency.where(contract_cell_id: contract_cell_ids, ckb_transaction_id: h24_tx_ids).select(:ckb_transaction_id).distinct.count