diff options
| author | John Newbery <john@johnnewbery.com> | 2018-02-02 14:34:13 -0500 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2018-02-08 08:59:28 -0500 |
| commit | cb28a0b07f889a327731a86d7c13681c3007437f (patch) | |
| tree | 210d20a0942c6149e27bfdf807debe5b6a5e91c8 | |
| parent | ed45c8201977aecde226b2e9b060820a8fd677c3 (diff) | |
| download | bitcoin-cb28a0b07f889a327731a86d7c13681c3007437f.tar.xz | |
[RPC] Remove deprecated createmultisig object
| -rw-r--r-- | src/rpc/misc.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index c11dda22c4..e772f56534 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -262,9 +262,6 @@ UniValue createmultisig(const JSONRPCRequest& request) std::string msg = "createmultisig nrequired [\"key\",...]\n" "\nCreates a multi-signature address with n signature of m keys required.\n" "It returns a json object with the address and redeemScript.\n" - "DEPRECATION WARNING: Using addresses with createmultisig is deprecated. Clients must\n" - "transition to using addmultisigaddress to create multisig addresses with addresses known\n" - "to the wallet before upgrading to v0.17. To use the deprecated functionality, start bitcoind with -deprecatedrpc=createmultisig\n" "\nArguments:\n" "1. nrequired (numeric, required) The number of required signatures out of the n keys or addresses.\n" "2. \"keys\" (string, required) A json array of hex-encoded public keys\n" @@ -297,15 +294,8 @@ UniValue createmultisig(const JSONRPCRequest& request) if (IsHex(keys[i].get_str()) && (keys[i].get_str().length() == 66 || keys[i].get_str().length() == 130)) { pubkeys.push_back(HexToPubKey(keys[i].get_str())); } else { -#ifdef ENABLE_WALLET - CWallet* const pwallet = GetWalletForJSONRPCRequest(request); - if (IsDeprecatedRPCEnabled("createmultisig") && EnsureWalletIsAvailable(pwallet, false)) { - pubkeys.push_back(AddrToPubKey(pwallet, keys[i].get_str())); - } else -#endif throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("Invalid public key: %s\nNote that from v0.16, createmultisig no longer accepts addresses." - " Clients must transition to using addmultisigaddress to create multisig addresses with addresses known to the wallet before upgrading to v0.17." - " To use the deprecated functionality, start bitcoind with -deprecatedrpc=createmultisig", keys[i].get_str())); + " Users must use addmultisigaddress to create multisig addresses with addresses known to the wallet.", keys[i].get_str())); } } |