From 792dab26b6068fbd33395fc078010b112af0c9dc Mon Sep 17 00:00:00 2001
From: dimxy <dimxy@komodoplatform.com>
Date: Fri, 1 Mar 2019 00:10:50 +0500
Subject: [PATCH] corr opretid for old-style assets

---
 src/cc/CCtokensOpRet.cpp | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/cc/CCtokensOpRet.cpp b/src/cc/CCtokensOpRet.cpp
index 23422f660..9271b01a9 100644
--- a/src/cc/CCtokensOpRet.cpp
+++ b/src/cc/CCtokensOpRet.cpp
@@ -197,8 +197,8 @@ uint8_t DecodeTokenOpRet(const CScript scriptPubKey, uint8_t &evalCodeTokens, ui
     uint256 dummySrcTokenId;
     CPubKey voutPubkey1, voutPubkey2;
 
-    vscript_t vroguedata;
-    bool foundRogue = false;
+    vscript_t voldstyledata;
+    bool foundOldstyle = false;
 
     GetOpReturnData(scriptPubKey, vopret);
     script = (uint8_t *)vopret.data();
@@ -227,22 +227,19 @@ uint8_t DecodeTokenOpRet(const CScript scriptPubKey, uint8_t &evalCodeTokens, ui
             return DecodeTokenImportOpRet(scriptPubKey, dummyPubkey, dummyName, dummyDescription, dummySrcTokenId, oprets);
             //break;
         case 't':
-            //not used yet: case 'l':
-            // NOTE: 'E_UNMARSHAL result==false' means 'parse error' OR 'not eof state'. Consequently, 'result==false' but 'isEof==true' means just 'parse error' 
-            
-            // compatibility with rogue or assets data:
-            // try to unmarshal rogue or assets data:
-
-            foundRogue = E_UNMARSHAL(vopret, ss >> dummyEvalCode; ss >> dummyFuncId; ss >> tokenid; ss >> ccType;
+           
+            // compatibility with old-style rogue or assets data (with no opretid):
+            // try to unmarshal old-style rogue or assets data:
+            foundOldstyle = E_UNMARSHAL(vopret, ss >> dummyEvalCode; ss >> dummyFuncId; ss >> tokenid; ss >> ccType;
                                         if (ccType >= 1) ss >> voutPubkey1;
                                         if (ccType == 2) ss >> voutPubkey2;
                                         if (!ss.eof()) {
-                                            ss >> vroguedata;
-                                        }) && vroguedata.size() > 2 && 
-                                            (vroguedata.begin()[0] == 0x11 /*EVAL_ROGUE*/ && IS_CHARINSTR(vroguedata.begin()[1], "RHQKG")  ||
-                                             vroguedata.begin()[0] == EVAL_ASSETS && IS_CHARINSTR(vroguedata.begin()[1], "sbSBxo")) ;
+                                            ss >> voldstyledata;
+                                        }) && voldstyledata.size() > 2 && 
+                                            (voldstyledata.begin()[0] == 0x11 /*EVAL_ROGUE*/ && IS_CHARINSTR(voldstyledata.begin()[1], "RHQKG")  ||
+                                             voldstyledata.begin()[0] == EVAL_ASSETS && IS_CHARINSTR(voldstyledata.begin()[1], "sbSBxo")) ;
                 
-            if(foundRogue ||  // fix for compatibility with old rogue data (no opretid)
+            if (foundOldstyle ||  // fix for compatibility with old style data (no opretid)
                 E_UNMARSHAL(vopret, ss >> dummyEvalCode; ss >> dummyFuncId; ss >> tokenid; ss >> ccType;
                     if (ccType >= 1) ss >> voutPubkey1;
                     if (ccType == 2) ss >> voutPubkey2;
@@ -268,9 +265,15 @@ uint8_t DecodeTokenOpRet(const CScript scriptPubKey, uint8_t &evalCodeTokens, ui
 
                 tokenid = revuint256(tokenid);
 
-                if (foundRogue) {
-                    LOGSTREAM((char *)"cctokens", CCLOG_DEBUG1, stream << "DecodeTokenOpRet() found old-style rogue data" << " for tokenid=" << revuint256(tokenid).GetHex() << std::endl);
-                    oprets.push_back(std::make_pair(OPRETID_ROGUEGAMEDATA, vroguedata));
+                if (foundOldstyle) {        //patch for old-style opret data with no opretid
+                    LOGSTREAM((char *)"cctokens", CCLOG_DEBUG1, stream << "DecodeTokenOpRet() found old-style rogue/asset data, evalcode=" << (int)voldstyledata.begin()[0] << " funcid=" << (char)voldstyledata.begin()[1] << " for tokenid=" << revuint256(tokenid).GetHex() << std::endl);
+                    uint8_t opretIdRestored;
+                    if (voldstyledata.begin()[0] == 0x11 /*EVAL_ROGUE*/)
+                        opretIdRestored = OPRETID_ROGUEGAMEDATA;
+                    else // EVAL_ASSETS
+                        opretIdRestored = OPRETID_ASSETSDATA;
+
+                    oprets.push_back(std::make_pair(opretIdRestored, voldstyledata));
                 }
 
                 return(funcId);