Augment Message.NewTransaction with a welcome node key

archethic-foundation · Feb 28, 2023 · 92c7a43 · 92c7a43
1 parent 014ceee
commit 92c7a43
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 21 deletions.
diff --git a/lib/archethic.ex b/lib/archethic.ex
@@ -61,36 +61,37 @@ defmodule Archethic do
           do_send_transaction(tx, welcome_node_key)
 
         {:error, :node_out_of_sync} ->
-          forward_transaction(tx)
+          forward_transaction(tx, welcome_node_key)
 
         {:error, last_address_to_sync} ->
           Resync.node_out_of_sync(last_address_to_sync)
-          forward_transaction(tx)
+          forward_transaction(tx, welcome_node_key)
       end
     else
       # node not authorized
-      forward_transaction(tx)
+      forward_transaction(tx, welcome_node_key)
     end
   end
 
   defp forward_transaction(
          tx,
+         welcome_node_key,
          nodes \\ P2P.authorized_and_available_nodes()
          |> Enum.filter(&Node.locally_available?/1)
          |> P2P.nearest_nodes()
        )
 
-  defp forward_transaction(tx, [node | rest]) do
-    case P2P.send_message(node, %NewTransaction{transaction: tx}) do
+  defp forward_transaction(tx, welcome_node_key, [node | rest]) do
+    case P2P.send_message(node, %NewTransaction{transaction: tx, welcome_node: welcome_node_key}) do
       {:ok, %Ok{}} ->
         :ok
 
       {:error, _} ->
-        forward_transaction(tx, rest)
+        forward_transaction(tx, welcome_node_key, rest)
     end
   end
 
-  defp forward_transaction(_, []), do: {:error, :network_issue}
+  defp forward_transaction(_, _, []), do: {:error, :network_issue}
 
   defp do_send_transaction(tx = %Transaction{type: tx_type}, welcome_node_key) do
     current_date = DateTime.utc_now()

diff --git a/lib/archethic/bootstrap/transaction_handler.ex b/lib/archethic/bootstrap/transaction_handler.ex
@@ -36,7 +36,10 @@ defmodule Archethic.Bootstrap.TransactionHandler do
   @spec do_send_transaction(list(Node.t()), Transaction.t()) ::
           :ok
   defp do_send_transaction([node | rest], tx) do
-    case P2P.send_message(node, %NewTransaction{transaction: tx}) do
+    case P2P.send_message(node, %NewTransaction{
+           transaction: tx,
+           welcome_node: Crypto.first_node_public_key()
+         }) do
       {:ok, %Ok{}} ->
         Logger.info("Waiting transaction validation",
           transaction_address: Base.encode16(tx.address),

diff --git a/lib/archethic/p2p/message/new_transaction.ex b/lib/archethic/p2p/message/new_transaction.ex
@@ -4,20 +4,20 @@ defmodule Archethic.P2P.Message.NewTransaction do
 
   This message is used locally within a node during the bootstrap
   """
-  defstruct [:transaction]
+  @enforce_keys [:transaction, :welcome_node]
+  defstruct [:transaction, :welcome_node]
 
-  alias Archethic.TransactionChain.Transaction
-  alias Archethic.P2P.Message.Ok
-  alias Archethic.P2P.Message.Error
-  alias Archethic.Crypto
+  alias Archethic.{TransactionChain.Transaction, Crypto, Utils, P2P.Message}
+  alias Message.{Ok, Error}
 
   @type t :: %__MODULE__{
-          transaction: Transaction.t()
+          transaction: Transaction.t(),
+          welcome_node: Crypto.key()
         }
 
   @spec process(__MODULE__.t(), Crypto.key()) :: Ok.t() | Error.t()
-  def process(%__MODULE__{transaction: tx}, sender_public_key) do
-    case Archethic.send_new_transaction(tx, sender_public_key) do
+  def process(%__MODULE__{transaction: tx, welcome_node: node_pbkey}, _) do
+    case Archethic.send_new_transaction(tx, node_pbkey) do
       :ok ->
         %Ok{}
 
@@ -27,13 +27,14 @@ defmodule Archethic.P2P.Message.NewTransaction do
   end
 
   @spec serialize(t()) :: bitstring()
-  def serialize(%__MODULE__{transaction: tx}) do
-    <<Transaction.serialize(tx)::bitstring>>
+  def serialize(%__MODULE__{transaction: tx, welcome_node: node_pbkey}) do
+    <<Transaction.serialize(tx)::bitstring, node_pbkey::binary>>
   end
 
   @spec deserialize(bitstring()) :: {t(), bitstring}
   def deserialize(<<rest::bitstring>>) do
     {tx, rest} = Transaction.deserialize(rest)
-    {%__MODULE__{transaction: tx}, rest}
+    {node_pbkey, rest} = Utils.deserialize_public_key(rest)
+    {%__MODULE__{transaction: tx, welcome_node: node_pbkey}, rest}
   end
 end
diff --git a/test/archethic/p2p/messages_test.exs b/test/archethic/p2p/messages_test.exs
@@ -145,8 +145,8 @@ defmodule Archethic.P2P.MessageTest do
     test "NewTransaction message" do
       tx = Transaction.new(:transfer, %TransactionData{}, "seed", 0)
 
-      assert %NewTransaction{transaction: tx} ==
-               %NewTransaction{transaction: tx}
+      assert %NewTransaction{transaction: tx, welcome_node: Crypto.first_node_public_key()} ==
+               %NewTransaction{transaction: tx, welcome_node: Crypto.first_node_public_key()}
                |> Message.encode()
                |> Message.decode()
                |> elem(0)