Merge pull request #3727

laanwj · laanwj · commit ff17816abf2d · 2014-11-03T20:55:46.000+01:00
e69a587 RPC: submitblock: Support for returning specific rejection reasons (Luke Dashjr)
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp
@@ -593,7 +593,12 @@ Value submitblock(const Array& params, bool fHelp)
         throw JSONRPCError(RPC_VERIFY_ERROR, strRejectReason);
     }
     if (state.IsInvalid())
-        return "rejected"; // TODO: report validation state
+    {
+        std::string strRejectReason = state.GetRejectReason();
+        if (strRejectReason.empty())
+            return "rejected";
+        return strRejectReason;
+    }
 
     return Value::null;
 }

Original file line number	Diff line number	Diff line change
`@@ -593,7 +593,12 @@ Value submitblock(const Array& params, bool fHelp)`
`593`	`593`	`throw JSONRPCError(RPC_VERIFY_ERROR, strRejectReason);`
`594`	`594`	`}`
`595`	`595`	`if (state.IsInvalid())`
`596`		`- return "rejected"; // TODO: report validation state`
	`596`	`+ {`
	`597`	`+ std::string strRejectReason = state.GetRejectReason();`
	`598`	`+ if (strRejectReason.empty())`
	`599`	`+ return "rejected";`
	`600`	`+ return strRejectReason;`
	`601`	`+ }`
`597`	`602`
`598`	`603`	`return Value::null;`
`599`	`604`	`}`