|
|
@ -1619,7 +1619,10 @@ int64_t hush_checkcommission(CBlock *pblock,int32_t height) |
|
|
|
if(fDebug) |
|
|
|
fprintf(stderr,"%s at height=%d\n",__func__,height); |
|
|
|
int64_t checktoshis=0; uint8_t *script,scripthex[8192]; int32_t scriptlen,matched = 0; static bool didinit = false; |
|
|
|
ASSETCHAINS_SCRIPTPUB = devtax_scriptpub_for_height(height); |
|
|
|
|
|
|
|
// Create a local variable instead of modifying the global ASSETCHAINS_SCRIPTPUB
|
|
|
|
auto assetchains_scriptpub = devtax_scriptpub_for_height(height); |
|
|
|
|
|
|
|
if ( ASSETCHAINS_COMMISSION != 0 || ASSETCHAINS_FOUNDERS_REWARD != 0 ) |
|
|
|
{ |
|
|
|
checktoshis = the_commission(pblock,height); |
|
|
@ -1639,19 +1642,22 @@ int64_t hush_checkcommission(CBlock *pblock,int32_t height) |
|
|
|
fprintf(stderr,"%02x",script[i]); |
|
|
|
fprintf(stderr," vout[1] %.8f vs %.8f\n",(double)checktoshis/COIN,(double)pblock->vtx[0].vout[1].nValue/COIN); |
|
|
|
} |
|
|
|
if ( ASSETCHAINS_SCRIPTPUB.size() > 1 ) |
|
|
|
if ( assetchains_scriptpub.size() > 1 ) |
|
|
|
{ |
|
|
|
static bool didinit = false; |
|
|
|
if ( !didinit && height > HUSH_EARLYTXID_HEIGHT && HUSH_EARLYTXID != zeroid && hush_appendACscriptpub() ) |
|
|
|
{ |
|
|
|
fprintf(stderr, "appended CC_op_return to ASSETCHAINS_SCRIPTPUB.%s\n", ASSETCHAINS_SCRIPTPUB.c_str()); |
|
|
|
fprintf(stderr, "appended CC_op_return to assetchains_scriptpub.%s\n", assetchains_scriptpub.c_str()); |
|
|
|
didinit = true; |
|
|
|
} |
|
|
|
if ( ASSETCHAINS_SCRIPTPUB.size()/2 == scriptlen && scriptlen < sizeof(scripthex) ) |
|
|
|
if ( assetchains_scriptpub.size()/2 == scriptlen && scriptlen < sizeof(scripthex) ) |
|
|
|
{ |
|
|
|
decode_hex(scripthex,scriptlen,(char *)ASSETCHAINS_SCRIPTPUB.c_str()); |
|
|
|
if ( memcmp(scripthex,script,scriptlen) == 0 ) |
|
|
|
decode_hex(scripthex,scriptlen,(char *)assetchains_scriptpub.c_str()); |
|
|
|
if ( memcmp(scripthex,script,scriptlen) == 0 ) { |
|
|
|
matched = scriptlen; |
|
|
|
} else { |
|
|
|
fprintf(stderr, "%s: assetchains_scriptpub != scripthex scriptlen=%d\n", __func__, scriptlen); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
else if ( scriptlen == 35 && script[0] == 33 && script[34] == OP_CHECKSIG && memcmp(script+1,ASSETCHAINS_OVERRIDE_PUBKEY33,33) == 0 ) |
|
|
@ -1660,19 +1666,19 @@ int64_t hush_checkcommission(CBlock *pblock,int32_t height) |
|
|
|
matched = 25; |
|
|
|
if ( matched == 0 ) |
|
|
|
{ |
|
|
|
if ( ASSETCHAINS_SCRIPTPUB.size() > 1 ) |
|
|
|
if ( assetchains_scriptpub.size() > 1 ) |
|
|
|
{ |
|
|
|
int32_t i; |
|
|
|
fprintf(stderr,"%s: ASSETCHAINS_SCRIPTPUB=", __func__); |
|
|
|
for (i=0; i<ASSETCHAINS_SCRIPTPUB.size(); i++) { |
|
|
|
fprintf(stderr,"%02x",ASSETCHAINS_SCRIPTPUB[i]); |
|
|
|
fprintf(stderr,"%s: assetchains_scriptpub=", __func__); |
|
|
|
for (i=0; i<assetchains_scriptpub.size(); i++) { |
|
|
|
fprintf(stderr,"%02x",assetchains_scriptpub[i]); |
|
|
|
} |
|
|
|
fprintf(stderr," vs script="); |
|
|
|
for (i=0; i<scriptlen; i++) { |
|
|
|
fprintf(stderr,"%02x",script[i]); |
|
|
|
} |
|
|
|
} |
|
|
|
fprintf(stderr," -ac[%d] payment to wrong pubkey scriptlen.%d, scriptpub[%d] checktoshis.%llu\n",(int32_t)ASSETCHAINS_SCRIPTPUB.size(),scriptlen,(int32_t)ASSETCHAINS_SCRIPTPUB.size()/2,(long long)checktoshis); |
|
|
|
fprintf(stderr," -ac[%d] payment to wrong pubkey scriptlen.%d, scriptpub[%d] checktoshis.%llu\n",(int32_t)assetchains_scriptpub.size(),scriptlen,(int32_t)assetchains_scriptpub.size()/2,(long long)checktoshis); |
|
|
|
return(-1); |
|
|
|
|
|
|
|
} |
|
|
@ -1738,13 +1744,14 @@ int32_t hush_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height) |
|
|
|
} |
|
|
|
if ( failed == 0 && ASSETCHAINS_COMMISSION != 0 ) { |
|
|
|
if ( height == 1 ) { |
|
|
|
ASSETCHAINS_SCRIPTPUB = devtax_scriptpub_for_height(height); |
|
|
|
if ( ASSETCHAINS_SCRIPTPUB.size() > 1 && ASSETCHAINS_SCRIPTPUB[ASSETCHAINS_SCRIPTPUB.back()] != 49 && ASSETCHAINS_SCRIPTPUB[ASSETCHAINS_SCRIPTPUB.back()-1] != 51 ) { |
|
|
|
// Create a local variable instead of modifying the global assetchains_scriptpub
|
|
|
|
auto assetchains_scriptpub = devtax_scriptpub_for_height(height); |
|
|
|
if ( assetchains_scriptpub.size() > 1 && assetchains_scriptpub[assetchains_scriptpub.back()] != 49 && assetchains_scriptpub[assetchains_scriptpub.back()-1] != 51 ) { |
|
|
|
int32_t scriptlen; uint8_t scripthex[10000]; |
|
|
|
script = (uint8_t *)&pblock->vtx[0].vout[0].scriptPubKey[0]; |
|
|
|
scriptlen = (int32_t)pblock->vtx[0].vout[0].scriptPubKey.size(); |
|
|
|
if ( ASSETCHAINS_SCRIPTPUB.size()/2 == scriptlen && scriptlen < sizeof(scripthex) ) { |
|
|
|
decode_hex(scripthex,scriptlen,(char *)ASSETCHAINS_SCRIPTPUB.c_str()); |
|
|
|
if ( assetchains_scriptpub.size()/2 == scriptlen && scriptlen < sizeof(scripthex) ) { |
|
|
|
decode_hex(scripthex,scriptlen,(char *)assetchains_scriptpub.c_str()); |
|
|
|
if ( memcmp(scripthex,script,scriptlen) != 0 ) |
|
|
|
return(-1); |
|
|
|
} else return(-1); |
|
|
|