aboutsummaryrefslogtreecommitdiff
path: root/src/rpc/mining.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/rpc/mining.cpp')
-rw-r--r--src/rpc/mining.cpp14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 183082f64..17e8fd57a 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -936,7 +936,7 @@ UniValue estimatesmartpriority(const JSONRPCRequest& request)
/* ************************************************************************** */
/* Merge mining. */
-UniValue getauxblock(const JSONRPCRequest& request)
+UniValue getauxblockbip22(const JSONRPCRequest& request)
{
if (request.fHelp
|| (request.params.size() != 0 && request.params.size() != 2))
@@ -1102,6 +1102,18 @@ UniValue getauxblock(const JSONRPCRequest& request)
return BIP22ValidationResult(sc.state);
}
+UniValue getauxblock(const JSONRPCRequest& request)
+{
+ const UniValue response = getauxblockbip22(request);
+
+ // this is a request for a new blocktemplate: return response
+ if (request.params.size() == 0)
+ return response;
+
+ // this is a new block submission: return bool
+ return response.isNull();
+}
+
/* ************************************************************************** */
static const CRPCCommand commands[] =