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

Fixes

Browse Source
This commit is contained in:
jl777
2019-03-22 02:05:19 -11:00
parent 1747b7ebea
commit c9765fec2a
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/cc/gamescc.cpp
View File

@@ -69,14 +69,13 @@ UniValue games_rngnext(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
UniValue games_rng(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) UniValue games_rng(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
{ {
UniValue result(UniValue::VOBJ); int32_t i,n,playerid=0; uint64_t seed,initseed; bits256 hash; UniValue result(UniValue::VOBJ); int32_t i,n,playerid=0; uint64_t seed=0,initseed; bits256 hash;
if ( params != 0 && ((n= cJSON_GetArraySize(params)) == 2 || n == 3) ) if ( params != 0 && ((n= cJSON_GetArraySize(params)) == 1 || n == 2) )
{ {
hash = jbits256(jitem(params,0),0); hash = jbits256(jitem(params,0),0);
seed = jdouble(jitem(params,1),0); if ( n == 2 )
if ( n == 3 )
{ {
playerid = juint(jitem(params,2),0); playerid = juint(jitem(params,1),0);
if ( playerid >= 0xff ) if ( playerid >= 0xff )
{ {
result.push_back(Pair("result","error")); result.push_back(Pair("result","error"));
@@ -84,14 +83,11 @@ UniValue games_rng(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
return(result); return(result);
} }
} }
if ( seed == 0 ) playerid++;
for (i=0; i<8; i++)
{ {
playerid++; if ( ((1 << i) & playerid) != 0 )
for (i=0; i<8; i++) seed ^= (uint64_t)hash.uints[i] << ((i&1)*32);
{
if ( ((1 << i) & playerid) != 0 )
seed ^= (uint64_t)hash.uints[i] << ((i&1)*32);
}
} }
initseed = seed; initseed = seed;
seed = _games_rngnext(initseed); seed = _games_rngnext(initseed);

2
src/cc/gamescc.h
View File

@@ -11,7 +11,7 @@ std::string MYCCLIBNAME = (char *)"gamescc";
#define MYCCNAME "games" #define MYCCNAME "games"
#define RPC_FUNCS \ #define RPC_FUNCS \
{ (char *)MYCCNAME, (char *)"rng", (char *)"hash,seed,playerid", 2, 3, ' ', EVAL_GAMES }, \ { (char *)MYCCNAME, (char *)"rng", (char *)"hash,playerid", 1, 2, ' ', EVAL_GAMES }, \
{ (char *)MYCCNAME, (char *)"rngnext", (char *)"seed", 1, 1, ' ', EVAL_GAMES }, { (char *)MYCCNAME, (char *)"rngnext", (char *)"seed", 1, 1, ' ', EVAL_GAMES },
bool games_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const CTransaction tx); bool games_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const CTransaction tx);