Resolves IP Lookups #270

config/dev.exs

@@ -87,10 +87,7 @@ config :archethic, Archethic.OracleChain.Scheduler,
   # Aggregate chain at the 50th second
   summary_interval: "0 * * * * *"
 
-config :archethic, Archethic.Networking.IPLookup, Archethic.Networking.IPLookup.Static
-
-config :archethic, Archethic.Networking.IPLookup.Static,
-  hostname: System.get_env("ARCHETHIC_STATIC_IP", "127.0.0.1")
+config :archethic, Archethic.Networking.IPLookup, provider: Archethic.Networking.IPLookup.Static
 
 config :archethic, Archethic.Networking.Scheduler, interval: "0 * * * * * *"
 

config/prod.exs

@@ -143,18 +143,29 @@ config :archethic, Archethic.Mining.PendingTransactionValidation,
         :software
     end)
 
-config :archethic,
-       Archethic.Networking.IPLookup,
-       (case(System.get_env("ARCHETHIC_NETWORKING_IMPL", "NAT") |> String.upcase()) do
-          "NAT" ->
-            Archethic.Networking.IPLookup.NAT
+config(
+  :archethic,
+  Archethic.Networking.IPLookup,
+  provider:
+    case(System.get_env("ARCHETHIC_NETWORKING_IMPL", "NAT") |> String.upcase()) do
+      "NAT" ->
+        Archethic.Networking.IPLookup.NAT
+
+      "STATIC" ->
+        Archethic.Networking.IPLookup.Static
+
+      "IPFY" ->
+        Archethic.Networking.IPLookup.IPIFY
+    end,
+  validate_node_ip:
+    case(System.get_env("ARCHETHIC_NODE_IP_VALIDATION", "true")) do
+      "true" ->
+        true
 
-          "STATIC" ->
-            Archethic.Networking.IPLookup.Static
-
-          "IPFY" ->
-            Archethic.Networking.IPLookup.IPIFY
-        end)
+      _ ->
+        false
+    end
+)
 
 config :archethic, Archethic.Networking.PortForwarding,
   enabled:
@@ -166,9 +177,6 @@ config :archethic, Archethic.Networking.PortForwarding,
          false
      end)
 
-config :archethic, Archethic.Networking.IPLookup.Static,
-  hostname: System.get_env("ARCHETHIC_STATIC_IP")
-
 config :archethic, Archethic.Networking.Scheduler,
   interval: System.get_env("ARCHETHIC_NETWORKING_UPDATE_SCHEDULER", "0 0 * * * * *")
 

lib/archethic/networking/ip_lookup.ex

@@ -3,6 +3,7 @@ defmodule Archethic.Networking.IPLookup do
 
   alias __MODULE__.IPIFY
   alias __MODULE__.NAT
+  alias Archethic.Networking
 
   require Logger
 
@@ -16,23 +17,29 @@ defmodule Archethic.Networking.IPLookup do
     provider = get_provider()
 
     ip =
-      case apply(provider, :get_node_ip, []) do
-        {:ok, ip} ->
+      case {apply(provider, :get_node_ip, []), should_validate_node_ip?()} do
+        {{:ok, ip}, true} ->
+          case Networking.valid_ip?(ip) do
+            true ->
+              Logger.info("Node IP discovered by #{provider}")
+              ip
+
+            false ->
+              fallback(provider, "NAT: Private IP ")
+          end
+
+        {{:ok, ip}, false} ->
           Logger.info("Node IP discovered by #{provider}")
           ip
 
-        {:error, reason} ->
+        {{:error, reason}, _} ->
           fallback(provider, reason)
       end
 
     Logger.info("Node IP discovered: #{:inet.ntoa(ip)}")
     ip
   end
 
-  defp get_provider do
-    Application.get_env(:archethic, __MODULE__)
-  end
-
   defp fallback(NAT, reason) do
     Logger.warning("Cannot use NAT IP lookup - #{inspect(reason)}")
     Logger.info("Trying IPFY as fallback")
@@ -49,4 +56,16 @@ defmodule Archethic.Networking.IPLookup do
   defp fallback(provider, reason) do
     raise "Cannot use #{provider} IP lookup - #{inspect(reason)}"
   end
+
+  defp get_provider() do
+    :archethic
+    |> Application.get_env(__MODULE__, [])
+    |> Keyword.get(:provider)
+  end
+
+  def should_validate_node_ip?() do
+    :archethic
+    |> Application.get_env(__MODULE__, [])
+    |> Keyword.get(:validate_node_ip, false)
+  end
 end