Merge pull request #2613 from nervosnetwork/develop

Deploy to testnet

Author: zmcNotafraid

app/models/daily_statistic.rb

@@ -69,14 +69,16 @@ def liquidity
   define_logic :claimed_compensation do
     claimed_compensation = 0
     if from_scratch
-      CellOutput.nervos_dao_withdrawing.consumed_before(ended_at).find_each do |nervos_dao_withdrawing_cell|
+      DaoEvent.processed.withdraw_from_dao.consumed_before(ended_at).find_each do |dao_event|
+        nervos_dao_withdrawing_cell = CellOutput.find_by(ckb_transaction_id: dao_event.ckb_transaction_id, cell_index: dao_event.cell_index)
         claimed_compensation += CkbUtils.dao_interest(nervos_dao_withdrawing_cell)
       end
     else
       claimed_compensation_today = 0
 
-      CellOutput.nervos_dao_withdrawing.consumed_between(started_at,
-                                                         ended_at).find_each do |nervos_dao_withdrawing_cell|
+      DaoEvent.processed.withdraw_from_dao.consumed_between(started_at,
+                                                            ended_at).find_each do |dao_event|
+        nervos_dao_withdrawing_cell = CellOutput.find_by(ckb_transaction_id: dao_event.ckb_transaction_id, cell_index: dao_event.cell_index)
         claimed_compensation_today += CkbUtils.dao_interest(nervos_dao_withdrawing_cell)
       end
 
@@ -90,14 +92,14 @@ def liquidity
     sum_interest_bearing = 0
     sum_uninterest_bearing = 0
 
-    CellOutput.nervos_dao_withdrawing.generated_before(ended_at).unconsumed_at(ended_at).find_each do |nervos_dao_withdrawing_cell|
-      nervos_dao_withdrawing_cell_generated_tx = nervos_dao_withdrawing_cell.ckb_transaction
-      nervos_dao_deposit_cell = nervos_dao_withdrawing_cell_generated_tx.cell_inputs.order(:id)[nervos_dao_withdrawing_cell.cell_index].previous_cell_output
+    DaoEvent.processed.withdraw_from_dao.created_before(ended_at).unconsumed_at(ended_at).find_each do |nervos_dao_withdrawing_cell|
+      nervos_dao_deposit_cell = CellInput.find_by(ckb_transaction_id: nervos_dao_withdrawing_cell.ckb_transaction_id, index: nervos_dao_withdrawing_cell.cell_index).previous_cell_output
       interest_bearing_deposits += nervos_dao_deposit_cell.capacity
       sum_interest_bearing += nervos_dao_deposit_cell.capacity * (nervos_dao_withdrawing_cell.block_timestamp - nervos_dao_deposit_cell.block_timestamp) / MILLISECONDS_IN_DAY
     end
 
-    CellOutput.nervos_dao_deposit.generated_before(ended_at).unconsumed_at(ended_at).find_each do |nervos_dao_deposit_cell|
+    DaoEvent.includes(:cell_output).processed.deposit_to_dao.created_before(ended_at).unconsumed_at(ended_at).find_each do |dao_event|
+      nervos_dao_deposit_cell = dao_event.cell_output
       uninterest_bearing_deposits += nervos_dao_deposit_cell.capacity
 
       sum_uninterest_bearing += nervos_dao_deposit_cell.capacity * (ended_at - nervos_dao_deposit_cell.block_timestamp) / MILLISECONDS_IN_DAY
@@ -478,8 +480,9 @@ def phase1_dao_interests
     @phase1_dao_interests ||=
       begin
         total = 0
-        CellOutput.nervos_dao_withdrawing.
-          generated_before(ended_at).unconsumed_at(ended_at).find_each do |nervos_dao_withdrawing_cell|
+        DaoEvent.processed.withdraw_from_dao.
+          created_before(ended_at).unconsumed_at(ended_at).find_each do |dao_event|
+          nervos_dao_withdrawing_cell = CellOutput.find_by(ckb_transaction_id: dao_event.ckb_transaction_id, cell_index: dao_event.cell_index)
           total += CkbUtils.dao_interest(nervos_dao_withdrawing_cell)
         end
         total
@@ -491,9 +494,9 @@ def unmade_dao_interests
       begin
         tip_dao = current_tip_block.dao
         total = 0
-        CellOutput.nervos_dao_deposit.
-          generated_before(ended_at).unconsumed_at(ended_at).find_each do |cell_output|
-          total += DaoCompensationCalculator.new(cell_output, tip_dao).call
+        DaoEvent.includes(:cell_output).processed.deposit_to_dao.
+          created_before(ended_at).unconsumed_at(ended_at).find_each do |dao_event|
+          total += DaoCompensationCalculator.new(dao_event.cell_output, tip_dao).call
         end
         total
       end

app/models/dao_event.rb

@@ -23,6 +23,19 @@ class DaoEvent < ApplicationRecord
   scope :created_between, ->(start_block_timestamp, end_block_timestamp) {
                             created_after(start_block_timestamp).created_before(end_block_timestamp)
                           }
+  scope :consumed_before, ->(block_timestamp) {
+    where("consumed_block_timestamp <= ?", block_timestamp)
+  }
+  scope :consumed_after, ->(block_timestamp) {
+    where("consumed_block_timestamp >= ?", block_timestamp)
+  }
+  scope :consumed_between, ->(start_timestamp, end_timestamp) {
+                             consumed_after(start_timestamp).consumed_before(end_timestamp)
+                           }
+
+  scope :unconsumed_at, ->(block_timestamp) {
+                          where("consumed_block_timestamp > ? or consumed_block_timestamp is null", block_timestamp)
+                        }
 end
 
 # == Schema Information

app/utils/ckb_utils.rb

@@ -287,7 +287,7 @@ def self.dao_withdraw_tx_fee(ckb_transaction)
 
   def self.dao_interest(nervos_dao_withdrawing_cell)
     nervos_dao_withdrawing_cell_generated_tx = nervos_dao_withdrawing_cell.ckb_transaction
-    nervos_dao_deposit_cell = nervos_dao_withdrawing_cell_generated_tx.cell_inputs.order(:id)[nervos_dao_withdrawing_cell.cell_index].previous_cell_output
+    nervos_dao_deposit_cell = nervos_dao_withdrawing_cell_generated_tx.cell_inputs.order(:index)[nervos_dao_withdrawing_cell.cell_index].previous_cell_output
     withdrawing_dao_cell_block_dao = nervos_dao_withdrawing_cell.dao
     DaoCompensationCalculator.new(nervos_dao_deposit_cell, withdrawing_dao_cell_block_dao,
                                   nervos_dao_withdrawing_cell).call