Merge pull request #2573 from nervosnetwork/testnet

Deploy to mainnet

Author: rabbitz

app/interactions/graph_nodes/transactions.rb

@@ -20,7 +20,7 @@ class Transactions < ActiveInteraction::Base
     def execute
       channels = FiberGraphChannel.with_deleted
       channels = channels.where(node1: node_id).or(channels.where(node2: node_id))
-      return FiberGraphChannel.none if channels.empty?
+      return Kaminari.paginate_array([]).page(page).per(page_size) if channels.empty?
 
       channels = filter_by_address(channels)
       channels = filter_by_type_hash(channels)

app/models/concerns/ckb_transactions/display_cells.rb

@@ -130,6 +130,9 @@ def normal_tx_display_inputs(cell_inputs_for_display)
           if previous_cell_output.cell_type.in?(%w(spore_cluster spore_cell did_cell))
             display_input.merge!(attributes_for_dob_cell(previous_cell_output))
           end
+          if previous_cell_output.lock_script.code_hash == Settings.fiber_funding_code_hash
+            display_input.merge!(attributes_for_fiber_cell(previous_cell_output))
+          end
 
           CkbUtils.hash_value_to_s(display_input)
         end
@@ -172,6 +175,9 @@ def normal_tx_display_outputs(cell_outputs_for_display)
           if output.cell_type.in?(%w(spore_cluster spore_cell did_cell))
             display_output.merge!(attributes_for_dob_cell(output))
           end
+          if output.lock_script.code_hash == Settings.fiber_funding_code_hash
+            display_output.merge!(attributes_for_fiber_cell(output))
+          end
 
           CkbUtils.hash_value_to_s(display_output)
         end
@@ -262,6 +268,12 @@ def attributes_for_dob_cell(dob_cell)
         { dob_info: info, extra_info: info }
       end
 
+      def attributes_for_fiber_cell(fiber_cell)
+        fiber_graph_channel = FiberGraphChannel.with_deleted.find_by(cell_output_id: fiber_cell.id)
+        info = fiber_graph_channel&.slice(:node1, :node2)
+        { fiber_graph_channel_info: info }
+      end
+
       def hex_since(int_since_value)
         "0x#{int_since_value.to_s(16).rjust(16, '0')}"
       end