8000 fix(services/chain): detecting keyring by ilgooz · Pull Request #1449 · ignite/cli · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix(services/chain): detecting keyring #1449

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

Merged
merged 5 commits into from
Aug 12, 2021
Merged

fix(services/chain): detecting keyring #1449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
543a8cb
fix(services/chain): detecting keyring
ilgooz Aug 10, 2021
d708fb3
fix
ilgooz Aug 11, 2021
20d23dc
fix
ilgooz Aug 11, 2021
9eecc60
default to test kb
ilgooz Aug 12, 2021
7fd58e3
fix
ilgooz Aug 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
8000
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions starport/cmd/chain_serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package starportcmd

import (
"github.com/spf13/cobra"
"github.com/tendermint/starport/starport/pkg/chaincmd"
"github.com/tendermint/starport/starport/services/chain"
)

Expand Down Expand Up @@ -40,7 +39,6 @@ func chainServeHandler(cmd *cobra.Command, args []string) error {

chainOption := []chain.Option{
chain.LogLevel(logLevel(cmd)),
chain.KeyringBackend(chaincmd.KeyringBackendTest),
}

if isRebuildProtoOnce {
Expand Down
70 changes: 53 additions & 17 deletions starport/services/chain/chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
sperrors "github.com/tendermint/starport/starport/errors"
"github.com/tendermint/starport/starport/pkg/chaincmd"
chaincmdrunner "github.com/tendermint/starport/starport/pkg/chaincmd/runner"
"github.com/tendermint/starport/starport/pkg/confile"
"github.com/tendermint/starport/starport/pkg/cosmosver"
"github.com/tendermint/starport/starport/pkg/xurl"
)
Expand Down Expand Up @@ -335,6 +336,52 @@ func (c *Chain) ClientTOMLPath() (string, error) {
return filepath.Join(home, "config/client.toml"), nil
}

// KeyringBackend returns the keyring backend chosen for the chain.
func (c *Chain) KeyringBackend() (chaincmd.KeyringBackend, error) {
// 1st.
if c.options.keyringBackend != "" {
return c.options.keyringBackend, nil
}

config, err := c.Config()
if err != nil {
return "", err
}

// 2nd.
if config.Init.KeyringBackend != "" {
return chaincmd.KeyringBackendFromString(config.Init.KeyringBackend)
}

// 3rd.
if config.Init.Client != nil {
if backend, ok := config.Init.Client["keyring-backend"]; ok {
if backendStr, ok := backend.(string); ok {
return chaincmd.KeyringBackendFromString(backendStr)
}
}
}

// 4th.
configTOMLPath, err := c.ClientTOMLPath()
if err != nil {
return "", err
}
cf := confile.New(confile.DefaultTOMLEncodingCreator, configTOMLPath)
var conf struct {
KeyringBackend string `toml:"keyring-backend"`
}
if err := cf.Load(&conf); err != nil {
return "", err
}
if conf.KeyringBackend != "" {
return chaincmd.KeyringBackendFromString(conf.KeyringBackend)
}

// 5th.
return chaincmd.KeyringBackendTest, nil
}

// Commands returns the runner execute commands on the chain's binary
func (c *Chain) Commands(ctx context.Context) (chaincmdrunner.Runner, error) {
id, err := c.ID()
Expand All @@ -352,6 +399,11 @@ func (c *Chain) Commands(ctx context.Context) (chaincmdrunner.Runner, error) {
return chaincmdrunner.Runner{}, err
}

backend, err := c.KeyringBackend()
if err != nil {
return chaincmdrunner.Runner{}, err
}

config, err := c.Config()
if err != nil {
return chaincmdrunner.Runner{}, err
Expand All @@ -362,23 +414,7 @@ func (c *Chain) Commands(ctx context.Context) (chaincmdrunner.Runner, error) {
chaincmd.WithHome(home),
chaincmd.WithVersion(c.Version),
chaincmd.WithNodeAddress(xurl.TCP(config.Host.RPC)),
}

// use keyring backend if specified
if c.options.keyringBackend != chaincmd.KeyringBackendUnspecified {
chainCommandOptions = append(chainCommandOptions, chaincmd.WithKeyringBackend(c.options.keyringBackend))
} else {
// check if keyring backend is specified in config
if config.Init.KeyringBackend != "" {
configKeyringBackend, err := chaincmd.KeyringBackendFromString(config.Init.KeyringBackend)
if err != nil {
return chaincmdrunner.Runner{}, err
}
chainCommandOptions = append(chainCommandOptions, chaincmd.WithKeyringBackend(configKeyringBackend))
} else {
// default keyring backend used is OS
chainCommandOptions = append(chainCommandOptions, chaincmd.WithKeyringBackend(chaincmd.KeyringBackendOS))
}
chaincmd.WithKeyringBackend(backend),
}

cc := chaincmd.New(binary, chainCommandOptions...)
Expand Down
0