Merge pull request #1517 from nervosnetwork/develop

Deploy to testnet

app/controllers/api/v1/address_pending_transactions_controller.rb

@@ -0,0 +1,82 @@
+module Api
+  module V1
+    class AddressPendingTransactionsController < ApplicationController
+      before_action :validate_query_params
+      before_action :validate_pagination_params, :pagination_params
+      before_action :find_address
+
+      def show
+        expires_in 10.seconds, public: true, must_revalidate: true, stale_while_revalidate: 10.seconds
+
+        ckb_transactions = @address.ckb_transactions.tx_pending
+        ckb_transactions_ids = CellInput.where(ckb_transaction_id: ckb_transactions.ids).
+          where.not(previous_cell_output_id: nil, from_cell_base: false).
+          distinct.pluck(:ckb_transaction_id)
+        @ckb_transactions = CkbTransaction.where(id: ckb_transactions_ids).
+          order(transactions_ordering).page(@page).per(@page_size)
+
+        render json: serialized_ckb_transactions
+      end
+
+      private
+
+      def validate_query_params
+        validator = Validations::Address.new(params)
+
+        if validator.invalid?
+          errors = validator.error_object[:errors]
+          status = validator.error_object[:status]
+
+          render json: errors, status: status
+        end
+      end
+
+      def pagination_params
+        @page = params[:page] || 1
+        @page_size = params[:page_size] || CkbTransaction.default_per_page
+      end
+
+      def find_address
+        @address = Address.find_address!(params[:id])
+        raise Api::V1::Exceptions::AddressNotFoundError if @address.is_a?(NullAddress)
+      end
+
+      def transactions_ordering
+        sort, order = params.fetch(:sort, "id.desc").split(".", 2)
+        sort = case sort
+               when "time" then "block_timestamp"
+               else "id"
+               end
+
+        order = order.match?(/^(asc|desc)$/i) ? order : "asc"
+
+        "#{sort} #{order} NULLS LAST"
+      end
+
+      def serialized_ckb_transactions
+        options = FastJsonapi::PaginationMetaGenerator.new(
+          request: request,
+          records: @ckb_transactions,
+          page: @page,
+          page_size: @page_size
+        ).call
+        ckb_transaction_serializer = CkbTransactionsSerializer.new(
+          @ckb_transactions,
+          options.merge(params: { previews: true, address: @address })
+        )
+
+        if QueryKeyUtils.valid_address?(params[:id])
+          if @address.address_hash == @address.query_address
+            ckb_transaction_serializer.serialized_json
+          else
+            ckb_transaction_serializer.serialized_json.gsub(
+              @address.address_hash, @address.query_address
+            )
+          end
+        else
+          ckb_transaction_serializer.serialized_json
+        end
+      end
+    end
+  end
+end

app/controllers/api/v1/market_data_controller.rb

@@ -3,6 +3,10 @@ module V1
     class MarketDataController < ApplicationController
       skip_before_action :check_header_info
 
+      def index
+        render json: MarketData.new.indicators_json
+      end
+
       def show
         render json: MarketData.new(indicator: params[:id]).call
       end

app/controllers/api/v2/das_accounts_controller.rb

@@ -1,20 +1,25 @@
-module Api::V2
-  class DasAccountsController < BaseController
-    def query
-      das = DasIndexerService.instance
+module Api
+  module V2
+    class DasAccountsController < BaseController
+      def query
+        das = DasIndexerService.instance
 
-      cache_keys = params[:addresses]
+        cache_keys = params[:addresses]
 
-      res = Rails.cache.read_multi(*cache_keys)
-      not_cached = cache_keys - res.keys
-      to_cache = {}
-      not_cached.each do |address|
-        name = das.reverse_record(address)
-        res[address] = name
-        to_cache[address] = name
+        res = Rails.cache.read_multi(*cache_keys)
+        not_cached = cache_keys - res.keys
+        to_cache = {}
+        not_cached.each do |address|
+          next unless QueryKeyUtils.valid_address?(address)
+
+          name = das.reverse_record(address)
+          res[address] = name
+          to_cache[address] = name
+        end
+        Rails.cache.write_multi(to_cache, expires_in: 1.hour)
+
+        render json: res
       end
-      Rails.cache.write_multi(to_cache, expires_in: 1.hour)
-      render json: res
     end
   end
 end

app/models/address.rb

@@ -129,12 +129,6 @@ def self.find_address!(query_key)
   end
 
   def self.cached_find(query_key)
-    cache_key = query_key
-
-    unless QueryKeyUtils.valid_hex?(query_key)
-      cache_key = CkbUtils.parse_address(query_key).script.compute_hash
-    end
-
     address =
       if QueryKeyUtils.valid_hex?(query_key)
         find_by(lock_hash: query_key)

app/models/market_data.rb

@@ -23,6 +23,10 @@ def call
     send(indicator)
   end
 
+  def indicators_json
+    VALID_INDICATORS.index_with { |indicator| send(indicator) }
+  end
+
   def ecosystem_locked
     if current_timestamp < first_released_timestamp_other
       ECOSYSTEM_QUOTA * 0.97

config/routes.rb

@@ -53,7 +53,7 @@
       resources :daily_statistics, only: :show
       resources :block_statistics, only: :show ## TODO: unused route
       resources :epoch_statistics, only: :show
-      resources :market_data, only: :show
+      resources :market_data, only: [:index, :show]
       resources :udts, only: %i(index show update) do
         collection do
           get :download_csv
@@ -64,6 +64,7 @@
       resources :distribution_data, only: :show
       resources :monetary_data, only: :show
       resources :udt_verifications, only: :update
+      resources :address_pending_transactions, only: :show
     end
   end
   draw "v2"

lib/tasks/migration/fix_address_balance_occupied.rake

@@ -4,8 +4,6 @@ namespace :migration do
     pr_merged_datetime = DateTime.new(2022,7,23,0,0,0)
     addresses = Address.where("updated_at > ?", pr_merged_datetime).order(id: :asc)
     addresses.find_each do |address|
-      puts "Address ID: #{address.id}"
-
       occupied = address.cell_outputs.live.occupied.sum(:capacity)
       address.update(balance_occupied: occupied)
     end