Add option to create an encrypted wallet #15006

  29 | +        address1 = w0.getnewaddress()
  30 | +
  31 | +        self.log.info("Test disableprivatekeys creation.")
  32 | +        self.nodes[0].createwallet('w1', True)
  33 | +        w1 = node.get_wallet_rpc('w1')
  34 | +        assert_raises_rpc_error(-4,"Error: Private keys are disabled for this wallet", w1.getnewaddress)

---

 487 | @@ -488,6 +488,10 @@ class WalletImpl : public Wallet
 488 |      {
 489 |          return MakeHandler(m_wallet.NotifyWatchonlyChanged.connect(fn));
 490 |      }
 491 | +    std::unique_ptr<Handler> handleCanGetAddressesChanged(CanGetAddressesChangedFn fn) override

---

 433 | @@ -434,7 +434,7 @@ def batch(self, requests):
 434 |      def send_cli(self, command=None, *args, **kwargs):
 435 |          """Run bitcoin-cli command. Deserializes returned string as python object."""
 436 |          pos_args = [str(arg).lower() if type(arg) is bool else str(arg) for arg in args]
 437 | -        named_args = [str(key) + "=" + str(value) for (key, value) in kwargs.items()]
 438 | +        named_args = [str(key) + "=" + (str(value).lower() if type(value) is bool else str(value)) for (key, value) in kwargs.items()]

---

2596 |                  "\nCreates and loads a new wallet.\n",
2597 |                  {
2598 |                      {"wallet_name", RPCArg::Type::STR, /* opt */ false, /* default_val */ "", "The name for the new wallet. If this is a path, the wallet will be created at the path location."},
2599 |                      {"disable_private_keys", RPCArg::Type::BOOL, /* opt */ true, /* default_val */ "false", "Disable the possibility of private keys (only watchonlys are possible in this mode)."},
2600 |                      {"blank", RPCArg::Type::BOOL, /* opt */ true, /* default_val */ "false", "Create a blank wallet. A blank wallet has no keys or HD seed. One can be set using sethdseed."},
2601 | +                    {"passphrase", RPCArg::Type::STR, /* opt */ true, /* default_val */ "", "Encrypt the wallet with this passphrase. The empty string (\"\") will result in an unencrypted wallet."},

---

2598 | @@ -2598,8 +2599,21 @@ static UniValue createwallet(const JSONRPCRequest& request)
2599 |          flags |= WALLET_FLAG_DISABLE_PRIVATE_KEYS;
2600 |      }
2601 |  
2602 | +    bool create_blank = false;
2603 |      if (!request.params[2].isNull() && request.params[2].get_bool()) {
2604 |          flags |= WALLET_FLAG_BLANK_WALLET;
2605 | +        create_blank = true;
2606 | +    }
2607 | +    SecureString passphrase;

---

2609 | +    if (!request.params[3].isNull()) {
2610 | +        passphrase = request.params[3].get_str().c_str();
2611 | +        if (!passphrase.empty()) {
2612 | +            if (create_blank) {
2613 | +                throw JSONRPCError(RPC_WALLET_ERROR, "Cannot create an encrypted empty wallet.");
2614 | +            }

---

2607 | +    SecureString passphrase;
2608 | +    passphrase.reserve(100);
2609 | +    if (!request.params[3].isNull()) {
2610 | +        passphrase = request.params[3].get_str().c_str();
2611 | +        if (!passphrase.empty()) {
2612 | +            if (create_blank) {

---

 100 | +        assert_raises_rpc_error(-4, 'Cannot create an encrypted empty wallet.', self.nodes[0].createwallet, 'w6', False, True, 'thisisapassphrase')
 101 | +        # Encrypted wallet is created
 102 | +        self.nodes[0].createwallet('w6', False, False, 'thisisapassphrase')
 103 | +        w6 = node.get_wallet_rpc('w6')
 104 | +        w6.walletpassphrase('thisisapassphrase', 10)
 105 | +        # There should only be 1000 keys

---

2606 |      }
2607 | +    SecureString passphrase;
2608 | +    passphrase.reserve(100);
2609 | +    if (!request.params[3].isNull()) {
2610 | +        passphrase = request.params[3].get_str().c_str();
2611 | +        if (!passphrase.empty()) {

---

2633 | @@ -2620,6 +2634,25 @@ static UniValue createwallet(const JSONRPCRequest& request)
2634 |  
2635 |      wallet->postInitProcess();
2636 |  
2637 | +    // Encrypt the wallet if there's a passphrase

---

2633 | @@ -2620,6 +2634,25 @@ static UniValue createwallet(const JSONRPCRequest& request)
2634 |  
2635 |      wallet->postInitProcess();
2636 |  
2637 | +    // Encrypt the wallet if there's a passphrase
2638 | +    if (!passphrase.empty() && !(flags & WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
2639 | +        if (!wallet->EncryptWallet(passphrase)) {
2640 | +            throw JSONRPCError(RPC_WALLET_ENCRYPTION_FAILED, "Error: Wallet created but failed to encrypt.");

---

   0 | @@ -0,0 +1,4 @@
   1 | +Miscellaneous RPC changes
   2 | +------------
   3 | +
   4 | +- `createwallet` can now create encrypted wallets

---

2606 | +    }
2607 | +    SecureString passphrase;
2608 | +    passphrase.reserve(100);
2609 | +    if (!request.params[3].isNull()) {
2610 | +        passphrase = request.params[3].get_str().c_str();
2611 | +        if (passphrase.empty()) {

---

2568 | @@ -2569,14 +2569,15 @@ static UniValue loadwallet(const JSONRPCRequest& request)
2569 |  
2570 |  static UniValue createwallet(const JSONRPCRequest& request)
2571 |  {
2572 | -    if (request.fHelp || request.params.size() < 1 || request.params.size() > 3) {
2573 | +    if (request.fHelp || request.params.size() < 1 || request.params.size() > 4) {

---

2640 | +            throw JSONRPCError(RPC_WALLET_ENCRYPTION_FAILED, "Error: Wallet created but failed to encrypt.");
2641 | +        }
2642 | +
2643 | +        if (!create_blank) {
2644 | +            // Unlock the wallet
2645 | +            if (!wallet->Unlock(passphrase)) {

---

  95 | @@ -96,5 +96,22 @@ def run_test(self):
  96 |          assert_raises_rpc_error(-4, "Error: This wallet has no available keys", w5.getnewaddress)
  97 |          assert_raises_rpc_error(-4, "Error: This wallet has no available keys", w5.getrawchangeaddress)
  98 |  
  99 | +        self.log.info('New blank and encrypted wallets can be created')
 100 | +        self.nodes[0].createwallet(wallet_name='wblank', disable_private_keys=False, blank=True, passphrase='thisisapassphrase')
 101 | +        wblank = node.get_wallet_rpc('wblank')
 102 | +        wblank.walletpassphrase('thisisapassphrase', 10)

---

 101 | +        wblank = node.get_wallet_rpc('wblank')
 102 | +        wblank.walletpassphrase('thisisapassphrase', 10)
 103 | +
 104 | +        self.log.info('Test creating a new encrypted wallet.')
 105 | +        # Born encrypted wallet is created (has keys)
 106 | +        self.nodes[0].createwallet('w6', False, False, 'thisisapassphrase')

---

 104 | +        self.log.info('Test creating a new encrypted wallet.')
 105 | +        # Born encrypted wallet is created (has keys)
 106 | +        self.nodes[0].createwallet('w6', False, False, 'thisisapassphrase')
 107 | +        w6 = node.get_wallet_rpc('w6')
 108 | +        w6.walletpassphrase('thisisapassphrase', 10)
 109 | +        # There should only be 1 keys

---

 103 | +
 104 | +        self.log.info('Test creating a new encrypted wallet.')
 105 | +        # Born encrypted wallet is created (has keys)
 106 | +        self.nodes[0].createwallet('w6', False, False, 'thisisapassphrase')
 107 | +        w6 = node.get_wallet_rpc('w6')
 108 | +        w6.walletpassphrase('thisisapassphrase', 10)

---

2598 | @@ -2598,7 +2599,20 @@ static UniValue createwallet(const JSONRPCRequest& request)
2599 |          flags |= WALLET_FLAG_DISABLE_PRIVATE_KEYS;
2600 |      }
2601 |  
2602 | +    bool create_blank = false; // Indicate that we the wallet is actually supposed to be blank

---

2656 | +        "\nCreates and loads a new wallet.\n",
2657 | +        {
2658 | +            {"wallet_name", RPCArg::Type::STR, RPCArg::Optional::NO, "The name for the new wallet. If this is a path, the wallet will be created at the path location."},
2659 | +            {"disable_private_keys", RPCArg::Type::BOOL, /* default */ "false", "Disable the possibility of private keys (only watchonlys are possible in this mode)."},
2660 | +            {"blank", RPCArg::Type::BOOL, /* default */ "false", "Create a blank wallet. A blank wallet has no keys or HD seed. One can be set using sethdseed."},
2661 | +            {"passphrase", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "Encrypt the wallet with this passphrase."},

---

2703 | @@ -2688,6 +2704,29 @@ static UniValue createwallet(const JSONRPCRequest& request)
2704 |      if (!wallet) {
2705 |          throw JSONRPCError(RPC_WALLET_ERROR, "Wallet creation failed.");
2706 |      }
2707 | +
2708 | +    // Encrypt the wallet if there's a passphrase
2709 | +    if (!passphrase.empty() && !(flags & WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {

---

  95 | @@ -96,5 +96,28 @@ def run_test(self):
  96 |          assert_raises_rpc_error(-4, "Error: This wallet has no available keys", w5.getnewaddress)
  97 |          assert_raises_rpc_error(-4, "Error: This wallet has no available keys", w5.getrawchangeaddress)
  98 |  
  99 | +        self.log.info('New blank and encrypted wallets can be created')
 100 | +        self.nodes[0].createwallet(wallet_name='wblank', disable_private_keys=False, blank=True, passphrase='thisisapassphrase')
 101 | +        wblank = node.get_wallet_rpc('wblank')
 102 | +        assert_raises_rpc_error(-13, "Error: Please enter the wallet passphrase with walletpassphrase first.", wblank.signmessage, "needanargument", "test")

---

 115 | +        # There should only be 1 key
 116 | +        walletinfo = w6.getwalletinfo()
 117 | +        assert_equal(walletinfo['keypoolsize'], 1)
 118 | +        assert_equal(walletinfo['keypoolsize_hd_internal'], 1)
 119 | +        # Empty passphrase, error
 120 | +        assert_raises_rpc_error(-16, 'Cannot encrypt a wallet with a blank password', self.nodes[0].createwallet, 'w7', False, False, '')

---