diff --git a/constants.xml b/constants.xml index 9eae455481..5a8e6a3fa0 100644 --- a/constants.xml +++ b/constants.xml @@ -2,7 +2,7 @@ - 4 + 3 false false 25 @@ -19,7 +19,7 @@ 0 15 15360 - true + false 1 @@ -31,6 +31,7 @@ 1 1 1 + 1 1 @@ -39,7 +40,7 @@ true 5 100000 - 5 + 10 10 false 33135 @@ -57,19 +58,20 @@ 0.667 - 10 + 50 10 20 2 1 - 80 - 1000 + 69 + 50 + 9422 true 10 - 10 - 3 + 11 + 4 5 5 10 @@ -83,19 +85,18 @@ 2000 10 - 2000 + 7000 3000 - 500 - 180 - 2 - 500 + 3000 + 96 + 45 + 90 60 - 150 + 90 5 - 6000 - 7000 55 - 5 + 6000 + 10 3 5 5 @@ -103,13 +104,14 @@ 3 3 12 - 10 1 + 10 + 7000 21000 - 500000 - 400000 + 200000 + 150000 50 10 50 @@ -126,8 +128,8 @@ 127.0.0.1 - false - false + true + true true 2 @@ -135,10 +137,10 @@ 6 10 - 10 + 5 1000 0 - 18 + 300 true true @@ -158,8 +160,8 @@ - false - false + true + true 300 0.334 @@ -179,18 +181,18 @@ /tmp/zilliqa.sock /tmp/scilla-server.sock scilla-server - false + true 4401 false 4501 - false + true 2500 3 - 1000 + 100 true - 60 + 1 0 true @@ -205,40 +207,39 @@ true true + 64 + 65536 - - 200 - 4 + 600 + 2 0.05 3 - - 50 - 10 + 100 + 0 10 30 60 - 600 + 300 3 600 200 - 3 - 128 - 1 - 128 - 5000000 + 1 + 420 + 5 + 420 + 10000000 0 - 10000000 + 120000000 5 - 100 + 2 20 5 - 5 true @@ -257,7 +258,7 @@ 8 32 2 - 50 + 100 99 @@ -268,29 +269,30 @@ 1900 4 - 5 - - 120 + 50 + 600 10 2 3 360 - 5 + 50 false 0 - 40 + false + 80 5 true 30 5 - false 1 - 2 + false + false 5 1 + 2 true @@ -305,13 +307,19 @@ input_blockchain.json input_message.json output.json - input + input.scilla .scilla .scillib scilla_libs true + _fields_map_depth false false + + + 0000000000000000000000000000000000000000 + + 1500 10 @@ -323,6 +331,7 @@ 0 0 + false @@ -335,18 +344,18 @@ 12600000000000000000000 20 40 - 76800 - 20 + 500000 + 100 100 300 3600 50 0 1 - 1572864 + 768000 1024 2000000 - true + false 0 10 5 @@ -371,21 +380,12 @@ - NONE NONE - NONE @@ -428,7 +428,7 @@ 10 15 10 - 600 + 360 diff --git a/scripts/localdev.py b/scripts/localdev.py index ab97caa4ca..c6cf58c113 100755 --- a/scripts/localdev.py +++ b/scripts/localdev.py @@ -750,8 +750,8 @@ def write_testnet_configuration(config, zilliqa_image, testnet_name, isolated_se os.path.join(ZILLIQA_DIR, "constants.xml"), "--image", zilliqa_image, "-n", "7", - "-s", "7", "-d", "7", + "-s", "7", "-l", "1", "--guard", "5/0", "--gentxn", "false", @@ -766,11 +766,11 @@ def write_testnet_configuration(config, zilliqa_image, testnet_name, isolated_se cmd = ["./bootstrap.py", testnet_name, "--clusters", "minikube", "--constants-from-file", os.path.join(ZILLIQA_DIR, "constants.xml"), "--image", zilliqa_image, - "-n", "15", - "-s", "15", - "-d", "15", + "-n", "30", + "-s", "30", + "-d", "30", "-l", "1", - "--guard", "7/0", + "--guard", "17/0", "--gentxn", "false", "--multiplier-fanout", "1", "--host-network", "false", @@ -792,21 +792,30 @@ def write_testnet_configuration(config, zilliqa_image, testnet_name, isolated_se constants_xml_target_path = os.path.join(TESTNET_DIR, f"{testnet_name}/configmap/constants.xml") config_file = xml.dom.minidom.parse(constants_xml_target_path) - if desk: - print("Explicitly disabling all telemetry for desktop testing mode") - xml_replace_element(config_file, config_file.documentElement, "NUM_FINAL_BLOCK_PER_POW", "250") - xml_replace_element(config_file, config_file.documentElement, "DEBUG_LEVEL", "3") xml_replace_element(config_file, config_file.documentElement, "BROADCAST_GOSSIP_MODE", "true") xml_replace_element(config_file, config_file.documentElement, "METRIC_ZILLIQA_HOSTNAME", "0.0.0.0") xml_replace_element(config_file, config_file.documentElement, "METRIC_ZILLIQA_PORT", "8090") - xml_replace_element(config_file, config_file.documentElement, "METRIC_ZILLIQA_PROVIDER", "PROMETHEUS") - xml_replace_element(config_file, config_file.documentElement, "METRIC_ZILLIQA_MASK", "ALL") + xml_replace_element(config_file, config_file.documentElement, "METRIC_ZILLIQA_PROVIDER", "NONE") + xml_replace_element(config_file, config_file.documentElement, "METRIC_ZILLIQA_MASK", "NONE") xml_replace_element_if_exists(config_file, config_file.documentElement, "TRACE_ZILLIQA_HOSTNAME", "tempo.default.svc.cluster.local") xml_replace_element_if_exists(config_file, config_file.documentElement, "TRACE_ZILLIQA_PORT", "4317") xml_replace_element_if_exists(config_file, config_file.documentElement, "TRACE_ZILLIQA_PROVIDER", "NONE") xml_replace_element_if_exists(config_file, config_file.documentElement, "TRACE_ZILLIQA_MASK", "NONE") - xml_replace_element_if_exists(config_file, config_file.documentElement, "COMMIT_WINDOW_IN_SECONDS", "40") + xml_replace_element_if_exists(config_file, config_file.documentElement, "DS_ANNOUNCEMENT_DELAY_IN_MS", "5") + xml_replace_element_if_exists(config_file, config_file.documentElement, "NUM_DS_ELECTION", "2") + xml_replace_element(config_file, config_file.documentElement, "NUM_FINAL_BLOCK_PER_POW", "250") + ''' + xml_replace_element(config_file, config_file.documentElement, "GOSSIP_CUSTOM_ROUNDS_SETTINGS", "false") + xml_replace_element(config_file, config_file.documentElement, "SIGN_VERIFY_EMPTY_MSGTYP", "false") + xml_replace_element(config_file, config_file.documentElement, "SIGN_VERIFY_NONEMPTY_MSGTYP", "false") + xml_replace_element(config_file, config_file.documentElement, "MAX_NEIGHBORS_PER_ROUND", "3") + xml_replace_element(config_file, config_file.documentElement, "NUM_GOSSIP_RECEIVERS", "3") + ''' + xml_replace_element(config_file, config_file.documentElement, "ROUND_TIME_IN_MS", "1000") + + + if chain_id is not None: xml_replace_element(config_file, config_file.documentElement, "CHAIN_ID", chain_id) output_config = config_file.toprettyxml(newl='') @@ -906,7 +915,6 @@ def build_native_to_workspace(config): pass build_env = os.environ.copy() build_env['SCILLA_REPO_ROOT'] = SCILLA_DIR - '''build_env['EXTRA_BUILD_PARAMS'] = "tests debug"''' # Let's start off by building Scilla, in case it breaks. run_or_die(config, ["make"], in_dir = SCILLA_DIR, env = build_env) run_or_die(config, ["./build.sh"], in_dir = ZILLIQA_DIR)