Rescan, Account Discovery, and default Passphhrase #38

Merged
roylee17 merged 4 commits from separate-rescan-and-account-discovery into master 2022-11-01 03:53:17 +01:00
3 changed files with 9 additions and 7 deletions
Showing only changes of commit 9f4e998260 - Show all commits

View file

@ -58,7 +58,7 @@ type config struct {
DBTimeout time.Duration `long:"dbtimeout" description:"The timeout value to use when opening the wallet database."` DBTimeout time.Duration `long:"dbtimeout" description:"The timeout value to use when opening the wallet database."`
// Passphrase options // Passphrase options
Passphrase string `short:"p" long:"passphrase" default-mask:"-" description:"The wallet passphrase (default: \"insecurepassphrase\")"` Passphrase string `short:"p" long:"passphrase" default-mask:"-" description:"The wallet passphrase (default: \"passphrase\")"`
// RPC client options // RPC client options
RPCConnect string `short:"c" long:"rpcconnect" description:"Hostname/IP and port of lbcd RPC server to connect to (default localhost:9245, testnet: localhost:19245, regtest: localhost:29245)"` RPCConnect string `short:"c" long:"rpcconnect" description:"Hostname/IP and port of lbcd RPC server to connect to (default localhost:9245, testnet: localhost:19245, regtest: localhost:29245)"`

View file

@ -85,6 +85,11 @@ func walletMain() error {
loader.RunAfterLoad(func(w *wallet.Wallet) { loader.RunAfterLoad(func(w *wallet.Wallet) {
startWalletRPCServices(w, legacyRPCServer) startWalletRPCServices(w, legacyRPCServer)
log.Infof("Unlocking wallet with the default or specified passphrase...")
err = w.Unlock([]byte(cfg.Passphrase), nil)
if err != nil {
log.Infof("Unable to unlock wallet: %v", err)
}
}) })
_, err = loader.OpenExistingWallet() _, err = loader.OpenExistingWallet()

View file

@ -46,12 +46,9 @@ func createWallet(cfg *config) error {
) )
// Start by prompting for the passphrase. // Start by prompting for the passphrase.
reader := bufio.NewReader(os.Stdin) passphrase := []byte(cfg.Passphrase)
privPass, err := prompt.Passphrase(true)
if err != nil {
return err
}
reader := bufio.NewReader(os.Stdin)
// Ascertain the wallet generation seed. This will either be an // Ascertain the wallet generation seed. This will either be an
// automatically generated value the user has already confirmed or a // automatically generated value the user has already confirmed or a
// value the user has entered which has already been validated. // value the user has entered which has already been validated.
@ -61,7 +58,7 @@ func createWallet(cfg *config) error {
} }
fmt.Println("Creating the wallet...") fmt.Println("Creating the wallet...")
w, err := loader.CreateNewWallet(privPass, seed, bday) w, err := loader.CreateNewWallet(passphrase, seed, bday)
if err != nil { if err != nil {
return err return err
} }