From c0bef2656856d1ea13b499e93a29e7562365cdad Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 7 Nov 2016 07:41:28 -0300
Subject: [PATCH] test

---
 iguana/dpow/dpow_rpc.c | 38 ++++++++++++++++++++++----------------
 iguana/iguana_notary.c |  1 -
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/iguana/dpow/dpow_rpc.c b/iguana/dpow/dpow_rpc.c
index 54030b0e3..80db66694 100755
--- a/iguana/dpow/dpow_rpc.c
+++ b/iguana/dpow/dpow_rpc.c
@@ -13,6 +13,8 @@
  *                                                                            *
  ******************************************************************************/
 
+#define issue_curl(cmdstr) bitcoind_RPC(0,"curl",cmdstr,0,0,0)
+
 int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t kmdheight)
 {
     int32_t i,num=-1; struct iguana_info *coin; char params[256],*retstr,*pubkeystr; cJSON *retjson,*item,*array;
@@ -545,7 +547,6 @@ void dpow_issuer_withdraw(struct dpow_info *dp,char *coinaddr,uint64_t fiatoshis
         pax->txid = txid;
         pax->vout = vout;
         HASH_ADD_KEYPTR(hh,dp->PAX,&pax->txid,sizeof(pax->txid),pax);
-        printf("ADD PAX.%p (%p %p) pax.%p\n",dp->PAX,dp->PAX->hh.next,dp->PAX->hh.prev,pax);
     }
     pthread_mutex_unlock(&dp->mutex);
     if ( coinaddr != 0 )
@@ -627,33 +628,38 @@ void dpow_issuer_voutupdate(struct dpow_info *dp,char *symbol,int32_t isspecial,
 
 int32_t dpow_issuer_tx(struct dpow_info *dp,struct iguana_info *coin,int32_t height,int32_t txi,char *txidstr,uint32_t port)
 {
-    char *retstr,params[256],*hexstr; uint8_t script[10000]; cJSON *json,*result,*vouts,*item,*sobj; int32_t vout,n,len,isspecial,retval = -1; uint64_t value; bits256 txid;
+    char *retstr,params[256],*hexstr; uint8_t script[10000]; cJSON *json,*result,*vouts,*item,*sobj; int32_t vout,n,len,isspecial,retval = -1; uint64_t value,vpub_new,vpub_old; bits256 txid;
     sprintf(params,"[\"%s\", 1]",txidstr);
     if ( (retstr= dpow_issuemethod(coin->chain->userpass,(char *)"getrawtransaction",params,port)) != 0 )
     {
         if ( (json= cJSON_Parse(retstr)) != 0 )
         {
             //printf("TX.(%s)\n",retstr);
-            if ( (result= jobj(json,(char *)"result")) != 0 && (vouts= jarray(&n,result,(char *)"vout")) != 0 )
+            if ( (result= jobj(json,(char *)"result")) != 0 )
             {
+                vpub_old = j64bits(result,(char *)"vpub_old");
+                vpub_new = j64bits(result,(char *)"vpub_new");
                 retval = 0;
-                isspecial = 0;
-                txid = jbits256(result,(char *)"txid");
-                for (vout=0; vout<n; vout++)
+                if ( vpub_old == 0 && vpub_new == 0 && (vouts= jarray(&n,result,(char *)"vout")) != 0 )
                 {
-                    item = jitem(vouts,vout);
-                    value = SATOSHIDEN * jdouble(item,(char *)"value");
-                    if ( (sobj= jobj(item,(char *)"scriptPubKey")) != 0 )
+                    isspecial = 0;
+                    txid = jbits256(result,(char *)"txid");
+                    for (vout=0; vout<n; vout++)
                     {
-                        if ( (hexstr= jstr(sobj,(char *)"hex")) != 0 )
+                        item = jitem(vouts,vout);
+                        value = SATOSHIDEN * jdouble(item,(char *)"value");
+                        if ( (sobj= jobj(item,(char *)"scriptPubKey")) != 0 )
                         {
-                            len = (int32_t)strlen(hexstr) >> 1;
-                            if ( vout == 0 && ((memcmp(&hexstr[2],CRYPTO777_PUBSECPSTR,66) == 0 && len == 35) || (memcmp(&hexstr[6],CRYPTO777_RMD160STR,40) == 0 && len == 25)) )
-                                isspecial = 1;
-                            else if ( len <= sizeof(script) )
+                            if ( (hexstr= jstr(sobj,(char *)"hex")) != 0 )
                             {
-                                decode_hex(script,len,hexstr);
-                                dpow_issuer_voutupdate(dp,coin->symbol,isspecial,height,txi,txid,vout,n,value,script,len);
+                                len = (int32_t)strlen(hexstr) >> 1;
+                                if ( vout == 0 && ((memcmp(&hexstr[2],CRYPTO777_PUBSECPSTR,66) == 0 && len == 35) || (memcmp(&hexstr[6],CRYPTO777_RMD160STR,40) == 0 && len == 25)) )
+                                    isspecial = 1;
+                                else if ( len <= sizeof(script) )
+                                {
+                                    decode_hex(script,len,hexstr);
+                                    dpow_issuer_voutupdate(dp,coin->symbol,isspecial,height,txi,txid,vout,n,value,script,len);
+                                }
                             }
                         }
                     }
diff --git a/iguana/iguana_notary.c b/iguana/iguana_notary.c
index 2c483eb29..9f056baee 100755
--- a/iguana/iguana_notary.c
+++ b/iguana/iguana_notary.c
@@ -290,7 +290,6 @@ STRING_ARG(dpow,pending,fiat)
             dp = &myinfo->DPOWS[i];
             if ( strcmp(dp->symbol,base) == 0  )
                 return(jprint(dpow_withdraws_pending(dp),1));
-            else printf("mismatched i.%d %s\n",i,dp->symbol);
         }
     }
     return(clonestr("[]"));