Merge #15226: Allow creating blank (empty) wallets (alternative)

7687f7873 [wallet] Support creating a blank wallet (Andrew Chow)

Pull request description:

  Alternative (kind of) to #14938

  This PR adds a `blank` parameter to the `createwallet` RPC to create a wallet that has no private keys initially. `sethdseed` can then be used to make a clean wallet with a custom seed. `encryptwallet` can also be used to make a wallet that is born encrypted.

  Instead of changing the version number as done in #14938, a wallet flag is used to indicate that the wallet should be blank. This flag is set at creation, and then unset when the wallet is no longer blank. A wallet becomes non-blank when a HD seed is set or anything is imported. The main change to create a blank wallet is primarily taken from #14938.

  Also with this, the term "blank wallet" is used instead of "empty wallet" to avoid confusion with wallets that have balance which would also be referred to as "empty".

  This is built on top of #15225 in order to fix GUI issues.

Tree-SHA512: 824d685e11ac2259a26b5ece99c67a7bda94a570cd921472c464243ee356b7734595ad35cc439b34357135df041ed9cba951e6edac194935c3a55a1dc4fcbdea

3 files changed, 102 insertions, 48 deletions

diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index 138bcc13a0..d8f92e2601 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -116,8 +116,8 @@ BASE_SCRIPTS = [
     'mempool_persist.py',
     'wallet_multiwallet.py',
     'wallet_multiwallet.py --usecli',
-    'wallet_disableprivatekeys.py',
-    'wallet_disableprivatekeys.py --usecli',
+    'wallet_createwallet.py',
+    'wallet_createwallet.py --usecli',
     'interface_http.py',
     'interface_rpc.py',
     'rpc_psbt.py',
diff --git a/test/functional/wallet_createwallet.py b/test/functional/wallet_createwallet.py
new file mode 100755
index 0000000000..9fd2650d78
--- /dev/null
+++ b/test/functional/wallet_createwallet.py
@@ -0,0 +1,100 @@
+#!/usr/bin/env python3
+# Copyright (c) 2018 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+"""Test createwallet arguments.
+"""
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import (
+    assert_equal,
+    assert_raises_rpc_error,
+)
+
+class CreateWalletTest(BitcoinTestFramework):
+    def set_test_params(self):
+        self.setup_clean_chain = False
+        self.num_nodes = 1
+        self.supports_cli = True
+
+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+
+    def run_test(self):
+        node = self.nodes[0]
+        node.generate(1) # Leave IBD for sethdseed
+
+        self.nodes[0].createwallet(wallet_name='w0')
+        w0 = node.get_wallet_rpc('w0')
+        address1 = w0.getnewaddress()
+
+        self.log.info("Test disableprivatekeys creation.")
+        self.nodes[0].createwallet(wallet_name='w1', disable_private_keys=True)
+        w1 = node.get_wallet_rpc('w1')
+        assert_raises_rpc_error(-4, "Error: Private keys are disabled for this wallet", w1.getnewaddress)
+        assert_raises_rpc_error(-4, "Error: Private keys are disabled for this wallet", w1.getrawchangeaddress)
+        w1.importpubkey(w0.getaddressinfo(address1)['pubkey'])
+
+        self.log.info('Test that private keys cannot be imported')
+        addr = w0.getnewaddress('', 'legacy')
+        privkey = w0.dumpprivkey(addr)
+        assert_raises_rpc_error(-4, 'Cannot import private keys to a wallet with private keys disabled', w1.importprivkey, privkey)
+        result = w1.importmulti([{'scriptPubKey': {'address': addr}, 'timestamp': 'now', 'keys': [privkey]}])
+        assert(not result[0]['success'])
+        assert('warning' not in result[0])
+        assert_equal(result[0]['error']['code'], -4)
+        assert_equal(result[0]['error']['message'], 'Cannot import private keys to a wallet with private keys disabled')
+
+        self.log.info("Test blank creation with private keys disabled.")
+        self.nodes[0].createwallet(wallet_name='w2', disable_private_keys=True, blank=True)
+        w2 = node.get_wallet_rpc('w2')
+        assert_raises_rpc_error(-4, "Error: Private keys are disabled for this wallet", w2.getnewaddress)
+        assert_raises_rpc_error(-4, "Error: Private keys are disabled for this wallet", w2.getrawchangeaddress)
+        w2.importpubkey(w0.getaddressinfo(address1)['pubkey'])
+
+        self.log.info("Test blank creation with private keys enabled.")
+        self.nodes[0].createwallet(wallet_name='w3', disable_private_keys=False, blank=True)
+        w3 = node.get_wallet_rpc('w3')
+        assert_equal(w3.getwalletinfo()['keypoolsize'], 0)
+        assert_raises_rpc_error(-4, "Error: This wallet has no available keys", w3.getnewaddress)
+        assert_raises_rpc_error(-4, "Error: This wallet has no available keys", w3.getrawchangeaddress)
+        # Import private key
+        w3.importprivkey(w0.dumpprivkey(address1))
+        # Imported private keys are currently ignored by the keypool
+        assert_equal(w3.getwalletinfo()['keypoolsize'], 0)
+        assert_raises_rpc_error(-4, "Error: This wallet has no available keys", w3.getnewaddress)
+        # Set the seed
+        w3.sethdseed()
+        assert_equal(w3.getwalletinfo()['keypoolsize'], 1)
+        w3.getnewaddress()
+        w3.getrawchangeaddress()
+
+        self.log.info("Test blank creation with privkeys enabled and then encryption")
+        self.nodes[0].createwallet(wallet_name='w4', disable_private_keys=False, blank=True)
+        w4 = node.get_wallet_rpc('w4')
+        assert_equal(w4.getwalletinfo()['keypoolsize'], 0)
+        assert_raises_rpc_error(-4, "Error: This wallet has no available keys", w4.getnewaddress)
+        assert_raises_rpc_error(-4, "Error: This wallet has no available keys", w4.getrawchangeaddress)
+        # Encrypt the wallet. Nothing should change about the keypool
+        w4.encryptwallet('pass')
+        assert_raises_rpc_error(-4, "Error: This wallet has no available keys", w4.getnewaddress)
+        assert_raises_rpc_error(-4, "Error: This wallet has no available keys", w4.getrawchangeaddress)
+        # Now set a seed and it should work. Wallet should also be encrypted
+        w4.walletpassphrase('pass', 2)
+        w4.sethdseed()
+        w4.getnewaddress()
+        w4.getrawchangeaddress()
+
+        self.log.info("Test blank creation with privkeys disabled and then encryption")
+        self.nodes[0].createwallet(wallet_name='w5', disable_private_keys=True, blank=True)
+        w5 = node.get_wallet_rpc('w5')
+        assert_equal(w5.getwalletinfo()['keypoolsize'], 0)
+        assert_raises_rpc_error(-4, "Error: Private keys are disabled for this wallet", w5.getnewaddress)
+        assert_raises_rpc_error(-4, "Error: Private keys are disabled for this wallet", w5.getrawchangeaddress)
+        # Encrypt the wallet
+        w5.encryptwallet('pass')
+        assert_raises_rpc_error(-4, "Error: Private keys are disabled for this wallet", w5.getnewaddress)
+        assert_raises_rpc_error(-4, "Error: Private keys are disabled for this wallet", w5.getrawchangeaddress)
+
+if __name__ == '__main__':
+    CreateWalletTest().main()
diff --git a/test/functional/wallet_disableprivatekeys.py b/test/functional/wallet_disableprivatekeys.py
deleted file mode 100755
index e55bb82e76..0000000000
--- a/test/functional/wallet_disableprivatekeys.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env python3
-# Copyright (c) 2018 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-"""Test disable-privatekeys mode.
-"""
-
-from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import (
-    assert_equal,
-    assert_raises_rpc_error,
-)
-
-
-class DisablePrivateKeysTest(BitcoinTestFramework):
-    def set_test_params(self):
-        self.setup_clean_chain = False
-        self.num_nodes = 1
-        self.supports_cli = True
-
-    def skip_test_if_missing_module(self):
-        self.skip_if_no_wallet()
-
-    def run_test(self):
-        node = self.nodes[0]
-        self.log.info("Test disableprivatekeys creation.")
-        self.nodes[0].createwallet('w1', True)
-        self.nodes[0].createwallet('w2')
-        w1 = node.get_wallet_rpc('w1')
-        w2 = node.get_wallet_rpc('w2')
-        assert_raises_rpc_error(-4,"Error: Private keys are disabled for this wallet", w1.getnewaddress)
-        assert_raises_rpc_error(-4,"Error: Private keys are disabled for this wallet", w1.getrawchangeaddress)
-        w1.importpubkey(w2.getaddressinfo(w2.getnewaddress())['pubkey'])
-
-        self.log.info('Test that private keys cannot be imported')
-        addr = w2.getnewaddress('', 'legacy')
-        privkey = w2.dumpprivkey(addr)
-        assert_raises_rpc_error(-4, 'Cannot import private keys to a wallet with private keys disabled', w1.importprivkey, privkey)
-        result = w1.importmulti([{'scriptPubKey': {'address': addr}, 'timestamp': 'now', 'keys': [privkey]}])
-        assert(not result[0]['success'])
-        assert('warning' not in result[0])
-        assert_equal(result[0]['error']['code'], -4)
-        assert_equal(result[0]['error']['message'], 'Cannot import private keys to a wallet with private keys disabled')
-
-if __name__ == '__main__':
-    DisablePrivateKeysTest().main()