Merge pull request #494 from aguycalled/rescan-when-import-mnemonic

Use -rescan when -importmnemonic

Author: proletesseract

qa/rpc-tests/mnemonic.py

@@ -8,6 +8,7 @@
     start_node,
     assert_equal,
     slow_gen,
+    connect_nodes
 )
 import os
 
@@ -24,7 +25,7 @@ def __init__(self):
 
     def setup_network(self):
         self.nodes = []
-        self.nodes.append(start_node(0, self.options.tmpdir, []))
+        self.nodes.append(start_node(0, self.options.tmpdir, ["-keypool=5"]))
         self.is_network_split = False
 
     def run_test (self):
@@ -38,6 +39,10 @@ def run_test (self):
         for language in self.languages:
             self.mnemonics[language] = self.nodes[0].dumpmnemonic(language)
 
+        self.nodes[0].staking(False)
+        self.nodes[0].generate(1)
+        self.sync_all()
+
         print("Restoring from mnemonic ...")
         self.check_mnemonic_works(masterkeyid, mnemonic_eng)
 
@@ -48,7 +53,10 @@ def check_mnemonic_works(self, masterprivkey, mnemonic, language="english"):
         self.stop_node(0)
         os.remove(self.options.tmpdir + "/node0/devnet/wallet.dat")
 
-        self.nodes[0] = start_node(0, self.options.tmpdir, ["-importmnemonic=" + mnemonic, "-mnemoniclanguage=" + language])
+        self.nodes[0] = start_node(0, self.options.tmpdir, ["-importmnemonic=" + mnemonic, "-mnemoniclanguage=" + language, "-keypool=5"])
+        self.nodes[0].staking(False)
+
+        assert(len(self.nodes[0].listtransactions()) == 1);
         assert_equal(masterprivkey, self.nodes[0].dumpmasterprivkey())
 
 if __name__ == '__main__':

src/init.cpp

@@ -843,6 +843,12 @@ void InitParameterInteraction()
             LogPrintf("%s: parameter interaction: -zapwallettxes=<mode> -> setting -rescan=1\n", __func__);
     }
 
+    // -importmnemonic implies a rescan
+    if (mapArgs.count("-importmnemonic")) {
+        if (SoftSetBoolArg("-rescan", true))
+            LogPrintf("%s: parameter interaction: -importmnemonic=\"word list\" -> setting -rescan=1\n", __func__);
+    }
+
     // disable walletbroadcast and whitelistrelay in blocksonly mode
     if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY)) {
         if (SoftSetBoolArg("-whitelistrelay", false))