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

try to add second opret w/o serialization

Browse Source
This commit is contained in:
dimxy
2019-01-13 17:41:41 +05:00
parent 7b7b5bdbc0
commit 400b798cd2
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/cc/CCtokens.cpp
View File

@@ -71,16 +71,25 @@ CScript EncodeTokenOpRet(uint8_t tokenFuncId, uint8_t evalCodeInOpret, uint256 t
opret << OP_RETURN << E_MARSHAL(ss << evalCodeInOpret << tokenFuncId << tokenid << ccType; \ opret << OP_RETURN << E_MARSHAL(ss << evalCodeInOpret << tokenFuncId << tokenid << ccType; \
if (ccType >= 1) ss << voutPubkeys[0]; \ if (ccType >= 1) ss << voutPubkeys[0]; \
if (ccType == 2) ss << voutPubkeys[1];); // \ if (ccType == 2) ss << voutPubkeys[1]; ); // \
//if (vpayload.size() > 0) ss << vpayload;); // if (vpayload.size() > 0) ss << vpayload;);
// if (payload.size() > 0) // "error 64: scriptpubkey":
// opret += payload; --> "error 64: scriptpubkey" // if (payload.size() > 0)
// TODO: check or serialization to vpayload! // opret += payload;
CScript opretPayloadNoOpcode(vpayload);
return opret + opretPayloadNoOpcode; // error 64: scriptpubkey:
// CScript opretPayloadNoOpcode(vpayload);
// return opret + opretPayloadNoOpcode;
// how to attach payload without re-serialization:
opret.resize(opret.size() + vpayload.size());
CScript::iterator it = opret.begin() + opret.size();
for (int i = 0; i < vpayload.size(); i++)
*it = vpayload[i];
return opret;
} }