DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Test

Browse Source
This commit is contained in:
jl777
2019-01-12 08:24:41 -11:00
parent 4c900a4708
commit 3fb0d3a82a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cc/marmara.cpp
View File

@@ -178,7 +178,7 @@ int32_t MarmaraValidateCoinbase(int32_t height,CTransaction tx)
{
if ( ht == height && MarmaraUnlockht(height) == unlockht )
{
fprintf(stderr,"ht.%d -> unlock.%d\n",ht,unlockht);
//fprintf(stderr,"ht.%d -> unlock.%d\n",ht,unlockht);
ccvout = MakeCC1vout(EVAL_MARMARA,0,pk);
if ( ccvout.scriptPubKey == tx.vout[0].scriptPubKey )
return(0);

3
src/wallet/rpcwallet.cpp
View File

@@ -5534,7 +5534,7 @@ UniValue tokenaddress(const UniValue& params, bool fHelp)
UniValue marmara_poolpayout(const UniValue& params, bool fHelp)
{
int32_t firstheight; double perc; char *jsonstr;
if ( fHelp || params.size() != 3 )
if ( fHelp || params.size() < 3 )
{
fprintf(stderr,"params.size %d\n",(int32_t)params.size());
throw runtime_error("marmara_poolpayout perc firstheight \"[[\\\"pubkey\\\":shares], ...]\"\n");
@@ -5544,6 +5544,7 @@ UniValue marmara_poolpayout(const UniValue& params, bool fHelp)
perc = atof(params[0].get_str().c_str()) / 100.;
firstheight = atol(params[1].get_str().c_str());
jsonstr = (char *)params[2].get_str().c_str();
fprintf(stderr,"perc %.2f ht.%d (%s)\n",perc,firstheight,jsonstr);
return(MarmaraPoolPayout(0,firstheight,perc,jsonstr)); // [[pk0, shares0], [pk1, shares1], ...]
}