Merge pull request #1909 from nervosnetwork/testnet

Deploy to mainnet
nervosnetwork · Jun 3, 2024 · 34b43d9 · 34b43d9
2 parents e6ed219 + 3584daf
commit 34b43d9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/app/jobs/csv_exportable/export_dao_depositors_job.rb b/app/jobs/csv_exportable/export_dao_depositors_job.rb
@@ -10,7 +10,7 @@ def perform(args)
       end
 
       if args[:end_date].present?
-        sql << " AND ckb_transactions.block_timestamp <= #{BigDecimal(args[:start_date])}"
+        sql << " AND ckb_transactions.block_timestamp <= #{BigDecimal(args[:end_date])}"
       end
 
       if args[:start_number].present?

diff --git a/app/models/daily_statistic.rb b/app/models/daily_statistic.rb
@@ -383,17 +383,19 @@ def liquidity
       to_be_counted_date.days_ago(1).to_i * 1000, to_be_counted_date.to_i * 1000 - 1
     ).consumed_after(to_be_counted_date.to_i * 1000).sum(:capacity)
 
-    {
-      over_three_years:,
-      one_year_to_three_years:,
-      six_months_to_one_year:,
-      three_months_to_six_months:,
-      one_month_to_three_months:,
-      one_week_to_one_month:,
-      day_to_one_week:,
-      latest_day:,
-      total_supply: total_supply + burnt,
-    }.transform_values { |value| (value.to_f / 10**8).truncate(8) }
+    base_attrs =
+      {
+        over_three_years:,
+        one_year_to_three_years:,
+        six_months_to_one_year:,
+        three_months_to_six_months:,
+        one_month_to_three_months:,
+        one_week_to_one_month:,
+        day_to_one_week:,
+        latest_day:,
+      }
+    total_live_capacities = base_attrs.values.sum
+    base_attrs.merge(total_supply: total_live_capacities).transform_values { |value| (value.to_f / 10**8).truncate(8) }
   end
 
   private

diff --git a/app/workers/bitcoin_transaction_detect_worker.rb b/app/workers/bitcoin_transaction_detect_worker.rb
@@ -113,10 +113,10 @@ def annotation_workflow_attributes(transaction)
       end
     }
 
-    input_lock_types = transaction.input_cells.map { _1.bitcoin_transfer&.lock_type }.uniq
+    input_lock_types = transaction.input_cells.where.not(type_script_id: nil).map { _1.bitcoin_transfer&.lock_type }.uniq
     sort_types.call(input_lock_types)
 
-    output_lock_types = transaction.cell_outputs.map { _1.bitcoin_transfer&.lock_type }.uniq
+    output_lock_types = transaction.cell_outputs.where.not(type_script_id: nil).map { _1.bitcoin_transfer&.lock_type }.uniq
     sort_types.call(output_lock_types)
 
     if input_lock_types == ["rgbpp"]