mleku/libblkmaker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix_limits_opt' into 0.1.x

Browse Source
This commit is contained in:
Luke Dashjr
2012-11-17 20:31:29 +00:00
parent b86d129ed4 dd25439b04
commit 338e396678
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
blkmaker_jansson.c
View File

@@ -209,8 +209,10 @@ const char *blktmpl_add_jansson(blktemplate_t *tmpl, const json_t *json, time_t
GETNUM(height);
GETHEX(previousblockhash, prevblk);
my_flip(tmpl->prevblk, 32);
GETNUM(sigoplimit);
GETNUM(sizelimit);
if (json_object_get(json, "sigoplimit"))
GETNUM(sigoplimit);
if (json_object_get(json, "sizelimit"))
GETNUM(sizelimit);
GETNUM(version);
if ((v = json_object_get(json, "coinbasevalue")) && json_is_number(v))

4
blktemplate.c
View File

@@ -1,5 +1,6 @@
#define _BSD_SOURCE
#include <limits.h>
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
@@ -55,6 +56,9 @@ blktemplate_t *blktmpl_create() {
if (!tmpl)
return NULL;
tmpl->sigoplimit = USHRT_MAX;
tmpl->sizelimit = ULONG_MAX;
tmpl->maxtime = 0xffffffff;
tmpl->maxtimeoff = 0x7fff;
tmpl->mintimeoff = -0x7fff;