diff options
author | Andrew Chow <achow101-github@achow101.com> | 2021-02-16 13:22:49 -0500 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2021-02-19 12:47:40 +0100 |
commit | d6b5eb5fcc8e8f7f0ab778f32d49aabf6e04d80d (patch) | |
tree | 2bb8e3520646eb4262bdb9a1647424c1c74fc252 | |
parent | 08dada84565ea5f49127123e356c82a150626f3c (diff) | |
download | bitcoin-d6b5eb5fcc8e8f7f0ab778f32d49aabf6e04d80d.tar.xz |
Disallow sendtoaddress and sendmany when private keys disabled
Github-Pull: #21201
Rebased-From: 0997019e7681efb00847a7246c15ac8f235128d8
-rw-r--r-- | src/wallet/rpcwallet.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index e8c3ae888d..37d672ace1 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -400,6 +400,12 @@ UniValue SendMoney(CWallet* const pwallet, const CCoinControl &coin_control, std { EnsureWalletIsUnlocked(pwallet); + // This function is only used by sendtoaddress and sendmany. + // This should always try to sign, if we don't have private keys, don't try to do anything here. + if (pwallet->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)) { + throw JSONRPCError(RPC_WALLET_ERROR, "Error: Private keys are disabled for this wallet"); + } + // Shuffle recipient list std::shuffle(recipients.begin(), recipients.end(), FastRandomContext()); @@ -409,7 +415,7 @@ UniValue SendMoney(CWallet* const pwallet, const CCoinControl &coin_control, std bilingual_str error; CTransactionRef tx; FeeCalculation fee_calc_out; - bool fCreated = pwallet->CreateTransaction(recipients, tx, nFeeRequired, nChangePosRet, error, coin_control, fee_calc_out, !pwallet->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)); + const bool fCreated = pwallet->CreateTransaction(recipients, tx, nFeeRequired, nChangePosRet, error, coin_control, fee_calc_out, true); if (!fCreated) { throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, error.original); } |