zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up format of recovery information in the wallet dump.

This commit is contained in:
Kris Nuttycombe 2021-10-29 12:49:26 -06:00
parent 30517a002b
commit d09a0c44f3
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qa/rpc-tests/wallet_import_export.py
View File

@ -78,11 +78,10 @@ class WalletImportExportTest (BitcoinTestFramework):
def parse_wallet_file(dump_path):
file_lines = open(dump_path, "r", encoding="utf8").readlines()
# We expect information about the HDSeed and fingerpring in the header
assert_true("Emergency Recovery Phrase" in file_lines[4], "Expected Emergency Recovery Phrase")
assert_true("language" in file_lines[5], "Expected mnemonic seed language")
assert_true("fingerprint" in file_lines[6], "Expected mnemonic seed fingerprint")
mnemonic = file_lines[4].split("=")[1].strip()
print(mnemonic)
assert_true("recovery_phrase" in file_lines[5], "Expected emergency recovery phrase")
assert_true("language" in file_lines[6], "Expected mnemonic seed language")
assert_true("fingerprint" in file_lines[7], "Expected mnemonic seed fingerprint")
mnemonic = file_lines[5].split("=")[1].strip()
(t_keys, i) = parse_wallet_file_lines(file_lines, 0)
(sprout_keys, i) = parse_wallet_file_lines(file_lines, i)
(sapling_keys, i) = parse_wallet_file_lines(file_lines, i)

10
src/wallet/rpcdump.cpp
View File

@ -614,7 +614,10 @@ UniValue dumpwallet_impl(const UniValue& params, bool fDumpZKeys)
if (hdSeed.has_value()) {
auto mSeed = hdSeed.value();
file << strprintf(
"# Emergency Recovery Phrase=\"%s\" \n# language=%s \n# fingerprint=%s\n",
"# Emergency Recovery Information\n"
"# - recovery_phrase=\"%s\"\n"
"# - language=%s\n"
"# - fingerprint=%s\n",
mSeed.GetMnemonic(),
MnemonicSeed::LanguageName(mSeed.GetLanguage()),
mSeed.Fingerprint().GetHex()
@ -624,7 +627,10 @@ UniValue dumpwallet_impl(const UniValue& params, bool fDumpZKeys)
std::optional<HDSeed> legacySeed = pwalletMain->GetLegacyHDSeed();
if (legacySeed.has_value()) {
auto rawSeed = legacySeed.value().RawSeed();
file << strprintf("# Legacy HDSeed=%s fingerprint=%s\n",
file << strprintf(
"# Legacy HD Seed\n"
"# - seed=%s\n"
"# - fingerprint=%s\n",
HexStr(rawSeed.begin(), rawSeed.end()),
legacySeed.value().Fingerprint().GetHex()
);