Merge remote-tracking branch 'upstream/dev' into feat-1.6

ci/nightly-test.sh

@@ -103,15 +103,14 @@ function run_soundness_test() {
 source "$NCTL/sh/staging/set_override_tomls.sh"
 start_run_teardown "client.sh"
 start_run_teardown "itst01.sh"
+start_run_teardown "itst01_private_chain.sh"
 start_run_teardown "itst02.sh"
+start_run_teardown "itst02_private_chain.sh"
 start_run_teardown "itst11.sh"
+start_run_teardown "itst11_private_chain.sh"
 start_run_teardown "itst13.sh"
 start_run_teardown "itst14.sh"
-start_run_teardown "itst01_private_chain.sh"
-start_run_teardown "itst02_private_chain.sh"
-start_run_teardown "itst06_private_chain.sh"
-start_run_teardown "itst07_private_chain.sh"
-start_run_teardown "itst11_private_chain.sh"
+start_run_teardown "itst14_private_chain.sh"
 start_run_teardown "bond_its.sh"
 start_run_teardown "emergency_upgrade_test.sh"
 start_run_teardown "emergency_upgrade_test_balances.sh"
@@ -130,4 +129,6 @@ run_soundness_test
 
 # Run these last as they occasionally fail (see https://github.com/casper-network/casper-node/issues/2973)
 start_run_teardown "itst06.sh"
+start_run_teardown "itst06_private_chain.sh"
 start_run_teardown "itst07.sh"
+start_run_teardown "itst07_private_chain.sh"

utils/nctl/scripts/config_gen.py

@@ -112,7 +112,7 @@ def mergedicts(dict1, dict2, no_skip=False):
     for k in set(dict1) | set(dict2):
         if k in dict1 and k in dict2:
             if isinstance(dict1[k], dict) and isinstance(dict2[k], dict):
-                yield k, dict(mergedicts(dict1[k], dict2[k]))
+                yield k, dict(mergedicts(dict1[k], dict2[k], no_skip))
             else:
                 # value from dict2 overrides one in dict1.
                 yield k, dict2[k]

utils/nctl/sh/scenarios/accounts_toml/itst01_private_chain.accounts.toml.override

@@ -43,6 +43,12 @@ balance = "0"
 bonded_amount = "1000000000000005"
 delegation_rate = 5
 
+[[delegators]]
+validator_public_key = "PBK_V5"
+delegator_public_key = "PBK_U1"
+balance = "1000000000000000000"
+delegated_amount = "100000000000001"
+
 [[administrators]]
 public_key = "PBK_FAUCET"
-balance = "1000000000000000000000000000000000"
+balance = "1000000000000000000000000000000000"

utils/nctl/sh/scenarios/accounts_toml/itst02_private_chain.accounts.toml.override

@@ -43,6 +43,12 @@ balance = "0"
 bonded_amount = "1000000000000005"
 delegation_rate = 5
 
+[[delegators]]
+validator_public_key = "PBK_V5"
+delegator_public_key = "PBK_U1"
+balance = "1000000000000000000"
+delegated_amount = "100000000000001"
+
 [[administrators]]
 public_key = "PBK_FAUCET"
-balance = "1000000000000000000000000000000000"
+balance = "1000000000000000000000000000000000"

utils/nctl/sh/scenarios/accounts_toml/itst06_private_chain.accounts.toml.override

@@ -43,6 +43,12 @@ balance = "0"
 bonded_amount = "1000000000000005"
 delegation_rate = 5
 
+[[delegators]]
+validator_public_key = "PBK_V5"
+delegator_public_key = "PBK_U1"
+balance = "1000000000000000000"
+delegated_amount = "100000000000001"
+
 [[administrators]]
 public_key = "PBK_FAUCET"
-balance = "1000000000000000000000000000000000"
+balance = "1000000000000000000000000000000000"

utils/nctl/sh/scenarios/accounts_toml/itst07_private_chain.accounts.toml.override

@@ -43,6 +43,12 @@ balance = "0"
 bonded_amount = "1000000000000005"
 delegation_rate = 5
 
+[[delegators]]
+validator_public_key = "PBK_V5"
+delegator_public_key = "PBK_U1"
+balance = "1000000000000000000"
+delegated_amount = "100000000000001"
+
 [[administrators]]
 public_key = "PBK_FAUCET"
-balance = "1000000000000000000000000000000000"
+balance = "1000000000000000000000000000000000"

utils/nctl/sh/scenarios/accounts_toml/itst11_private_chain.accounts.toml.override

@@ -43,6 +43,12 @@ balance = "0"
 bonded_amount = "1000000000000005"
 delegation_rate = 5
 
+[[delegators]]
+validator_public_key = "PBK_V5"
+delegator_public_key = "PBK_U1"
+balance = "1000000000000000000"
+delegated_amount = "100000000000001"
+
 [[administrators]]
 public_key = "PBK_FAUCET"
-balance = "1000000000000000000000000000000000"
+balance = "1000000000000000000000000000000000"

utils/nctl/sh/scenarios/accounts_toml/itst14_private_chain.accounts.toml.override

@@ -43,6 +43,12 @@ balance = "0"
 bonded_amount = "1000000000000005"
 delegation_rate = 5
 
+[[delegators]]
+validator_public_key = "PBK_V5"
+delegator_public_key = "PBK_U1"
+balance = "1000000000000000000"
+delegated_amount = "100000000000001"
+
 [[administrators]]
 public_key = "PBK_FAUCET"
-balance = "1000000000000000000000000000000000"
+balance = "1000000000000000000000000000000000"

utils/nctl/sh/scenarios/chainspecs/itst01_private_chain.chainspec.toml.override

@@ -1,3 +1,4 @@
+[core]
 # Setting this to false makes sense only on private chains which don't need to auction new validator slots.
 #
 # Changing this option makes sense only for private chains which dont need auctioning new validator slots.

utils/nctl/sh/scenarios/chainspecs/itst02_private_chain.chainspec.toml.override

@@ -1,3 +1,4 @@
+[core]
 # Setting this to false makes sense only on private chains which don't need to auction new validator slots.
 #
 # Changing this option makes sense only for private chains which dont need auctioning new validator slots.

utils/nctl/sh/scenarios/chainspecs/itst06_private_chain.chainspec.toml.override

@@ -1,3 +1,4 @@
+[core]
 # Setting this to false makes sense only on private chains which don't need to auction new validator slots.
 #
 # Changing this option makes sense only for private chains which dont need auctioning new validator slots.

utils/nctl/sh/scenarios/chainspecs/itst07_private_chain.chainspec.toml.override

@@ -1,3 +1,4 @@
+[core]
 # Setting this to false makes sense only on private chains which don't need to auction new validator slots.
 #
 # Changing this option makes sense only for private chains which dont need auctioning new validator slots.

utils/nctl/sh/scenarios/chainspecs/itst11_private_chain.chainspec.toml.override

@@ -1,3 +1,4 @@
+[core]
 # Setting this to false makes sense only on private chains which don't need to auction new validator slots.
 #
 # Changing this option makes sense only for private chains which dont need auctioning new validator slots.

utils/nctl/sh/scenarios/chainspecs/itst13.chainspec.toml.override

@@ -6,4 +6,4 @@ auction_delay = 1
 maximum_round_length = '17seconds'
 
 [deploys]
-delete = { cost = 14_000, arguments = [0, 0] }
+delete = { cost = 14_000, arguments = [0, 0] }

utils/nctl/sh/scenarios/chainspecs/itst14_private_chain.chainspec.toml.override

@@ -1,3 +1,4 @@
+[core]
 # Setting this to false makes sense only on private chains which don't need to auction new validator slots.
 #
 # Changing this option makes sense only for private chains which dont need auctioning new validator slots.
@@ -11,3 +12,10 @@ fee_handling = { type = "accumulate" }
 # System account is an administrator
 administrators = ["01f137c5b0c252a028cdb3eccf62946c5340837c66a892fc5079a7c1854f0f962f"]
 compute_rewards = false
+era_duration = '180seconds'
+
+[highway]
+maximum_round_length = '17seconds'
+
+[deploys]
+delete = { cost = 14_000, arguments = [0, 0] }

utils/nctl/sh/scenarios/itst01_private_chain.sh

@@ -0,0 +1 @@
+itst01.sh