Code refactoring from Bitcoin Core 0.13.0

72c2651581

fc7c60d699

fa19b18c63

3e2c946cfd

0fd599767d

220f950ab1

fade505e8b

fa9976b853

fa10ce6a6d

...and some more

qa/pull-tester/rpc-tests.py

@@ -76,6 +76,7 @@ if EXEEXT == ".exe" and "-win" not in opts:
 testScripts = [
     'bip68-112-113-p2p.py',
     'wallet.py',
+    'wallet-hd.py',
     'listtransactions.py',
     'receivedby.py',
     'mempool_resurrect_test.py',

qa/rpc-tests/test_framework/test_framework.py

@@ -21,6 +21,7 @@ from .util import (
     sync_blocks,
     sync_mempools,
     stop_nodes,
+    stop_node,
     wait_bitcoinds,
     enable_coverage,
     check_json_precision,
@@ -44,6 +45,9 @@ class BitcoinTestFramework(object):
         print("Initializing test directory "+self.options.tmpdir)
         initialize_chain(self.options.tmpdir)
 
+    def stop_node(self, num_node):
+        stop_node(self.nodes[num_node], num_node)
+    
     def setup_nodes(self):
         return start_nodes(4, self.options.tmpdir)
 

qa/rpc-tests/wallet-hd.py

@@ -0,0 +1,87 @@
+#!/usr/bin/env python3
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import (
+    start_nodes,
+    start_node,
+    assert_equal,
+    connect_nodes_bi,
+)
+import os
+import shutil
+
+
+class WalletHDTest(BitcoinTestFramework):
+
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 2
+        self.node_args = [['-usehd=0'], ['-usehd=1', '-keypool=0']]
+
+    def setup_network(self):
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, self.node_args)
+        self.is_network_split = False
+        connect_nodes_bi(self.nodes, 0, 1)
+
+    def run_test (self):
+        tmpdir = self.options.tmpdir
+
+        # Make sure we use hd, keep masterkeyid
+        masterkeyid = self.nodes[1].getwalletinfo()['hdmasterkeyid']
+        assert_equal(len(masterkeyid), 40)
+
+        # Import a non-HD private key in the HD wallet
+        non_hd_add = self.nodes[0].getnewaddress()
+        self.nodes[1].importprivkey(self.nodes[0].dumpprivkey(non_hd_add))
+
+        # This should be enough to keep the master key and the non-HD key 
+        self.nodes[1].backupwallet(tmpdir + "/hd.bak")
+        #self.nodes[1].dumpwallet(tmpdir + "/hd.dump")
+
+        # Derive some HD addresses and remember the last
+        # Also send funds to each add
+        self.nodes[0].generate(101)
+        hd_add = None
+        num_hd_adds = 300
+        for i in range(num_hd_adds):
+            hd_add = self.nodes[1].getnewaddress()
+            hd_info = self.nodes[1].validateaddress(hd_add)
+            assert_equal(hd_info["hdkeypath"], "m/0'/0'/"+str(i+1)+"'")
+            assert_equal(hd_info["hdmasterkeyid"], masterkeyid)
+            self.nodes[0].sendtoaddress(hd_add, 1)
+            self.nodes[0].generate(1)
+        self.nodes[0].sendtoaddress(non_hd_add, 1)
+        self.nodes[0].generate(1)
+
+        self.sync_all()
+        assert_equal(self.nodes[1].getbalance(), num_hd_adds + 1)
+
+        print("Restore backup ...")
+        self.stop_node(1)
+        os.remove(self.options.tmpdir + "/node1/regtest/wallet.dat")
+        shutil.copyfile(tmpdir + "/hd.bak", tmpdir + "/node1/regtest/wallet.dat")
+        self.nodes[1] = start_node(1, self.options.tmpdir, self.node_args[1])
+        #connect_nodes_bi(self.nodes, 0, 1)
+
+        # Assert that derivation is deterministic
+        hd_add_2 = None
+        for _ in range(num_hd_adds):
+            hd_add_2 = self.nodes[1].getnewaddress()
+            hd_info_2 = self.nodes[1].validateaddress(hd_add_2)
+            assert_equal(hd_info_2["hdkeypath"], "m/0'/0'/"+str(_+1)+"'")
+            assert_equal(hd_info_2["hdmasterkeyid"], masterkeyid)
+        assert_equal(hd_add, hd_add_2)
+
+        # Needs rescan
+        self.stop_node(1)
+        self.nodes[1] = start_node(1, self.options.tmpdir, self.node_args[1] + ['-rescan'])
+        #connect_nodes_bi(self.nodes, 0, 1)
+        assert_equal(self.nodes[1].getbalance(), num_hd_adds + 1)
+
+
+if __name__ == '__main__':
+    WalletHDTest().main ()