Merge branch 'master' into refactoring

README.md

@@ -2,7 +2,7 @@
 # cyberd. Knowledge consensus computer
 ![banner](logo.png)
 
-[![testnet](https://img.shields.io/badge/testnet-euler--dev1-green.svg?style=flat-square)](https://github.com/cybercongress/cyberd/blob/master/docs/run_validator.md)
+[![testnet](https://img.shields.io/badge/testnet-euler--dev2-green.svg?style=flat-square)](https://github.com/cybercongress/cyberd/blob/master/docs/run_validator.md)
 [![version](https://img.shields.io/github/release/cybercongress/cyberd.svg?style=flat-square)](https://github.com/cosmos/cosmos-sdk/releases/latest)
 [![CircleCI](https://img.shields.io/circleci/project/github/cybercongress/cyberd.svg?style=flat-square)](https://circleci.com/gh/cybercongress/cyberd/tree/master)
 [![license](https://img.shields.io/github/license/cybercongress/cyb.svg?style=flat-square)](https://github.com/cybercongress/cyberd)

daemon/init/gentx.go

@@ -55,10 +55,6 @@ following delegation and commission default parameters:
 			if err != nil {
 				return err
 			}
-			genDoc, err := loadGenesisDoc(cdc, config.GenesisFile())
-			if err != nil {
-				return err
-			}
 
 			// Read --pubkey, if empty take it from priv_validator.json
 			if valPubKeyString := viper.GetString(cli.FlagPubKey); valPubKeyString != "" {
@@ -67,8 +63,21 @@ following delegation and commission default parameters:
 					return err
 				}
 			}
+
+			var chainId string
+
+			if id := viper.GetString(client.FlagChainID); id != "" {
+				chainId = id
+			} else {
+				genDoc, err := loadGenesisDoc(cdc, config.GenesisFile())
+				if err != nil {
+					return err
+				}
+				chainId = genDoc.ChainID
+			}
+
 			// Run cyberd create-validator
-			prepareFlagsForTxCreateValidator(config, nodeID, ip, genDoc.ChainID, valPubKey)
+			prepareFlagsForTxCreateValidator(config, nodeID, ip, chainId, valPubKey)
 			createValidatorCmd := cli.GetCmdCreateValidator(cdc)
 
 			w, err := ioutil.TempFile("", "gentx")
@@ -96,6 +105,7 @@ following delegation and commission default parameters:
 	cmd.Flags().String(tmcli.HomeFlag, app.DefaultNodeHome, "node's home directory")
 	cmd.Flags().String(flagClientHome, app.DefaultCLIHome, "client's home directory")
 	cmd.Flags().String(client.FlagName, "", "name of private key with which to sign the gentx")
+	cmd.Flags().String(client.FlagChainID, "euler-dev", "current chain-id")
 	cmd.Flags().AddFlagSet(cli.FsCommissionCreate)
 	cmd.Flags().AddFlagSet(cli.FsAmount)
 	cmd.Flags().AddFlagSet(cli.FsPk)

docs/run_validator.md

@@ -1,5 +1,7 @@
 # Join Cyberd Network As Validator
 
+**Note**. Currently active dev testnet is `euler-dev2` (substitute <testnet_chain_id> with that value).
+
 ## Prepare your server
 
 First, you have to setup a server. 
@@ -22,11 +24,12 @@ Here is the current required server specification to run validator node:
 
 Our main distribution unit is docker container. 
 All images are located in default [Dockerhub registry](https://hub.docker.com/r/cyberd/cyberd/).
-Rank calculated on **GPU** using [**CUDA Toolkit**](https://docs.nvidia.com/cuda/index.html).
 In order to access **GPU** from container, nvidia drivers version **410+** and 
  [nvidia docker runtime](https://github.com/NVIDIA/nvidia-docker) should be installed on host system.
 
-
+**Note**: Before installing nvidia docker runtime, reboot pc(nvidia drivers should be loaded into kernel during startup),
+ check that drivers loaded correctly by `nvidia-smi` command.
+
 Check both driver and docker runtime installed correctly:
 ```bash
 docker run --runtime=nvidia --rm nvidia/cuda:10.0-base nvidia-smi
@@ -63,7 +66,7 @@ docker run -d --name=cyberd --runtime=nvidia \
  -p 26656:26656 -p 26657:26657 -p 26660:26660 \
  -v /cyberd/daemon:/root/.cyberd \
  -v /cyberd/cli:/root/.cyberdcli \
- cyberd/cyberd:euler-dev0
+ cyberd/cyberd:<testnet_chain_id>
 ```
 
 To check if your node is connected to the testnet, you can run this:

testnet/checklist.md

@@ -12,27 +12,27 @@
 
 ```bash
 # Generate genesis validator tx
-./daemon gentx --amount=100000CBD \
- --pubkey=cbdvalconspub1zcjduepqe2wacj36s63tmytk8v4drpc4wrh7uex692msel2pjegeseeapp0q59t5pz \
- --name=euler-dev1_earth
+docker run --rm  -v /cyberdata/cyberd:/root/.cyberd  cyberd/cyberd:euler-dev1 cyberd tendermint show-validator
+./cyberd gentx --amount=100000CBD \
+ --pubkey=cbdvalconspub1zcjduepqsvzxlunur5cl644ypm4tv8lt22aaedeh6uma2ev7ux7y7tdlnhnqd5f0q3 \
+ --name=euler-dev_earth --chain-id=euler-dev2
 ```
 
 ```bash
 # Copy to earth
-scp -P 33324 /home/hlb/projects/cyberd/testnet/genesis.json   earth@earth.cybernode.ai:/cyberdata/cyberd/config/
-scp -P 33324 /home/hlb/projects/cyberd/testnet/config.toml   earth@earth.cybernode.ai:/cyberdata/cyberd/config/
+scp -P 33324 /home/hlb/projects/cyberd/testnet/genesis.json   earth@93.125.26.210:/cyberdata/cyberd/config/
+scp -P 33324 /home/hlb/projects/cyberd/testnet/config.toml   earth@93.125.26.210:/cyberdata/cyberd/config/
 # Copy from earth
 scp -P 33324 earth@93.125.26.210:/cyberdata/cyberd/config/priv_validator.json ~/.cyberd/config/
 ```
 
 ```bash
 # Reset node
-docker run --rm  -v /cyberdata/cyberd:/root/.cyberd  cyberd/cyberd:euler-dev1 cyberd unsafe-reset-all
+docker run --rm  -v /cyberdata/cyberd:/root/.cyberd  cyberd/cyberd:euler-dev2 cyberd unsafe-reset-all
 ```
 
 ```bash
 # Run node
 docker run -d --restart always --name=cyberd --runtime=nvidia \
- -p 34656:26656 -p 34657:26657 -p 34660:26660  \ 
- -v /cyberdata/cyberd:/root/.cyberd  cyberd/cyberd:euler-dev1
+ -p 34656:26656 -p 34657:26657 -p 34660:26660 -v /cyberdata/cyberd:/root/.cyberd  cyberd/cyberd:euler-dev2
 ```

testnet/genesis.json

@@ -1,6 +1,6 @@
 {
   "genesis_time": "2018-12-08T11:11:09.854654507Z",
-  "chain_id": "euler-dev1",
+  "chain_id": "euler-dev2",
   "consensus_params": {
     "block_size": {
       "max_bytes": "22020096",
@@ -188,7 +188,7 @@
                 "validator_address": "cbdvaloper1sk3uvpacpjm2t3389caqk4gd9n9gkzq2jhfzpy",
                 "pubkey": {
                   "type": "tendermint/PubKeyEd25519",
-                  "value": "yp3cSjqGor2Rdjsq0YcVcO/uZNoqtwz9QZZRmGc9CF4="
+                  "value": "gwRv8nwdMf1WpA7qth/rUrvctzfXN9VlnuG8Ty2/neY="
                 },
                 "delegation": {
                   "denom": "CBD",
@@ -212,12 +212,12 @@
                 "type": "tendermint/PubKeySecp256k1",
                 "value": "AyAoX+4zFopYd2iKSVAfFqVKsFL+SSAsSPO+wNkNZNUw"
               },
-              "signature": "5ZemPp8sb4PM9B/3CZINguZzeJvPBnj+nVpPpf2f8BwAh+eEHctemZ6zBru4ZQWM4ptIdCrSN3KIsZDhH0VfXg==",
+              "signature": "9R3lu50AhIaaVSv0osVeSTuZD9ZPjyR1X5FrDb8YrP8+eN4qIPUEQHdw+uRRpqTBs+TD5YCVK5WDSY4/0jQ3vg==",
               "account_number": "0",
               "sequence": "0"
             }
           ],
-          "memo": "fce363a8cb762a9408ac7be78e277863dd578b82@192.168.0.166:26656"
+          "memo": "fc8d5f870023bf4828bf5e76f69c08e2aa21af38@192.168.100.42:26656"
         }
       }
     ]