Merge pull request #617 from jl777/jl777

fix swapstatus crash

iguana/exchanges/LP_peers.c

@@ -275,7 +275,7 @@ void LP_peer_recv(char *ipaddr,int32_t ismine,struct LP_pubkey_info *pubp)
     if ( (peer= LP_peerfind((uint32_t)calc_ipbits(ipaddr),RPC_port)) != 0 )
     {
         peer->numrecv++;
-        if ( ismine != 0 && bits256_cmp(G.LP_mypub25519,pubp->pubkey) != 0 && (bits256_nonz(peer->pubkey) == 0 || pubp->pairsock < 0) )
+        if ( ismine != 0 && bits256_cmp(G.LP_mypub25519,pubp->pubkey) != 0 && (bits256_cmp(peer->pubkey,pubp->pubkey) != 0 || pubp->pairsock != peer->pairsock) )
         {
             peer->pubkey = pubp->pubkey;
             pubp->pairsock = peer->pairsock;

iguana/exchanges/LP_remember.c

@@ -1811,7 +1811,7 @@ char *basilisk_swapentries(char *refbase,char *refrel,int32_t limit)
                 if ( ridqid == 0 || j == count )
                 {
                     if ( basilisk_swap_addarray(pending,refbase,refrel) > 0 )
-                        jaddi(retarray,pending);
+                        jaddi(retarray,jduplicate(pending));
                     else free_json(pending);
                 } else free_json(pending);
             }

iguana/exchanges/LP_rpc.c

@@ -656,7 +656,7 @@ again:
                     best = fastest;
                 retstr = calloc(1,16);
                 sprintf(retstr,"%0.8f",((double)best * 1024)/SATOSHIDEN);
-                printf("LP_getestimatedrate (%s) -> %s\n",jprint(retjson,0),retstr);
+                //printf("LP_getestimatedrate (%s) -> %s\n",jprint(retjson,0),retstr);
                 free(retjson);
             }
             /*if ( (retjson= electrum_estimatefee(coin->symbol,coin->electrum,&retjson,numblocks)) != 0 )

iguana/exchanges/prices/autoprice

@@ -1,11 +1,18 @@
 #!/bin/bash
 margin=0.05
 source userpass
-./auto_chipskmd
+
-./auto_chipsbtc
+# KMD/BTC must be first as other prices depend on it
 #curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"base\":\"KMD\",\"rel\":\"BTC\",\"margin\":$margin,\"refbase\":\"komodo\",\"refrel\":\"coinmarketcap\"}"
 #curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"base\":\"BTC\",\"rel\":\"KMD\",\"fixed\":0.00025,\"margin\":$margin}"
 #curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"base\":\"KMD\",\"rel\":\"BTC\",\"fixed\":4000,\"margin\":$margin}"
+curl --url "http://127.0.0.1:7783" --data "{\"minprice\":0.0003,\"maxprice\":0.001,\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"base\":\"KMD\",\"rel\":\"BTC\",\"margin\":0.05,\"refbase\":\"komodo\",\"refrel\":\"coinmarketcap\"}"
+
+./auto_chipskmd
+./auto_chipsbtc
+
+
+
 #curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"base\":\"KMD\",\"rel\":\"MNZ\",\"offset\":0.0,\"refbase\":\"KMD\",\"refrel\":\"BTC\",\"factor\":15000,\"margin\":-0.2}"
 
 curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"base\":\"HUSH\",\"rel\":\"KMD\",\"margin\":$margin,\"refbase\":\"hush\",\"refrel\":\"coinmarketcap\"}"
@@ -38,7 +45,7 @@ curl --url "http://127.0.0.1:7783" --data "{\"margin\":$margin,\"base\":\"SUPERN
 
 curl --url "http://127.0.0.1:7783" --data "{\"margin\":$margin,\"base\":\"HODL\",\"rel\":\"KMD\",\"fundvalue_bid\":\"assetNAV_KMD\",\"fundvalue_ask\":\"assetNAV_KMD\",\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"address\":\"RNcUaMUEFLxVwtTo7rgruhwYanGk1jTkeU\",\"holdings\":[{\"coin\":\"siacoin\",\"balance\":185000000,\"comment\":\"using siafunds equal to million siacoin\"}],\"divisor\":10000000}"
 
-dexholdings="{\"coin\":\"blocknet\",\"balance\":4975836}"
+dexholdings="{\"coin\":\"blocknet\",\"balance\":4000000}"
 curl --url "http://127.0.0.1:7783" --data "{\"base\":\"DEX\",\"rel\":\"KMD\",\"margin\":$margin,\"fundvalue_bid\":\"assetNAV_KMD\",\"fundvalue_ask\":\"assetNAV_KMD\",\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"address\":\"RThtXup6Zo7LZAi8kRWgjAyi1s4u6U9Cpf\",\"holdings\":[$dexholdings],\"divisor\":1000000}"
 
 curl --url "http://127.0.0.1:7783" --data "{\"base\":\"BOTS\",\"rel\":\"KMD\",\"margin\":$margin,\"fundvalue_bid\":\"assetNAV_KMD\",\"fundvalue_ask\":\"assetNAV_KMD\",\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"address\":\"RNdqHx26GWy9bk8MtmH1UiXjQcXE4RKK2P\",\"holdings\":[$dexholdings],\"divisor\":3333333}"

iguana/m_mm_StaticNanoMsg

@@ -19,7 +19,7 @@ all:
 	+$(MAKE) -C secp256k1 -f m_unix_Makefile all
 	+$(MAKE) -C ../crypto777 -f m_LP_StaticNanoMsg all
 	+$(MAKE) -C ../crypto777 -f m_LP_StaticNanoMsg clean
-	$(CC) -DNOTETOMIC  -o ../agents/marketmaker -I../crypto777 exchanges/mm.c ../crypto777/cJSON.c mini-gmp.c groestl.c segwit_addr.c secp256k1.o ../agents/libcrypto777.a ../OSlibs/linux/$(shell uname -m)/libnanomsg-static.a -lcurl -lpthread -lm -lanl
+	$(CC) -DNOTETOMIC -o ../agents/marketmaker -I../crypto777 exchanges/mm.c ../crypto777/cJSON.c mini-gmp.c groestl.c segwit_addr.c secp256k1.o ../agents/libcrypto777.a ../OSlibs/linux/$(shell uname -m)/libnanomsg-static.a -lcurl -lpthread -lm -lanl
 	@echo "==========================="
 	@echo " marketmaker -> `pwd`/../agents/marketmaker"
 	@echo "==========================="