Test

basilisk/basilisk.h

@@ -16,8 +16,8 @@
 #ifndef H_BASILISK_H
 #define H_BASILISK_H
 
-#define BASILISK_DISABLESENDTX
-#define BASILISK_DISABLEWAITTX
+//#define BASILISK_DISABLESENDTX
+//#define BASILISK_DISABLEWAITTX
 
 #include "../iguana/iguana777.h"
 

basilisk/basilisk_swap.c

@@ -2223,7 +2223,7 @@ void basilisk_psockinit(struct supernet_info *myinfo,struct basilisk_swap *swap,
         return;
     if ( swap->pushsock < 0 && swap->subsock < 0 && (pushsock= nn_socket(AF_SP,NN_PUSH)) >= 0 && (subsock= nn_socket(AF_SP,NN_SUB)) >= 0 )
     {
-        timeout = 100;
+        timeout = 1000;
         nn_setsockopt(pushsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout));
         timeout = 1;
         nn_setsockopt(subsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout));

basilisk/jumblr.c

@@ -711,7 +711,7 @@ void jumblr_CMCname(char *CMCname,char *symbol)
         strcpy(CMCname,"komodo");
 }
 
-void jumblr_DEXcheck(struct supernet_info *myinfo,struct iguana_info *coin)
+void jumblr_DEXcheck(struct supernet_info *myinfo,struct iguana_info *coin,int32_t toKMD)
 {
     double vol,avail; struct iguana_info *kmdcoin,*coinbtc = 0;
     if ( myinfo->IAMNOTARY != 0 || myinfo->IAMLP != 0 )
@@ -732,7 +732,7 @@ void jumblr_DEXcheck(struct supernet_info *myinfo,struct iguana_info *coin)
         double minbtc,btcavail; char *retstr; cJSON *vals; bits256 hash;
         minbtc = (kmdcoin->DEXinfo.btcprice * 1.2) * (JUMBLR_INCR + 3*(JUMBLR_INCR * JUMBLR_FEE + JUMBLR_TXFEE));
         btcavail = dstr(jumblr_balance(myinfo,coinbtc,kmdcoin->DEXinfo.depositaddr));
-        if ( coinbtc != 0 && btcavail > (minbtc + kmdcoin->DEXinfo.DEXpending) )
+        if ( toKMD != 0 && coinbtc != 0 && btcavail > (minbtc + kmdcoin->DEXinfo.DEXpending) )
         {
             avail = (btcavail - kmdcoin->DEXinfo.DEXpending);
             printf("BTC deposits %.8f, min %.8f avail %.8f\n",btcavail,minbtc,avail);
@@ -763,7 +763,7 @@ void jumblr_DEXcheck(struct supernet_info *myinfo,struct iguana_info *coin)
                 // curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"InstantDEX\",\"method\":\"request\",\"vals\":{\"source\":\"KMD\",\"amount\":20,\"dest\":\"USD\",\"minprice\":0.08}}"
             }
         } //else printf("btcavail %.8f pending %.8f\n",btcavail,pending);
-        if ( 1 && coinbtc != 0 && kmdcoin->DEXinfo.KMDavail > (100. + kmdcoin->DEXinfo.KMDpending) )
+        if ( toKMD == 0 && coinbtc != 0 && kmdcoin->DEXinfo.KMDavail > (100. + kmdcoin->DEXinfo.KMDpending) )
         {
             avail = (kmdcoin->DEXinfo.KMDavail - kmdcoin->DEXinfo.KMDpending);
             printf("KMD deposits %.8f, min %.8f, avail %.8f\n",kmdcoin->DEXinfo.KMDavail,JUMBLR_INCR,avail);

iguana/main.c

@@ -756,13 +756,14 @@ void jumblr_loop(void *ptr)
         if ( (coin= iguana_coinfind("KMD")) != 0 )
         {
 #ifdef __APPLE__
-            jumblr_DEXcheck(myinfo,coin);
+            if ( (n++ % 10) == 0 )
+                jumblr_DEXcheck(myinfo,coin,!((n/10)&1));
 #endif
             if ( myinfo->jumblr_passphrase[0] != 0 && coin->FULLNODE < 0 )
             {
                 // if BTC has arrived in destination address, invoke DEX -> BTC
                 if ( (n++ % 10) == 0 )
-                    jumblr_DEXcheck(myinfo,coin);
+                    jumblr_DEXcheck(myinfo,coin,!((n/10)&1));
                 t = (uint32_t)time(NULL);
                 if ( (t % (120 * mult)) < 60 )
                 {

includes/iguana_funcs.h

@@ -629,7 +629,7 @@ int32_t iguana_staker_sort(struct iguana_info *coin,bits256 *hash2p,uint8_t *ref
 bits256 mpz_div64(bits256 hash,uint64_t divval);
 void iguana_walletinitcheck(struct supernet_info *myinfo,struct iguana_info *coin);
 void jumblr_iteration(struct supernet_info *myinfo,struct iguana_info *coin,int32_t selector,int32_t modval);
-void jumblr_DEXcheck(struct supernet_info *myinfo,struct iguana_info *coin);
+void jumblr_DEXcheck(struct supernet_info *myinfo,struct iguana_info *coin,int32_t toKMD);
 bits256 jumblr_privkey(struct supernet_info *myinfo,char *BTCaddr,uint8_t pubtype,char *KMDaddr,char *prefix);
 char *jumblr_importprivkey(struct supernet_info *myinfo,struct iguana_info *coin,char *wifstr);
 int64_t iguana_esttxfee(struct supernet_info *myinfo,struct iguana_info *coin,char *rawtx,char *signedtx,int32_t numvins);