Skip to content

support custom block overlays #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 30, 2024
Merged

support custom block overlays #275

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
626d4f4
support custom block overlays
yungwine May 28, 2024
1fce2cd
add timeout
yungwine May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions modules/custom_overlays.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -168,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
Expand Down