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

Test

Browse Source
This commit is contained in:
jl777
2019-03-27 09:16:03 -11:00
parent 7b6ad019e6
commit ecd3a17c85
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/cc/games/prices.cpp
View File

@@ -52,10 +52,10 @@ int64_t prices_blockinfo(int32_t height,char *acaddr)
} else return(-1); } else return(-1);
} }
UniValue games_origsettle(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) UniValue games_settle(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
{ {
UniValue result; char acaddr[64]; CPubKey acpk,mypk,gamespk; int64_t prizefund = 0; int32_t height,nextheight = komodo_nextheight(); UniValue result; char acaddr[64]; CPubKey acpk,mypk,gamespk; int64_t prizefund = 0; int32_t height,nextheight = komodo_nextheight();
if ( 1 || ASSETCHAINS_OVERRIDE_PUBKEY33[0] == 0 ) if ( ASSETCHAINS_OVERRIDE_PUBKEY33[0] == 0 )
{ {
result.push_back(Pair("result","error")); result.push_back(Pair("result","error"));
result.push_back(Pair("error"," no -ac_pubkey for price reference")); result.push_back(Pair("error"," no -ac_pubkey for price reference"));
@@ -64,6 +64,16 @@ UniValue games_origsettle(uint64_t txfee,struct CCcontract_info *cp,cJSON *param
mypk = pubkey2pk(Mypubkey()); mypk = pubkey2pk(Mypubkey());
gamespk = GetUnspendable(cp,0); gamespk = GetUnspendable(cp,0);
acpk = buf2pk(ASSETCHAINS_OVERRIDE_PUBKEY33); acpk = buf2pk(ASSETCHAINS_OVERRIDE_PUBKEY33);
result.push_back(Pair("result","success"));
if ( params != 0 && cJSON_GetArraySize(params) == 1 )
{
height = juint(jitem(params,0),0);
result.push_back(Pair("height",(int64_t)height));
}
return(result);
/*mypk = pubkey2pk(Mypubkey());
gamespk = GetUnspendable(cp,0);
acpk = buf2pk(ASSETCHAINS_OVERRIDE_PUBKEY33);
Getscriptaddress(acaddr,CScript() << ParseHex(HexStr(acpk)) << OP_CHECKSIG); Getscriptaddress(acaddr,CScript() << ParseHex(HexStr(acpk)) << OP_CHECKSIG);
if ( params != 0 && cJSON_GetArraySize(params) == 1 ) if ( params != 0 && cJSON_GetArraySize(params) == 1 )
{ {
@@ -91,7 +101,7 @@ UniValue games_origsettle(uint64_t txfee,struct CCcontract_info *cp,cJSON *param
result.push_back(Pair("result","error")); result.push_back(Pair("result","error"));
result.push_back(Pair("error","couldnt parse")); result.push_back(Pair("error","couldnt parse"));
} }
return(result); return(result);*/
} }
UniValue games_settle(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) UniValue games_settle(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
@@ -110,7 +120,7 @@ UniValue games_settle(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
result.push_back(Pair("result","success")); result.push_back(Pair("result","success"));
if ( params != 0 && cJSON_GetArraySize(params) == 1 ) if ( params != 0 && cJSON_GetArraySize(params) == 1 )
{ {
//height = juint(jitem(params,0),0); height = juint(jitem(params,0),0);
result.push_back(Pair("height",(int64_t)height)); result.push_back(Pair("height",(int64_t)height));
} }
/*if ( params != 0 && cJSON_GetArraySize(params) == 2 ) /*if ( params != 0 && cJSON_GetArraySize(params) == 2 )