From eb928486853efb9c9833c5ddeeee8d04d61e553a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 1 Dec 2016 18:00:52 -0300
Subject: [PATCH] test

---
 src/komodo_gateway.h | 20 ++++++++++++--------
 src/komodo_pax.h     |  2 +-
 src/miner.cpp        |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h
index 0a3a2f35e..ef15140b1 100644
--- a/src/komodo_gateway.h
+++ b/src/komodo_gateway.h
@@ -551,18 +551,18 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3
             bitcoin_address(coinaddr,addrtype,rmd160,20);
             checktoshis = PAX_fiatdest(&seed,tokomodo,destaddr,pubkey33,coinaddr,kmdheight,base,fiatoshis);
             typestr = "deposit";
-            printf("(%s) (%s) kmdheight.%d vs height.%d check %.8f vs %.8f tokomodo.%d %d seed.%llx\n",ASSETCHAINS_SYMBOL,base,kmdheight,height,dstr(checktoshis),dstr(value),komodo_is_issuer(),strncmp(ASSETCHAINS_SYMBOL,base,strlen(base)) == 0,(long long)seed);
             if ( kmdheight <= height )
             {
-                for (i=0; i<32; i++)
-                    printf("%02x",((uint8_t *)&txid)[i]);
-                printf(" <- txid.v%u ",vout);
-                for (i=0; i<33; i++)
-                    printf("%02x",pubkey33[i]);
-                printf(" checkpubkey check %.8f v %.8f dest.(%s) kmdheight.%d height.%d\n",dstr(checktoshis),dstr(value),destaddr,kmdheight,height);
                 didstats = 0;
                 if ( komodo_paxcmp(base,kmdheight,value,checktoshis,seed) == 0 )
                 {
+                    printf("(%s) (%s) kmdheight.%d vs height.%d check %.8f vs %.8f tokomodo.%d %d seed.%llx\n",ASSETCHAINS_SYMBOL,base,kmdheight,height,dstr(checktoshis),dstr(value),komodo_is_issuer(),strncmp(ASSETCHAINS_SYMBOL,base,strlen(base)) == 0,(long long)seed);
+                    for (i=0; i<32; i++)
+                        printf("%02x",((uint8_t *)&txid)[i]);
+                    printf(" <- txid.v%u ",vout);
+                    for (i=0; i<33; i++)
+                        printf("%02x",pubkey33[i]);
+                    printf(" checkpubkey check %.8f v %.8f dest.(%s) kmdheight.%d height.%d\n",dstr(checktoshis),dstr(value),destaddr,kmdheight,height);
                     if ( (pax= komodo_paxfind(txid,vout,'D')) == 0 )
                     {
                         if ( (basesp= komodo_stateptrget(base)) != 0 )
@@ -576,6 +576,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3
                     }
                     if ( (pax= komodo_paxfind(txid,vout,'D')) != 0 )
                     {
+                        pax->validated = kmdheight;
                         if ( didstats == 0 && pax->didstats == 0 )
                         {
                             if ( (basesp= komodo_stateptrget(base)) != 0 )
@@ -589,7 +590,9 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3
                         if ( didstats != 0 )
                             pax->didstats = 1;
                     }
-                } else printf("pax %s deposit %.8f rejected\n",base,dstr(fiatoshis));
+                }
+                else if ( kmdheight > 91800 )
+                    printf("pax %s deposit %.8f rejected\n",base,dstr(fiatoshis));
             }
         }
     }
@@ -622,6 +625,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3
                 if ( didstats != 0 )
                     pax->didstats = 1;
                 pax->type = opretbuf[0];
+                pax->validated = kmdheight;
             }
         }
     }
diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index 09eb6c01b..1f7e23a03 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -527,7 +527,7 @@ uint64_t PAX_fiatdest(uint64_t *seedp,int32_t tokomodo,char *destaddr,uint8_t pu
     if ( fiatoshis < 0 )
         shortflag = 1, fiatoshis = -fiatoshis;
     komodoshis = komodo_paxprice(seedp,height,base,(char *)"KMD",(uint64_t)fiatoshis);
-    printf("PAX_fiatdest ht.%d price %s %.8f -> KMD %.8f seed.%llx\n",height,base,(double)fiatoshis/COIN,(double)komodoshis/COIN,(long long)*seedp);
+    //printf("PAX_fiatdest ht.%d price %s %.8f -> KMD %.8f seed.%llx\n",height,base,(double)fiatoshis/COIN,(double)komodoshis/COIN,(long long)*seedp);
     if ( bitcoin_addr2rmd160(&addrtype,rmd160,coinaddr) == 20 )
     {
         PAX_pubkey(1,pubkey33,&addrtype,rmd160,base,&shortflag,tokomodo != 0 ? &komodoshis : &fiatoshis);
diff --git a/src/miner.cpp b/src/miner.cpp
index ffa9e43c2..4134248fb 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -133,7 +133,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
             }
             else if ( deposits != 0 )
             {
-                //fprintf(stderr,"start CreateNewBlock %s initdone.%d deposit %.8f mempool.%d RT.%u KOMODO_ON_DEMAND.%d\n",ASSETCHAINS_SYMBOL,KOMODO_INITDONE,(double)komodo_paxtotal()/COIN,(int32_t)mempool.GetTotalTxSize(),isrealtime,KOMODO_ON_DEMAND);
+                fprintf(stderr,"start CreateNewBlock %s initdone.%d deposit %.8f mempool.%d RT.%u KOMODO_ON_DEMAND.%d\n",ASSETCHAINS_SYMBOL,KOMODO_INITDONE,(double)komodo_paxtotal()/COIN,(int32_t)mempool.GetTotalTxSize(),isrealtime,KOMODO_ON_DEMAND);
                 break;
             }
             sleep(10);