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

try to construct secod opret w/o serialization

Browse Source
This commit is contained in:
dimxy
2019-01-13 18:06:41 +05:00
parent ab87b673eb
commit 39731c231f
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/cc/CCtokens.cpp
View File

@@ -71,8 +71,8 @@ CScript EncodeTokenOpRet(uint8_t tokenFuncId, uint8_t evalCodeInOpret, uint256 t
opret << OP_RETURN << E_MARSHAL(ss << evalCodeInOpret << tokenFuncId << tokenid << ccType; \
if (ccType >= 1) ss << voutPubkeys[0]; \
if (ccType == 2) ss << voutPubkeys[1]; ); // \
// if (vpayload.size() > 0) ss << vpayload;);
if (ccType == 2) ss << voutPubkeys[1]; \
if (vpayload.size() > 0) ss << vpayload;);
// "error 64: scriptpubkey":
@@ -84,10 +84,11 @@ CScript EncodeTokenOpRet(uint8_t tokenFuncId, uint8_t evalCodeInOpret, uint256 t
// 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++)
*it = vpayload[i];
// sig_aborted:
// opret.resize(opret.size() + vpayload.size());
// CScript::iterator it = opret.begin() + opret.size();
// for (int i = 0; i < vpayload.size(); i++, it++)
// *it = vpayload[i];
return opret;
}

15
src/cc/heir.cpp
View File

@@ -408,18 +408,23 @@ uint8_t _DecodeHeirEitherOpret(CScript scriptPubKey, uint256 &tokenid, CPubKey&
{
uint8_t evalCodeTokens = 0;
std::vector<CPubKey> voutPubkeys;
std::vector<uint8_t> vopretExtra;
std::vector<uint8_t> vopretExtra, vopretStripped;
CScript heirScript = scriptPubKey;
int32_t heirType = HEIR_COINS;
if (DecodeTokenOpRet(heirScript, evalCodeTokens, tokenid, voutPubkeys, vopretExtra) != 0) {
if (vopretExtra.size() > 1) {
// restore the second opret:
heirScript = CScript();
std::vector<uint8_t> vopretStripped = std::vector<uint8_t>(vopretExtra.begin()+1, vopretExtra.end()); //strip string size
heirScript << OP_RETURN << E_MARSHAL(ss << vopretStripped);
heirType = HEIR_TOKENS;
E_UNMARSHAL(vopretExtra, { ss >> vopretStripped; }); // std::vector<uint8_t>(vopretExtra.begin()+1, vopretExtra.end()); //strip string size
heirScript << OP_RETURN;
uint32_t i = heirScript.size();
heirScript << E_MARSHAL(ss << vopretStripped);
for (uint32_t iStripped = 0; iStripped < vopretStripped.size(); iStripped++)
heirScript[i] = vopretStripped[iStripped];
heirScript.resize(heirScript.size()-1);
}
else {
return (uint8_t)0;