Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix conflicts 0.34 #4037

Merged
merged 14 commits into from
Apr 3, 2019
Merged

Fix conflicts 0.34 #4037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7ec3d3d
update docs for mainnet
gamarin2 Mar 8, 2019
1662d6b
finalize mainnet docs
gamarin2 Mar 11, 2019
d563a26
bez review
gamarin2 Mar 11, 2019
3f87671
Apply suggestions from code review
jackzampolin Mar 11, 2019
e111162
Update docs/gaia/delegator-guide-cli.md
jackzampolin Mar 11, 2019
5b5960c
fix version
gamarin2 Mar 12, 2019
9e446df
melekes review
gamarin2 Mar 13, 2019
85b0733
Apply suggestions from code review
cwgoes Mar 13, 2019
bd1b693
chris review
gamarin2 Mar 13, 2019
f39cc0d
typo fix
gamarin2 Mar 13, 2019
ea0db50
Merge PR #3855: Mainnet docs update to master
jackzampolin Mar 13, 2019
ce82e01
Merge PR #3922: DOCS: gamarin/master docs update
gamarin2 Mar 18, 2019
3d88c9e
resolve conflicts
gamarin2 Apr 3, 2019
aaca405
fix typo
gamarin2 Apr 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 1 addition & 11 deletions docs/gaia/delegator-guide-cli.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ For each command, you can use the `-h` or `--help` flag to get more information.
## Sending Transactions

::: 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
Expand Down Expand Up @@ -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
```

<<<<<<< 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.

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`:
>>>>>>> 6371dacb... docs offline procedure improvment + other minor fixes

```bash
gaiacli query account <yourAddress> --chain-id cosmoshub-1
Expand All @@ -490,11 +484,7 @@ Then, copy `unsignedTx.json` and transfer it (e.g. via USB) to the offline compu
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 `chaind-id`, `sequence` and `account-number` obtained earlier:
>>>>>>> 6371dacb... docs offline procedure improvment + other minor fixes

```bash
gaiacli tx sign unsignedTx.json --from <delegatorKeyName> --offline --chain-id cosmoshub-1 --sequence <sequence> --account-number <account-number> > signedTx.json
Expand Down
4 changes: 2 additions & 2 deletions docs/gaia/gaiacli.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ txs by `gasPrice` in the mempool, so providing higher fees or gas prices may yie
e.g.

```bash
gaiacli tx send ... --fees=1000000uatom
gaiacli tx send ... --fees=50000uatom
```

or
Expand Down Expand Up @@ -575,7 +575,7 @@ gaiacli query gov proposer <proposal_id>

#### 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
gaiacli tx gov deposit <proposal_id> "10000000uatom" \
Expand Down
4 changes: 2 additions & 2 deletions docs/gaia/installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ Install `go` by following the [official docs](https://golang.org/doc/install). R
```bash
mkdir -p $HOME/go/bin
echo "export GOPATH=$HOME/go" >> ~/.bash_profile
echo "export GOBIN=\$GOPATH/bin" >> ~/.bash_profile
echo "export PATH=\$PATH:\$GOBIN" >> ~/.bash_profile
echo "export GOBIN=$GOPATH/bin" >> ~/.bash_profile
echo "export PATH=$PATH:$GOBIN" >> ~/.bash_profile
source ~/.bash_profile
```

Expand Down
4 changes: 2 additions & 2 deletions docs/gaia/join-mainnet.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Fetch the testnet's `genesis.json` file into `gaiad`'s config directory.

```bash
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.
Expand Down Expand Up @@ -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:

```
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.
Expand Down
7 changes: 3 additions & 4 deletions docs/gaia/validators/validator-setup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

::: warning
This section only concerns validators that want to be in the genesis
file of the Cosmos Hub mainnet. If the mainnet is already live, skip this section.
The genesis ceremony for the Cosmos Hub mainnet is closed. Please skip to the next section.
:::

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:

Expand Down Expand Up @@ -178,7 +177,7 @@ If you got jailed for downtime, you can get your voting power back to your valid
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.

Expand Down