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

Merge branch '0.1.x' into 0.2.x

Browse Source
This commit is contained in:
Luke Dashjr
2014-02-27 16:43:55 +00:00
parent 07fe5b155a ebe52b71c8
commit 300180210e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
blkmaker.c
View File

@@ -231,12 +231,14 @@ size_t blkmk_get_data(blktemplate_t *tmpl, void *buf, size_t bufsz, time_t useti
if (!build_merkle_root(&cbuf[36], tmpl, cbtxndata, cbtxndatasz))
return 0;
blktime_t timehdr = tmpl->curtime + difftime(usetime, tmpl->_time_rcvd);
double time_passed = difftime(usetime, tmpl->_time_rcvd);
blktime_t timehdr = tmpl->curtime + time_passed;
if (timehdr > tmpl->maxtime)
timehdr = tmpl->maxtime;
my_htole32(&cbuf[68], timehdr);
memcpy(&cbuf[72], &tmpl->diffbits, 4);
// TODO: set *out_expire if provided
if (out_expire)
*out_expire = tmpl->expires - time_passed - 1;
// TEMPORARY HACK:
memcpy(tmpl->_mrklroot, &cbuf[36], 32);