[master] Native Code and Network Tests

VERSION

@@ -1,9 +1,9 @@
 === [Zilliqa]Major Version ===
-0
+9
 === [Zilliqa]Minor Version ===
-0
+3
 === [Zilliqa]Fix Version ===
-0
+0rc5
 === [Zilliqa] Expected DS Epoch===
 0
 === [Scilla] Expected DS Epoch===

build.sh

@@ -105,13 +105,17 @@ do
     ;;
     fuzzer)
         CMAKE_EXTRA_OPTIONS="-DLIBFUZZER=ON ${CMAKE_EXTRA_OPTIONS}"
-        echo "Build with libfuzzer"
+        echo "Build with libfuzzer"``
     ;;
     style)
         CMAKE_EXTRA_OPTIONS="-DLLVM_EXTRA_TOOLS=ON ${CMAKE_EXTRA_OPTIONS}"
         run_clang_format_fix=1
         echo "Build with LLVM Extra Tools for coding style check (clang-format-fix)"
     ;;
+    nomark)
+          CMAKE_EXTRA_OPTIONS="-DNOMARK=ON ${CMAKE_EXTRA_OPTIONS}"
+          echo "Build with no markers"
+      ;;
     linter)
         CMAKE_EXTRA_OPTIONS="-DLLVM_EXTRA_TOOLS=ON ${CMAKE_EXTRA_OPTIONS}"
         run_clang_tidy_fix=1
@@ -170,9 +174,9 @@ echo "Current directory: $(pwd)"
 echo "Build directory: ${build_dir}"
 echo "Install directory: ${install_dir}"
 
-jobs=$((n_parallel - 1))
 
 echo building using $jobs jobs
+jobs=6
 
 cmake -H. -B"${build_dir}" ${CMAKE_EXTRA_OPTIONS}  -DCMAKE_BUILD_TYPE=${build_type} -DCMAKE_INSTALL_PREFIX="${install_dir}" -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}"/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=${VCPKG_TRIPLET}
 cmake --build "${build_dir}" --config ${build_type} -j $jobs

constants.xml

@@ -2,10 +2,10 @@
 <!-- format guideline: non-tab four-space indentation -->
 <node>
     <general>
-        <DEBUG_LEVEL>4</DEBUG_LEVEL>
+        <DEBUG_LEVEL>3</DEBUG_LEVEL>
         <ENABLE_DO_REJOIN>false</ENABLE_DO_REJOIN>
         <LOOKUP_NODE_MODE>false</LOOKUP_NODE_MODE>
-        <MAX_ENTRIES_FOR_DIAGNOSTIC_DATA>25</MAX_ENTRIES_FOR_DIAGNOSTIC_DATA>
+        <MAX_ENTRIES_FOR_DIAGNOSTIC_DATA>50</MAX_ENTRIES_FOR_DIAGNOSTIC_DATA>
         <CHAIN_ID>1</CHAIN_ID>
         <NETWORK_ID>3</NETWORK_ID>
         <!-- testnet -->
@@ -19,7 +19,7 @@
         <INIT_TRIE_DB_SNAPSHOT_EPOCH>0</INIT_TRIE_DB_SNAPSHOT_EPOCH>
         <MAX_ARCHIVED_LOG_COUNT>15</MAX_ARCHIVED_LOG_COUNT>
         <MAX_LOG_FILE_SIZE_KB>15360</MAX_LOG_FILE_SIZE_KB>
-        <JSON_LOGGING>true</JSON_LOGGING>
+        <JSON_LOGGING>false</JSON_LOGGING>
     </general>
     <version>
         <MSG_VERSION>1</MSG_VERSION>
@@ -57,19 +57,20 @@
     </remotestorageDB>
     <consensus>
         <TOLERANCE_FRACTION>0.667</TOLERANCE_FRACTION>
-        <COMMIT_WINDOW_IN_SECONDS>10</COMMIT_WINDOW_IN_SECONDS>
+        <COMMIT_WINDOW_IN_SECONDS>50</COMMIT_WINDOW_IN_SECONDS>
         <CONSENSUS_MSG_ORDER_BLOCK_WINDOW>10</CONSENSUS_MSG_ORDER_BLOCK_WINDOW>
         <CONSENSUS_OBJECT_TIMEOUT>20</CONSENSUS_OBJECT_TIMEOUT>
         <DS_NUM_CONSENSUS_SUBSETS>2</DS_NUM_CONSENSUS_SUBSETS>
         <SHARD_NUM_CONSENSUS_SUBSETS>1</SHARD_NUM_CONSENSUS_SUBSETS>
-        <COMMIT_TOLERANCE_PERCENT>80</COMMIT_TOLERANCE_PERCENT>
-        <SUBSET0_RESPONSE_DELAY_IN_MS>1000</SUBSET0_RESPONSE_DELAY_IN_MS>
+        <COMMIT_TOLERANCE_PERCENT>69</COMMIT_TOLERANCE_PERCENT>
+        <SUBSET0_RESPONSE_DELAY_IN_MS>50</SUBSET0_RESPONSE_DELAY_IN_MS>
+        <LEADER_SELECTION_TARGET_DS>9422</LEADER_SELECTION_TARGET_DS>
     </consensus>
     <data_sharing>
         <BROADCAST_TREEBASED_CLUSTER_MODE>true</BROADCAST_TREEBASED_CLUSTER_MODE>
         <MULTICAST_CLUSTER_SIZE>10</MULTICAST_CLUSTER_SIZE>
-        <NUM_FORWARDED_BLOCK_RECEIVERS_PER_SHARD>10</NUM_FORWARDED_BLOCK_RECEIVERS_PER_SHARD>
-        <NUM_NODES_TO_SEND_LOOKUP>3</NUM_NODES_TO_SEND_LOOKUP>
+        <NUM_FORWARDED_BLOCK_RECEIVERS_PER_SHARD>11</NUM_FORWARDED_BLOCK_RECEIVERS_PER_SHARD>
+        <NUM_NODES_TO_SEND_LOOKUP>4</NUM_NODES_TO_SEND_LOOKUP>
         <NUM_OF_TREEBASED_CHILD_CLUSTERS>5</NUM_OF_TREEBASED_CHILD_CLUSTERS>
         <POW_PACKET_SENDERS>5</POW_PACKET_SENDERS>
         <TX_SHARING_CLUSTER_SIZE>10</TX_SHARING_CLUSTER_SIZE>
@@ -83,36 +84,37 @@
     <epoch_timing>
         <DELAY_FIRSTXNEPOCH_IN_MS>2000</DELAY_FIRSTXNEPOCH_IN_MS>
         <FETCHING_MISSING_DATA_TIMEOUT>10</FETCHING_MISSING_DATA_TIMEOUT>
-        <DS_ANNOUNCEMENT_DELAY_IN_MS>2000</DS_ANNOUNCEMENT_DELAY_IN_MS>
+        <DS_ANNOUNCEMENT_DELAY_IN_MS>7000</DS_ANNOUNCEMENT_DELAY_IN_MS>
         <SHARD_ANNOUNCEMENT_DELAY_IN_MS>3000</SHARD_ANNOUNCEMENT_DELAY_IN_MS>
-        <LOOKUP_DELAY_SEND_TXNPACKET_IN_MS>500</LOOKUP_DELAY_SEND_TXNPACKET_IN_MS>
-        <MICROBLOCK_TIMEOUT>180</MICROBLOCK_TIMEOUT>
-        <NEW_NODE_SYNC_INTERVAL>2</NEW_NODE_SYNC_INTERVAL>
-        <POW_SUBMISSION_TIMEOUT>500</POW_SUBMISSION_TIMEOUT>
+        <ANNOUNCEMENT_DELAY_IN_MS>5000</ANNOUNCEMENT_DELAY_IN_MS>
+        <LOOKUP_DELAY_SEND_TXNPACKET_IN_MS>3000</LOOKUP_DELAY_SEND_TXNPACKET_IN_MS>
+        <MICROBLOCK_TIMEOUT>96</MICROBLOCK_TIMEOUT>
+        <NEW_NODE_SYNC_INTERVAL>45</NEW_NODE_SYNC_INTERVAL>
+        <POW_SUBMISSION_TIMEOUT>90</POW_SUBMISSION_TIMEOUT>
         <POW_WINDOW_IN_SECONDS>60</POW_WINDOW_IN_SECONDS>
-        <POWPACKETSUBMISSION_WINDOW_IN_SECONDS>150</POWPACKETSUBMISSION_WINDOW_IN_SECONDS>
+        <POWPACKETSUBMISSION_WINDOW_IN_SECONDS>90</POWPACKETSUBMISSION_WINDOW_IN_SECONDS>
         <RECOVERY_SYNC_TIMEOUT>5</RECOVERY_SYNC_TIMEOUT>
-        <TX_DISTRIBUTE_TIME_IN_MS>6000</TX_DISTRIBUTE_TIME_IN_MS>
         <EXTRA_TX_DISTRIBUTE_TIME_IN_MS>7000</EXTRA_TX_DISTRIBUTE_TIME_IN_MS>
         <DS_TX_PROCESSING_TIMEOUT>55</DS_TX_PROCESSING_TIMEOUT>
-        <NEW_LOOKUP_SYNC_DELAY_IN_SECONDS>5</NEW_LOOKUP_SYNC_DELAY_IN_SECONDS>
+        <TX_DISTRIBUTE_TIME_IN_MS>6000</TX_DISTRIBUTE_TIME_IN_MS>
+        <NEW_LOOKUP_SYNC_DELAY_IN_SECONDS>10</NEW_LOOKUP_SYNC_DELAY_IN_SECONDS>
         <GETSHARD_TIMEOUT_IN_SECONDS>3</GETSHARD_TIMEOUT_IN_SECONDS>
-        <GETSTATEDELTAS_TIMEOUT_IN_SECONDS>5</GETSTATEDELTAS_TIMEOUT_IN_SECONDS>
         <GETCOSIGREWARDS_TIMEOUT_IN_SECONDS>5</GETCOSIGREWARDS_TIMEOUT_IN_SECONDS>
+        <GETSTATEDELTAS_TIMEOUT_IN_SECONDS>5</GETSTATEDELTAS_TIMEOUT_IN_SECONDS>
         <RETRY_REJOINING_TIMEOUT>10</RETRY_REJOINING_TIMEOUT>
-        <RETRY_GETSTATEDELTAS_COUNT>3</RETRY_GETSTATEDELTAS_COUNT>
         <RETRY_COSIGREWARDS_COUNT>3</RETRY_COSIGREWARDS_COUNT>
+        <RETRY_GETSTATEDELTAS_COUNT>3</RETRY_GETSTATEDELTAS_COUNT>
         <MAX_FETCHMISSINGMBS_NUM>12</MAX_FETCHMISSINGMBS_NUM>
-        <LAST_N_TXBLKS_TOCHECK_FOR_MISSINGMBS>10</LAST_N_TXBLKS_TOCHECK_FOR_MISSINGMBS>
         <REMOVENODEFROMBLACKLIST_DELAY_IN_SECONDS>1</REMOVENODEFROMBLACKLIST_DELAY_IN_SECONDS>
+        <LAST_N_TXBLKS_TOCHECK_FOR_MISSINGMBS>10</LAST_N_TXBLKS_TOCHECK_FOR_MISSINGMBS>
     </epoch_timing>
     <gas>
         <MIN_ETH_GAS>21000</MIN_ETH_GAS>
-        <DS_MICROBLOCK_GAS_LIMIT>500000</DS_MICROBLOCK_GAS_LIMIT>
-        <SHARD_MICROBLOCK_GAS_LIMIT>400000</SHARD_MICROBLOCK_GAS_LIMIT>
+        <DS_MICROBLOCK_GAS_LIMIT>200000</DS_MICROBLOCK_GAS_LIMIT>
+        <SHARD_MICROBLOCK_GAS_LIMIT>150000</SHARD_MICROBLOCK_GAS_LIMIT>
         <CONTRACT_CREATE_GAS>50</CONTRACT_CREATE_GAS>
         <CONTRACT_INVOKE_GAS>10</CONTRACT_INVOKE_GAS>
-        <NORMAL_TRAN_GAS>50</NORMAL_TRAN_GAS>
+        <NORMAL_TRAN_GAS>1</NORMAL_TRAN_GAS>
         <GAS_CONGESTION_PERCENT>80</GAS_CONGESTION_PERCENT>
         <UNFILLED_PERCENT_LOW>10</UNFILLED_PERCENT_LOW>
         <UNFILLED_PERCENT_HIGH>70</UNFILLED_PERCENT_HIGH>
@@ -126,19 +128,19 @@
         <LEGAL_GAS_PRICE_IP>127.0.0.1</LEGAL_GAS_PRICE_IP>
     </gas>
     <gossip>
-        <BROADCAST_GOSSIP_MODE>false</BROADCAST_GOSSIP_MODE>
-        <SEND_RESPONSE_FOR_LAZY_PUSH>false</SEND_RESPONSE_FOR_LAZY_PUSH>
+        <BROADCAST_GOSSIP_MODE>true</BROADCAST_GOSSIP_MODE>
+        <SEND_RESPONSE_FOR_LAZY_PUSH>true</SEND_RESPONSE_FOR_LAZY_PUSH>
         <GOSSIP_CUSTOM_ROUNDS_SETTINGS>true</GOSSIP_CUSTOM_ROUNDS_SETTINGS>
         <gossip_custom_rounds>
             <MAX_ROUNDS_IN_BSTATE>2</MAX_ROUNDS_IN_BSTATE>
             <MAX_ROUNDS_IN_CSTATE>3</MAX_ROUNDS_IN_CSTATE>
             <MAX_TOTAL_ROUNDS>6</MAX_TOTAL_ROUNDS>
         </gossip_custom_rounds>
         <MAX_NEIGHBORS_PER_ROUND>10</MAX_NEIGHBORS_PER_ROUND>
-        <NUM_GOSSIP_RECEIVERS>10</NUM_GOSSIP_RECEIVERS>
+        <NUM_GOSSIP_RECEIVERS>5</NUM_GOSSIP_RECEIVERS>
         <ROUND_TIME_IN_MS>1000</ROUND_TIME_IN_MS>
         <SIMULATED_NETWORK_DELAY_IN_MS>0</SIMULATED_NETWORK_DELAY_IN_MS>
-        <KEEP_RAWMSG_FROM_LAST_N_ROUNDS>18</KEEP_RAWMSG_FROM_LAST_N_ROUNDS>
+        <KEEP_RAWMSG_FROM_LAST_N_ROUNDS>300</KEEP_RAWMSG_FROM_LAST_N_ROUNDS>
         <SIGN_VERIFY_EMPTY_MSGTYP>true</SIGN_VERIFY_EMPTY_MSGTYP>
         <SIGN_VERIFY_NONEMPTY_MSGTYP>true</SIGN_VERIFY_NONEMPTY_MSGTYP>
     </gossip>
@@ -205,6 +207,10 @@
         <LAUNCH_EVM_DAEMON>true</LAUNCH_EVM_DAEMON>
         <!-- Use Continuation passing style -->
         <ENABLE_CPS>true</ENABLE_CPS>
+        <pending_txn>
+            <NUM_TTL_PENDING_TXN>1</NUM_TTL_PENDING_TXN>
+            <NUM_TTL_DROPPED_TXN>5</NUM_TTL_DROPPED_TXN>
+        </pending_txn>
     </jsonrpc>
     <network_composition>
         <!-- Shard size will be automatically calculated if COMM_SIZE = 0 -->
@@ -223,22 +229,22 @@
     </network_composition>
     <p2pcomm>
         <BROADCAST_INTERVAL>60</BROADCAST_INTERVAL>
-        <BROADCAST_EXPIRY>600</BROADCAST_EXPIRY>
+        <BROADCAST_EXPIRY>300</BROADCAST_EXPIRY>
         <FETCH_LOOKUP_MSG_MAX_RETRY>3</FETCH_LOOKUP_MSG_MAX_RETRY>
         <MAXSENDMESSAGE>600</MAXSENDMESSAGE>
         <MAXRECVMESSAGE>200</MAXRECVMESSAGE>
-        <MAXRETRYCONN>3</MAXRETRYCONN>
-        <MSGQUEUE_SIZE>128</MSGQUEUE_SIZE>
+        <MAXRETRYCONN>1</MAXRETRYCONN>
+        <MSGQUEUE_SIZE>420</MSGQUEUE_SIZE>
         <PUMPMESSAGE_MILLISECONDS>1</PUMPMESSAGE_MILLISECONDS>
-        <SENDQUEUE_SIZE>128</SENDQUEUE_SIZE>
-        <MAX_GOSSIP_MSG_SIZE_IN_BYTES>5000000</MAX_GOSSIP_MSG_SIZE_IN_BYTES>
+        <SENDQUEUE_SIZE>420</SENDQUEUE_SIZE>
+        <MAX_GOSSIP_MSG_SIZE_IN_BYTES>10000000</MAX_GOSSIP_MSG_SIZE_IN_BYTES>
         <MIN_READ_WATERMARK_IN_BYTES>0</MIN_READ_WATERMARK_IN_BYTES>
-        <MAX_READ_WATERMARK_IN_BYTES>10000000</MAX_READ_WATERMARK_IN_BYTES>
+        <MAX_READ_WATERMARK_IN_BYTES>120000000</MAX_READ_WATERMARK_IN_BYTES>
         <BLACKLIST_NUM_TO_POP>5</BLACKLIST_NUM_TO_POP>
         <MAX_PEER_CONNECTION>100</MAX_PEER_CONNECTION>
         <MAX_PEER_CONNECTION_P2PSEED>20</MAX_PEER_CONNECTION_P2PSEED>
         <MAX_WHITELISTREQ_LIMIT>5</MAX_WHITELISTREQ_LIMIT>
-        <SENDJOBPEERS_TIMEOUT>5</SENDJOBPEERS_TIMEOUT>
+        <SENDJOBPEERS_TIMEOUT>15</SENDJOBPEERS_TIMEOUT>
     </p2pcomm>
     <pow>
         <FULL_DATASET_MINE>true</FULL_DATASET_MINE>
@@ -305,7 +311,7 @@
         <INPUT_BLOCKCHAIN_JSON>input_blockchain.json</INPUT_BLOCKCHAIN_JSON>
         <INPUT_MESSAGE_JSON>input_message.json</INPUT_MESSAGE_JSON>
         <OUTPUT_JSON>output.json</OUTPUT_JSON>
-        <INPUT_CODE>input</INPUT_CODE>
+        <INPUT_CODE>input.scilla</INPUT_CODE>
         <CONTRACT_FILE_EXTENSION>.scilla</CONTRACT_FILE_EXTENSION>
         <LIBRARY_CODE_EXTENSION>.scillib</LIBRARY_CODE_EXTENSION>
         <EXTLIB_FOLDER>scilla_libs</EXTLIB_FOLDER>
@@ -335,7 +341,7 @@
         <TOTAL_GENESIS_TOKEN>12600000000000000000000</TOTAL_GENESIS_TOKEN>
         <BASE_REWARD_IN_PERCENT>20</BASE_REWARD_IN_PERCENT>
         <LOOKUP_REWARD_IN_PERCENT>40</LOOKUP_REWARD_IN_PERCENT>
-        <MAX_CODE_SIZE_IN_BYTES>76800</MAX_CODE_SIZE_IN_BYTES>
+        <MAX_CODE_SIZE_IN_BYTES>51200</MAX_CODE_SIZE_IN_BYTES>
         <MAX_CONTRACT_EDGES>20</MAX_CONTRACT_EDGES>
         <SCILLA_CHECKER_INVOKE_GAS>100</SCILLA_CHECKER_INVOKE_GAS>
         <SCILLA_RUNNER_INVOKE_GAS>300</SCILLA_RUNNER_INVOKE_GAS>
@@ -428,7 +434,7 @@
         <POST_VIEWCHANGE_BUFFER>10</POST_VIEWCHANGE_BUFFER>
         <VIEWCHANGE_EXTRA_TIME>15</VIEWCHANGE_EXTRA_TIME>
         <VIEWCHANGE_PRECHECK_TIME>10</VIEWCHANGE_PRECHECK_TIME>
-        <VIEWCHANGE_TIME>600</VIEWCHANGE_TIME>
+        <VIEWCHANGE_TIME>360</VIEWCHANGE_TIME>
     </viewchange>
     <!-- These are the genesis accounts -->
     <accounts>

daemon/CMakeLists.txt

@@ -1,4 +1,5 @@
-add_executable(zilliqad ZilliqaDaemon.cpp ZilliqaUpdater.cpp)
+add_executable(zilliqad ZilliqaDaemon.cpp ZilliqaUpdater.cpp
+        ../tests/Network/Test_Rumours.cpp)
 
 target_include_directories(zilliqad PRIVATE ${CMAKE_SOURCE_DIR}/src)
 target_link_libraries (zilliqad

scripts/config-man.py

@@ -0,0 +1,81 @@
+#!/usr/bin/env python
+# Copyright (C) 2019 Zilliqa
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+import click
+from xml.etree import ElementTree as et
+
+class XMLCombiner(object):
+    def __init__(self, filenames, new_file):
+        assert len(filenames) > 0, 'No filenames!'
+        # save all the roots, in order, to be processed later
+        self.roots = [et.parse(f).getroot() for f in filenames]
+        self.output = new_file
+
+    def combine(self):
+        for r in self.roots[1:]:
+            # combine each element with the first one, and update that
+            self.combine_element(self.roots[0], r)
+        # return the string representation
+        tree = et.ElementTree(self.roots[0])
+        tree.write(self.output, encoding="utf-8", xml_declaration=True)
+        return True
+
+    def combine_element(self, one, other):
+
+        mapping = {el.tag: el for el in one}
+        for el in other:
+            if len(el) == 0:
+                # Not nested
+                try:
+                    # Update the text
+                    mapping[el.tag].text = el.text
+                except KeyError:
+                    # An element with this name is not in the mapping
+                    mapping[el.tag] = el
+                    # Add it
+                    one.append(el)
+            else:
+                try:
+                    # Recursively process the element, and update it in the same way
+                    self.combine_element(mapping[el.tag], el)
+                except KeyError:
+                    # Not in the mapping
+                    mapping[el.tag] = el
+                    # Just add it
+                    one.append(el)
+
+
+@click.command("merge-xml")
+@click.option('--baseline', default='constants.xml', prompt='The baseline file',
+              help='The name of the master file probably constants.xml')
+@click.option('--update', default='update.xml', prompt='The file with the updates',
+              help='The name of the update file probably just the difference from the baseline file')
+@click.option('--output', default='constants_new.xml', prompt='The combined file',
+              help='The name of the output file probably constants_new.xml')
+@click.pass_context
+
+def setup(ctx, baseline, update, output):
+
+    source_xml_file = 'constants_v9.3.0rt1_latest.xml'
+    target_xml_file = 'test.xml'
+    new_file = 'constants_new.xml'
+
+    if XMLCombiner((baseline, update), output).combine() :
+        print('success')
+    else:
+        print('failed')
+
+

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)