aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2018-04-29 19:34:57 -0400
committerMarcoFalke <falke.marco@gmail.com>2018-05-29 16:49:52 -0400
commitfa7a6cf1b36284db70e941bd2915fd6edbb0f9d6 (patch)
tree7a69ae65066c91fec3f7a0c23debf8905d793f55 /src/wallet
parent3a8e3f480612e29f5a8b208f31cedc687f66b9df (diff)
downloadbitcoin-fa7a6cf1b36284db70e941bd2915fd6edbb0f9d6.tar.xz
policy: Treat segwit as always active
Diffstat (limited to 'src/wallet')
-rw-r--r--src/wallet/rpcwallet.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 3809eb3dd7..f4bb5ce95d 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -1457,13 +1457,6 @@ static UniValue addwitnessaddress(const JSONRPCRequest& request)
"Projects should transition to using the address_type argument of getnewaddress, or option -addresstype=[bech32|p2sh-segwit] instead.\n");
}
- {
- LOCK(cs_main);
- if (!IsWitnessEnabled(chainActive.Tip(), Params().GetConsensus()) && !gArgs.GetBoolArg("-walletprematurewitness", false)) {
- throw JSONRPCError(RPC_WALLET_ERROR, "Segregated witness not enabled on network");
- }
- }
-
CTxDestination dest = DecodeDestination(request.params[0].get_str());
if (!IsValidDestination(dest)) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address");