From 41ecade0123d426aaea2d72added9ef9bcab3127 Mon Sep 17 00:00:00 2001
From: "Jonathan \"Duke\" Leto" <jonathan@leto.net>
Date: Sun, 5 Aug 2018 21:51:35 -0700
Subject: [PATCH 1/2] Fix some typos in rpc-tests readme

---
 qa/rpc-tests/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/README.md b/qa/rpc-tests/README.md
index a0229b56d..3affd50fc 100644
--- a/qa/rpc-tests/README.md
+++ b/qa/rpc-tests/README.md
@@ -18,9 +18,9 @@ Possible options:
 
 ```
 -h, --help       show this help message and exit
-  --nocleanup      Leave bitcoinds and test.* datadir on exit or error
+  --nocleanup      Leave zcashds and test.* datadir on exit or error
   --noshutdown     Don't stop bitcoinds after the test execution
-  --srcdir=SRCDIR  Source directory containing bitcoind/bitcoin-cli (default:
+  --srcdir=SRCDIR  Source directory containing zcashd/zcash-cli (default:
                    ../../src)
   --tmpdir=TMPDIR  Root directory for datadirs
   --tracerpc       Print out all RPC calls as they are made

From 3f824a908bd8995e119c28beb9068530ec1f58eb Mon Sep 17 00:00:00 2001
From: Eirik Ogilvie-Wigley <eirik@z.cash>
Date: Wed, 10 Oct 2018 16:00:59 -0600
Subject: [PATCH 2/2] Fix HDSeed comment

---
 qa/rpc-tests/wallet_import_export.py | 2 ++
 src/wallet/rpcdump.cpp               | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/qa/rpc-tests/wallet_import_export.py b/qa/rpc-tests/wallet_import_export.py
index ee9cc42ce..cdcc01d1f 100755
--- a/qa/rpc-tests/wallet_import_export.py
+++ b/qa/rpc-tests/wallet_import_export.py
@@ -61,6 +61,8 @@ def parse_wallet_file(dump_path):
     # We expect information about the HDSeed and fingerpring in the header
     assert_true("HDSeed" in file_lines[4], "Expected HDSeed")
     assert_true("fingerprint" in file_lines[4], "Expected fingerprint")
+    seed_comment_line = file_lines[4][2:].split()  # ["HDSeed=...", "fingerprint=..."]
+    assert_true(seed_comment_line[0].split("=")[1] != seed_comment_line[1].split("=")[1], "The seed should not equal the fingerprint")
     (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)
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index d507a3b1b..600d0de8b 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -508,7 +508,8 @@ UniValue dumpwallet_impl(const UniValue& params, bool fHelp, bool fDumpZKeys)
     {
         HDSeed hdSeed;
         pwalletMain->GetHDSeed(hdSeed);
-        file << strprintf("# HDSeed=%s fingerprint=%s", pwalletMain->GetHDChain().seedFp.GetHex(), hdSeed.Fingerprint().GetHex());
+        auto rawSeed = hdSeed.RawSeed();
+        file << strprintf("# HDSeed=%s fingerprint=%s", HexStr(rawSeed.begin(), rawSeed.end()), hdSeed.Fingerprint().GetHex());
         file << "\n";
     }
     file << "\n";