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

Qr

Browse Source
This commit is contained in:
jl777
2019-02-10 11:48:28 -11:00
parent 79ce5721dd
commit d4015ad408
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cc/rogue_rpc.cpp
View File

@@ -709,7 +709,7 @@ UniValue rogue_register(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
CCaddr1of2set(cp,roguepk,roguepk,cp->CCpriv,destaddr); CCaddr1of2set(cp,roguepk,roguepk,cp->CCpriv,destaddr);
mtx.vout.push_back(MakeTokensCC1vout(cp->evalcode, 1, burnpk)); mtx.vout.push_back(MakeTokensCC1vout(cp->evalcode, 1, burnpk));
std::vector<uint8_t> vopretFinish, vopret2; uint8_t e, f; uint256 tokenid; std::vector<CPubKey> voutPubkeys, voutPubkeysEmpty; int32_t didtx = 0; std::vector<uint8_t> vopretFinish, vopret2; uint8_t e, funcid; uint256 tokenid; std::vector<CPubKey> voutPubkeys, voutPubkeysEmpty; int32_t didtx = 0;
CScript opretRegister = rogue_registeropret(gametxid, playertxid); CScript opretRegister = rogue_registeropret(gametxid, playertxid);
if ( playertxid != zeroid ) if ( playertxid != zeroid )
{ {
@@ -717,10 +717,10 @@ UniValue rogue_register(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
voutPubkeysEmpty.push_back(burnpk); voutPubkeysEmpty.push_back(burnpk);
if ( GetTransaction(playertxid,playertx,hashBlock,false) != 0 ) if ( GetTransaction(playertxid,playertx,hashBlock,false) != 0 )
{ {
if ( DecodeTokenOpRet(playertx.vout.back().scriptPubKey, e, tokenid, voutPubkeys, vopretFinish, vopret2) != 0) if ( (funcid= DecodeTokenOpRet(playertx.vout.back().scriptPubKey, e, tokenid, voutPubkeys, vopretFinish, vopret2)) != 0)
{ // if token in the opret { // if token in the opret
didtx = 1; didtx = 1;
if ( tokenid == zeroid ) if ( funcid == 'c' )
tokenid = playertxid; tokenid = playertxid;
vopretFinish.resize(0); vopretFinish.resize(0);
rawtx = FinalizeCCTx(0, cp, mtx, mypk, txfee, rawtx = FinalizeCCTx(0, cp, mtx, mypk, txfee,