Merge pull request #47 from jl777/jl777

Jl777
2019-03-29 13:27:56 +08:00
parent 394b00366e c7a0e8562d
commit 0b75096839
27 changed files with 3603 additions and 27 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1014,6 +1014,15 @@ bool ContextualCheckCoinbaseTransaction(const CTransaction& tx, const int nHeigh
        }
        return(false);
    }
+    else if ( ASSETCHAINS_MARMARA != 0 && nHeight > 0 && (nHeight & 1) == 0 )
+    {
+        
+    }
+    else if ( ASSETCHAINS_CBOPRET != 0 && nHeight > 0 && tx.vout.size() > 0 )
+    {
+        if ( komodo_opretvalidate(nHeight,tx.vout[tx.vout.size()-1].scriptPubKey) < 0 )
+            return(false);
+    }
    return(true);
 }