Merge pull request #2857 from nervosnetwork/testnet

Deploy to mainnet

Author: u2

app/workers/dao_contract_unclaimed_compensation_generator.rb

@@ -15,7 +15,18 @@ def cal_unclaimed_compensation
   # @return [Integer]
   def phase1_dao_interests
     total = 0
-    CellOutput.nervos_dao_withdrawing.live.find_each do |nervos_dao_withdrawing_cell|
+    events = DaoEvent.processed.where(event_type: "withdraw_from_dao", consumed_transaction_id: nil)
+
+    pairs = events.map{|e| [e.ckb_transaction_id, e.cell_index] }
+    conditions = pairs.map do |tx_id, cell_idx|
+      ["ckb_transaction_id = #{tx_id} AND cell_index = #{cell_idx}"]
+    end
+    query = conditions.map do |cond|
+      "(#{cond[0]})"
+    end.join(" OR ")
+    cells = CellOutput.where(query).to_a
+
+    cells.each do |nervos_dao_withdrawing_cell|
       total += CkbUtils.dao_interest(nervos_dao_withdrawing_cell)
     end
     total
@@ -25,8 +36,8 @@ def phase1_dao_interests
   def unmade_dao_interests
     tip_dao = current_tip_block.dao
     total = 0
-    CellOutput.nervos_dao_deposit.live.find_each do |cell_output|
-      total += DaoCompensationCalculator.new(cell_output, tip_dao).call
+    DaoEvent.depositor.includes(:cell_output).select(:cell_output_id, :id).find_each do |event|
+      total += DaoCompensationCalculator.new(event.cell_output, tip_dao).call
     end
     total
   end