Merge pull request #129 from dimxy/dev-dimxy-rm-pegs-hush

more pegs, hush, marmara code removed
dimxy · Sep 19, 2022 · 3760fa7 · 3760fa7
2 parents fa2d133 + ba73fd3
commit 3760fa7
Show file tree

Hide file tree

Showing 22 changed files with 15 additions and 1,423 deletions.
diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h
@@ -100,7 +100,6 @@ enum opretid : uint8_t {
     OPRETID_CHANNELSDATA = 0x14,    //!< channels contract data id
     OPRETID_HEIRDATA = 0x15,        //!< heir contract data id
     OPRETID_ROGUEGAMEDATA = 0x16,   //!< rogue contract data id
-    OPRETID_PEGSDATA = 0x17,        //!< pegs contract data id
 
     /*! \cond INTERNAL */
     // non cc contract data:

diff --git a/src/cc/CCtokens.cpp b/src/cc/CCtokens.cpp
@@ -402,15 +402,11 @@ int64_t IsTokensvout(bool goDeeper, bool checkPubkeys /*<--not used, always true
                 struct CCcontract_info *cpEvalCode1,CEvalCode1;
                 cpEvalCode1 = CCinit(&CEvalCode1,evalCode1);
                 CPubKey pk=GetUnspendable(cpEvalCode1,0);
-                testVouts.push_back( std::make_pair(MakeTokensCC1of2vout(evalCode1, tx.vout[v].nValue, voutPubkeys[0], pk), std::string("dual-eval1 pegscc cc1of2 pk[0] globalccpk")) ); 
-                if (voutPubkeys.size() == 2) testVouts.push_back( std::make_pair(MakeTokensCC1of2vout(evalCode1, tx.vout[v].nValue, voutPubkeys[1], pk), std::string("dual-eval1 pegscc cc1of2 pk[1] globalccpk")) );
                 if (evalCode2!=0)
                 {
                     struct CCcontract_info *cpEvalCode2,CEvalCode2;
                     cpEvalCode2 = CCinit(&CEvalCode2,evalCode2);
                     CPubKey pk=GetUnspendable(cpEvalCode2,0);
-                    testVouts.push_back( std::make_pair(MakeTokensCC1of2vout(evalCode2, tx.vout[v].nValue, voutPubkeys[0], pk), std::string("dual-eval2 pegscc cc1of2 pk[0] globalccpk")) ); 
-                    if (voutPubkeys.size() == 2) testVouts.push_back( std::make_pair(MakeTokensCC1of2vout(evalCode2, tx.vout[v].nValue, voutPubkeys[1], pk), std::string("dual-eval2 pegscc cc1of2 pk[1] globalccpk")) );
                 }
 
 				// maybe it is single-eval or dual/three-eval token change?

diff --git a/src/cc/import.cpp b/src/cc/import.cpp
@@ -624,17 +624,14 @@ bool Eval::ImportCoin(const std::vector<uint8_t> params, const CTransaction &imp
 
     LOGSTREAM("importcoin", CCLOG_DEBUG1, stream << "Validating import tx..., txid=" << importTx.GetHash().GetHex() << std::endl);
 
-    if ( chainName.isSymbol("CFEKDIMXY6") && chainActive.Height() <= 44693)
-        return true;
-
     if (importTx.vout.size() < 2)
         return Invalid("too-few-vouts");
     // params
     if (!UnmarshalImportTx(importTx, proof, burnTx, payouts))
         return Invalid("invalid-params");
     // Control all aspects of this transaction
     // It should not be at all malleable
-    if (ASSETCHAINS_SELFIMPORT!="PEGSCC" && MakeImportCoinTransaction(proof, burnTx, payouts, importTx.nExpiryHeight).GetHash() != importTx.GetHash())  // ExistsImportTombstone prevents from duplication
+    if (MakeImportCoinTransaction(proof, burnTx, payouts, importTx.nExpiryHeight).GetHash() != importTx.GetHash())  // ExistsImportTombstone prevents from duplication
         return Invalid("non-canonical");
     // burn params
     if (!UnmarshalBurnTx(burnTx, targetSymbol, &targetCcid, payoutsHash, rawproof))
@@ -691,13 +688,6 @@ bool Eval::ImportCoin(const std::vector<uint8_t> params, const CTransaction &imp
             else if ( UnmarshalBurnTx(burnTx,srcaddr,receipt)==0 || CheckCODAimport(importTx,burnTx,payouts,srcaddr,receipt) < 0 )
                 return Invalid("CODA-import-failure");
         }
-        else if ( targetSymbol == "PEGSCC" )
-        {
-            if ( ASSETCHAINS_SELFIMPORT != "PEGSCC" )
-                return Invalid("PEGSCC-import-when-not PEGSCC");
-            // else if ( CheckPUBKEYimport(merkleBranchProof,rawproof,burnTx,payouts) < 0 )
-            //     return Invalid("PEGSCC-import-failure");
-        }
         else if ( targetSymbol == "PUBKEY" )
         {
             if ( ASSETCHAINS_SELFIMPORT != "PUBKEY" )