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

add rogueaddr to extract

Browse Source
This commit is contained in:
jl777
2019-02-27 01:55:59 -11:00
parent bfdd14c4fd
commit 4e9aa2136d
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/cc/rogue_rpc.cpp
View File

@@ -996,6 +996,7 @@ UniValue rogue_extract(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
roguepk = GetUnspendable(cp,0); roguepk = GetUnspendable(cp,0);
result.push_back(Pair("name","rogue")); result.push_back(Pair("name","rogue"));
result.push_back(Pair("method","extract")); result.push_back(Pair("method","extract"));
rogueaddr[0] = 0;
if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 ) if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 )
{ {
if ( n > 0 ) if ( n > 0 )
@@ -1004,14 +1005,20 @@ UniValue rogue_extract(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
result.push_back(Pair("gametxid",gametxid.GetHex())); result.push_back(Pair("gametxid",gametxid.GetHex()));
if ( n == 2 ) if ( n == 2 )
{ {
if ( (pubstr= jstr(jitem(params,1),0)) != 0 && strlen(pubstr) == 66 ) if ( (pubstr= jstr(jitem(params,1),0)) != 0 )
{ {
decode_hex(pub33,33,pubstr); if (strlen(pubstr) == 66 )
pk = buf2pk(pub33); {
decode_hex(pub33,33,pubstr);
pk = buf2pk(pub33);
}
else if ( strlen(pub33) < 36 )
strcpy(rogueaddr,pubstr);
} }
//fprintf(stderr,"gametxid.%s %s\n",gametxid.GetHex().c_str(),pubstr); //fprintf(stderr,"gametxid.%s %s\n",gametxid.GetHex().c_str(),pubstr);
} }
GetCCaddress1of2(cp,rogueaddr,roguepk,pk); if ( rogueaddr[0] == 0 )
GetCCaddress1of2(cp,rogueaddr,roguepk,pk);
result.push_back(Pair("rogueaddr",rogueaddr)); result.push_back(Pair("rogueaddr",rogueaddr));
str[0] = 0; str[0] = 0;
if ( (keystrokes= rogue_extractgame(1,str,&numkeys,newdata,seed,playertxid,cp,gametxid,rogueaddr)) != 0 ) if ( (keystrokes= rogue_extractgame(1,str,&numkeys,newdata,seed,playertxid,cp,gametxid,rogueaddr)) != 0 )