This commit is contained in:
jl777
2019-03-25 01:52:16 -11:00
parent 7ba094ac28
commit fe20bf47b0

View File

@@ -53,10 +53,9 @@ CScript games_eventopret(CPubKey pk,std::vector<uint8_t> sig,std::vector<uint8_t
return(opret); return(opret);
} }
uint8_t games_eventdecode(CPubKey &pk,std::vector<uint8_t> &sig,std::vector<uint8_t> &payload,std::vector<uint8_t> message) uint8_t games_eventdecode(CPubKey &pk,std::vector<uint8_t> &sig,std::vector<uint8_t> &payload,std::vector<uint8_t> vopret)
{ {
std::vector<uint8_t> vopret; uint8_t e,f; uint8_t e,f;
GetOpReturnData(message,vopret);
if ( message.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> pk; ss >> sig; ss >> payload) != 0 && e == EVAL_GAMES ) if ( message.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> pk; ss >> sig; ss >> payload) != 0 && e == EVAL_GAMES )
{ {
return(f); return(f);
@@ -196,7 +195,7 @@ int32_t games_eventsign(std::vector<uint8_t> &sig,std::vector<uint8_t> payload,C
UniValue games_events(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) UniValue games_events(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
{ {
UniValue result(UniValue::VOBJ); std::vector<uint8_t> sig,payload; int32_t n; CPubKey mypk; char str[67]; CScript msg; UniValue result(UniValue::VOBJ); std::vector<uint8_t> sig,payload,vopret; int32_t n; CPubKey mypk; char str[67];
if ( params != 0 && (n= cJSON_GetArraySize(params)) == 1 ) if ( params != 0 && (n= cJSON_GetArraySize(params)) == 1 )
{ {
if ( payments_parsehexdata(payload,jitem(params,0),0) == 0 ) if ( payments_parsehexdata(payload,jitem(params,0),0) == 0 )
@@ -204,8 +203,8 @@ UniValue games_events(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
mypk = pubkey2pk(Mypubkey()); mypk = pubkey2pk(Mypubkey());
if ( games_eventsign(sig,payload,mypk) == 0 ) if ( games_eventsign(sig,payload,mypk) == 0 )
{ {
msg = games_eventopret(pk,sig,payload); GetOpReturnData(games_eventopret(pk,sig,payload),vopret);
komodo_sendmessage(4,8,"events",&msg[0],(int32_t)msg.size()); komodo_sendmessage(4,8,"events",&vopret[0],(int32_t)vopret.size());
result.push_back(Pair("result","success")); result.push_back(Pair("result","success"));
result.push_back(Pair("pubkey33",pubkey33_str(str,(uint8_t *)&mypk))); result.push_back(Pair("pubkey33",pubkey33_str(str,(uint8_t *)&mypk)));
} }