Merge pull request #1601 from nervosnetwork/testnet

Deploy to mainnet

.rubocop.yml

@@ -449,9 +449,9 @@ Layout/InitialIndentation:
   Enabled: false
 
 Layout/LineLength:
-  Description: 'Limit lines to 80 characters.'
+  Description: 'Limit lines to 200 characters.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#80-character-limits'
-  Max: 80
+  Max: 200
 
 # Lint
 

Gemfile

@@ -66,7 +66,6 @@ gem "with_advisory_lock"
 
 gem "nokogiri", ">= 1.11.0.rc4"
 
-gem "benchmark_methods", require: false
 gem "sentry-ruby"
 gem "sentry-rails"
 gem "sentry-sidekiq"

Gemfile.lock

@@ -111,7 +111,6 @@ GEM
     awesome_print (1.9.2)
     backport (1.2.0)
     benchmark (0.2.1)
-    benchmark_methods (0.7)
     bigdecimal (3.1.4)
     bootsnap (1.13.0)
       msgpack (~> 1.2)
@@ -479,7 +478,6 @@ DEPENDENCIES
   annotate
   async-websocket (~> 0.22.1)
   awesome_print
-  benchmark_methods
   bigdecimal
   bootsnap
   ckb-sdk-ruby!

app/controllers/api/v1/omiga_inscriptions_controller.rb

@@ -6,7 +6,15 @@ class OmigaInscriptionsController < ApplicationController
                     only: :index
 
       def index
-        udts = Udt.omiga_inscription
+        pre_udt_hashes = OmigaInscriptionInfo.where.not(pre_udt_hash: nil).pluck(:pre_udt_hash)
+        udts =
+          if pre_udt_hashes.present?
+            Udt.joins(:omiga_inscription_info).where.not(
+              "omiga_inscription_infos.mint_status = 1 and omiga_inscription_infos.udt_hash IN (?)", pre_udt_hashes
+            )
+          else
+            Udt.omiga_inscription
+          end
 
         if stale?(udts)
           udts = sort_udts(udts).page(@page).per(@page_size).fast_page
@@ -22,15 +30,27 @@ def index
       end
 
       def show
-        udt = Udt.find_by!(type_hash: params[:id])
-        render json: UdtSerializer.new(udt)
-      rescue ActiveRecord::RecordNotFound
-        raise Api::V1::Exceptions::UdtNotFoundError
+        udt =
+          if params[:status] == "closed"
+            Udt.joins(:omiga_inscription_info).where(
+              "omiga_inscription_infos.type_hash = ? and omiga_inscription_infos.mint_status = 1", params[:id]
+            ).first
+          else
+            Udt.joins(:omiga_inscription_info).where(
+              "udts.type_hash = ? or omiga_inscription_infos.type_hash = ?", params[:id], params[:id]
+            ).order("block_timestamp DESC").first
+          end
+
+        if udt.nil?
+          raise Api::V1::Exceptions::UdtNotFoundError
+        else
+          render json: UdtSerializer.new(udt)
+        end
       end
 
       def download_csv
         args = params.permit(:id, :start_date, :end_date, :start_number,
-                             :end_number, udt: {})
+                             :end_number, :status, udt: {})
         file = CsvExportable::ExportOmigaInscriptionTransactionsJob.perform_now(args.to_h)
 
         send_data file, type: "text/csv; charset=utf-8; header=present",

app/jobs/csv_exportable/export_omiga_inscription_transactions_job.rb

@@ -1,7 +1,16 @@
 module CsvExportable
   class ExportOmigaInscriptionTransactionsJob < BaseExporter
     def perform(args)
-      udt = Udt.find_by!(type_hash: args[:id], published: true)
+      udt =
+        if args[:status] == "closed"
+          Udt.joins(:omiga_inscription_info).where(
+            "omiga_inscription_infos.type_hash = ? and omiga_inscription_infos.mint_status = 1", args[:id]
+          ).first
+        else
+          Udt.joins(:omiga_inscription_info).where(
+            "udts.type_hash = ? or omiga_inscription_infos.type_hash = ?", args[:id], args[:id]
+          ).order("block_timestamp DESC").first
+        end
       ckb_transactions = udt.ckb_transactions
 
       if args[:start_date].present?