[master] Fix/constants localdev production

constants.xml

@@ -2,7 +2,7 @@
 <!-- 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>
@@ -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>
@@ -31,6 +31,7 @@
         <BLOCKLINK_VERSION>1</BLOCKLINK_VERSION>
         <DSCOMMITTEE_VERSION>1</DSCOMMITTEE_VERSION>
         <SHARDINGSTRUCTURE_VERSION>1</SHARDINGSTRUCTURE_VERSION>
+        <ACCOUNT_VERSION>1</ACCOUNT_VERSION>
         <CONTRACT_STATE_VERSION>1</CONTRACT_STATE_VERSION>
     </version>
     <seed>
@@ -39,7 +40,7 @@
         <TX_TRACES>true</TX_TRACES>
         <SEED_TXN_COLLECTION_TIME_IN_SEC>5</SEED_TXN_COLLECTION_TIME_IN_SEC>
         <TXN_STORAGE_LIMIT>100000</TXN_STORAGE_LIMIT>
-        <SEED_SYNC_SMALL_PULL_INTERVAL>5</SEED_SYNC_SMALL_PULL_INTERVAL>
+        <SEED_SYNC_SMALL_PULL_INTERVAL>10</SEED_SYNC_SMALL_PULL_INTERVAL>
         <SEED_SYNC_LARGE_PULL_INTERVAL>10</SEED_SYNC_LARGE_PULL_INTERVAL>
         <ENABLE_SEED_TO_SEED_COMMUNICATION>false</ENABLE_SEED_TO_SEED_COMMUNICATION>
         <P2P_SEED_CONNECT_PORT>33135</P2P_SEED_CONNECT_PORT>
@@ -57,19 +58,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,33 +85,33 @@
     <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>
+        <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>
         <RETRY_REJOINING_TIMEOUT>10</RETRY_REJOINING_TIMEOUT>
         <RETRY_GETSTATEDELTAS_COUNT>3</RETRY_GETSTATEDELTAS_COUNT>
         <RETRY_COSIGREWARDS_COUNT>3</RETRY_COSIGREWARDS_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>
+        <EXTRA_TX_DISTRIBUTE_TIME_IN_MS>7000</EXTRA_TX_DISTRIBUTE_TIME_IN_MS>
     </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>
@@ -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>
@@ -158,8 +160,8 @@
         </cuda>
     </gpu>
     <guard_mode>
-        <GUARD_MODE>false</GUARD_MODE>
-        <EXCLUDE_PRIV_IP>false</EXCLUDE_PRIV_IP>
+        <GUARD_MODE>true</GUARD_MODE>
+        <EXCLUDE_PRIV_IP>true</EXCLUDE_PRIV_IP>
         <!-- Unit for window time is seconds.-->
         <WINDOW_FOR_DS_NETWORK_INFO_UPDATE>300</WINDOW_FOR_DS_NETWORK_INFO_UPDATE>
         <SHARD_GUARD_TOL>0.334</SHARD_GUARD_TOL>
@@ -179,18 +181,18 @@
         <SCILLA_IPC_SOCKET_PATH>/tmp/zilliqa.sock</SCILLA_IPC_SOCKET_PATH>
         <SCILLA_SERVER_SOCKET_PATH>/tmp/scilla-server.sock</SCILLA_SERVER_SOCKET_PATH>
         <SCILLA_SERVER_BINARY>scilla-server</SCILLA_SERVER_BINARY>
-        <ENABLE_WEBSOCKET>false</ENABLE_WEBSOCKET>
+        <ENABLE_WEBSOCKET>true</ENABLE_WEBSOCKET>
         <WEBSOCKET_PORT>4401</WEBSOCKET_PORT>
         <!-- Only for lookup nodes used for staking data retrieval -->
         <ENABLE_STAKING_RPC>false</ENABLE_STAKING_RPC>
         <STAKING_RPC_PORT>4501</STAKING_RPC_PORT>
-        <ENABLE_GETTXNBODIESFORTXBLOCK>false</ENABLE_GETTXNBODIESFORTXBLOCK>
+        <ENABLE_GETTXNBODIESFORTXBLOCK>true</ENABLE_GETTXNBODIESFORTXBLOCK>
         <NUM_TXNS_PER_PAGE>2500</NUM_TXNS_PER_PAGE>
         <PENDING_TXN_QUERY_NUM_EPOCHS>3</PENDING_TXN_QUERY_NUM_EPOCHS>
-        <PENDING_TXN_QUERY_MAX_RESULTS>1000</PENDING_TXN_QUERY_MAX_RESULTS>
+        <PENDING_TXN_QUERY_MAX_RESULTS>100</PENDING_TXN_QUERY_MAX_RESULTS>
         <CONNECTION_IO_USE_EPOLL>true</CONNECTION_IO_USE_EPOLL>
         <!-- Timeout in seconds for ANY connection to safehttpserver port, 0 means no timeout-->
-        <CONNECTION_ALL_TIMEOUT>60</CONNECTION_ALL_TIMEOUT>
+        <CONNECTION_ALL_TIMEOUT>1</CONNECTION_ALL_TIMEOUT>
         <!-- Timeout in seconds for ONLY connection that reach our callback function, 0 means no timeout-->
         <CONNECTION_CALLBACK_TIMEOUT>0</CONNECTION_CALLBACK_TIMEOUT>
         <ENABLE_EVM>true</ENABLE_EVM>
@@ -205,40 +207,39 @@
         <LAUNCH_EVM_DAEMON>true</LAUNCH_EVM_DAEMON>
         <!-- Use Continuation passing style -->
         <ENABLE_CPS>true</ENABLE_CPS>
+        <REQUEST_PROCESSING_THREADS>64</REQUEST_PROCESSING_THREADS>
+        <REQUEST_QUEUE_SIZE>65536</REQUEST_QUEUE_SIZE>
     </jsonrpc>
     <network_composition>
-        <!-- Shard size will be automatically calculated if COMM_SIZE = 0 -->
-        <COMM_SIZE>200</COMM_SIZE>
-        <NUM_DS_ELECTION>4</NUM_DS_ELECTION>
+        <COMM_SIZE>600</COMM_SIZE>
+        <NUM_DS_ELECTION>2</NUM_DS_ELECTION>
         <!-- DS Node must meet this minimum threshold to remain in the committee -->
         <DS_PERFORMANCE_THRESHOLD_PERCENT>0.05</DS_PERFORMANCE_THRESHOLD_PERCENT>
         <!-- Maximum number of Byzantine DS Nodes to remove each round. Must be smaller than
              NUM_DS_ELECTION -->
         <NUM_DS_BYZANTINE_REMOVED>3</NUM_DS_BYZANTINE_REMOVED>
-        <!-- SHARD_SIZE_TOLERANCE_LO must be smaller than COMM_SIZE -->
-        <SHARD_SIZE_TOLERANCE_LO>50</SHARD_SIZE_TOLERANCE_LO>
-        <SHARD_SIZE_TOLERANCE_HI>10</SHARD_SIZE_TOLERANCE_HI>
+        <SHARD_SIZE_TOLERANCE_LO>100</SHARD_SIZE_TOLERANCE_LO>
+        <SHARD_SIZE_TOLERANCE_HI>0</SHARD_SIZE_TOLERANCE_HI>
         <STORE_DS_COMMITTEE_INTERVAL>10</STORE_DS_COMMITTEE_INTERVAL>
         <MAX_NUMBER_OF_NEW_MEMBERS_INTO_DS_COMM>30</MAX_NUMBER_OF_NEW_MEMBERS_INTO_DS_COMM>
     </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>
-        <PUMPMESSAGE_MILLISECONDS>1</PUMPMESSAGE_MILLISECONDS>
-        <SENDQUEUE_SIZE>128</SENDQUEUE_SIZE>
-        <MAX_GOSSIP_MSG_SIZE_IN_BYTES>5000000</MAX_GOSSIP_MSG_SIZE_IN_BYTES>
+        <MAXRETRYCONN>1</MAXRETRYCONN>
+        <MSGQUEUE_SIZE>420</MSGQUEUE_SIZE>
+        <PUMPMESSAGE_MILLISECONDS>5</PUMPMESSAGE_MILLISECONDS>
+        <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>
+        <SENDJOBPEERS_TIMEOUT>2</SENDJOBPEERS_TIMEOUT>
         <MAX_PEER_CONNECTION_P2PSEED>20</MAX_PEER_CONNECTION_P2PSEED>
         <MAX_WHITELISTREQ_LIMIT>5</MAX_WHITELISTREQ_LIMIT>
-        <SENDJOBPEERS_TIMEOUT>5</SENDJOBPEERS_TIMEOUT>
     </p2pcomm>
     <pow>
         <FULL_DATASET_MINE>true</FULL_DATASET_MINE>
@@ -257,7 +258,7 @@
         <POW_BOUNDARY_N_DIVIDED>8</POW_BOUNDARY_N_DIVIDED>
         <POW_BOUNDARY_N_DIVIDED_START>32</POW_BOUNDARY_N_DIVIDED_START>
         <POW_SUBMISSION_LIMIT>2</POW_SUBMISSION_LIMIT>
-        <NUM_FINAL_BLOCK_PER_POW>50</NUM_FINAL_BLOCK_PER_POW>
+        <NUM_FINAL_BLOCK_PER_POW>100</NUM_FINAL_BLOCK_PER_POW>
         <!-- Shard difficulty adjust by compare pow number to EXPECTED_SHARD_NODE_NUM -->
         <POW_CHANGE_TO_ADJ_DIFF>99</POW_CHANGE_TO_ADJ_DIFF>
         <!-- DS difficulty adjust by compare DS pow number to NUM_DS_ELECTION -->
@@ -268,29 +269,30 @@
         <!-- If PoW submissions over this number, will select nodes by reputation -->
         <MAX_SHARD_NODE_NUM>1900</MAX_SHARD_NODE_NUM>
         <MIN_NODE_REPUTATION_PRIORITY>4</MIN_NODE_REPUTATION_PRIORITY>
-        <MISORDER_TOLERANCE_IN_PERCENT>5</MISORDER_TOLERANCE_IN_PERCENT>
-        <!-- To avoid premature rejoining, set this to a value such as several Tx epochs after DS epoch -->
-        <DSBLOCK_EXTRA_WAIT_TIME>120</DSBLOCK_EXTRA_WAIT_TIME>
+        <MISORDER_TOLERANCE_IN_PERCENT>50</MISORDER_TOLERANCE_IN_PERCENT>
+        <DSBLOCK_EXTRA_WAIT_TIME>600</DSBLOCK_EXTRA_WAIT_TIME>
         <DIFF_IP_TOLERANCE_IN_PERCENT>10</DIFF_IP_TOLERANCE_IN_PERCENT>
         <TXN_SHARD_TARGET_DIFFICULTY>2</TXN_SHARD_TARGET_DIFFICULTY>
         <TXN_DS_TARGET_DIFFICULTY>3</TXN_DS_TARGET_DIFFICULTY>
         <TXN_DS_TARGET_NUM>360</TXN_DS_TARGET_NUM>
-        <PRIORITY_TOLERANCE_IN_PERCENT>5</PRIORITY_TOLERANCE_IN_PERCENT>
+        <PRIORITY_TOLERANCE_IN_PERCENT>50</PRIORITY_TOLERANCE_IN_PERCENT>
         <SKIP_POW_REATTEMPT_FOR_DS_DIFF>false</SKIP_POW_REATTEMPT_FOR_DS_DIFF>
         <POW_SUBMISSION_VERSION_TAG/>
     </pow>
     <recovery>
         <WAIT_LOOKUP_WAKEUP_IN_SECONDS>0</WAIT_LOOKUP_WAKEUP_IN_SECONDS>
-        <SHARD_DELAY_WAKEUP_IN_SECONDS>40</SHARD_DELAY_WAKEUP_IN_SECONDS>
+        <GET_INITIAL_DS_FROM_REPO>false</GET_INITIAL_DS_FROM_REPO>
+        <SHARD_DELAY_WAKEUP_IN_SECONDS>80</SHARD_DELAY_WAKEUP_IN_SECONDS>
         <TERMINATION_COUNTDOWN_IN_SECONDS>5</TERMINATION_COUNTDOWN_IN_SECONDS>
         <REJOIN_NODE_NOT_IN_NETWORK>true</REJOIN_NODE_NOT_IN_NETWORK>
         <RESUME_BLACKLIST_DELAY_IN_SECONDS>30</RESUME_BLACKLIST_DELAY_IN_SECONDS>
         <INCRDB_DSNUMS_WITH_STATEDELTAS>5</INCRDB_DSNUMS_WITH_STATEDELTAS>
-        <CONTRACT_STATES_MIGRATED>false</CONTRACT_STATES_MIGRATED>
         <MAX_IPCHANGE_REQUEST_LIMIT>1</MAX_IPCHANGE_REQUEST_LIMIT>
-        <MAX_REJOIN_NETWORK_ATTEMPTS>2</MAX_REJOIN_NETWORK_ATTEMPTS>
+        <MIGRATE_MBS_TXNS>false</MIGRATE_MBS_TXNS>
+        <CONTRACT_STATES_MIGRATED>false</CONTRACT_STATES_MIGRATED>
         <RELEASE_CACHE_INTERVAL>5</RELEASE_CACHE_INTERVAL>
         <DIRBLOCK_FETCH_LIMIT>1</DIRBLOCK_FETCH_LIMIT>
+        <MAX_REJOIN_NETWORK_ATTEMPTS>2</MAX_REJOIN_NETWORK_ATTEMPTS>
     </recovery>
     <smart_contract>
         <ENABLE_SC>true</ENABLE_SC>
@@ -305,13 +307,19 @@
         <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>
         <ENABLE_SCILLA_MULTI_VERSION>true</ENABLE_SCILLA_MULTI_VERSION>
+        <FIELDS_MAP_DEPTH_INDICATOR>_fields_map_depth</FIELDS_MAP_DEPTH_INDICATOR>
         <LOG_SC>false</LOG_SC>
         <DISABLE_SCILLA_LIB>false</DISABLE_SCILLA_LIB>
+        <disambiguate_exclusion_list>
+            <entry>
+                <CONTRACT_ADDRESS>0000000000000000000000000000000000000000</CONTRACT_ADDRESS>
+            </entry>
+        </disambiguate_exclusion_list>
         <SCILLA_SERVER_PENDING_IN_MS>1500</SCILLA_SERVER_PENDING_IN_MS>
         <SCILLA_SERVER_LOOP_WAIT_MICROSECONDS>10</SCILLA_SERVER_LOOP_WAIT_MICROSECONDS>
     </smart_contract>
@@ -323,6 +331,7 @@
         <NUM_ACCOUNTS_PREGENERATE>0</NUM_ACCOUNTS_PREGENERATE>
         <PREGEN_ACCOUNT_TIMES>0</PREGEN_ACCOUNT_TIMES>
         <PREGENED_ACCOUNTS_FILE/>
+        <LOG_PARAMETERS>false</LOG_PARAMETERS>
     </tests>
     <transactions>
         <!-- DANGER WILL ROBINSON! DO **NOT** USE THIS SETTING IN PRODUCTION! THE PRIVATE KEY CORRESPONDING TO IT APPEARS IN THIS GIT REPOSITORY -->
@@ -335,18 +344,18 @@
         <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_CONTRACT_EDGES>20</MAX_CONTRACT_EDGES>
+        <MAX_CODE_SIZE_IN_BYTES>500000</MAX_CODE_SIZE_IN_BYTES>
+        <MAX_CONTRACT_EDGES>100</MAX_CONTRACT_EDGES>
         <SCILLA_CHECKER_INVOKE_GAS>100</SCILLA_CHECKER_INVOKE_GAS>
         <SCILLA_RUNNER_INVOKE_GAS>300</SCILLA_RUNNER_INVOKE_GAS>
         <SYS_TIMESTAMP_VARIANCE_IN_SECONDS>3600</SYS_TIMESTAMP_VARIANCE_IN_SECONDS>
         <TXN_MISORDER_TOLERANCE_IN_PERCENT>50</TXN_MISORDER_TOLERANCE_IN_PERCENT>
         <TXNS_MISSING_TOLERANCE_IN_PERCENT>0</TXNS_MISSING_TOLERANCE_IN_PERCENT>
         <PACKET_EPOCH_LATE_ALLOW>1</PACKET_EPOCH_LATE_ALLOW>
-        <PACKET_BYTESIZE_LIMIT>1572864</PACKET_BYTESIZE_LIMIT>
+        <PACKET_BYTESIZE_LIMIT>768000</PACKET_BYTESIZE_LIMIT>
         <SMALL_TXN_SIZE>1024</SMALL_TXN_SIZE>
         <ACCOUNT_IO_BATCH_SIZE>2000000</ACCOUNT_IO_BATCH_SIZE>
-        <ENABLE_REPOPULATE>true</ENABLE_REPOPULATE>
+        <ENABLE_REPOPULATE>false</ENABLE_REPOPULATE>
         <REPOPULATE_STATE_IN_DS>0</REPOPULATE_STATE_IN_DS>
         <REPOPULATE_STATE_PER_N_DS>10</REPOPULATE_STATE_PER_N_DS>
         <NUM_STORE_TX_BODIES_INTERVAL>5</NUM_STORE_TX_BODIES_INTERVAL>
@@ -371,21 +380,12 @@
     </metric>
     <trace>
         <zilliqa>
-            <!--
-            <TRACE_ZILLIQA_HOSTNAME>0.0.0.0</TRACE_ZILLIQA_HOSTNAME>
-            <TRACE_ZILLIQA_PORT>4318</TRACE_ZILLIQA_PORT>
-            <TRACE_ZILLIQA_PROVIDER>OTLPHTTP</TRACE_ZILLIQA_PROVIDER>
-            -->
             <TRACE_ZILLIQA_PROVIDER>NONE</TRACE_ZILLIQA_PROVIDER>
             <TRACE_ZILLIQA_MASK>NONE</TRACE_ZILLIQA_MASK>
         </zilliqa>
     </trace>
     <logging>
         <zilliqa>
-            <!--
-            <LOGGING_ZILLIQA_HOSTNAME>localhost</LOGGING_ZILLIQA_HOSTNAME>
-            <LOGGING_ZILLIQA_PORT>8090</LOGGING_ZILLIQA_PORT>
-            -->
             <LOGGING_ZILLIQA_PROVIDER>NONE</LOGGING_ZILLIQA_PROVIDER>
         </zilliqa>
     </logging>
@@ -428,7 +428,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>