fix conflict

Signed-off-by: Miles Zhang <[email protected]>
nervosnetwork · Dec 13, 2024 · 414cc8c · 414cc8c
2 parents 2ac4ca9 + d1f9b93
commit 414cc8c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/app/workers/analyze_contract_from_cell_dependency_worker.rb b/app/workers/analyze_contract_from_cell_dependency_worker.rb
@@ -73,6 +73,7 @@ def process_cell_dependencies(cell_deps, lock_scripts, type_scripts, out_points_
         contract_cell_id: cell_dep.contract_cell_id,
         dep_type: cell_dep.dep_type,
       }
+      next if Contract.joins(:cell_deps_out_points).where(cell_deps_out_points: { contract_cell_id: cell_dep.contract_cell_id }).exists?
 
       case cell_dep.dep_type
       when "code"

diff --git a/lib/tasks/migration/analyze_contract_from_start_block.rake b/lib/tasks/migration/analyze_contract_from_start_block.rake
@@ -27,6 +27,7 @@ namespace :migration do
 
         cell_deps.each do |cell_dep|
           cell_deps_attrs << { contract_analyzed: true, ckb_transaction_id: cell_dep.ckb_transaction_id, contract_cell_id: cell_dep.contract_cell_id, dep_type: cell_dep.dep_type }
+          next if Contract.joins(:cell_deps_out_points).where(cell_deps_out_points: { contract_cell_id: cell_dep.contract_cell_id }).exists?
 
           case cell_dep.dep_type
           when "code"
@@ -86,6 +87,10 @@ namespace :migration do
                   {
                     type_hash: cell_output.type_script&.script_hash,
                     data_hash: cell_output.data_hash,
+<<<<<<< HEAD
+=======
+
+>>>>>>> issue-794-7
                     deployed_cell_output_id: cell_output.id,
                     deployed_args: cell_output.type_script&.args,
                   }