test

basilisk/basilisk_swap.c

@@ -1859,10 +1859,11 @@ struct basilisk_swap *basilisk_thread_start(struct supernet_info *myinfo,struct
         if ( bitcoin_swapinit(myinfo,swap,optionduration) != 0 )
         {
             starttime = (uint32_t)time(NULL);
-            while ( statebits == 0 && m <= n/2 && time(NULL) < starttime+300 )
+            while ( statebits == 0 && m <= n/2 && time(NULL) < starttime+30 )
             {
                 m = n = 0;
                 dpow_nanomsg_update(myinfo);
+                dex_updateclient(myinfo);
                 sleep(3);
                 printf("waiting for offer to be accepted\n");
                 channel = 'D' + ((uint32_t)'E' << 8) + ((uint32_t)'X' << 16);

iguana/dPoW.h

@@ -147,5 +147,6 @@ char *dpow_sendrawtransaction(struct supernet_info *myinfo,struct iguana_info *c
 cJSON *dpow_gettxout(struct supernet_info *myinfo,struct iguana_info *coin,bits256 txid,int32_t vout);
 int32_t dpow_getchaintip(struct supernet_info *myinfo,bits256 *blockhashp,uint32_t *blocktimep,bits256 *txs,uint32_t *numtxp,struct iguana_info *coin);
 void dpow_send(struct supernet_info *myinfo,struct dpow_info *dp,struct dpow_block *bp,bits256 srchash,bits256 desthash,uint32_t channel,uint32_t msgbits,uint8_t *data,int32_t datalen);
+int32_t dpow_nanomsg_update(struct supernet_info *myinfo);
 
 #endif

iguana/dpow/dpow_network.c

@@ -938,7 +938,7 @@ void dpow_ipbitsadd(struct supernet_info *myinfo,struct dpow_info *dp,uint32_t *
 int32_t dpow_nanomsg_update(struct supernet_info *myinfo)
 {
     int32_t i,n=0,num=0,size,firstz = -1; uint32_t crc32,r,m; struct dpow_nanomsghdr *np=0; struct dpow_info *dp; struct dpow_block *bp; struct dex_nanomsghdr *dexp = 0;
-    if ( time(NULL) < myinfo->nanoinit+5 || myinfo->dpowsock < 0 )
+    if ( time(NULL) < myinfo->nanoinit+5 || (myinfo->dpowsock < 0 && myinfo->dexsock < 0 && myinfo->repsock < 0) )
         return(-1);
     portable_mutex_lock(&myinfo->dpowmutex);
     for (i=0; i<100; i++)