From 28915c30ca1888aebfa3b036f12abadea9ccebeb Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@z.cash>
Date: Tue, 3 Apr 2018 02:43:52 +0100
Subject: [PATCH] Fix z_importviewingkey startHeight parameter

Closes #2937.
---
 qa/rpc-tests/wallet_nullifiers.py | 2 +-
 src/wallet/rpcdump.cpp            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qa/rpc-tests/wallet_nullifiers.py b/qa/rpc-tests/wallet_nullifiers.py
index 743af7c92..207631efb 100755
--- a/qa/rpc-tests/wallet_nullifiers.py
+++ b/qa/rpc-tests/wallet_nullifiers.py
@@ -182,7 +182,7 @@ class WalletNullifiersTest (BitcoinTestFramework):
         # add node 1 address and node 2 viewing key to node 3
         myzvkey = self.nodes[2].z_exportviewingkey(myzaddr)
         self.nodes[3].importaddress(mytaddr1)
-        self.nodes[3].z_importviewingkey(myzvkey)
+        self.nodes[3].z_importviewingkey(myzvkey, 'whenkeyisnew', 1)
 
         # Check the address has been imported
         assert_equal(myzaddr in self.nodes[3].z_listaddresses(), False)
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 890a91e8d..0e232373d 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -653,7 +653,7 @@ UniValue z_importviewingkey(const UniValue& params, bool fHelp)
     if (!EnsureWalletIsAvailable(fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() < 1 || params.size() > 2)
+    if (fHelp || params.size() < 1 || params.size() > 3)
         throw runtime_error(
             "z_importviewingkey \"vkey\" ( rescan startHeight )\n"
             "\nAdds a viewing key (as returned by z_exportviewingkey) to your wallet.\n"