ignite · ilgooz · Oct 12, 2021 · Sep 9, 2021 · Sep 10, 2021 · Sep 11, 2021
diff --git a/starport/chainconfig/config.go b/starport/chainconfig/config.go
@@ -81,6 +81,7 @@ type Account struct {
 	Coins    []string `yaml:"coins,omitempty"`
 	Mnemonic string   `yaml:"mnemonic,omitempty"`
 	Address  string   `yaml:"address,omitempty"`
+	CoinType string   `yaml:"cointype,omitempty"`
 
 	// The RPCAddress off the chain that account is issued at.
 	RPCAddress string `yaml:"rpc_address,omitempty"`

diff --git a/starport/chainconfig/config_test.go b/starport/chainconfig/config_test.go
@@ -20,6 +20,7 @@ validator:
 `
 
 	conf, err := Parse(strings.NewReader(confyml))
+
 	require.NoError(t, err)
 	require.Equal(t, []Account{
 		{
@@ -37,6 +38,43 @@ validator:
 	}, conf.Validator)
 }
 
+func TestCoinTypeParse(t *testing.T) {
+	confyml := `
+accounts:
+  - name: me
+    coins: ["1000token", "100000000stake"]
+    mnemonic: ozone unfold device pave lemon potato omit insect column wise cover hint narrow large provide kidney episode clay notable milk mention dizzy muffin crazy
+    cointype: 7777777
+  - name: you
+    coins: ["5000token"]
+    cointype: 123456
+validator:
+  name: user1
+  staked: "100000000stake"
+`
+
+	conf, err := Parse(strings.NewReader(confyml))
+
+	require.NoError(t, err)
+	require.Equal(t, []Account{
+		{
+			Name:     "me",
+			Coins:    []string{"1000token", "100000000stake"},
+			Mnemonic: "ozone unfold device pave lemon potato omit insect column wise cover hint narrow large provide kidney episode clay notable milk mention dizzy muffin crazy",
+			CoinType: "7777777",
+		},
+		{
+			Name:     "you",
+			Coins:    []string{"5000token"},
+			CoinType: "123456",
+		},
+	}, conf.Accounts)
+	require.Equal(t, Validator{
+		Name:   "user1",
+		Staked: "100000000stake",
+	}, conf.Validator)
+}
+
 func TestParseInvalid(t *testing.T) {
 	confyml := `
 accounts:

diff --git a/starport/pkg/chaincmd/chaincmd.go b/starport/pkg/chaincmd/chaincmd.go
@@ -38,6 +38,7 @@ const (
 	optionValidatorGasPrices               = "--gas-prices"
 	optionYes                              = "--yes"
 	optionHomeClient                       = "--home-client"
+	optionCoinType                         = "--coin-type"
 
 	constTendermint = "tendermint"
 	constJSON       = "json"
@@ -192,27 +193,33 @@ func (c ChainCmd) InitCommand(moniker string) step.Option {
 }
 
 // AddKeyCommand returns the command to add a new key in the chain keyring
-func (c ChainCmd) AddKeyCommand(accountName string) step.Option {
+func (c ChainCmd) AddKeyCommand(accountName string, coinType string) step.Option {
 	command := []string{
 		commandKeys,
 		"add",
 		accountName,
 		optionOutput,
 		constJSON,
 	}
+	if coinType != "" {
+		command = append(command, optionCoinType, coinType)
+	}
 	command = c.attachKeyringBackend(command)
 
 	return c.cliCommand(command)
 }
 
 // ImportKeyCommand returns the command to import a key into the chain keyring from a mnemonic
-func (c ChainCmd) ImportKeyCommand(accountName string) step.Option {
+func (c ChainCmd) ImportKeyCommand(accountName string, coinType string) step.Option {
 	command := []string{
 		commandKeys,
 		"add",
 		accountName,
 		optionRecover,
 	}
+	if coinType != "" {
+		command = append(command, optionCoinType, coinType)
+	}
 	command = c.attachKeyringBackend(command)
 
 	return c.cliCommand(command)

diff --git a/starport/pkg/chaincmd/runner/account.go b/starport/pkg/chaincmd/runner/account.go
@@ -23,7 +23,7 @@ var (
 // AddAccount creates a new account or imports an account when mnemonic is provided.
 // returns with an error if the operation went unsuccessful or an account with the provided name
 // already exists.
-func (r Runner) AddAccount(ctx context.Context, name, mnemonic string) (Account, error) {
+func (r Runner) AddAccount(ctx context.Context, name, mnemonic string, coinType string) (Account, error) {
 	b := newBuffer()
 
 	// check if account already exists.
@@ -65,7 +65,7 @@ func (r Runner) AddAccount(ctx context.Context, name, mnemonic string) (Account,
 		if err := r.run(
 			ctx,
 			runOptions{},
-			r.chainCmd.ImportKeyCommand(name),
+			r.chainCmd.ImportKeyCommand(name, coinType),
 			step.Write(input.Bytes()),
 		); err != nil {
 			return Account{}, err
@@ -75,7 +75,7 @@ func (r Runner) AddAccount(ctx context.Context, name, mnemonic string) (Account,
 			stdout: b,
 			stderr: b,
 			stdin:  os.Stdin,
-		}, r.chainCmd.AddKeyCommand(name)); err != nil {
+		}, r.chainCmd.AddKeyCommand(name, coinType)); err != nil {
 			return Account{}, err
 		}
 

diff --git a/starport/pkg/cosmosfaucet/cosmosfaucet.go b/starport/pkg/cosmosfaucet/cosmosfaucet.go
@@ -43,6 +43,9 @@ type Faucet struct {
 	// accountMnemonic is the mnemonic of the account.
 	accountMnemonic string
 
+	// coinType registered coin type number for HD derivation (BIP-0044).
+	coinType string
+
 	// coins keeps a list of coins that can be distributed by the faucet.
 	coins []coin
 
@@ -73,10 +76,11 @@ type Option func(*Faucet)
 
 // Account provides the account information to transfer tokens from.
 // when mnemonic isn't provided, account assumed to be exists in the keyring.
-func Account(name, mnemonic string) Option {
+func Account(name, mnemonic string, coinType string) Option {
 	return func(f *Faucet) {
 		f.accountName = name
 		f.accountMnemonic = mnemonic
+		f.coinType = coinType
 	}
 }
 
@@ -137,7 +141,7 @@ func New(ctx context.Context, ccr chaincmdrunner.Runner, options ...Option) (Fau
 
 	// import the account if mnemonic is provided.
 	if f.accountMnemonic != "" {
-		_, err := f.runner.AddAccount(ctx, f.accountName, f.accountMnemonic)
+		_, err := f.runner.AddAccount(ctx, f.accountName, f.accountMnemonic, f.coinType)
 		if err != nil && err != chaincmdrunner.ErrAccountAlreadyExists {
 			return Faucet{}, err
 		}

diff --git a/starport/services/chain/faucet.go b/starport/services/chain/faucet.go
@@ -62,7 +62,7 @@ func (c *Chain) Faucet(ctx context.Context) (cosmosfaucet.Faucet, error) {
 	}
 
 	faucetOptions := []cosmosfaucet.Option{
-		cosmosfaucet.Account(*conf.Faucet.Name, ""),
+		cosmosfaucet.Account(*conf.Faucet.Name, "", ""),
 		cosmosfaucet.ChainID(id),
 		cosmosfaucet.OpenAPI(xurl.HTTP(apiAddress)),
 	}

diff --git a/starport/services/chain/init.go b/starport/services/chain/init.go
@@ -137,7 +137,7 @@ func (c *Chain) InitAccounts(ctx context.Context, conf chainconfig.Config) error
 
 		// If the account doesn't provide an address, we create one
 		if accountAddress == "" {
-			generatedAccount, err = commands.AddAccount(ctx, account.Name, account.Mnemonic)
+			generatedAccount, err = commands.AddAccount(ctx, account.Name, account.Mnemonic, account.CoinType)
 			if err != nil {
 				return err
 			}
@@ -219,5 +219,6 @@ type Account struct {
 	Name     string
 	Address  string
 	Mnemonic string `json:"mnemonic"`
+	CoinType string
 	Coins    string
 }
diff --git a/starport/services/networkbuilder/blockchain.go b/starport/services/networkbuilder/blockchain.go
@@ -268,7 +268,7 @@ func (b *Blockchain) CreateAccount(ctx context.Context, account chain.Account) (
 		return chain.Account{}, err
 	}
 
-	acc, err := commands.AddAccount(ctx, account.Name, account.Mnemonic)
+	acc, err := commands.AddAccount(ctx, account.Name, account.Mnemonic, account.CoinType)
 	if err != nil {
 		return chain.Account{}, err
 	}