Handle geopatch updates in Notifier

archethic-foundation · Feb 11, 2025 · 0b3ff35 · 0b3ff35
1 parent 1d9a5b1
commit 0b3ff35
Show file tree

Hide file tree

Showing 6 changed files with 240 additions and 236 deletions.
diff --git a/lib/archethic/p2p/mem_table_loader.ex b/lib/archethic/p2p/mem_table_loader.ex
@@ -8,6 +8,7 @@ defmodule Archethic.P2P.MemTableLoader do
 
   alias Archethic.DB
 
+  alias Archethic.P2P
   alias Archethic.P2P.GeoPatch
   alias Archethic.P2P.MemTable
   alias Archethic.P2P.Node
@@ -86,7 +87,7 @@ defmodule Archethic.P2P.MemTableLoader do
   end
 
   @doc """
-  Load the transaction and update the P2P view
+  Load the transaction and update the P2P view.
   """
   @spec load_transaction(Transaction.t()) :: :ok
   def load_transaction(%Transaction{
@@ -112,7 +113,8 @@ defmodule Archethic.P2P.MemTableLoader do
        reward_address: reward_address,
        origin_public_key: origin_public_key,
        mining_public_key: mining_public_key,
-       geo_patch: geo_patch
+       geo_patch: geo_patch,
+       geo_patch_update: geo_patch_update
      }} = Node.decode_transaction_content(content)
 
     geo_patch = if geo_patch == nil, do: GeoPatch.from_ip(ip), else: geo_patch
@@ -133,13 +135,12 @@ defmodule Archethic.P2P.MemTableLoader do
         mining_public_key: mining_public_key
       }
 
-      node
-      |> Node.enroll(timestamp)
-      |> MemTable.add_node()
+      node = Node.enroll(node, timestamp)
+      MemTable.add_node(node)
     else
       {:ok, node} = MemTable.get_node(first_public_key)
 
-      MemTable.add_node(%{
+      updated_node = %Node{
         node
         | ip: ip,
           port: port,
@@ -152,10 +153,14 @@ defmodule Archethic.P2P.MemTableLoader do
           origin_public_key: origin_public_key,
           last_update_date: timestamp,
           mining_public_key: mining_public_key
-      })
+      }
+
+      MemTable.add_node(updated_node)
+
+      handle_geo_patch_update(node, updated_node, geo_patch_update)
     end
 
-    Logger.info("Node loaded into in memory p2p tables", node: Base.encode16(first_public_key))
+    Logger.info("Node loaded into in-memory P2P tables", node: Base.encode16(first_public_key))
   end
 
   def load_transaction(%Transaction{
@@ -201,4 +206,27 @@ defmodule Archethic.P2P.MemTableLoader do
       MemTable.set_node_unavailable(node_public_key, availability_update)
     end
   end
+
+  defp handle_geo_patch_update(
+         %Node{first_public_key: first_public_key, geo_patch: prev_geo_patch},
+         %Node{geo_patch: new_geo_patch},
+         geo_patch_update
+       )
+       when prev_geo_patch != new_geo_patch do
+    Logger.info("GeoPatch changed for node", node: Base.encode16(first_public_key))
+    Logger.info("Starting Notifier for GeoPatch change")
+
+    new_nodes = P2P.authorized_and_available_nodes(geo_patch_update)
+
+    previous_nodes =
+      Enum.map(new_nodes, fn
+        node = %Node{first_public_key: ^first_public_key} ->
+          %Node{node | geo_patch: prev_geo_patch}
+
+        node ->
+          node
+      end)
+
+    SelfRepair.start_notifier(previous_nodes, new_nodes, geo_patch_update)
+  end
 end
diff --git a/lib/archethic/self_repair.ex b/lib/archethic/self_repair.ex
@@ -16,7 +16,6 @@ defmodule Archethic.SelfRepair do
   alias Archethic.P2P.Node
   alias Archethic.Replication
   alias Archethic.TransactionChain
-  alias Archethic.Utils
 
   require Logger
 
@@ -164,33 +163,21 @@ defmodule Archethic.SelfRepair do
   @doc """
   Start a new notifier process if there is new unavailable nodes after the self repair
   """
-  @spec start_notifier(list(Node.t()), list(Node.t()), DateTime.t()) :: :ok
-  def start_notifier(prev_available_nodes, new_available_nodes, availability_update) do
-    diff_node =
-      prev_available_nodes
-      |> Enum.reject(
-        &(Utils.key_in_node_list?(new_available_nodes, &1.first_public_key) or
-            &1.first_public_key == Crypto.first_node_public_key())
-      )
-
-    case diff_node do
-      [] ->
-        :ok
-
-      nodes ->
-        unavailable_nodes = Enum.map(nodes, & &1.first_public_key)
+  @spec start_notifier(
+          previous_nodes :: list(Node.t()),
+          new_nodes :: list(Node.t()),
+          availability_update :: DateTime.t()
+        ) :: :ok
+  def start_notifier(previous_nodes, new_nodes, availability_update) do
+    args = [
+      previous_nodes: previous_nodes,
+      new_nodes: new_nodes,
+      availability_update: availability_update
+    ]
 
-        DynamicSupervisor.start_child(
-          NotifierSupervisor,
-          {Notifier,
-           unavailable_nodes: unavailable_nodes,
-           prev_available_nodes: prev_available_nodes,
-           new_available_nodes: new_available_nodes,
-           availability_update: availability_update}
-        )
+    DynamicSupervisor.start_child(NotifierSupervisor, {Notifier, args})
 
-        :ok
-    end
+    :ok
   end
 
   @doc """