var

src/shared.py

@@ -41,7 +41,7 @@ class findora_env:
     findora_root_testnet = f"{findora_root}/testnet"
     toolbox_location = os.path.join(user_home_dir, "findora-toolbox")
     staker_memo_path = os.path.join(user_home_dir, "staker_memo")
-    our_external_ip = getUrl()
+    our_external_ip = get_url()
     container_name = "findorad"
     migrate_dir = os.path.join(user_home_dir, "migrate")
     fra_env = "prod"

web/src/shared.py

@@ -2,14 +2,22 @@
 import socket
 import requests
 
-def getUrl(timeout=5) -> str:
+def get_url(timeout=5) -> str:
     try:
-        response = requests.get("https://ident.me", timeout=timeout)
+        response = requests.get("https://api.ipify.org?format=json", timeout=timeout)
         response.raise_for_status()  # Raises a HTTPError if the response was unsuccessful
-        result = response.text
+
+        # Parse the JSON response
+        ip_data = response.json()
+        result = ip_data["ip"]
     except requests.exceptions.RequestException as x:
-        print(type(x), x)
-        result = '0.0.0.0'
+        try:
+            response = requests.get("https://ident.me", timeout=timeout)
+            response.raise_for_status()  # Raises a HTTPError if the response was unsuccessful
+            result = response.text
+        except requests.exceptions.RequestException as x:
+            print(type(x), x)
+            result = "0.0.0.0"
     return result
 
 class findora_env:
@@ -23,7 +31,7 @@ class findora_env:
     findora_root_testnet = f"{findora_root}/testnet"
     toolbox_location = os.path.join(user_home_dir, "findora-toolbox")
     web_location = os.path.join(user_home_dir, "findora-toolbox-web")
-    our_external_ip = getUrl()
+    our_external_ip = get_url()
     findora_menu = os.path.join(toolbox_location, "src", "messages", "framenu.txt")
     container_name = "findorad"
     migrate_dir = os.path.join(user_home_dir, "migrate")