Add conflict resolver for GetTransactionSummary

archethic-foundation · Dec 11, 2022 · 2520cea · 2520cea
1 parent d1149bd
commit 2520cea
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/lib/archethic/mining/pending_transaction_validation.ex b/lib/archethic/mining/pending_transaction_validation.ex
@@ -86,9 +86,22 @@ defmodule Archethic.Mining.PendingTransactionValidation do
   defp valid_not_exists(%Transaction{address: address}) do
     storage_nodes = Election.chain_storage_nodes(address, P2P.authorized_and_available_nodes())
 
+    conflict_resolver = fn results ->
+      # Prioritize transactions results over not found
+      case Enum.filter(results, &match?(%TransactionSummary{}, &1)) do
+        [] ->
+          %NotFound{}
+
+        res ->
+          Enum.sort_by(res, & &1.timestamp, {:desc, DateTime})
+          |> List.first()
+      end
+    end
+
     case P2P.quorum_read(
            storage_nodes,
-           %GetTransactionSummary{address: address}
+           %GetTransactionSummary{address: address},
+           conflict_resolver
          ) do
       {:ok, %TransactionSummary{address: ^address}} ->
         {:error, "transaction already exists"}

diff --git a/lib/archethic_web/controllers/api/transaction_controller.ex b/lib/archethic_web/controllers/api/transaction_controller.ex
@@ -42,9 +42,22 @@ defmodule ArchethicWeb.API.TransactionController do
         storage_nodes =
           Election.chain_storage_nodes(tx_address, P2P.authorized_and_available_nodes())
 
+        conflict_resolver = fn results ->
+          # Prioritize transactions results over not found
+          case Enum.filter(results, &match?(%TransactionSummary{}, &1)) do
+            [] ->
+              %NotFound{}
+
+            res ->
+              Enum.sort_by(res, & &1.timestamp, {:desc, DateTime})
+              |> List.first()
+          end
+        end
+
         case P2P.quorum_read(
                storage_nodes,
-               %GetTransactionSummary{address: tx_address}
+               %GetTransactionSummary{address: tx_address},
+               conflict_resolver
              ) do
           {:ok, %TransactionSummary{address: ^tx_address}} ->
             conn |> put_status(422) |> json(%{status: "error - transaction already exists!"})