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

Merge pull request #1234 from dimxy/add-nf-token-opret

Browse Source 
token opret and vout added
This commit is contained in:
jl777
2019-02-10 04:25:37 -11:00
committed by GitHub
parent 73a696f008 5229df57d4
commit 109498bc7e
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cc/rogue_rpc.cpp
View File

@@ -822,7 +822,8 @@ UniValue rogue_finishgame(uint64_t txfee,struct CCcontract_info *cp,cJSON *param
mtx.vin.push_back(CTxIn(gametxid,1+maxplayers+regslot,CScript())); mtx.vin.push_back(CTxIn(gametxid,1+maxplayers+regslot,CScript()));
if ( funcid == 'H' ) if ( funcid == 'H' )
mtx.vin.push_back(CTxIn(gametxid,0,CScript())); mtx.vin.push_back(CTxIn(gametxid,0,CScript()));
mtx.vout.push_back(MakeCC1vout(cp->evalcode,1,mypk)); //mtx.vout.push_back(MakeCC1vout(cp->evalcode,1,mypk));
mtx.vout.push_back(MakeTokensCC1vout(cp->evalcode, 1, mypk));
if ( num > 0 ) if ( num > 0 )
{ {
newdata.resize(num); newdata.resize(num);
@@ -851,8 +852,15 @@ UniValue rogue_finishgame(uint64_t txfee,struct CCcontract_info *cp,cJSON *param
mtx.vout.push_back(MakeCC1vout(cp->evalcode,CCchange + (batonvalue-2*txfee),roguepk)); mtx.vout.push_back(MakeCC1vout(cp->evalcode,CCchange + (batonvalue-2*txfee),roguepk));
Myprivkey(mypriv); Myprivkey(mypriv);
CCaddr1of2set(cp,roguepk,mypk,mypriv,myrogueaddr); CCaddr1of2set(cp,roguepk,mypk,mypriv,myrogueaddr);
rawtx = FinalizeCCTx(0,cp,mtx,mypk,txfee,rogue_highlanderopret(funcid,gametxid,mypk,newdata)); //rawtx = FinalizeCCTx(0,cp,mtx,mypk,txfee,rogue_highlanderopret(funcid,gametxid,mypk,newdata));
return(rogue_rawtxresult(result,rawtx,0));
CScript opret = rogue_highlanderopret(funcid, gametxid, mypk, newdata);
std::vector<uint8_t> vopretNonfungible;
GetOpReturnData(opret, vopretNonfungible);
rawtx = FinalizeCCTx(0, cp, mtx, mypk, txfee, EncodeTokenCreateOpRet('c', Mypubkey(), std::string("???"), std::string("??????"), vopretNonfungible));
return(rogue_rawtxresult(result,rawtx,1));
} }
result.push_back(Pair("result","success")); result.push_back(Pair("result","success"));
} }