Test

.gitignore

@@ -401,3 +401,5 @@ iguana/DB/SWAPS/2723832060-1788071166
 iguana/DB/SWAPS/3213598586-2281632307
 
 iguana/DB/SWAPS/2686675855-3655454671
+
+iguana/DB/SWAPS/1878868608-154367763

basilisk/basilisk.c

@@ -1207,9 +1207,9 @@ HASH_ARRAY_STRING(basilisk,value,hash,vals,hexstr)
                     value = SATOSHIDEN*jdouble(txoutjson,"amount");
                 if ( (coinaddr= jstr(txoutjson,"address")) == 0 )
                 {
-                    if ( (addrs= jarray(&n,txoutjson,"addresses")) != 0 && n > 0 )
+                    if ( (sobj= jobj(txoutjson,"scriptPubKey")) != 0 && (addrs= jarray(&n,sobj,"addresses")) != 0 && n > 0 )
                         coinaddr = jstri(addrs,0);
-                    printf("no address, check addrs.[%d] %p coinaddr.%p\n",n,addrs,coinaddr);
+                    printf("no address, check addrs %p coinaddr.%p\n",sobj,coinaddr);
                 }
                 if ( coinaddr != 0 && value != 0 )
                 {

basilisk/basilisk_swap.c

@@ -2537,7 +2537,7 @@ void basilisk_swaploop(void *_swap)
     fprintf(stderr,"start swap\n");
     maxlen = 1024*1024 + sizeof(*swap);
     data = malloc(maxlen);
-    expiration = (uint32_t)time(NULL) + 600;
+    expiration = (uint32_t)time(NULL) + 120;
     myinfo->DEXactive = expiration;
     channel = 'D' + ((uint32_t)'E' << 8) + ((uint32_t)'X' << 16);
     while ( swap->aborted == 0 && (swap->I.statebits & (0x08|0x02)) != (0x08|0x02) && time(NULL) < expiration )
@@ -3975,7 +3975,7 @@ char *basilisk_swaplist(struct supernet_info *myinfo)
                 if ( (item= basilisk_remember(myinfo,KMDtotals,BTCtotals,requestid,quoteid)) != 0 )
                 {
                     jaddi(array,item);
-                    if ( 1 && (status= jstr(item,"status")) != 0 && strcmp(status,"pending") == 0 )
+                    if ( 0 && (status= jstr(item,"status")) != 0 && strcmp(status,"pending") == 0 )
                         break;
                 }
             }