Merge commit '2cad5fd' into 0.4.x

2016-08-11 07:39:09 +00:00
parent ce5125dc90 2cad5fdadb
commit acc9266d63
1 changed files with 2 additions and 0 deletions
--- a/blkmaker_jansson.c
+++ b/blkmaker_jansson.c
@@ -251,6 +251,8 @@ const char *blktmpl_add_jansson(blktemplate_t *tmpl, const json_t *json, time_t
 		tmpl->cbtxn = calloc(1, sizeof(*tmpl->cbtxn));
 		if ((s = parse_txn(tmpl->cbtxn, v)))
 			return s;
+	} else if (!tmpl->cbvalue) {
+		return "Missing either coinbasetxn or coinbasevalue";
 	}
 	
 	// TODO: coinbaseaux