Merge pull request #6234

laanwj · laanwj · commit d38cd47fe3d6 · 2015-06-05T06:06:38.000+02:00
ef5fca8 fix rpcmining/getblocktemplate univalue transition logic error (Jonas Schnelli)
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp
@@ -398,7 +398,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
         if (strMode == "proposal")
         {
             const UniValue& dataval = find_value(oparam, "data");
-            if (dataval.isStr())
+            if (!dataval.isStr())
                 throw JSONRPCError(RPC_TYPE_ERROR, "Missing data String key for proposal");
 
             CBlock block;

Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)`
`398`	`398`	`if (strMode == "proposal")`
`399`	`399`	`{`
`400`	`400`	`const UniValue& dataval = find_value(oparam, "data");`
`401`		`- if (dataval.isStr())`
	`401`	`+ if (!dataval.isStr())`
`402`	`402`	`throw JSONRPCError(RPC_TYPE_ERROR, "Missing data String key for proposal");`
`403`	`403`
`404`	`404`	`CBlock block;`