0dbc5de9dd
<!-- The default pull request template is for types feat, fix, or refactor. For other templates, add one of the following parameters to the url: - template=docs.md - template=other.md --> This PR adds a missing save inside the `InitializeNodeValidatorFilesFromMnemonic` method. Without it when using `gaiad init <name> --recover` no `priv_validator_key.json` file is created. Closes: #XXXX <!-- Add a description of the changes that this PR introduces and the files that are the most critical to review. --> --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing) - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable)
102 lines
3.0 KiB
Go
102 lines
3.0 KiB
Go
package genutil
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"path/filepath"
|
|
"time"
|
|
|
|
"github.com/cosmos/go-bip39"
|
|
cfg "github.com/tendermint/tendermint/config"
|
|
tmed25519 "github.com/tendermint/tendermint/crypto/ed25519"
|
|
tmos "github.com/tendermint/tendermint/libs/os"
|
|
"github.com/tendermint/tendermint/p2p"
|
|
"github.com/tendermint/tendermint/privval"
|
|
tmtypes "github.com/tendermint/tendermint/types"
|
|
|
|
cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
|
|
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
|
|
)
|
|
|
|
// ExportGenesisFile creates and writes the genesis configuration to disk. An
|
|
// error is returned if building or writing the configuration to file fails.
|
|
func ExportGenesisFile(genDoc *tmtypes.GenesisDoc, genFile string) error {
|
|
if err := genDoc.ValidateAndComplete(); err != nil {
|
|
return err
|
|
}
|
|
|
|
return genDoc.SaveAs(genFile)
|
|
}
|
|
|
|
// ExportGenesisFileWithTime creates and writes the genesis configuration to disk.
|
|
// An error is returned if building or writing the configuration to file fails.
|
|
func ExportGenesisFileWithTime(
|
|
genFile, chainID string, validators []tmtypes.GenesisValidator,
|
|
appState json.RawMessage, genTime time.Time,
|
|
) error {
|
|
|
|
genDoc := tmtypes.GenesisDoc{
|
|
GenesisTime: genTime,
|
|
ChainID: chainID,
|
|
Validators: validators,
|
|
AppState: appState,
|
|
}
|
|
|
|
if err := genDoc.ValidateAndComplete(); err != nil {
|
|
return err
|
|
}
|
|
|
|
return genDoc.SaveAs(genFile)
|
|
}
|
|
|
|
// InitializeNodeValidatorFiles creates private validator and p2p configuration files.
|
|
func InitializeNodeValidatorFiles(config *cfg.Config) (nodeID string, valPubKey cryptotypes.PubKey, err error) {
|
|
return InitializeNodeValidatorFilesFromMnemonic(config, "")
|
|
}
|
|
|
|
// InitializeNodeValidatorFilesFromMnemonic creates private validator and p2p configuration files using the given mnemonic.
|
|
// If no valid mnemonic is given, a random one will be used instead.
|
|
func InitializeNodeValidatorFilesFromMnemonic(config *cfg.Config, mnemonic string) (nodeID string, valPubKey cryptotypes.PubKey, err error) {
|
|
if len(mnemonic) > 0 && !bip39.IsMnemonicValid(mnemonic) {
|
|
return "", nil, fmt.Errorf("invalid mnemonic")
|
|
}
|
|
|
|
nodeKey, err := p2p.LoadOrGenNodeKey(config.NodeKeyFile())
|
|
if err != nil {
|
|
return "", nil, err
|
|
}
|
|
|
|
nodeID = string(nodeKey.ID())
|
|
|
|
pvKeyFile := config.PrivValidatorKeyFile()
|
|
if err := tmos.EnsureDir(filepath.Dir(pvKeyFile), 0777); err != nil {
|
|
return "", nil, err
|
|
}
|
|
|
|
pvStateFile := config.PrivValidatorStateFile()
|
|
if err := tmos.EnsureDir(filepath.Dir(pvStateFile), 0777); err != nil {
|
|
return "", nil, err
|
|
}
|
|
|
|
var filePV *privval.FilePV
|
|
if len(mnemonic) == 0 {
|
|
filePV = privval.LoadOrGenFilePV(pvKeyFile, pvStateFile)
|
|
} else {
|
|
privKey := tmed25519.GenPrivKeyFromSecret([]byte(mnemonic))
|
|
filePV = privval.NewFilePV(privKey, pvKeyFile, pvStateFile)
|
|
filePV.Save()
|
|
}
|
|
|
|
tmValPubKey, err := filePV.GetPubKey()
|
|
if err != nil {
|
|
return "", nil, err
|
|
}
|
|
|
|
valPubKey, err = cryptocodec.FromTmPubKeyInterface(tmValPubKey)
|
|
if err != nil {
|
|
return "", nil, err
|
|
}
|
|
|
|
return nodeID, valPubKey, nil
|
|
}
|