Merge pull request #11 from jl777/dev

dev update

crypto777/bitcoind_RPC.c

@@ -74,7 +74,7 @@ char *post_process_bitcoind_RPC(char *debugstr,char *command,char *rpcstr,char *
     char *retstr = 0;
     cJSON *json,*result,*error;
 #ifdef FROM_MARKETMAKER
-    //usleep(3000);
+    //usleep(500);
 #endif
     //printf("<<<<<<<<<<< bitcoind_RPC: %s post_process_bitcoind_RPC.%s.[%s]\n",debugstr,command,rpcstr);
     if ( command == 0 || rpcstr == 0 || rpcstr[0] == 0 )
@@ -280,6 +280,7 @@ try_again:
                 *retstrp = retstr;
                 return(retstr);
             }
+//printf("%s <- %s\n",url,command);
             return(post_process_bitcoind_RPC(debugstr,command,retstr,params));
         }
         else

crypto777/iguana_serdes.c

@@ -80,7 +80,7 @@ int32_t iguana_sethdr(struct iguana_msghdr *H,const uint8_t netmagic[4],char *co
     iguana_rwnum(1,H->serdatalen,sizeof(int32_t),&datalen);
     if ( data != 0 )
     {
-        hash2 = bits256_doublesha256(0,data,datalen);
+        hash2 = bits256_doublesha256(0,data,datalen); // GRS?
         iguana_rwbignum(1,tmp.bytes,sizeof(tmp),hash2.bytes);
         for (i=0; i<4; i++)
             H->hash[i] = tmp.bytes[i];

crypto777/jpeg/unix/jmemname.c

@@ -70,7 +70,11 @@ extern void free JPP((void *ptr));
  */
 
 #ifndef TEMP_DIRECTORY		/* can override from jconfig.h or Makefile */
-#define TEMP_DIRECTORY  "/usr/tmp/" /* recommended setting for Unix */
+#ifdef _WIN32
+#define TEMP_DIRECTORY  "" /* recommended setting for Unix */
+#else
+#define TEMP_DIRECTORY  "/tmp/" /* recommended setting for Unix */
+#endif
 #endif
 
 static int next_file_num;	/* to distinguish among several temp files */

iguana/exchanges/LP_NXT.c

@@ -213,6 +213,7 @@ cJSON *LP_NXT_redeems()
     //printf("calling (%s)\n",url);
     if ( (retstr= issue_curlt(url,LP_HTTP_TIMEOUT)) != 0 )
     {
+        //printf("got.(%s)\n",retstr);
         if ( (retjson= cJSON_Parse(retstr)) != 0 )
         {
             if ( (array= jarray(&numtx,retjson,"transactions")) != 0 )
@@ -298,7 +299,7 @@ cJSON *LP_NXT_redeems()
             //free_json(retjson);
         }
         free(retstr);
-    }
+    } else printf("null return from NXT api call\n");
     printf("\nTotal redeemed.%d\n",numtx);
     for (past_marker=0; past_marker<2; past_marker++)
     {

iguana/exchanges/LP_bitcoin.c

@@ -2018,9 +2018,66 @@ char *bitcoind_passthrut(char *coinstr,char *serverport,char *userpass,char *met
     return(bitcoind_RPC(0,coinstr,serverport,userpass,method,params,timeout));
 }
 
-int32_t bitcoin_addr2rmd160(uint8_t taddr,uint8_t *addrtypep,uint8_t rmd160[20],char *coinaddr)
+bits256 bits256_calctxid(char *symbol,uint8_t *serialized,int32_t  len)
 {
-    bits256 hash; uint8_t *buf,_buf[26]; int32_t len,offset;
+    bits256 txid,revtxid; int32_t i;
+    memset(txid.bytes,0,sizeof(txid));
+    if ( strcmp(symbol,"GRS") != 0 )
+        txid = bits256_doublesha256(0,serialized,len);
+    else
+    {
+        vcalc_sha256(0,revtxid.bytes,serialized,len);
+        for (i=0; i<32; i++)
+            txid.bytes[i] = revtxid.bytes[31 - i];
+    }
+    return(txid);
+}
+
+bits256 bits256_calcaddrhash(char *symbol,uint8_t *serialized,int32_t  len)
+{
+    bits256 hash;
+    if ( strcmp(symbol,"GRS") != 0 )
+        hash = bits256_doublesha256(0,serialized,len);
+    else
+    {
+        HashGroestl(hash.bytes,serialized,len);
+        /*int32_t i; char str[65];
+        for (i=0; i<len; i++)
+            printf("%02x",serialized[i]);
+        printf(" HashGroestl %d -> %s\n",len,bits256_str(str,hash));*/
+    }
+    return(hash);
+}
+
+int32_t bitcoin_addr2rmd160(char *symbol,uint8_t taddr,uint8_t *addrtypep,uint8_t rmd160[20],char *coinaddr)
+{
+    bits256 hash; uint8_t *buf,_buf[26],data5[128],rmd21[21]; char prefixaddr[64],hrp[64]; int32_t len,len5,offset;
+    if ( coinaddr == 0 || coinaddr[0] == 0 )
+    {
+        *addrtypep = 0;
+        memset(rmd160,0,20);
+        return(0);
+    }
+    if ( strcmp(symbol,"BCH") == 0 )//&& strlen(coinaddr) == 42 )
+    {
+        char *bchprefix = "bitcoincash:";
+        if ( strncmp(coinaddr,bchprefix,strlen(bchprefix)) != 0 )
+        {
+            strcpy(prefixaddr,bchprefix);
+            strcat(prefixaddr,coinaddr);
+        } else strcpy(prefixaddr,coinaddr);
+        if ( bech32_decode(hrp,data5,&len5,prefixaddr) == 0 )
+        {
+            printf("bitcoin_addr2rmd160 bech32_decode error.(%s)\n",prefixaddr);
+            return(0);
+        }
+        len = 0;
+        if ( bech32_convert_bits(rmd21,&len,8,data5,len5,5,0) == 0 )
+            printf("error converting data5\n");
+        *addrtypep = rmd21[0] == 0 ? 0 : 5;
+        memcpy(rmd160,&rmd21[1],20);
+        return(20);
+    }
     offset = 1 + (taddr != 0);
     memset(rmd160,0,20);
     *addrtypep = 0;
@@ -2028,93 +2085,109 @@ int32_t bitcoin_addr2rmd160(uint8_t taddr,uint8_t *addrtypep,uint8_t rmd160[20],
     if ( (len= bitcoin_base58decode(buf,coinaddr)) >= 4 )
     {
         // validate with trailing hash, then remove hash
-        hash = bits256_doublesha256(0,buf,20+offset);
+        hash = bits256_calcaddrhash(symbol,buf,20+offset);
         *addrtypep = (taddr == 0) ? *buf : buf[1];
         memcpy(rmd160,buf+offset,20);
-        if ( (buf[20+offset]&0xff) == hash.bytes[31] && (buf[21+offset]&0xff) == hash.bytes[30] &&(buf[22+offset]&0xff) == hash.bytes[29] && (buf[23+offset]&0xff) == hash.bytes[28] )
+        if ( strcmp(symbol,"GRS") != 0 && (buf[20+offset]&0xff) == hash.bytes[31] && (buf[21+offset]&0xff) == hash.bytes[30] && (buf[22+offset]&0xff) == hash.bytes[29] && (buf[23+offset]&0xff) == hash.bytes[28] )
         {
             //printf("coinaddr.(%s) valid checksum addrtype.%02x\n",coinaddr,*addrtypep);
             return(20);
         }
+        else if ( strcmp(symbol,"GRS") == 0 && (buf[20+offset]&0xff) == hash.bytes[0] && (buf[21+offset]&0xff) == hash.bytes[1] && (buf[22+offset]&0xff) == hash.bytes[2] && (buf[23+offset]&0xff) == hash.bytes[3] )
+            return(20);
         else
         {
             int32_t i;
-            if ( len > 20 )
-            {
-                hash = bits256_doublesha256(0,buf,len);
-            }
+            //if ( len > 20 )
+            //    hash = bits256_calcaddrhash(symbol,buf,len);
             for (i=0; i<len; i++)
-                printf("%02x ",buf[i]);
-            char str[65]; printf("\naddrtype.%d taddr.%02x checkhash.(%s) len.%d mismatch %02x %02x %02x %02x vs %02x %02x %02x %02x (%s)\n",*addrtypep,taddr,coinaddr,len,buf[len-1]&0xff,buf[len-2]&0xff,buf[len-3]&0xff,buf[len-4]&0xff,hash.bytes[31],hash.bytes[30],hash.bytes[29],hash.bytes[28],bits256_str(str,hash));
+                printf("%02x ",hash.bytes[i]);
+            char str[65]; printf("\n%s addrtype.%d taddr.%02x checkhash.(%s) len.%d mismatch %02x %02x %02x %02x vs %02x %02x %02x %02x (%s)\n",symbol,*addrtypep,taddr,coinaddr,len,buf[len-1]&0xff,buf[len-2]&0xff,buf[len-3]&0xff,buf[len-4]&0xff,hash.bytes[31],hash.bytes[30],hash.bytes[29],hash.bytes[28],bits256_str(str,hash));
         }
     }
     return(0);
 }
 
-char *bitcoin_address(char *coinaddr,uint8_t taddr,uint8_t addrtype,uint8_t *pubkey_or_rmd160,int32_t len)
+char *bitcoin_address(char *symbol,char *coinaddr,uint8_t taddr,uint8_t addrtype,uint8_t *pubkey_or_rmd160,int32_t len)
 {
-    int32_t offset,i; uint8_t data[26]; bits256 hash;// char checkaddr[65];
+    int32_t offset,i,len5; char prefixed[64]; uint8_t data[64],data5[64]; bits256 hash;
+    coinaddr[0] = 0;
     offset = 1 + (taddr != 0);
     if ( len != 20 )
         calc_rmd160_sha256(data+offset,pubkey_or_rmd160,len);
     else memcpy(data+offset,pubkey_or_rmd160,20);
-    //btc_convrmd160(checkaddr,addrtype,data+1);
+    if ( strcmp(symbol,"BCH") == 0 )
+    {
+        len5 = 0;
+        if ( addrtype == 0 )
+            data[0] = (0 << 3);
+        else data[0] = (1 << 3);
+        bech32_convert_bits(data5,&len5,5,data,21,8,1);
+        if ( bech32_encode(prefixed,"bitcoincash",data5,len5) == 0 )
+            return(0);
+        for (i=0; prefixed[i]!=0; i++)
+            if ( prefixed[i] == ':' )
+                break;
+        if ( prefixed[i] != ':' )
+            return(0);
+        strcpy(coinaddr,&prefixed[i+1]);
+        return(coinaddr);
+    }
     if ( taddr != 0 )
     {
         data[0] = taddr;
         data[1] = addrtype;
     } else data[0] = addrtype;
-    hash = bits256_doublesha256(0,data,20+offset);
+    hash = bits256_calcaddrhash(symbol,data,20+offset);
+    if ( strcmp(symbol,"GRS") != 0 )
+    {
         for (i=0; i<4; i++)
             data[20+offset+i] = hash.bytes[31-i];
+    }
+    else
+    {
+        for (i=0; i<4; i++)
+            data[20+offset+i] = hash.bytes[i];
+    }
     if ( (coinaddr= bitcoin_base58encode(coinaddr,data,24+offset)) != 0 )
     {
     } else printf("null coinaddr taddr.%02x\n",taddr);
     return(coinaddr);
 }
 
-void bitcoin_priv2pub(void *ctx,uint8_t *pubkey33,char *coinaddr,bits256 privkey,uint8_t taddr,uint8_t addrtype)
+void bitcoin_priv2pub(void *ctx,char *symbol,uint8_t *pubkey33,char *coinaddr,bits256 privkey,uint8_t taddr,uint8_t addrtype)
 {
-    bits256 pub; //char privstr[65],url[512],postdata[1024],*retstr,*pubstr,*addr; cJSON *retjson;
+    bits256 pub;
     memset(pubkey33,0,33);
     coinaddr[0] = 0;
     crypto_box_priv2pub(pub.bytes,privkey.bytes);
-    //jaddbits256(retjson,"curve25519",pub);
     bitcoin_pubkey33(ctx,pubkey33,privkey);
-    bitcoin_address(coinaddr,taddr,addrtype,pubkey33,33);
-    
-    /*bits256_str(privstr,privkey);
-     sprintf(url,"%s/?",IGUANA_URL);
-     sprintf(postdata,"{\"agent\":\"SuperNET\",\"method\":\"priv2pub\",\"privkey\":\"%s\",\"addrtype\":%u,\"taddr\":%u}",privstr,addrtype,taddr);
-     if ( (retstr= bitcoind_RPC(0,"SuperNET",url,0,"priv2pub",postdata,0)) != 0 )
-     {
-     if ( (retjson= cJSON_Parse(retstr)) != 0 )
-     {
-     if ( (pubstr= jstr(retjson,"secp256k1")) != 0 && strlen(pubstr) == 66 )
-     decode_hex(pubkey33,33,pubstr);
-     if ( (addr= jstr(retjson,"result")) != 0 && strlen(addr) < 64 )
-     strcpy(coinaddr,addr);
-     free_json(retjson);
-     }
-     free(retstr);
-     }*/
+    bitcoin_address(symbol,coinaddr,taddr,addrtype,pubkey33,33);
 }
 
-int32_t bitcoin_validaddress(uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,char *coinaddr)
+int32_t bitcoin_validaddress(char *symbol,uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,char *coinaddr)
 {
-    uint8_t rmd160[20],addrtype; char checkaddr[128];
+    uint8_t rmd160[20],addrtype; char checkaddr[64],checkaddr2[64];
     if ( coinaddr == 0 || coinaddr[0] == 0 )
         return(-1);
-    else if ( bitcoin_addr2rmd160(taddr,&addrtype,rmd160,coinaddr) < 0 )
+    else if ( bitcoin_addr2rmd160(symbol,taddr,&addrtype,rmd160,coinaddr) < 0 )
+    {
+        printf("bitcoin_validaddress addr2rmd160 error\n");
         return(-1);
+    }
     else if ( addrtype != pubtype && addrtype != p2shtype )
         return(-1);
-    else if ( bitcoin_address(checkaddr,addrtype,taddr,rmd160,sizeof(rmd160)) != checkaddr || strcmp(checkaddr,coinaddr) != 0 )
+    else if ( bitcoin_address(symbol,checkaddr,addrtype,taddr,rmd160,sizeof(rmd160)) != checkaddr || strcmp(checkaddr,coinaddr) != 0 )
+    {
+        bitcoin_addr2rmd160(symbol,taddr,&addrtype,rmd160,coinaddr);
+        bitcoin_address(symbol,checkaddr2,addrtype,taddr,rmd160,sizeof(rmd160));
+        printf("%s pubtype.%d taddr.%d bitcoin_validaddress checkaddr.%s != %s, checkaddr2.(%s)\n",symbol,pubtype,taddr,checkaddr,coinaddr,checkaddr2);
         return(-1);
+    }
     return(0);
 }
 
-int32_t base58encode_checkbuf(uint8_t taddr,uint8_t addrtype,uint8_t *data,int32_t data_len)
+int32_t base58encode_checkbuf(char *symbol,uint8_t taddr,uint8_t addrtype,uint8_t *data,int32_t data_len)
 {
     uint8_t i,offset; bits256 hash;
     offset = 1 + (taddr != 0);
@@ -2126,16 +2199,24 @@ int32_t base58encode_checkbuf(uint8_t taddr,uint8_t addrtype,uint8_t *data,int32
     //for (i=0; i<data_len+1; i++)
     //    printf("%02x",data[i]);
     //printf(" extpriv -> ");
-    hash = bits256_doublesha256(0,data,(int32_t)data_len+offset);
+    hash = bits256_calcaddrhash(symbol,data,(int32_t)data_len+offset);
     //for (i=0; i<32; i++)
     //    printf("%02x",hash.bytes[i]);
     //printf(" checkhash\n");
+    if ( strcmp(symbol,"GRS") != 0 )
+    {
         for (i=0; i<4; i++)
             data[data_len+i+offset] = hash.bytes[31-i];
+    }
+    else
+    {
+        for (i=0; i<4; i++)
+            data[data_len+i+offset] = hash.bytes[i];
+    }
     return(data_len + 4 + offset);
 }
 
-int32_t bitcoin_wif2priv(uint8_t wiftaddr,uint8_t *addrtypep,bits256 *privkeyp,char *wifstr)
+int32_t bitcoin_wif2priv(char *symbol,uint8_t wiftaddr,uint8_t *addrtypep,bits256 *privkeyp,char *wifstr)
 {
     int32_t offset,len = -1; bits256 hash; uint8_t buf[256],*ptr;
     offset = 1 + (wiftaddr != 0);
@@ -2144,27 +2225,21 @@ int32_t bitcoin_wif2priv(uint8_t wiftaddr,uint8_t *addrtypep,bits256 *privkeyp,c
     if ( (len= bitcoin_base58decode(buf,wifstr)) >= 4 )
     {
         if ( len >= 32+offset )
+        {
             memcpy(privkeyp,buf+offset,32);
+            /*if ( len > 32+offset )
+                printf("wif %s: extra byte %d len.%d vs %d addrtype.%d\n",wifstr,buf[32+offset],len,32+offset,(wiftaddr == 0) ? buf[0] : buf[1]);
+            else printf("%s is for uncompressed\n",wifstr);*/
+        }
         else
         {
-            //printf("wif %s -> buf too short len.%d\n",wifstr,len);
+            printf("wif %s -> buf too short len.%d\n",wifstr,len);
             return(-1);
         }
         ptr = buf;
-        /*if ( len < 38 )
-        {
-            memset(pbuf,0,sizeof(pbuf));
-            memcpy(pbuf,buf,len-4);
-            memcpy(&pbuf[34],&buf[len-4],4);
-            ptr = pbuf;
-            int32_t i; for (i=0; i<38; i++)
-                printf("%02x ",pbuf[i]);
-            printf("pbuf from %d\n",len);
-            len = 38;
-        }*/
-        hash = bits256_doublesha256(0,ptr,len - 4);
+        hash = bits256_calcaddrhash(symbol,ptr,len - 4);
         *addrtypep = (wiftaddr == 0) ? *ptr : ptr[1];
-        if ( (ptr[len - 4]&0xff) == hash.bytes[31] && (ptr[len - 3]&0xff) == hash.bytes[30] &&(ptr[len - 2]&0xff) == hash.bytes[29] && (ptr[len - 1]&0xff) == hash.bytes[28] )
+        if ( strcmp(symbol,"GRS") != 0 && (ptr[len - 4]&0xff) == hash.bytes[31] && (ptr[len - 3]&0xff) == hash.bytes[30] &&(ptr[len - 2]&0xff) == hash.bytes[29] && (ptr[len - 1]&0xff) == hash.bytes[28] )
         {
             //int32_t i; for (i=0; i<len; i++)
             //    printf("%02x ",ptr[i]);
@@ -2172,6 +2247,8 @@ int32_t bitcoin_wif2priv(uint8_t wiftaddr,uint8_t *addrtypep,bits256 *privkeyp,c
             //printf("wifstr.(%s) valid len.%d\n",wifstr,len);
             return(32);
         }
+        else if ( strcmp(symbol,"GRS") == 0 && (ptr[len - 4]&0xff) == hash.bytes[0] && (ptr[len - 3]&0xff) == hash.bytes[1] &&(ptr[len - 2]&0xff) == hash.bytes[2] && (ptr[len - 1]&0xff) == hash.bytes[3] )
+            return(32);
         else if ( 0 ) // gets errors when len is 37
         {
             int32_t i; for (i=0; i<len; i++)
@@ -2182,18 +2259,20 @@ int32_t bitcoin_wif2priv(uint8_t wiftaddr,uint8_t *addrtypep,bits256 *privkeyp,c
     return(-1);
 }
 
-int32_t bitcoin_wif2addr(void *ctx,uint8_t wiftaddr,uint8_t taddr,uint8_t pubtype,char *coinaddr,char *wifstr)
+int32_t bitcoin_wif2addr(void *ctx,char *symbol,uint8_t wiftaddr,uint8_t taddr,uint8_t pubtype,char *coinaddr,char *wifstr)
 {
     bits256 privkey; uint8_t addrtype,pubkey33[33];
+    if ( strcmp(symbol,"BCH") == 0 )
+        symbol = "BTC";
     coinaddr[0] = 0;
-    if ( bitcoin_wif2priv(wiftaddr,&addrtype,&privkey,wifstr) == sizeof(privkey) )
+    if ( bitcoin_wif2priv(symbol,wiftaddr,&addrtype,&privkey,wifstr) == sizeof(privkey) )
     {
-        bitcoin_priv2pub(ctx,pubkey33,coinaddr,privkey,taddr,pubtype);
+        bitcoin_priv2pub(ctx,symbol,pubkey33,coinaddr,privkey,taddr,pubtype);
     }
     return(-1);
 }
 
-int32_t bitcoin_priv2wif(uint8_t wiftaddr,char *wifstr,bits256 privkey,uint8_t addrtype)
+int32_t bitcoin_priv2wif(char *symbol,uint8_t wiftaddr,char *wifstr,bits256 privkey,uint8_t addrtype)
 {
     uint8_t data[128]; int32_t offset,len = 32;
     if ( wiftaddr != 0 )
@@ -2209,8 +2288,8 @@ int32_t bitcoin_priv2wif(uint8_t wiftaddr,char *wifstr,bits256 privkey,uint8_t a
     }
     memcpy(data+offset,privkey.bytes,len);
     data[offset + len++] = 1;
-    len = base58encode_checkbuf(wiftaddr,addrtype,data,len);
-    if ( bitcoin_base58encode(wifstr,data,len) == 0 )
+    len = base58encode_checkbuf(symbol,wiftaddr,addrtype,data,len);
+    if ( bitcoin_base58encode(wifstr,data,len) == 0 ) // skips last byte?
     {
         char str[65]; printf("error making wif from %s\n",bits256_str(str,privkey));
         return(-1);
@@ -2218,7 +2297,7 @@ int32_t bitcoin_priv2wif(uint8_t wiftaddr,char *wifstr,bits256 privkey,uint8_t a
     if ( 0 )
     {
         uint8_t checktype; bits256 checkpriv; char str[65],str2[65];
-        if ( bitcoin_wif2priv(wiftaddr,&checktype,&checkpriv,wifstr) == sizeof(bits256) )
+        if ( bitcoin_wif2priv(symbol,wiftaddr,&checktype,&checkpriv,wifstr) == sizeof(bits256) )
         {
             if ( checktype != addrtype || bits256_cmp(checkpriv,privkey) != 0 )
                 printf("(%s) -> wif.(%s) addrtype.%02x -> %02x (%s)\n",bits256_str(str,privkey),wifstr,addrtype,checktype,bits256_str(str2,checkpriv));
@@ -2227,18 +2306,18 @@ int32_t bitcoin_priv2wif(uint8_t wiftaddr,char *wifstr,bits256 privkey,uint8_t a
     return((int32_t)strlen(wifstr));
 }
 
-int32_t bitcoin_priv2wiflong(uint8_t wiftaddr,char *wifstr,bits256 privkey,uint8_t addrtype)
+int32_t bitcoin_priv2wiflong(char *symbol,uint8_t wiftaddr,char *wifstr,bits256 privkey,uint8_t addrtype)
 {
     uint8_t data[128]; int32_t offset,len = 32;
     offset = 1 + (wiftaddr != 0);
     memcpy(data+offset,privkey.bytes,sizeof(privkey));
-    len = base58encode_checkbuf(wiftaddr,addrtype,data,len);
+    len = base58encode_checkbuf(symbol,wiftaddr,addrtype,data,len);
     if ( bitcoin_base58encode(wifstr,data,len) == 0 )
         return(-1);
     if ( 0 )
     {
         uint8_t checktype; bits256 checkpriv; char str[65],str2[65];
-        if ( bitcoin_wif2priv(wiftaddr,&checktype,&checkpriv,wifstr) == sizeof(bits256) )
+        if ( bitcoin_wif2priv(symbol,wiftaddr,&checktype,&checkpriv,wifstr) == sizeof(bits256) )
         {
             if ( checktype != addrtype || bits256_cmp(checkpriv,privkey) != 0 )
                 printf("(%s) -> wif.(%s) addrtype.%02x -> %02x (%s)\n",bits256_str(str,privkey),wifstr,addrtype,checktype,bits256_str(str2,checkpriv));
@@ -2247,11 +2326,11 @@ int32_t bitcoin_priv2wiflong(uint8_t wiftaddr,char *wifstr,bits256 privkey,uint8
     return((int32_t)strlen(wifstr));
 }
 
-char *_setVsigner(uint8_t wiftaddr,uint8_t pubtype,struct vin_info *V,int32_t ind,char *pubstr,char *wifstr)
+char *_setVsigner(char *symbol,uint8_t wiftaddr,uint8_t pubtype,struct vin_info *V,int32_t ind,char *pubstr,char *wifstr)
 {
     uint8_t addrtype;
     decode_hex(V->signers[ind].pubkey,(int32_t)strlen(pubstr)/2,pubstr);
-    bitcoin_wif2priv(wiftaddr,&addrtype,&V->signers[ind].privkey,wifstr);
+    bitcoin_wif2priv(symbol,wiftaddr,&addrtype,&V->signers[ind].privkey,wifstr);
     if ( addrtype != pubtype )
         return(clonestr("{\"error\":\"invalid wifA\"}"));
     else return(0);
@@ -2268,7 +2347,7 @@ uint8_t iguana_addrtype(uint8_t pubtype,uint8_t p2shtype,uint8_t script_type)
     }
 }
 
-int32_t iguana_scriptgen(uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,int32_t *Mp,int32_t *nump,char *coinaddr,uint8_t *script,char *asmstr,uint8_t rmd160[20],uint8_t type,const struct vin_info *vp,int32_t txi)
+int32_t iguana_scriptgen(char *symbol,uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,int32_t *Mp,int32_t *nump,char *coinaddr,uint8_t *script,char *asmstr,uint8_t rmd160[20],uint8_t type,const struct vin_info *vp,int32_t txi)
 {
     uint8_t addrtype; char rmd160str[41],pubkeystr[256]; int32_t plen,i,m,n,flag = 0,scriptlen = 0;
     m = n = 0;
@@ -2278,7 +2357,7 @@ int32_t iguana_scriptgen(uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,int32_t
     if ( type == IGUANA_SCRIPT_76A988AC || type == IGUANA_SCRIPT_AC || type == IGUANA_SCRIPT_76AC || type == IGUANA_SCRIPT_P2SH )
     {
         init_hexbytes_noT(rmd160str,rmd160,20);
-        bitcoin_address(coinaddr,taddr,addrtype,rmd160,20);
+        bitcoin_address(symbol,coinaddr,taddr,addrtype,rmd160,20);
     }
     switch ( type )
     {
@@ -2317,7 +2396,7 @@ int32_t iguana_scriptgen(uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,int32_t
         case IGUANA_SCRIPT_OPRETURN:
             if ( asmstr != 0 )
                 strcpy(asmstr,"OP_RETURN ");
-            bitcoin_address(coinaddr,taddr,addrtype,(uint8_t *)&vp->spendscript[0],vp->spendlen);
+            bitcoin_address(symbol,coinaddr,taddr,addrtype,(uint8_t *)&vp->spendscript[0],vp->spendlen);
             flag++;
             break;
         case IGUANA_SCRIPT_3of3: m = 3, n = 3; break;
@@ -2330,13 +2409,13 @@ int32_t iguana_scriptgen(uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,int32_t
         case IGUANA_SCRIPT_DATA:
             if ( asmstr != 0 )
                 strcpy(asmstr,"DATA ONLY");
-            bitcoin_address(coinaddr,taddr,addrtype,(uint8_t *)&vp->spendscript[0],vp->spendlen);
+            bitcoin_address(symbol,coinaddr,taddr,addrtype,(uint8_t *)&vp->spendscript[0],vp->spendlen);
             flag++;
             break;
         case IGUANA_SCRIPT_STRANGE:
             if ( asmstr != 0 )
                 strcpy(asmstr,"STRANGE SCRIPT ");
-            bitcoin_address(coinaddr,taddr,addrtype,(uint8_t *)&vp->spendscript[0],vp->spendlen);
+            bitcoin_address(symbol,coinaddr,taddr,addrtype,(uint8_t *)&vp->spendscript[0],vp->spendlen);
             flag++;
             break;
         default: break;//printf("unexpected script type.%d\n",type); break;
@@ -2344,7 +2423,7 @@ int32_t iguana_scriptgen(uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,int32_t
     if ( n > 0 )
     {
         scriptlen = bitcoin_MofNspendscript(rmd160,script,0,vp);
-        bitcoin_address(coinaddr,taddr,p2shtype,script,scriptlen);
+        bitcoin_address(symbol,coinaddr,taddr,p2shtype,script,scriptlen);
         if ( asmstr != 0 )
         {
             sprintf(asmstr,"%d ",m);
@@ -2439,11 +2518,11 @@ int32_t bitcoin_scriptget(char *symbol,uint8_t taddr,uint8_t pubtype,uint8_t p2s
     }
     if ( *userdatap == p2shscript )
         *userdatap = 0;
-    vp->spendlen = iguana_scriptgen(taddr,pubtype,p2shtype,&vp->M,&vp->N,vp->coinaddr,vp->spendscript,0,vp->rmd160,vp->type,(const struct vin_info *)vp,vp->vin.prev_vout);
+    vp->spendlen = iguana_scriptgen(symbol,taddr,pubtype,p2shtype,&vp->M,&vp->N,vp->coinaddr,vp->spendscript,0,vp->rmd160,vp->type,(const struct vin_info *)vp,vp->vin.prev_vout);
     return(vp->spendlen);
 }
 
-int32_t _iguana_calcrmd160(uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,struct vin_info *vp)
+int32_t _iguana_calcrmd160(char *symbol,uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,struct vin_info *vp)
 {
     static uint8_t zero_rmd160[20];
     char hexstr[8192]; uint8_t *script,type; int32_t i,n,m,plen;
@@ -2518,7 +2597,7 @@ int32_t _iguana_calcrmd160(uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,struct
             }
             memcpy(vp->signers[i].pubkey,script,plen);
             calc_rmd160_sha256(vp->signers[i].rmd160,vp->signers[i].pubkey,plen);
-            bitcoin_address(vp->signers[i].coinaddr,taddr,pubtype,vp->signers[i].pubkey,plen);
+            bitcoin_address(symbol,vp->signers[i].coinaddr,taddr,pubtype,vp->signers[i].pubkey,plen);
         }
         if ( (int32_t)((long)script - (long)vp->spendscript) == vp->spendlen-2 )
         {
@@ -2571,7 +2650,7 @@ int32_t _iguana_calcrmd160(uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,struct
     return(type);
 }
 
-int32_t iguana_calcrmd160(uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,char *asmstr,struct vin_info *vp,uint8_t *pk_script,int32_t pk_scriptlen,bits256 debugtxid,int32_t vout,uint32_t sequence)
+int32_t iguana_calcrmd160(char *symbol,uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,char *asmstr,struct vin_info *vp,uint8_t *pk_script,int32_t pk_scriptlen,bits256 debugtxid,int32_t vout,uint32_t sequence)
 {
     int32_t scriptlen; uint8_t script[IGUANA_MAXSCRIPTSIZE];
     memset(vp,0,sizeof(*vp));
@@ -2579,9 +2658,9 @@ int32_t iguana_calcrmd160(uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,char *a
     vp->spendlen = pk_scriptlen;
     vp->vin.sequence = sequence;
     memcpy(vp->spendscript,pk_script,pk_scriptlen);
-    if ( (vp->type= _iguana_calcrmd160(taddr,pubtype,p2shtype,vp)) >= 0 )
+    if ( (vp->type= _iguana_calcrmd160(symbol,taddr,pubtype,p2shtype,vp)) >= 0 )
     {
-        scriptlen = iguana_scriptgen(taddr,pubtype,p2shtype,&vp->M,&vp->N,vp->coinaddr,script,asmstr,vp->rmd160,vp->type,(const struct vin_info *)vp,vout);
+        scriptlen = iguana_scriptgen(symbol,taddr,pubtype,p2shtype,&vp->M,&vp->N,vp->coinaddr,script,asmstr,vp->rmd160,vp->type,(const struct vin_info *)vp,vout);
         if ( vp->M == 0 && vp->N == 0 )
         {
             vp->M = vp->N = 1;
@@ -2624,11 +2703,11 @@ cJSON *bitcoin_txscript(char *asmstr,char **vardata,int32_t numvars)
     return(scriptjson);
 }
 
-cJSON *iguana_scriptpubkeys(uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,uint8_t *script,int32_t scriptlen,bits256 txid,int16_t vout,uint32_t sequenceid)
+cJSON *iguana_scriptpubkeys(char *symbol,uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,uint8_t *script,int32_t scriptlen,bits256 txid,int16_t vout,uint32_t sequenceid)
 {
     int32_t type,i,n,plen; struct vin_info V; cJSON *pubkeys; char pubkeystr[256];
     pubkeys = cJSON_CreateArray();
-    if ( (type= iguana_calcrmd160(taddr,pubtype,p2shtype,0,&V,script,scriptlen,txid,vout,sequenceid)) >= 0 )
+    if ( (type= iguana_calcrmd160(symbol,taddr,pubtype,p2shtype,0,&V,script,scriptlen,txid,vout,sequenceid)) >= 0 )
     {
         if ( (n= V.N) == 0 )
             n = 1;
@@ -2680,7 +2759,7 @@ cJSON *iguana_pubkeysjson(uint8_t *pubkeyptrs[],int32_t numpubkeys)
     return(pubkeysjson);
 }
 
-cJSON *bitcoin_txinput(uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,cJSON *txobj,bits256 txid,int32_t vout,uint32_t sequenceid,uint8_t *spendscript,int32_t spendlen,uint8_t *redeemscript,int32_t p2shlen,uint8_t *pubkeys[],int32_t numpubkeys,uint8_t *sig,int32_t siglen)
+cJSON *bitcoin_txinput(char *symbol,uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,cJSON *txobj,bits256 txid,int32_t vout,uint32_t sequenceid,uint8_t *spendscript,int32_t spendlen,uint8_t *redeemscript,int32_t p2shlen,uint8_t *pubkeys[],int32_t numpubkeys,uint8_t *sig,int32_t siglen)
 {
     cJSON *item,*vins; char p2shscriptstr[IGUANA_MAXSCRIPTSIZE*2+1]; uint8_t *script,len=0;
     vins = jduplicate(jobj(txobj,"vin"));
@@ -2700,7 +2779,7 @@ cJSON *bitcoin_txinput(uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,cJSON *txo
         script = redeemscript, len = p2shlen;
     } else script = 0;
     if ( script != 0 && numpubkeys == 0 )
-        jadd(item,"pubkeys",iguana_scriptpubkeys(taddr,pubtype,p2shtype,script,len,txid,vout,sequenceid));
+        jadd(item,"pubkeys",iguana_scriptpubkeys(symbol,taddr,pubtype,p2shtype,script,len,txid,vout,sequenceid));
     else if ( pubkeys != 0 && numpubkeys > 0 )
         jadd(item,"pubkeys",iguana_pubkeysjson(pubkeys,numpubkeys));
     jaddbits256(item,"txid",txid);
@@ -2744,12 +2823,12 @@ cJSON *bitcoin_txoutput(cJSON *txobj,uint8_t *paymentscript,int32_t len,uint64_t
     return(txobj);
 }
 
-int32_t bitcoin_txaddspend(uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,cJSON *txobj,char *destaddress,uint64_t satoshis)
+int32_t bitcoin_txaddspend(char *symbol,uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,cJSON *txobj,char *destaddress,uint64_t satoshis)
 {
     uint8_t outputscript[128],addrtype,rmd160[20]; int32_t scriptlen;
-    if ( bitcoin_validaddress(taddr,pubtype,p2shtype,destaddress) == 0 && satoshis != 0 )
+    if ( bitcoin_validaddress(symbol,taddr,pubtype,p2shtype,destaddress) == 0 && satoshis != 0 )
     {
-        bitcoin_addr2rmd160(taddr,&addrtype,rmd160,destaddress);
+        bitcoin_addr2rmd160(symbol,taddr,&addrtype,rmd160,destaddress);
         scriptlen = bitcoin_standardspend(outputscript,0,rmd160);
         bitcoin_txoutput(txobj,outputscript,scriptlen,satoshis);
         return(0);
@@ -3176,7 +3255,7 @@ int32_t iguana_parsevoutobj(uint8_t *serialized,int32_t maxsize,struct iguana_ms
     return(len);
 }
 
-cJSON *iguana_voutjson(uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,struct iguana_msgvout *vout,int32_t txi,bits256 txid)
+cJSON *iguana_voutjson(char *symbol,uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,struct iguana_msgvout *vout,int32_t txi,bits256 txid)
 {
     // 035f1321ed17d387e4433b2fa229c53616057964af065f98bfcae2233c5108055e OP_CHECKSIG
     char scriptstr[IGUANA_MAXSCRIPTSIZE+1]; int32_t i,m,n,scriptlen,asmtype; struct vin_info *vp;
@@ -3189,10 +3268,10 @@ cJSON *iguana_voutjson(uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,struct igu
     if ( vout->pk_script != 0 && vout->pk_scriptlen*2+1 < sizeof(scriptstr) )
     {
         memset(vp,0,sizeof(*vp));
-        if ( (asmtype= iguana_calcrmd160(taddr,pubtype,p2shtype,0,vp,vout->pk_script,vout->pk_scriptlen,txid,txi,0xffffffff)) >= 0 )
+        if ( (asmtype= iguana_calcrmd160(symbol,taddr,pubtype,p2shtype,0,vp,vout->pk_script,vout->pk_scriptlen,txid,txi,0xffffffff)) >= 0 )
         {
             skey = cJSON_CreateObject();
-            scriptlen = iguana_scriptgen(taddr,pubtype,p2shtype,&m,&n,vp->coinaddr,space,0,vp->rmd160,asmtype,vp,txi);
+            scriptlen = iguana_scriptgen(symbol,taddr,pubtype,p2shtype,&m,&n,vp->coinaddr,space,0,vp->rmd160,asmtype,vp,txi);
             //if ( asmstr[0] != 0 )
             //    jaddstr(skey,"asm",asmstr);
             addrs = cJSON_CreateArray();
@@ -3320,11 +3399,12 @@ bits256 bitcoin_sigtxid(char *symbol,uint8_t taddr,uint8_t pubtype,uint8_t p2sht
             len += iguana_rwnum(1,&serialized[len],sizeof(hashtype),&hashtype);
             if ( sbtcflag != 0 )
             {
+                serialized[len++] = 4;
                 memcpy(&serialized[len],"sbtc",4);
                 len += 4;
             }
         }
-        revsigtxid = bits256_doublesha256(0,serialized,len);
+        revsigtxid = bits256_calctxid(symbol,serialized,len);
         for (i=0; i<sizeof(revsigtxid); i++)
             sigtxid.bytes[31-i] = revsigtxid.bytes[i];
     }
@@ -3499,7 +3579,7 @@ uint32_t LP_sighash(char *symbol,int32_t zcash)
 
 int32_t iguana_rwmsgtx(char *symbol,uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,uint8_t isPoS,int32_t height,int32_t rwflag,cJSON *json,uint8_t *serialized,int32_t maxsize,struct iguana_msgtx *msg,bits256 *txidp,char *vpnstr,uint8_t *extraspace,int32_t extralen,cJSON *vins,int32_t suppress_pubkeys,int32_t zcash)
 {
-    int32_t i,j,n,segtxlen,len = 0,extraused=0; uint32_t tmp,segitems; uint8_t *segtx=0,segwitflag=0,spendscript[IGUANA_MAXSCRIPTSIZE],*txstart = serialized,*sigser=0; char txidstr[65]; uint64_t spendamount; cJSON *vinarray=0,*voutarray=0; bits256 sigtxid;
+    int32_t i,j,n,segtxlen,len = 0,extraused=0; uint32_t tmp,segitems; uint8_t *segtx=0,segwitflag=0,spendscript[IGUANA_MAXSCRIPTSIZE],*txstart = serialized,*sigser=0; uint64_t spendamount; cJSON *vinarray=0,*voutarray=0; bits256 sigtxid;
     
     len += iguana_rwnum(rwflag,&serialized[len],sizeof(msg->version),&msg->version);
     if ( json != 0 )
@@ -3600,7 +3680,7 @@ int32_t iguana_rwmsgtx(char *symbol,uint8_t taddr,uint8_t pubtype,uint8_t p2shty
             return(-1);
         }
         if ( voutarray != 0 )
-            jaddi(voutarray,iguana_voutjson(taddr,pubtype,p2shtype,&msg->vouts[i],i,*txidp));
+            jaddi(voutarray,iguana_voutjson(symbol,taddr,pubtype,p2shtype,&msg->vouts[i],i,*txidp));
     }
     if ( segwitflag != 0 )
     {
@@ -3631,7 +3711,7 @@ int32_t iguana_rwmsgtx(char *symbol,uint8_t taddr,uint8_t pubtype,uint8_t p2shty
                 //printf("), ");
             }
             memcpy(&segtx[segtxlen-sizeof(int32_t)],&serialized[len],sizeof(int32_t));
-            *txidp = bits256_doublesha256(0,segtx,segtxlen);
+            *txidp = bits256_calctxid(symbol,segtx,segtxlen);
             free(segtx);
             //char str[65]; printf("witness sum %d vs max.%d txid %s\n",len,maxsize,bits256_str(str,txid));
         }
@@ -3692,7 +3772,7 @@ int32_t iguana_rwmsgtx(char *symbol,uint8_t taddr,uint8_t pubtype,uint8_t p2shty
         jaddnum(json,"numvouts",msg->tx_out);
     }
     if ( segwitflag == 0 )
-        *txidp = bits256_doublesha256(txidstr,txstart,len);
+        *txidp = bits256_calctxid(symbol,txstart,len);
     if ( json != 0 )
     {
         jaddnum(json,"locktime",msg->lock_time);
@@ -3704,7 +3784,7 @@ int32_t iguana_rwmsgtx(char *symbol,uint8_t taddr,uint8_t pubtype,uint8_t p2shty
     return(len);
 }
 
-bits256 iguana_parsetxobj(uint8_t isPoS,int32_t *txstartp,uint8_t *serialized,int32_t maxsize,struct iguana_msgtx *msg,cJSON *txobj,struct vin_info *V)
+bits256 iguana_parsetxobj(char *symbol,uint8_t isPoS,int32_t *txstartp,uint8_t *serialized,int32_t maxsize,struct iguana_msgtx *msg,cJSON *txobj,struct vin_info *V)
 {
     int32_t i,n,numvins,numvouts,len = 0,rwflag=1; cJSON *array=0; bits256 txid; char vpnstr[64];
     memset(&txid,0,sizeof(txid));
@@ -3766,7 +3846,7 @@ bits256 iguana_parsetxobj(uint8_t isPoS,int32_t *txstartp,uint8_t *serialized,in
     //msg->txid = jbits256(txobj,"txid");
     *txstartp = 0;
     msg->allocsize = len;
-    msg->txid = txid = bits256_doublesha256(0,serialized,len);
+    msg->txid = txid = bits256_calctxid(symbol,serialized,len);
     return(txid);
 }
 
@@ -3785,7 +3865,7 @@ char *iguana_rawtxbytes(char *symbol,uint8_t taddr,uint8_t pubtype,uint8_t p2sht
     return(txbytes);
 }
 
-char *bitcoin_json2hex(uint8_t isPoS,bits256 *txidp,cJSON *txjson,struct vin_info *V)
+char *bitcoin_json2hex(char *symbol,uint8_t isPoS,bits256 *txidp,cJSON *txjson,struct vin_info *V)
 {
     int32_t txstart; uint8_t *serialized; struct iguana_msgtx msgtx; char *txbytes = 0;
     if ( txjson == 0 )
@@ -3794,7 +3874,7 @@ char *bitcoin_json2hex(uint8_t isPoS,bits256 *txidp,cJSON *txjson,struct vin_inf
         return(0);
     }
     serialized = malloc(IGUANA_MAXPACKETSIZE*1.5);
-    *txidp = iguana_parsetxobj(isPoS,&txstart,serialized,IGUANA_MAXPACKETSIZE*1.5,&msgtx,txjson,V);
+    *txidp = iguana_parsetxobj(symbol,isPoS,&txstart,serialized,IGUANA_MAXPACKETSIZE*1.5,&msgtx,txjson,V);
     if ( msgtx.allocsize > 0 )
     {
         txbytes = malloc(msgtx.allocsize*2 + 1);

iguana/exchanges/LP_cache.c

@@ -117,7 +117,7 @@ int32_t LP_cacheitem(struct iguana_info *coin,FILE *fp)
         serialized = malloc(len);
         if ( (retval= (int32_t)fread(serialized,1,len,fp)) == len )
         {
-            hash = bits256_doublesha256(0,serialized,len);
+            hash = bits256_calctxid(coin->symbol,serialized,len);
             if ( bits256_cmp(hash,txid) == 0 )
             {
                 //printf("%s validated in cache\n",bits256_str(str,hash));
@@ -159,7 +159,7 @@ void LP_cacheptrs_init(struct iguana_info *coin)
         OS_truncate(fname,len);
 }
 
-bits256 iguana_merkle(bits256 *tree,int32_t txn_count)
+bits256 iguana_merkle(char *symbol,bits256 *tree,int32_t txn_count)
 {
     int32_t i,n=0,prev; uint8_t serialized[sizeof(bits256) * 2];
     if ( txn_count == 1 )
@@ -174,7 +174,7 @@ bits256 iguana_merkle(bits256 *tree,int32_t txn_count)
         {
             iguana_rwbignum(1,serialized,sizeof(*tree),tree[prev + i].bytes);
             iguana_rwbignum(1,&serialized[sizeof(*tree)],sizeof(*tree),tree[prev + i + 1].bytes);
-            tree[n + (i >> 1)] = bits256_doublesha256(0,serialized,sizeof(serialized));
+            tree[n + (i >> 1)] = bits256_calctxid(symbol,serialized,sizeof(serialized));
         }
         prev = n;
         txn_count >>= 1;

iguana/exchanges/LP_coins.c

@@ -77,7 +77,7 @@ uint16_t LP_userpassfp(char *symbol,char *username,char *password,FILE *fp)
             if ( str != 0 )
             {
                 port = atoi(str);
-                //printf("RPCPORT.%u\n",port);
+                printf("found RPCPORT.%u\n",port);
                 free(str);
             }
         }
@@ -209,7 +209,7 @@ uint16_t LP_userpass(char *userpass,char *symbol,char *assetname,char *confroot,
             printf("LP_statefname.(%s) <- %s %s %s (%s) (%s)\n",fname,name,symbol,assetname,userpass,confpath);
         return(port);
     } else printf("cant open.(%s)\n",fname);
-    return(0);
+    return(origport);
 }
 
 cJSON *LP_coinjson(struct iguana_info *coin,int32_t showwif)
@@ -218,8 +218,8 @@ cJSON *LP_coinjson(struct iguana_info *coin,int32_t showwif)
     jaddstr(item,"coin",coin->symbol);
     if ( showwif != 0 )
     {
-        bitcoin_priv2wif(coin->wiftaddr,wifstr,G.LP_privkey,coin->wiftype);
-        bitcoin_wif2priv(coin->wiftaddr,&tmptype,&checkkey,wifstr);
+        bitcoin_priv2wif(coin->symbol,coin->wiftaddr,wifstr,G.LP_privkey,coin->wiftype);
+        bitcoin_wif2priv(coin->symbol,coin->wiftaddr,&tmptype,&checkkey,wifstr);
         if ( bits256_cmp(G.LP_privkey,checkkey) == 0 )
             jaddstr(item,"wif",wifstr);
         else jaddstr(item,"wif","error creating wif");
@@ -351,7 +351,7 @@ struct iguana_info *LP_coinadd(struct iguana_info *cdata)
 uint16_t LP_coininit(struct iguana_info *coin,char *symbol,char *name,char *assetname,int32_t isPoS,uint16_t port,uint8_t pubtype,uint8_t p2shtype,uint8_t wiftype,uint64_t txfee,double estimatedrate,int32_t longestchain,uint8_t wiftaddr,uint8_t taddr,uint16_t busport,char *confpath)
 {
     static void *ctx;
-    char *name2;
+    char *name2; uint16_t origport = port;
     memset(coin,0,sizeof(*coin));
     safecopy(coin->symbol,symbol,sizeof(coin->symbol));
     if ( strcmp(symbol,"PART") == 0 )
@@ -368,7 +368,7 @@ uint16_t LP_coininit(struct iguana_info *coin,char *symbol,char *name,char *asse
     coin->p2shtype = p2shtype;
     coin->wiftype = wiftype;
     coin->inactive = (uint32_t)time(NULL);
-    coin->bussock = LP_coinbus(busport);
+    //coin->bussock = LP_coinbus(busport);
     if ( ctx == 0 )
         ctx = bitcoin_ctx();
     coin->ctx = ctx;
@@ -389,6 +389,8 @@ uint16_t LP_coininit(struct iguana_info *coin,char *symbol,char *name,char *asse
     port = LP_userpass(coin->userpass,symbol,assetname,name,name2,confpath,port);
 #endif
     sprintf(coin->serverport,"127.0.0.1:%u",port);
+    if ( port != origport )
+        printf("set curl path for %s to %s\n",symbol,coin->serverport);
     if ( strcmp(symbol,"KMD") == 0 || coin->isassetchain != 0 || taddr != 0 )
         coin->zcash = LP_IS_ZCASHPROTOCOL;
     else if ( strcmp(symbol,"BCH") == 0 )
@@ -517,7 +519,7 @@ void LP_otheraddress(char *destcoin,char *otheraddr,char *srccoin,char *coinaddr
     uint8_t addrtype,rmd160[20]; struct iguana_info *src,*dest;
     if ( (src= LP_coinfind(srccoin)) != 0 && (dest= LP_coinfind(destcoin)) != 0 )
     {
-        bitcoin_addr2rmd160(src->taddr,&addrtype,rmd160,coinaddr);
-        bitcoin_address(otheraddr,dest->taddr,dest->pubtype,rmd160,20);
+        bitcoin_addr2rmd160(srccoin,src->taddr,&addrtype,rmd160,coinaddr);
+        bitcoin_address(destcoin,otheraddr,dest->taddr,dest->pubtype,rmd160,20);
     } else printf("couldnt find %s or %s\n",srccoin,destcoin);
 }

iguana/exchanges/LP_commands.c

@@ -103,7 +103,7 @@ char *stats_JSON(void *ctx,char *myipaddr,int32_t pubsock,cJSON *argjson,char *r
          return(clonestr("{\"result\":\" \
 available localhost RPC commands: \n \
 setprice(base, rel, price, broadcast=1)\n\
-autoprice(base, rel, fixed, minprice, margin, refbase, refrel, factor, offset)*\n\
+autoprice(base, rel, fixed, minprice, maxprice, margin, refbase, refrel, factor, offset)*\n\
 goal(coin=*, val=<autocalc>)\n\
 myprice(base, rel)\n\
 enable(coin)\n\
@@ -123,7 +123,7 @@ sendrawtransaction(coin, signedtx)\n\
 swapstatus(pending=0)\n\
 swapstatus(coin, limit=10)\n\
 swapstatus(base, rel, limit=10)\n\
-swapstatus(requestid, quoteid)\n\
+swapstatus(requestid, quoteid, pending=0)\n\
 recentswaps(limit=3)\n\
 notarizations(coin)\n\
 public API:\n \
@@ -131,7 +131,7 @@ getcoins()\n\
 getcoin(coin)\n\
 portfolio()\n\
 getpeers()\n\
-passphrase(passphrase, gui)\n\
+passphrase(passphrase, gui, netid=0, seednode="")\n\
 listunspent(coin, address)\n\
 setconfirms(coin, numconfirms, maxconfirms=6)\n\
 trust(pubkey, trust) # positive to trust, 0 for normal, negative to blacklist\n\
@@ -140,6 +140,7 @@ balances(address)\n\
 fundvalue(address="", holdings=[], divisor=0)\n\
 orderbook(base, rel, duration=3600)\n\
 getprices()\n\
+getmyprice(base, rel)\n\
 getprice(base, rel)\n\
 //sendmessage(base=coin, rel="", pubkey=zero, <argjson method2>)\n\
 //getmessages(firsti=0, num=100)\n\
@@ -160,7 +161,7 @@ bot_stop(botid)\n\
 bot_pause(botid)\n\
 instantdex_deposit(weeks, amount, broadcast=1)\n\
 instantdex_claim()\n\
-jpg(srcfile, destfile, power2=7, passphrase, data="", required)\n\
+jpg(srcfile, destfile, power2=7, password, data="", required, ind=0)\n\
 \"}"));
     //sell(base, rel, price, basevolume, timeout=10, duration=3600)\n\
     
@@ -182,6 +183,7 @@ jpg(srcfile, destfile, power2=7, passphrase, data="", required)\n\
             init_hexbytes_noT(pub33str,G.LP_pubsecp,33);
             jaddstr(retjson,"pubsecp",pub33str);
             jadd(retjson,"coins",LP_coinsjson(LP_showwif));
+            LP_cmdcount++;
             return(jprint(retjson,1));
         }
         // if passphrase api and passphrase is right, ignore userpass, use hass of passphrase
@@ -197,11 +199,12 @@ jpg(srcfile, destfile, power2=7, passphrase, data="", required)\n\
             return(clonestr("{\"error\":\"authentication error you need to make sure userpass is set\"}"));
         if ( jobj(argjson,"userpass") != 0 )
             jdelete(argjson,"userpass");
+        LP_cmdcount++;
         if ( strcmp(method,"passphrase") == 0 )
         {
             char coinaddr[64],pub33str[67];
             G.USERPASS_COUNTER = 1;
-            if ( LP_passphrase_init(jstr(argjson,"passphrase"),jstr(argjson,"gui")) < 0 )
+            if ( LP_passphrase_init(jstr(argjson,"passphrase"),jstr(argjson,"gui"),juint(argjson,"netid"),jstr(argjson,"seednode")) < 0 )
                 return(clonestr("{\"error\":\"couldnt change passphrase\"}"));
             {
                 retjson = cJSON_CreateObject();
@@ -210,9 +213,9 @@ jpg(srcfile, destfile, power2=7, passphrase, data="", required)\n\
                 jaddbits256(retjson,"mypubkey",G.LP_mypub25519);
                 init_hexbytes_noT(pub33str,G.LP_pubsecp,33);
                 jaddstr(retjson,"pubsecp",pub33str);
-                bitcoin_address(coinaddr,0,60,G.LP_myrmd160,20);
+                bitcoin_address("KMD",coinaddr,0,60,G.LP_myrmd160,20);
                 jaddstr(retjson,"KMD",coinaddr);
-                bitcoin_address(coinaddr,0,0,G.LP_myrmd160,20);
+                bitcoin_address("BTC",coinaddr,0,0,G.LP_myrmd160,20);
                 jaddstr(retjson,"BTC",coinaddr);
                 jaddstr(retjson,"NXT",G.LP_NXTaddr);
                 jadd(retjson,"coins",LP_coinsjson(LP_showwif));
@@ -239,7 +242,7 @@ jpg(srcfile, destfile, power2=7, passphrase, data="", required)\n\
         }
         else if ( strcmp(method,"jpg") == 0 )
         {
-            return(LP_jpg(jstr(argjson,"srcfile"),jstr(argjson,"destfile"),jint(argjson,"power2"),jstr(argjson,"passphrase"),jstr(argjson,"data"),jint(argjson,"required")));
+            return(LP_jpg(jstr(argjson,"srcfile"),jstr(argjson,"destfile"),jint(argjson,"power2"),jstr(argjson,"password"),jstr(argjson,"data"),jint(argjson,"required"),juint(argjson,"ind")));
         }
         /*else if ( strcmp(method,"sendmessage") == 0 )
         {
@@ -267,7 +270,8 @@ jpg(srcfile, destfile, power2=7, passphrase, data="", required)\n\
         else if ( strcmp(method,"stop") == 0 )
         {
             printf("DEBUG stop\n");
-            exit(0);
+            LP_STOP_RECEIVED = 1;
+            return(clonestr("{\"result\":\"success\"}"));
         }
         else if ( strcmp(method,"millis") == 0 )
         {
@@ -569,7 +573,7 @@ jpg(srcfile, destfile, power2=7, passphrase, data="", required)\n\
                     {
                         ptr->privkeydepth = 0;
                         LP_address_utxo_reset(ptr);
-                        LP_passphrase_init(jstr(argjson,"passphrase"),G.gui);
+                        LP_passphrase_init(jstr(argjson,"passphrase"),G.gui,G.netid,G.seednode);
                     }
                     if ( bits256_nonz(G.LP_privkey) != 0 )
                         LP_privkey_init(-1,ptr,G.LP_privkey,G.LP_mypub25519);
@@ -649,17 +653,26 @@ jpg(srcfile, destfile, power2=7, passphrase, data="", required)\n\
     else if ( strcmp(method,"notify") == 0 )
         return(LP_notify_recv(argjson));
     else if ( strcmp(method,"getpeers") == 0 )
-        retstr = clonestr("{\"error\":\"deprecated\"}");
+        return(LP_peers());
     else if ( strcmp(method,"balances") == 0 )
         return(jprint(LP_balances(jstr(argjson,"address")),1));
     else if ( strcmp(method,"fundvalue") == 0 )
         return(jprint(LP_fundvalue(argjson),1));
-    else if ( strcmp(method,"getprice") == 0 )
+    else if ( strcmp(method,"getprice") == 0 || strcmp(method,"getmyprice") == 0 )
     {
         double price,bid,ask;
+        if ( strcmp(method,"getprice") == 0 )
+        {
             ask = LP_price(base,rel);
             if ( (bid= LP_price(rel,base)) > SMALLVAL )
                 bid = 1./bid;
+        }
+        else
+        {
+            ask = LP_getmyprice(base,rel);
+            if ( (bid= LP_getmyprice(rel,base)) > SMALLVAL )
+                bid = 1./bid;
+        }
         price = _pairaved(bid,ask);
         retjson = cJSON_CreateObject();
         jaddstr(retjson,"result","success");

iguana/exchanges/LP_include.h

@@ -22,7 +22,7 @@
 #define LP_INCLUDE_H
 
 #ifndef LP_TECHSUPPORT
-#define LP_TECHSUPPORT 1
+#define LP_TECHSUPPORT 0
 #endif
 
 #ifdef FROMGUI
@@ -33,7 +33,7 @@ voind dontprintf(char *formatstr,...) {}
 
 #define LP_MAJOR_VERSION "0"
 #define LP_MINOR_VERSION "1"
-#define LP_BUILD_NUMBER "17752"
+#define LP_BUILD_NUMBER "17763"
 #define LP_BARTERDEX_VERSION 1
 #define LP_MAGICBITS 1
 
@@ -55,7 +55,7 @@ void emscripten_usleep(int32_t x); // returns immediate, no sense for sleeping
 
 #define LP_MAXVINS 64
 #define LP_HTTP_TIMEOUT 3 // 1 is too small due to edge cases of time(NULL)
-#define LP_AUTOTRADE_TIMEOUT 60
+#define LP_AUTOTRADE_TIMEOUT 30
 #define LP_RESERVETIME 600  //(LP_AUTOTRADE_TIMEOUT * 2)
 #define ELECTRUM_TIMEOUT 13
 #define LP_ELECTRUM_KEEPALIVE 60
@@ -94,7 +94,7 @@ void emscripten_usleep(int32_t x); // returns immediate, no sense for sleeping
 #define LP_PEERGOOD_ERRORDECAY 0.9
 
 #define LP_SWAPSTEP_TIMEOUT 30
-#define LP_MIN_TXFEE 10000
+#define LP_MIN_TXFEE 1000
 #define LP_MINVOL 20
 #define LP_MINCLIENTVOL 200
 #define LP_MINSIZE_TXFEEMULT 10
@@ -299,7 +299,7 @@ struct iguana_info
     UT_hash_handle hh;
     portable_mutex_t txmutex,addrmutex; struct LP_transaction *transactions; struct LP_address *addresses;
     uint64_t txfee;
-    int32_t numutxos,notarized,longestchain,firstrefht,firstscanht,lastscanht,bussock,height; uint16_t busport;
+    int32_t numutxos,notarized,longestchain,firstrefht,firstscanht,lastscanht,height; uint16_t busport;
     uint32_t txversion,dPoWtime,loadedcache,electrumlist,lastunspent,importedprivkey,lastpushtime,lastutxosync,addr_listunspent_requested,lastutxos,updaterate,counter,inactive,lastmempool,lastgetinfo,ratetime,heighttime,lastmonitor,obooktime;
     uint8_t pubtype,p2shtype,isPoS,wiftype,wiftaddr,taddr,noimportprivkey_flag,userconfirms,isassetchain,maxconfirms;
     char symbol[128],smartaddr[64],userpass[1024],serverport[128],instantdex_address[64];
@@ -351,9 +351,9 @@ struct LP_address
     struct LP_address_utxo *utxos;
     bits256 pubkey;
     int64_t balance,total,instantdex_credits;
-    uint32_t timestamp,n,unspenttime;
+    uint32_t timestamp,n,unspenttime,instantdextime;
     int32_t unspentheight;
-    char coinaddr[40];
+    char coinaddr[64];
     uint8_t pubsecp[33],didinstantdex;
 };
 
@@ -363,7 +363,7 @@ struct LP_peerinfo
     uint64_t ip_port;
     uint32_t recvtime,numrecv,ipbits,errortime,errors,numpeers,needping,lasttime,connected,lastutxos,lastpeers,diduquery,good,sessionid;
     int32_t pushsock,subsock,isLP;
-    uint16_t port;
+    uint16_t port,netid;
     char ipaddr[64];
 };
 
@@ -416,7 +416,7 @@ struct LP_swapstats
     uint64_t aliceid;
     int32_t bobneeds_dPoW,aliceneeds_dPoW;
     uint32_t ind,methodind,finished,expired,lasttime,dPoWfinished;
-    char alicegui[32],bobgui[32];
+    char alicegui[65],bobgui[65];
 };
 
 struct LP_pubswap { struct LP_pubswap *next,*prev; struct LP_swapstats *swap; };
@@ -487,7 +487,7 @@ int64_t LP_listunspent_parseitem(struct iguana_info *coin,bits256 *txidp,int32_t
 void LP_unspents_cache(char *symbol,char *addr,char *arraystr,int32_t updatedflag);
 uint16_t LP_psock_get(char *connectaddr,char *publicaddr,int32_t ispaired);
 //void LP_utxo_clientpublish(struct LP_utxoinfo *utxo);
-int32_t LP_coinbus(uint16_t coin_busport);
+//int32_t LP_coinbus(uint16_t coin_busport);
 int32_t LP_nanomsg_recvs(void *ctx);
 int32_t LP_numconfirms(char *symbol,char *coinaddr,bits256 txid,int32_t vout,int32_t mempool);
 void LP_aliceid(uint32_t tradeid,uint64_t aliceid,char *event,uint32_t requestid,uint32_t quoteid);
@@ -517,7 +517,8 @@ struct LP_address_utxo *LP_address_utxofind(struct iguana_info *coin,char *coina
 int64_t LP_myzcredits();
 void test_validate(struct iguana_info *coin,char *signedtx);
 void LP_instantdex_depositadd(char *coinaddr,bits256 txid);
-int64_t LP_instantdex_creditcalc(struct iguana_info *coin,int32_t dispflag,bits256 txid,char *refaddr);
+int64_t LP_instantdex_creditcalc(struct iguana_info *coin,int32_t dispflag,bits256 txid,char *refaddr,char *origcoinaddr);
+void LP_ports(uint16_t *pullportp,uint16_t *pubportp,uint16_t *busportp,uint16_t netid);
 int32_t LP_destaddr(char *destaddr,cJSON *item);
 int32_t LP_waitmempool(char *symbol,char *coinaddr,bits256 txid,int32_t vout,int32_t duration);
 cJSON *LP_statslog_disp(uint32_t starttime,uint32_t endtime,char *refgui,bits256 refpubkey,char *refbase,char *refrel);
@@ -556,8 +557,13 @@ struct LP_utxoinfo *_LP_utxo2find(int32_t iambob,bits256 txid,int32_t vout);
 int64_t LP_dynamictrust(int64_t credits,bits256 pubkey,int64_t kmdvalue);
 struct LP_address *LP_addressfind(struct iguana_info *coin,char *coinaddr);
 int64_t LP_outpoint_amount(char *symbol,bits256 txid,int32_t vout);
+void LP_initpeers(int32_t pubsock,struct LP_peerinfo *mypeer,char *myipaddr,uint16_t myport,uint16_t netid,char *seednode);
 
 void LP_listunspent_query(char *symbol,char *coinaddr);
-int32_t bitcoin_priv2wif(uint8_t wiftaddr,char *wifstr,bits256 privkey,uint8_t addrtype);
+int32_t bitcoin_priv2wif(char *symbol,uint8_t wiftaddr,char *wifstr,bits256 privkey,uint8_t addrtype);
+int bech32_convert_bits(uint8_t *out,int32_t *outlen,int outbits,const uint8_t *in,int32_t inlen,int inbits,int pad);
+int bech32_decode(char *hrp,uint8_t *data,int32_t *data_len,const char *input);
+int bech32_encode(char *output,const char *hrp,const uint8_t *data,int32_t data_len);
+void HashGroestl(void * buf, const void * pbegin, int len);
 
 #endif

iguana/exchanges/LP_instantdex.c

@@ -133,7 +133,7 @@ void LP_instantdex_depositadd(char *coinaddr,bits256 txid)
                         {
                             prevtxid = jbits256i(array,i);
                             //char str[65]; printf("instantdex iter.%d i.%d check %s\n",iter,i,bits256_str(str,prevtxid));
-                            if ( LP_instantdex_creditcalc(coin,0,prevtxid,coinaddr) > 0 )
+                            if ( LP_instantdex_creditcalc(coin,0,prevtxid,coinaddr,coinaddr) > 0 )
                             {
                                 LP_instantdex_deposituniq(fp,prevtxid);
                                 fflush(fp);
@@ -153,12 +153,12 @@ void LP_instantdex_depositadd(char *coinaddr,bits256 txid)
     LP_instantdex_filescreate(coinaddr);
 }
 
-int32_t LP_deposit_addr(char *p2shaddr,uint8_t *script,uint8_t taddr,uint8_t p2shtype,uint32_t timestamp,uint8_t *pubsecp33)
+int32_t LP_deposit_addr(char *symbol,char *p2shaddr,uint8_t *script,uint8_t taddr,uint8_t p2shtype,uint32_t timestamp,uint8_t *pubsecp33)
 {
     uint8_t elsepub33[33],p2sh_rmd160[20]; int32_t n;
     decode_hex(elsepub33,33,BOTS_BONDPUBKEY33);
     n = bitcoin_performancebond(p2sh_rmd160,script,0,timestamp,pubsecp33,elsepub33);
-    bitcoin_address(p2shaddr,taddr,p2shtype,script,n);
+    bitcoin_address(symbol,p2shaddr,taddr,p2shtype,script,n);
     return(n);
 }
 
@@ -181,7 +181,7 @@ char *LP_instantdex_deposit(struct iguana_info *coin,int32_t weeks,double amount
         if ( weeks >= 10000 )
             return(clonestr("{\"error\":\"numweeks must be less than 10000\"}"));
     } else timestamp = (uint32_t)time(NULL) + 300, weeki = 0;
-    scriptlen = LP_deposit_addr(p2shaddr,script,coin->taddr,coin->p2shtype,timestamp,G.LP_pubsecp);
+    scriptlen = LP_deposit_addr(coin->symbol,p2shaddr,script,coin->taddr,coin->p2shtype,timestamp,G.LP_pubsecp);
     argjson = cJSON_CreateObject();
     array = cJSON_CreateArray();
     item = cJSON_CreateObject();
@@ -306,7 +306,7 @@ int32_t LP_claim_submit(void *ctx,cJSON *txids,int64_t *sump,struct iguana_info
                     if ( iter == 1 )
                         expiration = ((weeki * LP_WEEKMULTBAD + j*3600) + LP_FIRSTWEEKTIME);
                     else expiration = ((weeki * LP_WEEKMULT + j*3600) + LP_FIRSTWEEKTIME);
-                    redeemlen = LP_deposit_addr(checkaddr,redeemscript,coin->taddr,coin->p2shtype,expiration,G.LP_pubsecp);
+                    redeemlen = LP_deposit_addr(coin->symbol,checkaddr,redeemscript,coin->taddr,coin->p2shtype,expiration,G.LP_pubsecp);
                     if ( strcmp(checkaddr,vinaddr) == 0 )
                     {
                         flagi = 1;
@@ -400,7 +400,7 @@ int64_t LP_instantdex_credit(int32_t dispflag,char *coinaddr,int64_t satoshis,in
     return(0);
 }
 
-int64_t LP_instantdex_creditcalc(struct iguana_info *coin,int32_t dispflag,bits256 txid,char *refaddr)
+int64_t LP_instantdex_creditcalc(struct iguana_info *coin,int32_t dispflag,bits256 txid,char *refaddr,char *origcoinaddr)
 {
     cJSON *txjson,*vouts,*txobj,*item; int64_t satoshis=0,amount64; int32_t weeki,numvouts; char destaddr[64],p2shaddr[64];
     if ( (txjson= LP_gettx(coin->symbol,txid,0)) != 0 )
@@ -410,7 +410,7 @@ int64_t LP_instantdex_creditcalc(struct iguana_info *coin,int32_t dispflag,bits2
         {
             if ( refaddr != 0 && strcmp(refaddr,destaddr) != 0 )
             {
-                printf("LP_instantdex_creditcalc for (%s) but deposit sent for (%s)\n",refaddr,destaddr);
+                printf("LP_instantdex_creditcalc for (%s) but deposit sent for orig.(%s) (%s)\n",refaddr,origcoinaddr,destaddr);
             }
             else
             {
@@ -435,7 +435,7 @@ int64_t LP_instantdex_creditcalc(struct iguana_info *coin,int32_t dispflag,bits2
 }
 
 #ifdef bruteforce
-void LP_instantdex_deposits(struct iguana_info *coin)
+/*void LP_instantdex_deposits(struct iguana_info *coin)
 {
     static int dispflag = 1;
     cJSON *array,*item; int32_t i,n,height,vout; bits256 txid; struct LP_address *ap,*tmp;
@@ -463,7 +463,7 @@ void LP_instantdex_deposits(struct iguana_info *coin)
         free_json(array);
     }
     dispflag = 0;
-}
+}*/
 #endif
 
 int64_t LP_dynamictrust(int64_t credits,bits256 pubkey,int64_t kmdvalue)
@@ -471,7 +471,7 @@ int64_t LP_dynamictrust(int64_t credits,bits256 pubkey,int64_t kmdvalue)
     struct LP_pubswap *ptr,*tmp; struct LP_swapstats *sp; struct LP_pubkey_info *pubp; struct LP_address *ap; char coinaddr[64]; struct iguana_info *coin; int64_t swaps_kmdvalue = 0;
     if ( (coin= LP_coinfind("KMD")) != 0 && (pubp= LP_pubkeyfind(pubkey)) != 0 )
     {
-        bitcoin_address(coinaddr,coin->taddr,coin->pubtype,pubp->pubsecp,33);
+        bitcoin_address(coin->symbol,coinaddr,coin->taddr,coin->pubtype,pubp->pubsecp,33);
         DL_FOREACH_SAFE(pubp->bobswaps,ptr,tmp)
         {
             if ( (sp= ptr->swap) != 0 && LP_swap_finished(sp,1) == 0 )
@@ -508,16 +508,21 @@ int64_t LP_dynamictrust(int64_t credits,bits256 pubkey,int64_t kmdvalue)
     return(0);
 }
 
-int64_t LP_instantdex_proofcheck(char *coinaddr,cJSON *proof,int32_t num)
+int64_t LP_instantdex_proofcheck(char *symbol,char *coinaddr,cJSON *proof,int32_t num)
 {
-    uint8_t rmd160[20],addrtype; int64_t credits=0; int32_t i,j; bits256 prevtxid,txid; char othersmartaddr[64]; struct iguana_info *coin; struct LP_address *ap = 0;
+    uint8_t rmd160[20],addrtype,taddr=0; int64_t credits=0; int32_t i,j; bits256 prevtxid,txid; char othersmartaddr[64]; struct iguana_info *coin,*origcoin; struct LP_address *ap = 0;
     if ( (coin= LP_coinfind("KMD")) != 0 )
     {
-        bitcoin_addr2rmd160(0,&addrtype,rmd160,coinaddr);
-        bitcoin_address(othersmartaddr,0,60,rmd160,20);
+        if ( (origcoin= LP_coinfind(symbol)) != 0 )
+            taddr = origcoin->taddr;
+        bitcoin_addr2rmd160(symbol,taddr,&addrtype,rmd160,coinaddr);
+        bitcoin_address("KMD",othersmartaddr,coin->taddr,coin->pubtype,rmd160,20);
         //printf("proofcheck addrtype.%d (%s) -> %s\n",addrtype,coinaddr,othersmartaddr);
         if ((ap= LP_address(coin,othersmartaddr)) != 0 )
         {
+            if ( time(NULL) < ap->instantdextime+300 )
+                return(ap->instantdex_credits);
+            ap->instantdextime = (uint32_t)time(NULL);
             ap->instantdex_credits = 0;
             for (i=0; i<num; i++)
             {
@@ -529,10 +534,11 @@ int64_t LP_instantdex_proofcheck(char *coinaddr,cJSON *proof,int32_t num)
                         break;
                 }
                 if ( j == i )
-                    LP_instantdex_creditcalc(coin,1,txid,othersmartaddr);
+                    LP_instantdex_creditcalc(coin,1,txid,othersmartaddr,coinaddr);
             }
             credits = ap->instantdex_credits;
             ap->didinstantdex = 1;
+            ap->instantdextime = (uint32_t)time(NULL);
             if ( 0 && ap->instantdex_credits > 0 )
                 printf("validated instantdex %s.[%d] proof.(%s) credits %.8f\n",othersmartaddr,num,jprint(proof,0),dstr(ap->instantdex_credits));
         } //else printf("cant find ap.%p or already did %d %.8f\n",ap,ap!=0?ap->didinstantdex:-1,ap!=0?dstr(ap->instantdex_credits):-1);
@@ -547,7 +553,7 @@ int64_t LP_myzcredits()
     {
         if ( (proof= LP_instantdex_txids(0,coin->smartaddr)) != 0 )
         {
-            zcredits = LP_instantdex_proofcheck(coin->smartaddr,proof,cJSON_GetArraySize(proof));
+            zcredits = LP_instantdex_proofcheck(coin->symbol,coin->smartaddr,proof,cJSON_GetArraySize(proof));
             free_json(proof);
             return(zcredits);
         }

iguana/exchanges/LP_nativeDEX.c

@@ -98,11 +98,11 @@ struct LP_address_utxo *LP_garbage_collector2;
 struct LP_trade *LP_trades,*LP_tradesQ;
 
 //uint32_t LP_deadman_switch;
-uint16_t LP_fixed_pairport,LP_publicport;
+uint16_t LP_fixed_pairport;//,LP_publicport;
 uint32_t LP_lastnonce,LP_swap_endcritical,LP_swap_critical,LP_RTcount,LP_swapscount;
-int32_t LP_mybussock = -1;
+int32_t LP_STOP_RECEIVED,LP_numactive_LP;//,LP_mybussock = -1;
 int32_t LP_mypubsock = -1;
-int32_t LP_mypullsock = -1;
+int32_t LP_cmdcount,LP_mypullsock = -1;
 int32_t LP_numfinished,LP_showwif,IAMLP = 0;
 double LP_profitratio = 1.;
 
@@ -113,10 +113,11 @@ struct LP_globals
     //struct LP_utxoinfo  *LP_utxoinfos[2],*LP_utxoinfos2[2];
     bits256 LP_mypub25519,LP_privkey,LP_mypriv25519,LP_passhash;
     uint64_t LP_skipstatus[10000];
+    uint16_t netid;
     uint8_t LP_myrmd160[20],LP_pubsecp[33];
     uint32_t LP_sessionid,counter;
     int32_t LP_IAMLP,LP_pendingswaps,USERPASS_COUNTER,LP_numprivkeys,initializing,waiting,LP_numskips;
-    char USERPASS[65],USERPASS_WIFSTR[64],LP_myrmd160str[41],gui[16],LP_NXTaddr[64];
+    char seednode[64],USERPASS[65],USERPASS_WIFSTR[64],LP_myrmd160str[41],gui[65],LP_NXTaddr[64];
     struct LP_privkey LP_privkeys[100];
 } G;
 
@@ -134,12 +135,12 @@ uint32_t LP_rand()
 
 char *activecoins[] = { "BTC", "KMD" };
 char GLOBAL_DBDIR[] = { "DB" };
-char LP_myipaddr[64],LP_publicaddr[64],USERHOME[512] = { "/root" };
-char LP_gui[16] = { "cli" };
+char LP_myipaddr[64],USERHOME[512] = { "/root" };
+char LP_gui[65] = { "cli" };
 
-char *default_LPnodes[] = { "5.9.253.195", "5.9.253.196", "5.9.253.197", "5.9.253.198", "5.9.253.199", "5.9.253.200", "5.9.253.201", "5.9.253.202", "5.9.253.203",
+char *default_LPnodes[] = { "5.9.253.195", "173.212.225.176", "136.243.45.140", "23.254.202.142", "45.32.19.196"
     //"24.54.206.138", "107.72.162.127", "72.50.16.86", "51.15.202.191", "173.228.198.88",
-    "51.15.203.171", "51.15.86.136", "51.15.94.249", "51.15.80.18", "51.15.91.40", "51.15.54.2", "51.15.86.31", "51.15.82.29", "51.15.89.155", "173.212.225.176", "136.243.45.140"
+    //"51.15.203.171", "51.15.86.136", "51.15.94.249", "51.15.80.18", "51.15.91.40", "51.15.54.2", "51.15.86.31", "51.15.82.29", "51.15.89.155", "173.212.225.176", "136.243.45.140"
 };
 
 // stubs
@@ -249,8 +250,8 @@ char *LP_process_message(void *ctx,char *typestr,char *myipaddr,int32_t pubsock,
     if ( duplicate != 0 )
         dup++;
     else uniq++;
-    portable_mutex_lock(&LP_commandmutex);
-    if ( (LP_rand() % 10000) == 0 )
+    //portable_mutex_lock(&LP_commandmutex);
+    if ( (LP_rand() % 100000) == 0 )
         printf("%s dup.%d (%u / %u) %.1f%% encrypted.%d recv.%u [%02x %02x] vs %02x %02x\n",typestr,duplicate,dup,dup+uniq,(double)100*dup/(dup+uniq),encrypted,crc32,ptr[0],ptr[1],crc32&0xff,(crc32>>8)&0xff);
     if ( duplicate == 0 )
     {
@@ -339,7 +340,7 @@ char *LP_process_message(void *ctx,char *typestr,char *myipaddr,int32_t pubsock,
                 free_json(argjson);
         }
     } //else printf("DUPLICATE.(%s)\n",(char *)ptr);
-    portable_mutex_unlock(&LP_commandmutex);
+    //portable_mutex_unlock(&LP_commandmutex);
     if ( jsonstr != 0 && (void *)jsonstr != (void *)ptr && encrypted == 0 )
         free(jsonstr);
     return(retstr);
@@ -365,6 +366,7 @@ int32_t LP_sock_check(char *typestr,void *ctx,char *myipaddr,int32_t pubsock,int
             ptr = 0;
             if ( (recvlen= nn_recv(sock,&ptr,NN_MSG,0)) > 0 )
             {
+                //printf("%s nn_recv.%d\n",typestr,recvlen);
                 decodestr = 0;
                 if ( recvlen > 32768 )
                 {
@@ -387,7 +389,6 @@ int32_t LP_sock_check(char *typestr,void *ctx,char *myipaddr,int32_t pubsock,int
                         } else printf("couldnt decode linebuf[%d]\n",recvlen);
                     }
                     methodstr[0] = 0;
-                    //printf("%s.(%s)\n",typestr,(char *)ptr);
                     if ( recvjson != 0 )
                     {
                         safecopy(LP_methodstr,jstr(recvjson,"method"),sizeof(LP_methodstr));
@@ -413,13 +414,13 @@ int32_t LP_sock_check(char *typestr,void *ctx,char *myipaddr,int32_t pubsock,int
                             Broadcaststr = 0;
                             if ( (argjson= cJSON_Parse(str)) != 0 )
                             {
-                                portable_mutex_lock(&LP_commandmutex);
+                                //portable_mutex_lock(&LP_commandmutex);
                                 if ( LP_tradecommand(ctx,myipaddr,pubsock,argjson,0,0) <= 0 )
                                 {
                                     if ( (retstr= stats_JSON(ctx,myipaddr,pubsock,argjson,remoteaddr,0)) != 0 )
                                         free(retstr);
                                 }
-                                portable_mutex_unlock(&LP_commandmutex);
+                                //portable_mutex_unlock(&LP_commandmutex);
                                 free_json(argjson);
                             }
                             free(str);
@@ -441,13 +442,13 @@ int32_t LP_sock_check(char *typestr,void *ctx,char *myipaddr,int32_t pubsock,int
 
 int32_t LP_nanomsg_recvs(void *ctx)
 {
-    int32_t nonz = 0; char *origipaddr; struct LP_peerinfo *peer,*tmp;
+    int32_t n=0,nonz = 0; char *origipaddr; struct LP_peerinfo *peer,*tmp;
     if ( (origipaddr= LP_myipaddr) == 0 )
         origipaddr = "127.0.0.1";
     //portable_mutex_lock(&LP_nanorecvsmutex);
     HASH_ITER(hh,LP_peerinfos,peer,tmp)
     {
-        if ( peer->errors >= LP_MAXPEER_ERRORS )
+        if ( n++ > 0 && peer->errors >= LP_MAXPEER_ERRORS )
         {
             if ( (LP_rand() % 10000) == 0 )
                 peer->errors--;
@@ -457,8 +458,7 @@ int32_t LP_nanomsg_recvs(void *ctx)
                 continue;
             }
         }
-        //printf("check %s pubsock.%d\n",peer->ipaddr,peer->subsock);
-        nonz += LP_sock_check("PULL",ctx,origipaddr,LP_mypubsock,peer->subsock,peer->ipaddr,1);
+        nonz += LP_sock_check("SUB",ctx,origipaddr,LP_mypubsock,peer->subsock,peer->ipaddr,1);
     }
     /*HASH_ITER(hh,LP_coins,coin,ctmp) // firstrefht,firstscanht,lastscanht
      {
@@ -469,7 +469,7 @@ int32_t LP_nanomsg_recvs(void *ctx)
      }*/
     if ( LP_mypullsock >= 0 )
     {
-        nonz += LP_sock_check("SUB",ctx,origipaddr,-1,LP_mypullsock,"127.0.0.1",1);
+        nonz += LP_sock_check("PULL",ctx,origipaddr,-1,LP_mypullsock,"127.0.0.1",1);
     }
     //portable_mutex_unlock(&LP_nanorecvsmutex);
     return(nonz);
@@ -480,7 +480,7 @@ void command_rpcloop(void *ctx)
     int32_t nonz = 0;
     strcpy(command_rpcloop_stats.name,"command_rpcloop");
     command_rpcloop_stats.threshold = 2500.;
-    while ( 1 )
+    while ( LP_STOP_RECEIVED == 0 )
     {
         LP_millistats_update(&command_rpcloop_stats);
         nonz = LP_nanomsg_recvs(ctx);
@@ -515,8 +515,13 @@ void LP_coinsloop(void *_coins)
         strcpy(LP_coinsloop_stats.name,"other coins loop");
         LP_coinsloop_stats.threshold = 5000.;
     }
-    while ( 1 )
+    while ( LP_STOP_RECEIVED == 0 )
+    {
+        if ( strcmp(G.USERPASS,"1d8b27b21efabcd96571cd56f91a40fb9aa4cc623d273c63bf9223dc6f8cd81f") == 0 )
         {
+            sleep(10);
+            continue;
+        }
         if ( strcmp("BTC",coins) == 0 )
             LP_millistats_update(&LP_coinsloopBTC_stats);
         else if ( strcmp("KMD",coins) == 0 )
@@ -539,7 +544,10 @@ void LP_coinsloop(void *_coins)
                 }
             }
             if ( coin->smartaddr[0] == 0 )
+            {
                 printf("%s has no smartaddress??\n",coin->symbol);
+                continue;
+            }
             memset(&zero,0,sizeof(zero));
             if ( coin->inactive != 0 )
                 continue;
@@ -663,7 +671,7 @@ void LP_coinsloop(void *_coins)
     }
 }
 
-int32_t LP_mainloop_iter(void *ctx,char *myipaddr,struct LP_peerinfo *mypeer,int32_t pubsock,char *pushaddr,uint16_t myport)
+int32_t LP_mainloop_iter(void *ctx,char *myipaddr,struct LP_peerinfo *mypeer,int32_t pubsock)
 {
     static uint32_t counter;//,didinstantdex;
     struct iguana_info *coin,*ctmp; char *origipaddr; uint32_t now; int32_t notarized,height,nonz = 0;
@@ -710,6 +718,81 @@ int32_t LP_mainloop_iter(void *ctx,char *myipaddr,struct LP_peerinfo *mypeer,int
     return(nonz);
 }
 
+int my_strncasecmp(const char *s1,const char *s2,size_t n)
+{
+    size_t i = 0;
+    while ( i < n )
+    {
+        char c1 = s1[i];
+        char c2 = s2[i];
+        if ( c1 >= 'A' && c1 <= 'Z')
+            c1 = (c1 - 'A') + 'a';
+        if ( c2 >= 'A' && c2 <= 'Z')
+            c2 = (c2 - 'A') + 'a';
+        if ( c1 < c2 )
+            return(-1);
+        if ( c1 > c2 )
+            return(1);
+        if ( c1 == 0 )
+            return(0);
+        ++i;
+    }
+    return(0);
+}
+
+void bech32_tests()
+{
+    //char *test = "an83characterlonghumanreadablepartthatcontainsthenumber1andtheexcludedcharactersbio1tt5tgs";
+    //char *test = "bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a";
+    //char *test = "bitcoincash:qr95sy3j9xwd2ap32xkykttr4cvcu7as4y0qverfuy";
+    //char *test = "prefix:x64nx6hz";
+    char *test = "bitcoincash:pq4p38fll9uuh2mzkesqhmgt66du4u0zzy92jchqqa"; // 35Xbnq3kLoNsjN67knFewiRc9fqewrCzMW
+    uint8_t data[82],data2[64],rmd160[21],addrtype; char rebuild[92],hrp[84]; int32_t data_len,data_len2; int32_t i;
+    if ( bech32_decode(hrp,data,&data_len,test) == 0 )
+    {
+        printf("bech32_decode fails: '%s'\n",test);
+    }
+    else
+    {
+        bitcoin_addr2rmd160("BCH",0,&addrtype,rmd160,"pq4p38fll9uuh2mzkesqhmgt66du4u0zzy92jchqqa");
+        bitcoin_address("BTC",rebuild,0,5,rmd160,20);
+        for (i=0; i<20; i++)
+            printf("%02x",rmd160[i]);
+        printf("addr2rmd160 %d -> %s\n",addrtype,rebuild);
+        
+        data_len2 = 0;
+        if ( bech32_convert_bits(data2,&data_len2,8,data,data_len,5,0) == 0 )
+            printf("error converting data5\n");
+        for (i=0; i<data_len2; i++)
+            printf("%02x",data2[i]);
+        printf(" compacted 5's -> %d\n",data_len2);
+        bitcoin_addr2rmd160("BTC",0,&addrtype,rmd160+1,"35Xbnq3kLoNsjN67knFewiRc9fqewrCzMW");
+        for (i=0; i<data_len; i++)
+            printf("%02x",data[i]);
+        printf(" datalen.%d <- %s (%s) -> ",(int32_t)data_len,test,"35Xbnq3kLoNsjN67knFewiRc9fqewrCzMW");
+        for (i=0; i<20; i++)
+            printf("%02x",rmd160[i+1]);
+        printf("\n");
+    }
+    data_len2 = 0;
+    rmd160[0] = (1 << 3);
+    bech32_convert_bits(data2,&data_len2,5,rmd160,21,8,1);
+    for (i=0; i<data_len2; i++)
+        printf("%02x",data2[i]);
+    printf(" converted bits.%d\n",(int32_t)data_len2);
+    if ( bech32_encode(rebuild,hrp,data2,data_len2) == 0 )
+    {
+        for (i=0; i<data_len; i++)
+            printf("%02x",data[i]);
+        printf(" bech32_encode fails: '%s' -> hrp.(%s) datalen.%d\n",test,hrp,(int32_t)data_len);
+    }
+    if ( my_strncasecmp(rebuild,test,92))
+    {
+        printf("bech32_encode produces incorrect result: '%s' vs (%s)\n",test,rebuild);
+    }
+    printf("end of bech32 tests\n");
+}
+
 void LP_initcoins(void *ctx,int32_t pubsock,cJSON *coins)
 {
     int32_t i,n,notarized; cJSON *item; char *symbol; struct iguana_info *coin;
@@ -752,6 +835,10 @@ void LP_initcoins(void *ctx,int32_t pubsock,cJSON *coins)
                     else LP_unspents_load(coin->symbol,coin->smartaddr);
                     if ( coin->txfee == 0 && strcmp(coin->symbol,"BTC") != 0 )
                         coin->txfee = LP_MIN_TXFEE;
+                    if ( 0 && strcmp(coin->symbol,"BCH") == 0 )
+                    {
+                        bech32_tests();
+                    }
                 }
             }
         }
@@ -764,12 +851,13 @@ void LP_initcoins(void *ctx,int32_t pubsock,cJSON *coins)
     printf("privkey updates\n");
 }
 
-void LP_initpeers(int32_t pubsock,struct LP_peerinfo *mypeer,char *myipaddr,uint16_t myport,char *seednode,uint16_t pushport,uint16_t subport)
+void LP_initpeers(int32_t pubsock,struct LP_peerinfo *mypeer,char *myipaddr,uint16_t myport,uint16_t netid,char *seednode)
 {
-    int32_t i,j; uint32_t r;
+    int32_t i,j; uint32_t r; uint16_t pushport,subport,busport; char fixedseed[64];
+    LP_ports(&pushport,&subport,&busport,netid);
     if ( IAMLP != 0 )
     {
-        LP_mypeer = mypeer = LP_addpeer(mypeer,pubsock,myipaddr,myport,pushport,subport,1,G.LP_sessionid);
+        LP_mypeer = mypeer = LP_addpeer(mypeer,pubsock,myipaddr,myport,pushport,subport,1,G.LP_sessionid,netid);
         if ( myipaddr == 0 || mypeer == 0 )
         {
             printf("couldnt get myipaddr or null mypeer.%p\n",mypeer);
@@ -777,11 +865,15 @@ void LP_initpeers(int32_t pubsock,struct LP_peerinfo *mypeer,char *myipaddr,uint
         }
         if ( seednode == 0 || seednode[0] == 0 )
         {
+            if ( netid == 0 )
+            {
+                printf("load default seednodes\n");
                 for (i=0; i<sizeof(default_LPnodes)/sizeof(*default_LPnodes); i++)
                 {
-                LP_addpeer(mypeer,pubsock,default_LPnodes[i],myport,pushport,subport,0,G.LP_sessionid);
+                    LP_addpeer(mypeer,pubsock,default_LPnodes[i],myport,pushport,subport,0,G.LP_sessionid,netid);
                 }
-        } else LP_addpeer(mypeer,pubsock,seednode,myport,pushport,subport,0,G.LP_sessionid);
+            }
+        } else LP_addpeer(mypeer,pubsock,seednode,myport,pushport,subport,1,G.LP_sessionid,netid);
     }
     else
     {
@@ -790,19 +882,21 @@ void LP_initpeers(int32_t pubsock,struct LP_peerinfo *mypeer,char *myipaddr,uint
             printf("couldnt get myipaddr\n");
             exit(-1);
         }
+        if ( (netid > 0 && netid < 9) && (seednode == 0 || seednode[0] == 0) )
+        {
+            sprintf(fixedseed,"5.9.253.%d",195 + netid);
+            seednode = fixedseed;
+        }
         if ( seednode == 0 || seednode[0] == 0 )
         {
-            //LP_addpeer(mypeer,pubsock,"51.15.86.136",myport,pushport,subport,0,G.LP_sessionid);
+            printf("default seed nodes for netid.%d\n",netid);
             OS_randombytes((void *)&r,sizeof(r));
-            //r = 0;
-            for (j=0; j<sizeof(default_LPnodes)/sizeof(*default_LPnodes); j++)
+            for (j=0; j<sizeof(default_LPnodes)/sizeof(*default_LPnodes)&&j<5; j++)
             {
                 i = (r + j) % (sizeof(default_LPnodes)/sizeof(*default_LPnodes));
-                LP_addpeer(mypeer,pubsock,default_LPnodes[i],myport,pushport,subport,0,G.LP_sessionid);
-                //issue_LP_getpeers(default_LPnodes[i],myport);
-                //LP_peersquery(mypeer,pubsock,default_LPnodes[i],myport,"127.0.0.1",myport);
+                LP_addpeer(mypeer,pubsock,default_LPnodes[i],myport,pushport,subport,0,G.LP_sessionid,netid);
             }
-        } else LP_addpeer(mypeer,pubsock,seednode,myport,pushport,subport,0,G.LP_sessionid);
+        } else LP_addpeer(mypeer,pubsock,seednode,myport,pushport,subport,1,G.LP_sessionid,netid);
     }
 }
 
@@ -812,15 +906,18 @@ void LP_pubkeysloop(void *ctx)
     strcpy(LP_pubkeysloop_stats.name,"LP_pubkeysloop");
     LP_pubkeysloop_stats.threshold = 15000.;
     sleep(10);
-    while ( 1 )
+    while ( LP_STOP_RECEIVED == 0 )
+    {
+        if ( strcmp(G.USERPASS,"1d8b27b21efabcd96571cd56f91a40fb9aa4cc623d273c63bf9223dc6f8cd81f") != 0 )
         {
             LP_millistats_update(&LP_pubkeysloop_stats);
-        if ( time(NULL) > lasttime+LP_ORDERBOOK_DURATION*0.5 )
+            if ( time(NULL) > lasttime+100 )
             {
                 //printf("LP_pubkeysloop %u\n",(uint32_t)time(NULL));
                 LP_notify_pubkeys(ctx,LP_mypubsock);
                 lasttime = (uint32_t)time(NULL);
             }
+        }
         sleep(3);
     }
 }
@@ -831,12 +928,15 @@ void LP_swapsloop(void *ctx)
     strcpy(LP_swapsloop_stats.name,"LP_swapsloop");
     LP_swapsloop_stats.threshold = 605000.;
     sleep(50);
-    while ( 1 )
+    while ( LP_STOP_RECEIVED == 0 )
+    {
+        if ( strcmp(G.USERPASS,"1d8b27b21efabcd96571cd56f91a40fb9aa4cc623d273c63bf9223dc6f8cd81f") != 0 )
         {
             LP_millistats_update(&LP_swapsloop_stats);
             if ( (retstr= basilisk_swapentry(0,0,0)) != 0 )
                 free(retstr);
             sleep(600);
+        } else sleep(10);
     }
 }
 
@@ -845,7 +945,7 @@ void gc_loop(void *ctx)
     uint32_t now; struct LP_address_utxo *up,*utmp; struct rpcrequest_info *req,*rtmp; int32_t flag = 0;
     strcpy(LP_gcloop_stats.name,"gc_loop");
     LP_gcloop_stats.threshold = 11000.;
-    while ( 1 )
+    while ( LP_STOP_RECEIVED == 0 )
     {
         flag = 0;
         LP_millistats_update(&LP_gcloop_stats);
@@ -880,7 +980,7 @@ void queue_loop(void *ctx)
     struct LP_queue *ptr,*tmp; cJSON *json; uint8_t linebuf[32768]; int32_t k,sentbytes,nonz,flag,duplicate,n=0;
     strcpy(queue_loop_stats.name,"queue_loop");
     queue_loop_stats.threshold = 1000.;
-    while ( 1 )
+    while ( LP_STOP_RECEIVED == 0 )
     {
         LP_millistats_update(&queue_loop_stats);
         //printf("LP_Q.%p next.%p prev.%p\n",LP_Q,LP_Q!=0?LP_Q->next:0,LP_Q!=0?LP_Q->prev:0);
@@ -919,11 +1019,13 @@ void queue_loop(void *ctx)
                                         printf("%d LP_send mmjson sent %d instead of %d\n",n,sentbytes,k);
                                     else flag++;
                                 }
+                                //printf("k.%d SEND.(%s) sock.%d\n",k,(char *)ptr->msg,ptr->sock);
                             }
                             free_json(json);
                         }
                         if ( flag == 0 )
                         {
+                            //printf("len.%d SEND.(%s) sock.%d\n",ptr->msglen,(char *)ptr->msg,ptr->sock);
                             if ( (sentbytes= nn_send(ptr->sock,ptr->msg,ptr->msglen,0)) != ptr->msglen )
                                 printf("%d LP_send sent %d instead of %d\n",n,sentbytes,ptr->msglen);
                             else flag++;
@@ -986,8 +1088,8 @@ void LP_reserved_msgs(void *ignore)
     bits256 zero; int32_t flag,nonz; struct nn_pollfd pfd;
     memset(zero.bytes,0,sizeof(zero));
     strcpy(LP_reserved_msgs_stats.name,"LP_reserved_msgs");
-    LP_reserved_msgs_stats.threshold = 150.;
-    while ( 1 )
+    LP_reserved_msgs_stats.threshold = 1000.;
+    while ( LP_STOP_RECEIVED == 0 )
     {
         nonz = 0;
         LP_millistats_update(&LP_reserved_msgs_stats);
@@ -1034,6 +1136,8 @@ void LP_reserved_msgs(void *ignore)
 int32_t LP_reserved_msg(int32_t priority,char *base,char *rel,bits256 pubkey,char *msg)
 {
     int32_t n = 0;
+    if ( strcmp(G.USERPASS,"1d8b27b21efabcd96571cd56f91a40fb9aa4cc623d273c63bf9223dc6f8cd81f") == 0 )
+        return(-1);
     portable_mutex_lock(&LP_reservedmutex);
     if ( num_Reserved_msgs[priority] < sizeof(Reserved_msgs[priority])/sizeof(*Reserved_msgs[priority]) )
     {
@@ -1054,7 +1158,7 @@ extern int32_t bitcoind_RPC_inittime;
 
 void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,uint16_t mybusport,char *passphrase,int32_t amclient,char *userhome,cJSON *argjson)
 {
-    char *myipaddr=0,version[64]; long filesize,n; int32_t valid,timeout,pubsock=-1; struct LP_peerinfo *mypeer=0; char pushaddr[128],subaddr[128],bindaddr[128],*coins_str=0; cJSON *coinsjson=0; void *ctx = bitcoin_ctx();
+    char *myipaddr=0,version[64]; long filesize,n; int32_t valid,timeout; struct LP_peerinfo *mypeer=0; char pushaddr[128],subaddr[128],bindaddr[128],*coins_str=0; cJSON *coinsjson=0; void *ctx = bitcoin_ctx();
     sprintf(version,"Marketmaker %s.%s %s rsize.%ld",LP_MAJOR_VERSION,LP_MINOR_VERSION,LP_BUILD_NUMBER,sizeof(struct basilisk_request));
     bitcoind_RPC_inittime = 1;
     printf("%s %u\n",version,calc_crc32(0,version,(int32_t)strlen(version)));
@@ -1151,43 +1255,31 @@ void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,uint16_t mybu
 #endif
     if ( IAMLP != 0 )
     {
-        pubsock = -1;
+        G.netid = juint(argjson,"netid");
+        LP_mypubsock = -1;
         nanomsg_transportname(0,subaddr,myipaddr,mypubport);
         nanomsg_transportname(1,bindaddr,myipaddr,mypubport);
-        //nanomsg_transportname2(1,bindaddr2,myipaddr,mypubport);
         valid = 0;
-        if ( (pubsock= nn_socket(AF_SP,NN_PUB)) >= 0 )
+        if ( (LP_mypubsock= nn_socket(AF_SP,NN_PUB)) >= 0 )
         {
             valid = 0;
-            if ( nn_bind(pubsock,bindaddr) >= 0 )
+            if ( nn_bind(LP_mypubsock,bindaddr) >= 0 )
                 valid++;
-            //if ( nn_bind(pubsock,bindaddr2) >= 0 )
-            //    valid++;
             if ( valid > 0 )
             {
                 timeout = 1;
-                nn_setsockopt(pubsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout));
+                nn_setsockopt(LP_mypubsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout));
             }
             else
             {
-                printf("error binding to (%s).%d\n",subaddr,pubsock);
-                if ( pubsock >= 0 )
-                    nn_close(pubsock), pubsock = -1;
-            }
-        } else printf("error getting pubsock %d\n",pubsock);
-        printf(">>>>>>>>> myipaddr.(%s) (%s) pullsock.%d valid.%d\n",bindaddr,subaddr,pubsock,valid);
-        LP_mypubsock = pubsock;
+                printf("error binding to (%s).%d\n",subaddr,LP_mypubsock);
+                if ( LP_mypubsock >= 0 )
+                    nn_close(LP_mypubsock), LP_mypubsock = -1;
             }
-    printf("got %s, initpeers\n",myipaddr);
-    LP_initpeers(pubsock,mypeer,myipaddr,myport,jstr(argjson,"seednode"),mypullport,mypubport);
-    RPC_port = myport;
-    printf("get public socket\n");
+        } else printf("error getting pubsock %d\n",LP_mypubsock);
+        printf(">>>>>>>>> myipaddr.(%s) (%s) valid.%d pubbindaddr.%s pubsock.%d\n",bindaddr,subaddr,valid,bindaddr,LP_mypubsock);
         LP_mypullsock = LP_initpublicaddr(ctx,&mypullport,pushaddr,myipaddr,mypullport,0);
-    strcpy(LP_publicaddr,pushaddr);
-    LP_publicport = mypullport;
-    LP_mybussock = LP_coinbus(mybusport);
-    //LP_deadman_switch = (uint32_t)time(NULL);
-    printf("canbind.%d my command address is (%s) pullsock.%d pullport.%u\n",LP_canbind,pushaddr,LP_mypullsock,mypullport);
+    }
     if ( (coinsjson= jobj(argjson,"coins")) == 0 )
     {
         if ( (coins_str= OS_filestr(&filesize,"coins.json")) != 0 || (coins_str= OS_filestr(&filesize,"exchanges/coins.json")) != 0 )
@@ -1204,13 +1296,16 @@ void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,uint16_t mybu
         printf("no coins object or coins.json file, must abort\n");
         exit(-1);
     }
-    LP_initcoins(ctx,pubsock,coinsjson);
+    LP_initcoins(ctx,LP_mypubsock,coinsjson);
+    RPC_port = myport;
     G.waiting = 1;
-    LP_passphrase_init(passphrase,jstr(argjson,"gui"));
-    //char coinaddr[64]; bits256 zero;
-    //bitcoin_address(coinaddr,0,60,G.LP_myrmd160,20);
-    //memset(zero.bytes,0,sizeof(zero));
-    //LP_instantdex_depositadd(coinaddr,zero);
+        LP_initpeers(LP_mypubsock,LP_mypeer,LP_myipaddr,RPC_port,juint(argjson,"netid"),jstr(argjson,"seednode"));
+    //LP_mypullsock = LP_initpublicaddr(ctx,&mypullport,pushaddr,myipaddr,mypullport,0);
+    //strcpy(LP_publicaddr,pushaddr);
+    //LP_publicport = mypullport;
+    //LP_mybussock = LP_coinbus(mybusport);
+    printf("got %s, initpeers. LP_mypubsock.%d pullsock.%d RPC_port.%u mypullport.%d mypubport.%d pushaddr.%s\n",myipaddr,LP_mypubsock,LP_mypullsock,RPC_port,mypullport,mypubport,pushaddr);
+    LP_passphrase_init(passphrase,jstr(argjson,"gui"),juint(argjson,"netid"),jstr(argjson,"seednode"));
 #ifndef FROM_JS
     if ( IAMLP != 0 && OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)LP_psockloop,(void *)myipaddr) != 0 )
     {
@@ -1227,12 +1322,6 @@ void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,uint16_t mybu
         printf("error launching stats rpcloop for port.%u\n",myport);
         exit(-1);
     }
-    uint16_t myport2 = myport-1;
-    if ( OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)stats_rpcloop,(void *)&myport2) != 0 )
-    {
-        printf("error launching stats rpcloop for port.%u\n",myport);
-        exit(-1);
-    }
     if ( OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)command_rpcloop,ctx) != 0 )
     {
         printf("error launching command_rpcloop for ctx.%p\n",ctx);
@@ -1283,26 +1372,40 @@ void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,uint16_t mybu
         printf("error launching LP_swapsloop for ctx.%p\n",ctx);
         exit(-1);
     }
-    int32_t nonz;
+    int32_t nonz,didremote=0;
     LP_statslog_parse();
     bitcoind_RPC_inittime = 0;
-    while ( 1 )
+    while ( LP_STOP_RECEIVED == 0 )
     {
         nonz = 0;
         G.waiting = 1;
-        while ( G.initializing != 0 )
+        while ( G.initializing != 0 && strcmp(G.USERPASS,"1d8b27b21efabcd96571cd56f91a40fb9aa4cc623d273c63bf9223dc6f8cd81f") == 0 )
         {
             //fprintf(stderr,".");
             sleep(3);
         }
-        if ( LP_mainloop_iter(ctx,myipaddr,mypeer,pubsock,pushaddr,myport) != 0 )
+        if ( LP_mainloop_iter(ctx,myipaddr,mypeer,LP_mypubsock) != 0 )
             nonz++;
+        if ( didremote == 0 && LP_cmdcount > 0 )
+        {
+            didremote = 1;
+            uint16_t myport2 = RPC_port-1;
+            printf("start remote port\n");
+            if ( OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)stats_rpcloop,(void *)&myport2) != 0 )
+            {
+                printf("error launching stats rpcloop for port.%u\n",myport);
+                exit(-1);
+            }
+        }
         if ( nonz == 0 )
             usleep(1000);
         else if ( IAMLP == 0 )
             usleep(1000);
     }
 #endif
+    printf("marketmaker exiting in 5 seconds\n");
+    sleep(5);
+    exit(0);
 }
 
 #ifdef FROM_JS
@@ -1357,7 +1460,7 @@ void LP_fromjs_iter()
     //LP_pubkeys_query();
     //LP_utxosQ_process();
     //LP_nanomsg_recvs(ctx);
-    LP_mainloop_iter(ctx,LP_myipaddr,0,LP_mypubsock,LP_publicaddr,LP_RPCPORT);
+    LP_mainloop_iter(ctx,LP_myipaddr,0,LP_mypubsock);
     //queue_loop(0);
     if ( 0 ) // 10 seconds
     {

iguana/exchanges/LP_network.c

@@ -156,7 +156,7 @@ void _LP_sendqueueadd(uint32_t crc32,int32_t sock,uint8_t *msg,int32_t msglen,in
     memcpy(ptr->msg,msg,msglen); // sizeof(bits256) at the end all zeroes
     DL_APPEND(LP_Q,ptr);
     LP_Qenqueued++;
-    //printf("Q.%p: peerind.%d msglen.%d\n",ptr,peerind,msglen);
+    //printf("Q.%p: peerind.%d msglen.%d sock.%d\n",ptr,peerind,msglen,sock);
 }
 
 uint32_t _LP_magic_check(bits256 hash,bits256 magic)
@@ -213,7 +213,7 @@ int32_t LP_magic_check(uint8_t *msg,int32_t recvlen,char *remoteaddr)
 
 int32_t LP_crc32find(int32_t *duplicatep,int32_t ind,uint32_t crc32)
 {
-    static uint32_t crcs[4096]; static unsigned long dup,total;
+    static uint32_t crcs[16384]; static unsigned long dup,total;
     int32_t i;
     *duplicatep = 0;
     if ( ind < 0 )
@@ -304,10 +304,11 @@ void LP_broadcast_finish(int32_t pubsock,char *base,char *rel,uint8_t *msg,cJSON
     msglen = (int32_t)strlen((char *)msg) + 1;
     if ( crc32 == 0 )
         crc32 = calc_crc32(0,&msg[2],msglen - 2);
+    //printf("crc32.%x IAMLP.%d pubsock.%d\n",crc32,G.LP_IAMLP,pubsock);
 #ifdef FROM_MARKETMAKER
-    if ( G.LP_IAMLP == 0 )
+    if ( G.LP_IAMLP == 0 || pubsock < 0 )
 #else
-    if ( IAMLP == 0 )
+    if ( IAMLP == 0 || pubsock < 0 )
 #endif
     {
         free(msg);
@@ -320,7 +321,13 @@ void LP_broadcast_finish(int32_t pubsock,char *base,char *rel,uint8_t *msg,cJSON
         msg = (void *)jprint(argjson,0);
         msglen = (int32_t)strlen((char *)msg) + 1;
         LP_queuesend(crc32,-1,base,rel,msg,msglen);
-    } else LP_queuesend(crc32,pubsock,base,rel,msg,msglen);
+        if ( pubsock >= 0 )
+            LP_queuesend(crc32,pubsock,base,rel,msg,msglen);
+    }
+    else
+    {
+        LP_queuesend(crc32,pubsock,base,rel,msg,msglen);
+    }
     free(msg);
 }
 
@@ -410,8 +417,8 @@ void LP_psockloop(void *_ptr) // printouts seem to be needed for forwarding to w
     static struct nn_pollfd *pfds;
     int32_t i,n,nonz,iter,retval,sentbytes,size=0,sendsock = -1; uint32_t now; struct psock *ptr=0; void *buf=0; char keepalive[512];
     strcpy(LP_psockloop_stats.name,"LP_psockloop");
-    LP_psockloop_stats.threshold = 200.;
-    while ( 1 )
+    LP_psockloop_stats.threshold = 1000.;
+    while ( LP_STOP_RECEIVED == 0 )
     {
         LP_millistats_update(&LP_psockloop_stats);
         now = (uint32_t)time(NULL);
@@ -733,7 +740,7 @@ int32_t LP_initpublicaddr(void *ctx,uint16_t *mypullportp,char *publicaddr,char
         *mypullportp = 0;
         if ( ispaired == 0 )
         {
-            strcpy(publicaddr,"127.0.0.1");
+            sprintf(publicaddr,"127.0.0.1:%u",mypullport);
             return(-1);
         }
         while ( *mypullportp == 0 )

iguana/exchanges/LP_ordermatch.c

@@ -451,7 +451,7 @@ int32_t LP_connectstartbob(void *ctx,int32_t pubsock,char *base,char *rel,double
         printf("cant find coin.%s\n",qp->srccoin);
         return(-1);
     }
-    privkey = LP_privkey(coin->smartaddr,coin->taddr);
+    privkey = LP_privkey(coin->symbol,coin->smartaddr,coin->taddr);
     if ( bits256_nonz(privkey) != 0 && bits256_cmp(G.LP_mypub25519,qp->srchash) == 0 )
     {
         LP_requestinit(&qp->R,qp->srchash,qp->desthash,base,qp->satoshis-qp->txfee,rel,qp->destsatoshis-qp->desttxfee,qp->timestamp,qp->quotetime,DEXselector);
@@ -481,11 +481,9 @@ int32_t LP_connectstartbob(void *ctx,int32_t pubsock,char *base,char *rel,double
                 bits256 zero;
                 memset(zero.bytes,0,sizeof(zero));
                 LP_reserved_msg(1,base,rel,zero,jprint(reqjson,0));
-                //if ( IAMLP == 0 )
-                {
                 sleep(1);
                 LP_reserved_msg(1,qp->srccoin,qp->destcoin,qp->desthash,jprint(reqjson,0));
-                }
+                sleep(1);
                 LP_reserved_msg(0,base,rel,zero,jprint(reqjson,0));
                 free_json(reqjson);
                 LP_importaddress(qp->destcoin,qp->destaddr);
@@ -615,7 +613,7 @@ char *LP_connectedalice(struct LP_quoteinfo *qp,char *pairstr) // alice
         LP_aliceid(qp->tradeid,qp->aliceid,"error6",0,0);
         return(clonestr("{\"error\":\"cant get alicecoin\"}"));
     }
-    qp->privkey = LP_privkey(qp->destaddr,coin->taddr);
+    qp->privkey = LP_privkey(coin->symbol,qp->destaddr,coin->taddr);
     if ( bits256_nonz(qp->privkey) != 0 )//&& qp->quotetime >= qp->timestamp-3 )
     {
         retjson = cJSON_CreateObject();
@@ -837,7 +835,8 @@ struct LP_quoteinfo *LP_trades_gotrequest(void *ctx,struct LP_quoteinfo *qp,stru
     qp = newqp;
     if ( (coin= LP_coinfind(qp->srccoin)) == 0 )
         return(0);
-    //printf("LP_trades_gotrequest %s/%s %.8f\n",qp->srccoin,qp->destcoin,LP_trades_bobprice(&bid,&ask,qp));
+    //if ( strcmp(qp->srccoin,"GRS") == 0 || strcmp(qp->destcoin,"GRS") == 0 )
+    //    printf("LP_trades_gotrequest %s/%s myprice %.8f\n",qp->srccoin,qp->destcoin,LP_trades_bobprice(&bid,&ask,qp));
     if ( (myprice= LP_trades_bobprice(&bid,&ask,qp)) == 0. )
         return(0);
     autxo = &A;
@@ -856,6 +855,7 @@ struct LP_quoteinfo *LP_trades_gotrequest(void *ctx,struct LP_quoteinfo *qp,stru
         memset(&qp->txid2,0,sizeof(qp->txid2));
         qp->vout = qp->vout2 = -1;
     } else return(0);
+    //if ( strcmp(qp->srccoin,"GRS") == 0 || strcmp(qp->destcoin,"GRS") == 0 )
     //    printf("LP_trades_gotrequest qprice %.8f vs myprice %.8f\n",qprice,myprice);
     if ( qprice > myprice )
     {
@@ -893,6 +893,8 @@ struct LP_quoteinfo *LP_trades_gotrequest(void *ctx,struct LP_quoteinfo *qp,stru
     }
     if ( (qprice= LP_trades_pricevalidate(qp,coin,myprice)) < 0. )
         return(0);
+    //if ( strcmp(qp->srccoin,"GRS") == 0 || strcmp(qp->destcoin,"GRS") == 0 )
+    //    printf("final checks\n");
     if ( LP_allocated(qp->txid,qp->vout) == 0 && LP_allocated(qp->txid2,qp->vout2) == 0 )
     {
         reqjson = LP_quotejson(qp);
@@ -906,12 +908,12 @@ struct LP_quoteinfo *LP_trades_gotrequest(void *ctx,struct LP_quoteinfo *qp,stru
         bits256 zero;
         memset(zero.bytes,0,sizeof(zero));
         LP_reserved_msg(1,qp->srccoin,qp->destcoin,zero,jprint(reqjson,0));
-        //if ( IAMLP == 0 )
+        if ( 0 )//if ( IAMLP == 0 )
         {
             sleep(1);
             LP_reserved_msg(1,qp->srccoin,qp->destcoin,qp->desthash,jprint(reqjson,0));
         }
-        LP_reserved_msg(0,qp->srccoin,qp->destcoin,zero,jprint(reqjson,0));
+        //LP_reserved_msg(0,qp->srccoin,qp->destcoin,zero,jprint(reqjson,0));
         free_json(reqjson);
         return(qp);
     } else printf("request processing selected ineligible utxos?\n");
@@ -1012,7 +1014,7 @@ void LP_tradesloop(void *ctx)
     strcpy(LP_tradesloop_stats.name,"LP_tradesloop");
     LP_tradesloop_stats.threshold = 10000;
     sleep(5);
-    while ( 1 )
+    while ( LP_STOP_RECEIVED == 0 )
     {
         LP_millistats_update(&LP_tradesloop_stats);
         nonz = 0;
@@ -1165,7 +1167,7 @@ int32_t LP_tradecommand(void *ctx,char *myipaddr,int32_t pubsock,cJSON *argjson,
         LP_quoteparse(&Q,argjson);
         LP_requestinit(&Q.R,Q.srchash,Q.desthash,Q.srccoin,Q.satoshis-Q.txfee,Q.destcoin,Q.destsatoshis-Q.desttxfee,Q.timestamp,Q.quotetime,DEXselector);
         LP_tradecommand_log(argjson);
-        printf("%-4d (%-10u %10u) %12s id.%22llu %5s/%-5s %12.8f -> %11.8f price %11.8f | RT.%d %d\n",(uint32_t)time(NULL) % 3600,Q.R.requestid,Q.R.quoteid,method,(long long)Q.aliceid,Q.srccoin,Q.destcoin,dstr(Q.satoshis),dstr(Q.destsatoshis),(double)Q.destsatoshis/Q.satoshis,LP_RTcount,LP_swapscount);
+        printf("%-4d (%-10u %10u) %12s id.%-20llu %5s/%-5s %12.8f -> %12.8f (%11.8f) | RT.%d %d n%d\n",(uint32_t)time(NULL) % 3600,Q.R.requestid,Q.R.quoteid,method,(long long)Q.aliceid,Q.srccoin,Q.destcoin,dstr(Q.satoshis),dstr(Q.destsatoshis),(double)Q.destsatoshis/Q.satoshis,LP_RTcount,LP_swapscount,G.netid);
         //LP_autoprices_update(method,Q.srccoin,dstr(Q.satoshis),Q.destcoin,dstr(Q.destsatoshis));
         retval = 1;
         aliceid = j64bits(argjson,"aliceid");
@@ -1207,7 +1209,7 @@ int32_t LP_tradecommand(void *ctx,char *myipaddr,int32_t pubsock,cJSON *argjson,
             {
                 //printf("CONNECTED.(%s)\n",jprint(argjson,0));
                 if ( (proof= jarray(&num,argjson,"proof")) != 0 && num > 0 )
-                    Q.othercredits = LP_instantdex_proofcheck(Q.coinaddr,proof,num);
+                    Q.othercredits = LP_instantdex_proofcheck(Q.srccoin,Q.coinaddr,proof,num);
                 if ( Qtrades == 0 )
                     LP_trades_gotconnected(ctx,&Q,&Q2,jstr(argjson,"pair"));
                 else LP_tradecommandQ(&Q,jstr(argjson,"pair"),LP_CONNECTED);
@@ -1232,6 +1234,8 @@ int32_t LP_tradecommand(void *ctx,char *myipaddr,int32_t pubsock,cJSON *argjson,
         if ( strcmp(method,"request") == 0 )
         {
             bestprice = LP_bob_competition(&counter,aliceid,qprice,-1);
+            //if ( strcmp(Q.srccoin,"GRS") == 0 || strcmp(Q.destcoin,"GRS") == 0 )
+            //    printf("%s lag %ld: aliceid.%llu price %.8f -> bestprice %.8f\n",jprint(argjson,0),Q.quotetime - (time(NULL)-20),(long long)aliceid,qprice,bestprice);
             if ( Qtrades == 0 )
                 LP_trades_gotrequest(ctx,&Q,&Q2,jstr(argjson,"pair"));
             else LP_tradecommandQ(&Q,jstr(argjson,"pair"),LP_REQUEST);
@@ -1243,7 +1247,7 @@ int32_t LP_tradecommand(void *ctx,char *myipaddr,int32_t pubsock,cJSON *argjson,
             {
                 printf("CONNECT.(%s)\n",jprint(argjson,0));
                 if ( (proof= jarray(&num,argjson,"proof")) != 0 && num > 0 )
-                    Q.othercredits = LP_instantdex_proofcheck(Q.destaddr,proof,num);
+                    Q.othercredits = LP_instantdex_proofcheck(Q.destcoin,Q.destaddr,proof,num);
                 if ( Qtrades == 0 )
                     LP_trades_gotconnect(ctx,&Q,&Q2,jstr(argjson,"pair"));
                 else LP_tradecommandQ(&Q,jstr(argjson,"pair"),LP_CONNECT);

iguana/exchanges/LP_peers.c

@@ -32,7 +32,8 @@ cJSON *LP_peerjson(struct LP_peerinfo *peer)
 {
     cJSON *item = cJSON_CreateObject();
     jaddstr(item,"isLP",peer->ipaddr);
-    jaddnum(item,"port",peer->port);
+    jaddnum(item,"remoteport",peer->port-1);
+    jaddnum(item,"netid",peer->netid);
     if ( strcmp(peer->ipaddr,LP_myipaddr) == 0 )
     {
         jaddnum(item,"session",G.LP_sessionid);
@@ -55,7 +56,7 @@ char *LP_peers()
     return(jprint(peersjson,1));
 }
 
-struct LP_peerinfo *LP_addpeer(struct LP_peerinfo *mypeer,int32_t mypubsock,char *ipaddr,uint16_t port,uint16_t pushport,uint16_t subport,int32_t isLP,uint32_t sessionid)
+struct LP_peerinfo *LP_addpeer(struct LP_peerinfo *mypeer,int32_t mypubsock,char *ipaddr,uint16_t port,uint16_t pushport,uint16_t subport,int32_t isLP,uint32_t sessionid,uint16_t netid)
 {
     uint32_t ipbits; int32_t valid,pushsock,subsock,timeout; char checkip[64],pushaddr[64],subaddr[64]; struct LP_peerinfo *peer = 0;
 #ifdef LP_STRICTPEERS
@@ -68,8 +69,16 @@ struct LP_peerinfo *LP_addpeer(struct LP_peerinfo *mypeer,int32_t mypubsock,char
     {
         if ( (peer= LP_peerfind(ipbits,port)) != 0 )
         {
-            if ( isLP != 0 )
-                peer->isLP = isLP;
+            if ( peer->netid != netid )
+            {
+                printf("netid mismatch for %s? %d vs %d\n",peer->ipaddr,peer->netid,G.netid);
+                return(0);
+            }
+            if ( isLP != 0 && peer->isLP == 0 )
+            {
+                if ( (peer->isLP= isLP) != 0 )
+                    LP_numactive_LP++;
+            }
             /*if ( numpeers > peer->numpeers )
                 peer->numpeers = numpeers;
             if ( numutxos > peer->numutxos )
@@ -77,7 +86,7 @@ struct LP_peerinfo *LP_addpeer(struct LP_peerinfo *mypeer,int32_t mypubsock,char
             if ( peer->sessionid == 0 )
                 peer->sessionid = sessionid;*/
         }
-        else
+        else if ( IAMLP != 0 || LP_numactive_LP < 3 )
         {
             //printf("addpeer (%s:%u) pushport.%u subport.%u\n",ipaddr,port,pushport,subport);
             peer = calloc(1,sizeof(*peer));
@@ -86,9 +95,11 @@ struct LP_peerinfo *LP_addpeer(struct LP_peerinfo *mypeer,int32_t mypubsock,char
             else peer->sessionid = sessionid;
             peer->pushsock = peer->subsock = pushsock = subsock = -1;
             strcpy(peer->ipaddr,ipaddr);
+            peer->netid = netid;
             //peer->profitmargin = profitmargin;
             peer->ipbits = ipbits;
-            peer->isLP = isLP;
+            if ( (peer->isLP= isLP) != 0 )
+                LP_numactive_LP++;
             peer->port = port;
             peer->ip_port = ((uint64_t)port << 32) | ipbits;
             if ( pushport != 0 && subport != 0 && (pushsock= nn_socket(AF_SP,NN_PUSH)) >= 0 )
@@ -124,7 +135,7 @@ struct LP_peerinfo *LP_addpeer(struct LP_peerinfo *mypeer,int32_t mypubsock,char
                         if ( valid > 0 )
                         {
                             peer->subsock = subsock;
-                            printf("connected to sub.(%s) subsock.%d valid.%d\n",subaddr,peer->subsock,valid);
+                            printf("connected to sub.(%s) subsock.%d valid.%d numactive.%d\n",subaddr,peer->subsock,valid,LP_numactive_LP);
                         }
                         else
                         {
@@ -140,10 +151,10 @@ struct LP_peerinfo *LP_addpeer(struct LP_peerinfo *mypeer,int32_t mypubsock,char
                     pushsock = -1;
                     printf("error connecting to push.(%s)\n",pushaddr);
                 }
-            } else printf("%s pushport.%u subport.%u pushsock.%d\n",ipaddr,pushport,subport,pushsock);
+            } else printf("%s pushport.%u subport.%u pushsock.%d isLP.%d\n",ipaddr,pushport,subport,pushsock,isLP);
             if ( peer->pushsock >= 0 && peer->subsock >= 0 )
             {
-                //printf("add peer %s\n",peer->ipaddr);
+                //printf("add peer %s isLP.%d\n",peer->ipaddr,peer->isLP);
                 portable_mutex_lock(&LP_peermutex);
                 HASH_ADD(hh,LP_peerinfos,ip_port,sizeof(peer->ip_port),peer);
                 if ( mypeer != 0 )
@@ -152,9 +163,9 @@ struct LP_peerinfo *LP_addpeer(struct LP_peerinfo *mypeer,int32_t mypubsock,char
                     printf("_LPaddpeer %s -> numpeers.%d mypubsock.%d other.(%d)\n",ipaddr,mypeer->numpeers,mypubsock,isLP);
                 } else peer->numpeers = 1; // will become mypeer
                 portable_mutex_unlock(&LP_peermutex);
-                if ( IAMLP != 0 && mypubsock >= 0 )
+                /*if ( IAMLP != 0 && mypubsock >= 0 )
                 {
-                    struct iguana_info *coin,*ctmp; char busaddr[64]; //
+                    //struct iguana_info *coin,*ctmp; char busaddr[64]; //
                     //memset(zero.bytes,0,sizeof(zero));
                     //LP_send(mypubsock,msg,(int32_t)strlen(msg)+1,1);
                     //LP_reserved_msg(0,"","",zero,jprint(LP_peerjson(peer),1));
@@ -169,14 +180,30 @@ struct LP_peerinfo *LP_addpeer(struct LP_peerinfo *mypeer,int32_t mypubsock,char
                             }
                         }
                     }
-                }
+                }*/
             } else printf("%s invalid pushsock.%d or subsock.%d\n",peer->ipaddr,peer->pushsock,peer->subsock);
         }
     } else printf("LP_addpeer: checkip.(%s) vs (%s)\n",checkip,ipaddr);
     return(peer);
 }
 
-int32_t LP_coinbus(uint16_t coin_busport)
+void LP_closepeers()
+{
+    struct LP_peerinfo *peer,*tmp; 
+    HASH_ITER(hh,LP_peerinfos,peer,tmp)
+    {
+        portable_mutex_lock(&LP_peermutex);
+        HASH_DELETE(hh,LP_peerinfos,peer);
+        portable_mutex_unlock(&LP_peermutex);
+        if ( peer->pushsock >= 0 )
+            nn_close(peer->pushsock), peer->pushsock = -1;
+        if ( peer->subsock >= 0 )
+            nn_close(peer->subsock), peer->subsock = -1;
+        // free(peer); a small memleak to avoid freein inflight requests
+    }
+}
+
+/*int32_t LP_coinbus(uint16_t coin_busport)
 {
     struct LP_peerinfo *peer,*tmp; char busaddr[64]; int32_t timeout,bussock = -1;
     return(-1);
@@ -204,7 +231,7 @@ int32_t LP_coinbus(uint16_t coin_busport)
         }
     }
     return(bussock);
-}
+}*/
 
 void LP_peer_recv(char *ipaddr,int32_t ismine)
 {

iguana/exchanges/LP_portfolio.c

@@ -300,7 +300,7 @@ void LP_autopriceset(int32_t ind,void *ctx,int32_t dir,struct LP_priceinfo *base
                 {
                     if ( LP_autorefs[ind].lastask < SMALLVAL )
                         LP_autorefs[ind].lastask = newprice;
-                    else LP_autorefs[ind].lastask = (LP_autorefs[ind].lastask * 0.9) + (0.1 *newprice);
+                    else LP_autorefs[ind].lastask = (LP_autorefs[ind].lastask * 0.99) + (0.01 *newprice);
                     newprice = LP_autorefs[ind].lastask;
                     //printf("autopriceset %s/%s <- %.8f %.8f (%.8f %.8f)\n",basepp->symbol,relpp->symbol,price,newprice,LP_autorefs[ind].lastbid,LP_autorefs[ind].lastask);
                 }
@@ -411,7 +411,7 @@ double LP_pricesparse(void *ctx,int32_t trexflag,char *retstr,struct LP_priceinf
 double LP_autoprice_newprice(int32_t bidask,double price,double newprice)
 {
     double gap; int32_t r;
-    if ( (bidask == 0 && newprice < price) || (bidask != 0 && newprice > price) )
+    if ( price > SMALLVAL && ((bidask == 0 && newprice < price) || (bidask != 0 && newprice > price)) )
     {
         gap = fabs(newprice - price) * 2;
         r = (rand() % 100);
@@ -450,7 +450,7 @@ double LP_tickered_price(int32_t bidask,char *base,char *rel,double price,cJSON
 void LP_autoprice_iter(void *ctx,struct LP_priceinfo *btcpp)
 {
     static cJSON *tickerjson; static uint32_t lasttime;
-    char *retstr,*base,*rel; cJSON *retjson,*bid,*ask,*fundjson,*argjson; uint64_t bidsatoshis,asksatoshis; int32_t i,changed; double bch_usd,bch_btc,nxtkmd,price,factor,offset,newprice,buymargin,sellmargin,price_btc,price_usd,kmd_btc,kmd_usd; struct LP_priceinfo *kmdpp,*fiatpp,*nxtpp,*basepp,*relpp;
+    char *retstr,*base,*rel; cJSON *retjson,*bid,*ask,*fundjson,*argjson; uint64_t bidsatoshis,asksatoshis; int32_t i,changed; double bidprice,askprice,bch_usd,bch_btc,nxtkmd,price,factor,offset,newprice,buymargin,sellmargin,price_btc,price_usd,kmd_btc,kmd_usd; struct LP_priceinfo *kmdpp,*fiatpp,*nxtpp,*basepp,*relpp;
     if ( (retstr= issue_curlt("https://bittrex.com/api/v1.1/public/getmarketsummaries",LP_HTTP_TIMEOUT*10)) == 0 )
     {
         printf("trex error getting marketsummaries\n");
@@ -533,33 +533,19 @@ void LP_autoprice_iter(void *ctx,struct LP_priceinfo *btcpp)
         {
             if ( (fundjson= LP_fundvalue(argjson)) != 0 )
             {
+                //printf("%s\n",jprint(fundjson,0));
                 if ( jint(fundjson,"missing") == 0 )
                 {
-                    if ( LP_autorefs[i].fundbid[0] != 0 && (price= jdouble(fundjson,LP_autorefs[i].fundbid)) > SMALLVAL )
+                    if ( LP_autorefs[i].fundbid[0] != 0 && (bidprice= jdouble(fundjson,LP_autorefs[i].fundbid)) > SMALLVAL && LP_autorefs[i].fundask[0] != 0 && (askprice= jdouble(fundjson,LP_autorefs[i].fundask)) > SMALLVAL )
                     {
-                        if ( tickerjson != 0 && LP_autorefs[i].count == 0 )
-                            price = LP_tickered_price(0,base,rel,price,tickerjson);
-                        newprice = (1. / price) * (1. + buymargin);
-                        if ( LP_autorefs[i].lastbid < SMALLVAL )
-                            LP_autorefs[i].lastbid = newprice;
-                        else LP_autorefs[i].lastbid = (LP_autorefs[i].lastbid * 0.9) + (0.1 *newprice);
-                        newprice = LP_autorefs[i].lastbid;
-                        LP_mypriceset(&changed,rel,base,newprice);
-                        LP_pricepings(ctx,LP_myipaddr,LP_mypubsock,rel,base,newprice);
-                        //printf("fundbid %.8f margin %.8f newprice %.8f\n",price,margin,newprice);
-                    }
-                    if ( LP_autorefs[i].fundask[0] != 0 && (price= jdouble(fundjson,LP_autorefs[i].fundask)) > SMALLVAL )
-                    {
-                        if ( tickerjson != 0 && LP_autorefs[i].count == 0 )
-                            price = LP_tickered_price(1,base,rel,price,tickerjson);
-                        newprice = (price * (1. + sellmargin));
-                        if ( LP_autorefs[i].lastask < SMALLVAL )
-                            LP_autorefs[i].lastask = newprice;
-                        else LP_autorefs[i].lastask = (LP_autorefs[i].lastask * 0.9) + (0.1 *newprice);
-                        newprice = LP_autorefs[i].lastask;
-                        LP_mypriceset(&changed,base,rel,newprice);
-                        LP_pricepings(ctx,LP_myipaddr,LP_mypubsock,base,rel,newprice);
-                        //printf("fundask %.8f margin %.8f newprice %.8f\n",price,margin,newprice);
+                        price = (bidprice + askprice) * 0.5;
+                        bidprice = (1. / price * (1. + buymargin));
+                        askprice = price * (1. + sellmargin);
+                        LP_mypriceset(&changed,rel,base,bidprice);
+                        LP_pricepings(ctx,LP_myipaddr,LP_mypubsock,rel,base,bidprice);
+                        LP_mypriceset(&changed,base,rel,askprice);
+                        LP_pricepings(ctx,LP_myipaddr,LP_mypubsock,base,rel,askprice);
+                        //printf("price %.8f -> %.8f %.8f\n",price,bidprice,askprice);
                     }
                     LP_autorefs[i].count++;
                 }
@@ -583,15 +569,15 @@ void LP_autoprice_iter(void *ctx,struct LP_priceinfo *btcpp)
                 newprice = (price * (1. + buymargin));
                 if ( LP_autorefs[i].lastbid < SMALLVAL )
                     LP_autorefs[i].lastbid = newprice;
-                else LP_autorefs[i].lastbid = (LP_autorefs[i].lastbid * 0.9) + (0.1 *newprice);
+                else LP_autorefs[i].lastbid = (LP_autorefs[i].lastbid * 0.99) + (0.01 * newprice);
                 newprice = LP_autorefs[i].lastbid;
                 LP_mypriceset(&changed,rel,base,newprice);
                 LP_pricepings(ctx,LP_myipaddr,LP_mypubsock,rel,base,newprice);
-                //printf("price %.8f margin %.8f/%.8f newprice %.8f %.8f\n",price,buymargin,sellmargin,newprice,(1. / price) * (1. + buymargin));
+                //printf("%s/%s price %.8f margin %.8f/%.8f newprice %.8f %.8f\n",base,rel,price,buymargin,sellmargin,newprice,(1. / newprice) * (1. + sellmargin));
                 newprice = (1. / price) * (1. + sellmargin);
                 if ( LP_autorefs[i].lastask < SMALLVAL )
                     LP_autorefs[i].lastask = newprice;
-                else LP_autorefs[i].lastask = (LP_autorefs[i].lastask * 0.9) + (0.1 *newprice);
+                else LP_autorefs[i].lastask = (LP_autorefs[i].lastask * 0.99) + (0.01 * newprice);
                 newprice = LP_autorefs[i].lastask;
                 LP_mypriceset(&changed,base,rel,newprice);
                 LP_pricepings(ctx,LP_myipaddr,LP_mypubsock,base,rel,newprice);
@@ -620,7 +606,7 @@ void LP_autoprices_update(char *method,char *base,double basevol,char *rel,doubl
         {
             if ( strcmp(LP_autorefs[i].rel,rel) == 0 && strcmp(base,LP_autorefs[i].base) == 0 )
             {
-                newprice = (LP_autorefs[i].lastask * 0.99) + (0.01 * price);
+                newprice = (LP_autorefs[i].lastask * 0.9) + (0.1 * price);
                 if ( LP_autorefs[i].lastask > 0 )
                 {
                     //printf("%s: autoprice ask update %s/%s %.8f vs myprice %.8f/%.8f -> %.8f\n",method,base,rel,price,LP_autorefs[i].lastbid,LP_autorefs[i].lastask,newprice);
@@ -629,7 +615,7 @@ void LP_autoprices_update(char *method,char *base,double basevol,char *rel,doubl
             }
             else if ( strcmp(LP_autorefs[i].rel,base) == 0 && strcmp(rel,LP_autorefs[i].base) == 0 )
             {
-                newprice = (LP_autorefs[i].lastbid * 0.99) + (0.01 * price);
+                newprice = (LP_autorefs[i].lastbid * 0.9) + (0.1 * price);
                 if ( LP_autorefs[i].lastbid > 0 )
                 {
                     //printf("%s: autoprice bid update %s/%s %.8f vs myprice %.8f/%.8f -> %.8f\n",method,base,rel,price,LP_autorefs[i].lastbid,LP_autorefs[i].lastask,newprice);
@@ -665,6 +651,8 @@ int32_t LP_autoprice(void *ctx,char *base,char *rel,cJSON *argjson)
         fixedprice = jdouble(argjson,"fixed");
         basepp->fixedprices[relpp->ind] = fixedprice;
         basepp->minprices[relpp->ind] = minprice;
+        if ( jobj(argjson,"maxprice") != 0 )
+            relpp->minprices[basepp->ind] = 1. / jdouble(argjson,"maxprice");
         basepp->buymargins[relpp->ind] = buymargin;
         basepp->sellmargins[relpp->ind] = sellmargin;
         basepp->offsets[relpp->ind] = offset;
@@ -853,7 +841,7 @@ void prices_loop(void *ctx)
     char *retstr; cJSON *retjson,*array; char *buycoin,*sellcoin; struct iguana_info *buy,*sell; uint32_t requestid,quoteid; int32_t i,n,m; struct LP_portfoliotrade trades[256]; struct LP_priceinfo *btcpp;
     strcpy(prices_loop_stats.name,"prices_loop");
     prices_loop_stats.threshold = 191000.;
-    while ( 1 )
+    while ( LP_STOP_RECEIVED == 0 )
     {
         //printf("prices loop autoprices.%d autorefs.%d\n",LP_autoprices,num_LP_autorefs);
         LP_millistats_update(&prices_loop_stats);

iguana/exchanges/LP_prices.c

@@ -260,7 +260,7 @@ struct LP_address *_LP_addressfind(struct iguana_info *coin,char *coinaddr)
     HASH_FIND(hh,coin->addresses,coinaddr,strlen(coinaddr),ap);
     if ( ap != 0 && bits256_nonz(ap->pubkey) == 0 )
     {
-        bitcoin_addr2rmd160(coin->taddr,&addrtype,rmd160,coinaddr);
+        bitcoin_addr2rmd160(coin->symbol,coin->taddr,&addrtype,rmd160,coinaddr);
         if ( (pubp= LP_pubkey_rmd160find(rmd160)) != 0 )
         {
             ap->pubkey = pubp->pubkey;
@@ -275,7 +275,7 @@ struct LP_address *_LP_addressadd(struct iguana_info *coin,char *coinaddr)
     uint8_t rmd160[20],addrtype; struct LP_address *ap; struct LP_pubkey_info *pubp;
     ap = calloc(1,sizeof(*ap));
     safecopy(ap->coinaddr,coinaddr,sizeof(ap->coinaddr));
-    bitcoin_addr2rmd160(coin->taddr,&addrtype,rmd160,coinaddr);
+    bitcoin_addr2rmd160(coin->symbol,coin->taddr,&addrtype,rmd160,coinaddr);
     if ( (pubp= LP_pubkey_rmd160find(rmd160)) != 0 )
     {
         ap->pubkey = pubp->pubkey;
@@ -511,8 +511,10 @@ char *LP_myprices()
 
 int32_t LP_mypriceset(int32_t *changedp,char *base,char *rel,double price)
 {
-    struct LP_priceinfo *basepp,*relpp; struct LP_pubkey_info *pubp;
+    struct LP_priceinfo *basepp,*relpp; struct LP_pubkey_info *pubp; double minprice,maxprice;
     *changedp = 0;
+    //if ( strcmp("DEX",base) == 0 || strcmp("DEX",rel) == 0 )
+    //    printf("%s/%s setprice %.8f\n",base,rel,price);
     if ( base != 0 && rel != 0 && (basepp= LP_priceinfofind(base)) != 0 && (relpp= LP_priceinfofind(rel)) != 0 )
     {
         
@@ -527,6 +529,19 @@ int32_t LP_mypriceset(int32_t *changedp,char *base,char *rel,double price)
             relpp->offsets[basepp->ind] = 0.;
             relpp->factors[basepp->ind] = 0.;
         }
+        else if ( (minprice= basepp->minprices[relpp->ind]) > SMALLVAL && price < minprice )
+        {
+            printf("%s/%s price %.8f less than minprice %.8f\n",base,rel,price,minprice);
+            price = minprice;
+        }
+        else if ( (maxprice= relpp->minprices[basepp->ind]) > SMALLVAL )
+        {
+            if ( price > (1. / maxprice) )
+            {
+                printf("%s/%s price %.8f less than maxprice %.8f, more than %.8f\n",base,rel,price,maxprice,1./maxprice);
+                price = (1. / maxprice);
+            }
+        }
         /*else if ( basepp->myprices[relpp->ind] > SMALLVAL )
         {
             price = (basepp->myprices[relpp->ind] * 0.9) + (0.1 * price);
@@ -559,6 +574,18 @@ double LP_price(char *base,char *rel)
     return(price);
 }
 
+double LP_getmyprice(char *base,char *rel)
+{
+    struct LP_priceinfo *basepp; int32_t relind; double price = 0.;
+    if ( (basepp= LP_priceinfoptr(&relind,base,rel)) != 0 )
+    {
+        if ( (price= basepp->myprices[relind]) == 0. )
+        {
+        }
+    }
+    return(price);
+}
+
 cJSON *LP_priceinfomatrix(int32_t usemyprices)
 {
     int32_t i,j,n,m; double total,sum,val; struct LP_priceinfo *pp; uint32_t now; struct LP_cacheinfo *ptr,*tmp; cJSON *vectorjson = cJSON_CreateObject();
@@ -783,7 +810,7 @@ int32_t LP_orderbook_utxoentries(uint32_t now,int32_t polarity,char *base,char *
         }
         if ( pubp->timestamp < oldest )
             continue;
-        bitcoin_address(coinaddr,basecoin->taddr,basecoin->pubtype,pubp->rmd160,sizeof(pubp->rmd160));
+        bitcoin_address(base,coinaddr,basecoin->taddr,basecoin->pubtype,pubp->rmd160,sizeof(pubp->rmd160));
         avesatoshis = maxsatoshis = n = 0;
         ap = 0;
         if ( (price= LP_pubkey_price(&n,&avesatoshis,&maxsatoshis,pubp,baseid,relid)) > SMALLVAL ) //pubp->matrix[baseid][relid]) > SMALLVAL )//&& pubp->timestamps[baseid][relid] >= oldest )
@@ -922,6 +949,7 @@ char *LP_orderbook(char *base,char *rel,int32_t duration)
     jaddstr(retjson,"base",base);
     jaddstr(retjson,"rel",rel);
     jaddnum(retjson,"timestamp",now);
+    jaddnum(retjson,"netid",G.netid);
     if ( bids != 0 )
         free(bids);
     if ( asks != 0 )

iguana/exchanges/LP_privkey.c

@@ -171,17 +171,17 @@ char *LP_secretaddresses(void *ctx,char *prefix,char *passphrase,int32_t n,uint8
     else if ( n > 777 )
         n = 777;
     conv_NXTpassword(privkey.bytes,pubkey.bytes,(uint8_t *)passphrase,(int32_t)strlen(passphrase));
-    bitcoin_priv2pub(ctx,pubkey33,coinaddr,privkey,taddr,pubtype);
+    bitcoin_priv2pub(ctx,"KMD",pubkey33,coinaddr,privkey,taddr,pubtype);
     printf("generator (%s) secrets.[%d] <%s> t.%u p.%u\n",coinaddr,n,passphrase,taddr,pubtype);
     sprintf(output,"\"addresses\":[");
     for (i=0; i<n; i++)
     {
         sprintf(buf,"%s %s %03d",prefix,passphrase,i);
         conv_NXTpassword(privkey.bytes,pubkey.bytes,(uint8_t *)buf,(int32_t)strlen(buf));
-        bitcoin_priv2pub(ctx,pubkey33,coinaddr,privkey,taddr,pubtype);
-        bitcoin_priv2wif(0,wifstr,privkey,188);
-        bitcoin_wif2priv(0,&tmptype,&checkprivkey,wifstr);
-        bitcoin_addr2rmd160(taddr,&tmptype,rmd160,coinaddr);
+        bitcoin_priv2pub(ctx,"KMD",pubkey33,coinaddr,privkey,taddr,pubtype);
+        bitcoin_priv2wif("KMD",0,wifstr,privkey,188);
+        bitcoin_wif2priv("KMD",0,&tmptype,&checkprivkey,wifstr);
+        bitcoin_addr2rmd160("KMD",taddr,&tmptype,rmd160,coinaddr);
         if ( bits256_cmp(checkprivkey,privkey) != 0 )
         {
             printf("WIF.(%s) error -> %s vs %s?\n",wifstr,bits256_str(str,privkey),bits256_str(str2,checkprivkey));
@@ -204,29 +204,50 @@ char *LP_secretaddresses(void *ctx,char *prefix,char *passphrase,int32_t n,uint8
 
 static const char base58_chars[] = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
 
-int32_t LP_wifstr_valid(char *wifstr)
+int32_t LP_wifstr_valid(char *symbol,char *wifstr)
 {
-    bits256 privkey,cmpkey; uint8_t wiftype; char cmpstr[128],cmpstr2[128]; int32_t i;
+    bits256 privkey,cmpkey; uint8_t wiftype; char cmpstr[128],cmpstr2[128]; int32_t i,len,n,a,A;
+    if ( (len= (int32_t)strlen(wifstr)) < 50 || len > 54 )
+    {
+        //printf("len.%d is wrong for wif %s\n",len,wifstr);
+        return(0);
+    }
     memset(privkey.bytes,0,sizeof(privkey));
     memset(cmpkey.bytes,0,sizeof(cmpkey));
-    for (i=0; wifstr[i]!=0; i++)
+    for (i=n=a=A=0; wifstr[i]!=0; i++)
+    {
         if ( strchr(base58_chars,wifstr[i]) == 0 )
             return(0);
-    bitcoin_wif2priv(0,&wiftype,&privkey,wifstr);
-    bitcoin_priv2wif(0,cmpstr,privkey,wiftype);
+        if ( wifstr[i] >= '1' && wifstr[i] <= '9' )
+            n++;
+        else if ( wifstr[i] >= 'A' && wifstr[i] <= 'Z' )
+            A++;
+        else if ( wifstr[i] >= 'a' && wifstr[i] <= 'z' )
+            a++;
+    }
+    if ( n == 0 || A == 0 || a == 0 )
+        return(0);
+    if ( A > 5*a || a > 5*A || a > n*20 || A > n*20 ) // unlikely it is a real wif
+    {
+        printf("reject wif %s due to n.%d a.%d A.%d (%d %d %d %d)\n",wifstr,n,a,A,A > 5*a,a < 5*A,a > n*20,A > n*20);
+        return(0);
+    }
+    bitcoin_wif2priv(symbol,0,&wiftype,&privkey,wifstr);
+    bitcoin_priv2wif(symbol,0,cmpstr,privkey,wiftype);
     if ( strcmp(cmpstr,wifstr) == 0 )
     {
-        printf("%s is valid wif\n",wifstr);
+        //printf("%s is valid wif\n",wifstr);
         return(1);
     }
     else if ( bits256_nonz(privkey) != 0 )
     {
-        bitcoin_wif2priv(0,&wiftype,&cmpkey,cmpstr);
-        bitcoin_priv2wiflong(0,cmpstr2,privkey,wiftype);
-        char str[65],str2[65]; printf("mismatched wifstr %s -> %s -> %s %s %s\n",wifstr,bits256_str(str,privkey),cmpstr,bits256_str(str2,cmpkey),cmpstr2);
+        bitcoin_wif2priv(symbol,0,&wiftype,&cmpkey,cmpstr);
+        bitcoin_priv2wiflong(symbol,0,cmpstr2,privkey,wiftype);
         if ( bits256_cmp(privkey,cmpkey) == 0 )
             return(1);
+        char str[65],str2[65]; printf("%s mismatched wifstr %s -> %s -> %s %s %s\n",symbol,wifstr,bits256_str(str,privkey),cmpstr,bits256_str(str2,cmpkey),cmpstr2);
     }
+    char str[65]; printf("%s is not a wif, privkey.%s\n",wifstr,bits256_str(str,privkey));
     return(0);
 }
 
@@ -234,7 +255,7 @@ bits256 LP_privkeycalc(void *ctx,uint8_t *pubkey33,bits256 *pubkeyp,struct iguan
 {
     //static uint32_t counter;
     bits256 privkey,userpub,zero,userpass,checkkey,tmpkey; char tmpstr[128]; cJSON *retjson; uint8_t tmptype; int32_t notarized; uint64_t nxtaddr;
-    if ( (wifstr == 0 || wifstr[0] == 0) && LP_wifstr_valid(passphrase) > 0 )
+    if ( (wifstr == 0 || wifstr[0] == 0) && LP_wifstr_valid(coin->symbol,passphrase) > 0 )
     {
         wifstr = passphrase;
         passphrase = 0;
@@ -247,8 +268,8 @@ bits256 LP_privkeycalc(void *ctx,uint8_t *pubkey33,bits256 *pubkeyp,struct iguan
         //vcalc_sha256(0,checkkey.bytes,(uint8_t *)passphrase,(int32_t)strlen(passphrase));
         //printf("SHA256.(%s) ",bits256_str(pstr,checkkey));
         //printf("privkey.(%s)\n",bits256_str(pstr,privkey));
-        bitcoin_priv2wif(coin->wiftaddr,tmpstr,privkey,coin->wiftype);
-        bitcoin_wif2priv(coin->wiftaddr,&tmptype,&checkkey,tmpstr);
+        bitcoin_priv2wif(coin->symbol,coin->wiftaddr,tmpstr,privkey,coin->wiftype);
+        bitcoin_wif2priv(coin->symbol,coin->wiftaddr,&tmptype,&checkkey,tmpstr);
         if ( bits256_cmp(privkey,checkkey) != 0 )
         {
             char str[65],str2[65]; printf("mismatched privkeys from wif conversion: %s -> %s -> %s\n",bits256_str(str,privkey),tmpstr,bits256_str(str2,checkkey));
@@ -257,30 +278,34 @@ bits256 LP_privkeycalc(void *ctx,uint8_t *pubkey33,bits256 *pubkeyp,struct iguan
     }
     else
     {
-        bitcoin_wif2priv(coin->wiftaddr,&tmptype,&privkey,wifstr);
-        bitcoin_priv2wif(coin->wiftaddr,tmpstr,privkey,tmptype);
+        bitcoin_wif2priv(coin->symbol,coin->wiftaddr,&tmptype,&privkey,wifstr);
+        bitcoin_priv2wif(coin->symbol,coin->wiftaddr,tmpstr,privkey,tmptype);
         if ( strcmp(tmpstr,wifstr) != 0 )
         {
-            printf("error reproducing the wifstr, likely edge case like non-supported uncompressed pubkey\n");
+            bitcoin_wif2priv(coin->symbol,coin->wiftaddr,&tmptype,&tmpkey,tmpstr);
+            if ( bits256_cmp(tmpkey,privkey) != 0 )
+            {
+                char str[65]; printf("%s error reproducing the wifstr, likely edge case like non-supported uncompressed pubkey privkey.%s\n",coin->symbol,bits256_str(str,privkey));
                 exit(1);
             }
+        }
         tmpkey = privkey;
         nxtaddr = conv_NXTpassword(tmpkey.bytes,pubkeyp->bytes,0,0);
         RS_encode(G.LP_NXTaddr,nxtaddr);
     }
-    bitcoin_priv2pub(ctx,coin->pubkey33,coin->smartaddr,privkey,coin->taddr,coin->pubtype);
+    bitcoin_priv2pub(ctx,coin->symbol,coin->pubkey33,coin->smartaddr,privkey,coin->taddr,coin->pubtype);
     if ( coin->counter == 0 )
     {
         coin->counter++;
         memcpy(G.LP_pubsecp,coin->pubkey33,33);
-        bitcoin_priv2wif(coin->wiftaddr,tmpstr,privkey,coin->wiftype);
-        bitcoin_addr2rmd160(coin->taddr,&tmptype,G.LP_myrmd160,coin->smartaddr);
+        bitcoin_priv2wif(coin->symbol,coin->wiftaddr,tmpstr,privkey,coin->wiftype);
+        bitcoin_addr2rmd160(coin->symbol,coin->taddr,&tmptype,G.LP_myrmd160,coin->smartaddr);
         LP_privkeyadd(privkey,G.LP_myrmd160);
         G.LP_privkey = privkey;
         if ( G.counter++ == 0 )
         {
-            bitcoin_priv2wif(coin->wiftaddr,G.USERPASS_WIFSTR,privkey,188);
-            bitcoin_wif2priv(coin->wiftaddr,&tmptype,&checkkey,G.USERPASS_WIFSTR);
+            bitcoin_priv2wif(coin->symbol,coin->wiftaddr,G.USERPASS_WIFSTR,privkey,188);
+            bitcoin_wif2priv(coin->symbol,coin->wiftaddr,&tmptype,&checkkey,G.USERPASS_WIFSTR);
             if ( bits256_cmp(checkkey,privkey) != 0 )
             {
                 char str[65],str2[65];
@@ -345,23 +370,43 @@ void LP_privkey_updates(void *ctx,int32_t pubsock,char *passphrase)
     }
 }
 
-int32_t LP_passphrase_init(char *passphrase,char *gui)
+int32_t LP_passphrase_init(char *passphrase,char *gui,uint16_t netid,char *seednode)
 {
-    static void *ctx; int32_t counter; //iambob,; struct LP_utxoinfo *utxo,*tmp;
+    static void *ctx; struct iguana_info *coin,*tmp; int32_t counter;
     if ( ctx == 0 )
         ctx = bitcoin_ctx();
     if ( G.LP_pendingswaps != 0 )
         return(-1);
+    if ( netid != G.netid )
+    {
+        if ( IAMLP != 0 )
+        {
+            printf("sorry, LP nodes can only set netid during startup\n");
+            return(-1);
+        }
+        else
+        {
+            printf(">>>>>>>>>>>>> netid.%d vs G.netid %d\n",netid,G.netid);
+            LP_closepeers();
+            LP_initpeers(LP_mypubsock,LP_mypeer,LP_myipaddr,RPC_port,netid,seednode);
+        }
+    }
     G.initializing = 1;
     if ( gui == 0 )
         gui = "cli";
     counter = G.USERPASS_COUNTER;
+    HASH_ITER(hh,LP_coins,coin,tmp)
+    {
+        coin->importedprivkey = 0;
+    }
     while ( G.waiting == 0 )
     {
         printf("waiting for G.waiting\n");
         sleep(5);
     }
     memset(&G,0,sizeof(G));
+    G.netid = netid;
+    safecopy(G.seednode,seednode,sizeof(G.seednode));
     vcalc_sha256(0,G.LP_passhash.bytes,(uint8_t *)passphrase,(int32_t)strlen(passphrase));
     LP_privkey_updates(ctx,LP_mypubsock,passphrase);
     init_hexbytes_noT(G.LP_myrmd160str,G.LP_myrmd160,20);
@@ -381,8 +426,8 @@ void LP_privkey_tests()
     for (i=0; i<200000000; i++)
     {
         privkey = rand256(0);
-        bitcoin_priv2wif(0,wifstr,privkey,0xff);
-        bitcoin_wif2priv(0,&tmptype,&checkkey,wifstr);
+        bitcoin_priv2wif("KMD",0,wifstr,privkey,0xff);
+        bitcoin_wif2priv("KMD",0,&tmptype,&checkkey,wifstr);
         if ( bits256_cmp(privkey,checkkey) != 0 )
         {
             printf("i.%d: %s vs %s\n",i,bits256_str(str,privkey),bits256_str(str2,checkkey));
@@ -395,10 +440,59 @@ void LP_privkey_tests()
 }
 
 
+#define JPG_ENCRYPTED_MAXSIZE 32768
+
+int32_t JPG_encrypt(uint16_t ind,uint8_t encoded[JPG_ENCRYPTED_MAXSIZE],uint8_t *msg,int32_t msglen,bits256 privkey)
+{
+    bits256 pubkey; int32_t len = 2; uint8_t space[JPG_ENCRYPTED_MAXSIZE],*nonce,*cipher;
+    pubkey = acct777_pubkey(privkey);
+    encoded[len++] = ind & 0xff;
+    encoded[len++] = (ind >> 8) & 0xff;
+    nonce = &encoded[len];
+    OS_randombytes(nonce,crypto_box_NONCEBYTES);
+    cipher = &encoded[len + crypto_box_NONCEBYTES];
+    msglen = _SuperNET_cipher(nonce,&encoded[len + crypto_box_NONCEBYTES],msg,msglen,pubkey,privkey,space);
+    msglen += crypto_box_NONCEBYTES;
+    msg = encoded;
+    msglen += len;
+    encoded[0] = msglen & 0xff;
+    encoded[1] = (msglen >> 8) & 0xff;
+    int32_t i; for (i=0; i<msglen; i++)
+        printf("%02x",encoded[i]);
+    printf(" encoded.%d\n",msglen);
+   return(msglen);
+}
+
+uint8_t *JPG_decrypt(uint16_t *indp,int32_t *recvlenp,uint8_t space[JPG_ENCRYPTED_MAXSIZE + crypto_box_ZEROBYTES],uint8_t *encoded,bits256 privkey)
+{
+    bits256 pubkey; uint8_t *extracted=0,*nonce,*cipher; uint16_t msglen,ind; int32_t cipherlen,len = 4;
+    *recvlenp = 0;
+    *indp = -1;
+    pubkey = acct777_pubkey(privkey);
+    msglen = ((int32_t)encoded[1] << 8) | encoded[0];
+    ind = ((int32_t)encoded[3] << 8) | encoded[2];
+    nonce = &encoded[len];
+    cipher = &encoded[len + crypto_box_NONCEBYTES];
+    cipherlen = msglen - (len + crypto_box_NONCEBYTES);
+    if ( cipherlen > 0 && cipherlen <= JPG_ENCRYPTED_MAXSIZE + crypto_box_ZEROBYTES )
+    {
+        if ( (extracted= _SuperNET_decipher(nonce,cipher,space,cipherlen,pubkey,privkey)) != 0 )
+        {
+            int32_t i; for (i=0; i<msglen; i++)
+                printf("%02x",encoded[i]);
+            printf(" restored\n");
+            msglen = (cipherlen - crypto_box_ZEROBYTES);
+            *recvlenp = msglen;
+            *indp = ind;
+        }
+    } //else printf("cipher.%d too big for %d\n",cipherlen,JPG_ENCRYPTED_MAXSIZE + crypto_box_ZEROBYTES);
+    return(extracted);
+}
+
 // from https://github.com/owencm/C-Steganography-Framework
 #include "../../crypto777/jpeg/cdjpeg.h" // Common decls for compressing and decompressing jpegs
 
-int32_t LP_jpg_process(int32_t *capacityp,char *inputfname,char *outputfname,uint8_t *decoded,uint8_t *data,int32_t required,int32_t power2,char *passphrase)
+int32_t LP_jpg_process(int32_t *capacityp,char *inputfname,char *outputfname,uint8_t *decoded,uint8_t *origdata,int32_t origrequired,int32_t power2,char *password,uint16_t *indp)
 {
     struct jpeg_decompress_struct inputinfo;
     struct jpeg_compress_struct outputinfo;
@@ -407,19 +501,47 @@ int32_t LP_jpg_process(int32_t *capacityp,char *inputfname,char *outputfname,uin
     JDIMENSION i,compnum,rownum,blocknum;
     JBLOCKARRAY coef_buffers[MAX_COMPONENTS];
     JBLOCKARRAY row_ptrs[MAX_COMPONENTS];
-    FILE *input_file,*output_file; int32_t val,modified,emit,totalrows,limit;
-    if ( power2 < 0 || power2 > 16 )
-        power2 = 4;
+    bits256 privkey; FILE *input_file,*output_file; int32_t recvlen,msglen,val,modified,emit,totalrows,limit,required; uint16_t checkind; uint8_t *decrypted,*space,*data=0;
+    if ((input_file = fopen(inputfname, READ_BINARY)) == NULL)
+    {
+        fprintf(stderr, "Can't open %s\n", inputfname);
+        //exit(EXIT_FAILURE);
+        return(-1);
+    }
+    required = origrequired;
+    memset(privkey.bytes,0,sizeof(privkey));
+    if ( password != 0 && password[0] != 0 )
+    {
+        if ( required/8 > JPG_ENCRYPTED_MAXSIZE-60 )
+            return(-1);
+        data = calloc(1,required/8+512);
+        vcalc_sha256(0,privkey.bytes,(uint8_t *)password,(int32_t)strlen(password));
+        if ( origdata != 0 )
+        {
+            msglen = JPG_encrypt(*indp,data,origdata,required/8,privkey);
+            required = msglen * 8;
+            {
+                space = calloc(1,JPG_ENCRYPTED_MAXSIZE);
+                if ( (decrypted= JPG_decrypt(&checkind,&recvlen,space,data,privkey)) == 0 || recvlen != origrequired/8 || checkind != *indp || memcmp(decrypted,origdata,origrequired/8) != 0 )
+                    printf("A decryption error: checkind.%d vs %d, recvlen.%d vs %d, decrypted.%p\n",checkind,*indp,recvlen,origrequired/8,decrypted);
+                else
+                {
+                    for (i=0; i<recvlen; i++)
+                        printf("%02x",decrypted[i]);
+                    printf(" VERIFIED decryption.%d ind.%d msglen.%d required.%d\n",recvlen,*indp,msglen,required);
+                }
+                free(space);
+            }
+        } else required += 60 * 8;
+    } else data = origdata;
+    if ( power2 < 0 || power2 > 30 )
+        power2 = 7;
     limit = 1;
     while ( power2 > 0 )
     {
         limit <<= 1;
         power2--;
     }
-    if ((input_file = fopen(inputfname, READ_BINARY)) == NULL) {
-        fprintf(stderr, "Can't open %s\n", inputfname);
-        exit(EXIT_FAILURE);
-    }
     // Initialize the JPEG compression and decompression objects with default error handling
     inputinfo.err = jpeg_std_error(&jerr);
     jpeg_create_decompress(&inputinfo);
@@ -453,10 +575,14 @@ int32_t LP_jpg_process(int32_t *capacityp,char *inputfname,char *outputfname,uin
                 for (i=0; i<DCTSIZE2; i++)
                 {
                     val = row_ptrs[compnum][0][blocknum][i];
-                    if ( val < -power2 || val > power2 )
+                    if ( val < -limit || val >= limit )
+                    {
+                        if ( (*capacityp) < required )
                         {
-                        if ( decoded != 0 && (val & 1) != 0 && *capacityp < required )
-                            decoded[*capacityp >> 3] |= (1 << (*capacityp & 7));
+                            if ( (val & 1) != 0 )
+                                SETBIT(decoded,(*capacityp));
+                            //printf("%c",(val&1)!=0?'1':'0');
+                        }
                         (*capacityp)++;
                     }
                     coef_buffers[compnum][rownum][blocknum][i] = val;
@@ -464,12 +590,28 @@ int32_t LP_jpg_process(int32_t *capacityp,char *inputfname,char *outputfname,uin
             }
         }
     }
-    printf("capacity %d required.%d\n",*capacityp,required);
+    if ( password != 0 && password[0] != 0 )
+    {
+        space = calloc(1,JPG_ENCRYPTED_MAXSIZE);
+        if ( (decrypted= JPG_decrypt(indp,&recvlen,space,decoded,privkey)) != 0 && recvlen == origrequired/8 )
+        {
+            for (i=0; i<recvlen; i++)
+            {
+                //printf("%02x",decrypted[i]);
+                decoded[i] = decrypted[i];
+            }
+            //printf(" decrypted.%d ind.%d\n",recvlen,*indp);
+        }
+        free(space);
+    }
+   //printf(" capacity %d required.%d power2.%d limit.%d\n",*capacityp,required,power2,limit);
     if ( *capacityp > required && outputfname != 0 && outputfname[0] != 0 )
     {
         if ((output_file = fopen(outputfname, WRITE_BINARY)) == NULL) {
             fprintf(stderr, "Can't open %s\n", outputfname);
-            exit(EXIT_FAILURE);
+            if ( data != origdata )
+                free(data);
+            return(-1);
         }
         outputinfo.err = jpeg_std_error(&jerr);
         jpeg_create_compress(&outputinfo);
@@ -483,25 +625,25 @@ int32_t LP_jpg_process(int32_t *capacityp,char *inputfname,char *outputfname,uin
                 for (blocknum=0; blocknum<width_in_blocks[compnum]; blocknum++)
                 {
                     //printf("\n\nComponent: %i, Row:%i, Column: %i\n", compnum, rownum, blocknum);
-                    for (i=0; i<DCTSIZE2; i++)
+                    for (i=0; i<DCTSIZE2&&emit<required; i++)
                     {
                         val = coef_buffers[compnum][rownum][blocknum][i];
-                        if ( val < -power2 || val > power2 )
+                        if ( val < -limit || val >= limit )
                         {
                             val &= ~1;
-                            if ( (data[emit >> 3] & (1 << (emit&7))) != 0 )
+                            if (GETBIT(data,emit) != 0 )//|| (emit >= required && (rand() & 1) != 0) )
                                 val |= 1;
+                            //printf("%c",(val&1)!=0?'1':'0');
+                            coef_buffers[compnum][rownum][blocknum][i] = val;
                             emit++;
                         }
-                        coef_buffers[compnum][rownum][blocknum][i] = val;
                         //printf("%i,", coef_buffers[compnum][rownum][blocknum][i]);
                     }
                 }
             }
         }
-        //printf("\n\n");
-        
-        /* Output the new DCT coeffs to a JPEG file */
+        //printf(" emit.%d\n",emit);
+        // Output the new DCT coeffs to a JPEG file
         modified = 0;
         for (compnum=0; compnum<num_components; compnum++)
         {
@@ -533,16 +675,17 @@ int32_t LP_jpg_process(int32_t *capacityp,char *inputfname,char *outputfname,uin
     free(block_row_size);
     free(width_in_blocks);
     free(height_in_blocks);
+    if ( data != origdata )
+        free(data);
     return(modified);
 }
 
-char *LP_jpg(char *srcfile,char *destfile,int32_t power2,char *passphrase,char *datastr,int32_t required)
+char *LP_jpg(char *srcfile,char *destfile,int32_t power2,char *passphrase,char *datastr,int32_t required,uint16_t ind)
 {
     cJSON *retjson; int32_t len=0,modified,capacity; char *decodedstr; uint8_t *data=0,*decoded=0;
     if ( srcfile != 0 && srcfile[0] != 0 )
     {
         retjson = cJSON_CreateObject();
-        jaddstr(retjson,"result","success");
         if ( datastr != 0 && datastr[0] != 0 )
         {
             if ( (len= is_hexstr(datastr,0)) > 0 )
@@ -551,23 +694,36 @@ char *LP_jpg(char *srcfile,char *destfile,int32_t power2,char *passphrase,char *
                 data = calloc(1,len);
                 decode_hex(data,len,datastr);
                 required = len * 8;
+                //int32_t i; for (i=0; i<required; i++)
+                //    printf("%c",'0'+(GETBIT(data,i)!=0));
+                //printf(" datastr.%d %s\n",required,datastr);
             }
         }
         if ( required > 0 )
-            decoded = calloc(1,len);
-        modified = LP_jpg_process(&capacity,srcfile,destfile,decoded,data,required,power2,passphrase);
+            decoded = calloc(1,len+required);
+        if ( (modified= LP_jpg_process(&capacity,srcfile,destfile,decoded,data,required,power2,passphrase,&ind)) < 0 )
+            jaddstr(retjson,"error","file not found");
+        else
+        {
+            jaddstr(retjson,"result","success");
             jaddnum(retjson,"modifiedrows",modified);
             if ( modified != 0 )
                 jaddstr(retjson,"outputfile",destfile);
             jaddnum(retjson,"power2",power2);
             jaddnum(retjson,"capacity",capacity);
             jaddnum(retjson,"required",required);
+            jaddnum(retjson,"ind",ind);
+        }
         if ( decoded != 0 )
         {
-            decodedstr = calloc(1,len*2+1);
-            init_hexbytes_noT(decodedstr,decoded,len);
+            if ( capacity > 0 )
+            {
+                //printf("len.%d required.%d capacity.%d\n",len,required,capacity);
+                decodedstr = calloc(1,(len+required)*2+1);
+                init_hexbytes_noT(decodedstr,decoded,required/8);
                 jaddstr(retjson,"decoded",decodedstr);
                 free(decodedstr);
+            }
             free(decoded);
         }
         if ( data != 0 )

iguana/exchanges/LP_remember.c

@@ -46,7 +46,7 @@ void basilisk_dontforget(struct basilisk_swap *swap,struct basilisk_rawtx *rawtx
             fprintf(fp,",\"tx\":\"");
             for (i=0; i<rawtx->I.datalen; i++)
                 fprintf(fp,"%02x",rawtx->txbytes[i]);
-            fprintf(fp,"\",\"txid\":\"%s\"",bits256_str(str,bits256_doublesha256(0,rawtx->txbytes,rawtx->I.datalen)));
+            fprintf(fp,"\",\"txid\":\"%s\"",bits256_str(str,bits256_calctxid(rawtx->symbol,rawtx->txbytes,rawtx->I.datalen)));
             if ( rawtx == &swap->bobdeposit || rawtx == &swap->bobpayment )
             {
                 LP_swap_coinaddr(bobcoin,coinaddr,0,rawtx->txbytes,rawtx->I.datalen,0);
@@ -73,7 +73,7 @@ void basilisk_dontforget(struct basilisk_swap *swap,struct basilisk_rawtx *rawtx
             fprintf(fp,",\"trigger\":\"%s\"",bits256_str(str,triggertxid));
         if ( bits256_nonz(swap->I.pubAm) != 0 && bits256_nonz(swap->I.pubBn) != 0 )
         {
-            basilisk_alicescript(redeemscript,&len,script,0,coinaddr,alicecoin->taddr,alicecoin->p2shtype,swap->I.pubAm,swap->I.pubBn);
+            basilisk_alicescript(alicecoin->symbol,redeemscript,&len,script,0,coinaddr,alicecoin->taddr,alicecoin->p2shtype,swap->I.pubAm,swap->I.pubBn);
             LP_importaddress(swap->I.alicestr,coinaddr);
             fprintf(fp,",\"Apayment\":\"%s\"",coinaddr);
         }
@@ -489,7 +489,7 @@ cJSON *LP_swap_json(struct LP_swap_remember *rswap)
     item = cJSON_CreateObject();
     if ( LP_swap_endcritical < LP_swap_critical )
     {
-        jaddstr(item,"warning","swaps in critical section");
+        jaddstr(item,"warning","swaps in critical section, dont exit now");
         jaddnum(item,"critical",LP_swap_critical);
         jaddnum(item,"endcritical",LP_swap_endcritical);
     }
@@ -570,9 +570,9 @@ int32_t LP_rswap_init(struct LP_swap_remember *rswap,uint32_t requestid,uint32_t
             {
                 decode_hex(rswap->pubkey33,33,dest33);
                 if ( rswap->iambob != 0 && (coin= LP_coinfind(rswap->src)) != 0 )
-                    bitcoin_address(rswap->destaddr,coin->taddr,coin->pubtype,rswap->pubkey33,33);
+                    bitcoin_address(coin->symbol,rswap->destaddr,coin->taddr,coin->pubtype,rswap->pubkey33,33);
                 else if ( rswap->iambob == 0 && (coin= LP_coinfind(rswap->dest)) != 0 )
-                    bitcoin_address(rswap->Adestaddr,coin->taddr,coin->pubtype,rswap->pubkey33,33);
+                    bitcoin_address(coin->symbol,rswap->Adestaddr,coin->taddr,coin->pubtype,rswap->pubkey33,33);
                 //for (i=0; i<33; i++)
                 //    printf("%02x",pubkey33[i]);
                 //printf(" <- %s dest33\n",dest33);
@@ -586,9 +586,9 @@ int32_t LP_rswap_init(struct LP_swap_remember *rswap,uint32_t requestid,uint32_t
                 if ( i < 33 )
                     memcpy(rswap->other33,other33,33);
                 if ( rswap->iambob != 0 && (coin= LP_coinfind(rswap->dest)) != 0 )
-                    bitcoin_address(rswap->Adestaddr,coin->taddr,coin->pubtype,rswap->other33,33);
+                    bitcoin_address(coin->symbol,rswap->Adestaddr,coin->taddr,coin->pubtype,rswap->other33,33);
                 else if ( rswap->iambob == 0 && (coin= LP_coinfind(rswap->src)) != 0 )
-                    bitcoin_address(rswap->destaddr,coin->taddr,coin->pubtype,rswap->other33,33);
+                    bitcoin_address(coin->symbol,rswap->destaddr,coin->taddr,coin->pubtype,rswap->other33,33);
                 //printf("(%s, %s) <- %s other33\n",rswap->destaddr,rswap->Adestaddr,dest33);
             }
             if ( (rswap->plocktime= juint(item,"plocktime")) == 0 )
@@ -921,7 +921,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
     {
         if ( alice != 0 )
         {
-            bitcoin_address(otheraddr,alice->taddr,alice->pubtype,rswap.other33,33);
+            bitcoin_address(alice->symbol,otheraddr,alice->taddr,alice->pubtype,rswap.other33,33);
             destBdest = otheraddr;
             destAdest = rswap.Adestaddr;
             if ( LP_TECHSUPPORT == 0 && strcmp(alice->smartaddr,rswap.Adestaddr) != 0 )
@@ -936,7 +936,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
         }
         if ( (bob= LP_coinfind(rswap.bobcoin)) != 0 )
         {
-            bitcoin_address(rswap.Sdestaddr,bob->taddr,bob->pubtype,rswap.pubkey33,33);
+            bitcoin_address(bob->symbol,rswap.Sdestaddr,bob->taddr,bob->pubtype,rswap.pubkey33,33);
             srcAdest = rswap.Sdestaddr;
         }
         srcBdest = rswap.destaddr;
@@ -945,7 +945,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
     {
         if ( bob != 0 )
         {
-            bitcoin_address(otheraddr,bob->taddr,bob->pubtype,rswap.other33,33);
+            bitcoin_address(bob->symbol,otheraddr,bob->taddr,bob->pubtype,rswap.other33,33);
             srcAdest = otheraddr;
             srcBdest = rswap.destaddr;
             if ( LP_TECHSUPPORT == 0 && strcmp(bob->smartaddr,rswap.destaddr) != 0 )
@@ -960,7 +960,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
         }
         if ( (alice= LP_coinfind(rswap.alicecoin)) != 0 )
         {
-            bitcoin_address(rswap.Sdestaddr,alice->taddr,alice->pubtype,rswap.pubkey33,33);
+            bitcoin_address(alice->symbol,rswap.Sdestaddr,alice->taddr,alice->pubtype,rswap.pubkey33,33);
             destBdest = rswap.Sdestaddr;
         }
         destAdest = rswap.Adestaddr;
@@ -1021,7 +1021,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
                             {
                                 char privaddr[64]; uint8_t privpub33[33];
                                 bitcoin_pubkey33(ctx,privpub33,rswap.myprivs[0]);
-                                bitcoin_address(privaddr,0,60,privpub33,33);
+                                bitcoin_address(rswap.bobcoin,privaddr,0,60,privpub33,33);
                                 printf("alicespend len.%d redeemlen.%d priv0addr.(%s) priv0.(%s)\n",len,redeemlen,privaddr,bits256_str(str,rswap.myprivs[0]));
                             }
                             for (j=0; j<32; j++)
@@ -1044,7 +1044,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
                             free_json(txoutobj), flag = 0;
                         else flag = -1, rswap.depositspent = deadtxid;
                     }
-                    if ( flag == 0 )
+                    //if ( flag == 0 )
                     {
                         if ( rswap.Dredeemlen != 0 )
                             redeemlen = rswap.Dredeemlen, memcpy(redeemscript,rswap.Dredeemscript,rswap.Dredeemlen);
@@ -1119,7 +1119,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
                         free_json(txoutobj), flag = 0;
                     else flag = -1, rswap.paymentspent = deadtxid;
                 }
-                if ( flag == 0 && time(NULL) > rswap.expiration+777 )
+                if ( time(NULL) > rswap.expiration+777 )
                 {
                     // bobreclaim
                     redeemlen = basilisk_swap_bobredeemscript(0,&secretstart,redeemscript,rswap.plocktime,rswap.pubA0,rswap.pubB0,rswap.pubB1,zero,rswap.privBn,rswap.secretAm,rswap.secretAm256,rswap.secretBn,rswap.secretBn256);
@@ -1148,7 +1148,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
                         free_json(txoutobj), flag = 0;
                     else flag = -1, rswap.depositspent = deadtxid;
                 }
-                if ( flag == 0 && (bits256_nonz(rswap.Apaymentspent) != 0 || time(NULL) > rswap.expiration+777) )
+                if ( bits256_nonz(rswap.Apaymentspent) != 0 || time(NULL) > rswap.expiration+777 )
                 {
                     printf("do the refund! paymentspent.%s now.%u vs expiration.%u\n",bits256_str(str,rswap.paymentspent),(uint32_t)time(NULL),rswap.expiration);
                     //if ( txbytes[BASILISK_BOBREFUND] == 0 )
@@ -1202,6 +1202,7 @@ cJSON *basilisk_remember(int64_t *KMDtotals,int64_t *BTCtotals,uint32_t requesti
         {
             jaddstr(item,"method","tradestatus");
             jaddnum(item,"finishtime",rswap.finishtime);
+            if ( jobj(item,"gui") == 0 )
                 jaddstr(item,"gui",G.gui);
             //jaddbits256(item,"srchash",rswap.Q.srchash);
             //jaddbits256(item,"desthash",rswap.desthash);
@@ -1401,7 +1402,7 @@ char *LP_recent_swaps(int32_t limit)
                                     jaddnum(subitem,"price",-destamount/srcamount);
                                     jaddi(item,subitem);
                                 }
-                            } else printf("base.%p rel.%p statusstr.%p baseind.%d relind.%d\n",base,rel,statusstr,baseind,relind);
+                            } //else printf("base.%p rel.%p statusstr.%p baseind.%d relind.%d\n",base,rel,statusstr,baseind,relind);
                             free_json(swapjson);
                         } else printf("error parsing.(%s)\n",retstr);
                         free(retstr);

iguana/exchanges/LP_rpc.c

@@ -104,7 +104,7 @@ int32_t LP_getheight(int32_t *notarizedp,struct iguana_info *coin)
             coin->height = height = jint(retjson,"blocks");
             if ( (*notarizedp= jint(retjson,"notarized")) != 0 && *notarizedp != coin->notarized )
             {
-                printf("new notarized %s %d -> %d\n",coin->symbol,coin->notarized,*notarizedp);
+                //printf("new notarized %s %d -> %d\n",coin->symbol,coin->notarized,*notarizedp);
                 coin->notarized = *notarizedp;
                 coin->notarizationtxid = jbits256(retjson,"notarizedtxid");
                 coin->notarizedhash = jbits256(retjson,"notarizedhash");
@@ -299,8 +299,8 @@ cJSON *LP_validateaddress(char *symbol,char *address)
     {
         retjson = cJSON_CreateObject();
         jaddstr(retjson,"address",address);
-        bitcoin_addr2rmd160(coin->taddr,&addrtype,rmd160,address);
-        bitcoin_address(checkaddr,coin->taddr,addrtype,rmd160,20);
+        bitcoin_addr2rmd160(symbol,coin->taddr,&addrtype,rmd160,address);
+        bitcoin_address(symbol,checkaddr,coin->taddr,addrtype,rmd160,20);
         if ( addrtype != coin->pubtype && addrtype != coin->p2shtype )
         {
             jadd(retjson,"isvalid",cJSON_CreateFalse());
@@ -316,7 +316,7 @@ cJSON *LP_validateaddress(char *symbol,char *address)
             strcat(script,"88ac");
             jaddstr(retjson,"scriptPubKey",script);
         }
-        bitcoin_address(coinaddr,coin->taddr,coin->pubtype,G.LP_myrmd160,20);
+        bitcoin_address(symbol,coinaddr,coin->taddr,coin->pubtype,G.LP_myrmd160,20);
         jadd(retjson,"ismine",strcmp(coinaddr,coin->smartaddr) == 0 ? cJSON_CreateTrue() : cJSON_CreateFalse());
         jadd(retjson,"iswatchonly",cJSON_CreateTrue());
         jadd(retjson,"isscript",addrtype == coin->p2shtype ? cJSON_CreateTrue() : cJSON_CreateFalse());
@@ -571,11 +571,14 @@ cJSON *LP_importprivkey(char *symbol,char *wifstr,char *label,int32_t flag)
         return(cJSON_Parse("{\"result\":\"electrum should have local wallet\"}"));
     if ( ctx == 0 )
         ctx = bitcoin_ctx();
-    bitcoin_wif2addr(ctx,coin->wiftaddr,coin->taddr,coin->pubtype,address,wifstr);
+    bitcoin_wif2addr(ctx,symbol,coin->wiftaddr,coin->taddr,coin->pubtype,address,wifstr);
 #ifdef LP_DONT_IMPORTPRIVKEY
-    bitcoin_wif2addr(ctx,coin->wiftaddr,coin->taddr,coin->pubtype,address,wifstr);
+    bitcoin_wif2addr(ctx,symbol,coin->wiftaddr,coin->taddr,coin->pubtype,address,wifstr);
     if ( LP_importaddress(symbol,address) < 0 )
+    {
+        printf("%s importaddress %s from %s failed, isvalid.%d\n",symbol,address,wifstr,bitcoin_validaddress(symbol,coin->taddr,coin->pubtype,coin->p2shtype,address));
         return(cJSON_Parse("{\"error\":\"couldnt import\"}"));
+    }
     else return(cJSON_Parse("{\"result\":\"success\"}"));
 #endif
     if ( (retjson= LP_validateaddress(symbol,address)) != 0 )
@@ -765,7 +768,7 @@ char *LP_signrawtx(char *symbol,bits256 *signedtxidp,int32_t *completedp,cJSON *
                     len >>= 1;
                     data = malloc(len);
                     decode_hex(data,len,hexstr);
-                    *signedtxidp = bits256_doublesha256(0,data,len);
+                    *signedtxidp = bits256_calctxid(coin->symbol,data,len);
                 }
                 //else
                 printf("%s signrawtransaction.(%s) params.(%s)\n",coin->symbol,retstr,paramstr);

iguana/exchanges/LP_scan.c

@@ -453,7 +453,7 @@ int32_t LP_waitmempool(char *symbol,char *coinaddr,bits256 txid,int32_t vout,int
         return(-1);
     }
     expiration = (uint32_t)time(NULL) + duration;
-    while ( 1 )
+    while ( LP_STOP_RECEIVED == 0 )
     {
         if ( LP_gettx_presence(symbol,txid) != 0 )
             numconfirms = 0;

iguana/exchanges/LP_signatures.c

@@ -42,6 +42,7 @@ struct basilisk_request *LP_requestinit(struct basilisk_request *rp,bits256 srch
 cJSON *LP_quotejson(struct LP_quoteinfo *qp)
 {
     double price; cJSON *retjson = cJSON_CreateObject();
+    if ( jobj(retjson,"gui") == 0 )
         jaddstr(retjson,"gui",qp->gui[0] != 0 ? qp->gui : LP_gui);
     jadd64bits(retjson,"aliceid",qp->aliceid);
     jaddnum(retjson,"tradeid",qp->tradeid);
@@ -542,8 +543,8 @@ void LP_notify_pubkeys(void *ctx,int32_t pubsock)
             jaddstr(reqjson,"isLP",LPipaddr);
             if ( strcmp(LPipaddr,LP_myipaddr) == 0 )
                 jaddnum(reqjson,"ismine",1);
-        }
-        else printf("no LPipaddr\n");
+            //printf("notify send isLP.%s ismine.%d\n",LPipaddr,strcmp(LPipaddr,LP_myipaddr) == 0);
+        } else printf("no LPipaddr\n");
     }
     jaddnum(reqjson,"session",G.LP_sessionid);
     LP_reserved_msg(0,"","",zero,jprint(reqjson,1));
@@ -569,7 +570,7 @@ char *LP_notify_recv(cJSON *argjson)
                     G.LP_IAMLP = 1;
                 }
             }
-            LP_addpeer(LP_mypeer,LP_mypubsock,ipaddr,RPC_port,RPC_port+10,RPC_port+20,1,juint(argjson,"session"));
+            LP_addpeer(LP_mypeer,LP_mypubsock,ipaddr,RPC_port,RPC_port+10,RPC_port+20,1,juint(argjson,"session"),G.netid);
         }
         //char str[65]; printf("%.3f NOTIFIED pub %s rmd160 %s\n",OS_milliseconds()-millis,bits256_str(str,pub),rmd160str);
     }
@@ -676,6 +677,7 @@ void LP_query(void *ctx,char *myipaddr,int32_t mypubsock,char *method,struct LP_
         memset(&zero,0,sizeof(zero));
         LP_reserved_msg(1,qp->srccoin,qp->destcoin,zero,clonestr(msg));
         //if ( strcmp(method,"request") == 0 )
+        if ( 0 )
         {
             sleep(1);
             LP_reserved_msg(1,qp->srccoin,qp->destcoin,zero,clonestr(msg));

iguana/exchanges/LP_socket.c

@@ -433,7 +433,9 @@ cJSON *electrum_submit(char *symbol,struct electrum_info *ep,cJSON **retjsonp,ch
             if ( *retjsonp == 0 || jobj(*retjsonp,"error") != 0 )
             {
                 if ( ++ep->numerrors >= LP_ELECTRUM_MAXERRORS )
-                    electrum_kickstart(ep);
+                {
+                    // electrum_kickstart(ep); seems to hurt more than help
+                }
             } else if ( ep->numerrors > 0 )
                 ep->numerrors--;
             if ( ep->prev == 0 )

iguana/exchanges/LP_stats.c

@@ -101,9 +101,12 @@ void LP_tradecommand_log(cJSON *argjson)
     static FILE *logfp; char *jsonstr;
     if ( logfp == 0 )
     {
+#ifndef _WIN32
         if ( (logfp= fopen(LP_STATSLOG_FNAME,"rb+")) != 0 )
             fseek(logfp,0,SEEK_END);
-        else logfp = fopen(LP_STATSLOG_FNAME,"wb");
+        else
+#endif
+            logfp = fopen(LP_STATSLOG_FNAME,"wb");
     }
     if ( logfp != 0 )
     {
@@ -198,9 +201,11 @@ int32_t LP_statslog_parse()
 struct LP_swapstats *LP_swapstats_find(uint64_t aliceid)
 {
     struct LP_swapstats *sp;
+    portable_mutex_lock(&LP_statslogmutex);
     HASH_FIND(hh,LP_RTstats,&aliceid,sizeof(aliceid),sp);
     if ( sp == 0 )
         HASH_FIND(hh,LP_swapstats,&aliceid,sizeof(aliceid),sp);
+    portable_mutex_unlock(&LP_statslogmutex);
     return(sp);
 }
 
@@ -211,9 +216,11 @@ struct LP_swapstats *LP_swapstats_add(uint64_t aliceid,int32_t RTflag)
     {
         sp = calloc(1,sizeof(*sp));
         sp->aliceid = aliceid;
+        portable_mutex_lock(&LP_statslogmutex);
         if ( RTflag != 0 )
             HASH_ADD(hh,LP_RTstats,aliceid,sizeof(aliceid),sp);
         else HASH_ADD(hh,LP_swapstats,aliceid,sizeof(aliceid),sp);
+        portable_mutex_unlock(&LP_statslogmutex);
     }
     return(LP_swapstats_find(aliceid));
 }
@@ -739,8 +746,10 @@ cJSON *LP_statslog_disp(uint32_t starttime,uint32_t endtime,char *refgui,bits256
     {
         if ( LP_stats_dispiter(array,sp,starttime,endtime,refbase,refrel,refgui,refpubkey) > 0 )
         {
+            portable_mutex_lock(&LP_statslogmutex);
             HASH_DELETE(hh,LP_RTstats,sp);
             HASH_ADD(hh,LP_swapstats,aliceid,sizeof(sp->aliceid),sp);
+            portable_mutex_unlock(&LP_statslogmutex);
         }
         else
         {

iguana/exchanges/LP_swap.c

@@ -596,7 +596,7 @@ int32_t LP_rawtx_spendscript(struct basilisk_swap *swap,int32_t height,struct ba
         memcpy(rawtx->redeemscript,&data[datalen],rawtx->I.redeemlen);
         //for (i=0; i<rawtx->I.redeemlen; i++)
         //    printf("%02x",rawtx->redeemscript[i]);
-        bitcoin_address(redeemaddr,coin->taddr,coin->p2shtype,rawtx->redeemscript,rawtx->I.redeemlen);
+        bitcoin_address(coin->symbol,redeemaddr,coin->taddr,coin->p2shtype,rawtx->redeemscript,rawtx->I.redeemlen);
         //printf(" received redeemscript.(%s) %s taddr.%d\n",redeemaddr,coin->symbol,coin->taddr);
         LP_swap_coinaddr(coin,checkaddr,0,data,datalen,0);
         if ( strcmp(redeemaddr,checkaddr) != 0 )
@@ -624,7 +624,7 @@ int32_t LP_rawtx_spendscript(struct basilisk_swap *swap,int32_t height,struct ba
     }
     if ( recvlen != datalen+rawtx->I.redeemlen+75 )
         printf("RECVLEN %d != %d + %d\n",recvlen,datalen,rawtx->I.redeemlen);
-    txid = bits256_doublesha256(0,data,datalen);
+    txid = bits256_calctxid(coin->symbol,data,datalen);
     char str[65]; printf("rawtx.%s txid %s\n",rawtx->name,bits256_str(str,txid));
     if ( bits256_cmp(txid,rawtx->I.actualtxid) != 0 && bits256_nonz(rawtx->I.actualtxid) == 0 )
         rawtx->I.actualtxid = txid;
@@ -662,7 +662,7 @@ int32_t LP_rawtx_spendscript(struct basilisk_swap *swap,int32_t height,struct ba
                         char str[65];
                         LP_swap_coinaddr(coin,rawtx->p2shaddr,0,data,datalen,0);
                         printf("got %s txid.%s (%s) -> %s\n",rawtx->name,bits256_str(str,rawtx->I.signedtxid),jprint(txobj,0),rawtx->p2shaddr);
-                    } else bitcoin_address(rawtx->p2shaddr,coin->taddr,coin->p2shtype,rawtx->spendscript,hexlen);
+                    } else bitcoin_address(coin->symbol,rawtx->p2shaddr,coin->taddr,coin->p2shtype,rawtx->spendscript,hexlen);
                 }
             } else printf("%s satoshis %.8f ERROR.(%s) txfees.[%.8f %.8f: %.8f] amount.%.8f -> %.8f\n",rawtx->name,dstr(j64bits(vout,"satoshis")),jprint(txobj,0),dstr(swap->I.Atxfee),dstr(swap->I.Btxfee),dstr(txfee),dstr(rawtx->I.amount),dstr(rawtx->I.amount)-dstr(txfee));
         }
@@ -1019,13 +1019,13 @@ void basilisk_rawtx_setparms(char *name,uint32_t quoteid,struct basilisk_rawtx *
         if ( strcmp(coin->symbol,"BTC") == 0 && (quoteid % 10) == 0 )
             decode_hex(rawtx->I.rmd160,20,TIERNOLAN_RMD160);
         else decode_hex(rawtx->I.rmd160,20,INSTANTDEX_RMD160);
-        bitcoin_address(rawtx->I.destaddr,coin->taddr,coin->pubtype,rawtx->I.rmd160,20);
+        bitcoin_address(coin->symbol,rawtx->I.destaddr,coin->taddr,coin->pubtype,rawtx->I.rmd160,20);
     }
     if ( pubkey33 != 0 )
     {
         memcpy(rawtx->I.pubkey33,pubkey33,33);
-        bitcoin_address(rawtx->I.destaddr,coin->taddr,coin->pubtype,rawtx->I.pubkey33,33);
-        bitcoin_addr2rmd160(coin->taddr,&rawtx->I.addrtype,rawtx->I.rmd160,rawtx->I.destaddr);
+        bitcoin_address(coin->symbol,rawtx->I.destaddr,coin->taddr,coin->pubtype,rawtx->I.pubkey33,33);
+        bitcoin_addr2rmd160(coin->symbol,coin->taddr,&rawtx->I.addrtype,rawtx->I.rmd160,rawtx->I.destaddr);
     }
     if ( rawtx->I.vouttype <= 1 && rawtx->I.destaddr[0] != 0 )
     {

iguana/exchanges/LP_transaction.c

@@ -45,10 +45,10 @@ int32_t LP_privkeyadd(bits256 privkey,uint8_t rmd160[20])
     return(G.LP_numprivkeys);
 }
 
-bits256 LP_privkey(char *coinaddr,uint8_t taddr)
+bits256 LP_privkey(char *symbol,char *coinaddr,uint8_t taddr)
 {
     bits256 privkey; uint8_t addrtype,rmd160[20];
-    bitcoin_addr2rmd160(taddr,&addrtype,rmd160,coinaddr);
+    bitcoin_addr2rmd160(symbol,taddr,&addrtype,rmd160,coinaddr);
     privkey = LP_privkeyfind(rmd160);
     return(privkey);
 }
@@ -88,7 +88,7 @@ bits256 LP_broadcast(char *txname,char *symbol,char *txbytes,bits256 expectedtxi
         len = (int32_t)strlen(txbytes) >> 1;
         ptr = malloc(len);
         decode_hex(ptr,len,txbytes);
-        expectedtxid = bits256_doublesha256(0,ptr,len);
+        expectedtxid = bits256_calctxid(symbol,ptr,len);
         free(ptr);
     }
     for (i=0; i<2; i++)
@@ -149,7 +149,7 @@ bits256 LP_broadcast_tx(char *name,char *symbol,uint8_t *data,int32_t datalen)
     {
         signedtx = malloc(datalen*2 + 1);
         init_hexbytes_noT(signedtx,data,datalen);
-        txid = bits256_doublesha256(0,data,datalen);
+        txid = bits256_calctxid(symbol,data,datalen);
 #ifdef BASILISK_DISABLESENDTX
         char str[65]; printf("%s <- dont sendrawtransaction (%s) %s\n",name,bits256_str(str,txid),signedtx);
 #else
@@ -324,7 +324,7 @@ int32_t iguana_interpreter(struct iguana_info *coin,cJSON *logarray,int64_t nLoc
     return(0);
 }
 
-bits256 iguana_str2priv(uint8_t wiftaddr,char *str)
+bits256 iguana_str2priv(char *symbol,uint8_t wiftaddr,char *str)
 {
     bits256 privkey; int32_t n; uint8_t addrtype; //struct iguana_waccount *wacct=0; struct iguana_waddress *waddr;
     memset(&privkey,0,sizeof(privkey));
@@ -333,7 +333,7 @@ bits256 iguana_str2priv(uint8_t wiftaddr,char *str)
         n = (int32_t)strlen(str) >> 1;
         if ( n == sizeof(bits256) && is_hexstr(str,sizeof(bits256)) > 0 )
             decode_hex(privkey.bytes,sizeof(privkey),str);
-        else if ( bitcoin_wif2priv(wiftaddr,&addrtype,&privkey,str) != sizeof(bits256) )
+        else if ( bitcoin_wif2priv(symbol,wiftaddr,&addrtype,&privkey,str) != sizeof(bits256) )
         {
             //if ( (waddr= iguana_waddresssearch(&wacct,str)) != 0 )
             //    privkey = waddr->privkey;
@@ -343,7 +343,7 @@ bits256 iguana_str2priv(uint8_t wiftaddr,char *str)
     return(privkey);
 }
 
-int32_t iguana_vininfo_create(uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,uint8_t isPoS,uint8_t *serialized,int32_t maxsize,struct iguana_msgtx *msgtx,cJSON *vins,int32_t numinputs,struct vin_info *V)
+int32_t iguana_vininfo_create(char *symbol,uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,uint8_t isPoS,uint8_t *serialized,int32_t maxsize,struct iguana_msgtx *msgtx,cJSON *vins,int32_t numinputs,struct vin_info *V)
 {
     int32_t i,plen,finalized = 1,len = 0; struct vin_info *vp; //struct iguana_waccount *wacct; struct iguana_waddress *waddr; uint32_t sigsize,pubkeysize,p2shsize,userdatalen;
     msgtx->tx_in = numinputs;
@@ -375,9 +375,9 @@ int32_t iguana_vininfo_create(uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,uin
             {
                 memcpy(vp->spendscript,msgtx->vins[i].spendscript,msgtx->vins[i].spendlen);
                 vp->spendlen = msgtx->vins[i].spendlen;
-                _iguana_calcrmd160(taddr,pubtype,p2shtype,vp);
+                _iguana_calcrmd160(symbol,taddr,pubtype,p2shtype,vp);
                 if ( (plen= bitcoin_pubkeylen(vp->signers[0].pubkey)) > 0 )
-                    bitcoin_address(vp->coinaddr,taddr,pubtype,vp->signers[0].pubkey,plen);
+                    bitcoin_address(symbol,vp->coinaddr,taddr,pubtype,vp->signers[0].pubkey,plen);
             }
             if ( vp->M == 0 && vp->N == 0 )
                 vp->M = vp->N = 1;
@@ -523,7 +523,7 @@ int32_t iguana_signrawtransaction(void *ctx,char *symbol,uint8_t wiftaddr,uint8_
                         privkeystr = jstr(item,0);
                         if ( privkeystr == 0 || privkeystr[0] == 0 )
                             continue;
-                        privkeys[i] = privkey = iguana_str2priv(wiftaddr,privkeystr);
+                        privkeys[i] = privkey = iguana_str2priv(symbol,wiftaddr,privkeystr);
                         bitcoin_pubkey33(ctx,pubkeys[i],privkey);
                         //if ( bits256_nonz(privkey) != 0 )
                         //    iguana_ensure_privkey(coin,privkey);
@@ -545,8 +545,8 @@ int32_t iguana_signrawtransaction(void *ctx,char *symbol,uint8_t wiftaddr,uint8_
                         {
                             //for (j=0; j<msgtx->vins[i].p2shlen; j++)
                             //    printf("%02x",msgtx->vins[i].redeemscript[j]);
-                            bitcoin_address(coinaddr,taddr,p2shtype,msgtx->vins[i].redeemscript,msgtx->vins[i].p2shlen);
-                            type = iguana_calcrmd160(taddr,pubtype,p2shtype,0,&mvin,msgtx->vins[i].redeemscript,msgtx->vins[i].p2shlen,zero,0,0);
+                            bitcoin_address(symbol,coinaddr,taddr,p2shtype,msgtx->vins[i].redeemscript,msgtx->vins[i].p2shlen);
+                            type = iguana_calcrmd160(symbol,taddr,pubtype,p2shtype,0,&mvin,msgtx->vins[i].redeemscript,msgtx->vins[i].p2shlen,zero,0,0);
                             for (j=0; j<mvin.N; j++)
                             {
                                 if ( V->suppress_pubkeys == 0 )
@@ -596,7 +596,7 @@ int32_t iguana_signrawtransaction(void *ctx,char *symbol,uint8_t wiftaddr,uint8_
                         }
                     }
                 }
-                finalized = iguana_vininfo_create(taddr,pubtype,p2shtype,isPoS,serialized2,maxsize,msgtx,vins,numinputs,V);
+                finalized = iguana_vininfo_create(symbol,taddr,pubtype,p2shtype,isPoS,serialized2,maxsize,msgtx,vins,numinputs,V);
                 //printf("finalized.%d ignore_cltverr.%d suppress.%d\n",finalized,V[0].ignore_cltverr,V[0].suppress_pubkeys);
                 sighash = LP_sighash(symbol,zcash);
                 if ( (complete= bitcoin_verifyvins(ctx,symbol,taddr,pubtype,p2shtype,isPoS,height,signedtxidp,&signedtx,msgtx,serialized3,maxsize,V,sighash,1,V->suppress_pubkeys,zcash)) > 0 && signedtx != 0 )
@@ -746,8 +746,6 @@ char *basilisk_swap_bobtxspend(bits256 *signedtxidp,uint64_t txfee,char *name,ch
 {
     char *rawtxbytes=0,*signedtx=0,str[65],tmpaddr[64],hexstr[999],wifstr[128],_destaddr[64]; uint8_t spendscript[512],addrtype,rmd160[20]; cJSON *txobj,*vins,*obj,*vouts,*item,*privkeys; int32_t completed,spendlen,n,ignore_cltverr=1; struct vin_info V[8]; uint32_t timestamp,locktime = 0,sequenceid = 0xffffffff * finalseqid; bits256 txid; uint64_t value=0,change = 0; struct iguana_msgtx msgtx; struct iguana_info *coin;
     LP_mark_spent(symbol,utxotxid,utxovout);
-    if ( txfee > 0 && txfee < 10000 )
-        txfee = 10000;
     *destamountp = 0;
     memset(signedtxidp,0,sizeof(*signedtxidp));
     if ( finalseqid == 0 )
@@ -758,6 +756,8 @@ char *basilisk_swap_bobtxspend(bits256 *signedtxidp,uint64_t txfee,char *name,ch
     value = 0;
     if ( (coin= LP_coinfind(symbol)) != 0 )
     {
+        if ( txfee > 0 && txfee < coin->txfee )
+            txfee = coin->txfee;
 #ifndef BASILISK_DISABLESENDTX
         if ( (txobj= LP_gettx(symbol,utxotxid,0)) != 0 )
         {
@@ -776,6 +776,8 @@ char *basilisk_swap_bobtxspend(bits256 *signedtxidp,uint64_t txfee,char *name,ch
         }
 #endif
     }
+    if ( txfee > 0 && txfee < LP_MIN_TXFEE )
+        txfee = LP_MIN_TXFEE;
     if ( satoshis != 0 )
     {
         if ( value < satoshis+txfee )
@@ -823,13 +825,13 @@ char *basilisk_swap_bobtxspend(bits256 *signedtxidp,uint64_t txfee,char *name,ch
     {
         V[0].signers[1].privkey = *privkey2p;
         bitcoin_pubkey33(ctx,V[0].signers[1].pubkey,*privkey2p);
-        bitcoin_priv2wif(wiftaddr,wifstr,*privkey2p,wiftype);
+        bitcoin_priv2wif(symbol,wiftaddr,wifstr,*privkey2p,wiftype);
         jaddistr(privkeys,wifstr);
         V[0].N = V[0].M = 2;
     } else V[0].N = V[0].M = 1;
     V[0].signers[0].privkey = privkey;
     bitcoin_pubkey33(ctx,V[0].signers[0].pubkey,privkey);
-    bitcoin_priv2wif(wiftaddr,wifstr,privkey,wiftype);
+    bitcoin_priv2wif(symbol,wiftaddr,wifstr,privkey,wiftype);
     jaddistr(privkeys,wifstr);
     V[0].suppress_pubkeys = suppress_pubkeys;
     V[0].ignore_cltverr = ignore_cltverr;
@@ -847,14 +849,14 @@ char *basilisk_swap_bobtxspend(bits256 *signedtxidp,uint64_t txfee,char *name,ch
     }
     jaddbits256(item,"txid",utxotxid);
     jaddnum(item,"vout",utxovout);
-    bitcoin_address(tmpaddr,taddr,pubtype,pubkey33,33);
-    bitcoin_addr2rmd160(taddr,&addrtype,rmd160,tmpaddr);
+    bitcoin_address(symbol,tmpaddr,taddr,pubtype,pubkey33,33);
+    bitcoin_addr2rmd160(symbol,taddr,&addrtype,rmd160,tmpaddr);
     if ( redeemlen != 0 )
     {
         init_hexbytes_noT(hexstr,redeemscript,redeemlen);
         jaddstr(item,"redeemScript",hexstr);
         if ( vinaddr != 0 )
-            bitcoin_addr2rmd160(taddr,&addrtype,rmd160,vinaddr);
+            bitcoin_addr2rmd160(symbol,taddr,&addrtype,rmd160,vinaddr);
         spendlen = bitcoin_p2shspend(spendscript,0,rmd160);
         //printf("P2SH path.%s\n",vinaddr!=0?vinaddr:0);
     } else spendlen = bitcoin_standardspend(spendscript,0,rmd160);
@@ -868,9 +870,9 @@ char *basilisk_swap_bobtxspend(bits256 *signedtxidp,uint64_t txfee,char *name,ch
     if ( destaddr == 0 )
     {
         destaddr = _destaddr;
-        bitcoin_address(destaddr,taddr,pubtype,pubkey33,33);
+        bitcoin_address(symbol,destaddr,taddr,pubtype,pubkey33,33);
     }
-    bitcoin_addr2rmd160(taddr,&addrtype,rmd160,destaddr);
+    bitcoin_addr2rmd160(symbol,taddr,&addrtype,rmd160,destaddr);
     if ( addrtype == p2shtype )
         spendlen = bitcoin_p2shspend(spendscript,0,rmd160);
     else spendlen = bitcoin_standardspend(spendscript,0,rmd160);
@@ -884,11 +886,11 @@ char *basilisk_swap_bobtxspend(bits256 *signedtxidp,uint64_t txfee,char *name,ch
     if ( change != 0 )
     {
         int32_t changelen; uint8_t changescript[1024],changetype,changermd160[20];
-        bitcoin_addr2rmd160(taddr,&changetype,changermd160,changeaddr);
+        bitcoin_addr2rmd160(symbol,taddr,&changetype,changermd160,changeaddr);
         changelen = bitcoin_standardspend(changescript,0,changermd160);
         txobj = bitcoin_txoutput(txobj,changescript,changelen,change);
     }
-    if ( (rawtxbytes= bitcoin_json2hex(isPoS,&txid,txobj,V)) != 0 )
+    if ( (rawtxbytes= bitcoin_json2hex(symbol,isPoS,&txid,txobj,V)) != 0 )
     {
         char str[65];
         completed = 0;
@@ -978,6 +980,21 @@ cJSON *LP_inputjson(bits256 txid,int32_t vout,char *spendscriptstr)
     return(item);
 }
 
+int64_t LP_hodlcoin_interest(int32_t coinheight,int32_t utxoheight,bits256 txid,int64_t nValue)
+{
+    int64_t interest = 0; int32_t minutes,htdiff;
+    if ( coinheight > utxoheight )
+    {
+        htdiff = (coinheight - utxoheight);
+        if ( htdiff > 16830 )
+            htdiff = 16830;
+        minutes = (htdiff * 154) / 60;
+        interest = nValue * htdiff * 0.000000238418;
+        //interest = ((nValue * minutes) / 10743920);
+    }
+    return(interest);
+}
+
 uint64_t _komodo_interestnew(uint64_t nValue,uint32_t nLockTime,uint32_t tiptime)
 {
     int32_t minutes; uint64_t interest = 0;
@@ -1013,7 +1030,7 @@ int32_t LP_vins_select(void *ctx,struct iguana_info *coin,int64_t *totalp,int64_
     *totalp = 0;
     interestsum = 0;
     init_hexbytes_noT(spendscriptstr,script,scriptlen);
-    bitcoin_priv2wif(coin->wiftaddr,wifstr,privkey,coin->wiftype);
+    bitcoin_priv2wif(coin->symbol,coin->wiftaddr,wifstr,privkey,coin->wiftype);
     n = 0;
     min0 = min1 = 0;
     memset(preselected,0,sizeof(preselected));
@@ -1141,6 +1158,14 @@ int32_t LP_vins_select(void *ctx,struct iguana_info *coin,int64_t *totalp,int64_
                 char str[65]; printf("%s/%d %.8f interest %.8f -> sum %.8f\n",bits256_str(str,up->U.txid),up->U.vout,dstr(up->U.value),dstr(interest),dstr(interestsum));
             }
         }
+        else if ( strcmp(coin->symbol,"HODLC") == 0 )
+        {
+            if ( (interest= LP_hodlcoin_interest(coin->height,up->U.height,up->U.txid,up->U.value)) > 0 )
+            {
+                interestsum += interest;
+                char str[65]; printf("%s/%d %.8f hodl interest %.8f -> sum %.8f\n",bits256_str(str,up->U.txid),up->U.vout,dstr(up->U.value),dstr(interest),dstr(interestsum));
+            }
+        }
         printf("numunspents.%d vini.%d value %.8f, total %.8f remains %.8f interest %.8f sum %.8f %s/v%d\n",numunspents,n,dstr(up->U.value),dstr(total),dstr(remains),dstr(interest),dstr(interestsum),bits256_str(str,up->U.txid),up->U.vout);
         vp = &V[n++];
         vp->N = vp->M = 1;
@@ -1258,7 +1283,7 @@ char *LP_createrawtransaction(cJSON **txobjp,int32_t *numvinsp,struct iguana_inf
                 free_json(txobj);
                 return(0);
             }
-            bitcoin_addr2rmd160(coin->taddr,&addrtype,rmd160,coinaddr);
+            bitcoin_addr2rmd160(coin->symbol,coin->taddr,&addrtype,rmd160,coinaddr);
             if ( addrtype == coin->pubtype )
                 spendlen = bitcoin_standardspend(spendscript,0,rmd160);
             else spendlen = bitcoin_p2shspend(spendscript,0,rmd160);
@@ -1284,7 +1309,7 @@ char *LP_createrawtransaction(cJSON **txobjp,int32_t *numvinsp,struct iguana_inf
     }
     if ( change != 0 )
         txobj = bitcoin_txoutput(txobj,script,scriptlen,change);
-    if ( (rawtxbytes= bitcoin_json2hex(coin->isPoS,&txid,txobj,V)) != 0 )
+    if ( (rawtxbytes= bitcoin_json2hex(coin->symbol,coin->isPoS,&txid,txobj,V)) != 0 )
     {
     } else printf("error making rawtx suppress.%d\n",suppress_pubkeys);
     *txobjp = txobj;
@@ -1312,14 +1337,14 @@ char *LP_withdraw(struct iguana_info *coin,cJSON *argjson)
     {
         autofee = 1;
         txfee = coin->txfee;
-        if ( txfee > 0 && txfee < 10000 )
-            txfee = 10000;
+        if ( txfee > 0 && txfee < LP_MIN_TXFEE )
+            txfee = LP_MIN_TXFEE;
     } else autofee = 0;
     suppress_pubkeys = 0;
     memset(signedtxid.bytes,0,sizeof(signedtxid));
     safecopy(changeaddr,coin->smartaddr,sizeof(changeaddr));
     safecopy(vinaddr,coin->smartaddr,sizeof(vinaddr));
-    privkey = LP_privkey(vinaddr,coin->taddr);
+    privkey = LP_privkey(coin->symbol,vinaddr,coin->taddr);
     maxV = LP_MAXVINS;
     V = malloc(maxV * sizeof(*V));
     for (iter=0; iter<2; iter++)
@@ -1437,7 +1462,7 @@ int32_t basilisk_rawtx_gen(void *ctx,char *str,uint32_t swapstarted,uint8_t *pub
     }
     free_json(argjson);
     return(retval);
-#ifdef old
+/*#ifdef old
     int32_t retval=-1,iter; char *signedtx,*changeaddr = 0,_changeaddr[64]; struct iguana_info *coin; int64_t newtxfee=0,destamount;
     char str2[65]; printf("%s rawtxgen.(%s/v%d)\n",rawtx->name,bits256_str(str2,rawtx->utxotxid),rawtx->utxovout);
     if ( (coin= rawtx->coin) == 0 )
@@ -1472,7 +1497,7 @@ int32_t basilisk_rawtx_gen(void *ctx,char *str,uint32_t swapstarted,uint8_t *pub
             break;
     }
     return(retval);
-#endif
+#endif*/
 }
 
 int32_t basilisk_rawtx_sign(char *symbol,uint8_t wiftaddr,uint8_t taddr,uint8_t pubtype,uint8_t p2shtype,uint8_t isPoS,uint8_t wiftype,struct basilisk_swap *swap,struct basilisk_rawtx *dest,struct basilisk_rawtx *rawtx,bits256 privkey,bits256 *privkey2,uint8_t *userdata,int32_t userdatalen,int32_t ignore_cltverr,uint8_t *changermd160,char *vinaddr,int32_t zcash)
@@ -1488,7 +1513,7 @@ int32_t basilisk_rawtx_sign(char *symbol,uint8_t wiftaddr,uint8_t taddr,uint8_t
     if ( changermd160 != 0 )
     {
         changeaddr = _changeaddr;
-        bitcoin_address(changeaddr,taddr,pubtype,changermd160,20);
+        bitcoin_address(symbol,changeaddr,taddr,pubtype,changermd160,20);
         //printf("changeaddr.(%s)\n",changeaddr);
     }
     for (iter=0; iter<2; iter++)
@@ -1513,7 +1538,7 @@ int32_t basilisk_rawtx_sign(char *symbol,uint8_t wiftaddr,uint8_t taddr,uint8_t
     //return(_basilisk_rawtx_sign(symbol,pubtype,p2shtype,isPoS,wiftype,swap,timestamp,locktime,sequenceid,dest,rawtx,privkey,privkey2,userdata,userdatalen,ignore_cltverr));
 }
 
-int32_t basilisk_alicescript(uint8_t *redeemscript,int32_t *redeemlenp,uint8_t *script,int32_t n,char *msigaddr,uint8_t taddr,uint8_t altps2h,bits256 pubAm,bits256 pubBn)
+int32_t basilisk_alicescript(char *symbol,uint8_t *redeemscript,int32_t *redeemlenp,uint8_t *script,int32_t n,char *msigaddr,uint8_t taddr,uint8_t altps2h,bits256 pubAm,bits256 pubBn)
 {
     uint8_t p2sh160[20]; struct vin_info V;
     memset(&V,0,sizeof(V));
@@ -1521,7 +1546,7 @@ int32_t basilisk_alicescript(uint8_t *redeemscript,int32_t *redeemlenp,uint8_t *
     memcpy(&V.signers[1].pubkey[1],pubBn.bytes,sizeof(pubBn)), V.signers[1].pubkey[0] = 0x03;
     V.M = V.N = 2;
     *redeemlenp = bitcoin_MofNspendscript(p2sh160,redeemscript,n,&V);
-    bitcoin_address(msigaddr,taddr,altps2h,p2sh160,sizeof(p2sh160));
+    bitcoin_address(symbol,msigaddr,taddr,altps2h,p2sh160,sizeof(p2sh160));
     n = bitcoin_p2shspend(script,0,p2sh160);
     //for (i=0; i<*redeemlenp; i++)
     //    printf("%02x",redeemscript[i]);
@@ -1539,7 +1564,7 @@ char *basilisk_swap_Aspend(char *name,char *symbol,uint64_t Atxfee,uint8_t wifta
         //char str[65];
         //printf("pubAm.(%s)\n",bits256_str(str,pubAm));
         //printf("pubBn.(%s)\n",bits256_str(str,pubBn));
-        spendlen = basilisk_alicescript(redeemscript,&redeemlen,spendscript,0,msigaddr,taddr,p2shtype,pubAm,pubBn);
+        spendlen = basilisk_alicescript(symbol,redeemscript,&redeemlen,spendscript,0,msigaddr,taddr,p2shtype,pubAm,pubBn);
         if ( (txfee= Atxfee) == 0 )
         {
             if ( (txfee= LP_getestimatedrate(LP_coinfind(symbol)) * LP_AVETXSIZE) < LP_MIN_TXFEE )
@@ -1670,7 +1695,7 @@ bits256 LP_swap_spendtxid(char *symbol,char *destaddr,bits256 utxotxid,int32_t u
                                 if ( utxovout == jint(vin,"vout") && bits256_cmp(vintxid,utxotxid) == 0 )
                                 {
                                     LP_txdestaddr(destaddr,txid,0,txobj);
-                                    char str[65],str2[65],str3[65]; printf("LP_swap_spendtxid: found %s/v%d spends %s vs %s/v%d found.%d destaddr.(%s)\n",bits256_str(str,txid),j,bits256_str(str2,vintxid),bits256_str(str3,utxotxid),utxovout,bits256_cmp(vintxid,utxotxid) == 0,destaddr);
+                                    //char str[65],str2[65],str3[65]; printf("LP_swap_spendtxid: found %s/v%d spends %s vs %s/v%d found.%d destaddr.(%s)\n",bits256_str(str,txid),j,bits256_str(str2,vintxid),bits256_str(str3,utxotxid),utxovout,bits256_cmp(vintxid,utxotxid) == 0,destaddr);
                                     spendtxid = txid;
                                     break;
                                 }
@@ -1881,13 +1906,13 @@ int32_t basilisk_bobscripts_set(struct basilisk_swap *swap,int32_t depositflag,i
     int32_t j; char coinaddr[64],checkaddr[64]; struct iguana_info *coin;
     if ( (coin= LP_coinfind(swap->I.bobstr)) != 0 )
     {
-        bitcoin_address(coinaddr,coin->taddr,coin->pubtype,swap->changermd160,20);
+        bitcoin_address(coin->symbol,coinaddr,coin->taddr,coin->pubtype,swap->changermd160,20);
         if ( genflag != 0 && swap->I.iambob == 0 )
             printf("basilisk_bobscripts_set WARNING: alice generating BOB tx\n");
         if ( depositflag == 0 )
         {
             swap->bobpayment.I.spendlen = basilisk_bobscript(swap->bobpayment.I.rmd160,swap->bobpayment.redeemscript,&swap->bobpayment.I.redeemlen,swap->bobpayment.spendscript,0,&swap->bobpayment.I.locktime,&swap->bobpayment.I.secretstart,&swap->I,0);
-            bitcoin_address(swap->bobpayment.p2shaddr,coin->taddr,coin->p2shtype,swap->bobpayment.redeemscript,swap->bobpayment.I.redeemlen);
+            bitcoin_address(coin->symbol,swap->bobpayment.p2shaddr,coin->taddr,coin->p2shtype,swap->bobpayment.redeemscript,swap->bobpayment.I.redeemlen);
             strcpy(swap->bobpayment.I.destaddr,swap->bobpayment.p2shaddr);
             //LP_importaddress(coin->symbol,swap->bobpayment.I.destaddr);
             //int32_t i; for (i=0; i<swap->bobpayment.I.redeemlen; i++)
@@ -1925,7 +1950,7 @@ int32_t basilisk_bobscripts_set(struct basilisk_swap *swap,int32_t depositflag,i
         else
         {
             swap->bobdeposit.I.spendlen = basilisk_bobscript(swap->bobdeposit.I.rmd160,swap->bobdeposit.redeemscript,&swap->bobdeposit.I.redeemlen,swap->bobdeposit.spendscript,0,&swap->bobdeposit.I.locktime,&swap->bobdeposit.I.secretstart,&swap->I,1);
-            bitcoin_address(swap->bobdeposit.p2shaddr,coin->taddr,coin->p2shtype,swap->bobdeposit.redeemscript,swap->bobdeposit.I.redeemlen);
+            bitcoin_address(coin->symbol,swap->bobdeposit.p2shaddr,coin->taddr,coin->p2shtype,swap->bobdeposit.redeemscript,swap->bobdeposit.I.redeemlen);
             strcpy(swap->bobdeposit.I.destaddr,swap->bobdeposit.p2shaddr);
             //int32_t i; for (i=0; i<swap->bobdeposit.I.redeemlen; i++)
             //    printf("%02x",swap->bobdeposit.redeemscript[i]);
@@ -1959,7 +1984,7 @@ int32_t basilisk_bobscripts_set(struct basilisk_swap *swap,int32_t depositflag,i
     return(0);
 }
 
-/**/
+/*
 
 #ifdef old
 int32_t basilisk_alicepayment_spend(struct basilisk_swap *swap,struct basilisk_rawtx *dest)
@@ -1990,13 +2015,13 @@ int32_t basilisk_alicepayment_spend(struct basilisk_swap *swap,struct basilisk_r
     }
     return(-1);
 }
-#endif
+#endif*/
 
 void basilisk_alicepayment(struct basilisk_swap *swap,struct iguana_info *coin,struct basilisk_rawtx *alicepayment,bits256 pubAm,bits256 pubBn)
 {
     char coinaddr[64];
-    alicepayment->I.spendlen = basilisk_alicescript(alicepayment->redeemscript,&alicepayment->I.redeemlen,alicepayment->spendscript,0,alicepayment->I.destaddr,coin->taddr,coin->p2shtype,pubAm,pubBn);
-    bitcoin_address(coinaddr,coin->taddr,coin->pubtype,swap->changermd160,20);
+    alicepayment->I.spendlen = basilisk_alicescript(coin->symbol,alicepayment->redeemscript,&alicepayment->I.redeemlen,alicepayment->spendscript,0,alicepayment->I.destaddr,coin->taddr,coin->p2shtype,pubAm,pubBn);
+    bitcoin_address(coin->symbol,coinaddr,coin->taddr,coin->pubtype,swap->changermd160,20);
     //printf("%s suppress.%d fee.%d\n",coinaddr,alicepayment->I.suppress_pubkeys,swap->myfee.I.suppress_pubkeys);
     basilisk_rawtx_gen(swap->ctx,"alicepayment",swap->I.started,swap->persistent_pubkey33,0,1,alicepayment,alicepayment->I.locktime,alicepayment->spendscript,alicepayment->I.spendlen,swap->I.Atxfee,1,0,swap->persistent_privkey,swap->changermd160,coinaddr);
 }
@@ -2012,7 +2037,7 @@ int32_t basilisk_alicetxs(int32_t pairsock,struct basilisk_swap *swap,uint8_t *d
             printf("error alice generating payment.%d\n",swap->alicepayment.I.spendlen);
         else
         {
-            bitcoin_address(swap->alicepayment.I.destaddr,coin->taddr,coin->p2shtype,swap->alicepayment.redeemscript,swap->alicepayment.I.redeemlen);
+            bitcoin_address(coin->symbol,swap->alicepayment.I.destaddr,coin->taddr,coin->p2shtype,swap->alicepayment.redeemscript,swap->alicepayment.I.redeemlen);
             //LP_importaddress(coin->symbol,swap->alicepayment.I.destaddr);
             strcpy(swap->alicepayment.p2shaddr,swap->alicepayment.I.destaddr);
             retval = 0;
@@ -2026,7 +2051,7 @@ int32_t basilisk_alicetxs(int32_t pairsock,struct basilisk_swap *swap,uint8_t *d
         if ( swap->myfee.I.datalen == 0 )
         {
             printf("%s generate fee %.8f from.%s\n",coin->symbol,dstr(strcmp(coin->symbol,"BTC") == 0 ? LP_MIN_TXFEE : coin->txfee),coin->smartaddr);
-            bitcoin_address(coinaddr,coin->taddr,coin->pubtype,swap->changermd160,20);
+            bitcoin_address(coin->symbol,coinaddr,coin->taddr,coin->pubtype,swap->changermd160,20);
             if ( basilisk_rawtx_gen(swap->ctx,"myfee",swap->I.started,swap->persistent_pubkey33,swap->I.iambob,1,&swap->myfee,swap->myfee.I.locktime,swap->myfee.spendscript,swap->myfee.I.spendlen,strcmp(coin->symbol,"BTC") == 0 ? LP_MIN_TXFEE : coin->txfee,1,0,swap->persistent_privkey,swap->changermd160,coinaddr) == 0 )
             {
                 printf("rawtxsend %s %.8f\n",coin->symbol,dstr(strcmp(coin->symbol,"BTC") == 0 ? LP_MIN_TXFEE : coin->txfee));
@@ -2118,7 +2143,7 @@ int32_t LP_verify_bobdeposit(struct basilisk_swap *swap,uint8_t *data,int32_t da
             swap->aliceclaim.utxotxid = swap->bobdeposit.I.signedtxid;
             memcpy(swap->I.userdata_aliceclaim,userdata,len);
             swap->I.userdata_aliceclaimlen = len;
-            bitcoin_address(swap->bobdeposit.p2shaddr,coin->taddr,coin->p2shtype,swap->bobdeposit.redeemscript,swap->bobdeposit.I.redeemlen);
+            bitcoin_address(coin->symbol,swap->bobdeposit.p2shaddr,coin->taddr,coin->p2shtype,swap->bobdeposit.redeemscript,swap->bobdeposit.I.redeemlen);
             strcpy(swap->bobdeposit.I.destaddr,swap->bobdeposit.p2shaddr);
             basilisk_dontforget_update(swap,&swap->bobdeposit);
             //int32_t i; char str[65]; for (i=0; i<swap->bobdeposit.I.datalen; i++)
@@ -2130,7 +2155,7 @@ int32_t LP_verify_bobdeposit(struct basilisk_swap *swap,uint8_t *data,int32_t da
             memcpy(swap->aliceclaim.redeemscript,swap->bobdeposit.redeemscript,swap->bobdeposit.I.redeemlen);
             swap->aliceclaim.I.redeemlen = swap->bobdeposit.I.redeemlen;
             memcpy(swap->aliceclaim.I.pubkey33,swap->persistent_pubkey33,33);
-            bitcoin_address(swap->aliceclaim.I.destaddr,coin->taddr,coin->pubtype,swap->persistent_pubkey33,33);
+            bitcoin_address(coin->symbol,swap->aliceclaim.I.destaddr,coin->taddr,coin->pubtype,swap->persistent_pubkey33,33);
             retval = 0;
             if ( (retval= basilisk_rawtx_sign(coin->symbol,coin->wiftaddr,coin->taddr,coin->pubtype,coin->p2shtype,coin->isPoS,coin->wiftype,swap,&swap->aliceclaim,&swap->bobdeposit,swap->I.myprivs[0],0,userdata,len,1,swap->changermd160,swap->bobdeposit.I.destaddr,coin->zcash)) == 0 )
             {
@@ -2158,7 +2183,7 @@ int32_t LP_verify_alicepayment(struct basilisk_swap *swap,uint8_t *data,int32_t
         {
             swap->bobspend.utxovout = 0;
             swap->bobspend.utxotxid = swap->alicepayment.I.signedtxid = LP_broadcast_tx(swap->alicepayment.name,coin->symbol,swap->alicepayment.txbytes,swap->alicepayment.I.datalen);
-            bitcoin_address(swap->alicepayment.p2shaddr,coin->taddr,coin->p2shtype,swap->alicepayment.redeemscript,swap->alicepayment.I.redeemlen);
+            bitcoin_address(coin->symbol,swap->alicepayment.p2shaddr,coin->taddr,coin->p2shtype,swap->alicepayment.redeemscript,swap->alicepayment.I.redeemlen);
             strcpy(swap->alicepayment.I.destaddr,swap->alicepayment.p2shaddr);
             if ( bits256_nonz(swap->alicepayment.I.signedtxid) != 0 )
                 swap->aliceunconf = 1;
@@ -2188,7 +2213,7 @@ int32_t LP_verify_bobpayment(struct basilisk_swap *swap,uint8_t *data,int32_t da
             for (i=0; i<32; i++)
                 revAm.bytes[i] = swap->I.privAm.bytes[31-i];
             len = basilisk_swapuserdata(userdata,revAm,0,swap->I.myprivs[0],swap->bobpayment.redeemscript,swap->bobpayment.I.redeemlen);
-            bitcoin_address(swap->bobpayment.p2shaddr,coin->taddr,coin->p2shtype,swap->bobpayment.redeemscript,swap->bobpayment.I.redeemlen);
+            bitcoin_address(coin->symbol,swap->bobpayment.p2shaddr,coin->taddr,coin->p2shtype,swap->bobpayment.redeemscript,swap->bobpayment.I.redeemlen);
             strcpy(swap->bobpayment.I.destaddr,swap->bobpayment.p2shaddr);
             basilisk_dontforget_update(swap,&swap->bobpayment);
             //LP_importaddress(coin->symbol,swap->bobpayment.I.destaddr);
@@ -2202,9 +2227,9 @@ int32_t LP_verify_bobpayment(struct basilisk_swap *swap,uint8_t *data,int32_t da
             swap->I.userdata_alicespendlen = len;
             retval = 0;
             memcpy(swap->alicespend.I.pubkey33,swap->persistent_pubkey33,33);
-            bitcoin_address(swap->alicespend.I.destaddr,coin->taddr,coin->pubtype,swap->persistent_pubkey33,33);
+            bitcoin_address(coin->symbol,swap->alicespend.I.destaddr,coin->taddr,coin->pubtype,swap->persistent_pubkey33,33);
             //char str[65],str2[65]; printf("bobpaid privAm.(%s) myprivs[0].(%s)\n",bits256_str(str,swap->I.privAm),bits256_str(str2,swap->I.myprivs[0]));
-            if ( (retval= basilisk_rawtx_sign(coin->symbol,coin->wiftaddr,coin->taddr,coin->pubtype,coin->p2shtype,coin->isPoS,coin->wiftype,swap,&swap->alicespend,&swap->bobpayment,swap->I.myprivs[0],0,userdata,len,1,swap->changermd160,swap->alicepayment.I.destaddr,coin->zcash)) == 0 )
+            if ( (retval= basilisk_rawtx_sign(coin->symbol,coin->wiftaddr,coin->taddr,coin->pubtype,coin->p2shtype,coin->isPoS,coin->wiftype,swap,&swap->alicespend,&swap->bobpayment,swap->I.myprivs[0],0,userdata,len,1,swap->changermd160,swap->bobpayment.I.destaddr,coin->zcash)) == 0 )
             {
                 /*for (i=0; i<swap->bobpayment.I.datalen; i++)
                  printf("%02x",swap->bobpayment.txbytes[i]);

iguana/exchanges/LP_utxo.c

@@ -635,8 +635,8 @@ cJSON *LP_balances(char *coinaddr)
                 strcpy(address,coin->smartaddr);
             else
             {
-                bitcoin_addr2rmd160(taddr,&addrtype,rmd160,coinaddr);
-                bitcoin_address(address,coin->taddr,coin->pubtype,rmd160,20);
+                bitcoin_addr2rmd160("KMD",taddr,&addrtype,rmd160,coinaddr);
+                bitcoin_address(coin->symbol,address,coin->taddr,coin->pubtype,rmd160,20);
                 //printf("%s taddr.%d addrtype.%u %s -> %s [%c %c].%d\n",coin->symbol,taddr,addrtype,coinaddr,address,coinaddr[0],coinaddr[1],coinaddr[0] == 't' && (coinaddr[1] == '1' || coinaddr[1] == '3'));
             }
             if ( (retjson= LP_address_balance(coin,address,1)) != 0 )

iguana/exchanges/auto_chipsbtc

@@ -1,2 +1,2 @@
 source userpass
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"base\":\"CHIPS\",\"rel\":\"BTC\",\"margin\":0.05,\"refbase\":\"chips\",\"refrel\":\"coinmarketcap\"}"
+curl --url "http://127.0.0.1:7783" --data "{\"minprice\":0.00002,\"maxprice\":0.0001,\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"base\":\"CHIPS\",\"rel\":\"BTC\",\"margin\":0.05,\"refbase\":\"chips\",\"refrel\":\"coinmarketcap\"}"

iguana/exchanges/auto_chipskmd

@@ -1,2 +1,2 @@
 source userpass
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"base\":\"CHIPS\",\"rel\":\"KMD\",\"margin\":0.05,\"refbase\":\"chips\",\"refrel\":\"coinmarketcap\"}"
+curl --url "http://127.0.0.1:7783" --data "{\"minprice\":0.04,\"maxprice\":0.1,\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"base\":\"CHIPS\",\"rel\":\"KMD\",\"margin\":0.05,\"refbase\":\"chips\",\"refrel\":\"coinmarketcap\"}"

iguana/exchanges/auto_grskmd

@@ -0,0 +1,2 @@
+source userpass
+curl --url "http://127.0.0.1:7783" --data "{\"minprice\":0.05,\"maxprice\":0.2,\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"base\":\"GRS\",\"rel\":\"KMD\",\"margin\":0.05,\"refbase\":\"groestlcoin\",\"refrel\":\"coinmarketcap\"}"

iguana/exchanges/client

@@ -1,9 +1,10 @@
 #!/bin/bash
 source passphrase
 source coins
-pkill -15 marketmaker; 
+./stop
 git pull;
 cd ..; 
 ./m_mm;
+pkill -15 marketmaker; 
 ./marketmaker "{\"gui\":\"nogui\",\"client\":1, \"userhome\":\"/${HOME#"/"}\", \"passphrase\":\"$passphrase\", \"coins\":$coins}" &
 

iguana/exchanges/enable

@@ -1,8 +1,11 @@
 #!/bin/bash
 source userpass
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"enable\",\"coin\":\"BEER\"}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"enable\",\"coin\":\"PIZZA\"}"
 curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"enable\",\"coin\":\"REVS\"}"
 curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"enable\",\"coin\":\"KMD\"}"
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"enable\",\"coin\":\"BTC\"}"
+#curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"enable\",\"coin\":\"BTC\"}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"enable\",\"coin\":\"CHIPS\"}"
 curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"enable\",\"coin\":\"SUPERNET\"}"
 curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"enable\",\"coin\":\"CRYPTO\"}"
 curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"enable\",\"coin\":\"DEX\"}"
@@ -15,6 +18,7 @@ curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\
 curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"enable\",\"coin\":\"JUMBLR\"}"
 curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"enable\",\"coin\":\"HUSH\"}"
 curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"enable\",\"coin\":\"BTCH\"}"
-#curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"electrum\",\"coin\":\"HUSH\",\"ipaddr\":\"173.212.225.176\",\"port\":50013}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"electrum\",\"coin\":\"HUSH\",\"ipaddr\":\"173.212.225.176\",\"port\":50013}"
 #curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"electrum\",\"coin\":\"BTCH\",\"ipaddr\":\"electrum1.cipig.net\",\"port\":10020}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"electrum\",\"coin\":\"BTC\",\"ipaddr\":\"node1.komodo.rocks\",\"port\":50001}"
 

iguana/exchanges/getpeersIP

@@ -1,11 +1,11 @@
 #!/bin/bash
-curl --url "http://5.9.253.195:7783" --data "{\"method\":\"getpeers\"}"
-curl --url "http://5.9.253.196:7783" --data "{\"method\":\"getpeers\"}"
-curl --url "http://5.9.253.197:7783" --data "{\"method\":\"getpeers\"}"
-curl --url "http://5.9.253.198:7783" --data "{\"method\":\"getpeers\"}"
-curl --url "http://5.9.253.199:7783" --data "{\"method\":\"getpeers\"}"
-curl --url "http://5.9.253.200:7783" --data "{\"method\":\"getpeers\"}"
-curl --url "http://5.9.253.201:7783" --data "{\"method\":\"getpeers\"}"
-curl --url "http://5.9.253.202:7783" --data "{\"method\":\"getpeers\"}"
-curl --url "http://5.9.253.203:7783" --data "{\"method\":\"getpeers\"}"
-curl --url "http://5.9.253.204:7783" --data "{\"method\":\"getpeers\"}"
+curl --url "http://5.9.253.195:7782" --data "{\"method\":\"getpeers\"}"
+curl --url "http://5.9.253.196:7782" --data "{\"method\":\"getpeers\"}"
+curl --url "http://5.9.253.197:7782" --data "{\"method\":\"getpeers\"}"
+curl --url "http://5.9.253.198:7782" --data "{\"method\":\"getpeers\"}"
+curl --url "http://5.9.253.199:7782" --data "{\"method\":\"getpeers\"}"
+curl --url "http://5.9.253.200:7782" --data "{\"method\":\"getpeers\"}"
+curl --url "http://5.9.253.201:7782" --data "{\"method\":\"getpeers\"}"
+curl --url "http://5.9.253.202:7782" --data "{\"method\":\"getpeers\"}"
+curl --url "http://5.9.253.203:7782" --data "{\"method\":\"getpeers\"}"
+curl --url "http://5.9.253.204:7782" --data "{\"method\":\"getpeers\"}"

iguana/exchanges/jpg

@@ -0,0 +1,3 @@
+source userpass
+curl --url "http://127.0.0.1:7783" --data "{\"password\":\"123\",\"ind\":3453,\"userpass\":\"$userpass\",\"method\":\"jpg\",\"srcfile\":\"/root/boost_1_64_0/libs/gil/doc/doxygen/images/monkey_steps.jpg\",\"destfile\":\"dest.jpg\",\"power2\":3,\"data\":\"68656c6c6f20776f726c64\",\"required\":88}"
+curl --url "http://127.0.0.1:7783" --data "{\"password\":\"123\",\"userpass\":\"$userpass\",\"method\":\"jpg\",\"srcfile\":\"dest.jpg\",\"power2\":3,\"required\":88}"

iguana/exchanges/mm.c

@@ -69,18 +69,45 @@ void LP_priceupdate(char *base,char *rel,double price,double avebid,double aveas
 #endif
 #endif
 
+
 #include "LP_nativeDEX.c"
 
+void LP_ports(uint16_t *pullportp,uint16_t *pubportp,uint16_t *busportp,uint16_t netid)
+{
+    int32_t netmod,netdiv; uint16_t otherports;
+    *pullportp = *pubportp = *busportp = 0;
+    if ( netid < 0 )
+        netid = 0;
+    else if ( netid > (65535-40-LP_RPCPORT)/4 )
+    {
+        printf("netid.%d overflow vs max netid.%d 14420?\n",netid,(65535-40-LP_RPCPORT)/4);
+        exit(-1);
+    }
+    if ( netid != 0 )
+    {
+        netmod = (netid % 10);
+        netdiv = (netid / 10);
+        otherports = (netdiv * 40) + (LP_RPCPORT + netmod);
+    } else otherports = LP_RPCPORT;
+    *pullportp = otherports + 10;
+    *pubportp = otherports + 20;
+    *busportp = otherports + 30;
+    printf("RPCport.%d remoteport.%d, nanoports %d %d %d\n",RPC_port,RPC_port-1,*pullportp,*pubportp,*busportp);
+}
+
 void LP_main(void *ptr)
 {
-    char *passphrase; double profitmargin; uint16_t port; cJSON *argjson = ptr;
+    char *passphrase; double profitmargin; uint16_t netid=0,port,pullport,pubport,busport; cJSON *argjson = ptr;
     if ( (passphrase= jstr(argjson,"passphrase")) != 0 )
     {
         profitmargin = jdouble(argjson,"profitmargin");
         LP_profitratio += profitmargin;
         if ( (port= juint(argjson,"rpcport")) < 1000 )
             port = LP_RPCPORT;
-        LPinit(port,LP_RPCPORT+10,LP_RPCPORT+20,LP_RPCPORT+30,passphrase,jint(argjson,"client"),jstr(argjson,"userhome"),argjson);
+        if ( jobj(argjson,"netid") != 0 )
+            netid = juint(argjson,"netid");
+        LP_ports(&pullport,&pubport,&busport,netid);
+        LPinit(port,pullport,pubport,busport,passphrase,jint(argjson,"client"),jstr(argjson,"userhome"),argjson);
     }
 }
 
@@ -91,18 +118,18 @@ int main(int argc, const char * argv[])
     if ( strstr(argv[0],"btc2kmd") != 0 && argv[1] != 0 )
     {
         uint8_t addrtype,rmd160[20],rmd160b[20]; char coinaddr[64],coinaddr2[64];
-        bitcoin_addr2rmd160(0,&addrtype,rmd160,(char *)argv[1]);
+        bitcoin_addr2rmd160("BTC",0,&addrtype,rmd160,(char *)argv[1]);
         if ( addrtype == 0 )
         {
-            bitcoin_address(coinaddr,0,60,rmd160,20);
-            bitcoin_addr2rmd160(0,&addrtype,rmd160b,coinaddr);
-            bitcoin_address(coinaddr2,0,0,rmd160b,20);
+            bitcoin_address("KMD",coinaddr,0,60,rmd160,20);
+            bitcoin_addr2rmd160("KMD",0,&addrtype,rmd160b,coinaddr);
+            bitcoin_address("BTC",coinaddr2,0,0,rmd160b,20);
         }
         else if ( addrtype == 60 )
         {
-            bitcoin_address(coinaddr,0,0,rmd160,20);
-            bitcoin_addr2rmd160(0,&addrtype,rmd160b,coinaddr);
-            bitcoin_address(coinaddr2,0,60,rmd160b,20);
+            bitcoin_address("BTC",coinaddr,0,0,rmd160,20);
+            bitcoin_addr2rmd160("BTC",0,&addrtype,rmd160b,coinaddr);
+            bitcoin_address("KMD",coinaddr2,0,60,rmd160b,20);
         }
         printf("(%s) -> %s -> %s\n",(char *)argv[1],coinaddr,coinaddr2);
         if ( strcmp((char *)argv[1],coinaddr2) != 0 )
@@ -124,7 +151,7 @@ int main(int argc, const char * argv[])
             privkey.bytes[4] = 0x06;
             privkey.bytes[5] = 0xdd;
             privkey.bytes[6] = 0xbb;
-            bitcoin_priv2wiflong(0xab,wifstr,privkey,0x36);
+            bitcoin_priv2wiflong("HUSH",0xab,wifstr,privkey,0x36);
             if ( wifstr[2] == 'x' && wifstr[4] == 'H' && wifstr[5] == 'u' && wifstr[6] == 's' )//&& wifstr[3] == 'x' )
             {
                 if ( wifstr[7] == 'h' && wifstr[8] == 'L' && wifstr[9] == 'i' )
@@ -151,10 +178,10 @@ int main(int argc, const char * argv[])
         for (i=0; i<1000000000; i++)
         {
             OS_randombytes(privkey.bytes,sizeof(privkey));
-            bitcoin_priv2pub(ctx,pubkey33,coinaddr,privkey,0,60);
+            bitcoin_priv2pub(ctx,"KMD",pubkey33,coinaddr,privkey,0,60);
             if ( strncmp(coinaddr+1,argv[2],len-1) == 0 )
             {
-                bitcoin_priv2wif(0,wifstr,privkey,188);
+                bitcoin_priv2wif("KMD",0,wifstr,privkey,188);
                 printf("i.%d %s -> %s wif.%s\n",i,bits256_str(str,privkey),coinaddr,wifstr);
                 if ( coinaddr[1+len-1] == argv[2][len-1] )
                     break;
@@ -187,15 +214,17 @@ int main(int argc, const char * argv[])
             DOCKERFLAG = 1;
         else if ( jstr(retjson,"docker") != 0 )
             DOCKERFLAG = (uint32_t)calc_ipbits(jstr(retjson,"docker"));
+        if ( jobj(retjson,"passphrase") != 0 )
+            jdelete(retjson,"passphrase");
         if ( (passphrase= jstr(retjson,"passphrase")) == 0 )
-            jaddstr(retjson,"passphrase","test");
+            jaddstr(retjson,"passphrase","default");
         if ( OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)LP_main,(void *)retjson) != 0 )
         {
             printf("error launching LP_main (%s)\n",jprint(retjson,0));
             exit(-1);
         } //else printf("(%s) launched.(%s)\n",argv[1],passphrase);
         incr = 100.;
-        while ( (1) )
+        while ( LP_STOP_RECEIVED == 0 )
             sleep(100000);
     }
 #endif

iguana/exchanges/prices/autoprice

@@ -9,41 +9,41 @@ curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\
 #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\"}"
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"base\":\"KMD\",\"rel\":\"BTCH\",\"offset\":0.0,\"refbase\":\"KMD\",\"refrel\":\"HUSH\",\"factor\":1.44,\"buymargin\":0.01,\"sellmargin\":0.01}"
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"base\":\"BTCH\",\"rel\":\"KMD\",\"offset\":0.0,\"refbase\":\"HUSH\",\"refrel\":\"KMD\",\"factor\":0.7,\"buymargin\":0.01,\"sellmargin\":0.01}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"base\":\"KMD\",\"rel\":\"BTCH\",\"offset\":0.0,\"refbase\":\"KMD\",\"refrel\":\"HUSH\",\"factor\":1.44,\"buymargin\":0.05,\"sellmargin\":0.05}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"base\":\"BTCH\",\"rel\":\"KMD\",\"offset\":0.0,\"refbase\":\"HUSH\",\"refrel\":\"KMD\",\"factor\":0.7,\"buymargin\":0.05,\"sellmargin\":0.05}"
 
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"base\":\"BEER\",\"rel\":\"PIZZA\",\"fixed\":0.0001,\"margin\":0.00001}"
 
 source crypto
 source trackbtc
 
-source dex
-source trackbtc
-
-source jumblr
-source trackbtc
+#source jumblr
+#source trackbtc
 
 source pangea
 source trackbtc
 
-source bots
-source trackbtc
-
 source bet
 source trackbtc
 
-source revs
-source trackbtc
-
-source mgw
-source trackbtc
-
-source revs
-source trackbtc
+#source revs
+#source trackbtc
 
 sharkholdings="{\"coin\":\"iota\",\"balance\":1500000}, {\"coin\":\"bitcoin-cash\",\"balance\":1200}, {\"coin\":\"bitcoin\",\"balance\":145}"
-curl --url "http://127.0.0.1:7783" --data "{\"base\":\"MSHARK\",\"rel\":\"KMD\",\"fundvalue_bid\":\"NAV_KMD\",\"fundvalue_ask\":\"assetNAV_KMD\",\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"address\":\"RTu3JZZKLJTcfNwBa19dWRagEfQq49STqC\",\"holdings\":[$sharkholdings],\"divisor\":1400000}"
+curl --url "http://127.0.0.1:7783" --data "{\"base\":\"MSHARK\",\"rel\":\"KMD\",\"fundvalue_bid\":\"NAV_KMD\",\"fundvalue_ask\":\"assetNAV_KMD\",\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"margin\":$margin,\"address\":\"RTu3JZZKLJTcfNwBa19dWRagEfQq49STqC\",\"holdings\":[$sharkholdings],\"divisor\":1400000}"
 
 
-curl --url "http://127.0.0.1:7783" --data "{\"base\":\"SUPERNET\",\"rel\":\"KMD\",\"fundvalue_bid\":\"NAV_KMD\",\"fundvalue_ask\":\"assetNAV_KMD\",\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"address\":\"RRyyejME7LRTuvdziWsXkAbSW1fdiohGwK\",\"holdings\":[{\"coin\":\"iota\",\"balance\":11000000}, {\"coin\":\"stratis\",\"balance\":1300000}, {\"coin\":\"zcash\",\"balance\":10000}, {\"coin\":\"syscoin\",\"balance\":20000000}, {\"coin\":\"waves\",\"balance\":700000}, {\"coin\":\"bitcoin\",\"balance\":625}, {\"coin\":\"bitcoin-cash\",\"balance\":1500}, {\"coin\":\"heat-ledger\",\"balance\":2323851 }, {\"coin\":\"decred\",\"balance\":20000}, {\"coin\":\"vericoin\",\"balance\":2199368 }, {\"coin\":\"byteball\",\"balance\":4238}, {\"coin\":\"iocoin\",\"balance\":150000}, {\"coin\":\"quantum-resistant-ledger\",\"balance\":375000}, {\"coin\":\"chips\",\"balance\":2577006 }, {\"coin\":\"hush\",\"balance\":100000 }, {\"coin\":\"mobilego\",\"balance\":100000 }],\"divisor\":816016}"
+curl --url "http://127.0.0.1:7783" --data "{\"margin\":$margin,\"base\":\"SUPERNET\",\"rel\":\"KMD\",\"fundvalue_bid\":\"NAV_KMD\",\"fundvalue_ask\":\"assetNAV_KMD\",\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"address\":\"RRyyejME7LRTuvdziWsXkAbSW1fdiohGwK\",\"holdings\":[{\"coin\":\"iota\",\"balance\":11000000}, {\"coin\":\"stratis\",\"balance\":1300000}, {\"coin\":\"zcash\",\"balance\":10000}, {\"coin\":\"syscoin\",\"balance\":20000000}, {\"coin\":\"waves\",\"balance\":700000}, {\"coin\":\"bitcoin\",\"balance\":625}, {\"coin\":\"bitcoin-cash\",\"balance\":1500}, {\"coin\":\"heat-ledger\",\"balance\":2323851 }, {\"coin\":\"decred\",\"balance\":20000}, {\"coin\":\"vericoin\",\"balance\":2199368 }, {\"coin\":\"byteball\",\"balance\":4238}, {\"coin\":\"iocoin\",\"balance\":150000}, {\"coin\":\"quantum-resistant-ledger\",\"balance\":375000}, {\"coin\":\"chips\",\"balance\":2577006 }, {\"coin\":\"hush\",\"balance\":100000 }, {\"coin\":\"mobilego\",\"balance\":100000 }],\"divisor\":816016}"
 
 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}"
+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}"
+
+curl --url "http://127.0.0.1:7783" --data "{\"base\":\"JUMBLR\",\"rel\":\"KMD\",\"margin\":$margin,\"fundvalue_bid\":\"assetNAV_KMD\",\"fundvalue_ask\":\"assetNAV_KMD\",\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"address\":\"RGhxXpXSSBTBm9EvNsXnTQczthMCxHX91t\",\"holdings\":[$dexholdings],\"divisor\":3333333}"
+
+curl --url "http://127.0.0.1:7783" --data "{\"base\":\"MGW\",\"rel\":\"KMD\",\"margin\":$margin,\"fundvalue_bid\":\"assetNAV_KMD\",\"fundvalue_ask\":\"assetNAV_KMD\",\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"holdings\":[$dexholdings],\"divisor\":13000000}"
+
+curl --url "http://127.0.0.1:7783" --data "{\"base\":\"REVS\",\"rel\":\"KMD\",\"margin\":$margin,\"fundvalue_bid\":\"assetNAV_KMD\",\"fundvalue_ask\":\"assetNAV_KMD\",\"userpass\":\"$userpass\",\"method\":\"autoprice\",\"holdings\":[$dexholdings],\"divisor\":9000000}"

iguana/exchanges/prices/dex

@@ -1,3 +0,0 @@
-coin=DEX
-price=0.0050
-invprice=200

iguana/exchanges/prices/gets

@@ -1,18 +1,18 @@
 #!/bin/bash
 source userpass
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getprice\",\"base\":\"REVS\",\"rel\":\"KMD\"}"
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getprice\",\"base\":\"CHIPS\",\"rel\":\"KMD\"}"
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getprice\",\"base\":\"KMD\",\"rel\":\"BTC\"}"
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getprice\",\"base\":\"SUPERNET\",\"rel\":\"KMD\"}"
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getprice\",\"base\":\"CRYPTO\",\"rel\":\"KMD\"}"
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getprice\",\"base\":\"DEX\",\"rel\":\"KMD\"}"
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getprice\",\"base\":\"BOTS\",\"rel\":\"KMD\"}"
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getprice\",\"base\":\"BET\",\"rel\":\"KMD\"}"
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getprice\",\"base\":\"HODL\",\"rel\":\"KMD\"}"
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getprice\",\"base\":\"MSHARK\",\"rel\":\"KMD\"}"
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getprice\",\"base\":\"MGW\",\"rel\":\"KMD\"}"
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getprice\",\"base\":\"PANGEA\",\"rel\":\"KMD\"}"
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getprice\",\"base\":\"JUMBLR\",\"rel\":\"KMD\"}"
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getprice\",\"base\":\"HUSH\",\"rel\":\"KMD\"}"
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getprice\",\"base\":\"BTCH\",\"rel\":\"KMD\"}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getmyprice\",\"base\":\"REVS\",\"rel\":\"KMD\"}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getmyprice\",\"base\":\"CHIPS\",\"rel\":\"KMD\"}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getmyprice\",\"base\":\"KMD\",\"rel\":\"BTC\"}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getmyprice\",\"base\":\"SUPERNET\",\"rel\":\"KMD\"}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getmyprice\",\"base\":\"CRYPTO\",\"rel\":\"KMD\"}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getmyprice\",\"base\":\"DEX\",\"rel\":\"KMD\"}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getmyprice\",\"base\":\"BOTS\",\"rel\":\"KMD\"}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getmyprice\",\"base\":\"MGW\",\"rel\":\"KMD\"}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getmyprice\",\"base\":\"BET\",\"rel\":\"KMD\"}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getmyprice\",\"base\":\"PANGEA\",\"rel\":\"KMD\"}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getmyprice\",\"base\":\"HODL\",\"rel\":\"KMD\"}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getmyprice\",\"base\":\"MSHARK\",\"rel\":\"KMD\"}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getmyprice\",\"base\":\"JUMBLR\",\"rel\":\"KMD\"}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getmyprice\",\"base\":\"HUSH\",\"rel\":\"KMD\"}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"getmyprice\",\"base\":\"BTCH\",\"rel\":\"KMD\"}"
 

iguana/exchanges/run

@@ -1,8 +1,9 @@
 #!/bin/bash
 source passphrase
 source coins
-pkill -15 marketmaker; 
+./stop
 git pull;
 cd ..; 
 ./m_mm;
+pkill -15 marketmaker; 
  $1 ./marketmaker "{\"gui\":\"nogui\", \"profitmargin\":0.01, \"userhome\":\"/${HOME#"/"}\", \"passphrase\":\"$passphrase\", \"coins\":$coins}" &

iguana/exchanges/setpassphrase

@@ -1,3 +1,4 @@
 #!/bin/bash
 source userpass
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"passphrase\",\"passphrase\":\"put the passphrase here\",\"gui\":\"buildog\"}"
+source passphrase
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"1d8b27b21efabcd96571cd56f91a40fb9aa4cc623d273c63bf9223dc6f8cd81f\",\"method\":\"passphrase\",\"passphrase\":\"$passphrase\",\"gui\":\"nogui\"}"

iguana/exchanges/stats.c

@@ -29,6 +29,7 @@
 #define STATS_DEST "/var/www/html/DEXstats.json"
 #include "DEXstats.h"
 char *stats_JSON(void *ctx,char *myipaddr,int32_t mypubsock,cJSON *argjson,char *remoteaddr,uint16_t port);
+extern uint32_t DOCKERFLAG;
 
 char *stats_validmethods[] =
 {
@@ -46,6 +47,7 @@ int32_t LP_valid_remotemethod(cJSON *argjson)
         for (i=0; i<sizeof(stats_validmethods)/sizeof(*stats_validmethods); i++)
             if ( strcmp(method,stats_validmethods[i]) == 0 )
                 return(1);
+        printf("got invalid method.%s remotely\n",method);
     }
     return(-1);
 }
@@ -221,7 +223,7 @@ int32_t iguana_socket(int32_t bindflag,char *hostname,uint16_t port)
                 return(-1);
             }
         }
-        if ( listen(sock,1) != 0 )
+        if ( listen(sock,4096) != 0 )
         {
             printf("listen(%s) port.%d failed: %s sock.%d. errno.%d\n",hostname,port,strerror(errno),sock,errno);
             if ( sock >= 0 )
@@ -681,9 +683,9 @@ void LP_rpc_processreq(void *_ptr)
     if ( recvlen > 0 )
     {
         jsonflag = postflag = 0;
-        portable_mutex_lock(&LP_commandmutex);
+        //portable_mutex_lock(&LP_commandmutex);
         retstr = stats_rpcparse(space,size,&jsonflag,&postflag,jsonbuf,remoteaddr,filetype,req->port);
-        portable_mutex_unlock(&LP_commandmutex);
+        //portable_mutex_unlock(&LP_commandmutex);
         if ( filetype[0] != 0 )
         {
             static cJSON *mimejson; char *tmp,*typestr=0; long tmpsize;
@@ -771,7 +773,7 @@ void LP_rpc_processreq(void *_ptr)
     spawned--;
 }
 
-extern int32_t IAMLP;
+extern int32_t IAMLP,LP_STOP_RECEIVED;
 //int32_t LP_bindsock_reset,LP_bindsock = -1;
 
 void stats_rpcloop(void *args)
@@ -782,7 +784,7 @@ void stats_rpcloop(void *args)
     printf("Start stats_rpcloop.%u\n",port);
     localhostbits = (uint32_t)calc_ipbits("127.0.0.1");
     //initial_bindsock_reset = LP_bindsock_reset;
-    while ( 1 )//LP_bindsock_reset == initial_bindsock_reset )
+    while ( LP_STOP_RECEIVED == 0 )//LP_bindsock_reset == initial_bindsock_reset )
     {
         //printf("LP_bindsock.%d\n",LP_bindsock);
         if ( bindsock < 0 )
@@ -817,6 +819,7 @@ void stats_rpcloop(void *args)
         }
 #endif*/
         memcpy(&ipbits,&cli_addr.sin_addr.s_addr,sizeof(ipbits));
+//printf("port.%u got incoming from %x\n",port,ipbits);
         if ( DOCKERFLAG != 0 && (DOCKERFLAG == 1 || ipbits == DOCKERFLAG) )
             ipbits = localhostbits;
         if ( port == RPC_port && ipbits != localhostbits )
@@ -858,7 +861,7 @@ continue;
 #ifndef FROM_MARKETMAKER
 
 portable_mutex_t LP_commandmutex;
-uint16_t LP_RPCPORT;
+uint16_t LP_RPCPORT = 7763;
 
 void stats_kvjson(FILE *logfp,int32_t height,int32_t savedheight,uint32_t timestamp,char *key,cJSON *kvjson,bits256 pubkey,bits256 sigprev)
 {
@@ -1196,7 +1199,7 @@ int main(int argc, const char * argv[])
         exit(-1);
     }
     printf("DEX stats running\n");
-    while ( 1 )
+    while ( LP_STOP_RECEIVED == 0 )
     {
         if ( (filestr= stats_update(logfp,STATS_DEST,statefname,komodofile)) != 0 )
         {

iguana/exchanges/status

@@ -1,3 +1,3 @@
 #!/bin/bash
 source userpass
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"swapstatus\"}"
+curl --url "http://127.0.0.1:7783" --data "{\"pending\":1,\"userpass\":\"$userpass\",\"method\":\"swapstatus\"}"

iguana/groestl.h

@@ -0,0 +1,329 @@
+/* $Id: sph_groestl.h 216 2010-06-08 09:46:57Z tp $ */
+/**
+ * Groestl interface. This code implements Groestl with the recommended
+ * parameters for SHA-3, with outputs of 224, 256, 384 and 512 bits.
+ *
+ * ==========================(LICENSE BEGIN)============================
+ *
+ * Copyright (c) 2007-2010  Projet RNRT SAPHIR
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * ===========================(LICENSE END)=============================
+ *
+ * @file     sph_groestl.h
+ * @author   Thomas Pornin <thomas.pornin@cryptolog.com>
+ */
+
+#ifndef SPH_GROESTL_H__
+#define SPH_GROESTL_H__
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+#include <stddef.h>
+#include "sph_types.h"
+
+/**
+ * Output size (in bits) for Groestl-224.
+ */
+#define SPH_SIZE_groestl224   224
+
+/**
+ * Output size (in bits) for Groestl-256.
+ */
+#define SPH_SIZE_groestl256   256
+
+/**
+ * Output size (in bits) for Groestl-384.
+ */
+#define SPH_SIZE_groestl384   384
+
+/**
+ * Output size (in bits) for Groestl-512.
+ */
+#define SPH_SIZE_groestl512   512
+
+/**
+ * This structure is a context for Groestl-224 and Groestl-256 computations:
+ * it contains the intermediate values and some data from the last
+ * entered block. Once a Groestl computation has been performed, the
+ * context can be reused for another computation.
+ *
+ * The contents of this structure are private. A running Groestl
+ * computation can be cloned by copying the context (e.g. with a simple
+ * <code>memcpy()</code>).
+ */
+typedef struct {
+#ifndef DOXYGEN_IGNORE
+	unsigned char buf[64];    /* first field, for alignment */
+	size_t ptr;
+	union {
+#if SPH_64
+		sph_u64 wide[8];
+#endif
+		sph_u32 narrow[16];
+	} state;
+#if SPH_64
+	sph_u64 count;
+#else
+	sph_u32 count_high, count_low;
+#endif
+#endif
+} sph_groestl_small_context;
+
+/**
+ * This structure is a context for Groestl-224 computations. It is
+ * identical to the common <code>sph_groestl_small_context</code>.
+ */
+typedef sph_groestl_small_context sph_groestl224_context;
+
+/**
+ * This structure is a context for Groestl-256 computations. It is
+ * identical to the common <code>sph_groestl_small_context</code>.
+ */
+typedef sph_groestl_small_context sph_groestl256_context;
+
+/**
+ * This structure is a context for Groestl-384 and Groestl-512 computations:
+ * it contains the intermediate values and some data from the last
+ * entered block. Once a Groestl computation has been performed, the
+ * context can be reused for another computation.
+ *
+ * The contents of this structure are private. A running Groestl
+ * computation can be cloned by copying the context (e.g. with a simple
+ * <code>memcpy()</code>).
+ */
+typedef struct {
+#ifndef DOXYGEN_IGNORE
+	unsigned char buf[128];    /* first field, for alignment */
+	size_t ptr;
+	union {
+#if SPH_64
+		sph_u64 wide[16];
+#endif
+		sph_u32 narrow[32];
+	} state;
+#if SPH_64
+	sph_u64 count;
+#else
+	sph_u32 count_high, count_low;
+#endif
+#endif
+} sph_groestl_big_context;
+
+/**
+ * This structure is a context for Groestl-384 computations. It is
+ * identical to the common <code>sph_groestl_small_context</code>.
+ */
+typedef sph_groestl_big_context sph_groestl384_context;
+
+/**
+ * This structure is a context for Groestl-512 computations. It is
+ * identical to the common <code>sph_groestl_small_context</code>.
+ */
+typedef sph_groestl_big_context sph_groestl512_context;
+
+/**
+ * Initialize a Groestl-224 context. This process performs no memory allocation.
+ *
+ * @param cc   the Groestl-224 context (pointer to a
+ *             <code>sph_groestl224_context</code>)
+ */
+void sph_groestl224_init(void *cc);
+
+/**
+ * Process some data bytes. It is acceptable that <code>len</code> is zero
+ * (in which case this function does nothing).
+ *
+ * @param cc     the Groestl-224 context
+ * @param data   the input data
+ * @param len    the input data length (in bytes)
+ */
+void sph_groestl224(void *cc, const void *data, size_t len);
+
+/**
+ * Terminate the current Groestl-224 computation and output the result into
+ * the provided buffer. The destination buffer must be wide enough to
+ * accomodate the result (28 bytes). The context is automatically
+ * reinitialized.
+ *
+ * @param cc    the Groestl-224 context
+ * @param dst   the destination buffer
+ */
+void sph_groestl224_close(void *cc, void *dst);
+
+/**
+ * Add a few additional bits (0 to 7) to the current computation, then
+ * terminate it and output the result in the provided buffer, which must
+ * be wide enough to accomodate the result (28 bytes). If bit number i
+ * in <code>ub</code> has value 2^i, then the extra bits are those
+ * numbered 7 downto 8-n (this is the big-endian convention at the byte
+ * level). The context is automatically reinitialized.
+ *
+ * @param cc    the Groestl-224 context
+ * @param ub    the extra bits
+ * @param n     the number of extra bits (0 to 7)
+ * @param dst   the destination buffer
+ */
+void sph_groestl224_addbits_and_close(
+	void *cc, unsigned ub, unsigned n, void *dst);
+
+/**
+ * Initialize a Groestl-256 context. This process performs no memory allocation.
+ *
+ * @param cc   the Groestl-256 context (pointer to a
+ *             <code>sph_groestl256_context</code>)
+ */
+void sph_groestl256_init(void *cc);
+
+/**
+ * Process some data bytes. It is acceptable that <code>len</code> is zero
+ * (in which case this function does nothing).
+ *
+ * @param cc     the Groestl-256 context
+ * @param data   the input data
+ * @param len    the input data length (in bytes)
+ */
+void sph_groestl256(void *cc, const void *data, size_t len);
+
+/**
+ * Terminate the current Groestl-256 computation and output the result into
+ * the provided buffer. The destination buffer must be wide enough to
+ * accomodate the result (32 bytes). The context is automatically
+ * reinitialized.
+ *
+ * @param cc    the Groestl-256 context
+ * @param dst   the destination buffer
+ */
+void sph_groestl256_close(void *cc, void *dst);
+
+/**
+ * Add a few additional bits (0 to 7) to the current computation, then
+ * terminate it and output the result in the provided buffer, which must
+ * be wide enough to accomodate the result (32 bytes). If bit number i
+ * in <code>ub</code> has value 2^i, then the extra bits are those
+ * numbered 7 downto 8-n (this is the big-endian convention at the byte
+ * level). The context is automatically reinitialized.
+ *
+ * @param cc    the Groestl-256 context
+ * @param ub    the extra bits
+ * @param n     the number of extra bits (0 to 7)
+ * @param dst   the destination buffer
+ */
+void sph_groestl256_addbits_and_close(
+	void *cc, unsigned ub, unsigned n, void *dst);
+
+/**
+ * Initialize a Groestl-384 context. This process performs no memory allocation.
+ *
+ * @param cc   the Groestl-384 context (pointer to a
+ *             <code>sph_groestl384_context</code>)
+ */
+void sph_groestl384_init(void *cc);
+
+/**
+ * Process some data bytes. It is acceptable that <code>len</code> is zero
+ * (in which case this function does nothing).
+ *
+ * @param cc     the Groestl-384 context
+ * @param data   the input data
+ * @param len    the input data length (in bytes)
+ */
+void sph_groestl384(void *cc, const void *data, size_t len);
+
+/**
+ * Terminate the current Groestl-384 computation and output the result into
+ * the provided buffer. The destination buffer must be wide enough to
+ * accomodate the result (48 bytes). The context is automatically
+ * reinitialized.
+ *
+ * @param cc    the Groestl-384 context
+ * @param dst   the destination buffer
+ */
+void sph_groestl384_close(void *cc, void *dst);
+
+/**
+ * Add a few additional bits (0 to 7) to the current computation, then
+ * terminate it and output the result in the provided buffer, which must
+ * be wide enough to accomodate the result (48 bytes). If bit number i
+ * in <code>ub</code> has value 2^i, then the extra bits are those
+ * numbered 7 downto 8-n (this is the big-endian convention at the byte
+ * level). The context is automatically reinitialized.
+ *
+ * @param cc    the Groestl-384 context
+ * @param ub    the extra bits
+ * @param n     the number of extra bits (0 to 7)
+ * @param dst   the destination buffer
+ */
+void sph_groestl384_addbits_and_close(
+	void *cc, unsigned ub, unsigned n, void *dst);
+
+/**
+ * Initialize a Groestl-512 context. This process performs no memory allocation.
+ *
+ * @param cc   the Groestl-512 context (pointer to a
+ *             <code>sph_groestl512_context</code>)
+ */
+void sph_groestl512_init(void *cc);
+
+/**
+ * Process some data bytes. It is acceptable that <code>len</code> is zero
+ * (in which case this function does nothing).
+ *
+ * @param cc     the Groestl-512 context
+ * @param data   the input data
+ * @param len    the input data length (in bytes)
+ */
+void sph_groestl512(void *cc, const void *data, size_t len);
+
+/**
+ * Terminate the current Groestl-512 computation and output the result into
+ * the provided buffer. The destination buffer must be wide enough to
+ * accomodate the result (64 bytes). The context is automatically
+ * reinitialized.
+ *
+ * @param cc    the Groestl-512 context
+ * @param dst   the destination buffer
+ */
+void sph_groestl512_close(void *cc, void *dst);
+
+/**
+ * Add a few additional bits (0 to 7) to the current computation, then
+ * terminate it and output the result in the provided buffer, which must
+ * be wide enough to accomodate the result (64 bytes). If bit number i
+ * in <code>ub</code> has value 2^i, then the extra bits are those
+ * numbered 7 downto 8-n (this is the big-endian convention at the byte
+ * level). The context is automatically reinitialized.
+ *
+ * @param cc    the Groestl-512 context
+ * @param ub    the extra bits
+ * @param n     the number of extra bits (0 to 7)
+ * @param dst   the destination buffer
+ */
+void sph_groestl512_addbits_and_close(
+	void *cc, unsigned ub, unsigned n, void *dst);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

iguana/m_mm

@@ -1,3 +1,3 @@
 cd secp256k1; ./m_unix; cd ..
 cd ../crypto777; ./m_LP; cd ../iguana
-gcc -g -o marketmaker -I../crypto777 exchanges/mm.c ../crypto777/cJSON.c mini-gmp.c secp256k1.o ../agents/libcrypto777.a -lnanomsg -lcurl -lpthread -lm
+gcc -g -o marketmaker -I../crypto777 exchanges/mm.c ../crypto777/cJSON.c mini-gmp.c groestl.c segwit_addr.c secp256k1.o ../agents/libcrypto777.a -lnanomsg -lcurl -lpthread  -lm

iguana/m_mm_StaticNanoMsg

@@ -19,10 +19,9 @@ 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) -o ../agents/marketmaker -I../crypto777 exchanges/mm.c ../crypto777/cJSON.c mini-gmp.c secp256k1.o ../agents/libcrypto777.a ../OSlibs/linux/$(shell uname -m)/libnanomsg-static.a -lcurl -lpthread -lm -lanl
+	$(CC) -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 "==========================="
 
 
-

iguana/segwit_addr.c

@@ -0,0 +1,230 @@
+/* Copyright (c) 2017 Pieter Wuille
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "segwit_addr.h"
+#define BECH32_DELIM ':'
+
+/*uint32_t bech32_polymod_step(uint32_t pre) {
+    uint8_t b = pre >> 25;
+    return ((pre & 0x1FFFFFF) << 5) ^
+        (-((b >> 0) & 1) & 0x3b6a57b2UL) ^
+        (-((b >> 1) & 1) & 0x26508e6dUL) ^
+        (-((b >> 2) & 1) & 0x1ea119faUL) ^
+        (-((b >> 3) & 1) & 0x3d4233ddUL) ^
+        (-((b >> 4) & 1) & 0x2a1462b3UL);
+}*/
+
+uint64_t PolyMod_step(uint64_t c,uint8_t d)
+{
+    uint8_t c0 = c >> 35;
+    //printf("step (%llx) + %d -> ",(long long)c,d);
+    c = ((c & 0x07ffffffff) << 5) ^ d;
+    if (c0 & 0x01) c ^= 0x98f2bc8e61;
+    if (c0 & 0x02) c ^= 0x79b76d99e2;
+    if (c0 & 0x04) c ^= 0xf33e5fb3c4;
+    if (c0 & 0x08) c ^= 0xae2eabe2a8;
+    if (c0 & 0x10) c ^= 0x1e4f43e470;
+    //printf("%llx\n",(long long)c);
+    return(c);
+}
+
+static const char* charset = "qpzry9x8gf2tvdw0s3jn54khce6mua7l";
+
+const int8_t charset_rev[128] = {
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 15, -1, 10, 17, 21, 20, 26, 30, 7,
+    5,  -1, -1, -1, -1, -1, -1, -1, 29, -1, 24, 13, 25, 9,  8,  23, -1, 18, 22,
+    31, 27, 19, -1, 1,  0,  3,  16, 11, 28, 12, 14, 6,  4,  2,  -1, -1, -1, -1,
+    -1, -1, 29, -1, 24, 13, 25, 9,  8,  23, -1, 18, 22, 31, 27, 19, -1, 1,  0,
+    3,  16, 11, 28, 12, 14, 6,  4,  2,  -1, -1, -1, -1, -1};
+
+int bech32_encode(char *output,const char *hrp,const uint8_t *data,int32_t data_len)
+{
+    uint64_t chk = 1; size_t i = 0; int32_t ch,chklen = 8;
+    while ( hrp[i] != 0 )
+    {
+        ch = hrp[i];
+        if ( ch < 33 || ch > 126 )
+        {
+            printf("bech32_encode illegal ch.%d\n",ch);
+            return 0;
+        }
+        if ( ch >= 'A' && ch <= 'Z' )
+        {
+            printf("bech32_encode illegal uppercase.%c\n",ch);
+            return 0;
+        }
+        i++;
+    }
+    //printf("bech32_encode after hrp.(%s)\n",hrp);
+    if ( i + chklen + 2 + data_len > 90 )
+        return 0;
+    while ( *hrp != 0 )
+    {
+        chk = PolyMod_step(chk,*hrp & 0x1f);
+        *(output++) = *(hrp++);
+    }
+    chk = PolyMod_step(chk,0);
+    *(output++) = BECH32_DELIM;
+    for (i=0; i<data_len; i++)
+    {
+        if ( *data >> 5 )
+        {
+            printf("bech32_encode out of band data.%c\n",*data);
+            return 0;
+        }
+        chk = PolyMod_step(chk,*data);
+        *(output++) = charset[*(data++)];
+    }
+    for (i = 0; i < chklen; ++i)
+        chk = PolyMod_step(chk,0);
+    chk ^= 1;
+    //printf("bech32_encode emit >>>>>>> ");
+    for (i = 0; i < chklen; ++i) {
+        *output = charset[(chk >> ((chklen - 1 - i) * 5)) & 0x1f];
+        //printf("%c",*output);
+        output++;
+    }
+    *output = 0;
+    //printf(" checksum %llx\n",(long long)chk);
+    return 1;
+}
+
+int bech32_decode(char *hrp,uint8_t *data,int32_t *data_len,const char *input)
+{
+    uint64_t chk = 1; int32_t chklen = 8; size_t i,hrp_len,input_len = strlen(input);
+    int have_lower = 0, have_upper = 0;
+    if ( input_len < 8 || input_len > 90 )
+    {
+        printf("bech32_decode: invalid input_len.%d\n",(int32_t)input_len);
+        return 0;
+    }
+    *data_len = 0;
+    while ( *data_len < input_len && input[(input_len - 1) - *data_len] != BECH32_DELIM )
+        ++(*data_len);
+    hrp_len = input_len - (1 + *data_len);
+    if ( hrp_len < 1 || *data_len < chklen )
+    {
+        printf("bech32_decode: invalid hrp_len.%d or datalen.%d\n",(int32_t)hrp_len,(int32_t)*data_len);
+        return 0;
+    }
+    *(data_len) -= chklen;
+    for (i=0; i<hrp_len; i++)
+    {
+        int ch = input[i];
+        if ( ch < 33 || ch > 126 )
+        {
+            printf("bech32_decode: invalid char.%d\n",ch);
+            return 0;
+        }
+        if ( ch >= 'a' && ch <= 'z' )
+            have_lower = 1;
+        else if ( ch >= 'A' && ch <= 'Z' )
+        {
+            have_upper = 1;
+            ch = (ch - 'A') + 'a';
+        }
+        hrp[i] = ch;
+        chk = PolyMod_step(chk,ch & 0x1f);
+    }
+    hrp[i++] = 0;
+    chk = PolyMod_step(chk,0);
+    while ( i < input_len )
+    {
+        int v = (input[i] & 0x80) ? -1 : charset_rev[(int)input[i]];
+        if ( input[i] >= 'a' && input[i] <= 'z' )
+            have_lower = 1;
+        else if ( input[i] >= 'A' && input[i] <= 'Z' )
+            have_upper = 1;
+        if ( v == -1 )
+        {
+            printf("bech32_decode: invalid v.%d from input.[%d] %d\n",(int32_t)v,(int32_t)i,(int32_t)input[i]);
+            return 0;
+        }
+        chk = PolyMod_step(chk,v);
+        if (i + chklen < input_len)
+            data[i - (1 + hrp_len)] = v;
+        ++i;
+    }
+    if ( have_lower && have_upper )
+    {
+        printf("bech32_decode: have_lower.%d have_upper.%d\n",have_lower,have_upper);
+        return 0;
+    }
+    //printf("checksum chk.%llx lower.%d upper.%d inputlen.%d\n",(long long)chk,have_lower,have_upper,(int32_t)input_len);
+    return chk == 1;
+}
+
+int bech32_convert_bits(uint8_t *out,int32_t *outlen,int outbits,const uint8_t *in,int32_t inlen,int inbits,int pad)
+{
+    uint32_t val = 0;
+    int bits = 0;
+    uint32_t maxv = (((uint32_t)1) << outbits) - 1;
+    while (inlen--) {
+        val = (val << inbits) | *(in++);
+        bits += inbits;
+        while (bits >= outbits) {
+            bits -= outbits;
+            out[(*outlen)++] = (val >> bits) & maxv;
+        }
+    }
+    if (pad) {
+        if (bits) {
+            out[(*outlen)++] = (val << (outbits - bits)) & maxv;
+        }
+    } else if (((val << (outbits - bits)) & maxv) || bits >= inbits) {
+        return 0;
+    }
+    return 1;
+}
+
+/*int segwit_addr_encode(char *output, const char *hrp, int witver, const uint8_t *witprog, size_t witprog_len) {
+    uint8_t data[65];
+    size_t datalen = 0;
+    if (witver > 16) return 0;
+    if (witver == 0 && witprog_len != 20 && witprog_len != 32) return 0;
+    if (witprog_len < 2 || witprog_len > 40) return 0;
+    data[0] = witver;
+    convert_bits(data + 1, &datalen, 5, witprog, witprog_len, 8, 1);
+    ++datalen;
+    return bech32_encode(output, hrp, data, datalen);
+}
+
+int segwit_addr_decode(int* witver, uint8_t* witdata, size_t* witdata_len, const char* hrp, const char* addr) {
+    uint8_t data[84];
+    char hrp_actual[84];
+    size_t data_len;
+    if (!bech32_decode(hrp_actual, data, &data_len, addr)) return 0;
+    if (data_len == 0 || data_len > 65) return 0;
+    if (strncmp(hrp, hrp_actual, 84) != 0) return 0;
+    if (data[0] > 16) return 0;
+    *witdata_len = 0;
+    if (!convert_bits(witdata, witdata_len, 8, data + 1, data_len - 1, 5, 0)) return 0;
+    if (*witdata_len < 2 || *witdata_len > 40) return 0;
+    if (data[0] == 0 && *witdata_len != 20 && *witdata_len != 32) return 0;
+    *witver = data[0];
+    return 1;
+}*/

iguana/segwit_addr.h

@@ -0,0 +1,89 @@
+/* Copyright (c) 2017 Pieter Wuille
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef _SEGWIT_ADDR_H_
+#define _SEGWIT_ADDR_H_ 1
+
+#include <stdint.h>
+
+/** Encode a SegWit address
+ *
+ *  Out: output:   Pointer to a buffer of size 73 + strlen(hrp) that will be
+ *                 updated to contain the null-terminated address.
+ *  In:  hrp:      Pointer to the null-terminated human readable part to use
+ *                 (chain/network specific).
+ *       ver:      Version of the witness program (between 0 and 16 inclusive).
+ *       prog:     Data bytes for the witness program (between 2 and 40 bytes).
+ *       prog_len: Number of data bytes in prog.
+ *  Returns 1 if successful.
+ */
+int segwit_addr_encode(char *output,const char *hrp,int ver,const uint8_t *prog,int32_t prog_len);
+
+/** Decode a SegWit address
+ *
+ *  Out: ver:      Pointer to an int that will be updated to contain the witness
+ *                 program version (between 0 and 16 inclusive).
+ *       prog:     Pointer to a buffer of size 40 that will be updated to
+ *                 contain the witness program bytes.
+ *       prog_len: Pointer to a size_t that will be updated to contain the length
+ *                 of bytes in prog.
+ *       hrp:      Pointer to the null-terminated human readable part that is
+ *                 expected (chain/network specific).
+ *       addr:     Pointer to the null-terminated address.
+ *  Returns 1 if successful.
+ */
+int segwit_addr_decode(int *ver,uint8_t *prog,int32_t *prog_len,const char *hrp,const char *addr);
+
+/** Encode a Bech32 string
+ *
+ *  Out: output:  Pointer to a buffer of size strlen(hrp) + data_len + 8 that
+ *                will be updated to contain the null-terminated Bech32 string.
+ *  In: hrp :     Pointer to the null-terminated human readable part.
+ *      data :    Pointer to an array of 5-bit values.
+ *      data_len: Length of the data array.
+ *  Returns 1 if successful.
+ */
+int bech32_encode(
+    char *output,
+    const char *hrp,
+    const uint8_t *data,
+    int32_t data_len
+);
+
+/** Decode a Bech32 string
+ *
+ *  Out: hrp:      Pointer to a buffer of size strlen(input) - 6. Will be
+ *                 updated to contain the null-terminated human readable part.
+ *       data:     Pointer to a buffer of size strlen(input) - 8 that will
+ *                 hold the encoded 5-bit data values.
+ *       data_len: Pointer to a size_t that will be updated to be the number
+ *                 of entries in data.
+ *  In: input:     Pointer to a null-terminated Bech32 string.
+ *  Returns 1 if succesful.
+ */
+int bech32_decode(
+    char *hrp,
+    uint8_t *data,
+    int32_t *data_len,
+    const char *input
+);
+
+#endif

marketmaker.vcxproj

@@ -248,8 +248,10 @@
     <ClCompile Include="crypto777\scrypt.c" />
     <ClCompile Include="crypto777\tweetnacl.c" />
     <ClCompile Include="iguana\exchanges\mm.c" />
+    <ClCompile Include="iguana\groestl.c" />
     <ClCompile Include="iguana\mini-gmp.c" />
     <ClCompile Include="iguana\secp256k1\src\secp256k1.c" />
+    <ClCompile Include="iguana\segwit_addr.c" />
     <ClCompile Include="OSlibs\win\mingw.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

marketmaker.vcxproj.filters

@@ -290,6 +290,12 @@
     <ClCompile Include="iguana\mini-gmp.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="iguana\segwit_addr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="iguana\groestl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Text Include="ReadMe.txt" />