From 626d4f464bea90cee7770b6d0c8bafef84eb4f1a Mon Sep 17 00:00:00 2001 From: yungwine Date: Tue, 28 May 2024 14:44:03 +0700 Subject: [PATCH 1/2] support custom block overlays --- modules/custom_overlays.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/modules/custom_overlays.py b/modules/custom_overlays.py index e951318c..4ca7331e 100644 --- a/modules/custom_overlays.py +++ b/modules/custom_overlays.py @@ -31,12 +31,20 @@ def parse_config(name: str, config: dict, vset: list = None): "msg_sender": False, }) else: - result["nodes"].append({ - "adnl_id": hex2base64(k), - "msg_sender": v["msg_sender"], - }) - if v["msg_sender"]: - result["nodes"][-1]["msg_sender_priority"] = v["msg_sender_priority"] + if "block_sender" in v: + result["nodes"].append({ + "adnl_id": hex2base64(k), + "block_sender": v["block_sender"], + }) + elif "msg_sender" in v: + result["nodes"].append({ + "adnl_id": hex2base64(k), + "msg_sender": v["msg_sender"], + }) + if v["msg_sender"]: + result["nodes"][-1]["msg_sender_priority"] = v["msg_sender_priority"] + else: + raise Exception("Unknown node type") return result def add_custom_overlay(self, args): From 1fce2cda03ca6e4a0284d2deae0e7e193cd79584 Mon Sep 17 00:00:00 2001 From: yungwine Date: Tue, 28 May 2024 14:51:39 +0700 Subject: [PATCH 2/2] add timeout --- modules/custom_overlays.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/custom_overlays.py b/modules/custom_overlays.py index 4ca7331e..efa82dd8 100644 --- a/modules/custom_overlays.py +++ b/modules/custom_overlays.py @@ -176,7 +176,7 @@ def get_default_custom_overlay(self): network = self.ton.GetNetworkName() default_url = 'https://ton-blockchain.github.io/fallback_custom_overlays.json' url = self.ton.local.db.get('defaultCustomOverlaysUrl', default_url) - resp = requests.get(url) + resp = requests.get(url, timeout=3) if resp.status_code != 200: self.ton.local.add_log(f"Failed to get default custom overlays from {url}", "error") return None