Merge branch 'rc/v1.6.0' into dependabot/go_modules/master/github.com…

…/beevik/ntp-1.3.0

cmd/node/config/testKeys/extraValidatorsKeys.pem

@@ -0,0 +1,84 @@
+-----BEGIN PRIVATE KEY for 030f64b325e44c6d1b3aded4e17d8d2e8df130654322634436b60edefbbbe96c28ae8c27411a0bb09d8c9b16bfd3f409139c339e0a01a64c19cb0e5f5d90d36b9eba368908c3cf79358ee710472e60f57ff96450c6c619afcdb64cde28c3120c-----
+N2M0ZWQ2ZWU0MTMyNGUwNzI4NmZhZDM0ZmQ2NjdhOGUyYTM2NjcyMjc2YTg2MWYy
+ZWIwYzVmYTRkM2VmOWEzOQ==
+-----END PRIVATE KEY for 030f64b325e44c6d1b3aded4e17d8d2e8df130654322634436b60edefbbbe96c28ae8c27411a0bb09d8c9b16bfd3f409139c339e0a01a64c19cb0e5f5d90d36b9eba368908c3cf79358ee710472e60f57ff96450c6c619afcdb64cde28c3120c-----
+-----BEGIN PRIVATE KEY for 249c62e3b56d8979919c318c00fff9e456b2c79cf7862e8d53376f3d5ad8be731201e038cd32a613954ec31cce1b4e10627a874334d9e50141c8c13dfd9ce079f20fd3602ec9bd6aaec3111e88c82691eabebf2e9dd0cd85b0d2e2dd490cd519-----
+ZTEwM2IzZDA4OTJmZTA2Y2ZiYjk3NjY1YWMzNTJkNTcxM2FmZWY4NmI4MmZlYTkz
+NDk5N2M4M2ZlNDZjZDI0MA==
+-----END PRIVATE KEY for 249c62e3b56d8979919c318c00fff9e456b2c79cf7862e8d53376f3d5ad8be731201e038cd32a613954ec31cce1b4e10627a874334d9e50141c8c13dfd9ce079f20fd3602ec9bd6aaec3111e88c82691eabebf2e9dd0cd85b0d2e2dd490cd519-----
+-----BEGIN PRIVATE KEY for 264b6598dd1ebcf0c25be31adc68ce57283f2ece639009ea680256b004856925ec9fafe44c994e2f4def4a07d10c380f79db89681fc805d06f4843f96777a18e41827a7c696272d16447f741cf28306b03bebb10d65236b2a762897c28545b04-----
+MGVlYjNmNjIyOGMyZDcxMWEzZGU2ZjRmZDZmZmZiODk3YWExYjcyYTIwY2VlYmEy
+MmQyMGMwYjI3NWFhNzQ3MA==
+-----END PRIVATE KEY for 264b6598dd1ebcf0c25be31adc68ce57283f2ece639009ea680256b004856925ec9fafe44c994e2f4def4a07d10c380f79db89681fc805d06f4843f96777a18e41827a7c696272d16447f741cf28306b03bebb10d65236b2a762897c28545b04-----
+-----BEGIN PRIVATE KEY for 121da32615b6206aeb021f0c6a98cbb136bbe861f828748d6e127d30d510e06ba92fa1d9dec046eb0836080745b6bb0462762c1a9fe136fa3c1bb274db35c5d52b9a84c46395e2556f6e58296f81bd7dd4716e9f3a585f111178c9059ee6628b-----
+ZDE5ZmYyMGFlZGI3ZWY3OGIzMzFhMWY3NGRkMmNmZTA4NTBhODUwMDU1ODA5MGNl
+MDI4MWE2NDMzYWZiODQ0MA==
+-----END PRIVATE KEY for 121da32615b6206aeb021f0c6a98cbb136bbe861f828748d6e127d30d510e06ba92fa1d9dec046eb0836080745b6bb0462762c1a9fe136fa3c1bb274db35c5d52b9a84c46395e2556f6e58296f81bd7dd4716e9f3a585f111178c9059ee6628b-----
+-----BEGIN PRIVATE KEY for aecbab700543e1848ea923e3e2b9344d2b3ea6334e95b301d904608cadee932e9af699ecc3b78d5fc107533757528b17c7214754ae781aad76d424ae788c1c8c210d2507cd867013144d8732c88dcefb418c49b6f45d27c7b0d629e95c69808f-----
+YmUxZDIzYjg1ZTYwMTE5ZjdlMWYxY2JmYWEyOWZhZGE0NjE5MDc5MzkzNWEwNzkz
+YzVhMjFlMGVhZDJjMTg0OQ==
+-----END PRIVATE KEY for aecbab700543e1848ea923e3e2b9344d2b3ea6334e95b301d904608cadee932e9af699ecc3b78d5fc107533757528b17c7214754ae781aad76d424ae788c1c8c210d2507cd867013144d8732c88dcefb418c49b6f45d27c7b0d629e95c69808f-----
+-----BEGIN PRIVATE KEY for c6dd20674a464b2a1d8492a39238c67ae1d6226445077de73fcc71a9137de1b55d476fdff5845afc6b860673bd5c7f06147dd83c8314e34f28d6ae05e7edf156df713fd5b7d771a955da761fd508c816cdc5a4e0faceff34334cfedc86053a19-----
+ZGQ4ZDY1ZjdhMGZmZGYwYTc0MDM1MTNlNGMzZDM1ZmE1N2IzODM4YzA5OWY0NmMz
+ZTZiYTgzYjRlNzU0MGM0ZQ==
+-----END PRIVATE KEY for c6dd20674a464b2a1d8492a39238c67ae1d6226445077de73fcc71a9137de1b55d476fdff5845afc6b860673bd5c7f06147dd83c8314e34f28d6ae05e7edf156df713fd5b7d771a955da761fd508c816cdc5a4e0faceff34334cfedc86053a19-----
+-----BEGIN PRIVATE KEY for 964c9baed3d8b4a9affebf81006ae7ee75c98ac1f2348b6a2e407add61663e2ce5c7994c18dcab6a0ebbce1378c9140c7e6475bd204d9c8773af47c6d1d0764edbaf4abf3052d4a7755442d3c1e51d8c8dd8174ea69dde80f8c21eb2adec3b17-----
+Njg0NTE2MTAwZmU5OWVhNDBhYjE5ZDA1OGI2OTk0MDI3NzA2MDVjZDhlNjFmMmU1
+M2M3Mzk3MWQ5OTA1OGUxYw==
+-----END PRIVATE KEY for 964c9baed3d8b4a9affebf81006ae7ee75c98ac1f2348b6a2e407add61663e2ce5c7994c18dcab6a0ebbce1378c9140c7e6475bd204d9c8773af47c6d1d0764edbaf4abf3052d4a7755442d3c1e51d8c8dd8174ea69dde80f8c21eb2adec3b17-----
+-----BEGIN PRIVATE KEY for 168fc4729e416f2dbbe79af7337e5acf8975cc6c24ff49b22902157dfb6376460e6c8fbac4b746df36c87f80f8741f14304a3f76224ff69c5971a40d0019a788d651be12fc21d97f54084aa251c9ad9fb2cdb853c9b9d108aff1efb0f3c25301-----
+YjlmY2YzNDc3MTRmNDgxNzhhYjcyNDc4MmYyYTRkZTBjZDVhMDdjYmUxNjU3Mjg2
+YzIyZTZkNGJlNmNiZjA2Yg==
+-----END PRIVATE KEY for 168fc4729e416f2dbbe79af7337e5acf8975cc6c24ff49b22902157dfb6376460e6c8fbac4b746df36c87f80f8741f14304a3f76224ff69c5971a40d0019a788d651be12fc21d97f54084aa251c9ad9fb2cdb853c9b9d108aff1efb0f3c25301-----
+-----BEGIN PRIVATE KEY for 917f49e8302c57d794af44502917502517fe621f5ef8bd49141e587469e1be2005f9600316f00478e07160abd18d341468dd9bc72b46cc8bf7565f06165d7653ab5cd183ab6ef5074b47299484be210fbc9b1ee0a57e15ce9cb872dfaba4cf10-----
+YTQyMTJmZWEwOGRkNzcyYmJlMzZiYjgyNjRmMDA1ZTUzOWVjYzQ0ZWY3MTYyOTZm
+MTk5ODI2MGEzYWQ3ZDY0MA==
+-----END PRIVATE KEY for 917f49e8302c57d794af44502917502517fe621f5ef8bd49141e587469e1be2005f9600316f00478e07160abd18d341468dd9bc72b46cc8bf7565f06165d7653ab5cd183ab6ef5074b47299484be210fbc9b1ee0a57e15ce9cb872dfaba4cf10-----
+-----BEGIN PRIVATE KEY for 920c54e87b0b66960800bcfe3837fc54794c5187764313e13781bd7ecddfe72a9aa138faca52b5293b5bd44debcfeb07241c3ce1967d3c0730bedee5c0bff588ed977a482f36f9dfd8a0abf54a812b78ea951739904dc6e74a9f722e6f9aa109-----
+NDIxMWY5ZDRmNjJmMjA0MTY1NTkxMjFjYmFjM2ZjOWM5ODgxYzFkZTBjNDU2ZWM2
+Y2M0NTA1NGVhNTY4MmM0NQ==
+-----END PRIVATE KEY for 920c54e87b0b66960800bcfe3837fc54794c5187764313e13781bd7ecddfe72a9aa138faca52b5293b5bd44debcfeb07241c3ce1967d3c0730bedee5c0bff588ed977a482f36f9dfd8a0abf54a812b78ea951739904dc6e74a9f722e6f9aa109-----
+-----BEGIN PRIVATE KEY for 239112057c492a97d5a512da5ab61d0dedbd0fb7066b83f22ad4f1e105e3a67566161d07c252c25e615cbc10dede8c15f3c96430fe0160e4c22b22b3c24114c5ed71a2a29f75c21122797fb83a6b2d58a8ef2cd8b445f6b6fb81c6a2f5739d00-----
+M2ViNGQ3YjNmZmQ5NWMxZWU0MTRhYmMxN2I4OGYzYThjOWU3MWIyN2JmYjk3MDhh
+M2QzNmNmZWExOWI0OWIyMw==
+-----END PRIVATE KEY for 239112057c492a97d5a512da5ab61d0dedbd0fb7066b83f22ad4f1e105e3a67566161d07c252c25e615cbc10dede8c15f3c96430fe0160e4c22b22b3c24114c5ed71a2a29f75c21122797fb83a6b2d58a8ef2cd8b445f6b6fb81c6a2f5739d00-----
+-----BEGIN PRIVATE KEY for 71da072e471fc514cc59bd81f33a96c54a8e94a066c03e750dbf8c987b9ed2a56a2160ce956bafa88e00cfec4b7922069129829cd595321ceced47b5ab231a9323be4ee2c7e336734500cb5fd001747545b90803150f2818f53dd6354feb3315-----
+MjJmM2ZlMDY1NWM3YmUxODg3ZmQ1MGRmMGFlNTdlZjRiNjZhNzM5MGIyYzQzOTgw
+YTkxZDBjMzE4MTZlZTI0OQ==
+-----END PRIVATE KEY for 71da072e471fc514cc59bd81f33a96c54a8e94a066c03e750dbf8c987b9ed2a56a2160ce956bafa88e00cfec4b7922069129829cd595321ceced47b5ab231a9323be4ee2c7e336734500cb5fd001747545b90803150f2818f53dd6354feb3315-----
+-----BEGIN PRIVATE KEY for 2f2146c08e3e73c44d3eab746f2a950ad0b79185fb0620e8e215ee5499997549e52a37505f593f909e15f3e6b1d0f214d0a787975691733c2c655dc32c4e0e792be3116bafb953c5e0909ed381157089f51574d9fab9bae40d7d2e8cb8defc16-----
+MjQ5YWE3MTcwZGMwOGRmNjNkYTkzZDdmNzJhODEyMTE4ZDI1NzE3ZjliZjE1YmZi
+NzA1YzZhYTAxYTEyMDc0MQ==
+-----END PRIVATE KEY for 2f2146c08e3e73c44d3eab746f2a950ad0b79185fb0620e8e215ee5499997549e52a37505f593f909e15f3e6b1d0f214d0a787975691733c2c655dc32c4e0e792be3116bafb953c5e0909ed381157089f51574d9fab9bae40d7d2e8cb8defc16-----
+-----BEGIN PRIVATE KEY for 3a0b17851dd2cc84363e229638aebc2d3354c22b3b891b39e885dcac797f43e6e372b827c368ab3efb636e271cc1a2017e996c2318d6c4a3e3c26f52141496ecfd7c3363599bbd5d715a72c6850b57d9e49057b37c3ae502a6bd244b3e7f8108-----
+ZGY4Nzc0NmJhZjI4YzU4ZDViMjYwMzUwNmJkY2RiZjBlYmNiNmVjZDFiNjY4MzY1
+YzE1MzU0NzM0ZDAzOGQyZQ==
+-----END PRIVATE KEY for 3a0b17851dd2cc84363e229638aebc2d3354c22b3b891b39e885dcac797f43e6e372b827c368ab3efb636e271cc1a2017e996c2318d6c4a3e3c26f52141496ecfd7c3363599bbd5d715a72c6850b57d9e49057b37c3ae502a6bd244b3e7f8108-----
+-----BEGIN PRIVATE KEY for 6dc9fee64f63262c7647ea067449656845275c5bcb2d0354afd31486ff32b8022d349054e87578d0359a0d3dc3dbc50ec485840b4029a2f7d2658571ca6d381c5c80ad93ce9cba7c43e89020caee1b19d4848946c4711e06dfeee3f1dc2b3483-----
+OWRkY2IyZWRmMGRiMzUwY2FjMDhmYzM1NGRhZGY1NGY4NmU0N2UxNTJjMmNmZDNk
+OWQyOTJlMjg2MzJlN2EzZg==
+-----END PRIVATE KEY for 6dc9fee64f63262c7647ea067449656845275c5bcb2d0354afd31486ff32b8022d349054e87578d0359a0d3dc3dbc50ec485840b4029a2f7d2658571ca6d381c5c80ad93ce9cba7c43e89020caee1b19d4848946c4711e06dfeee3f1dc2b3483-----
+-----BEGIN PRIVATE KEY for 6c9dadc88e601b68b8e421a3742ea37113aeb1eee690acc86b28eb55a7b75eae1657bdebed0477e5aee7eb83df38c00232a151c6ea952ed148c4c34a858caa20dae3e6c33c8b3561f9ba8278b8a1a03d7a934607ff35dbb6d2ecccfd15a33913-----
+MDI5ZGVkMGE4YmIyZDYyMTNiOGFhN2Q2ZDY2MTFkYzc2OWIyZDU4MGJkODdlZDNl
+MWUwNWVmMjAyNTIxNTA1Yg==
+-----END PRIVATE KEY for 6c9dadc88e601b68b8e421a3742ea37113aeb1eee690acc86b28eb55a7b75eae1657bdebed0477e5aee7eb83df38c00232a151c6ea952ed148c4c34a858caa20dae3e6c33c8b3561f9ba8278b8a1a03d7a934607ff35dbb6d2ecccfd15a33913-----
+-----BEGIN PRIVATE KEY for 45526548fb3b1e3bd76377e3998b3e6be72a572225d84ed7d6a837bec364172fdacd0cbe0551892c2f527e18ff01470db5ba8151de6f06f8881eed4bd1c4e9dcc59eeb7b62889918eff0180f6bc0ce52a2df25d7f58692e56987e59dee125780-----
+NzljYTYxOGViNTZhM2ZmNTNjOTQzMGUwM2YzNTVkMTYzMzYwY2NjMzQwY2M3Mjk5
+Y2UyMDJhNWM3NWQ3ZTUxMw==
+-----END PRIVATE KEY for 45526548fb3b1e3bd76377e3998b3e6be72a572225d84ed7d6a837bec364172fdacd0cbe0551892c2f527e18ff01470db5ba8151de6f06f8881eed4bd1c4e9dcc59eeb7b62889918eff0180f6bc0ce52a2df25d7f58692e56987e59dee125780-----
+-----BEGIN PRIVATE KEY for 2fc71725f7368f068dc52a5ee468fa56a051ee25dbbc486fff169baf46ffa92e386c47a649220d3c238fee1f2f3e1904f87a000d8c1e43ddccfef73f37b7381954c2668d92338f2140c9360d8cbb52857835e698bed51433074c0daa6916e60d-----
+Zjg0OTY5ZmYyMTU4NWZhM2UxNmU2YzUwMjNmZmQ2MDljZTE0OTBkMmJjNWQ5ZjJl
+NjEwMjgwYzllZTk4ZjU0Yg==
+-----END PRIVATE KEY for 2fc71725f7368f068dc52a5ee468fa56a051ee25dbbc486fff169baf46ffa92e386c47a649220d3c238fee1f2f3e1904f87a000d8c1e43ddccfef73f37b7381954c2668d92338f2140c9360d8cbb52857835e698bed51433074c0daa6916e60d-----
+-----BEGIN PRIVATE KEY for a4c519bd1f223434a641cd26c6e64cab1c71847a402150e54d9dfe7eab3574adf0ed2fc7a9d782c356aa9ee3ea016809f771d6b53295ecab718d9cdd702a87b811cc2d84864b5b6bb59286254fa07d530bb8f385d8f1f5cf14a1d27afc34d708-----
+NmYzMjM4NzhlNDE5OWU1Y2NmYTZkNmNlYTNiMDY3NmM0MDJmNmI3ODVlOTZjOGUz
+NWRkMzg5MjI4ZDQxNDAxNA==
+-----END PRIVATE KEY for a4c519bd1f223434a641cd26c6e64cab1c71847a402150e54d9dfe7eab3574adf0ed2fc7a9d782c356aa9ee3ea016809f771d6b53295ecab718d9cdd702a87b811cc2d84864b5b6bb59286254fa07d530bb8f385d8f1f5cf14a1d27afc34d708-----
+-----BEGIN PRIVATE KEY for 593aad5efc849dc30cb0d2c119c5b310d0c5d1ab9540d37cad7779e0b7209030321a332fde8a548bd61b65fe535a5408157be4d42b0143763cd43ded1ea0c7e24dfcceb444610cae5763d77a7ddd1fbeaac40fcec3e5e3189af12df996fe7317-----
+ZDkxZjU2N2MyNWNjMWQ1NzQ4YzRkMWFhMzNlY2NmMWUxZjdlOTAwYjFiN2QxZTFl
+MjdjMTg0OGFhNGE2ZDQwNw==
+-----END PRIVATE KEY for 593aad5efc849dc30cb0d2c119c5b310d0c5d1ab9540d37cad7779e0b7209030321a332fde8a548bd61b65fe535a5408157be4d42b0143763cd43ded1ea0c7e24dfcceb444610cae5763d77a7ddd1fbeaac40fcec3e5e3189af12df996fe7317-----
+-----BEGIN PRIVATE KEY for c0de52d21c284b40b384de4d0c69f59164de3b46e065a78bd2f3b9ff67d106023fae25c628d96e0b10abec84067a3701f80138a341f3fcdd7ebb297db9b29f2da82dbdd797fe44a9b5fcebf27945e90229c850bf8090965aab5e3457c797cb0c-----
+ODAxYjIzZGRmOTU5N2QxMGQwZmMyZmE2MjE4OTQ3OGMzZDkyNGRhYWQ1ODA0OTg4
+Y2Q3MDhiMTk0M2I3MTQ3Mg==
+-----END PRIVATE KEY for c0de52d21c284b40b384de4d0c69f59164de3b46e065a78bd2f3b9ff67d106023fae25c628d96e0b10abec84067a3701f80138a341f3fcdd7ebb297db9b29f2da82dbdd797fe44a9b5fcebf27945e90229c850bf8090965aab5e3457c797cb0c-----

scripts/testnet/include/config.sh

@@ -30,7 +30,10 @@ copyConfig() {
   cp ./filegen/"$CONFIGGENERATOROUTPUTDIR"/nodesSetup.json ./node/config
   cp ./filegen/"$CONFIGGENERATOROUTPUTDIR"/*.pem ./node/config #there might be more .pem files there
   if [[ $MULTI_KEY_NODES -eq 1 ]]; then
-    mv ./node/config/"$VALIDATOR_KEY_PEM_FILE" ./node/config/"$MULTI_KEY_PEM_FILE"
+      mv ./node/config/"$VALIDATOR_KEY_PEM_FILE" ./node/config/"$MULTI_KEY_PEM_FILE"
+      if [[ $EXTRA_KEYS -eq 1 ]]; then
+        cat $NODEDIR/config/testKeys/"${EXTRA_KEY_PEM_FILE}" >> ./node/config/"$MULTI_KEY_PEM_FILE"
+      fi
   fi
   echo "Configuration files copied from the configuration generator to the working directories of the executables."
   popd

scripts/testnet/variables.sh

@@ -65,6 +65,9 @@ export META_CONSENSUS_SIZE=$META_VALIDATORCOUNT
 # MULTI_KEY_NODES if set to 1, one observer will be generated on each shard that will handle all generated keys
 export MULTI_KEY_NODES=0
 
+# EXTRA_KEYS if set to 1, extra keys will be added to the generated keys
+export EXTRA_KEYS=1
+
 # ALWAYS_NEW_CHAINID will generate a fresh new chain ID each time start.sh/config.sh is called
 export ALWAYS_NEW_CHAINID=1
 
@@ -180,3 +183,6 @@ export VALIDATOR_KEY_PEM_FILE="validatorKey.pem"
 
 # MULTI_KEY_PEM_FILE is the pem file name when running multi key mode, with all managed
 export MULTI_KEY_PEM_FILE="allValidatorsKeys.pem"
+
+# EXTRA_KEY_PEM_FILE is the pem file name when running multi key mode, with all extra managed
+export EXTRA_KEY_PEM_FILE="extraValidatorsKeys.pem"