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

Merge commit '723a7e5' into 0.4.x

Browse Source
This commit is contained in:
Luke Dashjr 2016-08-10 22:04:58 +00:00
commit d594808495
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
blktemplate.c
View File

@ -26,7 +26,7 @@ static const char *capnames[] = {
"coinbase/append",
"coinbase",
"generate",
"generation",
"time/increment",
"time/decrement",
"transactions/add",
@ -53,6 +53,10 @@ gbt_capabilities_t blktmpl_getcapability(const char *n) {
for (unsigned int i = 0; i < GBT_CAPABILITY_COUNT; ++i)
if (capnames[i] && !strcasecmp(n, capnames[i]))
return 1 << i;
if (!strcasecmp(n, "time")) {
// multi-capability
return BMM_TIMEINC | BMM_TIMEDEC;
}
if (!strcasecmp(n, "transactions"))
return BMM_TXNADD; // Odd one as it's overloaded w/"transactions/add" per spec
return 0;

1
blktemplate.h
View File

@ -73,6 +73,7 @@ typedef enum {
extern const char *blktmpl_capabilityname(gbt_capabilities_t);
#define BLKTMPL_LONGEST_CAPABILITY_NAME (16)
// ABI FIXME: return uint32_t since "time" can yield a combination gbt_capabilities_t
extern gbt_capabilities_t blktmpl_getcapability(const char *);