test

basilisk/basilisk_DEX.c

@@ -566,10 +566,8 @@ STRING_ARG(InstantDEX,available,source)
                     for (i=0; i<n; i++)
                     {
                         item = jitem(unspents,i);
-                        //if ( jobj(item,"unspent") != 0 )
-                        {
+                        //if ( is_cJSON_True(jobj(item,"spendable")) != 0 )
                             total += jdouble(item,"amount") * SATOSHIDEN;
-                        }
                         //printf("(%s) -> %.8f\n",jprint(item,0),dstr(total));
                     }
                 }

basilisk/basilisk_swap.c

@@ -1100,13 +1100,13 @@ struct basilisk_swap *bitcoin_swapinit(struct supernet_info *myinfo,struct basil
                     swap->I.bobsatoshis = swap->I.req.destamount;
                     swap->alicecoin = iguana_coinfind(swap->I.req.src);
                     swap->I.alicesatoshis = swap->I.req.srcamount;
-                }
-            }
-        }
+                } else printf("neither coin handles ctlv %s %s\n",swap->I.req.src,swap->I.req.dest);
+            } else printf("cant find src or dest coin.(%s %s)\n",swap->I.req.src,swap->I.req.dest);
+        } else printf("cant find src coin.(%s)\n",swap->I.req.src);
     }
     if ( swap->bobcoin == 0 || swap->alicecoin == 0 )
     {
-        printf("missing BTC.%p or missing alicecoin.%p\n",swap->bobcoin,swap->alicecoin);
+        printf("missing bobcoin.%p or missing alicecoin.%p src.%p dest.%p\n",swap->bobcoin,swap->alicecoin,iguana_coinfind(swap->I.req.src),iguana_coinfind(swap->I.req.dest));
         free(swap);
         return(0);
     }

iguana/iguana_chains.c

@@ -303,8 +303,6 @@ void iguana_chainparms(struct supernet_info *myinfo,struct iguana_chain *chain,c
             chain->estblocktime = juint(argjson,"blocktime");
         if ( chain->estblocktime == 0 )
             chain->estblocktime = 60;
-        if ( chain->havecltv == 0 )
-            chain->havecltv = juint(argjson,"havecltv");
         path = jstr(argjson,"path");
         if ( jobj(argjson,"conf") == 0 )
             conf[0] = 0;
@@ -348,6 +346,8 @@ void iguana_chainparms(struct supernet_info *myinfo,struct iguana_chain *chain,c
                 chain->rpcport = 14632;
         }
         chain->zcash = juint(argjson,"zcash");
+        if ( chain->havecltv == 0 )
+            chain->havecltv = juint(argjson,"havecltv") || chain->zcash;
         chain->debug = juint(argjson,"debug");
         chain->fixit = juint(argjson,"fixit");
         if ( (chain->normal_txversion= juint(argjson,"normal_txversion")) == 0 )