Merge pull request #2559 from nervosnetwork/develop

Deploy to testnet

Author: zmcNotafraid

app/controllers/api/v1/fungible_tokens_controller.rb

@@ -0,0 +1,92 @@
+module Api
+  module V1
+    class FungibleTokensController < ApplicationController
+      before_action :validate_query_params, only: :show
+      before_action :validate_pagination_params, :pagination_params, only: :index
+
+      def index
+        scope = Udt.includes(:xudt_tag).where(published: true, udt_type: %i[ssri xudt xudt_compatible sudt])
+
+        if params[:tags].present?
+          tags = parse_tags
+          if params[:union].present?
+            scope = scope.joins(:xudt_tag).where("xudt_tags.tags && ARRAY[?]::varchar[]", tags).select("udts.*") unless tags.empty?
+          else
+            scope = scope.joins(:xudt_tag).where("xudt_tags.tags @> array[?]::varchar[]", tags).select("udts.*") unless tags.empty?
+          end
+        end
+
+        if stale?(scope)
+          expires_in 1.minute, public: true
+
+          udts = sort_udts(scope).page(@page).per(@page_size).fast_page
+          options = FastJsonapi::PaginationMetaGenerator.new(
+            request:,
+            records: udts,
+            page: @page,
+            page_size: @page_size,
+          ).call
+
+          render json: UdtSerializer.new(udts, options)
+        end
+      end
+
+      def show
+        udt = Udt.find_by!(type_hash: params[:id], published: true)
+        render json: UdtSerializer.new(udt)
+      rescue ActiveRecord::RecordNotFound
+        raise Api::V1::Exceptions::UdtNotFoundError
+      end
+
+      def download_csv
+        args = params.permit(:id, :start_date, :end_date, :start_number, :end_number, udt: {})
+        file = CsvExportable::ExportUdtTransactionsJob.perform_now(args.to_h)
+
+        send_data file, type: "text/csv; charset=utf-8; header=present",
+                        disposition: "attachment;filename=udt_transactions.csv"
+      rescue ActiveRecord::RecordNotFound
+        raise Api::V1::Exceptions::UdtNotFoundError
+      end
+
+      private
+
+      def validate_query_params
+        validator = Validations::Udt.new(params)
+
+        if validator.invalid?
+          errors = validator.error_object[:errors]
+          status = validator.error_object[:status]
+
+          render json: errors, status:
+        end
+      end
+
+      def pagination_params
+        @page = params[:page] || 1
+        @page_size = params[:page_size] || Udt.default_per_page
+      end
+
+      def sort_udts(records)
+        sort, order = params.fetch(:sort, "id.desc").split(".", 2)
+        sort =
+          case sort
+          when "created_time" then "block_timestamp"
+          when "transactions" then "h24_ckb_transactions_count"
+          when "addresses_count" then "addresses_count"
+          else "id"
+          end
+
+        if order.nil? || !order.match?(/^(asc|desc)$/i)
+          order = "asc"
+        end
+
+        records.order("#{sort} #{order}").order("full_name ASC, id ASC")
+      end
+
+      def parse_tags
+        tags = params[:tags].split(",")
+        tags & XudtTag::VALID_TAGS
+      end
+    end
+  end
+end

app/jobs/revert_block_job.rb

@@ -48,7 +48,7 @@ def update_address_balance_and_ckb_transactions_count(local_tip_block)
         address.update!(attrs)
       else
         address.live_cells_count = address.cell_outputs.live.count
-        address.ckb_transactions_count = AccountBook.where(address_id: address.id).count
+        address.ckb_transactions_count = AccountBook.tx_committed.where(address_id: address.id).count
         address.dao_transactions_count = DaoEvent.processed.where(address_id: address.id).distinct(:ckb_transaction_id).count
         address.cal_balance!
         address.save!
@@ -184,7 +184,7 @@ def revert_deposit_to_dao(dao_events)
     end
 
     upsert_data = address_attrs.values
-    address_ids = address_attrs.values.map { |hash| hash[:id] }
+    address_ids = address_attrs.values.pluck(:id)
     Address.upsert_all(upsert_data, unique_by: :id) if upsert_data.present?
     Address.where(id: address_ids, dao_deposit: 0).update_all(is_depositor: false)
 

app/models/ckb_sync/new_node_data_processor.rb

@@ -498,7 +498,7 @@ def update_addresses_info(addrs_change, local_block, refresh_balance)
         if addr.last_updated_block_number.nil?
           addr.last_updated_block_number = local_block.number
           addr.live_cells_count = addr.cell_outputs.live.count
-          addr.ckb_transactions_count = AccountBook.where(address_id: addr.id).count
+          addr.ckb_transactions_count = AccountBook.tx_committed.where(address_id: addr.id).count
           addr.dao_transactions_count = DaoEvent.processed.where(address_id: addr.id).distinct(:ckb_transaction_id).count
           addr.cal_balance!
           addr.save!
@@ -1444,17 +1444,6 @@ def forked?(target_block, local_tip_block)
       target_block.header.parent_hash != local_tip_block.block_hash
     end
 
-    def update_address_balance_and_ckb_transactions_count(local_tip_block)
-      local_tip_block.contained_addresses.each do |address|
-        address.live_cells_count = address.cell_outputs.live.count
-        # address.ckb_transactions_count = address.custom_ckb_transactions.count
-        address.ckb_transactions_count = AccountBook.where(address_id: address.id).count
-        address.dao_transactions_count = DaoEvent.processed.where(address_id: address.id).distinct(:ckb_transaction_id).count
-        address.cal_balance!
-        address.save!
-      end
-    end
-
     def update_nrc_factory_cell_info(type_script, output_data)
       factory_cell = NrcFactoryCell.find_or_create_by(
         code_hash: type_script.code_hash,

app/models/udt.rb

@@ -48,7 +48,7 @@ def holders_count
   end
 
   def ssri_contract_outpoint
-    return unless udt_type == "ssri"
+    return unless udt_type == "ssri" && SsriContract.find_by(code_hash: code_hash, hash_type: hash_type)
 
     cell = SsriContract.find_by(code_hash: code_hash, hash_type: hash_type).contract.deployed_cell_output
     { tx_hash: cell.tx_hash, cell_index: cell.cell_index }

config/routes.rb

@@ -61,6 +61,9 @@
         get :download_csv, on: :collection
         get :snapshot, on: :collection
       end
+      resources :fungible_tokens, only: %i(index show) do
+        get :download_csv, on: :collection
+      end
       resources :omiga_inscriptions, only: %i(index show) do
         get :download_csv, on: :collection
       end

test/controllers/api/v1/fungible_tokens_controller_test.rb

@@ -0,0 +1,28 @@
+require "test_helper"
+
+module Api
+  module V1
+    class FungibleTokensControllerTest < ActionDispatch::IntegrationTest
+      setup do
+        create(:udt, published: true, udt_type: "xudt_compatible")
+        create(:udt, published: true, udt_type: "xudt")
+        @ssri = create(:udt, published: true, udt_type: "ssri")
+        create(:udt, published: true, udt_type: "sudt")
+      end
+
+      test "should return all udts" do
+        valid_get api_v1_fungible_tokens_url
+
+        assert_response :success
+        assert 4, json["data"].length
+      end
+
+      test "should return ssri udt" do
+        valid_get api_v1_fungible_token_url(@ssri.type_hash)
+
+        assert_response :success
+        assert "ssri", json["data"]["udt_type"]
+      end
+    end
+  end
+end

test/factories/udt.rb

@@ -23,7 +23,7 @@
           transaction = create(:ckb_transaction, block:,
                                                  contained_udt_ids: [udt.id], tags: ["udt"], tx_index: i * 2)
           transaction1 = create(:ckb_transaction, block:,
-                                                  contained_udt_ids: [udt.id], tags: ["udt"], tx_index: i * 2 + 1)
+                                                  contained_udt_ids: [udt.id], tags: ["udt"], tx_index: (i * 2) + 1)
           cell_output = create(:cell_output, block:,
                                              ckb_transaction: transaction,
                                              consumed_by: transaction1,