certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge PR #4037: Fix doc conflicts

This commit is contained in:
gamarin2 2019-04-03 16:36:19 +02:00 committed by Alexander Bezobchuk
parent d8833d760d
commit ecba8a154a
5 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/gaia/delegator-guide-cli.md
View File

@ -337,7 +337,7 @@ For each command, you can use the `-h` or `--help` flag to get more information.
## Sending Transactions ## Sending Transactions
::: warning ::: warning
On Cosmos Hub mainnet, the accepted denom is `uatom`, where `1atom = 1,000,000uatom` On Cosmos Hub mainnet, the accepted denom is `uatom` (micro-Atom), where `1atom = 1,000,000uatom`
::: :::
### A note on gas and fees ### A note on gas and fees
@ -470,15 +470,9 @@ If you do not have a ledger device and want to interact with your private key on
gaiacli tx staking delegate <validatorAddress> <amountToBond> --from <delegatorAddress> --gas auto --gas-adjustment 1.5 --gas-prices <gasPrice> --generate-only > unsignedTX.json gaiacli tx staking delegate <validatorAddress> <amountToBond> --from <delegatorAddress> --gas auto --gas-adjustment 1.5 --gas-prices <gasPrice> --generate-only > unsignedTX.json
``` ```
<<<<<<< HEAD
In order to sign, you will also need the `chain-id`, `account-number` and `sequence`. The `chain-id` is a unique identifier for the blockchain on which you are submitting the transaction. The `account-number` is an identifier generated when your account first receives funds. The `sequence` number is used to keep track of the number of transactions you have sent and prevent replay attacks. In order to sign, you will also need the `chain-id`, `account-number` and `sequence`. The `chain-id` is a unique identifier for the blockchain on which you are submitting the transaction. The `account-number` is an identifier generated when your account first receives funds. The `sequence` number is used to keep track of the number of transactions you have sent and prevent replay attacks.
Get the chain-id from the genesis file (`cosmoshub-1`), and the two other fields using the account query:
=======
In order to sign, you will also need the `chain-id`, `account-number` and `sequence`. The `account-number` is an identifier generated when your account first receives funds. The `sequence` number is used to keep track of the number of transactions you have sent and prevent replay attacks.
Get the chain-id from the genesis file (`cosmoshub-1`), and the two other information using the `account query`: Get the chain-id from the genesis file (`cosmoshub-1`), and the two other information using the `account query`:
>>>>>>> 6371dacb... docs offline procedure improvment + other minor fixes
```bash ```bash
gaiacli query account <yourAddress> --chain-id cosmoshub-1 gaiacli query account <yourAddress> --chain-id cosmoshub-1
@ -490,11 +484,7 @@ Then, copy `unsignedTx.json` and transfer it (e.g. via USB) to the offline compu
cat unsignedTx.json cat unsignedTx.json
``` ```
<<<<<<< HEAD
Now, sign the transaction using the following command. You will need the `chain-id`, `sequence` and `account-number` obtained earlier: Now, sign the transaction using the following command. You will need the `chain-id`, `sequence` and `account-number` obtained earlier:
=======
Now, sign the transaction using the following command. You will need the `chaind-id`, `sequence` and `account-number` obtained earlier:
>>>>>>> 6371dacb... docs offline procedure improvment + other minor fixes
```bash ```bash
gaiacli tx sign unsignedTx.json --from <delegatorKeyName> --offline --chain-id cosmoshub-1 --sequence <sequence> --account-number <account-number> > signedTx.json gaiacli tx sign unsignedTx.json --from <delegatorKeyName> --offline --chain-id cosmoshub-1 --sequence <sequence> --account-number <account-number> > signedTx.json

4
docs/gaia/gaiacli.md
View File

@ -154,7 +154,7 @@ txs by `gasPrice` in the mempool, so providing higher fees or gas prices may yie
e.g. e.g.
```bash ```bash
gaiacli tx send ... --fees=1000000uatom gaiacli tx send ... --fees=50000uatom
``` ```
or or
@ -575,7 +575,7 @@ gaiacli query gov proposer <proposal_id>
#### Increase deposit #### Increase deposit
In order for a proposal to be broadcasted to the network, the amount deposited must be above a `minDeposit` value (default: `512000000uatom`). If the proposal you previously created didn't meet this requirement, you can still increase the total amount deposited to activate it. Once the minimum deposit is reached, the proposal enters voting period: In order for a proposal to be broadcasted to the network, the amount deposited must be above a `minDeposit` value (initial value: `512000000uatom`). If the proposal you previously created didn't meet this requirement, you can still increase the total amount deposited to activate it. Once the minimum deposit is reached, the proposal enters voting period:
```bash ```bash
gaiacli tx gov deposit <proposal_id> "10000000uatom" \ gaiacli tx gov deposit <proposal_id> "10000000uatom" \

4
docs/gaia/installation.md
View File

@ -9,8 +9,8 @@ Install `go` by following the [official docs](https://golang.org/doc/install). R
```bash ```bash
mkdir -p $HOME/go/bin mkdir -p $HOME/go/bin
echo "export GOPATH=$HOME/go" >> ~/.bash_profile echo "export GOPATH=$HOME/go" >> ~/.bash_profile
echo "export GOBIN=\$GOPATH/bin" >> ~/.bash_profile echo "export GOBIN=$GOPATH/bin" >> ~/.bash_profile
echo "export PATH=\$PATH:\$GOBIN" >> ~/.bash_profile echo "export PATH=$PATH:$GOBIN" >> ~/.bash_profile
source ~/.bash_profile source ~/.bash_profile
``` ```

4
docs/gaia/join-mainnet.md
View File

@ -56,7 +56,7 @@ Fetch the testnet's `genesis.json` file into `gaiad`'s config directory.
```bash ```bash
mkdir -p $HOME/.gaiad/config mkdir -p $HOME/.gaiad/config
curl https://raw.githubusercontent.com/cosmos/launch/master/genesis.json > $HOME/.gaiad/config/genesis.json curl https://raw.githubusercontent.com/cosmos/launch/master/latest/genesis.json > $HOME/.gaiad/config/genesis.json
``` ```
Note we use the `latest` directory in the [launch repo](https://github.com/cosmos/launch) which contains details for the mainnet like the latest version and the genesis file. Note we use the `latest` directory in the [launch repo](https://github.com/cosmos/launch) which contains details for the mainnet like the latest version and the genesis file.
@ -90,7 +90,7 @@ On Cosmos Hub mainnet, the accepted denom is `uatom`, where `1atom = 1.000.000ua
Transactions on the Cosmos Hub network need to include a transaction fee in order to be processed. This fee pays for the gas required to run the transaction. The formula is the following: Transactions on the Cosmos Hub network need to include a transaction fee in order to be processed. This fee pays for the gas required to run the transaction. The formula is the following:
``` ```
fees = gas * gasPrices fees = ceil(gas * gasPrices)
``` ```
The `gas` is dependent on the transaction. Different transaction require different amount of `gas`. The `gas` amount for a transaction is calculated as it is being processed, but there is a way to estimate it beforehand by using the `auto` value for the `gas` flag. Of course, this only gives an estimate. You can adjust this estimate with the flag `--gas-adjustment` (default `1.0`) if you want to be sure you provide enough `gas` for the transaction. The `gas` is dependent on the transaction. Different transaction require different amount of `gas`. The `gas` amount for a transaction is calculated as it is being processed, but there is a way to estimate it beforehand by using the `auto` value for the `gas` flag. Of course, this only gives an estimate. You can adjust this estimate with the flag `--gas-adjustment` (default `1.0`) if you want to be sure you provide enough `gas` for the transaction.

7
docs/gaia/validators/validator-setup.md
View File

@ -58,12 +58,11 @@ You can confirm that you are in the validator set by using a third party explore
## Participate in genesis as a validator ## Participate in genesis as a validator
::: warning ::: warning
This section only concerns validators that want to be in the genesis The genesis ceremony for the Cosmos Hub mainnet is closed. Please skip to the next section.
file of the Cosmos Hub mainnet. If the mainnet is already live, skip this section.
::: :::
If you want to participate in genesis as a validator, you need to justify that If you want to participate in genesis as a validator, you need to justify that
you have some atoms at genesis, create one (or multiple) transactions to bond these atoms to your validator address, and include this transaction in the genesis file. you have some stake at genesis, create one (or multiple) transactions to bond this stake to your validator address, and include this transaction in the genesis file.
Your `cosmosvalconspub` can be used to create a new validator by staking tokens. You can find your validator pubkey by running: Your `cosmosvalconspub` can be used to create a new validator by staking tokens. You can find your validator pubkey by running:
@ -178,7 +177,7 @@ If you got jailed for downtime, you can get your voting power back to your valid
gaiad start gaiad start
``` ```
Wait for your full node to catch up to the latest block. Next, run the following command. Then, you can [unjail your validator](#unjail-validator) Wait for your full node to catch up to the latest block. Then, you can [unjail your validator](#unjail-validator)
Lastly, check your validator again to see if your voting power is back. Lastly, check your validator again to see if your voting power is back.