Merge PR #1818: CLI keybase-sig -> identity

cosmos · Jul 25, 2018 · d6cd0d4 · d6cd0d4
1 parent 9d0f407
commit d6cd0d4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/PENDING.md b/PENDING.md
@@ -5,6 +5,9 @@ BREAKING CHANGES
 * [x/gov] CLI flag changed from `proposalID` to `proposal-id`
 * [x/stake] Fixed the period check for the inflation calculation
 * [x/stake] Inflation doesn't use rationals in calculation (performance boost)
+* [x/stake] CLI flags for identity changed from `--keybase-sig` to `--identity`, effects:
+  * `gaiacli stake create-validator`
+  * `gaiacli stake edit-validator`
 * [baseapp] NewBaseApp constructor now takes sdk.TxDecoder as argument instead of wire.Codec
 * [x/auth] Default TxDecoder can be found in `x/auth` rather than baseapp
 * \#1606 The following CLI commands have been switched to use `--from`
@@ -47,3 +50,4 @@ BUG FIXES
 *  \#1666 Add intra-tx counter to the genesis validators
 *  \#1797 Fix off-by-one error in slashing for downtime
 *  \#1787 Fixed bug where Tally fails due to revoked/unbonding validator
+*  \#1766 Fixes bad example for keybase identity
diff --git a/cmd/gaia/testnets/README.md b/cmd/gaia/testnets/README.md
@@ -237,14 +237,14 @@ gaiacli stake create-validator \
 
 You can edit your validator's public description. This info is to identify your validator, and will be relied on by delegators to decide which validators to stake to. Make sure to provide input for every flag below, otherwise the field will default to empty (`--moniker` defaults to the machine name).
 
-The `--keybase-sig` is a 16-digit string that is generated with a [keybase.io](https://keybase.io) account. It's a cryptographically secure method of verifying your identity across multiple online networks. The Keybase API allows us to retrieve your Keybase avatar. This is how you can add a logo to your validator profile.
+The `--identity` can be used as to verify identity with systems like Keybase or UPort. When using with Keybase `--identity` should be populated with a 16-digit string that is generated with a [keybase.io](https://keybase.io) account. It's a cryptographically secure method of verifying your identity across multiple online networks. The Keybase API allows us to retrieve your Keybase avatar. This is how you can add a logo to your validator profile.
 
 ```bash
 gaiacli stake edit-validator
   --address-validator=<account_cosmosaccaddr>
   --moniker="choose a moniker" \
   --website="https://cosmos.network" \
-  --keybase-sig="6A0D65E29A4CBC8E"
+  --identity=6A0D65E29A4CBC8E
   --details="To infinity and beyond!"
   --chain-id=gaia-7001 \
   --from=<key_name>

diff --git a/docs/validators/validator-setup.md b/docs/validators/validator-setup.md
@@ -38,14 +38,14 @@ gaiacli stake create-validator \
 
 You can edit your validator's public description. This info is to identify your validator, and will be relied on by delegators to decide which validators to stake to. Make sure to provide input for every flag below, otherwise the field will default to empty (`--moniker` defaults to the machine name).
 
-The `--keybase-sig` is a 16-digit string that is generated with a [keybase.io](https://keybase.io) account. It's a cryptographically secure method of verifying your identity across multiple online networks. The Keybase API allows us to retrieve your Keybase avatar. This is how you can add a logo to your validator profile.
+The `--identity` can be used as to verify identity with systems like Keybase or UPort. When using with Keybase `--identity` should be populated with a 16-digit string that is generated with a [keybase.io](https://keybase.io) account. It's a cryptographically secure method of verifying your identity across multiple online networks. The Keybase API allows us to retrieve your Keybase avatar. This is how you can add a logo to your validator profile.
 
 ```bash
 gaiacli stake edit-validator
   --address-validator=<account_cosmosaccaddr>
   --moniker="choose a moniker" \
   --website="https://cosmos.network" \
-  --keybase-sig="6A0D65E29A4CBC8E"
+  --identity=6A0D65E29A4CBC8E
   --details="To infinity and beyond!"
   --chain-id=gaia-6002 \
   --name=<key_name>

diff --git a/x/stake/client/cli/flags.go b/x/stake/client/cli/flags.go
@@ -16,7 +16,7 @@ const (
 	FlagSharesPercent       = "shares-percent"
 
 	FlagMoniker  = "moniker"
-	FlagIdentity = "keybase-sig"
+	FlagIdentity = "identity"
 	FlagWebsite  = "website"
 	FlagDetails  = "details"
 )
@@ -38,7 +38,7 @@ func init() {
 	fsShares.String(FlagSharesAmount, "", "Amount of source-shares to either unbond or redelegate as a positive integer or decimal")
 	fsShares.String(FlagSharesPercent, "", "Percent of source-shares to either unbond or redelegate as a positive integer or decimal >0 and <=1")
 	fsDescription.String(FlagMoniker, "[do-not-modify]", "validator name")
-	fsDescription.String(FlagIdentity, "[do-not-modify]", "optional keybase signature")
+	fsDescription.String(FlagIdentity, "[do-not-modify]", "optional identity signature (ex. UPort or Keybase)")
 	fsDescription.String(FlagWebsite, "[do-not-modify]", "optional website")
 	fsDescription.String(FlagDetails, "[do-not-modify]", "optional details")
 	fsValidator.String(FlagAddressValidator, "", "hex address of the validator")