Set validator flag when use dev account (qdrvm#1625)

Signed-off-by: kamilsa <[email protected]>
rotkonetworks · May 22, 2023 · be47d3e · be47d3e
1 parent d1b9e9e
commit be47d3e
Show file tree

Hide file tree

Showing 31 changed files with 20 additions and 38 deletions.
diff --git a/core/api/service/system/requests/health.cpp b/core/api/service/system/requests/health.cpp
@@ -28,7 +28,7 @@ namespace kagome::api::system::request {
     // isSyncing - Whether the node is syncing.
     data["isSyncing"] =
         makeValue(api_->getBabe()->getCurrentState()
-                  == consensus::babe::Babe::State::SYNCHRONIZED);
+                  != consensus::babe::Babe::State::SYNCHRONIZED);
 
     // peers - Number of connected peers
     data["peers"] = makeValue(

diff --git a/core/application/impl/app_configuration_impl.cpp b/core/application/impl/app_configuration_impl.cpp
@@ -835,7 +835,14 @@ namespace kagome::application {
     // clang-format on
 
     for (auto &[flag, name, dev] : devAccounts()) {
-      development_desc.add_options()(flag, po::bool_switch());
+      development_desc.add_options()(
+          flag,
+          po::bool_switch(),
+          fmt::format("Shortcut for `--name {} --validator` with session keys "
+                      "for `{}` added to keystore",
+                      name,
+                      name)
+              .c_str());
     }
 
     po::variables_map vm;
@@ -961,6 +968,9 @@ namespace kagome::application {
         dev_account_flag = flag;
         node_name_ = name;
         dev_mnemonic_phrase_ = dev;
+        // if dev account is passed node is considered as validator
+        roles_.flags.full = 0;
+        roles_.flags.authority = 1;
       }
     }
 

diff --git a/examples/polkadot-local/README.md b/examples/polkadot-local/README.md
@@ -89,18 +89,18 @@ polkadot build-spec --chain polkadot-local-custom-spec.json --raw > polkadot-loc
 
 Open four terminals and run a unique instance of KAGOME in each of them
 ```
-kagome --chain polkadot-local-custom.json --validator --base-path alice   --name Alice   -p 10001 --rpc-port 11001 --ws-port 12001 --prometheus-port 13001
-kagome --chain polkadot-local-custom.json --validator --base-path bob     --name Bob     -p 10002 --rpc-port 11002 --ws-port 12002 --prometheus-port 13002
-kagome --chain polkadot-local-custom.json --validator --base-path charlie --name Charlie -p 10003 --rpc-port 11003 --ws-port 12003 --prometheus-port 13003
-kagome --chain polkadot-local-custom.json --validator --base-path dave    --name Dave    -p 10004 --rpc-port 11004 --ws-port 12004 --prometheus-port 13004
+kagome --chain polkadot-local-custom.json --base-path alice   --alice   --port=10001 --rpc-port=11001 --prometheus-port=12001 --node-key=95d11fd8fc41db64f8f90fecccc1420af9a3ff8dacef6d6a96c3679177860516
+kagome --chain polkadot-local-custom.json --base-path bob-sub --bob     --port=10002 --rpc-port=11002 --prometheus-port=12002 --node-key=a9c7609d2c48c88f5ca3b147fc946ae0664dae7d824a2549379127ef3eadea35
+kagome --chain polkadot-local-custom.json --base-path charlie --charlie --port=10003 --rpc-port=11003 --prometheus-port 12003 --node-key=f69b297baa6a2a1d2652ee0f72bf07f45fc92c0facc07250679dcc164c53e9a5
+kagome --chain polkadot-local-custom.json --base-path dave    --dave    --port=10004 --rpc-port=11004 --prometheus-port 12004 --node-key=e0d0ba382d0c82b8e1bffc23e316bb9dac07a63408b83480402aee1499515c72
 ```
 
 ### Run Polkadot network
 ```
-polkadot --chain polkadot-local-custom.json --base-path=alice-sub   --alice   --port=10001 --rpc-port=11001 --ws-port=12001 --prometheus-port=13001 --node-key=95d11fd8fc41db64f8f90fecccc1420af9a3ff8dacef6d6a96c3679177860516
-polkadot --chain polkadot-local-custom.json --base-path=bob-sub     --bob     --port=10002 --rpc-port=11002 --ws-port=12002 --prometheus-port=13002 --node-key=a9c7609d2c48c88f5ca3b147fc946ae0664dae7d824a2549379127ef3eadea35
-polkadot --chain polkadot-local-custom.json --base-path=charlie-sub --charlie --port=10003 --rpc-port=11003 --ws-port=12003 --prometheus-port=13003 --node-key=f69b297baa6a2a1d2652ee0f72bf07f45fc92c0facc07250679dcc164c53e9a5
-polkadot --chain polkadot-local-custom.json --base-path=dave-sub    --dave    --port=10004 --rpc-port=11004 --ws-port=12004 --prometheus-port=13004 --node-key=e0d0ba382d0c82b8e1bffc23e316bb9dac07a63408b83480402aee1499515c72
+polkadot --chain polkadot-local-custom.json --base-path=alice   --alice   --port=10001 --rpc-port=11001 --prometheus-port=12001 --node-key=95d11fd8fc41db64f8f90fecccc1420af9a3ff8dacef6d6a96c3679177860516
+polkadot --chain polkadot-local-custom.json --base-path=bob     --bob     --port=10002 --rpc-port=11002 --prometheus-port=12002 --node-key=a9c7609d2c48c88f5ca3b147fc946ae0664dae7d824a2549379127ef3eadea35
+polkadot --chain polkadot-local-custom.json --base-path=charlie --charlie --port=10003 --rpc-port=11003 --prometheus-port=12003 --node-key=f69b297baa6a2a1d2652ee0f72bf07f45fc92c0facc07250679dcc164c53e9a5
+polkadot --chain polkadot-local-custom.json --base-path=dave    --dave    --port=10004 --rpc-port=11004 --prometheus-port=12004 --node-key=e0d0ba382d0c82b8e1bffc23e316bb9dac07a63408b83480402aee1499515c72
 ```
 
 > Note, you may run network composed of both KAGOME and Polkadot type of validators
diff --git a/...testnet/keystore/6173676ed43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d b/...testnet/keystore/6173676ed43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d
diff --git a/...testnet/keystore/61756469d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d b/...testnet/keystore/61756469d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d
diff --git a/...testnet/keystore/62616265d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d b/...testnet/keystore/62616265d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d
diff --git a/...testnet/keystore/6772616e88dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee b/...testnet/keystore/6772616e88dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee
diff --git a/...testnet/keystore/696d6f6ed43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d b/...testnet/keystore/696d6f6ed43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d
diff --git a/...testnet/keystore/70617261d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d b/...testnet/keystore/70617261d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d
diff --git a/examples/polkadot-local/alice/chains/local_testnet/network/secret_ed25519 b/examples/polkadot-local/alice/chains/local_testnet/network/secret_ed25519
diff --git a/...testnet/keystore/6173676e8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48 b/...testnet/keystore/6173676e8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48
diff --git a/...testnet/keystore/617564698eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48 b/...testnet/keystore/617564698eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48
diff --git a/...testnet/keystore/626162658eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48 b/...testnet/keystore/626162658eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48
diff --git a/...testnet/keystore/6772616ed17c2d7823ebf260fd138f2d7e27d114c0145d968b5ff5006125f2414fadae69 b/...testnet/keystore/6772616ed17c2d7823ebf260fd138f2d7e27d114c0145d968b5ff5006125f2414fadae69
diff --git a/...testnet/keystore/696d6f6e8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48 b/...testnet/keystore/696d6f6e8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48
diff --git a/...testnet/keystore/706172618eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48 b/...testnet/keystore/706172618eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48
diff --git a/examples/polkadot-local/bob/chains/local_testnet/network/secret_ed25519 b/examples/polkadot-local/bob/chains/local_testnet/network/secret_ed25519
diff --git a/...testnet/keystore/6173676e90b5ab205c6974c9ea841be688864633dc9ca8a357843eeacf2314649965fe22 b/...testnet/keystore/6173676e90b5ab205c6974c9ea841be688864633dc9ca8a357843eeacf2314649965fe22
diff --git a/...testnet/keystore/6175646990b5ab205c6974c9ea841be688864633dc9ca8a357843eeacf2314649965fe22 b/...testnet/keystore/6175646990b5ab205c6974c9ea841be688864633dc9ca8a357843eeacf2314649965fe22
diff --git a/...testnet/keystore/6261626590b5ab205c6974c9ea841be688864633dc9ca8a357843eeacf2314649965fe22 b/...testnet/keystore/6261626590b5ab205c6974c9ea841be688864633dc9ca8a357843eeacf2314649965fe22
diff --git a/...testnet/keystore/6772616e439660b36c6c03afafca027b910b4fecf99801834c62a5e6006f27d978de234f b/...testnet/keystore/6772616e439660b36c6c03afafca027b910b4fecf99801834c62a5e6006f27d978de234f
diff --git a/...testnet/keystore/696d6f6e90b5ab205c6974c9ea841be688864633dc9ca8a357843eeacf2314649965fe22 b/...testnet/keystore/696d6f6e90b5ab205c6974c9ea841be688864633dc9ca8a357843eeacf2314649965fe22
diff --git a/...testnet/keystore/7061726190b5ab205c6974c9ea841be688864633dc9ca8a357843eeacf2314649965fe22 b/...testnet/keystore/7061726190b5ab205c6974c9ea841be688864633dc9ca8a357843eeacf2314649965fe22
diff --git a/examples/polkadot-local/charlie/chains/local_testnet/network/secret_ed25519 b/examples/polkadot-local/charlie/chains/local_testnet/network/secret_ed25519
diff --git a/...testnet/keystore/6173676e306721211d5404bd9da88e0204360a1a9ab8b87c66c1bc2fcdd37f3c2222cc20 b/...testnet/keystore/6173676e306721211d5404bd9da88e0204360a1a9ab8b87c66c1bc2fcdd37f3c2222cc20
diff --git a/...testnet/keystore/61756469306721211d5404bd9da88e0204360a1a9ab8b87c66c1bc2fcdd37f3c2222cc20 b/...testnet/keystore/61756469306721211d5404bd9da88e0204360a1a9ab8b87c66c1bc2fcdd37f3c2222cc20
diff --git a/...testnet/keystore/62616265306721211d5404bd9da88e0204360a1a9ab8b87c66c1bc2fcdd37f3c2222cc20 b/...testnet/keystore/62616265306721211d5404bd9da88e0204360a1a9ab8b87c66c1bc2fcdd37f3c2222cc20
diff --git a/...testnet/keystore/6772616e5e639b43e0052c47447dac87d6fd2b6ec50bdd4d0f614e4299c665249bbd09d9 b/...testnet/keystore/6772616e5e639b43e0052c47447dac87d6fd2b6ec50bdd4d0f614e4299c665249bbd09d9
diff --git a/...testnet/keystore/696d6f6e306721211d5404bd9da88e0204360a1a9ab8b87c66c1bc2fcdd37f3c2222cc20 b/...testnet/keystore/696d6f6e306721211d5404bd9da88e0204360a1a9ab8b87c66c1bc2fcdd37f3c2222cc20
diff --git a/...testnet/keystore/70617261306721211d5404bd9da88e0204360a1a9ab8b87c66c1bc2fcdd37f3c2222cc20 b/...testnet/keystore/70617261306721211d5404bd9da88e0204360a1a9ab8b87c66c1bc2fcdd37f3c2222cc20
diff --git a/examples/polkadot-local/dave/chains/local_testnet/network/secret_ed25519 b/examples/polkadot-local/dave/chains/local_testnet/network/secret_ed25519