Merge pull request #1412 from nervosnetwork/develop

Deploy to testnet
nervosnetwork · Aug 29, 2023 · 680abb6 · 680abb6
2 parents 36f754c + 62f2c3b
commit 680abb6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/app/controllers/api/v1/contract_transactions_controller.rb b/app/controllers/api/v1/contract_transactions_controller.rb
@@ -23,8 +23,8 @@ def show
             address = Address.find_address!(params[:address_hash])
             raise Api::V1::Exceptions::AddressNotFoundError if address.is_a?(NullAddress)
 
-            ckb_transactions = ckb_transactions.includes(:contained_dao_addresses).
-              where(address_dao_transactions: { address_id: address.id })
+            ckb_transactions = ckb_transactions.joins(:account_books).
+              where(account_books: { address_id: address.id })
           end
 
           ckb_transactions = ckb_transactions.page(@page).per(@page_size).fast_page

diff --git a/app/workers/token_transfer_detect_worker.rb b/app/workers/token_transfer_detect_worker.rb
@@ -156,6 +156,7 @@ def find_or_create_spore_collection(cell, type_script)
     spore_cluster_cell = spore_cluster_type.cell_outputs.order("id desc").first
     if spore_cluster_cell.present? && coll.cell_id.blank?
       parsed_cluster_data = CkbUtils.parse_spore_cluster_data(spore_cluster_cell.data)
+      coll.creator_id = spore_cluster_cell.address_id
       coll.cell_id = spore_cluster_cell.id
       coll.name = parsed_cluster_data[:name]
       coll.description = parsed_cluster_data[:description]

diff --git a/test/controllers/api/v1/contract_transactions_controller_test.rb b/test/controllers/api/v1/contract_transactions_controller_test.rb
@@ -209,8 +209,8 @@ class ContractTransactionsControllerTest < ActionDispatch::IntegrationTest
         address = create(:address)
         fake_dao_deposit_transaction(15, address)
 
-        contract_ckb_transactions = address.ckb_dao_transactions.includes(:contained_dao_addresses).
-          where(address_dao_transactions: { address_id: address.id }).
+        contract_ckb_transactions = address.ckb_dao_transactions.joins(:account_books).
+          where(account_books: { address_id: address.id }).
           order("ckb_transactions.block_timestamp desc nulls last, ckb_transactions.id desc").page(page).per(page_size).fast_page
 
         valid_get api_v1_contract_transaction_url(DaoContract::CONTRACT_NAME),