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

Pass various internal dice errors back in JSON response

Browse Source
This commit is contained in:
Jonathan "Duke" Leto
2018-08-22 17:07:04 +02:00
parent b8245a9397
commit 505634eeae
1 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/cc/dice.cpp
View File

@@ -859,12 +859,17 @@ std::string DiceCreateFunding(uint64_t txfee,char *planstr,int64_t funds,int64_t
CMutableTransaction mtx; uint256 zero; CScript fundingPubKey; CPubKey mypk,dicepk; int64_t a,b,c,d; uint64_t sbits; struct CCcontract_info *cp,C; CMutableTransaction mtx; uint256 zero; CScript fundingPubKey; CPubKey mypk,dicepk; int64_t a,b,c,d; uint64_t sbits; struct CCcontract_info *cp,C;
if ( funds < 0 || minbet < 0 || maxbet < 0 || maxodds < 1 || maxodds > 9999 || timeoutblocks < 0 || timeoutblocks > 1440 ) if ( funds < 0 || minbet < 0 || maxbet < 0 || maxodds < 1 || maxodds > 9999 || timeoutblocks < 0 || timeoutblocks > 1440 )
{ {
fprintf(stderr,"negative parameter error\n"); CCerror = "invalid parameter error";
fprintf(stderr,"%s\n", CCerror.c_str() );
return(""); return("");
} }
memset(&zero,0,sizeof(zero)); memset(&zero,0,sizeof(zero));
if ( (cp= Diceinit(fundingPubKey,zero,&C,planstr,txfee,mypk,dicepk,sbits,a,b,c,d)) == 0 ) if ( (cp= Diceinit(fundingPubKey,zero,&C,planstr,txfee,mypk,dicepk,sbits,a,b,c,d)) == 0 )
{
CCerror = "Diceinit error";
fprintf(stderr,"%s\n", CCerror.c_str() );
return(""); return("");
}
if ( AddNormalinputs(mtx,mypk,funds+3*txfee,60) > 0 ) if ( AddNormalinputs(mtx,mypk,funds+3*txfee,60) > 0 )
{ {
mtx.vout.push_back(MakeCC1vout(cp->evalcode,funds,dicepk)); mtx.vout.push_back(MakeCC1vout(cp->evalcode,funds,dicepk));
@@ -872,7 +877,8 @@ std::string DiceCreateFunding(uint64_t txfee,char *planstr,int64_t funds,int64_t
mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(HexStr(dicepk)) << OP_CHECKSIG)); mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(HexStr(dicepk)) << OP_CHECKSIG));
return(FinalizeCCTx(0,cp,mtx,mypk,txfee,EncodeDiceFundingOpRet('F',sbits,minbet,maxbet,maxodds,timeoutblocks))); return(FinalizeCCTx(0,cp,mtx,mypk,txfee,EncodeDiceFundingOpRet('F',sbits,minbet,maxbet,maxodds,timeoutblocks)));
} }
fprintf(stderr,"cant find enough inputs\n"); CCerror = "cant find enough inputs";
fprintf(stderr,"%s\n", CCerror.c_str() );
return(""); return("");
} }
@@ -881,7 +887,8 @@ std::string DiceAddfunding(uint64_t txfee,char *planstr,uint256 fundingtxid,int6
CMutableTransaction mtx; CScript fundingPubKey,scriptPubKey; uint256 entropy,hentropy; CPubKey mypk,dicepk; uint64_t sbits; struct CCcontract_info *cp,C; int64_t minbet,maxbet,maxodds,timeoutblocks; CMutableTransaction mtx; CScript fundingPubKey,scriptPubKey; uint256 entropy,hentropy; CPubKey mypk,dicepk; uint64_t sbits; struct CCcontract_info *cp,C; int64_t minbet,maxbet,maxodds,timeoutblocks;
if ( amount < 0 ) if ( amount < 0 )
{ {
fprintf(stderr,"negative parameter\n"); CCerror = "amount must be positive";
fprintf(stderr,"%s\n", CCerror.c_str() );
return(""); return("");
} }
if ( (cp= Diceinit(fundingPubKey,fundingtxid,&C,planstr,txfee,mypk,dicepk,sbits,minbet,maxbet,maxodds,timeoutblocks)) == 0 ) if ( (cp= Diceinit(fundingPubKey,fundingtxid,&C,planstr,txfee,mypk,dicepk,sbits,minbet,maxbet,maxodds,timeoutblocks)) == 0 )
@@ -907,31 +914,46 @@ std::string DiceAddfunding(uint64_t txfee,char *planstr,uint256 fundingtxid,int6
mtx.vout.push_back(MakeCC1vout(cp->evalcode,amount,dicepk)); mtx.vout.push_back(MakeCC1vout(cp->evalcode,amount,dicepk));
mtx.vout.push_back(CTxOut(txfee,fundingPubKey)); mtx.vout.push_back(CTxOut(txfee,fundingPubKey));
return(FinalizeCCTx(0,cp,mtx,mypk,txfee,EncodeDiceOpRet('E',sbits,fundingtxid,hentropy,zeroid))); return(FinalizeCCTx(0,cp,mtx,mypk,txfee,EncodeDiceOpRet('E',sbits,fundingtxid,hentropy,zeroid)));
} else fprintf(stderr,"cant find enough inputs\n"); } else {
} else fprintf(stderr,"only fund creator can add more funds (entropy)\n"); CCerror = "cant find enough inputs";
fprintf(stderr,"%s\n", CCerror.c_str() );
}
} else {
CCerror = "only fund creator can add more funds (entropy)";
fprintf(stderr,"%s\n", CCerror.c_str() );
}
return(""); return("");
} }
std::string DiceBet(uint64_t txfee,char *planstr,uint256 fundingtxid,int64_t bet,int32_t odds) std::string DiceBet(uint64_t txfee,char *planstr,uint256 fundingtxid,int64_t bet,int32_t odds)
{ {
CMutableTransaction mtx; CScript fundingPubKey; CPubKey mypk,dicepk; uint64_t sbits,entropyval; int64_t funding,minbet,maxbet,maxodds,timeoutblocks; uint256 entropytxid,entropy,hentropy; struct CCcontract_info *cp,C; CMutableTransaction mtx; CScript fundingPubKey; CPubKey mypk,dicepk; uint64_t sbits,entropyval; int64_t funding,minbet,maxbet,maxodds,timeoutblocks; uint256 entropytxid,entropy,hentropy; struct CCcontract_info *cp,C;
if ( bet < 0 || odds < 1 || odds > 9999 ) if ( bet < 0 )
{ {
fprintf(stderr,"negative parameter or odds too big error\n"); CCerror = "bet must be positive";
fprintf(stderr,"%s\n", CCerror.c_str() );
return("");
}
if ( odds < 1 || odds > 9999 )
{
CCerror = "odds must be between 1 and 9999";
fprintf(stderr,"%s\n", CCerror.c_str() );
return(""); return("");
} }
if ( (cp= Diceinit(fundingPubKey,fundingtxid,&C,planstr,txfee,mypk,dicepk,sbits,minbet,maxbet,maxodds,timeoutblocks)) == 0 ) if ( (cp= Diceinit(fundingPubKey,fundingtxid,&C,planstr,txfee,mypk,dicepk,sbits,minbet,maxbet,maxodds,timeoutblocks)) == 0 )
return(""); return("");
if ( bet < minbet || bet > maxbet || odds > maxodds ) if ( bet < minbet || bet > maxbet || odds > maxodds )
{ {
fprintf(stderr,"Dice plan %s illegal bet %.8f: minbet %.8f maxbet %.8f or odds %d vs max.%d\n",planstr,(double)bet/COIN,(double)minbet/COIN,(double)maxbet/COIN,(int32_t)odds,(int32_t)maxodds); CCerror = strprintf("Dice plan %s illegal bet %.8f: minbet %.8f maxbet %.8f or odds %d vs max.%d\n",planstr,(double)bet/COIN,(double)minbet/COIN,(double)maxbet/COIN,(int32_t)odds,(int32_t)maxodds);
fprintf(stderr,"%s\n", CCerror.c_str() );
return(""); return("");
} }
if ( (funding= DicePlanFunds(entropyval,entropytxid,sbits,cp,dicepk,fundingtxid)) >= 2*bet*odds+txfee && entropyval != 0 ) if ( (funding= DicePlanFunds(entropyval,entropytxid,sbits,cp,dicepk,fundingtxid)) >= 2*bet*odds+txfee && entropyval != 0 )
{ {
if ( myIsutxo_spentinmempool(entropytxid,0) != 0 ) if ( myIsutxo_spentinmempool(entropytxid,0) != 0 )
{ {
fprintf(stderr,"entropy txid is spent\n"); CCerror = "entropy txid is spent";
fprintf(stderr,"%s\n", CCerror.c_str() );
return(""); return("");
} }
mtx.vin.push_back(CTxIn(entropytxid,0,CScript())); mtx.vin.push_back(CTxIn(entropytxid,0,CScript()));
@@ -945,8 +967,10 @@ std::string DiceBet(uint64_t txfee,char *planstr,uint256 fundingtxid,int64_t bet
} else fprintf(stderr,"cant find enough inputs %.8f note enough for %.8f\n",(double)funding/COIN,(double)bet/COIN); } else fprintf(stderr,"cant find enough inputs %.8f note enough for %.8f\n",(double)funding/COIN,(double)bet/COIN);
} }
if ( entropyval == 0 && funding != 0 ) if ( entropyval == 0 && funding != 0 )
fprintf(stderr,"cant find dice entropy inputs\n"); CCerror = "cant find dice entropy inputs";
else fprintf(stderr,"cant find dice inputs\n"); else
CCerror = "cant find dice input";
fprintf(stderr,"%s\n", CCerror.c_str() );
return(""); return("");
} }
@@ -1015,7 +1039,8 @@ std::string DiceBetFinish(int32_t *resultp,uint64_t txfee,char *planstr,uint256
odds = (betTx.vout[2].nValue - txfee); odds = (betTx.vout[2].nValue - txfee);
if ( odds < 1 || odds > maxodds ) if ( odds < 1 || odds > maxodds )
{ {
fprintf(stderr,"illegal odds.%d vs maxodds.%d\n",(int32_t)odds,(int32_t)maxodds); CCerror = strprintf("illegal odds.%d vs maxodds.%d\n",(int32_t)odds,(int32_t)maxodds);
fprintf(stderr,"%s\n", CCerror.c_str() );
return(""); return("");
} }
CCchange = betTx.vout[0].nValue + betTx.vout[1].nValue; CCchange = betTx.vout[0].nValue + betTx.vout[1].nValue;
@@ -1029,7 +1054,8 @@ std::string DiceBetFinish(int32_t *resultp,uint64_t txfee,char *planstr,uint256
} }
else else
{ {
fprintf(stderr,"not enough inputs for %.8f\n",(double)fundsneeded/COIN); CCerror = strprintf("not enough inputs for %.8f\n",(double)fundsneeded/COIN);
fprintf(stderr,"%s\n", CCerror.c_str() );
return(""); return("");
} }
mtx.vout.push_back(MakeCC1vout(cp->evalcode,CCchange,dicepk)); mtx.vout.push_back(MakeCC1vout(cp->evalcode,CCchange,dicepk));
@@ -1058,7 +1084,8 @@ std::string DiceBetFinish(int32_t *resultp,uint64_t txfee,char *planstr,uint256
} }
} }
*resultp = -1; *resultp = -1;
fprintf(stderr,"couldnt find bettx or entropytx\n"); CCerror = "couldnt find bettx or entropytx";
fprintf(stderr,"%s\n", CCerror.c_str() );
return(""); return("");
} }