Merge pull request #2878 from nervosnetwork/testnet

Deploy to mainnet

Author: u2

app/controllers/api/v1/address_dao_transactions_controller.rb

@@ -9,7 +9,7 @@ def show
         raise Api::V1::Exceptions::AddressNotFoundError if address.is_a?(NullAddress)
 
         includes = { bitcoin_annotation: [], 
-                    cell_outputs: [:address, :deployed_contract, :type_script, :bitcoin_vout, :lock_script], 
+                    cell_outputs: [:address, :deployed_contract, :type_script, :bitcoin_vout, :lock_script, :consumed_by], 
                     cell_inputs: [:block, previous_cell_output: [:address, :deployed_contract, :type_script, :bitcoin_vout, :lock_script]]}
 
         ckb_dao_transactions = address.ckb_dao_transactions

app/controllers/api/v1/address_udt_transactions_controller.rb

@@ -13,7 +13,7 @@ def show
         raise Api::V1::Exceptions::UdtNotFoundError if udt.blank?
 
         includes = { bitcoin_annotation: [], 
-                    cell_outputs: [:address, :deployed_contract, :udt_cell, :type_script, :bitcoin_vout, :lock_script], 
+                    cell_outputs: [:address, :deployed_contract, :udt_cell, :type_script, :bitcoin_vout, :lock_script, :consumed_by], 
                     cell_inputs: [:block, previous_cell_output: [:udt_cell, :address, :deployed_contract, :type_script, :bitcoin_vout, :lock_script]]}
 
         ckb_udt_transactions = address.ckb_udt_transactions(udt.id)

app/controllers/api/v1/block_transactions_controller.rb

@@ -19,7 +19,7 @@ def show
         end
 
         includes = { bitcoin_annotation: [], 
-                    cell_outputs: [:address, :deployed_contract, :type_script, :bitcoin_vout, :lock_script], 
+                    cell_outputs: [:address, :deployed_contract, :type_script, :bitcoin_vout, :lock_script, :consumed_by], 
                     cell_inputs: [:block, previous_cell_output: [:address, :deployed_contract, :type_script, :bitcoin_vout, :lock_script]]}
 
         if stale?(ckb_transactions)

app/controllers/api/v1/ckb_transactions_controller.rb

@@ -85,7 +85,7 @@ def query
           end
 
         includes = { bitcoin_annotation: [], 
-              cell_outputs: [:address, :deployed_contract, :type_script, :bitcoin_vout, :lock_script], 
+              cell_outputs: [:address, :deployed_contract, :type_script, :bitcoin_vout, :lock_script, :consumed_by], 
               cell_inputs: [:block, previous_cell_output: [:address, :deployed_contract, :type_script, :bitcoin_vout, :lock_script]]}
 
         ckb_transactions = ckb_transactions.includes(includes).select(:id, :tx_hash, :block_id, :tags,
@@ -147,7 +147,7 @@ def find_transaction
                   witnesses: [],
                   block: [:epoch_statistic],
                   cell_dependencies: [:cell_output, :contract],
-                  cell_outputs: [:address, :deployed_contract, :type_script, :bitcoin_vout, :lock_script], 
+                  cell_outputs: [:address, :deployed_contract, :type_script, :bitcoin_vout, :lock_script, :consumed_by], 
                   cell_inputs: [:block, previous_cell_output: [:address, :deployed_contract, :type_script, :bitcoin_vout, :lock_script]]}
 
         @ckb_transaction = CkbTransaction.includes(includes).where(tx_hash: params[:id]).first

app/controllers/api/v1/contract_transactions_controller.rb

@@ -26,7 +26,7 @@ def show
           end
 
           includes = { bitcoin_annotation: [], 
-              cell_outputs: [:address, :deployed_contract, :type_script, :bitcoin_vout, :lock_script],
+              cell_outputs: [:address, :deployed_contract, :type_script, :bitcoin_vout, :lock_script, :consumed_by],
               cell_inputs: [:block, previous_cell_output: [:address, :deployed_contract, :type_script, :bitcoin_vout, :lock_script]]}
 
           ckb_transactions = ckb_transactions

app/interactions/addresses/ckb_transactions.rb

@@ -40,11 +40,11 @@ def execute
       includes = if is_bitcoin
         { bitcoin_annotation: [], 
           bitcoin_transfers: [:bitcoin_transaction],
-          cell_outputs: [:address, :deployed_contract, :type_script, :bitcoin_vout, :lock_script, bitcoin_vout: [:bitcoin_address, :bitcoin_transaction]], 
+          cell_outputs: [:address, :deployed_contract, :type_script, :bitcoin_vout, :lock_script, bitcoin_vout: [:bitcoin_address, :bitcoin_transaction, :consumed_by]], 
           cell_inputs: [:block, previous_cell_output: [:address, :deployed_contract, :type_script, :bitcoin_vout, :lock_script, bitcoin_vout: [:bitcoin_address, :bitcoin_transaction]]]}
       else
         { bitcoin_annotation: [], 
-          cell_outputs: [:address, :deployed_contract, :type_script, :bitcoin_vout, :lock_script], 
+          cell_outputs: [:address, :deployed_contract, :type_script, :bitcoin_vout, :lock_script, :consumed_by], 
           cell_inputs: [:block, previous_cell_output: [:address, :deployed_contract, :type_script, :bitcoin_vout, :lock_script]]}
       end
 

app/interactions/udts/ckb_transactions.rb

@@ -31,7 +31,7 @@ def execute
       end
 
       includes = { bitcoin_annotation: [], 
-            cell_outputs: [:address, :deployed_contract, :udt_cell, :type_script, :bitcoin_vout, :lock_script], 
+            cell_outputs: [:address, :deployed_contract, :udt_cell, :type_script, :bitcoin_vout, :lock_script, :consumed_by], 
             cell_inputs: [:block, previous_cell_output: [:address, :udt_cell, :deployed_contract, :type_script, :bitcoin_vout, :lock_script]]}
 
       records = ckb_transactions

app/lib/fast_jsonapi/pagination_meta_generator.rb

@@ -1,7 +1,7 @@
 module FastJsonapi
   class PaginationMetaGenerator
     DEFAULT_PAGE = 1
-    DEFAULT_PER_PAGE = 20
+    DEFAULT_PER_PAGE = 10
 
     def initialize(request:, records:, page:, page_size:, total_pages: nil, total_count: nil)
       @url = request.base_url + request.path + query_string(request.query_parameters)

app/serializers/ckb_transactions_serializer.rb

@@ -20,13 +20,13 @@ class CkbTransactionsSerializer
       1
     else
       # object.attributes['cell_inputs_count'].to_i
-      object.cell_inputs.count
+      object.cell_inputs.size
     end
   end
 
   attribute :display_outputs_count do |object|
     # object.attributes['cell_outputs_count'].to_i
-    object.outputs.count
+    object.outputs.size
   end
 
   attribute :display_inputs do |object, params|

test/controllers/api/v1/address_live_cells_controller_test.rb

@@ -23,7 +23,7 @@ class AddressLiveCellsControllerTest < ActionDispatch::IntegrationTest
         address = create(:address, :with_udt_transactions)
         valid_get api_v1_address_live_cell_url(address.address_hash)
 
-        assert_equal ({ "data" => [], "meta" => { "total" => 0, "page_size" => 20, "total_pages" => 0 } }), json
+        assert_equal ({ "data" => [], "meta" => { "total" => 0, "page_size" => 10, "total_pages" => 0 } }), json
       end
 
       test "should return all live cells" do