From 7e6f66167988e553a84789a27467f098ae5d5d3b Mon Sep 17 00:00:00 2001
From: jl777 <mac@MacBook-Pro-Vladimir.local>
Date: Sun, 12 Mar 2017 23:23:01 +0200
Subject: [PATCH] Test

---
 src/komodo_gateway.h | 8 ++++----
 src/komodo_utils.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h
index 881a3acd2..de3f95ccf 100644
--- a/src/komodo_gateway.h
+++ b/src/komodo_gateway.h
@@ -599,19 +599,19 @@ int32_t komodo_check_deposit(int32_t height,const CBlock& block) // verify above
     memset(otherheights,0,sizeof(otherheights));
     n = block.vtx[0].vout.size();
     script = (uint8_t *)block.vtx[0].vout[n-1].scriptPubKey.data();
-    fprintf(stderr,"ht.%d n.%d nValue %.8f (%d %d %d)\n",height,n,dstr(block.vtx[0].vout[1].nValue),KOMODO_PAX,komodo_isrealtime(&ht),KOMODO_PASSPORT_INITDONE);
-    if ( KOMODO_PAX == 0 || komodo_isrealtime(&ht) == 0 || KOMODO_PASSPORT_INITDONE == 0 )
-        return(0);
     if ( n <= 2 || script[0] != 0x6a )
     {
         if ( n == 2 && block.vtx[0].vout[1].nValue != 0 )
         {
-            fprintf(stderr,"ht.%d illegal nonz output %.8f n.%d\n",height,dstr(block.vtx[0].vout[1].nValue),n);
+            fprintf(stderr,">>>>>>>> <<<<<<<<<< ht.%d illegal nonz output %.8f n.%d\n",height,dstr(block.vtx[0].vout[1].nValue),n);
             if ( height > 236000 )
                 return(-1);
         }
         return(0);
     }
+    fprintf(stderr,"ht.%d n.%d nValue %.8f (%d %d %d)\n",height,n,dstr(block.vtx[0].vout[1].nValue),KOMODO_PAX,komodo_isrealtime(&ht),KOMODO_PASSPORT_INITDONE);
+    if ( KOMODO_PAX == 0 || komodo_isrealtime(&ht) == 0 || KOMODO_PASSPORT_INITDONE == 0 )
+        return(0);
     offset += komodo_scriptitemlen(&opretlen,&script[offset]);
     if ( ASSETCHAINS_SYMBOL[0] == 0 )
     {
diff --git a/src/komodo_utils.h b/src/komodo_utils.h
index d66eecaff..2a4170fc4 100644
--- a/src/komodo_utils.h
+++ b/src/komodo_utils.h
@@ -1457,10 +1457,10 @@ void komodo_args()
     if ( (KOMODO_EXCHANGEWALLET= GetBoolArg("-exchange", false)) != 0 )
         fprintf(stderr,"KOMODO_EXCHANGEWALLET mode active\n");
     NOTARY_PUBKEY = GetArg("-pubkey", "");
+    KOMODO_PAX = 1;
     if ( strlen(NOTARY_PUBKEY.c_str()) == 66 )
     {
         USE_EXTERNAL_PUBKEY = 1;
-        KOMODO_PAX = 1;
     } else KOMODO_PAX = GetArg("-pax",0);
     name = GetArg("-ac_name","");
     if ( (KOMODO_REWIND= GetArg("-rewind",0)) != 0 )