Merge pull request #584 from ton-blockchain/dev

Dev

Author: yungwine

modules/general.py

@@ -901,6 +901,47 @@ def Upgrade(self, args: list[str]):
             text = "Upgrade - {red}Error{endc}"
         color_print(text)
 
+    def reload_global_config(self, args: list[str]):
+        if not check_usage_args_min_max_len("reload_global_config", args, 0, 1):
+            return
+        if len(args) == 1:
+            url = args[0]
+        else:
+            network_name = self.ton.GetNetworkName()
+            if network_name == "mainnet":
+                url = "https://ton-blockchain.github.io/global.config.json"
+            elif network_name == "testnet":
+                url = "https://ton-blockchain.github.io/testnet-global.config.json"
+            else:
+                raise Exception(
+                    "could not detect the network, please provide the config url explicitly"
+                )
+
+        self.local.add_log(f"Downloading global config from {url}", "info")
+        try:
+            response = requests.get(url, timeout=30)
+            response.raise_for_status()
+            config_text = response.text
+            json.loads(config_text)  # make sure the downloaded config is valid json before replacing
+        except Exception as e:
+            color_print(
+                f"reload_global_config error: {{red}}failed to download config from {url}: {e}{{endc}}"
+            )
+            return
+
+        global_config_path = self.ton.get_paths().global_config_path
+        with tempfile.NamedTemporaryFile("w", suffix=".json") as tmp_file:
+            tmp_file.write(config_text)
+            tmp_file.flush()
+            exit_code = run_as_root(
+                ["install", "-m", "0644", tmp_file.name, str(global_config_path)]
+            )
+
+        if exit_code == 0:
+            color_print("reload_global_config - {green}OK{endc}")
+        else:
+            color_print("reload_global_config - {red}Error{endc}")
+
     def run_benchmark(self, args: list[str]):
         if shutil.which("uv") is None:
             answer = input("uv is not installed. Install it? [y/n] ").strip().lower()
@@ -1047,6 +1088,9 @@ def run_installer(self, args: list[str]):
     def add_console_commands(self, console):
         add_command(self.local, console, "update", self.Update)
         add_command(self.local, console, "upgrade", self.Upgrade)
+        add_command(
+            self.local, console, "reload_global_config", self.reload_global_config
+        )
         add_command(self.local, console, "installer", self.run_installer)
         add_command(self.local, console, "status", self.print_status)
         add_command(self.local, console, "status_modes", self.mode_status)

modules/utilities.py

@@ -373,15 +373,15 @@ def check_adnl_connection(self):
         if not check_adnl:
             return True, ''
         self.local.add_log('Checking ADNL connection to local node', 'info')
-        hosts = ['45.129.96.53', '5.154.181.153', '91.194.11.68', '45.12.134.214', '103.106.3.171']
+        hosts = ['45.129.96.53', '5.154.181.153', '45.12.134.214']
         hosts = random.sample(hosts, k=3)
         data = self.ton.get_local_adnl_data()
         error = ''
         ok = True
         for host in hosts:
             url = f'http://{host}/adnl_check'
             try:
-                response = requests.post(url, json=data, timeout=5).json()
+                response = requests.post(url, json=data, timeout=3).json()
             except Exception as e:
                 ok = False
                 error = f'Failed to check ADNL connection to local node: {type(e)}: {e}'

mytonctrl/console_cmd.py

@@ -6,6 +6,7 @@
 USAGES = {
     "update": "[repo_url|repo_owner] [branch]",
     "upgrade": "[repo_url|repo_owner] [branch]",
+    "reload_global_config": "[url]",
     "installer": "[command]",
     "status": "[fast]",
     "enable_mode": "<mode_name>",

mytonctrl/resources/translate.json

@@ -9,6 +9,11 @@
 		"ru": "Подтянуть исходный код и перекомпилировать компоненты TON",
 		"zh_TW": "拉取源碼並重新編譯 TON 組件"
 	},
+	"reload_global_config_cmd": {
+		"en": "Re-download the network global config",
+		"ru": "Переустановить глобальный конфиг сети",
+		"zh_TW": "重新下載網路全域設定檔"
+	},
 	"status_cmd": {
 		"en": "Show TON status",
 		"ru": "Показать статус TON",

tests/integration/test_basic_commands.py

@@ -130,6 +130,83 @@ def fake_SetSettings(self, name, value):
     assert "Upgrade - Error" in output
 
 
+def test_reload_global_config(cli, monkeypatch):
+    # the cli fixture pins GetNetworkName to "mainnet"
+    valid_config = json.dumps({"validator": {}, "liteservers": []})
+
+    class FakeResponse:
+        def __init__(self, text, status=200):
+            self.text = text
+            self._status = status
+
+        def raise_for_status(self):
+            if self._status >= 400:
+                raise Exception(f"HTTP {self._status}")
+
+    requested = {}
+
+    def fake_get(url, timeout=None):
+        requested["url"] = url
+        requested["timeout"] = timeout
+        return FakeResponse(valid_config)
+
+    monkeypatch.setattr(general_module.requests, "get", fake_get)
+
+    copied = {}
+
+    def fake_run_as_root(run_args):
+        copied["args"] = run_args
+        # the temp source file must still exist when we install it into place
+        assert pathlib.Path(run_args[3]).is_file()
+        return 0
+
+    monkeypatch.setattr(general_module, "run_as_root", fake_run_as_root)
+
+    # no url -> mainnet default url, installed to the global config path
+    output = cli.execute("reload_global_config", no_color=True)
+    assert requested["url"] == "https://ton-blockchain.github.io/global.config.json"
+    assert copied["args"][:3] == ["install", "-m", "0644"]
+    assert copied["args"][4] == "/usr/bin/ton/global.config.json"
+    assert not pathlib.Path(copied["args"][3]).exists()  # temp file cleaned up
+    assert "reload_global_config - OK" in output
+
+    # explicit url arg overrides the default
+    output = cli.execute(
+        "reload_global_config https://example.com/custom.json", no_color=True
+    )
+    assert requested["url"] == "https://example.com/custom.json"
+    assert "reload_global_config - OK" in output
+
+    # too many args -> usage error, nothing downloaded
+    requested.clear()
+    output = cli.execute("reload_global_config a b", no_color=True)
+    assert "Bad args" in output
+    assert requested == {}
+
+    # non-json response -> error, config is not touched
+    copied.clear()
+    monkeypatch.setattr(
+        general_module.requests,
+        "get",
+        lambda url, timeout=None: FakeResponse("<html>not json</html>"),
+    )
+    output = cli.execute("reload_global_config", no_color=True)
+    assert "reload_global_config error" in output
+    assert copied == {}
+
+    # network unknown and no url -> ask for explicit url
+    monkeypatch.setattr(general_module.requests, "get", fake_get)
+    monkeypatch.setattr(MyTonCore, "GetNetworkName", lambda self: "unknown")
+    output = cli.execute("reload_global_config", no_color=True)
+    assert "could not detect the network" in output
+
+    # root install fails -> Error
+    monkeypatch.setattr(MyTonCore, "GetNetworkName", lambda self: "mainnet")
+    monkeypatch.setattr(general_module, "run_as_root", lambda _: 1)
+    output = cli.execute("reload_global_config", no_color=True)
+    assert "reload_global_config - Error" in output
+
+
 def test_installer(cli, monkeypatch):
     calls = {}
     def fake_run(self, cmd):