From 0b58392fff0671169aa06f16c8cab9bb2869daac Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 12 Jan 2019 17:29:18 -1100
Subject: [PATCH] Validation for marmara 'P'

---
 src/cc/eval.cpp    |  5 +++--
 src/cc/marmara.cpp | 45 ++++++++++++++++++++++-----------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp
index d50bc8a0d..9161f2007 100644
--- a/src/cc/eval.cpp
+++ b/src/cc/eval.cpp
@@ -38,8 +38,9 @@ bool RunCCEval(const CC *cond, const CTransaction &tx, unsigned int nIn)
     pthread_mutex_lock(&KOMODO_CC_mutex);
     bool out = eval->Dispatch(cond, tx, nIn);
     pthread_mutex_unlock(&KOMODO_CC_mutex);
-    //fprintf(stderr,"out %d vs %d isValid\n",(int32_t)out,(int32_t)eval->state.IsValid());
-    assert(eval->state.IsValid() == out);
+    if ( eval->state.IsValid() != out)
+        fprintf(stderr,"out %d vs %d isValid\n",(int32_t)out,(int32_t)eval->state.IsValid());
+    //assert(eval->state.IsValid() == out);
 
     if (eval->state.IsValid()) return true;
 
diff --git a/src/cc/marmara.cpp b/src/cc/marmara.cpp
index 2e56c21b2..d12959d2a 100644
--- a/src/cc/marmara.cpp
+++ b/src/cc/marmara.cpp
@@ -191,40 +191,39 @@ int32_t MarmaraValidateCoinbase(int32_t height,CTransaction tx)
 
 bool MarmaraValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn)
 {
-    int32_t numvins,numvouts,preventCCvins,preventCCvouts,i,numblocks; bool retval; uint256 txid; uint8_t hash[32]; char str[65],destaddr[64];
-    return eval->Invalid("no validation yet");
-    std::vector<std::pair<CAddressIndexKey, CAmount> > txids;
+    CTransaction vinTx; uint256 hashBlock;  int32_t numvins,numvouts,i,ht,unlockht,vht,vunlockht; uint8_t funcid; CPubKey pk,vpk;
     numvins = tx.vin.size();
     numvouts = tx.vout.size();
     preventCCvins = preventCCvouts = -1;
     if ( numvouts < 1 )
         return eval->Invalid("no vouts");
-    else
+    else if ( tx.vout.size() >= 2 )
     {
-        for (i=0; i<numvins; i++)
+        funcid = DecodeMaramaraCoinbaseOpRet(tx.vout[1].scriptPubKey,pk,ht,unlockht);
+        if ( funcid == 'P' )
         {
-            if ( IsCCInput(tx.vin[0].scriptSig) == 0 )
+            for (i=0; i<numvins; i++)
             {
-                return eval->Invalid("illegal normal vini");
+                if ( (*cp->ismyvin)(tx.vin[i].scriptSig) != 0 )
+                {
+                    if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
+                        return eval->Invalid("cant find vinTx");
+                    else
+                    {
+                        if ( vinTx.IsCoinbase() == 0 )
+                            return eval->Invalid("noncoinbase input");
+                        else if ( vinTx.size() != 2 )
+                            return eval->Invalid("coinbase doesnt have 2 vouts");
+                        vfuncid = DecodeMaramaraCoinbaseOpRet(vinTx.vout[1].scriptPubKey,vpk,vht,vunlockht);
+                        if ( vfuncid != 'C' || vpk != pk || vunlockht != unlockht )
+                            return eval->Invalid("mismatched opreturn");
+                    }
+                }
             }
-        }
-        //fprintf(stderr,"check amounts\n");
-        if ( MarmaraExactAmounts(cp,eval,tx,1,10000) == false )
-        {
-            fprintf(stderr,"Marmaraget invalid amount\n");
-            return false;
-        }
-        else
-        {
-            txid = tx.GetHash();
-            memcpy(hash,&txid,sizeof(hash));
-            retval = PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts);
-            if ( retval != 0 )
-                fprintf(stderr,"Marmaraget validated\n");
-            else fprintf(stderr,"Marmaraget invalid\n");
-            return(retval);
+            return(true);
         }
     }
+    return eval->Invalid("fall through error");
 }
 // end of consensus code