From c08cd9cdb4c12a15784250268c97ffffa19d4024 Mon Sep 17 00:00:00 2001 From: Frank Yang Date: Wed, 13 Mar 2019 21:19:29 +0800 Subject: [PATCH 1/5] Fix #3833, modify stake(steak) to uatom. --- client/flags.go | 4 +-- cmd/gaia/cli_test/README.md | 2 +- cmd/gaia/init/testnet.go | 2 +- docs/gaia/deploy-testnet.md | 2 +- docs/spec/auth/01_concepts.md | 2 +- .../cn/gaia/delegator-guide-cli.md | 14 ++++---- .../kr/gaia/delegator-guide-cli.md | 10 +++--- docs/translations/kr/gaia/deploy-testnet.md | 2 +- docs/translations/kr/gaia/gaiacli.md | 10 +++--- docs/translations/kr/gaia/ledger.md | 2 +- .../kr/gaia/validators/validator-setup.md | 2 +- server/config/config.go | 2 +- server/config/toml.go | 2 +- server/start.go | 2 +- types/dec_coin_test.go | 34 +++++++++---------- types/rest/rest_test.go | 4 +-- x/auth/ante_test.go | 2 +- x/gov/client/cli/tx.go | 2 +- x/staking/client/cli/tx.go | 2 +- 19 files changed, 51 insertions(+), 51 deletions(-) diff --git a/client/flags.go b/client/flags.go index 62d912908ea1..f60b6d4901ae 100644 --- a/client/flags.go +++ b/client/flags.go @@ -80,8 +80,8 @@ func PostCommands(cmds ...*cobra.Command) []*cobra.Command { c.Flags().Uint64(FlagAccountNumber, 0, "AccountNumber number to sign the tx") c.Flags().Uint64(FlagSequence, 0, "Sequence number to sign the tx") c.Flags().String(FlagMemo, "", "Memo to send along with transaction") - c.Flags().String(FlagFees, "", "Fees to pay along with transaction; eg: 10stake,1atom") - c.Flags().String(FlagGasPrices, "", "Gas prices to determine the transaction fee (e.g. 0.00001stake)") + c.Flags().String(FlagFees, "", "Fees to pay along with transaction; eg: 10uatom,1atom") + c.Flags().String(FlagGasPrices, "", "Gas prices to determine the transaction fee (e.g. 0.00001uatom)") c.Flags().String(FlagNode, "tcp://localhost:26657", ": to tendermint rpc interface for this chain") c.Flags().Bool(FlagUseLedger, false, "Use a connected Ledger device") c.Flags().Float64(FlagGasAdjustment, DefaultGasAdjustment, "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored ") diff --git a/cmd/gaia/cli_test/README.md b/cmd/gaia/cli_test/README.md index 37fd41ce7eff..7c8df6913a04 100644 --- a/cmd/gaia/cli_test/README.md +++ b/cmd/gaia/cli_test/README.md @@ -36,7 +36,7 @@ This boilerplate above: - Ensures the tests run in parallel. Because the tests are calling out to `os/exec` for many operations these tests can take a long time to run. - Creates `.gaiad` and `.gaiacli` folders in a new temp folder. - Uses `gaiacli` to create 2 accounts for use in testing: `foo` and `bar` -- Creates a genesis file with coins (`1000footoken,1000feetoken,150stake`) controlled by the `foo` key +- Creates a genesis file with coins (`1000footoken,1000feetoken,150uatom`) controlled by the `foo` key - Generates an initial bonding transaction (`gentx`) to make the `foo` key a validator at genesis - Starts `gaiad` and stops it once the test exits - Cleans up test state on a successful run diff --git a/cmd/gaia/init/testnet.go b/cmd/gaia/init/testnet.go index fc59827a6cd6..5c817fef0662 100644 --- a/cmd/gaia/init/testnet.go +++ b/cmd/gaia/init/testnet.go @@ -85,7 +85,7 @@ Example: ) cmd.Flags().String( server.FlagMinGasPrices, fmt.Sprintf("0.000006%s", sdk.DefaultBondDenom), - "Minimum gas prices to accept for transactions; All fees in a tx must meet this minimum (e.g. 0.01photino,0.001stake)", + "Minimum gas prices to accept for transactions; All fees in a tx must meet this minimum (e.g. 0.01photino,0.001uatom)", ) return cmd diff --git a/docs/gaia/deploy-testnet.md b/docs/gaia/deploy-testnet.md index 2aa2f692e452..b51168bfd726 100644 --- a/docs/gaia/deploy-testnet.md +++ b/docs/gaia/deploy-testnet.md @@ -44,7 +44,7 @@ gaiacli keys add validator # Add that key into the genesis.app_state.accounts array in the genesis file # NOTE: this command lets you set the number of coins. Make sure this account has some coins # with the genesis.app_state.staking.params.bond_denom denom, the default is staking -gaiad add-genesis-account $(gaiacli keys show validator -a) 1000000000stake,1000000000validatortoken +gaiad add-genesis-account $(gaiacli keys show validator -a) 1000000000uatom,1000000000validatortoken # Generate the transaction that creates your validator gaiad gentx --name validator diff --git a/docs/spec/auth/01_concepts.md b/docs/spec/auth/01_concepts.md index 388c5a8ac81e..cf9251f0bb88 100644 --- a/docs/spec/auth/01_concepts.md +++ b/docs/spec/auth/01_concepts.md @@ -15,7 +15,7 @@ signature verification, as well as costs proportional to the tx size. Operators should set minimum gas prices when starting their nodes. They must set the unit costs of gas in each token denomination they wish to support: -`gaiad start ... --minimum-gas-prices=0.00001steak;0.05photinos` +`gaiad start ... --minimum-gas-prices=0.00001uatom;0.05photinos` When adding transactions to mempool or gossipping transactions, validators check if the transaction's gas prices, which are determined by the provided fees, meet diff --git a/docs/translations/cn/gaia/delegator-guide-cli.md b/docs/translations/cn/gaia/delegator-guide-cli.md index 5d34db0d4636..e2481a654a78 100644 --- a/docs/translations/cn/gaia/delegator-guide-cli.md +++ b/docs/translations/cn/gaia/delegator-guide-cli.md @@ -399,20 +399,20 @@ fees = gas * gasPrices ```bash // 向指定验证人绑定一定数量的Atom通证 -// 参数设定样例: =cosmosvaloper18thamkhnj9wz8pa4nhnp9rldprgant57pk2m8s, =10000stake, =0.001stake +// 参数设定样例: =cosmosvaloper18thamkhnj9wz8pa4nhnp9rldprgant57pk2m8s, =10000uatom, =0.001uatom gaiacli tx staking delegate --from --gas auto --gas-prices // 提取所有的奖励 -// 参数设定样例: =0.001stake +// 参数设定样例: =0.001uatom gaiacli tx distr withdraw-all-rewards --from --gas auto --gas-prices // 向指定验证人申请解绑一定数量的Atom通证 // 解绑的通证需要3周后才能完全解绑并可以交易， -// 参数设定样例: =cosmosvaloper18thamkhnj9wz8pa4nhnp9rldprgant57pk2m8s, =10000stake, =0.001stake +// 参数设定样例: =cosmosvaloper18thamkhnj9wz8pa4nhnp9rldprgant57pk2m8s, =10000uatom, =0.001uatom gaiacli tx staking unbond --from --gas auto --gas-prices ``` @@ -469,14 +469,14 @@ Cosmos Hub有一个内建的治理系统，该系统允许抵押通证的持有 ```bash // 提交一个提案 // =text/parameter_change/software_upgrade -// ex value for flag: =0.0001stake +// ex value for flag: =0.0001uatom -gaiacli tx gov submit-proposal --title "Test Proposal" --description "My awesome proposal" --type --deposit=10stake --gas auto --gas-prices --from +gaiacli tx gov submit-proposal --title "Test Proposal" --description "My awesome proposal" --type --deposit=10uatom --gas auto --gas-prices --from // 增加对提案的抵押 // Retrieve proposalID from $gaiacli query gov proposals --status deposit_period // 通过 $gaiacli query gov proposals --status deposit_period 命令获得 `proposalID` -// 参数设定样例: =1stake +// 参数设定样例: =1uatom gaiacli tx gov deposit --gas auto --gas-prices --from @@ -495,7 +495,7 @@ gaiacli tx gov vote