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

added second opret logging into IsTokenVout

Browse Source
This commit is contained in:
dimxy
2019-01-12 23:49:24 +05:00
parent d2119d8c45
commit 46d9219e21
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/cc/CCtokens.cpp
View File

@@ -365,7 +365,7 @@ int64_t IsTokensvout(bool goDeeper, bool checkPubkeys, struct CCcontract_info *c
// moved opret checking to this new reusable func (dimxy): // moved opret checking to this new reusable func (dimxy):
std::vector<CPubKey> voutPubkeys; std::vector<CPubKey> voutPubkeys;
std::vector<uint8_t> vcontractOpret; std::vector<uint8_t> vcontractOpret, vcontractOpret2;
const uint8_t funcId = ValidateTokenOpret(tx, v, reftokenid, voutPubkeys, vcontractOpret); const uint8_t funcId = ValidateTokenOpret(tx, v, reftokenid, voutPubkeys, vcontractOpret);
std::cerr << indentStr << "IsTokensvout() ValidateTokenOpret returned=" << (char)(funcId?funcId:' ') << " for txid=" << tx.GetHash().GetHex() << " for tokenid=" << reftokenid.GetHex() << std::endl; std::cerr << indentStr << "IsTokensvout() ValidateTokenOpret returned=" << (char)(funcId?funcId:' ') << " for txid=" << tx.GetHash().GetHex() << " for tokenid=" << reftokenid.GetHex() << std::endl;
if (funcId != 0) { if (funcId != 0) {
@@ -373,15 +373,18 @@ int64_t IsTokensvout(bool goDeeper, bool checkPubkeys, struct CCcontract_info *c
if (checkPubkeys && funcId != 'c') { // verify that the vout is token's (for 'c' there is no pubkeys!): if (checkPubkeys && funcId != 'c') { // verify that the vout is token's (for 'c' there is no pubkeys!):
//CScript contractScript = CScript(vopretExtra); CScript contractScript = CScript(vcontractOpret);
//GetOpReturnData(contractScript, vcontractOpret); GetOpReturnData(contractScript, vcontractOpret2);
if (vcontractOpret.size() == 0) { std::cerr << "IsTokensvout() vcontractOpret=" << HexStr( vcontractOpret );
std::cerr << "IsTokensvout() vcontractOpret2=" << HexStr(vcontractOpret2);
if (vcontractOpret2.size() == 0) {
std::cerr << "IsTokensvout() empty contract opret" << std::endl; std::cerr << "IsTokensvout() empty contract opret" << std::endl;
return 0; return 0;
} }
uint8_t evalCodeInOpret = vcontractOpret.begin()[0]; uint8_t evalCodeInOpret = vcontractOpret2.begin()[0];
if (voutPubkeys.size() >= 1 && voutPubkeys.size() <= 2) { if (voutPubkeys.size() >= 1 && voutPubkeys.size() <= 2) {
CTxOut testVout; CTxOut testVout;