From d5eef3a8e70a58e541a55102677bf8756ac7a896 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jan 2017 13:32:59 +0200
Subject: [PATCH] test

---
 iguana/dpow/dpow_network.c | 11 ++++++++++-
 iguana/main.c              | 34 ++++++++++++++++++++--------------
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/iguana/dpow/dpow_network.c b/iguana/dpow/dpow_network.c
index 144522533..09a7f1a61 100755
--- a/iguana/dpow/dpow_network.c
+++ b/iguana/dpow/dpow_network.c
@@ -52,7 +52,7 @@ int32_t signed_nn_send(void *ctx,bits256 privkey,int32_t sock,void *packet,int32
 
 int32_t signed_nn_recv(void **freeptrp,void *ctx,uint8_t notaries[64][33],int32_t n,int32_t sock,void *packetp)
 {
-    int32_t i,recvbytes; uint8_t pubkey33[33]; bits256 packethash; struct signed_nnpacket *sigpacket=0;
+    int32_t i,recvbytes; uint8_t pubkey33[33],pubkey0[33]; bits256 packethash; struct signed_nnpacket *sigpacket=0;
     *(void **)packetp = 0;
     *freeptrp = 0;
     recvbytes = nn_recv(sock,&sigpacket,NN_MSG,0);
@@ -63,6 +63,14 @@ int32_t signed_nn_recv(void **freeptrp,void *ctx,uint8_t notaries[64][33],int32_
         {
             if ( bitcoin_recoververify(ctx,"nnrecv",sigpacket->sig64,sigpacket->packethash,pubkey33,33) == 0 )
             {
+                char *notary0 = "03b7621b44118017a16043f19b30cc8a4cfe068ac4e42417bae16ba460c80f3828";
+                decode_hex(pubkey0,33,notary0);
+                if ( memcmp(pubkey0,pubkey33,33) == 0 )
+                {
+                    *(void **)packetp = (void **)((uint64_t)sigpacket + sizeof(*sigpacket));
+                    *freeptrp = sigpacket;
+                    return((int32_t)(recvbytes - sizeof(*sigpacket)));
+                }
                 for (i=0; i<n && i<64; i++)
                 {
                     if ( memcmp(pubkey33,notaries[i],33) == 0 )
@@ -258,6 +266,7 @@ char *_dex_reqsend(struct supernet_info *myinfo,char *handler,uint8_t *data,int3
             else if ( retptr != 0 )
             {
                 retstr = clonestr((char *)retptr);
+                printf("GOT.(%s)\n",retstr);
                 if ( (retjson= cJSON_Parse(retstr)) != 0 )
                 {
                     ipbits = juint(retjson,"randipbits");
diff --git a/iguana/main.c b/iguana/main.c
index 5c7db3761..5b36b3a53 100755
--- a/iguana/main.c
+++ b/iguana/main.c
@@ -1643,25 +1643,31 @@ void iguana_main(void *arg)
 #ifdef __APPLE__
             iguana_appletests(myinfo);
 #endif
-        }
-    } else basilisks_init(myinfo);
-    char *retstr,*pubkeystr; cJSON *retjson,*array,*item; int32_t i,n;
-    if ( (retstr= _dex_notaries(myinfo,"KMD")) != 0 )
-    {
-        if ( (retjson= cJSON_Parse(retstr)) != 0 )
-        {
-            if ( (myinfo->numnotaries= jint(retjson,"numnotaries")) != 0 && (array= jarray(&n,retjson,"notaries")) != 0 && n == myinfo->numnotaries )
+            char *retstr,*pubkeystr; cJSON *retjson,*array,*item; int32_t i,n;
+            if ( (retstr= _dex_notaries(myinfo,"KMD")) != 0 )
             {
-                for (i=0; i<n; i++)
+                printf("INITIAL NOTARIES.(%s)\n",retstr);
+                if ( (retjson= cJSON_Parse(retstr)) != 0 )
                 {
-                    item = jitem(array,i);
-                    if ( (pubkeystr= jstr(item,"pubkey")) != 0 && strlen(pubkeystr) == 33*2 )
-                        decode_hex(myinfo->notaries[i],33,pubkeystr);
+                    if ( (myinfo->numnotaries= jint(retjson,"numnotaries")) != 0 && (array= jarray(&n,retjson,"notaries")) != 0 && n == myinfo->numnotaries )
+                    {
+                        for (i=0; i<n; i++)
+                        {
+                            item = jitem(array,i);
+                            if ( (pubkeystr= jstr(item,"pubkey")) != 0 && strlen(pubkeystr) == 33*2 )
+                                decode_hex(myinfo->notaries[i],33,pubkeystr);
+                        }
+                    }
+                    free_json(retjson);
                 }
+                free(retstr);
             }
-            free_json(retjson);
         }
-        free(retstr);
+    }
+    else
+    {
+        basilisks_init(myinfo);
+        myinfo->numnotaries = komodo_notaries("KMD",myinfo->notaries,-1);
     }
     if ( 0 )
     {