This commit is contained in:
parent
c1c1ad7425
commit
90ffbce410
|
@ -12,16 +12,28 @@ import (
|
|||
// phrase to recover the private key.
|
||||
func GenerateCoinKey(algo keyring.SignatureAlgo) (sdk.AccAddress, string, error) {
|
||||
// generate a private key, with recovery phrase
|
||||
info, secret, err := keyring.NewInMemory().NewMnemonic("name", keyring.English, sdk.GetConfig().GetFullBIP44Path(), keyring.DefaultBIP39Passphrase, algo)
|
||||
info, secret, err := keyring.NewInMemory().NewMnemonic(
|
||||
"name",
|
||||
keyring.English,
|
||||
sdk.GetConfig().GetFullBIP44Path(),
|
||||
keyring.DefaultBIP39Passphrase,
|
||||
algo,
|
||||
)
|
||||
if err != nil {
|
||||
return sdk.AccAddress([]byte{}), "", err
|
||||
return sdk.AccAddress{}, "", err
|
||||
}
|
||||
|
||||
return sdk.AccAddress(info.GetPubKey().Address()), secret, nil
|
||||
}
|
||||
|
||||
// GenerateSaveCoinKey returns the address of a public key, along with the secret
|
||||
// phrase to recover the private key.
|
||||
func GenerateSaveCoinKey(keybase keyring.Keyring, keyName string, overwrite bool, algo keyring.SignatureAlgo) (sdk.AccAddress, string, error) {
|
||||
func GenerateSaveCoinKey(
|
||||
keybase keyring.Keyring,
|
||||
keyName, mnemonic string,
|
||||
overwrite bool,
|
||||
algo keyring.SignatureAlgo,
|
||||
) (sdk.AccAddress, string, error) {
|
||||
exists := false
|
||||
_, err := keybase.Key(keyName)
|
||||
if err == nil {
|
||||
|
@ -30,22 +42,41 @@ func GenerateSaveCoinKey(keybase keyring.Keyring, keyName string, overwrite bool
|
|||
|
||||
// ensure no overwrite
|
||||
if !overwrite && exists {
|
||||
return sdk.AccAddress([]byte{}), "", fmt.Errorf(
|
||||
"key already exists, overwrite is disabled")
|
||||
return sdk.AccAddress{}, "", fmt.Errorf("key already exists, overwrite is disabled")
|
||||
}
|
||||
|
||||
// generate a private key, with recovery phrase
|
||||
// remove the old key by name if it exists
|
||||
if exists {
|
||||
err = keybase.Delete(keyName)
|
||||
if err != nil {
|
||||
return sdk.AccAddress([]byte{}), "", fmt.Errorf(
|
||||
"failed to overwrite key")
|
||||
if err := keybase.Delete(keyName); err != nil {
|
||||
return sdk.AccAddress{}, "", fmt.Errorf("failed to overwrite key")
|
||||
}
|
||||
}
|
||||
|
||||
info, secret, err := keybase.NewMnemonic(keyName, keyring.English, sdk.GetConfig().GetFullBIP44Path(), keyring.DefaultBIP39Passphrase, algo)
|
||||
var (
|
||||
info keyring.Info
|
||||
secret string
|
||||
)
|
||||
|
||||
if mnemonic != "" {
|
||||
secret = mnemonic
|
||||
info, err = keybase.NewAccount(
|
||||
keyName,
|
||||
mnemonic,
|
||||
keyring.DefaultBIP39Passphrase,
|
||||
sdk.GetConfig().GetFullBIP44Path(),
|
||||
algo,
|
||||
)
|
||||
} else {
|
||||
info, secret, err = keybase.NewMnemonic(
|
||||
keyName,
|
||||
keyring.English,
|
||||
sdk.GetConfig().GetFullBIP44Path(),
|
||||
keyring.DefaultBIP39Passphrase,
|
||||
algo,
|
||||
)
|
||||
}
|
||||
if err != nil {
|
||||
return sdk.AccAddress([]byte{}), "", err
|
||||
return sdk.AccAddress{}, "", err
|
||||
}
|
||||
|
||||
return sdk.AccAddress(info.GetPubKey().Address()), secret, nil
|
||||
|
|
|
@ -28,7 +28,7 @@ func TestGenerateSaveCoinKey(t *testing.T) {
|
|||
kb, err := keyring.New(t.Name(), "test", t.TempDir(), nil)
|
||||
require.NoError(t, err)
|
||||
|
||||
addr, mnemonic, err := server.GenerateSaveCoinKey(kb, "keyname", false, hd.Secp256k1)
|
||||
addr, mnemonic, err := server.GenerateSaveCoinKey(kb, "keyname", "", false, hd.Secp256k1)
|
||||
require.NoError(t, err)
|
||||
|
||||
// Test key was actually saved
|
||||
|
@ -49,15 +49,15 @@ func TestGenerateSaveCoinKeyOverwriteFlag(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
|
||||
keyname := "justakey"
|
||||
addr1, _, err := server.GenerateSaveCoinKey(kb, keyname, false, hd.Secp256k1)
|
||||
addr1, _, err := server.GenerateSaveCoinKey(kb, keyname, "", false, hd.Secp256k1)
|
||||
require.NoError(t, err)
|
||||
|
||||
// Test overwrite with overwrite=false
|
||||
_, _, err = server.GenerateSaveCoinKey(kb, keyname, false, hd.Secp256k1)
|
||||
_, _, err = server.GenerateSaveCoinKey(kb, keyname, "", false, hd.Secp256k1)
|
||||
require.Error(t, err)
|
||||
|
||||
// Test overwrite with overwrite=true
|
||||
addr2, _, err := server.GenerateSaveCoinKey(kb, keyname, true, hd.Secp256k1)
|
||||
addr2, _, err := server.GenerateSaveCoinKey(kb, keyname, "", true, hd.Secp256k1)
|
||||
require.NoError(t, err)
|
||||
|
||||
require.NotEqual(t, addr1, addr2)
|
||||
|
|
|
@ -178,7 +178,7 @@ func InitTestnet(
|
|||
return err
|
||||
}
|
||||
|
||||
addr, secret, err := server.GenerateSaveCoinKey(kb, nodeDirName, true, algo)
|
||||
addr, secret, err := server.GenerateSaveCoinKey(kb, nodeDirName, "", true, algo)
|
||||
if err != nil {
|
||||
_ = os.RemoveAll(outputDir)
|
||||
return err
|
||||
|
|
|
@ -81,6 +81,7 @@ type Config struct {
|
|||
TimeoutCommit time.Duration // the consensus commitment timeout
|
||||
ChainID string // the network chain-id
|
||||
NumValidators int // the total number of validators to create and bond
|
||||
Mnemonics []string // custom user-provided validator operator mnemonics
|
||||
BondDenom string // the staking bond denomination
|
||||
MinGasPrices string // the minimum gas prices each validator will accept
|
||||
AccountTokens sdk.Int // the amount of unique validator tokens (e.g. 1000node0)
|
||||
|
@ -265,6 +266,7 @@ func New(t *testing.T, cfg Config) *Network {
|
|||
|
||||
p2pAddr, _, err := server.FreeTCPAddr()
|
||||
require.NoError(t, err)
|
||||
|
||||
tmCfg.P2P.ListenAddress = p2pAddr
|
||||
tmCfg.P2P.AddrBookStrict = false
|
||||
tmCfg.P2P.AllowDuplicateIP = true
|
||||
|
@ -281,7 +283,12 @@ func New(t *testing.T, cfg Config) *Network {
|
|||
algo, err := keyring.NewSigningAlgoFromString(cfg.SigningAlgo, keyringAlgos)
|
||||
require.NoError(t, err)
|
||||
|
||||
addr, secret, err := server.GenerateSaveCoinKey(kb, nodeDirName, true, algo)
|
||||
var mnemonic string
|
||||
if i < len(cfg.Mnemonics) {
|
||||
mnemonic = cfg.Mnemonics[i]
|
||||
}
|
||||
|
||||
addr, secret, err := server.GenerateSaveCoinKey(kb, nodeDirName, mnemonic, true, algo)
|
||||
require.NoError(t, err)
|
||||
|
||||
info := map[string]string{"secret": secret}
|
||||
|
|
Loading…
Reference in New Issue