feat: wire custom coin type and get bech32 prefix (backport #4569) (#4572)

* feat: wire custom coin type and get bech32 prefix (#4569)

(cherry picked from commit 2b45eaa)

# Conflicts:
#	go.mod
#	ignite/cmd/scaffold_chain.go
#	ignite/cmd/testnet_inplace.go
#	ignite/pkg/cosmosaccount/cosmosaccount.go
#	ignite/services/chain/chain.go
#	ignite/services/scaffolder/init.go
#	ignite/templates/app/app.go
#	integration/app/cmd_app_test.go

* conflicts

* updates

* consumer

---------

Co-authored-by: julienrbrt <[email protected]>

Author: mergify[bot]

changelog.md

@@ -2,9 +2,12 @@
 
 ## Unreleased
 
+## [`v28.8.2`](https://github.com/ignite/cli/releases/tag/v28.8.2)
+
 ### Changes
 
 - [#4568](https://github.com/ignite/cli/pull/4568) Bump Cosmos SDK to v0.50.13.
+- [#4569](https://github.com/ignite/cli/pull/4569) Add flags to set coin type on commands. Add getters for bech32 prefix and coin type.
 
 ## [`v28.8.1`](https://github.com/ignite/cli/releases/tag/v28.8.1)
 

go.mod

@@ -13,7 +13,8 @@ replace (
 )
 
 require (
-	cosmossdk.io/math v1.4.0
+	cosmossdk.io/core v0.11.2
+	cosmossdk.io/math v1.5.0
 	github.com/99designs/keyring v1.2.2
 	github.com/AlecAivazis/survey/v2 v2.3.7
 	github.com/DATA-DOG/go-sqlmock v1.5.2
@@ -97,13 +98,12 @@ require (
 	connectrpc.com/otelconnect v0.7.0 // indirect
 	cosmossdk.io/api v0.7.6 // indirect
 	cosmossdk.io/collections v0.4.0 // indirect
-	cosmossdk.io/core v0.11.1 // indirect
 	cosmossdk.io/depinject v1.1.0 // indirect
 	cosmossdk.io/errors v1.0.1 // indirect
 	cosmossdk.io/log v1.4.1 // indirect
 	cosmossdk.io/store v1.1.1 // indirect
 	cosmossdk.io/x/tx v0.13.7 // indirect
-	dario.cat/mergo v1.0.0 // indirect
+	dario.cat/mergo v1.0.1 // indirect
 	filippo.io/edwards25519 v1.0.0 // indirect
 	github.com/4meepo/tagalign v1.3.4 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
@@ -163,6 +163,7 @@ require (
 	github.com/cilium/ebpf v0.11.0 // indirect
 	github.com/ckaznocha/intrange v0.1.2 // indirect
 	github.com/cloudflare/circl v1.3.7 // indirect
+	github.com/cockroachdb/apd/v3 v3.2.1 // indirect
 	github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect
 	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
 	github.com/cockroachdb/pebble v1.1.2 // indirect

go.sum

@@ -28,22 +28,22 @@ cosmossdk.io/api v0.7.6 h1:PC20PcXy1xYKH2KU4RMurVoFjjKkCgYRbVAD4PdqUuY=
 cosmossdk.io/api v0.7.6/go.mod h1:IcxpYS5fMemZGqyYtErK7OqvdM0C8kdW3dq8Q/XIG38=
 cosmossdk.io/collections v0.4.0 h1:PFmwj2W8szgpD5nOd8GWH6AbYNi1f2J6akWXJ7P5t9s=
 cosmossdk.io/collections v0.4.0/go.mod h1:oa5lUING2dP+gdDquow+QjlF45eL1t4TJDypgGd+tv0=
-cosmossdk.io/core v0.11.1 h1:h9WfBey7NAiFfIcUhDVNS503I2P2HdZLebJlUIs8LPA=
-cosmossdk.io/core v0.11.1/go.mod h1:OJzxcdC+RPrgGF8NJZR2uoQr56tc7gfBKhiKeDO7hH0=
+cosmossdk.io/core v0.11.2 h1:20PXbQxhWRKA83pSYW76OXrc1MI2E93flbMAGSVFlyc=
+cosmossdk.io/core v0.11.2/go.mod h1:q137AJUo+/BFZ0hTTgx+7enPAar5c3Nr0h042BgcZMY=
 cosmossdk.io/depinject v1.1.0 h1:wLan7LG35VM7Yo6ov0jId3RHWCGRhe8E8bsuARorl5E=
 cosmossdk.io/depinject v1.1.0/go.mod h1:kkI5H9jCGHeKeYWXTqYdruogYrEeWvBQCw1Pj4/eCFI=
 cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0=
 cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U=
 cosmossdk.io/log v1.4.1 h1:wKdjfDRbDyZRuWa8M+9nuvpVYxrEOwbD/CA8hvhU8QM=
 cosmossdk.io/log v1.4.1/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU=
-cosmossdk.io/math v1.4.0 h1:XbgExXFnXmF/CccPPEto40gOO7FpWu9yWNAZPN3nkNQ=
-cosmossdk.io/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk=
+cosmossdk.io/math v1.5.0 h1:sbOASxee9Zxdjd6OkzogvBZ25/hP929vdcYcBJQbkLc=
+cosmossdk.io/math v1.5.0/go.mod h1:AAwwBmUhqtk2nlku174JwSll+/DepUXW3rWIXN5q+Nw=
 cosmossdk.io/store v1.1.1 h1:NA3PioJtWDVU7cHHeyvdva5J/ggyLDkyH0hGHl2804Y=
 cosmossdk.io/store v1.1.1/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM=
 cosmossdk.io/x/tx v0.13.7 h1:8WSk6B/OHJLYjiZeMKhq7DK7lHDMyK0UfDbBMxVmeOI=
 cosmossdk.io/x/tx v0.13.7/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w=
-dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
-dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
+dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
 filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
@@ -267,6 +267,8 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cockroachdb/apd/v3 v3.2.1 h1:U+8j7t0axsIgvQUqthuNm82HIrYXodOV2iWLWtEaIwg=
+github.com/cockroachdb/apd/v3 v3.2.1/go.mod h1:klXJcjp+FffLTHlhIG69tezTDvdP065naDsHzKhYSqc=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4=
 github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=

ignite/cmd/account.go

@@ -13,6 +13,7 @@ import (
 
 const (
 	flagAddressPrefix  = "address-prefix"
+	flagCoinType       = "coin-type"
 	flagPassphrase     = "passphrase"
 	flagNonInteractive = "non-interactive"
 	flagKeyringBackend = "keyring-backend"
@@ -102,6 +103,17 @@ func getAddressPrefix(cmd *cobra.Command) string {
 	return prefix
 }
 
+func flagSetCoinType() *flag.FlagSet {
+	fs := flag.NewFlagSet("", flag.ContinueOnError)
+	fs.Uint32(flagCoinType, cosmosaccount.CoinTypeCosmos, "coin type to use for the account")
+	return fs
+}
+
+func getCoinType(cmd *cobra.Command) uint32 {
+	coinType, _ := cmd.Flags().GetUint32(flagCoinType)
+	return coinType
+}
+
 func flagSetAccountImport() *flag.FlagSet {
 	fs := flag.NewFlagSet("", flag.ContinueOnError)
 	fs.Bool(flagNonInteractive, false, "do not enter into interactive mode")

ignite/cmd/account_create.go

@@ -15,6 +15,8 @@ func NewAccountCreate() *cobra.Command {
 		RunE:  accountCreateHandler,
 	}
 
+	c.Flags().AddFlagSet(flagSetCoinType())
+
 	return c
 }
 
@@ -24,6 +26,7 @@ func accountCreateHandler(cmd *cobra.Command, args []string) error {
 	ca, err := cosmosaccount.New(
 		cosmosaccount.WithKeyringBackend(getKeyringBackend(cmd)),
 		cosmosaccount.WithHome(getKeyringDir(cmd)),
+		cosmosaccount.WithCoinType(getCoinType(cmd)),
 	)
 	if err != nil {
 		return errors.Errorf("unable to create registry: %w", err)

ignite/cmd/account_import.go

@@ -23,6 +23,7 @@ func NewAccountImport() *cobra.Command {
 
 	c.Flags().String(flagSecret, "", "Your mnemonic or path to your private key (use interactive mode instead to securely pass your mnemonic)")
 	c.Flags().AddFlagSet(flagSetAccountImport())
+	c.Flags().AddFlagSet(flagSetCoinType())
 
 	return c
 }
@@ -61,6 +62,7 @@ func accountImportHandler(cmd *cobra.Command, args []string) error {
 	ca, err := cosmosaccount.New(
 		cosmosaccount.WithKeyringBackend(getKeyringBackend(cmd)),
 		cosmosaccount.WithHome(getKeyringDir(cmd)),
+		cosmosaccount.WithCoinType(getCoinType(cmd)),
 	)
 	if err != nil {
 		return err

ignite/cmd/account_list.go

@@ -22,6 +22,7 @@ func accountListHandler(cmd *cobra.Command, _ []string) error {
 	ca, err := cosmosaccount.New(
 		cosmosaccount.WithKeyringBackend(getKeyringBackend(cmd)),
 		cosmosaccount.WithHome(getKeyringDir(cmd)),
+		cosmosaccount.WithBech32Prefix(getAddressPrefix(cmd)),
 	)
 	if err != nil {
 		return err

ignite/cmd/account_show.go

@@ -25,6 +25,7 @@ func accountShowHandler(cmd *cobra.Command, args []string) error {
 	ca, err := cosmosaccount.New(
 		cosmosaccount.WithKeyringBackend(getKeyringBackend(cmd)),
 		cosmosaccount.WithHome(getKeyringDir(cmd)),
+		cosmosaccount.WithBech32Prefix(getAddressPrefix(cmd)),
 	)
 	if err != nil {
 		return err

ignite/cmd/scaffold_chain.go

@@ -79,6 +79,7 @@ about Cosmos SDK on https://docs.cosmos.network
 
 	flagSetClearCache(c)
 	c.Flags().AddFlagSet(flagSetAccountPrefixes())
+	c.Flags().AddFlagSet(flagSetCoinType())
 	c.Flags().StringP(flagPath, "p", "", "create a project in a specific path")
 	c.Flags().Bool(flagNoDefaultModule, false, "create a project without a default module")
 	c.Flags().StringSlice(flagParams, []string{}, "add default module parameters")
@@ -99,6 +100,7 @@ func scaffoldChainHandler(cmd *cobra.Command, args []string) error {
 	var (
 		name               = args[0]
 		addressPrefix      = getAddressPrefix(cmd)
+		coinType           = getCoinType(cmd)
 		appPath            = flagGetPath(cmd)
 		noDefaultModule, _ = cmd.Flags().GetBool(flagNoDefaultModule)
 		skipGit, _         = cmd.Flags().GetBool(flagSkipGit)
@@ -124,6 +126,7 @@ func scaffoldChainHandler(cmd *cobra.Command, args []string) error {
 		appPath,
 		name,
 		addressPrefix,
+		coinType,
 		noDefaultModule,
 		skipGit,
 		skipProto,

ignite/cmd/scaffold_chain_registry.go

@@ -55,7 +55,7 @@ func scaffoldChainRegistryFiles(cmd *cobra.Command, _ []string) error {
 		return err
 	}
 
-	if err = sc.AddChainRegistryFiles(c, cfg); err != nil {
+	if err = sc.CreateChainRegistryFiles(c, cfg); err != nil {
 		return err
 	}
 

ignite/cmd/testnet_inplace.go

@@ -29,6 +29,8 @@ We can create a testnet from the local network state and mint additional coins f
 	c.Flags().AddFlagSet(flagSetCheckDependencies())
 	c.Flags().AddFlagSet(flagSetSkipProto())
 	c.Flags().AddFlagSet(flagSetVerbose())
+	c.Flags().AddFlagSet(flagSetAccountPrefixes())
+	c.Flags().AddFlagSet(flagSetCoinType())
 
 	c.Flags().Bool(flagQuitOnFail, false, "quit program if the app fails to start")
 	return c
@@ -70,17 +72,25 @@ func testnetInplace(cmd *cobra.Command, session *cliui.Session) error {
 	if err != nil {
 		return err
 	}
+
 	home, err := c.Home()
 	if err != nil {
 		return err
 	}
+
 	keyringBackend, err := c.KeyringBackend()
 	if err != nil {
 		return err
 	}
+
+	prefix := getAddressPrefix(cmd)
+	coinType := getCoinType(cmd)
+
 	ca, err := cosmosaccount.New(
 		cosmosaccount.WithKeyringBackend(cosmosaccount.KeyringBackend(keyringBackend)),
 		cosmosaccount.WithHome(home),
+		cosmosaccount.WithBech32Prefix(prefix),
+		cosmosaccount.WithCoinType(coinType),
 	)
 	if err != nil {
 		return err
@@ -91,6 +101,7 @@ func testnetInplace(cmd *cobra.Command, session *cliui.Session) error {
 		accounts        string
 		accErr          *cosmosaccount.AccountDoesNotExistError
 	)
+
 	for _, acc := range cfg.Accounts {
 		sdkAcc, err := ca.GetByName(acc.Name)
 		if errors.As(err, &accErr) {
@@ -127,5 +138,6 @@ func testnetInplace(cmd *cobra.Command, session *cliui.Session) error {
 		NewOperatorAddress: operatorAddress.String(),
 		AccountsToFund:     accounts,
 	}
+
 	return c.TestnetInPlace(cmd.Context(), args)
 }

ignite/pkg/chainregistry/chain.go

@@ -19,7 +19,7 @@ type Chain struct {
 	DaemonName   string      `json:"daemon_name"`
 	NodeHome     string      `json:"node_home"`
 	KeyAlgos     []KeyAlgos  `json:"key_algos"`
-	Slip44       int         `json:"slip44"`
+	Slip44       uint32      `json:"slip44"`
 	Fees         Fees        `json:"fees"`
 	Staking      Staking     `json:"staking"`
 	Codebase     Codebase    `json:"codebase"`

ignite/pkg/cosmosaccount/cosmosaccount.go

@@ -6,14 +6,16 @@ import (
 	"fmt"
 	"os"
 
+	addresscodec "cosmossdk.io/core/address"
 	dkeyring "github.com/99designs/keyring"
+
 	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/cosmos-sdk/codec/address"
 	"github.com/cosmos/cosmos-sdk/codec/types"
 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
 	"github.com/cosmos/cosmos-sdk/crypto/hd"
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	sdktypes "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/bech32"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/go-bip39"
 
@@ -22,7 +24,7 @@ import (
 
 const (
 	// KeyringServiceName used for the name of keyring in OS backend.
-	KeyringServiceName = "starport"
+	KeyringServiceName = "ignite"
 
 	// DefaultAccount is the name of the default account.
 	DefaultAccount = "default"
@@ -34,6 +36,7 @@ var KeyringHome = os.ExpandEnv("$HOME/.ignite/accounts")
 var ErrAccountExists = errors.New("account already exists")
 
 const (
+	CoinTypeCosmos      = sdktypes.CoinType
 	AccountPrefixCosmos = "cosmos"
 )
 
@@ -58,6 +61,8 @@ type Registry struct {
 	homePath           string
 	keyringServiceName string
 	keyringBackend     KeyringBackend
+	addressCodec       addresscodec.Codec
+	coinType           uint32
 
 	Keyring keyring.Keyring
 }
@@ -83,12 +88,26 @@ func WithKeyringBackend(backend KeyringBackend) Option {
 	}
 }
 
+func WithBech32Prefix(prefix string) Option {
+	return func(c *Registry) {
+		c.addressCodec = address.NewBech32Codec(prefix)
+	}
+}
+
+func WithCoinType(coinType uint32) Option {
+	return func(c *Registry) {
+		c.coinType = coinType
+	}
+}
+
 // New creates a new registry to manage accounts.
 func New(options ...Option) (Registry, error) {
 	r := Registry{
 		keyringServiceName: sdktypes.KeyringServiceName(),
 		keyringBackend:     KeyringTest,
 		homePath:           KeyringHome,
+		addressCodec:       address.NewBech32Codec(AccountPrefixCosmos),
+		coinType:           CoinTypeCosmos,
 	}
 
 	for _, apply := range options {
@@ -145,7 +164,13 @@ func (a Account) Address(accPrefix string) (string, error) {
 		return "", err
 	}
 
-	return toBech32(accPrefix, pk.Address())
+	addressCodec := address.NewBech32Codec(accPrefix)
+	addr, err := addressCodec.BytesToString(pk.Address())
+	if err != nil {
+		return "", err
+	}
+
+	return addr, nil
 }
 
 // PubKey returns a public key for account.
@@ -158,14 +183,6 @@ func (a Account) PubKey() (string, error) {
 	return pk.String(), nil
 }
 
-func toBech32(prefix string, addr []byte) (string, error) {
-	bech32Addr, err := bech32.ConvertAndEncode(prefix, addr)
-	if err != nil {
-		return "", err
-	}
-	return bech32Addr, nil
-}
-
 // EnsureDefaultAccount ensures that default account exists.
 func (r Registry) EnsureDefaultAccount() error {
 	_, err := r.GetByName(DefaultAccount)
@@ -288,11 +305,11 @@ func (r Registry) GetByName(name string) (Account, error) {
 
 // GetByAddress returns an account by its address.
 func (r Registry) GetByAddress(address string) (Account, error) {
-	sdkAddr, err := sdktypes.AccAddressFromBech32(address)
+	sdkAddr, err := r.addressCodec.StringToBytes(address)
 	if err != nil {
 		return Account{}, err
 	}
-	record, err := r.Keyring.KeyByAddress(sdkAddr)
+	record, err := r.Keyring.KeyByAddress(sdktypes.AccAddress(sdkAddr))
 	if errors.Is(err, dkeyring.ErrKeyNotFound) || errors.Is(err, sdkerrors.ErrKeyNotFound) {
 		return Account{}, &AccountDoesNotExistError{address}
 	}
@@ -334,7 +351,7 @@ func (r Registry) DeleteByName(name string) error {
 }
 
 func (r Registry) hdPath() string {
-	return hd.CreateHDPath(sdktypes.GetConfig().GetCoinType(), 0, 0).String()
+	return hd.CreateHDPath(r.coinType, 0, 0).String()
 }
 
 func (r Registry) algo() (keyring.SignatureAlgo, error) {

ignite/pkg/cosmosclient/bank.go

@@ -26,7 +26,7 @@ func (c Client) BankBalances(ctx context.Context, address string, pagination *qu
 }
 
 func (c Client) BankSendTx(ctx context.Context, fromAccount cosmosaccount.Account, toAddress string, amount sdk.Coins) (TxService, error) {
-	addr, err := fromAccount.Address(c.addressPrefix)
+	addr, err := fromAccount.Address(c.bech32Prefix)
 	if err != nil {
 		return TxService{}, err
 	}