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

R4R: Gentx workflow for offline keys #3734

Merged
merged 2 commits into from
Feb 27, 2019
Merged

R4R: Gentx workflow for offline keys #3734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7b108d
fixed gentx workflow for offline keys
sunnya97 Feb 25, 2019
cb41a95
address @cwgoes comments
sunnya97 Feb 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions PENDING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ decoded automatically.
* [\#3670] CLI support for showing bech32 addresses in Ledger devices
* [\#3711] Update `tx sign` to use `--from` instead of the deprecated `--name`
CLI flag.
* [\#3730](https://github.com/cosmos/cosmos-sdk/issues/3730) Improve workflow for `gaiad gentx` with offline public keys, by outputting stdtx file that needs to be signed.

### Gaia

Expand Down
13 changes: 13 additions & 0 deletions cmd/gaia/init/gentx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/cosmos/cosmos-sdk/client/utils"
"github.com/cosmos/cosmos-sdk/cmd/gaia/app"
"github.com/cosmos/cosmos-sdk/codec"
kbkeys "github.com/cosmos/cosmos-sdk/crypto/keys"
"github.com/cosmos/cosmos-sdk/server"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth"
Expand Down Expand Up @@ -129,9 +130,20 @@ following delegation and commission default parameters:
return err
}

info, err := txBldr.Keybase().Get(name)
if err != nil {
return err
}

if info.GetType() == kbkeys.TypeOffline {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With #3748, multisig will have their own dedicated Info type (TypeMulti). Will we have to check both here?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we wait to merge this then? Or rebase it on your branch?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I say we merge this and then I can rebase/update.

fmt.Println("Offline key passed in. Use `gaiacli tx sign` command to sign:")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
fmt.Println("Offline key passed in. Use `gaiacli tx sign` command to sign:")
fmt.Println("Offline key passed in. Use `gaiacli tx sign` command to sign:")

return utils.PrintUnsignedStdTx(txBldr, cliCtx, []sdk.Msg{msg}, true)
}

// write the unsigned transaction to the buffer
w := bytes.NewBuffer([]byte{})
cliCtx = cliCtx.WithOutput(w)

if err = utils.PrintUnsignedStdTx(txBldr, cliCtx, []sdk.Msg{msg}, true); err != nil {
return err
}
Expand Down Expand Up @@ -163,6 +175,7 @@ following delegation and commission default parameters:

fmt.Fprintf(os.Stderr, "Genesis transaction written to %q\n", outputDocument)
return nil

},
}

Expand Down