From 5b4ae1d702358a4cfc171ef599c2152d9e89fc31 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 12 Jan 2019 01:37:41 -1100
Subject: [PATCH] Fix

---
 src/cc/marmara.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cc/marmara.cpp b/src/cc/marmara.cpp
index a7e9f2d1f..93d24b868 100644
--- a/src/cc/marmara.cpp
+++ b/src/cc/marmara.cpp
@@ -115,9 +115,9 @@ uint8_t DecodeMaramaraCoinbaseOpRet(const CScript &scriptPubKey,CPubKey &pk,int3
 CScript Marmara_scriptPubKey(int32_t height,CScript scriptPubKey)
 {
     CTxOut ccvout; uint8_t *ptr; CPubKey pk;
-    if ( height > 0 && ASSETCHAINS_MARMARA != 0 && (height & 1) == 0 && scriptPubKey.size() == 35 )
+    if ( height > 0 && (height & 1) == 0 && scriptPubKey.size() == 35 )
     {
-        ptr = (uint8_t *)pubkey.begin();
+        ptr = (uint8_t *)scriptPubKey.begin();
         if ( ptr[0] == 33 && ptr[34] == OP_CHECKSIG )
         pk = buf2pk(ptr+1);
         ccvout = MakeCC1vout(EVAL_MARMARA,0,pk);
@@ -131,11 +131,11 @@ CScript MarmaraCoinbaseOpret(int32_t height,CScript scriptPubKey)
     uint8_t *ptr; CPubKey pk;
     if ( height > 0 && (height & 1) == 0 && scriptPubKey.size() == 35 )
     {
-        ptr = (uint8_t *)pubkey.begin();
+        ptr = (uint8_t *)scriptPubKey.begin();
         if ( ptr[0] == 33 && ptr[34] == OP_CHECKSIG )
         {
             pk = buf2pk(ptr+1);
-            return(EncodeMarmaraCoinbaseOpRet(pk,height);
+            return(EncodeMarmaraCoinbaseOpRet(pk,height));
         }
     }
     return(scriptPubKey);