Skip to content

improve custom overlays #235

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 1 commit into from
Apr 8, 2024
Merged

improve custom overlays #235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 22 additions & 10 deletions custom_overlays.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def parse_config(name: str, config: dict, vset: list = None):


def add_custom_overlay(args):
from mytonctrl import ton
from mytonctrl import ton, local
if len(args) != 2:
color_print("{red}Bad args. Usage:{endc} add_custom_overlay <name> <path_to_config>")
return
Expand All @@ -54,7 +54,7 @@ def add_custom_overlay(args):
if '@validators' in config:
print('Dynamic overlay will be added within 1 minute')
else:
result = add_custom_overlay_to_vc(ton, parse_config(args[0], config))
result = add_custom_overlay_to_vc(local, ton, parse_config(args[0], config))
if not result:
print('Failed to add overlay to validator console')
color_print("add_custom_overlay - {red}ERROR{endc}")
Expand All @@ -77,10 +77,11 @@ def delete_custom_overlay(args):
if len(args) != 1:
color_print("{red}Bad args. Usage:{endc} delete_custom_overlay <name>")
return
ton.delete_custom_overlay(args[0])
if '@validators' in ton.get_custom_overlays().get(args[0], {}):
ton.delete_custom_overlay(args[0])
print('Dynamic overlay will be deleted within 1 minute')
else:
ton.delete_custom_overlay(args[0])
result = delete_custom_overlay_from_vc(ton, args[0])
if not result:
print('Failed to delete overlay from validator console')
Expand All @@ -89,12 +90,26 @@ def delete_custom_overlay(args):
color_print("delete_custom_overlay - {green}OK{endc}")


def check_node_eligible_for_custom_overlay(ton, config: dict):
vconfig = ton.GetValidatorConfig()
my_adnls = vconfig.adnl
node_adnls = [i["adnl_id"] for i in config["nodes"]]
for adnl in my_adnls:
if adnl.id in node_adnls:
return True
return False


def delete_custom_overlay_from_vc(ton, name: str):
result = ton.validatorConsole.Run(f"delcustomoverlay {name}")
return 'success' in result


def add_custom_overlay_to_vc(ton, config: dict):
def add_custom_overlay_to_vc(local, ton, config: dict):
if not check_node_eligible_for_custom_overlay(ton, config):
local.add_log(f"Node has no adnl address required for custom overlay {config.get('name')}", "debug")
return False
local.add_log(f"Adding custom overlay {config.get('name')}", "debug")
path = ton.tempDir + f'/custom_overlay_{config["name"]}.json'
with open(path, 'w') as f:
json.dump(config, f)
Expand Down Expand Up @@ -149,19 +164,16 @@ def deploy_custom_overlays(local, ton):
new_name = name + '_elid' + str(current_el_id)
if new_name not in names:
node_config = parse_config(new_name, config, current_vset)
local.add_log(f"Adding custom overlay {new_name}", "debug")
add_custom_overlay_to_vc(ton, node_config)
add_custom_overlay_to_vc(local, ton, node_config)

if next_el_id != 0:
new_name = name + '_elid' + str(next_el_id)
if new_name not in names:
node_config = parse_config(new_name, config, next_vset)
local.add_log(f"Adding custom overlay {new_name}", "debug")
add_custom_overlay_to_vc(ton, node_config)
add_custom_overlay_to_vc(local, ton, node_config)
else:
node_config = parse_config(name, config)
local.add_log(f"Adding custom overlay {name}", "debug")
add_custom_overlay_to_vc(ton, node_config)
add_custom_overlay_to_vc(local, ton, node_config)


MAINNET_DEFAULT_CUSTOM_OVERLAY = {
Expand Down