Merge pull request #310 from jl777/beta

Beta

.gitignore

@@ -150,4 +150,69 @@ iguana/DB/DEX.log
 
 iguana/iguana_notary.o-54f98cc3
 
+iguana/basilisk.o-2ad8cb38
 iguana/pangea_hand.o-02d25ec3
+
+iguana/confs/4dfa301d0adf61f0ec08e4d4cb4444f4fc377f45f5d6b1da0814033920d72353
+
+iguana/help.json
+
+iguana/index7778.html
+
+*.json
+
+iguana/DB/KMD/utxo.dat
+
+iguana/unparsed.txt
+
+iguana/unparsed.txt
+
+iguana/unparsed.txt
+
+iguana/DB/SWAPS/.tmpmarker
+
+iguana/DB/SWAPS/list
+
+iguana/DB/SWAPS/15974209-4014252807
+
+iguana/iguana777.o-0cc60f50
+
+iguana/DB/SWAPS/667293271-3414303895
+
+iguana/DB/SWAPS/667293271-3414303895.swap
+
+iguana/DB/SWAPS/548227681-1452262678.swap
+
+iguana/DB/SWAPS/548227681-1452262678
+
+*.bobdeposit
+
+*.bobpayment
+
+*.bobreclaim
+
+*.bobrefund
+
+*.swap
+
+iguana/DB/SWAPS/1268007736-526212866
+
+iguana/DB/SWAPS/3111936786-3185288772
+
+iguana/DB/SWAPS/3368214189-2405641584
+
+iguana/DB/SWAPS/1133671270-1840176506
+
+iguana/DB/SWAPS/467927158-3437055573
+
+iguana/DB/SWAPS/270159951-1269722638
+
+iguana/DB/SWAPS/244991424-1008712592
+
+iguana/confs/1cc0270abba7f4463a3dcb9908b9d875691a6773fe3cc1b4302233ed76665300
+
+iguana/autoAPI.md
+
+iguana/confs/5228bcea7ae2515a29c3844673de6ee2acba53bf45724744a00ff4306f192912
+
+iguana/confs/630929d976025fafde221c7358eb5805f4359bad3c6b8bd50ad3f6e0a9b5ce78

basilisk/basilisk.c

@@ -482,6 +482,7 @@ int32_t basilisk_relayid(struct supernet_info *myinfo,uint32_t ipbits)
 #include "basilisk_ether.c"
 #include "basilisk_waves.c"
 #include "basilisk_lisk.c"
+#include "smartaddress.c"
 
 #include "basilisk_MSG.c"
 #include "tradebots_marketmaker.c"
@@ -492,6 +493,7 @@ int32_t basilisk_relayid(struct supernet_info *myinfo,uint32_t ipbits)
 #include "basilisk_ping.c"
 #include "basilisk_vote.c"
 #include "basilisk_CMD.c"
+#include "jumblr.c"
 
 void basilisk_functions(struct iguana_info *coin,int32_t protocol)
 {
@@ -870,7 +872,7 @@ int32_t basilisk_issued_purge(struct supernet_info *myinfo,int32_t timepad)
 void basilisks_loop(void *arg)
 {
     static uint32_t counter;
-    struct iguana_info *relay; struct supernet_info *myinfo = arg; int32_t iter; double startmilli,endmilli; struct dpow_info *dp;
+    struct iguana_info *relay; struct supernet_info *myinfo = arg; int32_t iter; double startmilli,endmilli; struct dpow_info *dp; 
     iter = 0;
     relay = iguana_coinfind("RELAY");
     printf("start basilisk loop\n");
@@ -951,6 +953,436 @@ void basilisks_init(struct supernet_info *myinfo)
 
 #include "../includes/iguana_apidefs.h"
 #include "../includes/iguana_apideclares.h"
+#include "../includes/iguana_apideclares2.h"
+
+TWO_STRINGS(tradebot,gensvm,base,rel)
+{
+#ifdef _WIN
+    return(clonestr("{\"error\":\"windows doesnt support SVM\"}"));
+#else
+    int32_t numfeatures = 317*61;
+    struct tradebot_arbpair *pair;
+    if ( base[0] != 0 && rel[0] != 0 && (pair= tradebots_arbpair_find(base,rel)) != 0 && pair->fp != 0 )
+    {
+        tradebots_calcanswers(pair);
+        ocas_gen(pair->refc,numfeatures,0,(int32_t)(ftell(pair->fp) / sizeof(pair->rawfeatures)));
+        return(clonestr("{\"result\":\"success\"}"));
+    } else return(clonestr("{\"error\":\"cant find arbpair\"}"));
+#endif
+}
+
+ZERO_ARGS(tradebot,openliquidity)
+{
+    int32_t i; cJSON *array = cJSON_CreateArray();
+    for (i=0; i<sizeof(myinfo->linfos)/sizeof(*myinfo->linfos); i++)
+    {
+        if ( myinfo->linfos[i].base[0] != 0 )
+            jaddi(array,linfo_json(&myinfo->linfos[i]));
+    }
+    return(jprint(array,1));
+}
+
+ZERO_ARGS(tradebot,allbalances)
+{
+    int32_t i,n; double value,pending; char *base; cJSON *item,*balances = cJSON_CreateObject();
+    if ( myinfo->liquidity_currencies == 0 )
+        myinfo->liquidity_currencies = cJSON_Parse("[\"KMD\", \"BTC\"]");
+    if ( myinfo->liquidity_currencies != 0 && (n= cJSON_GetArraySize(myinfo->liquidity_currencies)) > 0 )
+    {
+        for (i=0; i<n; i++)
+        {
+            base = jstri(myinfo->liquidity_currencies,i);
+            value = tradebot_balance(myinfo,base);
+            pending = tradebot_pending(myinfo,base);
+            item = cJSON_CreateObject();
+            jaddnum(item,"value",value);
+            jaddnum(item,"pending",pending);
+            jadd(balances,base,item);
+        }
+    }
+    return(jprint(balances,1));
+}
+
+ZERO_ARGS(tradebot,anchor)
+{
+    FILE *fp; char *anchorstr,fname[512]; cJSON *anchor; int32_t retval = -1;
+    if ( (anchorstr= tradebot_allbalances(myinfo,0,0,0)) != 0 )
+    {
+        if ( (anchor= cJSON_Parse(anchorstr)) != 0 )
+        {
+            if ( jobj(anchor,"error") == 0 )
+            {
+                sprintf(fname,"%s/anchor",GLOBAL_DBDIR), OS_compatible_path(fname);
+                if ( (fp= fopen(fname,"wb")) != 0 )
+                {
+                    if ( fwrite(anchorstr,1,strlen(anchorstr)+1,fp) == strlen(anchorstr)+1 )
+                        retval = 0;
+                    fclose(fp);
+                }
+            }
+        }
+        free(anchorstr);
+    }
+    if ( retval == 0 )
+        return(clonestr("{\"result\":\"success\"}"));
+    else return(clonestr("{\"error\":\"couldnt make anchor file\"}"));
+}
+
+ZERO_ARGS(tradebot,portfolio)
+{
+    char *currentstr,*anchorstr,fname[512]; long fsize; cJSON *current,*anchor=0,*portfolio=0;
+    if ( (currentstr= tradebot_allbalances(myinfo,0,0,0)) != 0 )
+    {
+        if ( (current= cJSON_Parse(currentstr)) != 0 )
+        {
+            sprintf(fname,"%s/anchor",GLOBAL_DBDIR), OS_compatible_path(fname);
+            if ( (anchorstr= OS_filestr(&fsize,fname)) != 0 )
+            {
+                anchor = cJSON_Parse(anchorstr);
+                free(anchorstr);
+            }
+            if ( anchor == 0 )
+                anchor = cJSON_Parse("{}");
+            portfolio = tradebot_balancesdiff(myinfo,current,anchor);
+            free_json(current);
+        }
+        free(currentstr);
+    }
+    if ( portfolio == 0 )
+        return(clonestr("{\"result\":\"success\"}"));
+    else return(jprint(portfolio,1));
+}
+
+ARRAY_OBJ_INT(tradebot,goals,currencies,vals,targettime)
+{
+    static bits256 zero; char *targetcoin; int32_t i,n;
+    if ( currencies != 0 && vals != 0 )
+    {
+        // init things so automatically updates refli.bid and refli.ask
+        // volume range with margin
+        // currency percentage value in BTC? target distribution, max percentage, min percentage`
+        // min price to sell, max price to buy, max volume
+        n = cJSON_GetArraySize(currencies);
+        for (i=0; i<n; i++)
+        {
+            targetcoin = jstri(currencies,i);
+            tradebot_liquidity_command(myinfo,targetcoin,zero,vals);
+        }
+        return(clonestr("{\"result\":\"success\"}"));
+    } else return(clonestr("{\"error\":\"no currencies or vals\"}"));
+}
+HASH_ARRAY_STRING(basilisk,getmessage,hash,vals,hexstr)
+{
+    uint32_t msgid,width,channel; char *retstr;
+    if ( bits256_cmp(GENESIS_PUBKEY,jbits256(vals,"srchash")) == 0 )
+        jaddbits256(vals,"srchash",hash);
+    if ( bits256_cmp(GENESIS_PUBKEY,jbits256(vals,"desthash")) == 0 )
+        jaddbits256(vals,"desthash",myinfo->myaddr.persistent);
+    if ( (msgid= juint(vals,"msgid")) == 0 )
+    {
+        msgid = (uint32_t)time(NULL);
+        jdelete(vals,"msgid");
+        jaddnum(vals,"msgid",msgid);
+    }
+    if ( myinfo->NOTARY.RELAYID >= 0 || myinfo->dexsock >= 0 || myinfo->subsock >= 0 )
+    {
+        channel = juint(vals,"channel");
+        width = juint(vals,"width");
+        retstr = basilisk_iterate_MSG(myinfo,channel,msgid,jbits256(vals,"srchash"),jbits256(vals,"desthash"),width);
+        //printf("getmessage.(%s)\n",retstr);
+        return(retstr);
+    }
+    //printf("getmessage not relay.%d dexsock.%d subsock.%d\n",myinfo->NOTARY.RELAYID,myinfo->dexsock,myinfo->subsock);
+    return(basilisk_standardservice("MSG",myinfo,0,jbits256(vals,"desthash"),vals,hexstr,1));
+}
+
+HASH_ARRAY_STRING(basilisk,sendmessage,hash,vals,hexstr)
+{
+    int32_t keylen,datalen,allocsize = 65536; uint8_t key[BASILISK_KEYSIZE],*space,*space2,*data,*ptr = 0; char *retstr=0;
+    space = calloc(1,allocsize);
+    space2 = calloc(1,allocsize);
+    data = get_dataptr(BASILISK_HDROFFSET,&ptr,&datalen,&space[BASILISK_KEYSIZE],allocsize-BASILISK_KEYSIZE,hexstr);
+    if ( myinfo->subsock >= 0 || myinfo->dexsock >= 0 || (myinfo->IAMNOTARY != 0 && myinfo->NOTARY.RELAYID >= 0) )
+    {
+        keylen = basilisk_messagekey(key,juint(vals,"channel"),juint(vals,"msgid"),jbits256(vals,"srchash"),jbits256(vals,"desthash"));
+        if ( data != 0 )
+        {
+            retstr = basilisk_respond_addmessage(myinfo,key,keylen,data,datalen,0,juint(vals,"duration"));
+        } else printf("no get_dataptr\n");
+        if ( retstr != 0 )
+            free(retstr);
+    } //else printf("not notary.%d relayid.%d\n",myinfo->IAMNOTARY,myinfo->NOTARY.RELAYID);
+    if ( vals != 0 && juint(vals,"fanout") == 0 )
+        jaddnum(vals,"fanout",MAX(8,(int32_t)sqrt(myinfo->NOTARY.NUMRELAYS)+2));
+    if ( BASILISK_KEYSIZE+datalen < allocsize )
+    {
+        memcpy(space2,key,BASILISK_KEYSIZE);
+        if ( data != 0 && datalen != 0 )
+            memcpy(&space2[BASILISK_KEYSIZE],data,datalen);
+        dex_reqsend(myinfo,"DEX",space2,datalen+BASILISK_KEYSIZE,1,"");
+    } else printf("sendmessage space too small error for %d\n",datalen);
+    free(space);
+    free(space2);
+    if ( ptr != 0 )
+        free(ptr);
+    return(basilisk_standardservice("OUT",myinfo,0,jbits256(vals,"desthash"),vals,hexstr,0));
+}
+
+HASH_ARRAY_STRING(basilisk,value,hash,vals,hexstr)
+{
+    char *retstr=0,*symbol,*coinaddr,*infostr; cJSON *retjson,*sobj,*info,*addrs,*txoutjson,*txjson,*array; uint32_t basilisktag,blocktime; bits256 txid,blockhash; struct basilisk_item *ptr,Lptr; uint64_t value; int32_t timeoutmillis,vout,height,n,m;
+    if ( vals == 0 )
+        return(clonestr("{\"error\":\"null valsobj\"}"));
+    //if ( myinfo->IAMNOTARY != 0 || myinfo->NOTARY.RELAYID >= 0 )
+    //    return(clonestr("{\"error\":\"special relays only do OUT and MSG\"}"));
+    //if ( coin == 0 )
+    {
+        if ( (symbol= jstr(vals,"symbol")) != 0 || (symbol= jstr(vals,"coin")) != 0 )
+            coin = iguana_coinfind(symbol);
+    }
+    if ( jobj(vals,"fanout") == 0 )
+        jaddnum(vals,"fanout",MAX(5,(int32_t)sqrt(myinfo->NOTARY.NUMRELAYS)+1));
+    txid = jbits256(vals,"txid");
+    vout = jint(vals,"vout");
+    if ( coin != 0 )
+    {
+        if ( coin->FULLNODE < 0 )
+        {
+            if ( (txoutjson= dpow_gettxout(myinfo,coin,txid,vout)) != 0 )
+            {
+                if ( (coinaddr= jstr(txoutjson,"address")) != 0 && (value= SATOSHIDEN*jdouble(txoutjson,"value")) != 0 )
+                {
+                    retjson = cJSON_CreateObject();
+                    jaddstr(retjson,"result","success");
+                    jaddstr(retjson,"address",coinaddr);
+                    jadd64bits(retjson,"satoshis",value);
+                    jaddnum(retjson,"value",dstr(value));
+                    jaddnum(retjson,"amount",dstr(value));
+                    height = dpow_getchaintip(myinfo,&blockhash,&blocktime,0,0,coin);
+                    jaddnum(retjson,"height",height);
+                    jaddnum(retjson,"numconfirms",jint(txoutjson,"confirmations"));
+                    jaddbits256(retjson,"txid",txid);
+                    jaddnum(retjson,"vout",vout);
+                    jaddstr(retjson,"coin",coin->symbol);
+                }
+                else
+                {
+                    free_json(txoutjson);
+                    return(clonestr("{\"error\":\"return from gettxout missing fields\"}"));
+                }
+                free_json(txoutjson);
+                return(jprint(retjson,1));
+            } else return(clonestr("{\"error\":\"null return from gettxout\"}"));
+        }
+        if ( (basilisktag= juint(vals,"basilisktag")) == 0 )
+            basilisktag = rand();
+        if ( (timeoutmillis= juint(vals,"timeout")) <= 0 )
+            timeoutmillis = BASILISK_TIMEOUT;
+        if ( coin->FULLNODE > 0 && (ptr= basilisk_bitcoinvalue(&Lptr,myinfo,coin,remoteaddr,basilisktag,timeoutmillis,vals)) != 0 )
+        {
+            retstr = ptr->retstr, ptr->retstr = 0;
+            ptr->finished = OS_milliseconds() + 10000;
+            return(retstr);
+        }
+    }
+    if ( myinfo->reqsock >= 0 )
+    {
+        if ( (retstr= _dex_getrawtransaction(myinfo,symbol,txid)) != 0 )
+        {
+            if ( (txoutjson= cJSON_Parse(retstr)) != 0 )
+            {
+                //printf("TX.(%s)\n",jprint(txoutjson,0));
+                retjson = cJSON_CreateObject();
+                jaddstr(retjson,"result","success");
+                jaddnum(retjson,"numconfirms",jint(txoutjson,"confirmations"));
+                if ( (array= jarray(&n,txoutjson,"vout")) != 0 && vout < n && (txjson= jitem(array,vout)) != 0 )
+                {
+                    //printf("txjson.(%s)\n",jprint(txjson,0));
+                    if ( (value= jdouble(txjson,"value") * SATOSHIDEN) != 0 )
+                    {
+                        if ( (sobj= jobj(txjson,"scriptPubKey")) != 0 && (addrs= jarray(&m,sobj,"addresses")) != 0 && (coinaddr= jstri(addrs,0)) != 0 )
+                            jaddstr(retjson,"address",coinaddr);
+                        jadd64bits(retjson,"satoshis",value);
+                        jaddnum(retjson,"value",dstr(value));
+                        if ( (infostr= _dex_getinfo(myinfo,symbol)) != 0 )
+                        {
+                            if ( (info= cJSON_Parse(infostr)) != 0 )
+                            {
+                                if ( (height= jint(info,"blocks")) > 0 )
+                                {
+                                    height -= jint(txoutjson,"confirmations");
+                                    jaddnum(retjson,"height",height);
+                                }
+                                free_json(info);
+                            }
+                            free(infostr);
+                        }
+                        jaddbits256(retjson,"txid",txid);
+                        jaddnum(retjson,"vout",vout);
+                        jaddstr(retjson,"coin",symbol);
+                        free(retstr);
+                        free_json(txoutjson);
+                        return(jprint(retjson,1));
+                    }
+                }
+                free_json(txoutjson);
+                return(jprint(retjson,1));
+            }
+            return(retstr);
+        }
+    }
+    return(basilisk_standardservice("VAL",myinfo,0,hash,vals,hexstr,1));
+}
+
+HASH_ARRAY_STRING(basilisk,rawtx,hash,vals,hexstr)
+{
+    char *retstr=0,*symbol; uint32_t basilisktag; int32_t timeoutmillis,i,retval = -1; uint64_t amount,txfee; cJSON *retarray;
+    if ( vals == 0 )
+        return(clonestr("{\"error\":\"null valsobj\"}"));
+    //if ( coin == 0 )
+    {
+        if ( (symbol= jstr(vals,"symbol")) != 0 || (symbol= jstr(vals,"coin")) != 0 )
+            coin = iguana_coinfind(symbol);
+    }
+    if ( jobj(vals,"numrequired") == 0 )
+        jaddnum(vals,"numrequired",MIN(3,(int32_t)sqrt(myinfo->NOTARY.NUMRELAYS)+1));
+    if ( jobj(vals,"fanout") == 0 )
+        jaddnum(vals,"fanout",MAX(3,(int32_t)sqrt(myinfo->NOTARY.NUMRELAYS)+1));
+    if ( coin != 0 )
+    {
+        //if ( juint(vals,"burn") == 0 )
+        //    jaddnum(vals,"burn",0.0001);
+        if ( (basilisktag= juint(vals,"basilisktag")) == 0 )
+            basilisktag = rand();
+        if ( (timeoutmillis= juint(vals,"timeout")) <= 0 )
+            timeoutmillis = BASILISK_TIMEOUT;
+        if ( (retstr= basilisk_bitcoinrawtx(myinfo,coin,remoteaddr,basilisktag,timeoutmillis,vals,0)) != 0 )
+        {
+            printf("rawtx.(%s)\n",retstr);
+            if ( (amount= j64bits(vals,"satoshis")) == 0 )
+                amount = jdouble(vals,"value") * SATOSHIDEN;
+            if ( (txfee= j64bits(vals,"txfee")) == 0 )
+                txfee = coin->chain->txfee;
+            if ( txfee == 0 )
+                txfee = 10000;
+            retval = -1;
+            if ( (retarray= cJSON_Parse(retstr)) != 0 )
+            {
+                if ( is_cJSON_Array(retarray) != 0 )
+                {
+                    for (i=0; i<cJSON_GetArraySize(retarray); i++)
+                    {
+                        if ( basilisk_vins_validate(myinfo,coin,jitem(retarray,i),amount,txfee) == 0 )
+                        {
+                            retval = 0;
+                            break;
+                        }
+                    }
+                } else retval = basilisk_vins_validate(myinfo,coin,retarray,amount,txfee);
+                if ( retval < 0 )
+                {
+                    printf("ERROR.(%s)\n",retstr);
+                    free(retstr);
+                    retstr = clonestr("{\"error\":\"invalid vin in rawtx\"}");
+                }
+            }
+        }
+    } else retstr = clonestr("{\"error\":\"no coin specified or found\"}");
+    return(retstr);
+}
+
+STRING_ARG(jumblr,setpassphrase,passphrase)
+{
+    cJSON *retjson; char KMDaddr[64],BTCaddr[64],wifstr[64]; bits256 privkey; struct iguana_info *coinbtc;
+    if ( passphrase == 0 || passphrase[0] == 0 || (coin= iguana_coinfind("KMD")) == 0 || coin->FULLNODE >= 0 )
+        return(clonestr("{\"error\":\"no passphrase or no native komodod\"}"));
+    else
+    {
+        safecopy(myinfo->jumblr_passphrase,passphrase,sizeof(myinfo->jumblr_passphrase));
+        retjson = cJSON_CreateObject();
+        jaddstr(retjson,"result","success");
+        privkey = jumblr_privkey(myinfo,BTCaddr,KMDaddr,JUMBLR_DEPOSITPREFIX);
+        smartaddress_add(myinfo,privkey,BTCaddr,KMDaddr);
+        myinfo->jumblr_depositkey = curve25519(privkey,curve25519_basepoint9());
+        bitcoin_priv2wif(wifstr,privkey,coin->chain->wiftype);
+        if ( coin->FULLNODE < 0 )
+            jumblr_importprivkey(myinfo,coin,wifstr);
+        jaddstr(retjson,"KMDdeposit",KMDaddr);
+        jaddstr(retjson,"BTCdeposit",BTCaddr);
+        if ( (coinbtc= iguana_coinfind("BTC")) != 0 )
+        {
+            bitcoin_priv2wif(wifstr,privkey,coinbtc->chain->wiftype);
+            if ( coinbtc->FULLNODE < 0 )
+                jumblr_importprivkey(myinfo,coinbtc,wifstr);
+            jaddnum(retjson,"BTCdeposits",dstr(jumblr_balance(myinfo,coinbtc,BTCaddr)));
+        }
+        privkey = jumblr_privkey(myinfo,BTCaddr,KMDaddr,"");
+        smartaddress_add(myinfo,privkey,BTCaddr,KMDaddr);
+        myinfo->jumblr_pubkey = curve25519(privkey,curve25519_basepoint9());
+        jaddstr(retjson,"KMDjumblr",KMDaddr);
+        jaddstr(retjson,"BTCjumblr",BTCaddr);
+        if ( coinbtc != 0 )
+            jaddnum(retjson,"BTCjumbled",dstr(jumblr_balance(myinfo,coinbtc,BTCaddr)));
+        return(jprint(retjson,1));
+    }
+}
+
+ZERO_ARGS(jumblr,status)
+{
+    cJSON *retjson; char KMDaddr[64],BTCaddr[64]; struct jumblr_item *ptr,*tmp; struct iguana_info *coinbtc; int64_t received,deposited,jumblred,step_t2z,step_z2z,step_z2t,finished,pending,maxval,minval;
+    if ( strcmp(coin->symbol,"KMD") == 0 && coin->FULLNODE < 0 && myinfo->jumblr_passphrase[0] != 0 )
+    {
+        jumblr_opidsupdate(myinfo,coin);
+        retjson = cJSON_CreateObject();
+        step_t2z = step_z2z = step_z2t = deposited = finished = pending = 0;
+        jumblr_privkey(myinfo,BTCaddr,KMDaddr,JUMBLR_DEPOSITPREFIX);
+        jaddstr(retjson,"KMDdeposit",KMDaddr);
+        jaddstr(retjson,"BTCdeposit",BTCaddr);
+        if ( (coinbtc= iguana_coinfind("BTC")) != 0 )
+            jaddnum(retjson,"BTCdeposits",dstr(jumblr_balance(myinfo,coinbtc,BTCaddr)));
+        received = jumblr_receivedby(myinfo,coin,KMDaddr);
+        deposited = jumblr_balance(myinfo,coin,KMDaddr);
+        jumblr_privkey(myinfo,BTCaddr,KMDaddr,"");
+        jaddstr(retjson,"KMDjumblr",KMDaddr);
+        jaddstr(retjson,"BTCjumblr",BTCaddr);
+        if ( coinbtc != 0 )
+            jaddnum(retjson,"BTCjumbled",dstr(jumblr_balance(myinfo,coinbtc,BTCaddr)));
+        finished = jumblr_receivedby(myinfo,coin,KMDaddr);
+        jumblred = jumblr_balance(myinfo,coin,KMDaddr);
+        HASH_ITER(hh,myinfo->jumblrs,ptr,tmp)
+        {
+            if ( strlen(ptr->src) >= 40 )
+            {
+                if ( strlen(ptr->dest) >= 40 )
+                    step_z2z += ptr->amount;
+                else step_z2t += ptr->amount;
+            } else step_t2z += ptr->amount;
+        }
+        jaddstr(retjson,"result","success");
+        jaddnum(retjson,"deposits",dstr(deposited));
+        jaddnum(retjson,"t_to_z",dstr(step_t2z));
+        jaddnum(retjson,"z_to_z",dstr(step_z2z));
+        jaddnum(retjson,"z_to_t",dstr(step_z2t));
+        maxval = MAX(step_t2z,MAX(step_z2z,step_z2t));
+        minval = MIN(step_t2z,MIN(step_z2z,step_z2t));
+        if ( maxval > minval )
+        {
+            pending = (maxval - minval);
+            if ( pending < finished*.1 )
+                pending = 0;
+        }
+        jaddnum(retjson,"pending",dstr(pending));
+        jaddnum(retjson,"jumbled",dstr(jumblred));
+        jaddnum(retjson,"received",dstr(received));
+        jaddnum(retjson,"finished",dstr(finished));
+        return(jprint(retjson,1));
+    }
+    else
+    {
+        printf("(%s) (%s) %d\n",coin->symbol,myinfo->jumblr_passphrase,coin->FULLNODE);
+        return(clonestr("{\"error\":\"jumblr status no passphrase or no native komodod\"}"));
+    }
+}
 
 HASH_ARRAY_STRING(basilisk,balances,hash,vals,hexstr)
 {
@@ -1084,9 +1516,16 @@ int32_t utxocmp(cJSON *utxo,cJSON *utxo2)
     else return(-1);
 }
 
+ZERO_ARGS(basilisk,cancelrefresh)
+{
+    myinfo->cancelrefresh = 1;
+    return(clonestr("{\"result\":\"refresh cancel started\"}"));
+}
+
 TWO_STRINGS(basilisk,refresh,symbol,address)
 {
     cJSON *array=0,*array2=0,*array3,*item,*item2; char *retstr; int32_t i,j,n,m,vout; bits256 txid;
+    myinfo->cancelrefresh = 0;
     if ( symbol != 0 && iguana_isnotarychain(symbol) >= 0 && address != 0 && address[0] != 0 )
     {
         if ( (retstr= _dex_listunspent(myinfo,symbol,address)) != 0 )
@@ -1109,6 +1548,8 @@ TWO_STRINGS(basilisk,refresh,symbol,address)
             //printf("MERGE %s and %s\n",jprint(array,0),jprint(array2,0));
             for (j=0; j<m; j++)
             {
+                if ( myinfo->cancelrefresh != 0 )
+                    break;
                 item2 = jitem(array2,j);
                 for (i=0; i<n; i++)
                     if ( utxocmp(jitem(array,i),item2) == 0 )
@@ -1129,6 +1570,8 @@ TWO_STRINGS(basilisk,refresh,symbol,address)
             array3 = cJSON_CreateArray();
             for (i=0; i<n; i++)
             {
+                if ( myinfo->cancelrefresh != 0 )
+                    break;
                 item = jitem(array,i);
                 txid = jbits256(item,"txid");
                 vout = jint(item,"vout");
@@ -1150,9 +1593,11 @@ TWO_STRINGS(basilisk,refresh,symbol,address)
                 }
             }
             free_json(array);
+            myinfo->cancelrefresh = 0;
             return(jprint(array3,1));
         } else return(clonestr("[]"));
     }
+    myinfo->cancelrefresh = 0;
     return(clonestr("{\"error\":\"invalid coin or address specified\"}"));
 }
 
@@ -1166,8 +1611,7 @@ STRING_ARRAY_OBJ_STRING(basilisk,utxorawtx,symbol,utxos,vals,ignore)
     changeaddr = jstr(vals,"changeaddr");
     if ( destaddr != 0 && changeaddr != 0 && symbol != 0 && (coin= iguana_coinfind(symbol)) != 0 )
     {
-        if ( (txfee= jdouble(vals,"txfee") * SATOSHIDEN) == 0 )
-            txfee = coin->txfee;
+        txfee = jdouble(vals,"txfee") * SATOSHIDEN;
         return(iguana_utxorawtx(myinfo,coin,timelock,destaddr,changeaddr,satoshis,txfee,&completed,sendflag,utxos));
     }
     return(clonestr("{\"error\":\"invalid coin or address specified\"}"));
@@ -1175,5 +1619,249 @@ STRING_ARRAY_OBJ_STRING(basilisk,utxorawtx,symbol,utxos,vals,ignore)
 
 
 //int64_t iguana_verifytimelock(struct supernet_info *myinfo,struct iguana_info *coin,uint32_t timelocked,char *destaddr,bits256 txid,int32_t vout)
+THREE_STRINGS_AND_DOUBLE(tradebot,aveprice,comment,base,rel,basevolume)
+{
+    double retvals[4],aveprice; cJSON *retjson = cJSON_CreateObject();
+    aveprice = instantdex_avehbla(myinfo,retvals,base,rel,basevolume);
+    jaddstr(retjson,"result","success");
+    jaddnum(retjson,"aveprice",aveprice);
+    jaddnum(retjson,"avebid",retvals[0]);
+    jaddnum(retjson,"bidvol",retvals[1]);
+    jaddnum(retjson,"aveask",retvals[2]);
+    jaddnum(retjson,"askvol",retvals[3]);
+    return(jprint(retjson,1));
+}
+
+ZERO_ARGS(InstantDEX,allcoins)
+{
+    struct iguana_info *tmp; cJSON *native,*notarychains,*basilisk,*virtual,*full,*retjson = cJSON_CreateObject();
+    full = cJSON_CreateArray();
+    native = cJSON_CreateArray();
+    basilisk = cJSON_CreateArray();
+    virtual = cJSON_CreateArray();
+    notarychains = cJSON_CreateArray();
+    HASH_ITER(hh,myinfo->allcoins,coin,tmp)
+    {
+        if ( coin->FULLNODE < 0 )
+            jaddistr(native,coin->symbol);
+        //else if ( coin->virtualchain != 0 )
+        //    jaddistr(virtual,coin->symbol);
+        else if ( coin->FULLNODE > 0 )//|| coin->VALIDATENODE > 0 )
+            jaddistr(full,coin->symbol);
+        //else if ( coin->notarychain >= 0 )
+        //    jaddistr(notarychains,coin->symbol);
+        else jaddistr(basilisk,coin->symbol);
+    }
+    jadd(retjson,"native",native);
+    jadd(retjson,"basilisk",basilisk);
+    jadd(retjson,"full",full);
+    //jadd(retjson,"virtual",virtual);
+    //jadd(retjson,"notarychains",notarychains);
+    return(jprint(retjson,1));
+}
+
+STRING_ARG(InstantDEX,available,source)
+{
+    uint64_t total = 0; int32_t i,n=0; char coinaddr[64]; cJSON *item,*unspents,*retjson = 0;
+    if ( source != 0 && source[0] != 0 && (coin= iguana_coinfind(source)) != 0 )
+    {
+        if ( myinfo->expiration != 0 )
+        {
+            bitcoin_address(coinaddr,coin->chain->pubtype,myinfo->persistent_pubkey33,33);
+            if ( (unspents= basilisk_unspents(myinfo,coin,coinaddr)) != 0 )
+            {
+                //printf("available.(%s)\n",jprint(unspents,0));
+                if ( (n= cJSON_GetArraySize(unspents)) > 0 )
+                {
+                    for (i=0; i<n; i++)
+                    {
+                        item = jitem(unspents,i);
+                        //if ( is_cJSON_True(jobj(item,"spendable")) != 0 )
+                        total += jdouble(item,"amount") * SATOSHIDEN;
+                        //printf("(%s) -> %.8f\n",jprint(item,0),dstr(total));
+                    }
+                }
+                free_json(unspents);
+            }
+            retjson = cJSON_CreateObject();
+            jaddnum(retjson,"result",dstr(total));
+            printf(" n.%d total %.8f (%s)\n",n,dstr(total),jprint(retjson,0));
+            return(jprint(retjson,1));
+        }
+        printf("InstantDEX_available: need to unlock wallet\n");
+        return(clonestr("{\"error\":\"need to unlock wallet\"}"));
+    }
+    printf("InstantDEX_available: %s is not active\n",source!=0?source:"");
+    return(clonestr("{\"error\":\"specified coin is not active\"}"));
+}
+
+HASH_ARRAY_STRING(InstantDEX,request,hash,vals,hexstr)
+{
+    uint8_t serialized[512]; bits256 privkey; char buf[512],BTCaddr[64],KMDaddr[64]; struct basilisk_request R; int32_t jumblr,iambob,optionhours; cJSON *reqjson; uint32_t datalen=0,DEX_channel; struct iguana_info *bobcoin,*alicecoin;
+    myinfo->DEXactive = (uint32_t)time(NULL) + 3*BASILISK_TIMEOUT + 60;
+    jadd64bits(vals,"minamount",jdouble(vals,"minprice") * jdouble(vals,"amount") * SATOSHIDEN * SATOSHIDEN);
+    if ( jobj(vals,"desthash") == 0 )
+        jaddbits256(vals,"desthash",hash);
+    jadd64bits(vals,"satoshis",jdouble(vals,"amount") * SATOSHIDEN);
+    jadd64bits(vals,"destsatoshis",jdouble(vals,"destamount") * SATOSHIDEN);
+    jaddnum(vals,"timestamp",time(NULL));
+    if ( (jumblr= jint(vals,"usejumblr")) != 0 )
+        privkey = jumblr_privkey(myinfo,BTCaddr,KMDaddr,jumblr == 1 ? JUMBLR_DEPOSITPREFIX : "");
+    else privkey = myinfo->persistent_priv;
+    hash = curve25519(privkey,curve25519_basepoint9());
+    if ( jobj(vals,"srchash") == 0 )
+        jaddbits256(vals,"srchash",hash);
+    printf("service.(%s)\n",jprint(vals,0));
+    memset(&R,0,sizeof(R));
+    if ( basilisk_request_create(&R,vals,hash,juint(vals,"timestamp")) == 0 )
+    {
+        iambob = bitcoin_coinptrs(hash,&bobcoin,&alicecoin,R.src,R.dest,privkey,GENESIS_PUBKEY);
+        if ( (optionhours= jint(vals,"optionhours")) != 0 )
+        {
+            printf("iambob.%d optionhours.%d R.requestid.%u vs calc %u, q.%u\n",iambob,R.optionhours,R.requestid,basilisk_requestid(&R),R.quoteid);
+            if ( iambob != 0 && optionhours > 0 )
+            {
+                sprintf(buf,"{\"error\":\"illegal call option request hours.%d when iambob.%d\"}",optionhours,iambob);
+                printf("ERROR.(%s)\n",buf);
+                return(clonestr(buf));
+            }
+            else if ( iambob == 0 && optionhours < 0 )
+            {
+                sprintf(buf,"{\"error\":\"illegal put option request hours.%d when iambob.%d\"}",optionhours,iambob);
+                printf("ERROR.(%s)\n",buf);
+                return(clonestr(buf));
+            }
+        }
+        //if ( myinfo->IAMNOTARY != 0 || myinfo->NOTARY.RELAYID >= 0 )
+        //    R.relaybits = myinfo->myaddr.myipbits;
+        if ( (reqjson= basilisk_requestjson(&R)) != 0 )
+            free_json(reqjson);
+        datalen = basilisk_rwDEXquote(1,serialized,&R);
+        //int32_t i; for (i=0; i<sizeof(R); i++)
+        //    printf("%02x",((uint8_t *)&R)[i]);
+        printf(" R.requestid.%u vs calc %u, q.%u datalen.%d\n",R.requestid,basilisk_requestid(&R),R.quoteid,datalen);
+        basilisk_rwDEXquote(0,serialized,&R);
+    } else printf("error creating request\n");
+    if ( datalen > 0 )
+    {
+        uint32_t msgid;//,crc=0,crcs[2],numiters = 0; uint8_t buf[4096];
+        memset(hash.bytes,0,sizeof(hash));
+        msgid = (uint32_t)time(NULL);
+        DEX_channel = 'D' + ((uint32_t)'E' << 8) + ((uint32_t)'X' << 16);
+        basilisk_channelsend(myinfo,hash,hash,DEX_channel,msgid,serialized,datalen,60);
+        sleep(3);
+        /*while ( numiters < 10 && (crc= basilisk_crcsend(myinfo,0,buf,sizeof(buf),hash,myinfo->myaddr.persistent,DEX_channel,msgid,serialized,datalen,crcs)) == 0 )
+         {
+         //printf("didnt get back what was sent\n");
+         sleep(3);
+         basilisk_channelsend(myinfo,myinfo->myaddr.persistent,hash,DEX_channel,msgid,serialized,datalen,60);
+         numiters++;
+         }*/
+        //if ( crc != 0 )//basilisk_channelsend(myinfo,R.srchash,R.desthash,DEX_channel,(uint32_t)time(NULL),serialized,datalen,30) == 0 )
+        return(clonestr("{\"result\":\"DEX message sent\"}"));
+        //else return(clonestr("{\"error\":\"DEX message couldnt be sent\"}"));
+    }
+    return(clonestr("{\"error\":\"DEX message not sent\"}"));
+}
+
+INT_ARG(InstantDEX,automatched,requestid)
+{
+    // return quoteid
+    myinfo->DEXactive = (uint32_t)time(NULL) + INSTANTDEX_LOCKTIME;
+    return(clonestr("{\"result\":\"automatched not yet\"}"));
+}
+
+int32_t InstantDEX_incoming_func(struct supernet_info *myinfo,void *ptr,uint8_t *data,int32_t datalen)
+{
+    //int32_t i;
+    //for (i=0; i<datalen; i++)
+    //    printf("%02x",data[i]);
+    //printf(" <- incoming\n");
+    return(0);
+}
+
+int32_t InstantDEX_process_channelget(struct supernet_info *myinfo,void *ptr,int32_t (*internal_func)(struct supernet_info *myinfo,void *ptr,uint8_t *data,int32_t datalen),uint32_t channel,uint32_t msgid,uint8_t *data,int32_t datalen,uint32_t expiration,uint32_t duration)
+{
+    return((*internal_func)(myinfo,ptr,data,datalen));
+}
+
+INT_ARG(InstantDEX,incoming,requestid)
+{
+    cJSON *retjson,*retarray; bits256 zero; uint32_t DEX_channel,msgid,now; int32_t retval,width,drift=3; uint8_t data[32768];
+    now = (uint32_t)time(NULL);
+    memset(&zero,0,sizeof(zero));
+    width = (now - myinfo->DEXpoll) + 2*drift;
+    if ( width < (drift+1) )
+        width = 2*drift+1;
+    else if ( width > 64 )
+        width = 64;
+    myinfo->DEXpoll = now;
+    retjson = cJSON_CreateObject();
+    DEX_channel = 'D' + ((uint32_t)'E' << 8) + ((uint32_t)'X' << 16);
+    msgid = (uint32_t)time(NULL) + drift;
+    if ( (retarray= basilisk_channelget(myinfo,zero,myinfo->myaddr.persistent,DEX_channel,msgid,width)) != 0 )
+    {
+        //printf("GOT.(%s)\n",jprint(retarray,0));
+        if ( (retval= basilisk_process_retarray(myinfo,0,InstantDEX_process_channelget,data,sizeof(data),DEX_channel,msgid,retarray,InstantDEX_incoming_func)) > 0 )
+        {
+            jaddstr(retjson,"result","success");
+        } else jaddstr(retjson,"error","cant process InstantDEX retarray");
+        jadd(retjson,"responses",retarray);
+    }
+    else
+    {
+        jaddstr(retjson,"error","cant do InstantDEX channelget");
+        printf("error channelget\n");
+    }
+    return(jprint(retjson,1));
+}
+
+/*TWO_INTS(InstantDEX,swapstatus,requestid,quoteid)
+ {
+ cJSON *vals; char *retstr;
+ myinfo->DEXactive = (uint32_t)time(NULL) + INSTANTDEX_LOCKTIME;
+ //if ( myinfo->IAMLP != 0 )
+ //    return(basilisk_respond_swapstatus(myinfo,myinfo->myaddr.persistent,requestid,quoteid));
+ //else
+ {
+ vals = cJSON_CreateObject();
+ jaddnum(vals,"requestid",(uint32_t)requestid);
+ jaddnum(vals,"quoteid",(uint32_t)quoteid);
+ jaddbits256(vals,"hash",myinfo->myaddr.persistent);
+ retstr = basilisk_standardservice("SWP",myinfo,0,myinfo->myaddr.persistent,vals,"",1);
+ free_json(vals);
+ return(retstr);
+ }
+ }*/
+
+TWO_INTS(InstantDEX,accept,requestid,quoteid)
+{
+    cJSON *vals; char *retstr;
+    myinfo->DEXactive = (uint32_t)time(NULL) + INSTANTDEX_LOCKTIME;
+    if ( myinfo->IAMLP != 0 || myinfo->dexsock >= 0 || myinfo->subsock >= 0 )
+        return(basilisk_respond_accept(myinfo,myinfo->persistent_priv,requestid,quoteid,&myinfo->DEXaccept));
+    else
+    {
+        vals = cJSON_CreateObject();
+        jaddnum(vals,"quoteid",(uint32_t)quoteid);
+        jaddnum(vals,"requestid",(uint32_t)requestid);
+        retstr = basilisk_standardservice("ACC",myinfo,0,myinfo->myaddr.persistent,vals,"",1);
+        free_json(vals);
+        return(retstr);
+    }
+}
+
+ZERO_ARGS(InstantDEX,init)
+{
+    basilisk_swaps_init(myinfo);
+    return(clonestr("{\"result\":\"success\"}"));
+}
+
+ZERO_ARGS(InstantDEX,getswaplist)
+{
+    return(basilisk_swaplist(myinfo));
+}
+
+
 
 #include "../includes/iguana_apiundefs.h"

basilisk/basilisk.h

@@ -16,7 +16,7 @@
 #ifndef H_BASILISK_H
 #define H_BASILISK_H
 
-//#define BASILISK_DISABLESENDTX
+#define BASILISK_DISABLESENDTX
 #define BASILISK_DISABLEWAITTX
 
 #include "../iguana/iguana777.h"
@@ -37,13 +37,16 @@
 #define INSTANTDEX_INSURANCEDIV 777
 #define INSTANTDEX_PUBKEY "03bc2c7ba671bae4a6fc835244c9762b41647b9827d4780a89a949b984a8ddcc06"
 #define INSTANTDEX_RMD160 "ca1e04745e8ca0c60d8c5881531d51bec470743f"
+#define JUMBLR_RMD160 "5177f8b427e5f47342a4b8ab5dac770815d4389e"
 #define TIERNOLAN_RMD160 "daedddd8dbe7a2439841ced40ba9c3d375f98146"
 #define INSTANTDEX_BTC "1KRhTPvoxyJmVALwHFXZdeeWFbcJSbkFPu"
 #define INSTANTDEX_BTCD "RThtXup6Zo7LZAi8kRWgjAyi1s4u6U9Cpf"
 
+struct basilisk_swap;
+
 struct basilisk_rawtxinfo
 {
-    char destaddr[64];
+    char destaddr[64],coinstr[16];
     bits256 txid,signedtxid,actualtxid;
     uint64_t amount,change,inputsum;
     int32_t redeemlen,datalen,completed,vintype,vouttype,numconfirms,spendlen,secretstart,suppress_pubkeys;
@@ -57,8 +60,9 @@ struct basilisk_rawtx
     struct iguana_msgtx msgtx;
     struct basilisk_rawtxinfo I;
     struct iguana_info *coin;
+    char vinstr[8192];
     cJSON *vins;
-    uint8_t *txbytes,spendscript[512],redeemscript[1024],extraspace[1024];
+    uint8_t txbytes[16384],spendscript[512],redeemscript[1024],extraspace[4096];
 };
 
 struct basilisk_swapinfo
@@ -67,27 +71,16 @@ struct basilisk_swapinfo
     char bobstr[64],alicestr[64];
     bits256 myhash,otherhash,orderhash;
     uint32_t statebits,otherstatebits,started,expiration,finished,dead,reftime,putduration,callduration;
-    int32_t bobconfirms,aliceconfirms,iambob,reclaimed,bobspent,alicespent;
+    int32_t bobconfirms,aliceconfirms,iambob,reclaimed,bobspent,alicespent,pad;
     uint64_t alicesatoshis,bobsatoshis,bobinsurance,aliceinsurance;
     
     bits256 myprivs[2],mypubs[2],otherpubs[2],pubA0,pubA1,pubB0,pubB1,privAm,pubAm,privBn,pubBn;
     uint32_t crcs_mypub[2],crcs_mychoosei[2],crcs_myprivs[2],crcs_mypriv[2];
-    int32_t choosei,otherchoosei,cutverified,otherverifiedcut,numpubs,havestate,otherhavestate;
+    int32_t choosei,otherchoosei,cutverified,otherverifiedcut,numpubs,havestate,otherhavestate,pad2;
     uint8_t secretAm[20],secretBn[20];
     uint8_t secretAm256[32],secretBn256[32];
 };
 
-struct basilisk_swap
-{
-    struct supernet_info *myinfo; struct iguana_info *bobcoin,*alicecoin;
-    void (*balancingtrade)(struct supernet_info *myinfo,struct basilisk_swap *swap,int32_t iambob);
-    struct basilisk_swapinfo I;
-    struct basilisk_rawtx bobdeposit,bobpayment,alicepayment,myfee,otherfee,aliceclaim,alicespend,bobreclaim,bobspend,bobrefund,alicereclaim;
-    bits256 privkeys[INSTANTDEX_DECKSIZE];
-    uint64_t otherdeck[INSTANTDEX_DECKSIZE][2],deck[INSTANTDEX_DECKSIZE][2];
-    uint8_t verifybuf[65536];
-};
-
 struct basilisk_value { bits256 txid; int64_t value; int32_t height; int16_t vout; char coinaddr[64]; };
 
 struct basilisk_item
@@ -135,7 +128,7 @@ int32_t basilisk_update(char *symbol,uint32_t reftimestamp);
 void basilisk_seqresult(struct supernet_info *myinfo,char *retstr);
 struct iguana_info *basilisk_geckochain(struct supernet_info *myinfo,char *symbol,char *chainname,cJSON *valsobj);
 void basilisk_alicepayment(struct supernet_info *myinfo,struct basilisk_swap *swap,struct iguana_info *coin,struct basilisk_rawtx *alicepayment,bits256 pubAm,bits256 pubBn);
-void basilisk_rawtx_setparms(char *name,struct supernet_info *myinfo,struct basilisk_swap *swap,struct basilisk_rawtx *rawtx,struct iguana_info *coin,int32_t numconfirms,int32_t vintype,uint64_t satoshis,int32_t vouttype,uint8_t *pubkey33);
+void basilisk_rawtx_setparms(char *name,uint32_t quoteid,struct basilisk_rawtx *rawtx,struct iguana_info *coin,int32_t numconfirms,int32_t vintype,uint64_t satoshis,int32_t vouttype,uint8_t *pubkey33,int32_t jumblrflag);
 void basilisk_setmyid(struct supernet_info *myinfo);
 int32_t basilisk_rwDEXquote(int32_t rwflag,uint8_t *serialized,struct basilisk_request *rp);
 cJSON *basilisk_requestjson(struct basilisk_request *rp);

basilisk/basilisk_DEX.c

@@ -229,15 +229,17 @@ int32_t basilisk_request_create(struct basilisk_request *rp,cJSON *valsobj,bits2
     return(-1);
 }
 
-char *basilisk_start(struct supernet_info *myinfo,struct basilisk_request *_rp,uint32_t statebits,int32_t optionduration)
+char *basilisk_start(struct supernet_info *myinfo,bits256 privkey,struct basilisk_request *_rp,uint32_t statebits,int32_t optionduration)
 {
-    cJSON *retjson; struct basilisk_request *rp=0; int32_t i;
+    cJSON *retjson; bits256 tmpprivkey; struct basilisk_request *rp=0; int32_t i,srcmatch,destmatch;
     if ( _rp->requestid == myinfo->lastdexrequestid )
     {
         //printf("filter duplicate r%u\n",_rp->requestid);
         return(clonestr("{\"error\":\"filter duplicate requestid\"}"));
     }
-    if ( (bits256_cmp(_rp->srchash,myinfo->myaddr.persistent) == 0 || bits256_cmp(_rp->desthash,myinfo->myaddr.persistent) == 0) )
+    srcmatch = smartaddress_pubkey(myinfo,&tmpprivkey,_rp->srchash) >= 0;
+    destmatch = smartaddress_pubkey(myinfo,&tmpprivkey,_rp->desthash) >= 0;
+    if ( srcmatch != 0 || destmatch != 0 )
     {
         for (i=0; i<myinfo->numswaps; i++)
             if ( myinfo->swaps[i]->I.req.requestid == _rp->requestid )
@@ -251,12 +253,11 @@ char *basilisk_start(struct supernet_info *myinfo,struct basilisk_request *_rp,u
             *rp = *_rp;
             printf("START thread to complete %u/%u for (%s %.8f) <-> (%s %.8f) q.%u\n",rp->requestid,rp->quoteid,rp->src,dstr(rp->srcamount),rp->dest,dstr(rp->destamount),rp->quoteid);
             myinfo->lastdexrequestid = rp->requestid;
-            if ( basilisk_thread_start(myinfo,rp,statebits,optionduration) != 0 )
+            if ( basilisk_thread_start(myinfo,privkey,rp,statebits,optionduration,0) != 0 )
             {
                 basilisk_request_enqueue(myinfo,rp);
                 return(clonestr("{\"result\":\"started atomic swap thread\"}"));
-            }
-            else return(clonestr("{\"error\":\"couldnt atomic swap thread\"}"));
+            } else return(clonestr("{\"error\":\"couldnt atomic swap thread\"}"));
         }
         else
         {
@@ -275,8 +276,8 @@ char *basilisk_start(struct supernet_info *myinfo,struct basilisk_request *_rp,u
 void basilisk_requests_poll(struct supernet_info *myinfo)
 {
     static uint32_t lastpoll;
-    char *retstr; uint8_t data[32768]; cJSON *outerarray,*retjson; uint32_t msgid,channel; int32_t datalen,i,n; struct basilisk_request issueR; double hwm = 0.;
-    if ( time(NULL) < lastpoll+3 )
+    char *retstr; uint8_t data[32768]; cJSON *outerarray,*retjson; uint32_t msgid,channel; int32_t datalen,i,n; struct basilisk_request issueR; bits256 privkey; double hwm = 0.;
+    if ( myinfo->IAMNOTARY != 0 || time(NULL) < lastpoll+20 || (myinfo->IAMLP == 0 && myinfo->DEXactive < time(NULL)) )
         return;
     lastpoll = (uint32_t)time(NULL);
     memset(&issueR,0,sizeof(issueR));
@@ -299,42 +300,15 @@ void basilisk_requests_poll(struct supernet_info *myinfo)
     channel = 'D' + ((uint32_t)'E' << 8) + ((uint32_t)'X' << 16);
     if ( hwm > 0. )
     {
-        //printf("hwm %f\n",hwm);
-        //for (i=0; i<sizeof(issueR); i++)
-        //    printf("%02x",((uint8_t *)&issueR)[i]);
-        //printf("\n");
         myinfo->DEXaccept = issueR;
-        /*issueR.quoteid = basilisk_quoteid(&issueR);
-        datalen = basilisk_rwDEXquote(1,data,&issueR);
-        msgid = (uint32_t)time(NULL);
-        keylen = basilisk_messagekey(key,0,msgid,issueR.srchash,issueR.desthash);
-        if ( (retstr= basilisk_respond_addmessage(myinfo,key,keylen,data,datalen,0,BASILISK_DEXDURATION)) != 0 )
-            free(retstr);*/
-        if ( bits256_cmp(myinfo->myaddr.persistent,issueR.srchash) == 0 ) // my request
+        if ( smartaddress_pubkey(myinfo,&privkey,issueR.srchash) >= 0 )
         {
+            printf("matched dex_smartpubkey\n");
             dex_channelsend(myinfo,issueR.srchash,issueR.desthash,channel,0x4000000,(void *)&issueR.requestid,sizeof(issueR.requestid)); // 60
             dpow_nanomsg_update(myinfo);
             dex_updateclient(myinfo);
-            if ( (retstr= basilisk_start(myinfo,&issueR,1,issueR.optionhours * 3600)) != 0 )
-                free(retstr);
-           /*if ( (retstr= InstantDEX_accept(myinfo,0,0,0,issueR.requestid,issueR.quoteid)) != 0 )
+            if ( (retstr= basilisk_start(myinfo,privkey,&issueR,1,issueR.optionhours * 3600)) != 0 )
                 free(retstr);
-            printf("my req hwm %f -> %u\n",hwm,issueR.requestid);
-            basilisk_channelsend(myinfo,issueR.srchash,issueR.desthash,channel,0x4000000,(void *)&issueR.requestid,sizeof(issueR.requestid),60);
-            numiters = crc = 0;
-            while ( numiters < 10 && (crc= basilisk_crcsend(myinfo,0,buf,sizeof(buf),issueR.srchash,issueR.desthash,channel,0x4000000,(void *)&issueR.requestid,sizeof(issueR.requestid),crcs)) == 0 )
-            {
-                printf("didnt get back what was sent\n");
-                sleep(3);
-                basilisk_channelsend(myinfo,issueR.srchash,issueR.desthash,channel,0x4000000,(void *)&issueR.requestid,sizeof(issueR.requestid),60);
-                numiters++;
-            }
-            if ( crc != 0 )
-            {
-                printf("crc.%08x -> basilisk_starta\n",crc);
-                if ( (retstr= basilisk_start(myinfo,&issueR,1,issueR.optionhours * 3600)) != 0 )
-                    free(retstr);
-            } // else printf("couldnt accept offer\n");*/
         }
         else if ( issueR.requestid != myinfo->lastdexrequestid )//if ( issueR.quoteid == 0 )
         {
@@ -346,24 +320,8 @@ void basilisk_requests_poll(struct supernet_info *myinfo)
             dex_channelsend(myinfo,issueR.desthash,issueR.srchash,channel,msgid,data,datalen); //INSTANTDEX_LOCKTIME*2
             dpow_nanomsg_update(myinfo);
             dex_updateclient(myinfo);
-            if ( (retstr= basilisk_start(myinfo,&issueR,0,issueR.optionhours * 3600)) != 0 )
+            if ( (retstr= basilisk_start(myinfo,myinfo->persistent_priv,&issueR,0,issueR.optionhours * 3600)) != 0 )
                 free(retstr);
-            /*crcs[0] = crcs[1] = 0;
-            numiters = 0;
-            basilisk_channelsend(myinfo,issueR.desthash,issueR.srchash,channel,msgid,data,datalen,INSTANTDEX_LOCKTIME*2);
-            while ( numiters < 10 && (crc= basilisk_crcsend(myinfo,0,buf,sizeof(buf),issueR.desthash,issueR.srchash,channel,msgid,data,datalen,crcs)) == 0 )
-            {
-                //printf("didnt get back what was sent\n");
-                sleep(3);
-                basilisk_channelsend(myinfo,issueR.desthash,issueR.srchash,channel,msgid,data,datalen,INSTANTDEX_LOCKTIME*2);
-                numiters++;
-            }
-            if ( crc != 0 )
-            {
-                printf("crc.%08x -> basilisk_start\n",crc);
-                if ( (retstr= basilisk_start(myinfo,&issueR,0,issueR.optionhours * 3600)) != 0 )
-                    free(retstr);
-            }*/
         } //else printf("basilisk_requests_poll unexpected hwm issueR\n");
     }
 }
@@ -489,7 +447,7 @@ char *basilisk_respond_requests(struct supernet_info *myinfo,bits256 hash,uint32
     return(jprint(retjson,1));
 }
 
-char *basilisk_respond_accept(struct supernet_info *myinfo,uint32_t requestid,uint32_t quoteid,struct basilisk_request *refrp)
+char *basilisk_respond_accept(struct supernet_info *myinfo,bits256 privkey,uint32_t requestid,uint32_t quoteid,struct basilisk_request *refrp)
 {
     int32_t i,num=0; char *retstr=0; struct basilisk_request *requests,*rp; uint8_t space[4096];
     portable_mutex_lock(&myinfo->DEX_reqmutex);
@@ -501,7 +459,7 @@ char *basilisk_respond_accept(struct supernet_info *myinfo,uint32_t requestid,ui
             if ( rp->requestid == requestid && rp->quoteid == quoteid )
             {
                 printf("start from accept\n");
-                retstr = basilisk_start(myinfo,rp,1,0);
+                retstr = basilisk_start(myinfo,privkey,rp,1,0);
                 break;
             }
         }
@@ -513,51 +471,6 @@ char *basilisk_respond_accept(struct supernet_info *myinfo,uint32_t requestid,ui
         retstr = clonestr("{\"error\":\"couldnt find to requestid to choose\"}");
     return(retstr);
 }
-
-#include "../includes/iguana_apidefs.h"
-#include "../includes/iguana_apideclares.h"
-
-THREE_STRINGS_AND_DOUBLE(tradebot,aveprice,comment,base,rel,basevolume)
-{
-    double retvals[4],aveprice; cJSON *retjson = cJSON_CreateObject();
-    aveprice = instantdex_avehbla(myinfo,retvals,base,rel,basevolume);
-    jaddstr(retjson,"result","success");
-    jaddnum(retjson,"aveprice",aveprice);
-    jaddnum(retjson,"avebid",retvals[0]);
-    jaddnum(retjson,"bidvol",retvals[1]);
-    jaddnum(retjson,"aveask",retvals[2]);
-    jaddnum(retjson,"askvol",retvals[3]);
-    return(jprint(retjson,1));
-}
-
-ZERO_ARGS(InstantDEX,allcoins)
-{
-    struct iguana_info *tmp; cJSON *native,*notarychains,*basilisk,*virtual,*full,*retjson = cJSON_CreateObject();
-    full = cJSON_CreateArray();
-    native = cJSON_CreateArray();
-    basilisk = cJSON_CreateArray();
-    virtual = cJSON_CreateArray();
-    notarychains = cJSON_CreateArray();
-    HASH_ITER(hh,myinfo->allcoins,coin,tmp)
-    {
-        if ( coin->FULLNODE < 0 )
-            jaddistr(native,coin->symbol);
-        //else if ( coin->virtualchain != 0 )
-        //    jaddistr(virtual,coin->symbol);
-        else if ( coin->FULLNODE > 0 )//|| coin->VALIDATENODE > 0 )
-            jaddistr(full,coin->symbol);
-        //else if ( coin->notarychain >= 0 )
-        //    jaddistr(notarychains,coin->symbol);
-        else jaddistr(basilisk,coin->symbol);
-    }
-    jadd(retjson,"native",native);
-    jadd(retjson,"basilisk",basilisk);
-    jadd(retjson,"full",full);
-    //jadd(retjson,"virtual",virtual);
-    //jadd(retjson,"notarychains",notarychains);
-    return(jprint(retjson,1));
-}
-
 cJSON *basilisk_unspents(struct supernet_info *myinfo,struct iguana_info *coin,char *coinaddr)
 {
     cJSON *unspents=0,*array=0; char *retstr;
@@ -570,7 +483,7 @@ cJSON *basilisk_unspents(struct supernet_info *myinfo,struct iguana_info *coin,c
     }
     else if ( coin->FULLNODE == 0 )
     {
-        if ( (retstr= _dex_listunspent(myinfo,coin->symbol,coinaddr)) != 0 )
+        if ( (retstr= dex_listunspent(myinfo,coin,0,0,coin->symbol,coinaddr)) != 0 )
         {
             unspents = cJSON_Parse(retstr);
             free(retstr);
@@ -600,191 +513,3 @@ char *basilisk_sendrawtransaction(struct supernet_info *myinfo,struct iguana_inf
     return(retstr);
 }
 
-STRING_ARG(InstantDEX,available,source)
-{
-    uint64_t total = 0; int32_t i,n=0; char coinaddr[64]; cJSON *item,*unspents,*retjson = 0;
-    if ( source != 0 && source[0] != 0 && (coin= iguana_coinfind(source)) != 0 )
-    {
-        if ( myinfo->expiration != 0 )
-        {
-            bitcoin_address(coinaddr,coin->chain->pubtype,myinfo->persistent_pubkey33,33);
-            if ( (unspents= basilisk_unspents(myinfo,coin,coinaddr)) != 0 )
-            {
-                //printf("available.(%s)\n",jprint(unspents,0));
-                if ( (n= cJSON_GetArraySize(unspents)) > 0 )
-                {
-                    for (i=0; i<n; i++)
-                    {
-                        item = jitem(unspents,i);
-                        //if ( is_cJSON_True(jobj(item,"spendable")) != 0 )
-                            total += jdouble(item,"amount") * SATOSHIDEN;
-                        //printf("(%s) -> %.8f\n",jprint(item,0),dstr(total));
-                    }
-                }
-                free_json(unspents);
-            }
-            retjson = cJSON_CreateObject();
-            jaddnum(retjson,"result",dstr(total));
-            printf(" n.%d total %.8f (%s)\n",n,dstr(total),jprint(retjson,0));
-            return(jprint(retjson,1));
-        }
-        printf("InstantDEX_available: need to unlock wallet\n");
-        return(clonestr("{\"error\":\"need to unlock wallet\"}"));
-    }
-    printf("InstantDEX_available: %s is not active\n",source!=0?source:"");
-    return(clonestr("{\"error\":\"specified coin is not active\"}"));
-}
-
-HASH_ARRAY_STRING(InstantDEX,request,hash,vals,hexstr)
-{
-    uint8_t serialized[512]; char buf[512]; struct basilisk_request R; int32_t iambob,optionhours; cJSON *reqjson; uint32_t datalen=0,DEX_channel; struct iguana_info *bobcoin,*alicecoin;
-    myinfo->DEXactive = (uint32_t)time(NULL) + 3*BASILISK_TIMEOUT + 60;
-    jadd64bits(vals,"minamount",jdouble(vals,"minprice") * jdouble(vals,"amount") * SATOSHIDEN);
-    if ( jobj(vals,"srchash") == 0 )
-        jaddbits256(vals,"srchash",myinfo->myaddr.persistent);
-    if ( jobj(vals,"desthash") == 0 )
-        jaddbits256(vals,"desthash",hash);
-    jadd64bits(vals,"satoshis",jdouble(vals,"amount") * SATOSHIDEN);
-    jadd64bits(vals,"destsatoshis",jdouble(vals,"destamount") * SATOSHIDEN);
-    jaddnum(vals,"timestamp",time(NULL));
-    hash = myinfo->myaddr.persistent;
-    printf("service.(%s)\n",jprint(vals,0));
-    memset(&R,0,sizeof(R));
-    if ( basilisk_request_create(&R,vals,hash,juint(vals,"timestamp")) == 0 )
-    {
-        iambob = bitcoin_coinptrs(myinfo,&bobcoin,&alicecoin,R.src,R.dest,myinfo->myaddr.persistent,GENESIS_PUBKEY);
-        if ( (optionhours= jint(vals,"optionhours")) != 0 )
-        {
-            printf("iambob.%d optionhours.%d R.requestid.%u vs calc %u, q.%u\n",iambob,R.optionhours,R.requestid,basilisk_requestid(&R),R.quoteid);
-            if ( iambob != 0 && optionhours > 0 )
-            {
-                sprintf(buf,"{\"error\":\"illegal call option request hours.%d when iambob.%d\"}",optionhours,iambob);
-                printf("ERROR.(%s)\n",buf);
-                return(clonestr(buf));
-            }
-            else if ( iambob == 0 && optionhours < 0 )
-            {
-                sprintf(buf,"{\"error\":\"illegal put option request hours.%d when iambob.%d\"}",optionhours,iambob);
-                printf("ERROR.(%s)\n",buf);
-                return(clonestr(buf));
-            }
-        }
-        //if ( myinfo->IAMNOTARY != 0 || myinfo->NOTARY.RELAYID >= 0 )
-        //    R.relaybits = myinfo->myaddr.myipbits;
-        if ( (reqjson= basilisk_requestjson(&R)) != 0 )
-            free_json(reqjson);
-        datalen = basilisk_rwDEXquote(1,serialized,&R);
-        //int32_t i; for (i=0; i<sizeof(R); i++)
-        //    printf("%02x",((uint8_t *)&R)[i]);
-        printf(" R.requestid.%u vs calc %u, q.%u datalen.%d\n",R.requestid,basilisk_requestid(&R),R.quoteid,datalen);
-        basilisk_rwDEXquote(0,serialized,&R);
-    } else printf("error creating request\n");
-    if ( datalen > 0 )
-    {
-        uint32_t msgid,crc=0,crcs[2],numiters = 0; uint8_t buf[4096];
-        memset(hash.bytes,0,sizeof(hash));
-        msgid = (uint32_t)time(NULL);
-        DEX_channel = 'D' + ((uint32_t)'E' << 8) + ((uint32_t)'X' << 16);
-        basilisk_channelsend(myinfo,myinfo->myaddr.persistent,hash,DEX_channel,msgid,serialized,datalen,60);
-        sleep(3);
-        while ( numiters < 10 && (crc= basilisk_crcsend(myinfo,0,buf,sizeof(buf),hash,myinfo->myaddr.persistent,DEX_channel,msgid,serialized,datalen,crcs)) == 0 )
-        {
-            //printf("didnt get back what was sent\n");
-            sleep(3);
-            basilisk_channelsend(myinfo,myinfo->myaddr.persistent,hash,DEX_channel,msgid,serialized,datalen,60);
-            numiters++;
-        }
-        if ( crc != 0 )//basilisk_channelsend(myinfo,R.srchash,R.desthash,DEX_channel,(uint32_t)time(NULL),serialized,datalen,30) == 0 )
-            return(clonestr("{\"result\":\"DEX message sent\"}"));
-        else return(clonestr("{\"error\":\"DEX message couldnt be sent\"}"));
-    }
-    return(clonestr("{\"error\":\"DEX message not sent\"}"));
-}
-
-INT_ARG(InstantDEX,automatched,requestid)
-{
-    // return quoteid
-    myinfo->DEXactive = (uint32_t)time(NULL) + INSTANTDEX_LOCKTIME;
-    return(clonestr("{\"result\":\"automatched not yet\"}"));
-}
-
-int32_t InstantDEX_incoming_func(struct supernet_info *myinfo,void *ptr,uint8_t *data,int32_t datalen)
-{
-    //int32_t i;
-    //for (i=0; i<datalen; i++)
-    //    printf("%02x",data[i]);
-    //printf(" <- incoming\n");
-    return(0);
-}
-
-int32_t InstantDEX_process_channelget(struct supernet_info *myinfo,void *ptr,int32_t (*internal_func)(struct supernet_info *myinfo,void *ptr,uint8_t *data,int32_t datalen),uint32_t channel,uint32_t msgid,uint8_t *data,int32_t datalen,uint32_t expiration,uint32_t duration)
-{
-    return((*internal_func)(myinfo,ptr,data,datalen));
-}
-
-INT_ARG(InstantDEX,incoming,requestid)
-{
-    cJSON *retjson,*retarray; bits256 zero; uint32_t DEX_channel,msgid,now; int32_t retval,width,drift=3; uint8_t data[32768];
-    now = (uint32_t)time(NULL);
-    memset(&zero,0,sizeof(zero));
-    width = (now - myinfo->DEXpoll) + 2*drift;
-    if ( width < (drift+1) )
-        width = 2*drift+1;
-    else if ( width > 64 )
-        width = 64;
-    myinfo->DEXpoll = now;
-    retjson = cJSON_CreateObject();
-    DEX_channel = 'D' + ((uint32_t)'E' << 8) + ((uint32_t)'X' << 16);
-    msgid = (uint32_t)time(NULL) + drift;
-    if ( (retarray= basilisk_channelget(myinfo,zero,myinfo->myaddr.persistent,DEX_channel,msgid,width)) != 0 ) 
-    {
-        //printf("GOT.(%s)\n",jprint(retarray,0));
-        if ( (retval= basilisk_process_retarray(myinfo,0,InstantDEX_process_channelget,data,sizeof(data),DEX_channel,msgid,retarray,InstantDEX_incoming_func)) > 0 )
-        {
-            jaddstr(retjson,"result","success");
-        } else jaddstr(retjson,"error","cant process InstantDEX retarray");
-        jadd(retjson,"responses",retarray);
-    }
-    else
-    {
-        jaddstr(retjson,"error","cant do InstantDEX channelget");
-        printf("error channelget\n");
-    }
-    return(jprint(retjson,1));
-}
-
-/*TWO_INTS(InstantDEX,swapstatus,requestid,quoteid)
-{
-    cJSON *vals; char *retstr;
-    myinfo->DEXactive = (uint32_t)time(NULL) + INSTANTDEX_LOCKTIME;
-    //if ( myinfo->IAMLP != 0 )
-    //    return(basilisk_respond_swapstatus(myinfo,myinfo->myaddr.persistent,requestid,quoteid));
-    //else
-    {
-        vals = cJSON_CreateObject();
-        jaddnum(vals,"requestid",(uint32_t)requestid);
-        jaddnum(vals,"quoteid",(uint32_t)quoteid);
-        jaddbits256(vals,"hash",myinfo->myaddr.persistent);
-        retstr = basilisk_standardservice("SWP",myinfo,0,myinfo->myaddr.persistent,vals,"",1);
-        free_json(vals);
-        return(retstr);
-    }
-}*/
-
-TWO_INTS(InstantDEX,accept,requestid,quoteid)
-{
-    cJSON *vals; char *retstr;
-    myinfo->DEXactive = (uint32_t)time(NULL) + INSTANTDEX_LOCKTIME;
-    if ( myinfo->IAMLP != 0 || myinfo->dexsock >= 0 || myinfo->subsock >= 0 )
-        return(basilisk_respond_accept(myinfo,requestid,quoteid,&myinfo->DEXaccept));
-    else
-    {
-        vals = cJSON_CreateObject();
-        jaddnum(vals,"quoteid",(uint32_t)quoteid);
-        jaddnum(vals,"requestid",(uint32_t)requestid);
-        retstr = basilisk_standardservice("ACC",myinfo,0,myinfo->myaddr.persistent,vals,"",1);
-        free_json(vals);
-        return(retstr);
-    }
-}
-#include "../includes/iguana_apiundefs.h"

basilisk/basilisk_MSG.c

@@ -98,12 +98,16 @@ char *basilisk_iterate_MSG(struct supernet_info *myinfo,uint32_t channel,uint32_
    // char str[65],str2[65]; printf("MSGiterate (%s) -> (%s)\n",bits256_str(str,srchash),bits256_str(str2,desthash));
     array = cJSON_CreateArray();
     portable_mutex_lock(&myinfo->messagemutex);
-    //printf("iterate_MSG allflag.%d width.%d channel.%d msgid.%d src.%llx -> %llx\n",allflag,origwidth,channel,msgid,(long long)srchash.txid,(long long)desthash.txid);
+    //printf("iterate_MSG width.%d channel.%d msgid.%d src.%llx -> %llx\n",origwidth,channel,msgid,(long long)srchash.txid,(long long)desthash.txid);
     for (i=0; i<width; i++)
     {
         keylen = basilisk_messagekey(key,channel,msgid,srchash,desthash);
         if ( (item= _basilisk_respond_getmessage(myinfo,key,keylen)) != 0 )
-            jaddi(array,item);//, printf("gotmsg0.(%s)\n",jprint(item,0));
+        {
+            jaddbits256(item,"src",srchash);
+            jaddbits256(item,"dest",desthash);
+            jaddi(array,item);
+        }
         //keylen = basilisk_messagekey(key,channel,msgid,desthash,srchash);
         //if ( (item= _basilisk_respond_getmessage(myinfo,key,keylen)) != 0 )
         //    jaddi(array,item);//, printf("gotmsg0.(%s)\n",jprint(item,0));
@@ -113,7 +117,11 @@ char *basilisk_iterate_MSG(struct supernet_info *myinfo,uint32_t channel,uint32_
             {
                 keylen = basilisk_messagekey(key,channel,msgid,zero,desthash);
                 if ( (item= _basilisk_respond_getmessage(myinfo,key,keylen)) != 0 )
-                    jaddi(array,item);//, printf("gotmsg1.(%s)\n",jprint(item,0));
+                {
+                    jaddbits256(item,"src",srchash);
+                    jaddbits256(item,"dest",desthash);
+                    jaddi(array,item);
+                }
                 //keylen = basilisk_messagekey(key,channel,msgid,desthash,zero);
                 //if ( (item= _basilisk_respond_getmessage(myinfo,key,keylen)) != 0 )
                 //    jaddi(array,item);//, printf("gotmsg1.(%s)\n",jprint(item,0));
@@ -122,7 +130,11 @@ char *basilisk_iterate_MSG(struct supernet_info *myinfo,uint32_t channel,uint32_
             {
                 keylen = basilisk_messagekey(key,channel,msgid,srchash,zero);
                 if ( (item= _basilisk_respond_getmessage(myinfo,key,keylen)) != 0 )
-                    jaddi(array,item);//, printf("gotmsg2.(%s)\n",jprint(item,0));
+                {
+                    jaddbits256(item,"src",srchash);
+                    jaddbits256(item,"dest",desthash);
+                    jaddi(array,item);
+                }
                 //keylen = basilisk_messagekey(key,channel,msgid,zero,srchash);
                 //if ( (item= _basilisk_respond_getmessage(myinfo,key,keylen)) != 0 )
                 //    jaddi(array,item);//, printf("gotmsg2.(%s)\n",jprint(item,0));
@@ -131,7 +143,11 @@ char *basilisk_iterate_MSG(struct supernet_info *myinfo,uint32_t channel,uint32_
             {
                 keylen = basilisk_messagekey(key,channel,msgid,zero,zero);
                 if ( (item= _basilisk_respond_getmessage(myinfo,key,keylen)) != 0 )
-                    jaddi(array,item);//, printf("gotmsg3.(%s)\n",jprint(item,0));
+                {
+                    jaddbits256(item,"src",srchash);
+                    jaddbits256(item,"dest",desthash);
+                    jaddi(array,item);
+                }
             }
         }
         msgid--;
@@ -143,7 +159,11 @@ char *basilisk_iterate_MSG(struct supernet_info *myinfo,uint32_t channel,uint32_
             if ( basilisk_msgcmp(msg,origwidth,channel,origmsgid,zero,zero) == 0 )
             {
                 if ( (msgjson= basilisk_msgjson(msg,msg->key,msg->keylen)) != 0 )
+                {
+                    jaddbits256(msgjson,"src",srchash);
+                    jaddbits256(msgjson,"dest",desthash);
                     jaddi(array,msgjson);
+                }
             }
         }
         if ( now > msg->expiration+60 )
@@ -217,7 +237,11 @@ char *basilisk_respond_addmessage(struct supernet_info *myinfo,uint8_t *key,int3
     HASH_ADD_KEYPTR(hh,myinfo->messagetable,msg->key,msg->keylen,msg);
     QUEUEITEMS++;
     portable_mutex_unlock(&myinfo->messagemutex);
-//printf("add message keylen.%d [%d]\n",msg->keylen,datalen);
+    {
+        bits256 srchash,desthash; uint32_t channel,msgid;
+        basilisk_messagekeyread(key,&channel,&msgid,&srchash,&desthash);
+        //printf("add message keylen.%d [%d] msgid.%x channel.%x\n",msg->keylen,datalen,msgid,channel);
+    }
     //if ( myinfo->NOTARY.RELAYID >= 0 )
     //    dpow_handler(myinfo,msg);
     if ( sendping != 0 )
@@ -259,66 +283,41 @@ char *basilisk_respond_MSG(struct supernet_info *myinfo,char *CMD,void *addr,cha
     return(retstr);
 }
 
-#include "../includes/iguana_apidefs.h"
-#include "../includes/iguana_apideclares.h"
-
-HASH_ARRAY_STRING(basilisk,getmessage,hash,vals,hexstr)
+cJSON *dpow_getmessage(struct supernet_info *myinfo,char *jsonstr)
 {
-    uint32_t msgid,width,channel; char *retstr;
-    if ( bits256_cmp(GENESIS_PUBKEY,jbits256(vals,"srchash")) == 0 )
-        jaddbits256(vals,"srchash",hash);
-    if ( bits256_cmp(GENESIS_PUBKEY,jbits256(vals,"desthash")) == 0 )
-        jaddbits256(vals,"desthash",myinfo->myaddr.persistent);
-    if ( (msgid= juint(vals,"msgid")) == 0 )
+    cJSON *valsobj,*retjson = 0; char *retstr;
+    if ( (valsobj= cJSON_Parse(jsonstr)) != 0 )
     {
-        msgid = (uint32_t)time(NULL);
-        jdelete(vals,"msgid");
-        jaddnum(vals,"msgid",msgid);
-    }
-    if ( myinfo->NOTARY.RELAYID >= 0 || myinfo->dexsock >= 0 || myinfo->subsock >= 0 )
-    {
-        channel = juint(vals,"channel");
-        width = juint(vals,"width");
-        retstr = basilisk_iterate_MSG(myinfo,channel,msgid,jbits256(vals,"srchash"),jbits256(vals,"desthash"),width);
-        //printf("getmessage.(%s)\n",retstr);
-        return(retstr);
+        retstr = basilisk_iterate_MSG(myinfo,juint(valsobj,"channel"),juint(valsobj,"msgid"),jbits256(valsobj,"srchash"),jbits256(valsobj,"desthash"),juint(valsobj,"width"));
+        retjson = cJSON_Parse(retstr);
+        free(retstr);
     }
-    //printf("getmessage not relay.%d dexsock.%d subsock.%d\n",myinfo->NOTARY.RELAYID,myinfo->dexsock,myinfo->subsock);
-    return(basilisk_standardservice("MSG",myinfo,0,jbits256(vals,"desthash"),vals,hexstr,1));
+    return(retjson);
 }
 
-HASH_ARRAY_STRING(basilisk,sendmessage,hash,vals,hexstr)
+cJSON *dpow_addmessage(struct supernet_info *myinfo,char *jsonstr)
 {
-    int32_t keylen,datalen,allocsize = 65536; uint8_t key[BASILISK_KEYSIZE],*space,*space2,*data,*ptr = 0; char *retstr=0;
-    space = calloc(1,allocsize);
-    space2 = calloc(1,allocsize);
-    data = get_dataptr(BASILISK_HDROFFSET,&ptr,&datalen,&space[BASILISK_KEYSIZE],allocsize-BASILISK_KEYSIZE,hexstr);
-    if ( myinfo->subsock >= 0 || myinfo->dexsock >= 0 || (myinfo->IAMNOTARY != 0 && myinfo->NOTARY.RELAYID >= 0) )
+    cJSON *vals,*retjson=0; char *retstr=0,*datastr; int32_t datalen,keylen; uint8_t *data=0,key[BASILISK_KEYSIZE];
+    if ( (vals= cJSON_Parse(jsonstr)) != 0 )
     {
         keylen = basilisk_messagekey(key,juint(vals,"channel"),juint(vals,"msgid"),jbits256(vals,"srchash"),jbits256(vals,"desthash"));
-        if ( data != 0 )
+        if ( (datastr= jstr(vals,"data")) != 0 )
         {
-            retstr = basilisk_respond_addmessage(myinfo,key,keylen,data,datalen,0,juint(vals,"duration"));
-        } else printf("no get_dataptr\n");
+            datalen = (int32_t)strlen(datastr) >> 1;
+            data = malloc(datalen);
+            decode_hex(data,datalen,datastr);
+            if ( (retstr= basilisk_respond_addmessage(myinfo,key,keylen,data,datalen,0,juint(vals,"duration"))) != 0 )
+                retjson = cJSON_Parse(retstr);
+        }
         if ( retstr != 0 )
             free(retstr);
-    } //else printf("not notary.%d relayid.%d\n",myinfo->IAMNOTARY,myinfo->NOTARY.RELAYID);
-    if ( vals != 0 && juint(vals,"fanout") == 0 )
-        jaddnum(vals,"fanout",MAX(8,(int32_t)sqrt(myinfo->NOTARY.NUMRELAYS)+2));
-    if ( BASILISK_KEYSIZE+datalen < allocsize )
-    {
-        memcpy(space2,key,BASILISK_KEYSIZE);
-        if ( data != 0 && datalen != 0 )
-            memcpy(&space2[BASILISK_KEYSIZE],data,datalen);
-        dex_reqsend(myinfo,"DEX",space2,datalen+BASILISK_KEYSIZE,1,"");
-    } else printf("sendmessage space too small error for %d\n",datalen);
-    free(space);
-    free(space2);
-    if ( ptr != 0 )
-        free(ptr);
-    return(basilisk_standardservice("OUT",myinfo,0,jbits256(vals,"desthash"),vals,hexstr,0));
+        if ( data != 0 )
+            free(data);
+    }
+    if ( retjson == 0 )
+        retjson = cJSON_Parse("{\"error\":\"couldnt add message\"}");
+    return(retjson);
 }
-#include "../includes/iguana_apiundefs.h"
 
 int32_t basilisk_channelsend(struct supernet_info *myinfo,bits256 srchash,bits256 desthash,uint32_t channel,uint32_t msgid,uint8_t *data,int32_t datalen,uint32_t duration)
 {
@@ -384,9 +383,16 @@ cJSON *basilisk_channelget(struct supernet_info *myinfo,bits256 srchash,bits256
     jaddnum(valsobj,"numrequired",1);
     jaddbits256(valsobj,"srchash",srchash);
     jaddbits256(valsobj,"desthash",desthash);
-    if ( (retstr= basilisk_getmessage(myinfo,0,0,0,desthash,valsobj,0)) != 0 )
+    if ( myinfo->IAMNOTARY != 0 )
+        retstr = basilisk_getmessage(myinfo,0,0,0,desthash,valsobj,0);
+    else
+    {
+        //char str[65],str2[65];
+        retstr = _dex_getmessage(myinfo,jprint(valsobj,0));
+        //printf("channel.%u msgid.%u gotmessage.(%d) %s %s %s\n",channel,msgid,(int32_t)strlen(retstr),strlen(retstr) < 100 ? retstr : "(too long)",bits256_str(str,srchash),bits256_str(str2,desthash));
+    }
+    if ( retstr != 0 )
     {
-        //printf("channel.%u msgid.%u gotmessage.(%d)\n",channel,msgid,(int32_t)strlen(retstr));
         if ( (retarray= cJSON_Parse(retstr)) != 0 )
         {
             if ( is_cJSON_Array(retarray) == 0 )

basilisk/basilisk_bitcoin.c

@@ -473,6 +473,23 @@ void *basilisk_getinfo(struct basilisk_item *Lptr,struct supernet_info *myinfo,s
     return(ptr);
 }
 
+int64_t iguana_getestimatedfee(struct supernet_info *myinfo,struct iguana_info *coin)
+{
+    char *retstr; cJSON *retjson; double x; int64_t txfeeperbyte = 200;
+    if ( (retstr= _dex_getinfo(myinfo,coin->symbol)) != 0 )
+    {
+        if ( (retjson= cJSON_Parse(retstr)) != 0 )
+        {
+            if ( (x= jdouble(retjson,"estimatefee")) > SMALLVAL )
+                txfeeperbyte = 1 + (x * SATOSHIDEN) / 1024;
+            printf("SET txfeeperbyte %lld (%s)\n",(long long)txfeeperbyte,retstr);
+            free(retjson);
+        }
+        free(retstr);
+    }
+    return(txfeeperbyte);
+}
+
 int32_t basilisk_voutvin_validate(struct iguana_info *coin,char *rawtx,uint64_t inputsum,uint64_t amount,uint64_t txfee)
 {
     //static int counter;
@@ -543,13 +560,32 @@ int32_t basilisk_vins_validate(struct supernet_info *myinfo,struct iguana_info *
     return(retval);
 }
 
+int64_t iguana_esttxfee(struct supernet_info *myinfo,struct iguana_info *coin,char *rawtx,char *signedtx,int32_t numvins)
+{
+    int64_t txfee = 0;
+    if ( coin->estimatedfee == 0 )
+        coin->estimatedfee = iguana_getestimatedfee(myinfo,coin);
+    if ( signedtx != 0 )
+    {
+        txfee = coin->estimatedfee * (strlen(signedtx)/2 + numvins);
+        free(signedtx);
+    }
+    else if ( rawtx != 0 )
+    {
+        txfee = coin->estimatedfee * (strlen(rawtx)/2 + numvins * 110);
+        free(rawtx);
+    }
+    return(txfee);
+}
+
 char *iguana_utxoduplicates(struct supernet_info *myinfo,struct iguana_info *coin,uint8_t *pubkey33,uint64_t satoshis,int32_t duplicates,int32_t *completedp,bits256 *signedtxidp,int32_t sendflag,cJSON *addresses)
 {
-    uint8_t script[35]; int32_t i,spendlen; cJSON *txobj=0,*vins=0; char *rawtx=0,*signedtx,changeaddr[64];
+    uint8_t script[35]; int64_t txfee; int32_t i,spendlen; cJSON *txobj=0,*vins=0; char *rawtx=0,*signedtx=0,changeaddr[64];
     *completedp = 0;
     if ( signedtxidp != 0 )
         memset(signedtxidp,0,sizeof(*signedtxidp));
     bitcoin_address(changeaddr,coin->chain->pubtype,myinfo->persistent_pubkey33,33);
+    txfee = (coin->txfee + duplicates*coin->txfee*2);
     if ( (txobj= bitcoin_txcreate(coin->symbol,coin->chain->isPoS,0,1,0)) != 0 )
     {
         if ( duplicates <= 0 )
@@ -557,19 +593,28 @@ char *iguana_utxoduplicates(struct supernet_info *myinfo,struct iguana_info *coi
         spendlen = bitcoin_pubkeyspend(script,0,pubkey33);
         for (i=0; i<duplicates; i++)
             bitcoin_txoutput(txobj,script,spendlen,satoshis);
-        rawtx = iguana_calcrawtx(myinfo,coin,&vins,txobj,satoshis * duplicates,changeaddr,coin->txfee + duplicates*coin->txfee/5,addresses,0,0,0,0,"127.0.0.1",0,1);
+        rawtx = iguana_calcrawtx(myinfo,coin,&vins,txobj,satoshis * duplicates,changeaddr,txfee,addresses,0,0,0,0,"127.0.0.1",0,1);
+        if ( cJSON_GetArraySize(vins) > duplicates/4 )
+        {
+            free(rawtx);
+            rawtx = 0;
+            fprintf(stderr,"No point to recycle utxo when trying to create utxo duplicates, numvins.%d vs duplicates.%d\n",cJSON_GetArraySize(vins),duplicates);
+            free_json(vins);
+            return(rawtx);
+        }
         //printf("duplicatesTX.(%s)\n",rawtx);
         if ( signedtxidp != 0 )
         {
             if ( (signedtx= iguana_signrawtx(myinfo,coin,0,signedtxidp,completedp,vins,rawtx,0,0)) != 0 )
             {
-                free(rawtx);
-                if ( *completedp != 0 && sendflag != 0 )
+                if ( *completedp != 0 )
                 {
                     printf("splitfunds signedtx.(%s)\n",signedtx);
-                    iguana_sendrawtransaction(myinfo,coin,signedtx);
+                    if ( sendflag != 0 )
+                        iguana_sendrawtransaction(myinfo,coin,signedtx);
+                    free(rawtx);
+                    rawtx = signedtx, signedtx = 0;
                 }
-                rawtx = signedtx;
             } else printf("error signing raw utxoduplicates tx\n");
         }
     }
@@ -615,7 +660,7 @@ int64_t iguana_verifytimelock(struct supernet_info *myinfo,struct iguana_info *c
 
 char *iguana_utxorawtx(struct supernet_info *myinfo,struct iguana_info *coin,int32_t timelock,char *destaddr,char *changeaddr,uint64_t satoshis,uint64_t txfee,int32_t *completedp,int32_t sendflag,cJSON *utxos)
 {
-    uint8_t script[35],p2shscript[128],rmd160[20],addrtype; bits256 txid; int32_t p2shlen,spendlen; cJSON *retjson,*txobj=0,*vins=0; char *rawtx=0,*signedtx=0; uint32_t timelocked = 0;
+    uint8_t script[35],p2shscript[128],rmd160[20],addrtype; bits256 txid; int32_t p2shlen,iter,spendlen; cJSON *retjson,*txcopy,*txobj=0,*vins=0; char *rawtx=0,*signedtx=0; uint32_t timelocked = 0;
     *completedp = 0;
     if ( iguana_addressvalidate(coin,&addrtype,destaddr) < 0 || iguana_addressvalidate(coin,&addrtype,changeaddr) < 0 )
         return(clonestr("{\"error\":\"invalid coin address\"}"));
@@ -625,6 +670,8 @@ char *iguana_utxorawtx(struct supernet_info *myinfo,struct iguana_info *coin,int
     bitcoin_addr2rmd160(&addrtype,rmd160,destaddr);
     if ( addrtype != coin->chain->pubtype )
         return(clonestr("{\"error\":\"invalid dest address type\"}"));
+    if ( txfee == 0 && strcmp(coin->symbol,"BTC") != 0 && (txfee= coin->txfee) == 0 )
+        txfee = coin->chain->txfee;
     retjson = cJSON_CreateObject();
     if ( (txobj= bitcoin_txcreate(coin->symbol,coin->chain->isPoS,0,1,0)) != 0 )
     {
@@ -641,23 +688,42 @@ char *iguana_utxorawtx(struct supernet_info *myinfo,struct iguana_info *coin,int
             printf("timelock.%d spend timelocked %u\n",timelock,timelocked);
         }
         bitcoin_txoutput(txobj,script,spendlen,satoshis);
-        if ( (rawtx= iguana_calcutxorawtx(myinfo,coin,&vins,txobj,satoshis,changeaddr,txfee,utxos,"",0,0)) != 0 )
+        for (iter=0; iter<2; iter++)
         {
-            jaddstr(retjson,"rawtx",rawtx);
-            if ( (signedtx= iguana_signrawtx(myinfo,coin,0,&txid,completedp,vins,rawtx,0,0)) != 0 )
+            txcopy = jduplicate(txobj);
+            if ( (rawtx= iguana_calcutxorawtx(myinfo,coin,&vins,txobj,satoshis,changeaddr,txfee,utxos,"",0,0)) != 0 )
             {
-                if ( *completedp != 0 )
+                if ( iter == 1 || txfee != 0 )
+                    jaddstr(retjson,"rawtx",rawtx);
+                if ( (signedtx= iguana_signrawtx(myinfo,coin,0,&txid,completedp,vins,rawtx,0,0)) != 0 )
                 {
-                    jaddbits256(retjson,"txid",txid);
-                    jaddstr(retjson,"signedtx",signedtx);
-                    if ( sendflag != 0 )
+                    if ( (iter == 1 || txfee != 0) && *completedp != 0 )
                     {
-                        //printf("send signedtx.(%s)\n",signedtx);
-                        txid = iguana_sendrawtransaction(myinfo,coin,signedtx);
-                        jaddbits256(retjson,"sent",txid);
+                        jaddbits256(retjson,"txid",txid);
+                        jaddstr(retjson,"signedtx",signedtx);
+                        if ( sendflag != 0 )
+                        {
+                            //printf("send signedtx.(%s)\n",signedtx);
+                            txid = iguana_sendrawtransaction(myinfo,coin,signedtx);
+                            jaddbits256(retjson,"sent",txid);
+                        }
                     }
-                }
-            } else printf("error signing raw utxoduplicates tx\n");
+                } else printf("error signing raw utxorawtx tx\n");
+            } else printf("null rawtx from calcutxorawtx\n");
+            if ( txfee != 0 )
+            {
+                free_json(txcopy);
+                break;
+            }
+            else // must be BTC and txfee == 0
+            {
+                txfee = iguana_esttxfee(myinfo,coin,rawtx,signedtx,cJSON_GetArraySize(vins));
+                free_json(vins);
+                rawtx = signedtx = 0;
+                vins = 0;
+                *completedp = 0;
+                txobj = txcopy;
+            }
         }
     }
     if ( timelock != 0 )
@@ -692,9 +758,14 @@ char *basilisk_bitcoinrawtx(struct supernet_info *myinfo,struct iguana_info *coi
     if ( (amount= j64bits(valsobj,"satoshis")) == 0 )
         amount = jdouble(valsobj,"value") * SATOSHIDEN;
     if ( (txfee= j64bits(valsobj,"txfee")) == 0 )
-        txfee = coin->chain->txfee;
-    if ( txfee == 0 )
-        txfee = 10000;
+    {
+        //if ( strcmp(coin->symbol,"BTC") != 0 )
+        {
+            txfee = coin->chain->txfee;
+            if ( txfee < 50000 )
+                txfee = 50000;
+        }
+    }
     spendscriptstr = jstr(valsobj,"spendscript");
     minconf = juint(valsobj,"minconf");
     locktime = jint(valsobj,"locktime");
@@ -703,7 +774,7 @@ char *basilisk_bitcoinrawtx(struct supernet_info *myinfo,struct iguana_info *coi
         addresses = iguana_getaddressesbyaccount(myinfo,coin,"*");
         jadd(valsobj,"addresses",addresses);
     }
-    //printf("use addresses.(%s)\n",jprint(addresses,0));
+    printf("use addresses.(%s)\n",jprint(addresses,0));
     //printf("(%s) vals.(%s) change.(%s) spend.%s\n",coin->symbol,jprint(valsobj,0),changeaddr,spendscriptstr);
     if ( changeaddr == 0 || changeaddr[0] == 0 || spendscriptstr == 0 || spendscriptstr[0] == 0 )
         return(clonestr("{\"error\":\"invalid changeaddr or spendscript or addresses\"}"));
@@ -731,7 +802,15 @@ char *basilisk_bitcoinrawtx(struct supernet_info *myinfo,struct iguana_info *coi
                     oplen = 0;
                 } else oplen = datachain_opreturnscript(coin,buf,opreturn,oplen);
             }
-            rawtx = iguana_calcrawtx(myinfo,coin,&vins,txobj,amount,changeaddr,txfee,addresses,minconf,oplen!=0?buf:0,oplen+offset,burnamount,remoteaddr,V,0);
+            rawtx = iguana_calcrawtx(myinfo,coin,&vins,txobj,amount,changeaddr,txfee,addresses,minconf,oplen!=0?buf:0,oplen+offset,burnamount,remoteaddr,V,1);
+            if ( txfee == 0 )
+            {
+                txfee = iguana_esttxfee(myinfo,coin,rawtx,0,vins != 0 ? cJSON_GetArraySize(vins): 0);
+                if ( vins != 0 )
+                    free_json(vins), vins = 0;
+                rawtx = iguana_calcrawtx(myinfo,coin,&vins,txobj,amount,changeaddr,txfee,addresses,minconf,oplen!=0?buf:0,oplen+offset,burnamount,remoteaddr,V,1);
+                printf("new txfee %.8f (%s)\n",dstr(txfee),rawtx);
+            }
             //printf("generated.(%s) vins.(%s)\n",rawtx!=0?rawtx:"",vins!=0?jprint(vins,0):"");
         }
         if ( rawtx != 0 )
@@ -977,175 +1056,6 @@ cJSON *BTC_makeclaimfunc(struct supernet_info *myinfo,struct exchange_info *exch
 }
 #endif
 
-
-#include "../includes/iguana_apidefs.h"
-#include "../includes/iguana_apideclares.h"
-
-HASH_ARRAY_STRING(basilisk,value,hash,vals,hexstr)
-{
-    char *retstr=0,*symbol,*coinaddr,*infostr; cJSON *retjson,*sobj,*info,*addrs,*txoutjson,*txjson,*array; uint32_t basilisktag,blocktime; bits256 txid,blockhash; struct basilisk_item *ptr,Lptr; uint64_t value; int32_t timeoutmillis,vout,height,n,m;
-    if ( vals == 0 )
-        return(clonestr("{\"error\":\"null valsobj\"}"));
-    //if ( myinfo->IAMNOTARY != 0 || myinfo->NOTARY.RELAYID >= 0 )
-    //    return(clonestr("{\"error\":\"special relays only do OUT and MSG\"}"));
-    //if ( coin == 0 )
-    {
-        if ( (symbol= jstr(vals,"symbol")) != 0 || (symbol= jstr(vals,"coin")) != 0 )
-            coin = iguana_coinfind(symbol);
-    }
-    if ( jobj(vals,"fanout") == 0 )
-        jaddnum(vals,"fanout",MAX(5,(int32_t)sqrt(myinfo->NOTARY.NUMRELAYS)+1));
-    txid = jbits256(vals,"txid");
-    vout = jint(vals,"vout");
-    if ( coin != 0 )
-    {
-        if ( coin->FULLNODE < 0 )
-        {
-            if ( (txoutjson= dpow_gettxout(myinfo,coin,txid,vout)) != 0 )
-            {
-                if ( (coinaddr= jstr(txoutjson,"address")) != 0 && (value= SATOSHIDEN*jdouble(txoutjson,"value")) != 0 )
-                {
-                    retjson = cJSON_CreateObject();
-                    jaddstr(retjson,"result","success");
-                    jaddstr(retjson,"address",coinaddr);
-                    jadd64bits(retjson,"satoshis",value);
-                    jaddnum(retjson,"value",dstr(value));
-                    jaddnum(retjson,"amount",dstr(value));
-                    height = dpow_getchaintip(myinfo,&blockhash,&blocktime,0,0,coin);
-                    jaddnum(retjson,"height",height);
-                    jaddnum(retjson,"numconfirms",jint(txoutjson,"confirmations"));
-                    jaddbits256(retjson,"txid",txid);
-                    jaddnum(retjson,"vout",vout);
-                    jaddstr(retjson,"coin",coin->symbol);
-                }
-                else
-                {
-                    free_json(txoutjson);
-                    return(clonestr("{\"error\":\"return from gettxout missing fields\"}"));
-                }
-                free_json(txoutjson);
-                return(jprint(retjson,1));
-            } else return(clonestr("{\"error\":\"null return from gettxout\"}"));
-        }
-        if ( (basilisktag= juint(vals,"basilisktag")) == 0 )
-            basilisktag = rand();
-        if ( (timeoutmillis= juint(vals,"timeout")) <= 0 )
-            timeoutmillis = BASILISK_TIMEOUT;
-        if ( coin->FULLNODE > 0 && (ptr= basilisk_bitcoinvalue(&Lptr,myinfo,coin,remoteaddr,basilisktag,timeoutmillis,vals)) != 0 )
-        {
-            retstr = ptr->retstr, ptr->retstr = 0;
-            ptr->finished = OS_milliseconds() + 10000;
-            return(retstr);
-        }
-    }
-    if ( myinfo->reqsock >= 0 )
-    {
-        if ( (retstr= _dex_getrawtransaction(myinfo,symbol,txid)) != 0 )
-        {
-            if ( (txoutjson= cJSON_Parse(retstr)) != 0 )
-            {
-                //printf("TX.(%s)\n",jprint(txoutjson,0));
-                retjson = cJSON_CreateObject();
-                jaddstr(retjson,"result","success");
-                jaddnum(retjson,"numconfirms",jint(txoutjson,"confirmations"));
-                if ( (array= jarray(&n,txoutjson,"vout")) != 0 && vout < n && (txjson= jitem(array,vout)) != 0 )
-                {
-                    //printf("txjson.(%s)\n",jprint(txjson,0));
-                    if ( (value= jdouble(txjson,"value") * SATOSHIDEN) != 0 )
-                    {
-                        if ( (sobj= jobj(txjson,"scriptPubKey")) != 0 && (addrs= jarray(&m,sobj,"addresses")) != 0 && (coinaddr= jstri(addrs,0)) != 0 )
-                            jaddstr(retjson,"address",coinaddr);
-                        jadd64bits(retjson,"satoshis",value);
-                        jaddnum(retjson,"value",dstr(value));
-                        if ( (infostr= _dex_getinfo(myinfo,symbol)) != 0 )
-                        {
-                            if ( (info= cJSON_Parse(infostr)) != 0 )
-                            {
-                                if ( (height= jint(info,"blocks")) > 0 )
-                                {
-                                    height -= jint(txoutjson,"confirmations");
-                                    jaddnum(retjson,"height",height);
-                                }
-                                free_json(info);
-                            }
-                            free(infostr);
-                        }
-                        jaddbits256(retjson,"txid",txid);
-                        jaddnum(retjson,"vout",vout);
-                        jaddstr(retjson,"coin",symbol);
-                        free(retstr);
-                        free_json(txoutjson);
-                        return(jprint(retjson,1));
-                    }
-                }
-                free_json(txoutjson);
-                return(jprint(retjson,1));
-            }
-            return(retstr);
-        }
-    }
-    return(basilisk_standardservice("VAL",myinfo,0,hash,vals,hexstr,1));
-}
-
-HASH_ARRAY_STRING(basilisk,rawtx,hash,vals,hexstr)
-{
-    char *retstr=0,*symbol; uint32_t basilisktag; int32_t timeoutmillis,i,retval = -1; uint64_t amount,txfee; cJSON *retarray;
-    if ( vals == 0 )
-        return(clonestr("{\"error\":\"null valsobj\"}"));
-    //if ( coin == 0 )
-    {
-        if ( (symbol= jstr(vals,"symbol")) != 0 || (symbol= jstr(vals,"coin")) != 0 )
-            coin = iguana_coinfind(symbol);
-    }
-    if ( jobj(vals,"numrequired") == 0 )
-        jaddnum(vals,"numrequired",MIN(3,(int32_t)sqrt(myinfo->NOTARY.NUMRELAYS)+1));
-    if ( jobj(vals,"fanout") == 0 )
-        jaddnum(vals,"fanout",MAX(3,(int32_t)sqrt(myinfo->NOTARY.NUMRELAYS)+1));
-    if ( coin != 0 )
-    {
-        //if ( juint(vals,"burn") == 0 )
-        //    jaddnum(vals,"burn",0.0001);
-        if ( (basilisktag= juint(vals,"basilisktag")) == 0 )
-            basilisktag = rand();
-        if ( (timeoutmillis= juint(vals,"timeout")) <= 0 )
-            timeoutmillis = BASILISK_TIMEOUT;
-        if ( (retstr= basilisk_bitcoinrawtx(myinfo,coin,remoteaddr,basilisktag,timeoutmillis,vals,0)) != 0 )
-        {
-            printf("rawtx.(%s)\n",retstr);
-            if ( (amount= j64bits(vals,"satoshis")) == 0 )
-                amount = jdouble(vals,"value") * SATOSHIDEN;
-            if ( (txfee= j64bits(vals,"txfee")) == 0 )
-                txfee = coin->chain->txfee;
-            if ( txfee == 0 )
-                txfee = 10000;
-            retval = -1;
-            if ( (retarray= cJSON_Parse(retstr)) != 0 )
-            {
-                if ( is_cJSON_Array(retarray) != 0 )
-                {
-                    for (i=0; i<cJSON_GetArraySize(retarray); i++)
-                    {
-                        if ( basilisk_vins_validate(myinfo,coin,jitem(retarray,i),amount,txfee) == 0 )
-                        {
-                            retval = 0;
-                            break;
-                        }
-                    }
-                } else retval = basilisk_vins_validate(myinfo,coin,retarray,amount,txfee);
-                if ( retval < 0 )
-                {
-                    printf("ERROR.(%s)\n",retstr);
-                    free(retstr);
-                    retstr = clonestr("{\"error\":\"invalid vin in rawtx\"}");
-                }
-            }
-        }
-    } else retstr = clonestr("{\"error\":\"no coin specified or found\"}");
-    return(retstr);
-}
-
-#include "../includes/iguana_apiundefs.h"
-
 int32_t basilisk_unspentfind(struct supernet_info *myinfo,struct iguana_info *coin,bits256 *txidp,int32_t *voutp,uint8_t *spendscript,struct iguana_outpoint outpt,int64_t value)
 {
     struct iguana_waccount *wacct,*tmp; struct iguana_waddress *waddr,*tmp2;

basilisk/basilisk_tradebot.c

@@ -69,12 +69,12 @@ int32_t basilisk_txitem(struct supernet_info *myinfo,struct basilisk_swap *swap,
         decode_hex((void *)&rawtx->I,sizeof(rawtx->I),hexstr);
         if ( (hexstr= jstr(obj,"txbytes")) != 0 && strlen(hexstr) == rawtx->I.datalen*2 )
         {
-            if ( rawtx->txbytes == 0 )
+            /*if ( rawtx->txbytes == 0 )
             {
                 printf("free (%s) txbytes\n",name);
                 free(rawtx->txbytes);
             }
-            rawtx->txbytes = calloc(1,rawtx->I.datalen);
+            rawtx->txbytes = calloc(1,rawtx->I.datalen);*/
             decode_hex((void *)rawtx->txbytes,rawtx->I.datalen,hexstr);
         }
         printf("PROCESS.(%s)\n",jprint(obj,0));
@@ -92,6 +92,7 @@ cJSON *basilisk_swapobj(struct supernet_info *myinfo,struct basilisk_swap *swap)
     jaddnum(obj,"quoteid",swap->I.req.quoteid);
     jadd(obj,"req",basilisk_requestjson(&swap->I.req));
     jaddstr(obj,"info",hexstr);
+    //printf("strlen(hexstr) swap->I %d vs %d\n",(int32_t)strlen(hexstr),(int32_t)sizeof(swap->I)*2);
     return(obj);
 }
 
@@ -104,7 +105,7 @@ int32_t basilisk_swapconv(struct supernet_info *myinfo,struct basilisk_swap *swa
         if ( juint(obj,"requestid") == swap->I.req.requestid && juint(obj,"quoteid") == swap->I.req.quoteid )
             return(0);
         printf("swapconv mismatched req/quote %d %d, %d %d\n",juint(obj,"requestid"),swap->I.req.requestid,juint(obj,"quoteid"),swap->I.req.quoteid);
-    } else printf("no info field in swap obj\n");
+    } //else printf("no info field in swap obj.(%s) len.%d vs %d\n",jprint(obj,0),(int32_t)strlen(hexstr),(int32_t)sizeof(swap->I)*2);
     return(-1);
 }
 
@@ -278,7 +279,7 @@ int32_t basilisk_request_cmpref(struct basilisk_request *ref,struct basilisk_req
 
 double basilisk_request_listprocess(struct supernet_info *myinfo,struct basilisk_request *issueR,struct basilisk_request *list,int32_t n)
 {
-    int32_t i,noquoteflag=0,havequoteflag=0,myrequest=0,maxi=-1; int64_t balance=0,destamount,minamount = 0,maxamount = 0; uint32_t pendingid=0; struct basilisk_swap *active; double metric = 0.;
+    int32_t i,noquoteflag=0,havequoteflag=0,myrequest=0,maxi=-1; int64_t balance=0,destamount,minamount = 0,maxamount = 0; bits256 privkey; uint32_t pendingid=0; struct basilisk_swap *active; double metric = 0.;
     memset(issueR,0,sizeof(*issueR));
     minamount = list[0].minamount;
     //printf("need to verify null quoteid is list[0] requestid.%u quoteid.%u\n",list[0].requestid,list[0].quoteid);
@@ -288,7 +289,7 @@ double basilisk_request_listprocess(struct supernet_info *myinfo,struct basilisk
             return(0.);
         pendingid = active->I.req.quoteid;
     }
-    if ( bits256_cmp(myinfo->myaddr.persistent,list[0].srchash) == 0 ) // my request
+    if ( smartaddress_pubkey(myinfo,&privkey,list[0].srchash) >= 0 )
         myrequest = 1;
     for (i=0; i<n; i++)
     {
@@ -296,7 +297,7 @@ double basilisk_request_listprocess(struct supernet_info *myinfo,struct basilisk
             return(-1);
         if ( list[i].quoteid != 0 )
         {
-            if ( bits256_cmp(myinfo->myaddr.persistent,list[i].desthash) == 0 ) // my quoteid
+            if ( smartaddress_pubkey(myinfo,&privkey,list[i].desthash) >= 0 )
                 myrequest |= 2;
             havequoteflag++;
             if ( pendingid == 0 )
@@ -331,7 +332,7 @@ double basilisk_request_listprocess(struct supernet_info *myinfo,struct basilisk
         if ( fabs(aveprice) < SMALLVAL )
             return(0);
         //retvals[0] = avebid, retvals[1] = bidvol, retvals[2] = aveask, retvals[3] = askvol;
-        destamount = (1.0 - profitmargin) * aveprice * list[0].srcamount;
+        destamount = (1.0 - profitmargin) * aveprice * list[0].srcamount * SATOSHIDEN;
         printf("aveprice %f dest %.8f avebid %f bidvol %f, aveask %f askvol %f\n",aveprice,dstr(destamount),retvals[0],retvals[1],retvals[2],retvals[3]);
         if ( (retstr= InstantDEX_available(myinfo,iguana_coinfind(list[0].dest),0,0,list[0].dest)) != 0 )
         {

basilisk/jumblr.c

@@ -0,0 +1,495 @@
+/******************************************************************************
+ * Copyright © 2014-2017 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+// included from basilisk.c
+// connect DEX to jumblr-core
+
+/*
+ z_exportkey "zaddr"
+ z_exportwallet "filename"
+ z_getoperationstatus (["operationid", ... ])
+ z_gettotalbalance ( minconf )
+ z_importkey "zkey" ( rescan )
+ z_importwallet "filename"
+ z_listaddresses
+ z_sendmany "fromaddress" [{"address":... ,"amount":..., "memo":"<hex>"},...] ( minconf ) ( fee )
+ */
+
+#define JUMBLR_INCR 99.65
+#define JUMBLR_TXFEE 0.01
+#define JUMBLR_ADDR "RGhxXpXSSBTBm9EvNsXnTQczthMCxHX91t"
+#define JUMBLR_BTCADDR "18RmTJe9qMech8siuhYfMtHo8RtcN1obC6"
+#define JUMBLR_FEE 0.001
+
+int32_t jumblr_addresstype(struct supernet_info *myinfo,struct iguana_info *coin,char *addr)
+{
+    if ( addr[0] == 'z' && addr[1] == 'c' && strlen(addr) >= 40 )
+        return('z');
+    else if ( strlen(addr) < 40 )
+        return('t');
+    else return(-1);
+}
+
+struct jumblr_item *jumblr_opidfind(struct supernet_info *myinfo,char *opid)
+{
+    struct jumblr_item *ptr;
+    HASH_FIND(hh,myinfo->jumblrs,opid,(int32_t)strlen(opid),ptr);
+    return(ptr);
+}
+
+struct jumblr_item *jumblr_opidadd(struct supernet_info *myinfo,struct iguana_info *coin,char *opid)
+{
+    struct jumblr_item *ptr;
+    if ( (ptr= jumblr_opidfind(myinfo,opid)) == 0 )
+    {
+        ptr = calloc(1,sizeof(*ptr));
+        safecopy(ptr->opid,opid,sizeof(ptr->opid));
+        HASH_ADD_KEYPTR(hh,myinfo->jumblrs,ptr->opid,(int32_t)strlen(ptr->opid),ptr);
+        if ( ptr != jumblr_opidfind(myinfo,opid) )
+            printf("jumblr_opidadd.(%s) ERROR, couldnt find after add\n",opid);
+    }
+    return(ptr);
+}
+
+char *jumblr_validateaddress(struct supernet_info *myinfo,struct iguana_info *coin,char *addr)
+{
+    char params[1024];
+    if ( coin->FULLNODE < 0 )
+    {
+        sprintf(params,"[\"%s\"]",addr);
+        return(bitcoind_passthru(coin->symbol,coin->chain->serverport,coin->chain->userpass,"validateaddress",params));
+    } else return(_dex_validateaddress(myinfo,coin->symbol,addr));
+}
+
+int32_t jumblr_ismine(struct supernet_info *myinfo,struct iguana_info *coin,char *addr)
+{
+    char params[1024],*retstr; cJSON *retjson,*obj; int32_t retval = -1;
+    sprintf(params,"[\"%s\"]",addr);
+    if ( (retstr= jumblr_validateaddress(myinfo,coin,addr)) != 0 )
+    {
+        if ( (retjson= cJSON_Parse(retstr)) != 0 )
+        {
+            if ( (obj= jobj(retjson,"ismine")) != 0 && is_cJSON_True(obj) != 0 )
+                retval = 1;
+            else retval = 0;
+            free_json(retjson);
+        }
+        free(retstr);
+    }
+    return(retval);
+}
+
+char *jumblr_zgetnewaddress(struct supernet_info *myinfo,struct iguana_info *coin)
+{
+    return(bitcoind_passthru(coin->symbol,coin->chain->serverport,coin->chain->userpass,"z_getnewaddress",""));
+}
+
+char *jumblr_zlistoperationids(struct supernet_info *myinfo,struct iguana_info *coin)
+{
+    return(bitcoind_passthru(coin->symbol,coin->chain->serverport,coin->chain->userpass,"z_listoperationids",""));
+}
+
+char *jumblr_zgetoperationresult(struct supernet_info *myinfo,struct iguana_info *coin,char *opid)
+{
+    char params[1024];
+    sprintf(params,"[[\"%s\"]]",opid);
+    return(bitcoind_passthru(coin->symbol,coin->chain->serverport,coin->chain->userpass,"z_getoperationresult",params));
+}
+
+char *jumblr_zgetoperationstatus(struct supernet_info *myinfo,struct iguana_info *coin,char *opid)
+{
+    char params[1024];
+    sprintf(params,"[[\"%s\"]]",opid);
+    return(bitcoind_passthru(coin->symbol,coin->chain->serverport,coin->chain->userpass,"z_getoperationstatus",params));
+}
+
+char *jumblr_sendt_to_z(struct supernet_info *myinfo,struct iguana_info *coin,char *taddr,char *zaddr,double amount)
+{
+    char params[1024]; double fee = (amount-3*JUMBLR_TXFEE) * JUMBLR_FEE;
+    if ( jumblr_addresstype(myinfo,coin,zaddr) != 'z' || jumblr_addresstype(myinfo,coin,taddr) != 't' )
+        return(clonestr("{\"error\":\"illegal address in t to z\"}"));
+    sprintf(params,"[\"%s\", [{\"address\":\"%s\",\"amount\":%.8f}, {\"address\":\"%s\",\"amount\":%.8f}], 1, %.8f]",taddr,zaddr,amount-fee-JUMBLR_TXFEE,JUMBLR_ADDR,fee,JUMBLR_TXFEE);
+    return(bitcoind_passthru(coin->symbol,coin->chain->serverport,coin->chain->userpass,"z_sendmany",params));
+}
+
+char *jumblr_sendz_to_z(struct supernet_info *myinfo,struct iguana_info *coin,char *zaddrS,char *zaddrD,double amount)
+{
+    char params[1024]; double fee = (amount-2*JUMBLR_TXFEE) * JUMBLR_FEE;
+    if ( jumblr_addresstype(myinfo,coin,zaddrS) != 'z' || jumblr_addresstype(myinfo,coin,zaddrD) != 'z' )
+        return(clonestr("{\"error\":\"illegal address in z to z\"}"));
+    sprintf(params,"[\"%s\", [{\"address\":\"%s\",\"amount\":%.8f}, {\"address\":\"%s\",\"amount\":%.8f}], 1, %.8f]",zaddrS,zaddrD,amount-fee-JUMBLR_TXFEE,JUMBLR_ADDR,fee,JUMBLR_TXFEE);
+    return(bitcoind_passthru(coin->symbol,coin->chain->serverport,coin->chain->userpass,"z_sendmany",params));
+}
+
+char *jumblr_sendz_to_t(struct supernet_info *myinfo,struct iguana_info *coin,char *zaddr,char *taddr,double amount)
+{
+    char params[1024]; double fee = (amount-JUMBLR_TXFEE) * JUMBLR_FEE;
+    if ( jumblr_addresstype(myinfo,coin,zaddr) != 'z' || jumblr_addresstype(myinfo,coin,taddr) != 't' )
+        return(clonestr("{\"error\":\"illegal address in z to t\"}"));
+    sprintf(params,"[\"%s\", [{\"address\":\"%s\",\"amount\":%.8f}, {\"address\":\"%s\",\"amount\":%.8f}], 1, %.8f]",zaddr,taddr,amount-fee-JUMBLR_TXFEE,JUMBLR_ADDR,fee,JUMBLR_TXFEE);
+    return(bitcoind_passthru(coin->symbol,coin->chain->serverport,coin->chain->userpass,"z_sendmany",params));
+}
+
+char *jumblr_zlistreceivedbyaddress(struct supernet_info *myinfo,struct iguana_info *coin,char *addr)
+{
+    char params[1024];
+    sprintf(params,"[\"%s\", 1]",addr);
+    return(bitcoind_passthru(coin->symbol,coin->chain->serverport,coin->chain->userpass,"z_listreceivedbyaddress",params));
+}
+
+char *jumblr_getreceivedbyaddress(struct supernet_info *myinfo,struct iguana_info *coin,char *addr)
+{
+    char params[1024];
+    sprintf(params,"[\"%s\", 1]",addr);
+    return(bitcoind_passthru(coin->symbol,coin->chain->serverport,coin->chain->userpass,"getreceivedbyaddress",params));
+}
+
+char *jumblr_importprivkey(struct supernet_info *myinfo,struct iguana_info *coin,char *wifstr)
+{
+    char params[1024];
+    sprintf(params,"[\"%s\", \"\", false]",wifstr);
+    return(bitcoind_passthru(coin->symbol,coin->chain->serverport,coin->chain->userpass,"importprivkey",params));
+}
+
+char *jumblr_zgetbalance(struct supernet_info *myinfo,struct iguana_info *coin,char *addr)
+{
+    char params[1024];
+    sprintf(params,"[\"%s\", 1]",addr);
+    return(bitcoind_passthru(coin->symbol,coin->chain->serverport,coin->chain->userpass,"z_getbalance",params));
+}
+
+char *jumblr_listunspent(struct supernet_info *myinfo,struct iguana_info *coin,char *addr)
+{
+    char params[1024];
+    sprintf(params,"[1, 99999999, [\"%s\"]]",addr);
+    return(bitcoind_passthru(coin->symbol,coin->chain->serverport,coin->chain->userpass,"listunspent",params));
+}
+
+int64_t jumblr_receivedby(struct supernet_info *myinfo,struct iguana_info *coin,char *addr)
+{
+    char *retstr; int64_t total = 0;
+    if ( (retstr= jumblr_getreceivedbyaddress(myinfo,coin,addr)) != 0 )
+    {
+        total = atof(retstr) * SATOSHIDEN;
+        free(retstr);
+    }
+    return(total);
+}
+
+int64_t jumblr_balance(struct supernet_info *myinfo,struct iguana_info *coin,char *addr)
+{
+    char *retstr; double val; cJSON *retjson; int32_t i,n; int64_t balance = 0;
+    if ( jumblr_addresstype(myinfo,coin,addr) == 't' )
+    {
+        if ( coin->FULLNODE < 0 && jumblr_ismine(myinfo,coin,addr) > 0 )
+        {
+            if ( (retstr= jumblr_listunspent(myinfo,coin,addr)) != 0 )
+            {
+                if ( (retjson= cJSON_Parse(retstr)) != 0 )
+                {
+                    if ( (n= cJSON_GetArraySize(retjson)) > 0 )
+                        for (i=0; i<n; i++)
+                            balance += SATOSHIDEN * jdouble(jitem(retjson,i),"amount");
+                    free_json(retjson);
+                }
+                free(retstr);
+            }
+        }
+        else if ( (retstr= dex_getbalance(myinfo,coin,0,0,coin->symbol,addr)) != 0 )
+        {
+            //printf("retstr.(%s)\n",retstr);
+            if ( (retjson= cJSON_Parse(retstr)) != 0 )
+            {
+                balance = jdouble(retjson,"balance") * SATOSHIDEN;
+                free_json(retjson);
+            }
+            free(retstr);
+        }
+    }
+    else if ( (retstr= jumblr_zgetbalance(myinfo,coin,addr)) != 0 )
+    {
+        if ( (val= atof(retstr)) > SMALLVAL )
+            balance = val * SATOSHIDEN;
+        free(retstr);
+    }
+    return(balance);
+}
+
+int32_t jumblr_itemset(struct jumblr_item *ptr,cJSON *item,char *status)
+{
+    cJSON *params,*amounts,*dest; char *from,*addr; int32_t i,n; int64_t amount;
+    /*"params" : {
+     "fromaddress" : "RDhEGYScNQYetCyG75Kf8Fg61UWPdwc1C5",
+     "amounts" : [
+     {
+     "address" : "zc9s3UdkDFTnnwHrMCr1vYy2WmkjhmTxXNiqC42s7BjeKBVUwk766TTSsrRPKfnX31Bbu8wbrTqnjDqskYGwx48FZMPHvft",
+     "amount" : 3.00000000
+     }
+     ],
+     "minconf" : 1,
+     "fee" : 0.00010000
+     }*/
+    if ( (params= jobj(item,"params")) != 0 )
+    {
+        //printf("params.(%s)\n",jprint(params,0));
+        if ( (from= jstr(params,"fromaddress")) != 0 )
+        {
+            safecopy(ptr->src,from,sizeof(ptr->src));
+        }
+        if ( (amounts= jarray(&n,params,"amounts")) != 0 )
+        {
+            for (i=0; i<n; i++)
+            {
+                dest = jitem(amounts,i);
+                //printf("%s ",jprint(dest,0));
+                if ( (addr= jstr(dest,"address")) != 0 && (amount= jdouble(dest,"amount")*SATOSHIDEN) > 0 )
+                {
+                    if ( strcmp(addr,JUMBLR_ADDR) == 0 )
+                        ptr->fee = amount;
+                    else
+                    {
+                        ptr->amount = amount;
+                        safecopy(ptr->dest,addr,sizeof(ptr->dest));
+                    }
+                }
+            }
+        }
+        ptr->txfee = jdouble(params,"fee") * SATOSHIDEN;
+    }
+    return(1);
+}
+
+void jumblr_opidupdate(struct supernet_info *myinfo,struct iguana_info *coin,struct jumblr_item *ptr)
+{
+    char *retstr,*status,KMDjumblr[64],KMDdeposit[64],BTCaddr[64]; cJSON *retjson,*item;
+    if ( ptr->status == 0 )
+    {
+        if ( (retstr= jumblr_zgetoperationstatus(myinfo,coin,ptr->opid)) != 0 )
+        {
+            if ( (retjson= cJSON_Parse(retstr)) != 0 )
+            {
+                if ( cJSON_GetArraySize(retjson) == 1 )
+                {
+                    item = jitem(retjson,0);
+                    //printf("%s\n",jprint(item,0));
+                    if ( (status= jstr(item,"status")) != 0 )
+                    {
+                        if ( strcmp(status,"success") == 0 )
+                        {
+                            ptr->status = jumblr_itemset(ptr,item,status);
+                            jumblr_privkey(myinfo,BTCaddr,KMDdeposit,JUMBLR_DEPOSITPREFIX);
+                            jumblr_privkey(myinfo,BTCaddr,KMDjumblr,"");
+                            if ( (jumblr_addresstype(myinfo,coin,ptr->src) == 't' && jumblr_addresstype(myinfo,coin,ptr->src) == 'z' && strcmp(ptr->src,KMDdeposit) != 0) || (jumblr_addresstype(myinfo,coin,ptr->src) == 'z' && jumblr_addresstype(myinfo,coin,ptr->src) == 't' && strcmp(ptr->dest,KMDjumblr) != 0) )
+                            {
+                                printf("a non-jumblr t->z pruned\n");
+                                free(jumblr_zgetoperationresult(myinfo,coin,ptr->opid));
+                                ptr->status = -1;
+                            }
+
+                        }
+                        else if ( strcmp(status,"failed") == 0 )
+                        {
+                            printf("%s failed\n",ptr->opid);
+                            free(jumblr_zgetoperationresult(myinfo,coin,ptr->opid));
+                            ptr->status = -1;
+                        }
+                    }
+                }
+                free_json(retjson);
+            }
+            free(retstr);
+        }
+    }
+}
+
+void jumblr_prune(struct supernet_info *myinfo,struct iguana_info *coin,struct jumblr_item *ptr)
+{
+    struct jumblr_item *tmp; char oldsrc[128]; int32_t flag = 1;
+    printf("PRUNE %s\n",ptr->opid);
+    strcpy(oldsrc,ptr->src);
+    free(jumblr_zgetoperationresult(myinfo,coin,ptr->opid));
+    while ( flag != 0 )
+    {
+        flag = 0;
+        HASH_ITER(hh,myinfo->jumblrs,ptr,tmp)
+        {
+            if ( strcmp(oldsrc,ptr->dest) == 0 )
+            {
+                printf("prune %s (%s -> %s) matched oldsrc\n",ptr->opid,ptr->src,ptr->dest);
+                free(jumblr_zgetoperationresult(myinfo,coin,ptr->opid));
+                strcpy(oldsrc,ptr->src);
+                flag = 1;
+                break;
+            }
+        }
+    }
+}
+
+void jumblr_opidsupdate(struct supernet_info *myinfo,struct iguana_info *coin)
+{
+    char *retstr; cJSON *array; int32_t i,n; struct jumblr_item *ptr;
+    if ( (retstr= jumblr_zlistoperationids(myinfo,coin)) != 0 )
+    {
+        if ( (array= cJSON_Parse(retstr)) != 0 )
+        {
+            if ( (n= cJSON_GetArraySize(array)) > 0 )
+            {
+                for (i=0; i<n; i++)
+                {
+                    if ( (ptr= jumblr_opidadd(myinfo,coin,jstri(array,i))) != 0 )
+                    {
+                        if ( ptr->status == 0 )
+                            jumblr_opidupdate(myinfo,coin,ptr);
+                        //printf("%d: %s -> %s %.8f\n",ptr->status,ptr->src,ptr->dest,dstr(ptr->amount));
+                        if ( jumblr_addresstype(myinfo,coin,ptr->src) == 'z' && jumblr_addresstype(myinfo,coin,ptr->dest) == 't' )
+                            jumblr_prune(myinfo,coin,ptr);
+                    }
+                }
+            }
+            free_json(array);
+        }
+        free(retstr);
+    }
+}
+
+bits256 jumblr_privkey(struct supernet_info *myinfo,char *BTCaddr,char *KMDaddr,char *prefix)
+{
+    bits256 privkey,pubkey; uint8_t pubkey33[33]; char passphrase[sizeof(myinfo->jumblr_passphrase) + 64];
+    sprintf(passphrase,"%s%s",prefix,myinfo->jumblr_passphrase);
+    conv_NXTpassword(privkey.bytes,pubkey.bytes,(uint8_t *)passphrase,(int32_t)strlen(passphrase));
+    bitcoin_pubkey33(myinfo->ctx,pubkey33,privkey);
+    bitcoin_address(BTCaddr,0,pubkey33,33);
+    bitcoin_address(KMDaddr,60,pubkey33,33);
+    return(privkey);
+}
+
+void jumblr_DEXcheck(struct supernet_info *myinfo,struct iguana_info *coinkmd,char *BTCaddr,char *KMDaddr,bits256 privkey)
+{
+    static double kmdprice,pending; static uint32_t lasttime;
+    double btcavail=0,minbtc,avebid,aveask,highbid,lowask,CMC_average,USD_average,changes[3]; struct iguana_info *coinbtc; cJSON *vals; bits256 hash; char *retstr;
+    coinbtc = iguana_coinfind("BTC");
+    if ( kmdprice == 0. || time(NULL) > lasttime+60 )
+    {
+        kmdprice = get_theoretical(&avebid,&aveask,&highbid,&lowask,&CMC_average,changes,"komodo","KMD","BTC",&USD_average);
+        lasttime = (uint32_t)time(NULL);
+        printf("KMD %.8f\n",kmdprice);
+    }
+    if ( kmdprice > SMALLVAL )
+    {
+        minbtc = (kmdprice * 1.1) * (JUMBLR_INCR + 3*(JUMBLR_INCR * JUMBLR_FEE + JUMBLR_TXFEE));
+        if ( coinbtc != 0 && (btcavail= dstr(jumblr_balance(myinfo,coinbtc,BTCaddr))) > minbtc+pending )
+        {
+            printf("BTC deposits %.8f, min %.8f\n",btcavail,minbtc);
+            vals = cJSON_CreateObject();
+            jaddstr(vals,"source","BTC");
+            //hash = curve25519(privkey,curve25519_basepoint9());
+            jaddstr(vals,"dest","KMD");
+            jaddnum(vals,"amount",btcavail*.3);
+            jaddnum(vals,"minprice",kmdprice*.95);
+            jaddnum(vals,"usejumblr",1);
+            memset(hash.bytes,0,sizeof(hash));
+            pending = btcavail;
+            if ( (retstr= InstantDEX_request(myinfo,coinbtc,0,0,hash,vals,"")) != 0 )
+            {
+                printf("request.(%s) -> (%s)\n",jprint(vals,0),retstr);
+                free(retstr);
+            }
+            // curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"InstantDEX\",\"method\":\"request\",\"vals\":{\"source\":\"KMD\",\"amount\":20,\"dest\":\"USD\",\"minprice\":0.08}}"
+        } //else printf("btcavail %.8f pending %.8f\n",btcavail,pending);
+    } else printf("null kmdprice %.8f\n",kmdprice);
+}
+
+void jumblr_iteration(struct supernet_info *myinfo,struct iguana_info *coin,int32_t selector,int32_t modval)
+{
+    //static uint32_t lasttime;
+    char BTCaddr[64],KMDaddr[64],*zaddr,*retstr; bits256 privkey; uint64_t amount=0,total=0; double fee; struct jumblr_item *ptr,*tmp; uint8_t r;
+    fee = JUMBLR_INCR * JUMBLR_FEE;
+    OS_randombytes(&r,sizeof(r));
+//r = 0;
+    if ( strcmp(coin->symbol,"KMD") == 0 && coin->FULLNODE < 0 )
+    {
+        //printf("JUMBLR selector.%d modval.%d r.%d\n",selector,modval,r&7);
+        switch ( selector )
+        {
+            case 0: // public -> z, need to importprivkey
+                jumblr_privkey(myinfo,BTCaddr,KMDaddr,JUMBLR_DEPOSITPREFIX);
+                if ( (total= jumblr_balance(myinfo,coin,KMDaddr)) >= (JUMBLR_INCR + 3*(fee+JUMBLR_TXFEE))*SATOSHIDEN )
+                {
+                    if ( (r & 1) == 0 )
+                    {
+                        if ( (zaddr= jumblr_zgetnewaddress(myinfo,coin)) != 0 )
+                        {
+                            if ( total >= SATOSHIDEN * ((JUMBLR_INCR + 3*fee)*100 + 3*JUMBLR_TXFEE) )
+                                amount = SATOSHIDEN * ((JUMBLR_INCR + 3*fee)*100 + 3*JUMBLR_TXFEE);
+                            else if ( total >= SATOSHIDEN * ((JUMBLR_INCR + 3*fee)*10 + 3*JUMBLR_TXFEE) )
+                                amount = SATOSHIDEN * ((JUMBLR_INCR + 3*fee)*10 + 3*JUMBLR_TXFEE);
+                            else amount = SATOSHIDEN * ((JUMBLR_INCR + 3*fee) + 3*JUMBLR_TXFEE);
+                            if ( (retstr= jumblr_sendt_to_z(myinfo,coin,KMDaddr,zaddr,dstr(amount))) != 0 )
+                            {
+                                printf("sendt_to_z.(%s)\n",retstr);
+                                free(retstr);
+                            }
+                            free(zaddr);
+                        } else printf("no zaddr from jumblr_zgetnewaddress\n");
+                    }
+                } else printf("%s total %.8f vs %.8f\n",KMDaddr,dstr(total),(JUMBLR_INCR + 3*(fee+JUMBLR_TXFEE)));
+                break;
+            case 1: // z -> z
+                jumblr_opidsupdate(myinfo,coin);
+                HASH_ITER(hh,myinfo->jumblrs,ptr,tmp)
+                {
+                    if ( jumblr_addresstype(myinfo,coin,ptr->src) == 't' && jumblr_addresstype(myinfo,coin,ptr->dest) == 'z' )
+                    {
+                        if ( (r & 1) == 0 && ptr->spent == 0 && (total= jumblr_balance(myinfo,coin,ptr->dest)) >= (fee + JUMBLR_FEE)*SATOSHIDEN )
+                        {
+                            if ( (zaddr= jumblr_zgetnewaddress(myinfo,coin)) != 0 )
+                            {
+                                if ( (retstr= jumblr_sendz_to_z(myinfo,coin,ptr->dest,zaddr,dstr(total))) != 0 )
+                                {
+                                    printf("sendz_to_z.(%s)\n",retstr);
+                                    free(retstr);
+                                }
+                                ptr->spent = (uint32_t)time(NULL);
+                                free(zaddr);
+                                break;
+                            }
+                        }
+                    }
+                }
+                break;
+            case 2: // z -> public
+                jumblr_opidsupdate(myinfo,coin);
+                HASH_ITER(hh,myinfo->jumblrs,ptr,tmp)
+                {
+                    if ( jumblr_addresstype(myinfo,coin,ptr->src) == 'z' && jumblr_addresstype(myinfo,coin,ptr->dest) == 'z' )
+                    {
+                        if ( (r & 1) == 0 && ptr->spent == 0 && (total= jumblr_balance(myinfo,coin,ptr->dest)) >= (fee + JUMBLR_FEE)*SATOSHIDEN )
+                        {
+                            privkey = jumblr_privkey(myinfo,BTCaddr,KMDaddr,"");
+                            if ( (retstr= jumblr_sendz_to_t(myinfo,coin,ptr->dest,KMDaddr,dstr(total))) != 0 )
+                            {
+                                printf("sendz_to_t.(%s)\n",retstr);
+                                free(retstr);
+                            }
+                            ptr->spent = (uint32_t)time(NULL);
+                            break;
+                        }
+                    }
+                }
+                break;
+        }
+    }
+}
+

basilisk/smartaddress.c

@@ -0,0 +1,90 @@
+/******************************************************************************
+ * Copyright © 2014-2017 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+// included from basilisk.c
+
+int32_t smartaddress_add(struct supernet_info *myinfo,bits256 privkey,char *BTCaddr,char *KMDaddr)
+{
+    struct smartaddress *ap;
+    int32_t i;
+    if ( myinfo->numsmartaddrs < sizeof(myinfo->smartaddrs)/sizeof(*myinfo->smartaddrs) )
+    {
+        for (i=0; i<myinfo->numsmartaddrs; i++)
+            if ( bits256_cmp(myinfo->smartaddrs[i].privkey,privkey) == 0 )
+                return(-1);
+        ap = &myinfo->smartaddrs[myinfo->numsmartaddrs++];
+        ap->privkey = privkey;
+        bitcoin_pubkey33(myinfo->ctx,ap->pubkey33,privkey);
+        calc_rmd160_sha256(ap->rmd160,ap->pubkey33,33);
+        ap->pubkey = curve25519(privkey,curve25519_basepoint9());
+        char coinaddr[64]; uint8_t addrtype,rmd160[20];
+        bitcoin_address(coinaddr,0,ap->pubkey33,33);
+        for (i=0; i<20; i++)
+            printf("%02x",ap->rmd160[i]);
+        bitcoin_addr2rmd160(&addrtype,rmd160,coinaddr);
+        printf(", ");
+        for (i=0; i<20; i++)
+            printf("%02x",rmd160[i]);
+        printf (" <- rmd160 for %d %s vs %s\n",myinfo->numsmartaddrs,coinaddr,BTCaddr);
+        return(myinfo->numsmartaddrs);
+    }
+    printf("too many smartaddresses %d vs %d\n",myinfo->numsmartaddrs,(int32_t)(sizeof(myinfo->smartaddrs)/sizeof(*myinfo->smartaddrs)));
+    return(-1);
+}
+
+int32_t smartaddress(struct supernet_info *myinfo,bits256 *privkeyp,char *coinaddr)
+{
+    int32_t i; uint8_t addrtype,rmd160[20];
+    memset(privkeyp,0,sizeof(*privkeyp));
+    bitcoin_addr2rmd160(&addrtype,rmd160,coinaddr);
+    for (i=0; i<myinfo->numsmartaddrs; i++)
+        if ( memcmp(myinfo->smartaddrs[i].rmd160,rmd160,20) == 0 )
+        {
+            *privkeyp = myinfo->smartaddrs[i].privkey;
+            printf("MATCHED %s\n",coinaddr);
+            return(i);
+        }
+    for (i=0; i<20; i++)
+        printf("%02x",rmd160[i]);
+    printf(" <- rmd160 smartaddress cant find (%s) of %d\n",coinaddr,myinfo->numsmartaddrs);
+    return(-1);
+}
+
+int32_t smartaddress_pubkey(struct supernet_info *myinfo,bits256 *privkeyp,bits256 pubkey)
+{
+    int32_t i;
+    memset(privkeyp,0,sizeof(*privkeyp));
+    for (i=0; i<myinfo->numsmartaddrs; i++)
+        if ( bits256_cmp(myinfo->smartaddrs[i].pubkey,pubkey) == 0 )
+        {
+            *privkeyp = myinfo->smartaddrs[i].privkey;
+            return(i);
+        }
+    return(-1);
+}
+
+int32_t smartaddress_pubkey33(struct supernet_info *myinfo,bits256 *privkeyp,uint8_t *pubkey33)
+{
+    int32_t i;
+    memset(privkeyp,0,sizeof(*privkeyp));
+    for (i=0; i<myinfo->numsmartaddrs; i++)
+        if ( memcmp(myinfo->smartaddrs[i].pubkey33,pubkey33,33) == 0 )
+        {
+            *privkeyp = myinfo->smartaddrs[i].privkey;
+            return(i);
+        }
+    return(0);
+}
+

basilisk/tradebots_liquidity.c

@@ -110,7 +110,7 @@ int32_t tradebots_calcrawfeatures(struct tradebot_arbpair *pair)
     }
     if ( n > sizeof(pair->rawfeatures)/sizeof(*pair->rawfeatures) )
     {
-        printf("n.%d too many for rawfeatures %ld\n",n,sizeof(pair->rawfeatures)/sizeof(*pair->rawfeatures));
+        printf("n.%d too many for rawfeatures %d\n",n,(int32_t)(sizeof(pair->rawfeatures)/sizeof(*pair->rawfeatures)));
         exit(-1);
     }
     return(n);
@@ -160,7 +160,7 @@ struct tradebot_arbpair *tradebots_arbpair_create(char *base,char *rel)
         pair->fp = OS_appendfile(fname);
         if ( (ftell(pair->fp) % sizeof(pair->rawfeatures)) != 0 )
         {
-            printf("misalinged rawfeatures %ld %ld\n",ftell(pair->fp),(ftell(pair->fp) % sizeof(pair->rawfeatures)));
+            printf("misalinged rawfeatures %d %d\n",(uint32_t)ftell(pair->fp),(uint32_t)(ftell(pair->fp) % sizeof(pair->rawfeatures)));
         }
         fseek(pair->fp,(ftell(pair->fp) / sizeof(pair->rawfeatures)) * sizeof(pair->rawfeatures) - sizeof(pair->rawfeatures),SEEK_SET);
         if ( fread(pair->rawfeatures,1,sizeof(pair->rawfeatures),pair->fp) == sizeof(pair->rawfeatures) )
@@ -932,6 +932,8 @@ void _default_liquidity_command(struct supernet_info *myinfo,char *base,bits256
     li.ask = jdouble(vals,"ask");
     if ( (li.minvol= jdouble(vals,"minvol")) <= 0. )
         li.minvol = (strcmp("BTC",base) == 0) ? 0.0001 : 0.001;
+    if ( strcmp(li.base,"KMD") == 0 && strcmp(li.rel,"BTC") == 0 && li.minvol > 100. )
+        li.minvol = 100.;
     if ( (li.maxvol= jdouble(vals,"maxvol")) < li.minvol )
         li.maxvol = li.minvol;
     if ( (li.totalvol= jdouble(vals,"total")) < li.maxvol )
@@ -1129,6 +1131,8 @@ void _default_swap_balancingtrade(struct supernet_info *myinfo,struct basilisk_s
 
 void tradebot_swap_balancingtrade(struct supernet_info *myinfo,struct basilisk_swap *swap,int32_t iambob)
 {
+    printf("balancing trade\n");
+    return;
     if ( swap->balancingtrade == 0 )
         _default_swap_balancingtrade(myinfo,swap,iambob);
     else (*swap->balancingtrade)(myinfo,swap,iambob);
@@ -1203,35 +1207,3 @@ void tradebots_processprices(struct supernet_info *myinfo,struct exchange_info *
         }
     }
 }
-
-#include "../includes/iguana_apidefs.h"
-#include "../includes/iguana_apideclares.h"
-
-TWO_STRINGS(tradebot,gensvm,base,rel)
-{
-#ifdef _WIN
-    return(clonestr("{\"error\":\"windows doesnt support SVM\"}"));
-#else
-    int32_t numfeatures = 317*61;
-    struct tradebot_arbpair *pair;
-    if ( base[0] != 0 && rel[0] != 0 && (pair= tradebots_arbpair_find(base,rel)) != 0 && pair->fp != 0 )
-    {
-        tradebots_calcanswers(pair);
-        ocas_gen(pair->refc,numfeatures,0,(int32_t)(ftell(pair->fp) / sizeof(pair->rawfeatures)));
-        return(clonestr("{\"result\":\"success\"}"));
-    } else return(clonestr("{\"error\":\"cant find arbpair\"}"));
-#endif
-}
-
-ZERO_ARGS(tradebot,openliquidity)
-{
-    int32_t i; cJSON *array = cJSON_CreateArray();
-    for (i=0; i<sizeof(myinfo->linfos)/sizeof(*myinfo->linfos); i++)
-    {
-        if ( myinfo->linfos[i].base[0] != 0 )
-            jaddi(array,linfo_json(&myinfo->linfos[i]));
-    }
-    return(jprint(array,1));
-}
-
-#include "../includes/iguana_apiundefs.h"

basilisk/tradebots_marketmaker.c

@@ -106,97 +106,3 @@ double tradebot_pending(struct supernet_info *myinfo,char *base)
     return(pending);
 }
 
-#include "../includes/iguana_apidefs.h"
-#include "../includes/iguana_apideclares.h"
-
-ZERO_ARGS(tradebot,allbalances)
-{
-    int32_t i,n; double value,pending; char *base; cJSON *item,*balances = cJSON_CreateObject();
-    if ( myinfo->liquidity_currencies == 0 )
-        myinfo->liquidity_currencies = cJSON_Parse("[\"KMD\", \"BTC\"]");
-    if ( myinfo->liquidity_currencies != 0 && (n= cJSON_GetArraySize(myinfo->liquidity_currencies)) > 0 )
-    {
-        for (i=0; i<n; i++)
-        {
-            base = jstri(myinfo->liquidity_currencies,i);
-            value = tradebot_balance(myinfo,base);
-            pending = tradebot_pending(myinfo,base);
-            item = cJSON_CreateObject();
-            jaddnum(item,"value",value);
-            jaddnum(item,"pending",pending);
-            jadd(balances,base,item);
-        }
-    }
-    return(jprint(balances,1));
-}
-
-ZERO_ARGS(tradebot,anchor)
-{
-    FILE *fp; char *anchorstr,fname[512]; cJSON *anchor; int32_t retval = -1;
-    if ( (anchorstr= tradebot_allbalances(myinfo,0,0,0)) != 0 )
-    {
-        if ( (anchor= cJSON_Parse(anchorstr)) != 0 )
-        {
-            if ( jobj(anchor,"error") == 0 )
-            {
-                sprintf(fname,"%s/anchor",GLOBAL_DBDIR), OS_compatible_path(fname);
-                if ( (fp= fopen(fname,"wb")) != 0 )
-                {
-                    if ( fwrite(anchorstr,1,strlen(anchorstr)+1,fp) == strlen(anchorstr)+1 )
-                        retval = 0;
-                    fclose(fp);
-                }
-            }
-        }
-        free(anchorstr);
-    }
-    if ( retval == 0 )
-        return(clonestr("{\"result\":\"success\"}"));
-    else return(clonestr("{\"error\":\"couldnt make anchor file\"}"));
-}
-
-ZERO_ARGS(tradebot,portfolio)
-{
-    char *currentstr,*anchorstr,fname[512]; long fsize; cJSON *current,*anchor=0,*portfolio=0;
-    if ( (currentstr= tradebot_allbalances(myinfo,0,0,0)) != 0 )
-    {
-        if ( (current= cJSON_Parse(currentstr)) != 0 )
-        {
-            sprintf(fname,"%s/anchor",GLOBAL_DBDIR), OS_compatible_path(fname);
-            if ( (anchorstr= OS_filestr(&fsize,fname)) != 0 )
-            {
-                anchor = cJSON_Parse(anchorstr);
-                free(anchorstr);
-            }
-            if ( anchor == 0 )
-                anchor = cJSON_Parse("{}");
-            portfolio = tradebot_balancesdiff(myinfo,current,anchor);
-            free_json(current);
-        }
-        free(currentstr);
-    }
-    if ( portfolio == 0 )
-        return(clonestr("{\"result\":\"success\"}"));
-    else return(jprint(portfolio,1));
-}
-
-ARRAY_OBJ_INT(tradebot,goals,currencies,vals,targettime)
-{
-    static bits256 zero; char *targetcoin; int32_t i,n;
-    if ( currencies != 0 && vals != 0 )
-    {
-        // init things so automatically updates refli.bid and refli.ask
-        // volume range with margin
-        // currency percentage value in BTC? target distribution, max percentage, min percentage`
-        // min price to sell, max price to buy, max volume
-        n = cJSON_GetArraySize(currencies);
-        for (i=0; i<n; i++)
-        {
-            targetcoin = jstri(currencies,i);
-            tradebot_liquidity_command(myinfo,targetcoin,zero,vals);
-        }
-    return(clonestr("{\"result\":\"success\"}"));
-    } else return(clonestr("{\"error\":\"no currencies or vals\"}"));
-}
-
-#include "../includes/iguana_apiundefs.h"

crypto777/OS_portable.h

@@ -18,7 +18,7 @@
 // iguana_OS has functions that invoke system calls. Whenever possible stdio and similar functions are use and most functions are fully portable and in this file. For things that require OS specific, the call is routed to iguana_OS_portable_*  Usually, all but one OS can be handled with the same code, so iguana_OS_portable.c has most of this shared logic and an #ifdef iguana_OS_nonportable.c
 
 #ifdef __APPLE__
-#define LIQUIDITY_PROVIDER 1
+//#define LIQUIDITY_PROVIDER 1
 #endif
 
 #ifdef NATIVE_WINDOWS

crypto777/bitcoind_RPC.c

@@ -14,15 +14,11 @@
  ******************************************************************************/
 
 #include "OS_portable.h"
+#define LIQUIDITY_PROVIDER 1
 
 #if LIQUIDITY_PROVIDER
-#ifdef _WIN32
-#include <curl.h>
-#include <easy.h>
-#else
 #include <curl/curl.h>
 #include <curl/easy.h>
-#endif
 
 // return data from the server
 #define CURL_GLOBAL_ALL (CURL_GLOBAL_SSL|CURL_GLOBAL_WIN32)

crypto777/curve25519.c

@@ -1792,7 +1792,7 @@ void acct777_rwsig(int32_t rwflag,uint8_t *serialized,struct acct777_sig *sig)
 int32_t acct777_sigcheck(struct acct777_sig *sig)
 {
 #define IGUANA_GENESIS 1453075200
-#define IGUANA_MAXPACKETSIZE (1024 * 1024 * 2)
+#define IGUANA_MAXPACKETSIZE (1024 * 1024 * 4)
 #define TEN_YEARS (10 * 365 * 24 * 3600)
    if ( sig->allocsize < sizeof(*sig) || sig->allocsize > IGUANA_MAXPACKETSIZE )
     {

crypto777/iguana_utils.c

@@ -1164,7 +1164,7 @@ char *bittrex_orderbook(char *base,char *rel,int32_t maxdepth)
 
 double calc_theoretical(double weighted,double CMC_average,double changes[3])
 {
-    double adjusted = 0.,theoretical = 0.;
+    double theoretical = 0.; //adjusted = 0.,
     if ( weighted > SMALLVAL && CMC_average > SMALLVAL )
     {
         theoretical = (weighted + CMC_average) * 0.5;
@@ -1185,7 +1185,7 @@ double calc_theoretical(double weighted,double CMC_average,double changes[3])
         if ( adjusted != 0. && theoretical != 0. )
             theoretical = (theoretical + adjusted) * 0.5;*/
     }
-    printf("adjusted %.8f theoretical %.8f (%.8f + wt %.8f)\n",adjusted,theoretical,CMC_average,weighted);
+    //printf("adjusted %.8f theoretical %.8f (%.8f + wt %.8f)\n",adjusted,theoretical,CMC_average,weighted);
     return(theoretical);
 }
 

gecko/gecko.c

@@ -273,9 +273,6 @@ char *basilisk_respond_geckoget(struct supernet_info *myinfo,char *CMD,void *add
     } else return(clonestr("{\"error\":\"invalid geckoget type, mustbe (HDR or BLK or GTX)\"}"));
 }
 
-#include "../includes/iguana_apidefs.h"
-#include "../includes/iguana_apideclares.h"
-
 char *gecko_sendrawtransaction(struct supernet_info *myinfo,char *symbol,uint8_t *data,int32_t datalen,bits256 txid,cJSON *vals,char *signedtx)
 {
     char *retstr = 0; struct iguana_info *virt,*btcd = iguana_coinfind("BTCD");
@@ -290,48 +287,5 @@ char *gecko_sendrawtransaction(struct supernet_info *myinfo,char *symbol,uint8_t
     return(retstr);
 }
 
-HASH_ARRAY_STRING(basilisk,geckotx,hash,vals,hexstr)
-{
-    struct iguana_info *btcd; char *retstr=0,*symbol; uint8_t *data,*allocptr,space[4096]; int32_t datalen; bits256 txid;
-    if ( (btcd= iguana_coinfind("BTCD")) != 0 && (symbol= jstr(vals,"symbol")) != 0 )
-    {
-        if ( (data= get_dataptr(BASILISK_HDROFFSET,&allocptr,&datalen,space,sizeof(space),hexstr)) != 0 )
-        {
-            txid = bits256_doublesha256(0,data,datalen);
-            retstr = gecko_sendrawtransaction(myinfo,symbol,data,datalen,txid,vals,hexstr);
-        } else retstr = clonestr("{\"error\":\"no tx submitted\"}");
-        if ( allocptr != 0 )
-            free(allocptr);
-        if ( retstr == 0 )
-            retstr = clonestr("{\"error\":\"couldnt create geckotx\"}");
-        return(retstr);
-    } return(clonestr("{\"error\":\"need symbol and chain and BTCD to create new gecko tx\"}"));
-}
-
-HASH_ARRAY_STRING(basilisk,geckoblock,hash,vals,hexstr)
-{
-    return(clonestr("{\"error\":\"geckoblock is an internal reporting function\"}"));
-}
-
-HASH_ARRAY_STRING(basilisk,geckoheaders,hash,vals,hexstr)
-{
-    return(clonestr("{\"error\":\"geckoheaders is an internal reporting function\"}"));
-}
-
-HASH_ARRAY_STRING(basilisk,geckoget,hash,vals,hexstr)
-{
-    struct iguana_info *btcd,*virt; char *symbol;
-    if ( (btcd= iguana_coinfind("BTCD")) != 0 && (symbol= jstr(vals,"symbol")) != 0 )
-    {
-        if ( (virt= iguana_coinfind(symbol)) != 0 )
-        {
-            basilisk_wait(myinfo,virt);
-            return(basilisk_respond_geckoget(myinfo,"GET",&coin->internaladdr,remoteaddr,0,vals,0,0,hash,0));
-        } else return(clonestr("{\"error\":\"geckoget needs virtualchain\"}"));
-    }
-    return(clonestr("{\"error\":\"geckoget needs BTCD\"}"));
-}
-
-#include "../includes/iguana_apiundefs.h"
 
 

iguana.vcxproj

@@ -73,12 +73,16 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(ProjectDir)\includes;$(ProjectDir)\includes\curl;$(IncludePath)</IncludePath>
+    <LibraryPath>$(ProjectDir)\OSlibs\win;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <IncludePath>$(ProjectDir)\includes;$(ProjectDir)\includes\curl;$(IncludePath)</IncludePath>
+    <LibraryPath>$(ProjectDir)\OSlibs\win;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
@@ -97,7 +101,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Ws2_32.lib;pthreadVC2.lib;nanomsg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Ws2_32.lib;pthreadVC2.lib;nanomsg.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>.\iguana;.\OSlibs\win;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -133,7 +137,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Ws2_32.lib;pthreadVC2.lib;nanomsg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Ws2_32.lib;pthreadVC2.lib;nanomsg.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>.\OSlibs\win\release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>

iguana/SuperNET_keys.c

@@ -22,7 +22,6 @@
 #include "../includes/curve25519.h"
 #include "../includes/cJSON.h"
 
-
 /*
 if ( 0 )
 {
@@ -421,50 +420,4 @@ char *SuperNET_keysinit(struct supernet_info *myinfo,char *argjsonstr)
     return(coinargs);
 }
 
-#include "../includes/iguana_apidefs.h"
-#include "../includes/iguana_apideclares.h"
-
-TWO_STRINGS(SuperNET,decryptjson,password,permanentfile)
-{
-    char pass[8192],fname2[1023],destfname[1024]; cJSON *retjson; bits256 wallethash,wallet2priv;
-    safecopy(pass,password,sizeof(pass));
-    safecopy(fname2,permanentfile,sizeof(fname2));
-    wallethash = wallet2priv = GENESIS_PRIVKEY;
-    if ( strlen(pass) == sizeof(wallethash)*2 && is_hexstr(pass,(int32_t)sizeof(bits256)*2) > 0 )
-        wallethash = bits256_conv(pass);
-    if ( strlen(fname2) == sizeof(wallet2priv)*2 && is_hexstr(fname2,(int32_t)sizeof(bits256)*2) > 0 )
-        wallet2priv = bits256_conv(fname2);
-    if ( (retjson= SuperNET_decryptedjson(destfname,pass,sizeof(pass),wallethash,fname2,sizeof(fname2),wallet2priv)) != 0 )
-    {
-        //printf("decrypt pass.(%s) fname2.(%s) -> destfname.(%s)\n",pass,fname2,destfname);
-        //obj = jduplicate(jobj(retjson,"payload"));
-        //jdelete(retjson,"payload");
-        //jadd(retjson,"result",obj);
-        return(jprint(retjson,1));
-    } else return(clonestr("{\"error\":\"couldnt decrypt json file\"}"));
-}
-
-THREE_STRINGS(SuperNET,encryptjson,password,permanentfile,payload)
-{
-    char destfname[4096],pass[8192],fname2[1023]; cJSON *argjson,*retjson = cJSON_CreateObject();
-    safecopy(pass,password,sizeof(pass));
-    safecopy(fname2,permanentfile,sizeof(fname2));
-    argjson = jduplicate(json);
-    //printf("argjson.(%s)\n",jprint(argjson,0));
-    jdelete(argjson,"agent");
-    jdelete(argjson,"method");
-    jdelete(argjson,"password");
-    jdelete(argjson,"permanentfile");
-    jdelete(argjson,"timestamp");
-    jdelete(argjson,"tag");
-    if ( _SuperNET_encryptjson(myinfo,destfname,pass,sizeof(pass),fname2,sizeof(fname2),argjson) == 0 )
-    {
-        jaddstr(retjson,"result","success");
-        jaddstr(retjson,"filename",destfname);
-    } else jaddstr(retjson,"error","couldnt encrypt json file");
-    free_json(argjson);
-    return(jprint(retjson,1));
-}
-#include "../includes/iguana_apiundefs.h"
-
 

iguana/dPoW.h

@@ -23,7 +23,7 @@
 //#define DPOW_M(bp) ((bp)->minsigs)  // (((bp)->numnotaries >> 1) + 1)
 #define DPOW_MODIND(bp,offset) (((((bp)->height / DPOW_CHECKPOINTFREQ) % (bp)->numnotaries) + (offset)) % (bp)->numnotaries)
 #define DPOW_VERSION 0x0781
-#define DPOW_UTXOSIZE 10000
+#define DPOW_UTXOSIZE 50000
 #define DPOW_MINOUTPUT 6000
 #define DPOW_DURATION 600
 #define DPOW_RATIFYDURATION (3600 * 24)
@@ -167,6 +167,9 @@ char *dpow_alladdresses(struct supernet_info *myinfo,struct iguana_info *coin);
 cJSON *dpow_kvupdate(struct supernet_info *myinfo,struct iguana_info *coin,char *key,char *value,int32_t flags);
 cJSON *dpow_kvsearch(struct supernet_info *myinfo,struct iguana_info *coin,char *key);
 void init_alladdresses(struct supernet_info *myinfo,struct iguana_info *coin);
+cJSON *dpow_getmessage(struct supernet_info *myinfo,char *jsonstr);
+cJSON *dpow_addmessage(struct supernet_info *myinfo,char *jsonstr);
+cJSON *dpow_psock(struct supernet_info *myinfo,char *jsonstr);
 
 char *_dex_getinfo(struct supernet_info *myinfo,char *symbol);
 char *_dex_getrawtransaction(struct supernet_info *myinfo,char *symbol,bits256 txid);
@@ -178,6 +181,7 @@ char *_dex_gettxout(struct supernet_info *myinfo,char *symbol,bits256 txid,int32
 char *_dex_gettxin(struct supernet_info *myinfo,char *symbol,bits256 txid,int32_t vout);
 char *_dex_importaddress(struct supernet_info *myinfo,char *symbol,char *address);
 char *_dex_validateaddress(struct supernet_info *myinfo,char *symbol,char *address);
+char *_dex_getmessage(struct supernet_info *myinfo,char *jsonstr);
 char *_dex_listunspent(struct supernet_info *myinfo,char *symbol,char *address);
 char *_dex_listunspent2(struct supernet_info *myinfo,char *symbol,char *address);
 char *_dex_listspent(struct supernet_info *myinfo,char *symbol,char *address);
@@ -189,6 +193,7 @@ int32_t _dex_getheight(struct supernet_info *myinfo,char *symbol);
 char *_dex_getnotaries(struct supernet_info *myinfo,char *symbol);
 char *_dex_kvupdate(struct supernet_info *myinfo,char *symbol,char *key,char *value,int32_t flags);
 char *_dex_kvsearch(struct supernet_info *myinfo,char *symbol,char *key);
+char *_dex_psock(struct supernet_info *myinfo,char *jsonstr);
 
 int32_t komodo_notaries(char *symbol,uint8_t pubkeys[64][33],int32_t height);
 cJSON *dpow_checkaddress(struct supernet_info *myinfo,struct iguana_info *coin,char *address);

iguana/dpow/dpow_fsm.c

@@ -126,8 +126,8 @@ int32_t dpow_checkutxo(struct supernet_info *myinfo,struct dpow_info *dp,struct
     int32_t haveutxo,completed,minutxo,n; bits256 signedtxid; cJSON *addresses; char *rawtx,*sendtx;
     if ( strcmp("BTC",coin->symbol) == 0 )
     {
-        minutxo = 499;
-        n = 50;
+        minutxo = 199;
+        n = 10;
     }
     else
     {

iguana/dpow/dpow_network.c

@@ -239,6 +239,105 @@ char *nanomsg_tcpname(struct supernet_info *myinfo,char *str,char *ipaddr,uint16
     return(str);
 }
 
+void dpow_psockloop(void *_ptr)
+{
+    int32_t i,nonz,size,sentbytes; uint32_t now; struct psock *ptr; void *buf; struct supernet_info *myinfo = _ptr;
+    while ( 1 )
+    {
+        now = (uint32_t)time(NULL);
+        for (i=nonz=0; i<myinfo->numpsocks; i++) // change to nn_poll!
+        {
+            portable_mutex_lock(&myinfo->psockmutex);
+            if ( i < myinfo->numpsocks )
+            {
+                ptr = &myinfo->PSOCKS[i];
+                if ( (size= nn_recv(ptr->pullsock,&buf,NN_MSG,0)) > 0 )
+                {
+                    ptr->lasttime = now;
+                    if ( (sentbytes= nn_send(ptr->pubsock,buf,size,0)) > 0 )
+                    {
+                        //printf("PSOCKS[%d] of %d (%u %u) -> %d/%d bytes\n",i,myinfo->numpsocks,ptr->pushport,ptr->subport,size,sentbytes);
+                        nonz++;
+                    }
+                }
+                else if ( now > ptr->lasttime+PSOCK_IDLETIMEOUT )
+                {
+                    printf("PSOCKS[%d] of %d (%u %u) lag.%d IDLETIMEOUT\n",i,myinfo->numpsocks,ptr->pushport,ptr->subport,now - ptr->lasttime);
+                    nn_close(ptr->pullsock);
+                    nn_close(ptr->pubsock);
+                    if ( myinfo->numpsocks > 1 )
+                    {
+                        myinfo->PSOCKS[i] = myinfo->PSOCKS[--myinfo->numpsocks];
+                        memset(&myinfo->PSOCKS[myinfo->numpsocks],0,sizeof(*ptr));
+                    } else myinfo->numpsocks = 0;
+                }
+                if ( buf != 0 )
+                    nn_freemsg(buf), buf = 0;
+            }
+            portable_mutex_unlock(&myinfo->psockmutex);
+        }
+        if ( nonz == 0 )
+            usleep(100000);
+    }
+}
+
+void dpow_psockadd(struct supernet_info *myinfo,int32_t pullsock,uint16_t pushport,int32_t pubsock,uint16_t subport)
+{
+    struct psock *ptr;
+    portable_mutex_lock(&myinfo->psockmutex);
+    myinfo->PSOCKS = realloc(myinfo->PSOCKS,sizeof(*myinfo->PSOCKS) * (myinfo->numpsocks + 1));
+    ptr = &myinfo->PSOCKS[myinfo->numpsocks++];
+    ptr->pullsock = pullsock;
+    ptr->pushport = pushport;
+    ptr->pubsock = pubsock;
+    ptr->subport = subport;
+    ptr->lasttime = (uint32_t)time(NULL);
+    portable_mutex_unlock(&myinfo->psockmutex);
+}
+
+cJSON *dpow_psock(struct supernet_info *myinfo,char *jsonstr)
+{
+    char pushaddr[128],subaddr[128]; uint16_t i,pushport,subport; int32_t timeout,maxsize,pullsock=-1,pubsock=-1; cJSON *retjson=0;
+    retjson = cJSON_CreateObject();
+    pushport = myinfo->psockport++;
+    subport = myinfo->psockport++;
+    for (i=0; i<100; i++)
+    {
+        pullsock = pubsock = -1;
+        nanomsg_tcpname(myinfo,pushaddr,myinfo->ipaddr,pushport), pushport += 2;
+        nanomsg_tcpname(myinfo,subaddr,myinfo->ipaddr,subport), subport += 2;
+        if ( (pullsock= nn_socket(AF_SP,NN_PULL)) >= 0 && (pubsock= nn_socket(AF_SP,NN_PUB)) >= 0 )
+        {
+            if ( nn_bind(pullsock,pushaddr) >= 0 && nn_bind(pubsock,subaddr) >= 0 )
+            {
+                timeout = 10;
+                nn_setsockopt(pubsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout));
+                timeout = 1;
+                nn_setsockopt(pullsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout));
+                timeout = 1;
+                maxsize = 1024 * 1024;
+                nn_setsockopt(pullsock,NN_SOL_SOCKET,NN_RCVBUF,&maxsize,sizeof(maxsize));
+                dpow_psockadd(myinfo,pullsock,pushport,pubsock,subport);
+                jaddstr(retjson,"result","success");
+                jaddstr(retjson,"pushaddr",pushaddr);
+                jaddstr(retjson,"subaddr",subaddr);
+                break;
+            }
+            if ( pullsock >= 0 )
+                nn_close(pullsock);
+            if ( pubsock >= 0 )
+                nn_close(pubsock);
+        }
+        if ( pushport < 1000 )
+            pushport = 1001;
+        if ( subport < 1000 )
+            subport = 1001;
+    }
+    if ( i == 100 )
+        jaddstr(retjson,"error","cant find psock ports");
+    return(retjson);
+}
+
 static int _increasing_ipbits(const void *a,const void *b)
 {
 #define uint32_a (*(uint32_t *)a)
@@ -254,24 +353,24 @@ static int _increasing_ipbits(const void *a,const void *b)
 
 void dex_packet(struct supernet_info *myinfo,struct dex_nanomsghdr *dexp,int32_t size)
 {
-    char *retstr; int32_t datalen; struct iguana_info *coin; struct dex_request dexreq;
+    char *retstr; int32_t datalen; struct dex_request dexreq; //struct iguana_info *coin;
     //for (i=0; i<size; i++)
     //    printf("%02x",((uint8_t *)dexp)[i]);
-    //printf(" uniq.%s DEX_PACKET.[%d] crc.%x lag.%d (%d %d)\n",dexp->handler,size,calc_crc32(0,dexp->packet,dexp->datalen),(int32_t)(time(NULL)-dexp->timestamp),dexp->size,dexp->datalen);
     if ( strcmp(dexp->handler,"DEX") == 0 && dexp->datalen > BASILISK_KEYSIZE )
     {
+        printf(" uniq.%s DEX_PACKET.[%d] crc.%x lag.%d (%d %d)\n",dexp->handler,size,calc_crc32(0,dexp->packet,dexp->datalen),(int32_t)(time(NULL)-dexp->timestamp),dexp->size,dexp->datalen);
         if ( (retstr= basilisk_respond_addmessage(myinfo,dexp->packet,BASILISK_KEYSIZE,&dexp->packet[BASILISK_KEYSIZE],dexp->datalen-BASILISK_KEYSIZE,0,BASILISK_DEXDURATION)) != 0 )
             free(retstr);
     }
     else if ( strcmp(dexp->handler,"request") == 0 )
     {
         datalen = dex_rwrequest(0,dexp->packet,&dexreq);
-        if ( myinfo->IAMNOTARY != 0 && dexreq.func == 'A' && (coin= iguana_coinfind(dexreq.name)) != 0 )
+        /*if ( myinfo->IAMNOTARY != 0 && dexreq.func == 'A' && (coin= iguana_coinfind(dexreq.name)) != 0 )
         {
             if ( (retstr= dpow_importaddress(myinfo,coin,(char *)&dexp->packet[datalen])) != 0 )
                 free(retstr);
             printf("process broadcast importaddress.(%s) [%s]\n",(char *)&dexp->packet[datalen],dexreq.name);
-        }
+        }*/
     }
 }
 
@@ -287,17 +386,25 @@ char *_dex_reqsend(struct supernet_info *myinfo,char *handler,uint8_t *key,int32
        {
            timeout = 1000;
            nn_setsockopt(reqsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout));
-           //timeout = 5000;
+           //timeout = 1500;
            //nn_setsockopt(reqsock,NN_TCP,NN_RECONNECT_IVL,&timeout,sizeof(timeout));
-           timeout = 1000;
+           timeout = 3000;
            nn_setsockopt(reqsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout));
+           //prio = 1;
+           //nn_setsockopt(reqsock,NN_SOL_SOCKET,NN_SNDPRIO,&prio,sizeof(prio));
+           //nn_setsockopt(reqsock,NN_SOL_SOCKET,NN_RCVPRIO,&prio,sizeof(prio));
            for (i=0; i<sizeof(myinfo->dexseed_ipaddrs)/sizeof(*myinfo->dexseed_ipaddrs); i++)
+           {
                if ( nn_connect(reqsock,nanomsg_tcpname(0,str,myinfo->dexseed_ipaddrs[i],REP_SOCK)) < 0 )
                {
                    nn_close(reqsock);
                    reqsock = -1;
                    break;
                }
+           }
+           //prio = 8;
+           //nn_setsockopt(reqsock,NN_SOL_SOCKET,NN_SNDPRIO,&prio,sizeof(prio));
+           //nn_setsockopt(reqsock,NN_SOL_SOCKET,NN_RCVPRIO,&prio,sizeof(prio));
         }
         if ( reqsock >= 0 )
         {
@@ -408,14 +515,14 @@ char *_dex_reqsend(struct supernet_info *myinfo,char *handler,uint8_t *key,int32
                             printf("%d: subscribe connect (%s)\n",myinfo->numdexipbits,str);
                         }
                     }
-//#ifndef __APPLE__
+#ifndef __APPLE__
                     if ( (rand() % 100) < 40 )
                     {
                         nanomsg_tcpname(0,str,ipaddr,REP_SOCK);
                         nn_connect(myinfo->reqsock,str);
                         printf("%d: req connect (%s)\n",myinfo->numdexipbits,str);
                     }
-//#endif
+#endif
                 }
             }
             if ( freeptr != 0 )
@@ -612,7 +719,7 @@ char *dex_response(int32_t *broadcastflagp,struct supernet_info *myinfo,struct d
                 retstr = dpow_importaddress(myinfo,coin,(char *)&dexp->packet[datalen]);
                 if ( retstr == 0 )
                 {
-                    *broadcastflagp = 1;
+                    //*broadcastflagp = 1;
                     retstr = dpow_validateaddress(myinfo,coin,(char *)&dexp->packet[datalen]);
                 }
                 else
@@ -636,6 +743,31 @@ char *dex_response(int32_t *broadcastflagp,struct supernet_info *myinfo,struct d
                     retstr = jprint(retjson,1);
                 }
             }
+            else if ( dexreq.func == 'M' )
+            {
+                if ( (retjson= dpow_getmessage(myinfo,(char *)&dexp->packet[datalen])) != 0 )
+                {
+                    dpow_randipbits(myinfo,coin,retjson);
+                    retstr = jprint(retjson,1);
+                }
+            }
+            else if ( dexreq.func == 'Z' )
+            {
+                if ( (retjson= dpow_psock(myinfo,(char *)&dexp->packet[datalen])) != 0 )
+                {
+                    dpow_randipbits(myinfo,coin,retjson);
+                    retstr = jprint(retjson,1);
+                }
+            }
+            else if ( 0 && dexreq.func == 'a' )
+            {
+                if ( (retjson= dpow_addmessage(myinfo,(char *)&dexp->packet[datalen])) != 0 )
+                {
+                    *broadcastflagp = 1;
+                    dpow_randipbits(myinfo,coin,retjson);
+                    retstr = jprint(retjson,1);
+                }
+            }
             else if ( dexreq.func == 'N' )
             {
                 uint8_t pubkeys[64][33]; char str[128]; int32_t numnotaries; cJSON *array,*item;
@@ -985,6 +1117,35 @@ char *_dex_validateaddress(struct supernet_info *myinfo,char *symbol,char *addre
     return(_dex_sendrequeststr(myinfo,&dexreq,address,0,1,""));
 }
 
+char *_dex_getmessage(struct supernet_info *myinfo,char *jsonstr)
+{
+    struct dex_request dexreq;
+    memset(&dexreq,0,sizeof(dexreq));
+    safecopy(dexreq.name,"KMD",sizeof(dexreq.name));
+    dexreq.func = 'M';
+    return(_dex_sendrequeststr(myinfo,&dexreq,jsonstr,0,1,""));
+}
+
+char *_dex_sendmessage(struct supernet_info *myinfo,char *jsonstr)
+{
+    struct dex_request dexreq;
+    memset(&dexreq,0,sizeof(dexreq));
+    safecopy(dexreq.name,"KMD",sizeof(dexreq.name));
+    dexreq.func = 'a';
+    return(_dex_sendrequeststr(myinfo,&dexreq,jsonstr,0,1,""));
+}
+
+char *_dex_psock(struct supernet_info *myinfo,char *jsonstr)
+{
+    struct dex_request dexreq;
+    if ( jsonstr == 0 )
+        jsonstr = "{}";
+    memset(&dexreq,0,sizeof(dexreq));
+    safecopy(dexreq.name,"KMD",sizeof(dexreq.name));
+    dexreq.func = 'Z';
+    return(_dex_sendrequeststr(myinfo,&dexreq,jsonstr,0,1,""));
+}
+
 char *_dex_listunspentarg(struct supernet_info *myinfo,char *symbol,char *address,uint8_t arg)
 {
     struct dex_request dexreq; char *retstr;
@@ -1077,7 +1238,7 @@ int32_t dex_crc32find(struct supernet_info *myinfo,uint32_t crc32)
 
 int32_t dex_packetcheck(struct supernet_info *myinfo,struct dex_nanomsghdr *dexp,int32_t size)
 {
-    int32_t firstz=-1; uint32_t crc32;
+    uint32_t crc32; //int32_t firstz=-1; 
     if ( dexp->version0 == (DEX_VERSION & 0xff) && dexp->version1 == ((DEX_VERSION >> 8) & 0xff) )
     {
         if ( dexp->datalen == (size - sizeof(*dexp)) )
@@ -1085,7 +1246,7 @@ int32_t dex_packetcheck(struct supernet_info *myinfo,struct dex_nanomsghdr *dexp
             crc32 = calc_crc32(0,dexp->packet,dexp->datalen);//(void *)((long)dexp + sizeof(dexp->crc32)),(int32_t)(size - sizeof(dexp->crc32)));
             if ( dexp->crc32 == crc32 )//&& (firstz= dex_crc32find(myinfo,crc32)) >= 0 )
                 return(0);
-            else printf("dexp %08x != %08x || firstz.%d < 0\n",dexp->crc32,crc32,firstz);
+            //else printf("dexp %08x != %08x || firstz.%d < 0\n",dexp->crc32,crc32,firstz);
         } else printf("datalen.%d != (%d - %ld)\n",dexp->datalen,size,sizeof(*dexp));
     }
     return(-1);
@@ -1094,6 +1255,7 @@ int32_t dex_packetcheck(struct supernet_info *myinfo,struct dex_nanomsghdr *dexp
 int32_t dex_subsock_poll(struct supernet_info *myinfo)
 {
     int32_t size= -1; struct dex_nanomsghdr *dexp; void *freeptr;
+    return(0);
     //fprintf(stderr,"subsock.%d\n",myinfo->subsock);
     if ( myinfo->subsock >= 0 && (size= signed_nn_recv(&freeptr,myinfo->ctx,myinfo->notaries,myinfo->numnotaries,myinfo->subsock,&dexp)) >= 0 )
     {
@@ -1962,7 +2124,7 @@ int32_t dpow_nanomsg_update(struct supernet_info *myinfo)
                 if ( dex_packetcheck(myinfo,dexp,size) == 0 )
                 {
                     //printf("FROM BUS.%08x -> pub\n",dexp->crc32);
-                    signed_nn_send(myinfo,myinfo->ctx,myinfo->persistent_priv,myinfo->pubsock,dexp,size);
+                    //signed_nn_send(myinfo,myinfo->ctx,myinfo->persistent_priv,myinfo->pubsock,dexp,size);
                     dex_packet(myinfo,dexp,size);
                 }
                 //printf("GOT DEX bus PACKET.%d\n",size);
@@ -1984,8 +2146,9 @@ int32_t dpow_nanomsg_update(struct supernet_info *myinfo)
                     free(retstr);
                     if ( broadcastflag != 0 )
                     {
-                        //printf("BROADCAST dexp request.[%d]\n",size);
+                        printf("BROADCAST dexp request.[%d]\n",size);
                         signed_nn_send(myinfo,myinfo->ctx,myinfo->persistent_priv,myinfo->dexsock,dexp,size);
+                        //signed_nn_send(myinfo,myinfo->ctx,myinfo->persistent_priv,myinfo->pubsock,dexp,size);
                     }
                 }
                 else
@@ -1999,10 +2162,10 @@ int32_t dpow_nanomsg_update(struct supernet_info *myinfo)
                     if ( dex_packetcheck(myinfo,dexp,size) == 0 )
                     {
                         signed_nn_send(myinfo,myinfo->ctx,myinfo->persistent_priv,myinfo->dexsock,dexp,size);
-                        signed_nn_send(myinfo,myinfo->ctx,myinfo->persistent_priv,myinfo->pubsock,dexp,size);
+                        //signed_nn_send(myinfo,myinfo->ctx,myinfo->persistent_priv,myinfo->pubsock,dexp,size);
                         //printf("REP.%08x -> dexbus and pub, t.%d lag.%d\n",dexp->crc32,dexp->timestamp,(int32_t)(time(NULL)-dexp->timestamp));
                         dex_packet(myinfo,dexp,size);
-                    } else printf("failed dexpacketcheck\n");
+                    } //else printf("failed dexpacketcheck\n");
                 }
                 //printf("GOT DEX rep PACKET.%d\n",size);
                 //if ( freeptr != 0 )

iguana/dpow/dpow_rpc.c

@@ -36,6 +36,16 @@ cJSON *dpow_getinfo(struct supernet_info *myinfo,struct iguana_info *coin)
     {
         json = cJSON_Parse(retstr);
         free(retstr);
+        if ( strcmp(coin->symbol,"BTC") == 0 )
+        {
+            sprintf(buf,"[%d]",2);
+            if ( (retstr= bitcoind_passthru(coin->symbol,coin->chain->serverport,coin->chain->userpass,"estimatefee",buf)) != 0 )
+            {
+                if ( atof(retstr) > SMALLVAL )
+                    jaddnum(json,"estimatefee",atof(retstr));
+                free(retstr);
+            }
+        }
     }
     return(json);
 }

iguana/dpow/dpow_tx.c

@@ -224,7 +224,7 @@ int32_t dpow_voutstandard(struct dpow_block *bp,uint8_t *serialized,int32_t m,in
         }
         printf("numvouts.%d len.%d RATIFY vouts\n",numvouts,len);
     }
-    if ( (src_or_dest == 0 || strcmp(bp->destcoin->symbol,"BTC") != 0) && (n= dpow_paxpending(extras,&paxwdcrc)) > 0 )
+    if ( 0 && (src_or_dest == 0 || strcmp(bp->destcoin->symbol,"BTC") != 0) && (n= dpow_paxpending(extras,&paxwdcrc)) > 0 )
     {
         for (i=0; i<n; i++)
             printf("%02x",extras[i]);

iguana/exchanges/bitcoin.c

@@ -107,18 +107,30 @@ int32_t base58encode_checkbuf(uint8_t addrtype,uint8_t *data,int32_t data_len)
 
 int32_t bitcoin_wif2priv(uint8_t *addrtypep,bits256 *privkeyp,char *wifstr)
 {
-    int32_t len = -1; bits256 hash; uint8_t buf[64];
+    int32_t len = -1; bits256 hash; uint8_t buf[256];
+    memset(buf,0,sizeof(buf));
     if ( (len= bitcoin_base58decode(buf,wifstr)) >= 4 )
     {
         // validate with trailing hash, then remove hash
+        if ( len < 38 )
+            len = 38;
         hash = bits256_doublesha256(0,buf,len - 4);
         *addrtypep = *buf;
         memcpy(privkeyp,buf+1,32);
-        if ( (buf[len - 4]&0xff) == hash.bytes[31] && (buf[len - 3]&0xff) == hash.bytes[30] &&(buf[len - 2]&0xff) == hash.bytes[29] &&(buf[len - 1]&0xff) == hash.bytes[28] )
+        if ( (buf[len - 4]&0xff) == hash.bytes[31] && (buf[len - 3]&0xff) == hash.bytes[30] &&(buf[len - 2]&0xff) == hash.bytes[29] && (buf[len - 1]&0xff) == hash.bytes[28] )
         {
-            //printf("coinaddr.(%s) valid checksum\n",coinaddr);
+            //int32_t i; for (i=0; i<len; i++)
+            //    printf("%02x ",buf[i]);
+            //printf(" buf, hash.%02x %02x %02x %02x ",hash.bytes[28],hash.bytes[29],hash.bytes[30],hash.bytes[31]);
+            //printf("wifstr.(%s) valid len.%d\n",wifstr,len);
             return(32);
         }
+        else
+        {
+            int32_t i; for (i=0; i<len; i++)
+                printf("%02x ",buf[i]);
+            printf(" buf, hash.%02x %02x %02x %02x\n",hash.bytes[28],hash.bytes[29],hash.bytes[30],hash.bytes[31]);
+        }
     }
     return(-1);
 }

iguana/exchanges/mm.c

@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include "OS_portable.h"
+#define MAX(a,b) ((a) > (b) ? (a) : (b))
 
 struct mmpending_order
 {
@@ -501,15 +502,16 @@ int32_t marketmaker_spread(char *exchange,char *base,char *rel,double bid,double
                 jaddnum(vals,"ask",ask);
                 vol = bidvol > askvol ? askvol : bidvol;
                 jaddnum(vals,"maxvol",vol);
-                jaddnum(vals,"minvol",vol * 0.1);
+                jaddnum(vals,"minvol",vol*0.1 > 100 ? 100 : vol * 0.1);
                 sprintf(url,"%s/?",IGUANA_URL);
                 sprintf(postdata,"{\"agent\":\"tradebot\",\"method\":\"liquidity\",\"targetcoin\":\"%s\",\"vals\":%s}",base,jprint(vals,1));
+                printf("(%s)\n",postdata);
                 if ( (retstr= bitcoind_RPC(0,"tradebot",url,0,"liqudity",postdata)) != 0 )
                 {
                     //printf("(%s) -> (%s)\n",postdata,retstr);
                     free(retstr);
                 }
-                spread_ratio = (ask - bid) / (bid + ask);
+                spread_ratio = .5 * ((ask - bid) / (bid + ask));
                 for (i=0; i<sizeof(CURRENCIES)/sizeof(*CURRENCIES); i++)
                 {
                     if ( PAXPRICES[i] > SMALLVAL )
@@ -519,7 +521,7 @@ int32_t marketmaker_spread(char *exchange,char *base,char *rel,double bid,double
                         jaddnum(vals,"bid",PAXPRICES[i] * (1. - spread_ratio));
                         jaddnum(vals,"ask",PAXPRICES[i] * (1. + spread_ratio));
                         jaddnum(vals,"maxvol",vol * PAXPRICES[i]);
-                        jaddnum(vals,"minvol",vol * 0.1 * PAXPRICES[i]);
+                        jaddnum(vals,"minvol",MAX(1,(int32_t)(vol * 0.01 * PAXPRICES[i])));
                         sprintf(url,"%s/?",IGUANA_URL);
                         sprintf(postdata,"{\"agent\":\"tradebot\",\"method\":\"liquidity\",\"targetcoin\":\"%s\",\"vals\":%s}","KMD",jprint(vals,1));
                         if ( (retstr= bitcoind_RPC(0,"tradebot",url,0,"liqudity",postdata)) != 0 )
@@ -528,6 +530,7 @@ int32_t marketmaker_spread(char *exchange,char *base,char *rel,double bid,double
                             free(retstr);
                         }
                     }
+break;
                 }
             } else printf("unsupported ask only for DEX %s/%s\n",base,rel);
         }
@@ -561,7 +564,7 @@ int32_t marketmaker_spread(char *exchange,char *base,char *rel,double bid,double
 void marketmaker(double minask,double maxbid,char *baseaddr,char *reladdr,double start_BASE,double start_REL,double profitmargin,double maxexposure,double ratioincr,char *exchange,char *name,char *base,char *rel)
 {
     static uint32_t counter;
-    cJSON *fiatjson; double start_DEXbase,start_DEXrel,USD_average=0.,DEX_base = 0.,DEX_rel = 0.,balance_base=0.,balance_rel=0.,mmbid,mmask,usdprice=0.,CMC_average=0.,aveprice,incr,pendingbids,pendingasks,buyvol,sellvol,bidincr,askincr,filledprice,avebid=0.,aveask=0.,val,changes[3],highbid=0.,lowask=0.,theoretical = 0.; uint32_t lasttime = 0;
+    cJSON *fiatjson; double bid,ask,start_DEXbase,start_DEXrel,USD_average=0.,DEX_base = 0.,DEX_rel = 0.,balance_base=0.,balance_rel=0.,mmbid,mmask,usdprice=0.,CMC_average=0.,aveprice,incr,pendingbids,pendingasks,buyvol,sellvol,bidincr,askincr,filledprice,avebid=0.,aveask=0.,val,changes[3],highbid=0.,lowask=0.,theoretical = 0.; uint32_t lasttime = 0;
     incr = maxexposure * ratioincr;
     buyvol = sellvol = 0.;
     start_DEXbase = dex_balance(base,baseaddr);
@@ -636,8 +639,11 @@ void marketmaker(double minask,double maxbid,char *baseaddr,char *reladdr,double
                     mmask = 0.;
             }
             marketmaker_volumeset(&bidincr,&askincr,incr,buyvol,pendingbids,sellvol,pendingasks,maxexposure);
-            printf("AVE.(%.8f %.8f) hbla %.8f %.8f bid %.8f ask %.8f theory %.8f buys.(%.6f %.6f) sells.(%.6f %.6f) incr.(%.6f %.6f) balances.(%.8f + %.8f, %.8f + %.8f)\n",avebid,aveask,highbid,lowask,mmbid,mmask,theoretical,buyvol,pendingbids,sellvol,pendingasks,bidincr,askincr,balance_base,DEX_base,balance_rel,DEX_rel);
-            marketmaker_spread("DEX",base,rel,avebid - profitmargin*aveprice,incr,aveask + profitmargin*aveprice,incr,profitmargin*aveprice*0.5);
+            printf("AVE.(%.8f %.8f) hbla %.8f %.8f bid %.8f ask %.8f theory %.8f buys.(%.6f %.6f) sells.(%.6f %.6f) incr.(%.6f %.6f) balances.(%.8f + %.8f, %.8f + %.8f) test %f\n",avebid,aveask,highbid,lowask,mmbid,mmask,theoretical,buyvol,pendingbids,sellvol,pendingasks,bidincr,askincr,balance_base,DEX_base,balance_rel,DEX_rel,(aveask - avebid)/aveprice);
+            if ( (aveask - avebid)/aveprice > 4*profitmargin )
+                bid = highbid * (1 - 4*profitmargin), ask = lowask *  (1 + 4*profitmargin);
+            else bid = avebid - profitmargin*aveprice, ask = avebid + profitmargin*aveprice;
+            marketmaker_spread("DEX",base,rel,bid,incr,ask,incr,profitmargin*aveprice*0.5);
             if ( (pendingbids + buyvol) > (pendingasks + sellvol) )
             {
                 bidincr *= (double)(pendingasks + sellvol) / ((pendingbids + buyvol) + (pendingasks + sellvol));
@@ -655,8 +661,8 @@ void marketmaker(double minask,double maxbid,char *baseaddr,char *reladdr,double
                     askincr = (int32_t)askincr + 0.777;
             }
             //printf("mmbid %.8f %.6f, mmask %.8f %.6f\n",mmbid,bidincr,mmask,askincr);
-            marketmaker_spread(exchange,base,rel,mmbid,bidincr,mmask,askincr,profitmargin*aveprice*0.5);
-            sleep(60);
+            //marketmaker_spread(exchange,base,rel,mmbid,bidincr,mmask,askincr,profitmargin*aveprice*0.5);
+            sleep(6000);
         }
     }
 }
@@ -707,7 +713,7 @@ int main(int argc, const char * argv[])
                     marketmaker(minask,maxbid,baseaddr,reladdr,start_base,start_rel,profitmargin,maxexposure,incrratio,exchange,name,base,rel);
                 }
                 free_json(addrjson);
-            }
+            } else printf("ERROR parsing.(%s)\n",retstr);
             free(retstr);
         }
         free_json(retjson);

iguana/iguana777.h

@@ -21,13 +21,17 @@
 #define iguana777_net_h
 
 #if defined(_WIN32) || defined(_WIN64)
+#ifndef WIN32
 #define WIN32
 #endif
+#endif
 
 #if (defined(_WIN32) || defined(__WIN32__)) && \
 !defined(WIN32) && !defined(__SYMBIAN32__)
+#ifndef WIN32
 #define WIN32
 #endif
+#endif
 
 #ifdef WIN32
 #define __MINGW
@@ -59,12 +63,14 @@
 #include "../crypto777/nanosrc/nn.h"
 #include "../crypto777/nanosrc/bus.h"
 #include "../crypto777/nanosrc/pubsub.h"
+#include "../crypto777/nanosrc/pipeline.h"
 #include "../crypto777/nanosrc/reqrep.h"
 #include "../crypto777/nanosrc/tcp.h"
 #else
 #include "/usr/local/include/nanomsg/nn.h"
 #include "/usr/local/include/nanomsg/bus.h"
 #include "/usr/local/include/nanomsg/pubsub.h"
+#include "/usr/local/include/nanomsg/pipeline.h"
 #include "/usr/local/include/nanomsg/reqrep.h"
 #include "/usr/local/include/nanomsg/tcp.h"
 #endif
@@ -88,8 +94,26 @@ struct supernet_address
     char NXTADDR[32],BTC[64],BTCD[64];
 };
 
+struct smartaddress
+{
+    bits256 privkey,pubkey;
+    uint8_t pubkey33[33],rmd160[20];
+};
+
 struct pending_trade { UT_hash_handle hh; double basevolume,relvolume,dir; char base[32],rel[32]; };
 
+#define PSOCK_IDLETIMEOUT 600
+struct psock { uint32_t lasttime; int32_t pullsock,pubsock; uint16_t pushport,subport; };
+
+#define JUMBLR_DEPOSITPREFIX "deposit "
+struct jumblr_item
+{
+    UT_hash_handle hh;
+    int64_t amount,fee,txfee;
+    uint32_t spent,pad;
+    char opid[64],src[128],dest[128],status;
+};
+
 struct liquidity_info
 {
     char base[16],rel[16],exchange[16];
@@ -102,9 +126,9 @@ struct message_info { int32_t msgcount; bits256 refhash,msghashes[64]; uint32_t
 struct supernet_info
 {
     struct supernet_address myaddr;
-    bits256 persistent_priv,privkey;
+    bits256 persistent_priv,privkey,jumblr_pubkey,jumblr_depositkey;
     uint8_t persistent_pubkey33[33];
-    char ipaddr[64],NXTAPIURL[512],secret[4096],password[4096],rpcsymbol[64],handle[1024],permanentfile[1024];
+    char ipaddr[64],NXTAPIURL[512],secret[4096],password[4096],rpcsymbol[64],handle[1024],permanentfile[1024],jumblr_passphrase[1024];
     char *decryptstr;
     void (*liquidity_command)(struct supernet_info *myinfo,char *base,bits256 hash,cJSON *vals);
     double (*liquidity_active)(struct supernet_info *myinfo,double *refpricep,char *exchange,char *base,char *rel,double volume);
@@ -112,6 +136,7 @@ struct supernet_info
     uint32_t expiration,dirty,DEXactive,DEXpoll,totalcoins,nanoinit,lastdexrequestid,dexcrcs[1024];
     uint16_t argport,rpcport;
     struct basilisk_info basilisks;
+    struct jumblr_item *jumblrs;
     struct exchange_info *tradingexchanges[SUPERNET_MAXEXCHANGES]; int32_t numexchanges;
     struct iguana_waccount *wallet;
     struct iguana_info *allcoins; int32_t allcoins_being_added,allcoins_numvirts;
@@ -139,7 +164,33 @@ struct supernet_info
     uint8_t logs[256],exps[510];
     struct message_info msgids[8192];
     double *svmfeatures;
+    uint16_t psockport,numpsocks; struct psock *PSOCKS; portable_mutex_t psockmutex;
     uint8_t notaries[64][33]; int32_t numnotaries,DEXEXPLORER;
+    FILE *swapsfp;
+    struct smartaddress smartaddrs[64]; int32_t numsmartaddrs,cancelrefresh;
+};
+
+struct basilisk_swapmessage
+{
+    bits256 srchash,desthash;
+    uint32_t crc32,msgbits,quoteid,datalen;
+    uint8_t *data;
+};
+
+struct basilisk_swap
+{
+    struct supernet_info *myinfoptr; struct iguana_info *bobcoin,*alicecoin;
+    void (*balancingtrade)(struct supernet_info *myinfo,struct basilisk_swap *swap,int32_t iambob);
+    int32_t subsock,pushsock,connected; uint32_t lasttime;
+    FILE *fp;
+    bits256 persistent_privkey,persistent_pubkey;
+    struct basilisk_swapinfo I;
+    struct basilisk_rawtx bobdeposit,bobpayment,alicepayment,myfee,otherfee,aliceclaim,alicespend,bobreclaim,bobspend,bobrefund,alicereclaim;
+    bits256 privkeys[INSTANTDEX_DECKSIZE];
+    struct basilisk_swapmessage *messages; int32_t nummessages;
+    uint64_t otherdeck[INSTANTDEX_DECKSIZE][2],deck[INSTANTDEX_DECKSIZE][2];
+    uint8_t persistent_pubkey33[33],pad[15],verifybuf[65536];
+
 };
 
 #include "../includes/iguana_funcs.h"

iguana/iguana_bitmap.c

@@ -1162,42 +1162,3 @@ void iguana_bitmap(char *space,int32_t max,char *name)
     }
 }
 
-#include "../includes/iguana_apidefs.h"
-#include "../includes/iguana_apideclares.h"
-
-STRING_AND_TWOINTS(mouse,change,name,x,y)
-{
-    printf("mouse (%s) x.%d y.%d\n",name,x,y);
-    return(clonestr("{\"result\":\"changed\"}"));
-}
-
-STRING_ARG(mouse,leave,name)
-{
-    printf("mouse (%s) leave\n",name);
-    return(clonestr("{\"result\":\"left\"}"));
-}
-
-STRING_AND_TWOINTS(mouse,click,name,x,y)
-{
-    printf("mouse (%s) x.%d y.%d click\n",name,x,y);
-    return(clonestr("{\"result\":\"click\"}"));
-}
-
-STRING_AND_INT(keyboard,key,name,c)
-{
-    printf(" KEY.(%s) c.%d (%c)\n",name,c,c);
-    return(clonestr("{\"result\":\"key\"}"));
-}
-
-STRING_AND_TWOINTS(mouse,image,name,x,y)
-{
-    printf("mouse CREATE (%s) x.%d y.%d\n",name,x,y);
-    return(clonestr("{\"result\":\"opened\"}"));
-}
-
-STRING_ARG(mouse,close,name)
-{
-    printf("mouse CLOSE (%s)\n",name);
-    return(clonestr("{\"result\":\"closed\"}"));
-}
-#include "../includes/iguana_apiundefs.h"

iguana/iguana_chains.c

@@ -232,7 +232,12 @@ void set_coinconfname(char *fname,char *coinstr,char *userhome,char *coindir,cha
         sprintf(confname,"%s.conf",buf);
     }
     printf("userhome.(%s) coindir.(%s) confname.(%s)\n",userhome,coindir,confname);
-    sprintf(fname,"%s/%s/%s",userhome,coindir,confname);
+#ifdef WIN32
+    if ( userhome == 0 || userhome[0] == 0 )
+        sprintf(fname,"%s/%s",coindir,confname);
+    else
+#endif
+        sprintf(fname,"%s/%s/%s",userhome,coindir,confname);
 }
 
 uint16_t extract_userpass(char *serverport,char *userpass,char *coinstr,char *userhome,char *coindir,char *confname)
@@ -486,7 +491,7 @@ void iguana_chaininit(struct supernet_info *myinfo,struct iguana_chain *chain,in
     if ( strcmp(chain->symbol,"BTC") == 0 )
     {
         chain->unitval = 0x1d;
-        chain->txfee = 10000;
+        chain->txfee = 50000;
         chain->havecltv = 1;
     }
     else chain->txfee = 10000;

iguana/iguana_exchanges.c

@@ -1176,6 +1176,7 @@ cJSON *iguana_pricesarray(struct supernet_info *myinfo,char *exchange,char *base
 
 #include "../includes/iguana_apidefs.h"
 #include "../includes/iguana_apideclares.h"
+#include "../includes/iguana_apideclares2.h"
 
 THREE_STRINGS_AND_THREE_INTS(InstantDEX,orderbook,exchange,base,rel,depth,allfields,ignore)
 {

iguana/iguana_json.c

@@ -191,7 +191,10 @@ cJSON *SuperNET_helpjson()
 
 #include "../includes/iguana_apideclares.h"
     
+#undef IGUANA_ARGS
+#undef _IGUANA_APIDEC_H_
 #include "../includes/iguana_apiundefs.h"
+    
     if ( array != 0 )
         jadd(json,"API",array);
     jadd(json,"agents",agents);
@@ -493,421 +496,13 @@ char *SuperNET_htmlstr(char *fname,char *htmlstr,int32_t maxsize,char *agentstr)
     return(OS_filestr(&filesize,"index7778.html"));
 }
 
-cJSON *iguana_peerjson(struct iguana_info *coin,struct iguana_peer *addr)
-{
-    cJSON *array,*json = cJSON_CreateObject();
-    jaddstr(json,"ipaddr",addr->ipaddr);
-    if ( addr->supernet != 0 )
-        jaddstr(json,"ipaddr",addr->ipaddr);
-    jaddstr(json,"supernet","yes");
-    jaddnum(json,"protover",addr->protover);
-    jaddnum(json,"relay",addr->relayflag);
-    jaddnum(json,"height",addr->height);
-    jaddnum(json,"rank",addr->rank);
-    jaddnum(json,"usock",addr->usock);
-    if ( addr->dead != 0 )
-        jaddnum(json,"dead",addr->dead);
-    jaddnum(json,"ready",addr->ready);
-    jaddnum(json,"recvblocks",addr->recvblocks);
-    jaddnum(json,"recvtotal",addr->recvtotal);
-    jaddnum(json,"lastcontact",addr->lastcontact);
-    if ( addr->numpings > 0 )
-        jaddnum(json,"aveping",addr->pingsum/addr->numpings);
-    array = cJSON_CreateObject();
-    jaddnum(array,"version",addr->msgcounts.version);
-    jaddnum(array,"verack",addr->msgcounts.verack);
-    jaddnum(array,"getaddr",addr->msgcounts.getaddr);
-    jaddnum(array,"addr",addr->msgcounts.addr);
-    jaddnum(array,"inv",addr->msgcounts.inv);
-    jaddnum(array,"getdata",addr->msgcounts.getdata);
-    jaddnum(array,"notfound",addr->msgcounts.notfound);
-    jaddnum(array,"getblocks",addr->msgcounts.getblocks);
-    jaddnum(array,"getheaders",addr->msgcounts.getheaders);
-    jaddnum(array,"headers",addr->msgcounts.headers);
-    jaddnum(array,"tx",addr->msgcounts.tx);
-    jaddnum(array,"block",addr->msgcounts.block);
-    jaddnum(array,"mempool",addr->msgcounts.mempool);
-    jaddnum(array,"ping",addr->msgcounts.ping);
-    jaddnum(array,"pong",addr->msgcounts.pong);
-    jaddnum(array,"reject",addr->msgcounts.reject);
-    jaddnum(array,"filterload",addr->msgcounts.filterload);
-    jaddnum(array,"filteradd",addr->msgcounts.filteradd);
-    jaddnum(array,"filterclear",addr->msgcounts.filterclear);
-    jaddnum(array,"merkleblock",addr->msgcounts.merkleblock);
-    jaddnum(array,"alert",addr->msgcounts.alert);
-    jadd(json,"msgcounts",array);
-    return(json);
-}
-
-cJSON *iguana_peersjson(struct iguana_info *coin,int32_t addronly)
-{
-    cJSON *retjson,*array; int32_t i; struct iguana_peer *addr;
-    if ( coin == 0 || coin->peers == 0 )
-        return(0);
-    array = cJSON_CreateArray();
-    for (i=0; i<coin->MAXPEERS; i++)
-    {
-        addr = &coin->peers->active[i];
-        if ( addr->usock >= 0 && addr->ipbits != 0 && addr->ipaddr[0] != 0 )
-        {
-            if ( addronly != 0 )
-                jaddistr(array,addr->ipaddr);
-            else jaddi(array,iguana_peerjson(coin,addr));
-        }
-    }
-    if ( addronly == 0 )
-    {
-        retjson = cJSON_CreateObject();
-        jadd(retjson,"peers",array);
-        jaddnum(retjson,"maxpeers",coin->MAXPEERS);
-        jaddstr(retjson,"coin",coin->symbol);
-        return(retjson);
-    }
-    else return(array);
-}
-
-#include "../includes/iguana_apidefs.h"
-#include "../includes/iguana_apideclares.h"
-
-STRING_ARG(iguana,peers,activecoin)
-{
-    if ( coin != 0 )
-        return(jprint(iguana_peersjson(coin,0),1));
-    else return(clonestr("{\"error\":\"peers needs coin\"}"));
-}
-
-STRING_ARG(iguana,getconnectioncount,activecoin)
-{
-    int32_t i,num = 0; char buf[512];
-    if ( coin != 0 && coin->peers != 0 )
-    {
-        for (i=0; i<sizeof(coin->peers->active)/sizeof(*coin->peers->active); i++)
-            if ( coin->peers->active[i].usock >= 0 )
-                num++;
-        sprintf(buf,"{\"result\":\"%d\"}",num);
-        return(clonestr(buf));
-    } else return(clonestr("{\"error\":\"getconnectioncount needs coin\"}"));
-}
-
-ZERO_ARGS(bitcoinrpc,getdifficulty)
-{
-    char buf[512];
-    if ( coin != 0 )
-    {
-        sprintf(buf,"{\"result\":\"success\",\"proof-of-work\":\"%.8f\",\"search-interval\": 0}",PoW_from_compact(coin->blocks.hwmchain.RO.bits,coin->chain->unitval));
-        return(clonestr(buf));
-    } else return(clonestr("{\"error\":\"getdifficulty needs coin\"}"));
-}
-
-STRING_ARG(iguana,addcoin,newcoin)
-{
-    char *symbol,*seedip; int32_t retval;
-    if ( (symbol= newcoin) == 0 && coin != 0 )
-        symbol = coin->symbol;
-    if ( symbol != 0 )
-    {
-        if ( (seedip= jstr(json,"seedipaddr")) != 0 )
-            safecopy(myinfo->seedipaddr,seedip,sizeof(myinfo->seedipaddr));
-        printf(">> addcoin.%s seedipaddr.%s\n",symbol,myinfo->seedipaddr);
-#ifdef __PNACL__
-//        if ( strcmp(symbol,"BTC") == 0 )
-//            return(clonestr("{\"result\":\"BTC for chrome app is not yet\"}"));
+#ifdef WIN32
+/**
+* workaround for MSVS compiler bug -
+* instead of going on if-else-if block split the if-else-if into two function
+*/
+char *SuperNET_parser2(struct supernet_info *myinfo, char *agentstr, char *method, cJSON *json, char *remoteaddr);
 #endif
-        if ( (retval= iguana_launchcoin(myinfo,symbol,json,0)) > 0 )
-        {
-            if ( myinfo->rpcsymbol[0] == 0 )
-                safecopy(myinfo->rpcsymbol,symbol,sizeof(myinfo->rpcsymbol));
-            return(clonestr("{\"result\":\"coin added\"}"));
-        }
-        else if ( retval == 0 )
-            return(clonestr("{\"result\":\"coin already there\"}"));
-        else return(clonestr("{\"error\":\"error adding coin\"}"));
-    } else return(clonestr("{\"error\":\"addcoin needs newcoin\"}"));
-}
-
-STRING_ARG(iguana,startcoin,activecoin)
-{
-    if ( coin != 0 )
-    {
-        coin->active = 1;
-        return(clonestr("{\"result\":\"coin started\"}"));
-    } else return(clonestr("{\"error\":\"startcoin needs coin\"}"));
-}
-
-STRING_ARG(iguana,stopcoin,activecoin)
-{
-    if ( activecoin[0] != 0 )
-        coin = iguana_coinfind(activecoin);
-    if ( coin != 0 )
-    {
-        coin->active = 0;
-        //iguana_coinpurge(coin);
-        return(clonestr("{\"result\":\"coin stopped\"}"));
-    } else return(clonestr("{\"error\":\"stopcoin needs coin\"}"));
-}
-
-STRING_ARG(iguana,pausecoin,activecoin)
-{
-    if ( coin != 0 )
-    {
-        coin->active = 0;
-        return(clonestr("{\"result\":\"coin paused\"}"));
-    } else return(clonestr("{\"error\":\"pausecoin needs coin\"}"));
-}
-
-TWO_STRINGS(iguana,addnode,activecoin,ipaddr)
-{
-    struct iguana_peer *addr; int32_t i,n;
-    if ( coin == 0 )
-        coin = iguana_coinfind(activecoin);
-    if ( coin != 0 && strcmp(coin->symbol,"RELAY") == 0 )
-        basilisk_addrelay_info(myinfo,0,(uint32_t)calc_ipbits(ipaddr),GENESIS_PUBKEY);
-    printf("coin.%p.[%s] addnode.%s -> %s\n",coin,coin!=0?coin->symbol:"",activecoin,ipaddr);
-    if ( coin != 0 && coin->peers != 0 && ipaddr != 0 && is_ipaddr(ipaddr) != 0 )
-    {
-        //iguana_possible_peer(coin,ipaddr);
-        if ( (addr= iguana_peerslot(coin,(uint32_t)calc_ipbits(ipaddr),1)) != 0 )
-        {
-            addr->supernet = 1;
-            if ( addr->usock >= 0 )
-            {
-                if ( (n= coin->peers->numranked) != 0 )
-                {
-                    for (i=0; i<n; i++)
-                    {
-                        if ( addr == coin->peers->ranked[i] )
-                            break;
-                    }
-                    if ( i == n )
-                    {
-                        if ( i == IGUANA_MAXPEERS )
-                            i--;
-                        else coin->peers->numranked = n+1;
-                        coin->peers->ranked[i] = addr;
-                        addr->recvblocks = coin->peers->ranked[0]->recvblocks + 100;
-                        addr->recvtotal = coin->peers->ranked[0]->recvtotal*1.1 + 100;
-                        printf("set (%s) -> slot.%d numranked.%d\n",ipaddr,i,coin->peers->numranked);
-                    } else printf("(%s) is already peer.%d\n",ipaddr,i);
-                }
-                return(clonestr("{\"result\":\"peer was already connected\"}"));
-            }
-            if ( addr->pending == 0 )
-            {
-                addr->pending = (uint32_t)time(NULL);
-                iguana_launch(coin,"connection",iguana_startconnection,addr,IGUANA_CONNTHREAD);
-                return(clonestr("{\"result\":\"addnode submitted\"}"));
-            } else return(clonestr("{\"result\":\"addnode connection was already pending\"}"));
-        } else return(clonestr("{\"result\":\"addnode cant find peer slot\"}"));
-    }
-    else if ( coin == 0 )
-        return(clonestr("{\"error\":\"addnode needs active coin, do an addcoin first\"}"));
-    else return(clonestr("{\"error\":\"addnode needs ipaddr\"}"));
-}
-
-TWO_STRINGS(iguana,persistent,activecoin,ipaddr)
-{
-    int32_t i;
-    if ( coin != 0 && coin->peers != 0 && ipaddr != 0 )
-    {
-        for (i=0; i<IGUANA_MAXPEERS; i++)
-        {
-            if ( strcmp(coin->peers->active[i].ipaddr,ipaddr) == 0 )
-            {
-                coin->peers->active[i].persistent_peer = juint(json,"interval")+3;
-                return(clonestr("{\"result\":\"node marked as persistent\"}"));
-            }
-        }
-        return(clonestr("{\"result\":\"node wasnt active\"}"));
-    } else return(clonestr("{\"error\":\"persistent needs coin and ipaddr\"}"));
-}
-
-TWO_STRINGS(iguana,removenode,activecoin,ipaddr)
-{
-    int32_t i;
-    if ( coin != 0 && coin->peers != 0 && ipaddr != 0 )
-    {
-        for (i=0; i<IGUANA_MAXPEERS; i++)
-        {
-            if ( strcmp(coin->peers->active[i].ipaddr,ipaddr) == 0 )
-            {
-                coin->peers->active[i].rank = 0;
-                coin->peers->active[i].dead = (uint32_t)time(NULL);
-                return(clonestr("{\"result\":\"node marked as dead\"}"));
-            }
-        }
-        return(clonestr("{\"result\":\"node wasnt active\"}"));
-    } else return(clonestr("{\"error\":\"removenode needs coin and ipaddr\"}"));
-}
-
-TWO_STRINGS(iguana,oneshot,activecoin,ipaddr)
-{
-    if ( coin != 0 && ipaddr != 0 )
-    {
-        iguana_possible_peer(coin,ipaddr);
-        return(clonestr("{\"result\":\"addnode submitted\"}"));
-    } else return(clonestr("{\"error\":\"addnode needs coin and ipaddr\"}"));
-}
-
-TWO_STRINGS(iguana,nodestatus,activecoin,ipaddr)
-{
-    int32_t i; struct iguana_peer *addr;
-    if ( coin != 0 && coin->peers != 0 && ipaddr != 0 )
-    {
-        for (i=0; i<coin->MAXPEERS; i++)
-        {
-            addr = &coin->peers->active[i];
-            if ( strcmp(addr->ipaddr,ipaddr) == 0 )
-                return(jprint(iguana_peerjson(coin,addr),1));
-        }
-        return(clonestr("{\"result\":\"nodestatus couldnt find ipaddr\"}"));
-    } else return(clonestr("{\"error\":\"nodestatus needs ipaddr\"}"));
-}
-
-STRING_AND_INT(iguana,maxpeers,activecoin,max)
-{
-    cJSON *retjson; int32_t i; struct iguana_peer *addr;
-    if ( coin != 0 && coin->peers != 0 )
-    {
-        retjson = cJSON_CreateObject();
-        if ( max > IGUANA_MAXPEERS )
-            max = IGUANA_MAXPEERS;
-        if ( max > coin->MAXPEERS )
-        {
-            for (i=max; i<coin->MAXPEERS; i++)
-                if ( (addr= coin->peers->ranked[i]) != 0 )
-                    addr->dead = 1;
-        }
-        coin->MAXPEERS = max;
-        jaddnum(retjson,"maxpeers",coin->MAXPEERS);
-        jaddstr(retjson,"coin",coin->symbol);
-        return(jprint(retjson,1));
-    } else return(clonestr("{\"error\":\"maxpeers needs coin\"}"));
-}
-
-char *hmac_dispatch(char *(*hmacfunc)(char *dest,char *key,int32_t key_size,char *message),char *name,char *message,char *password)
-{
-    char hexstr[1025]; cJSON *json;
-    if ( message != 0 && password != 0 && message[0] != 0 && password[0] != 0 )
-    {
-        memset(hexstr,0,sizeof(hexstr));
-        (*hmacfunc)(hexstr,password,password==0?0:(int32_t)strlen(password),message);
-        json = cJSON_CreateObject();
-        jaddstr(json,"result","hmac calculated");
-        jaddstr(json,"message",message);
-        jaddstr(json,name,hexstr);
-        return(jprint(json,1));
-    } else return(clonestr("{\"error\":\"hmac needs message and passphrase\"}"));
-}
-
-char *hash_dispatch(void (*hashfunc)(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len),char *name,char *message)
-{
-    char hexstr[65537]; uint8_t databuf[32768]; cJSON *json;
-    if ( message != 0 && message[0] != 0 )
-    {
-        memset(hexstr,0,sizeof(hexstr));
-        (*hashfunc)(hexstr,databuf,(uint8_t *)message,(int32_t)strlen(message));
-        json = cJSON_CreateObject();
-        jaddstr(json,"result","hash calculated");
-        jaddstr(json,"message",message);
-        jaddstr(json,name,hexstr);
-        return(jprint(json,1));
-    } else return(clonestr("{\"error\":\"hash needs message\"}"));
-}
-
-TWO_HASHES(hash,curve25519_pair,element,scalar)
-{
-    cJSON *retjson = cJSON_CreateObject();
-    jaddbits256(retjson,"result",curve25519(element,scalar));
-    return(jprint(retjson,1));
-}
-
-STRING_ARG(hash,NXT,passphrase) { return(hash_dispatch(calc_NXTaddr,"NXT",passphrase)); }
-STRING_ARG(hash,curve25519,pubkey) { return(hash_dispatch(calc_curve25519_str,"curve25519",pubkey)); }
-STRING_ARG(hash,crc32,message) { return(hash_dispatch(calc_crc32str,"crc32",message)); }
-STRING_ARG(hash,base64_encode,message) { return(hash_dispatch(calc_base64_encodestr,"base64_encode",message)); }
-STRING_ARG(hash,base64_decode,message) { return(hash_dispatch(calc_base64_decodestr,"base64_decode",message)); }
-STRING_ARG(hash,rmd160_sha256,message) { return(hash_dispatch(rmd160ofsha256,"rmd160_sha256",message)); }
-STRING_ARG(hash,sha256_sha256,message) { return(hash_dispatch(sha256_sha256,"sha256_sha256",message)); }
-STRING_ARG(hash,hex,message) { return(hash_dispatch(calc_hexstr,"hex",message)); }
-STRING_ARG(hash,unhex,message) { return(hash_dispatch(calc_unhexstr,"unhex",message)); }
-
-STRING_ARG(hash,sha224,message) { return(hash_dispatch(calc_sha224,"sha224",message)); }
-STRING_ARG(hash,sha256,message) { return(hash_dispatch(vcalc_sha256,"sha256",message)); }
-STRING_ARG(hash,sha384,message) { return(hash_dispatch(calc_sha384,"sha384",message)); }
-STRING_ARG(hash,sha512,message) { return(hash_dispatch(calc_sha512,"sha512",message)); }
-STRING_ARG(hash,rmd128,message) { return(hash_dispatch(calc_rmd128,"rmd128",message)); }
-STRING_ARG(hash,rmd160,message) { return(hash_dispatch(calc_rmd160,"rmd160",message)); }
-STRING_ARG(hash,rmd256,message) { return(hash_dispatch(calc_rmd256,"rmd256",message)); }
-STRING_ARG(hash,rmd320,message) { return(hash_dispatch(calc_rmd320,"rmd320",message)); }
-STRING_ARG(hash,sha1,message) { return(hash_dispatch(calc_sha1,"sha1",message)); }
-STRING_ARG(hash,md2,message) { return(hash_dispatch(calc_md2str,"md2",message)); }
-STRING_ARG(hash,md4,message) { return(hash_dispatch(calc_md4str,"md4",message)); }
-STRING_ARG(hash,md5,message) { return(hash_dispatch(calc_md5str,"md5",message)); }
-STRING_ARG(hash,tiger192_3,message) { return(hash_dispatch(calc_tiger,"tiger",message)); }
-STRING_ARG(hash,whirlpool,message) { return(hash_dispatch(calc_whirlpool,"whirlpool",message)); }
-TWO_STRINGS(hmac,sha224,message,passphrase) { return(hmac_dispatch(hmac_sha224_str,"sha224",message,passphrase)); }
-TWO_STRINGS(hmac,sha256,message,passphrase) { return(hmac_dispatch(hmac_sha256_str,"sha256",message,passphrase)); }
-TWO_STRINGS(hmac,sha384,message,passphrase) { return(hmac_dispatch(hmac_sha384_str,"sha384",message,passphrase)); }
-TWO_STRINGS(hmac,sha512,message,passphrase) { return(hmac_dispatch(hmac_sha512_str,"sha512",message,passphrase)); }
-TWO_STRINGS(hmac,rmd128,message,passphrase) { return(hmac_dispatch(hmac_rmd128_str,"rmd128",message,passphrase)); }
-TWO_STRINGS(hmac,rmd160,message,passphrase) { return(hmac_dispatch(hmac_rmd160_str,"rmd160",message,passphrase)); }
-TWO_STRINGS(hmac,rmd256,message,passphrase) { return(hmac_dispatch(hmac_rmd256_str,"rmd256",message,passphrase)); }
-TWO_STRINGS(hmac,rmd320,message,passphrase) { return(hmac_dispatch(hmac_rmd320_str,"rmd320",message,passphrase)); }
-TWO_STRINGS(hmac,sha1,message,passphrase) { return(hmac_dispatch(hmac_sha1_str,"sha1",message,passphrase)); }
-TWO_STRINGS(hmac,md2,message,passphrase) { return(hmac_dispatch(hmac_md2_str,"md2",message,passphrase)); }
-TWO_STRINGS(hmac,md4,message,passphrase) { return(hmac_dispatch(hmac_md4_str,"md4",message,passphrase)); }
-TWO_STRINGS(hmac,md5,message,passphrase) { return(hmac_dispatch(hmac_md5_str,"md5",message,passphrase)); }
-TWO_STRINGS(hmac,tiger192_3,message,passphrase) { return(hmac_dispatch(hmac_tiger_str,"tiger",message,passphrase)); }
-TWO_STRINGS(hmac,whirlpool,message,passphrase) { return(hmac_dispatch(hmac_whirlpool_str,"whirlpool",message,passphrase)); }
-
-STRING_ARG(SuperNET,bitcoinrpc,setcoin)
-{
-    char buf[1024];
-    if ( setcoin != 0 && setcoin[0] != 0 )
-    {
-        strcpy(myinfo->rpcsymbol,setcoin);
-        touppercase(myinfo->rpcsymbol);
-        printf("bitcoinrpc.%s\n",myinfo->rpcsymbol);
-        if ( iguana_launchcoin(myinfo,myinfo->rpcsymbol,json,0) < 0 )
-            return(clonestr("{\"error\":\"error creating coin\"}"));
-        else
-        {
-            sprintf(buf,"{\"result\":\"success\",\"setcoin\":\"%s\"}",setcoin);
-            return(clonestr(buf));
-        }
-    } else return(clonestr("{\"error\":\"bitcoinrpc needs setcoin value\"}"));
-}
-
-ZERO_ARGS(SuperNET,help)
-{
-    cJSON *helpjson,*retjson;
-    if ( (helpjson= SuperNET_helpjson()) != 0 )
-    {
-        retjson = cJSON_CreateObject();
-        jadd(retjson,"result",helpjson);
-        return(jprint(retjson,1));
-    } else return(clonestr("{\"error\":\"cant get helpjson\"}"));
-}
-
-TWO_STRINGS(SuperNET,html,agentform,htmlfile)
-{
-    char *htmlstr; cJSON *retjson; int32_t max = 4*1024*1024;
-    if ( htmlfile == 0 || htmlfile[0] == 0 )
-        htmlfile = "forms.html";
-    //if ( (fp= fopen(htmlfile,"w")) == 0 )
-    //    printf("error opening htmlfile.(%s)\n",htmlfile);
-    htmlstr = malloc(max);
-    htmlstr = SuperNET_htmlstr(htmlfile,htmlstr,max,agentform);
-    retjson = cJSON_CreateObject();
-    jaddstr(retjson,"result",htmlstr);
-    free(htmlstr);
-    //if ( fp != 0 )
-    //    fclose(fp);
-    return(jprint(retjson,1));
-}
-       
-#undef IGUANA_ARGS
-#include "../includes/iguana_apiundefs.h"
 
 char *SuperNET_parser(struct supernet_info *myinfo,char *agentstr,char *method,cJSON *json,char *remoteaddr)
 {
@@ -1025,12 +620,31 @@ char *SuperNET_parser(struct supernet_info *myinfo,char *agentstr,char *method,c
 #define STRING_ARRAY_OBJ_STRING IGUANA_DISPATCH_SAOS
 
 #include "../includes/iguana_apideclares.h"
-//#undef IGUANA_ARGS
-    
+#ifdef WIN32
+return SuperNET_parser2(myinfo, agentstr, method, json, remoteaddr);
+#else
+#undef IGUANA_ARGS
+#undef _IGUANA_APIDEC_H_
 #include "../includes/iguana_apiundefs.h"
     char errstr[512];
     sprintf(errstr,"{\"error\":\"unsupported call\",\"agent\":\"%s\",\"method\":\"%s\"}",agentstr,method);
     return(clonestr(errstr));
+#endif
 }
 
 
+#ifdef WIN32
+char *SuperNET_parser2(struct supernet_info *myinfo, char *agentstr, char *method, cJSON *json, char *remoteaddr) {
+	char *coinstr; struct iguana_info *coin = 0;
+	if (remoteaddr != 0 && (remoteaddr[0] == 0 || strcmp(remoteaddr, "127.0.0.1") == 0))
+		remoteaddr = 0;
+#include "../includes/iguana_apideclares2.h"
+#undef IGUANA_ARGS
+#undef _IGUANA_APIDEC_H_
+#include "../includes/iguana_apiundefs.h"
+	char errstr[512];
+	sprintf(errstr, "{\"error\":\"unsupported call\",\"agent\":\"%s\",\"method\":\"%s\"}", agentstr, method);
+	return(clonestr(errstr));
+}
+
+#endif

iguana/iguana_notary.c

@@ -224,6 +224,7 @@ void dpow_addresses()
 
 #include "../includes/iguana_apidefs.h"
 #include "../includes/iguana_apideclares.h"
+#include "../includes/iguana_apideclares2.h"
 
 TWO_STRINGS(iguana,dpow,symbol,pubkey)
 {
@@ -373,7 +374,6 @@ THREE_STRINGS(iguana,passthru,asset,function,hex)
     else return(clonestr("{\"error\":\"assetchain not active, start in bitcoind mode\"}"));
 }
 
-
 TWO_STRINGS(dex,send,hex,handler)
 {
     uint8_t data[8192]; int32_t datalen; char *retstr;
@@ -615,7 +615,7 @@ HASH_AND_STRING_AND_INT(dex,gettxout,txid,symbol,vout)
 
 TWO_STRINGS(dex,listunspent,symbol,address)
 {
-    if ( symbol != 0 && strcmp(symbol,"BTC") == 0 && (coin= iguana_coinfind("BTC")) != 0 && coin->FULLNODE == 0 && myinfo->IAMLP != 0 )
+    if ( symbol != 0 && strcmp(symbol,"BTC") == 0 && (coin= iguana_coinfind("BTC")) != 0 && coin->FULLNODE == 0 && myinfo->blocktrail_apikey[0] != 0 )
     {
         char url[1024],*retstr,*coinaddr,*script; int32_t i,n,vout; cJSON *retjson,*data,*item,*item3,*data3; bits256 txid; uint64_t val;
         sprintf(url,"https://api.blocktrail.com/v1/btc/address/%s/unspent-outputs?api_key=%s",address,myinfo->blocktrail_apikey);
@@ -670,7 +670,7 @@ TWO_STRINGS(dex,listunspent,symbol,address)
 
 TWO_STRINGS_AND_TWO_DOUBLES(dex,listtransactions,symbol,address,count,skip)
 {
-    if ( symbol != 0 && strcmp(symbol,"BTC") == 0 && (coin= iguana_coinfind("BTC")) != 0 && coin->FULLNODE == 0 && myinfo->IAMLP != 0 )
+    if ( symbol != 0 && strcmp(symbol,"BTC") == 0 && (coin= iguana_coinfind("BTC")) != 0 && coin->FULLNODE == 0 && myinfo->blocktrail_apikey[0] != 0 )
     {
         char url[1024],*retstr,*retstr2; cJSON *retjson,*retjson2,*retjson3,*data,*data2; int32_t i,n;
         sprintf(url,"https://api.blocktrail.com/v1/btc/address/%s/transactions?api_key=%s",address,myinfo->blocktrail_apikey);
@@ -747,6 +747,16 @@ TWO_STRINGS(dex,validateaddress,symbol,address)
     return(_dex_validateaddress(myinfo,symbol,address));
 }
 
+STRING_ARG(dex,getmessage,argstr)
+{
+    return(_dex_getmessage(myinfo,argstr));
+}
+
+STRING_ARG(dex,psock,argstr)
+{
+    return(_dex_psock(myinfo,argstr));
+}
+
 STRING_ARG(dex,getnotaries,symbol)
 {
     return(_dex_getnotaries(myinfo,symbol));
@@ -860,7 +870,7 @@ TWO_STRINGS(dex,getbalance,symbol,address)
     }
     if ( symbol != 0 && address != 0 )
     {
-        if ( strcmp(symbol,"BTC") == 0 && myinfo->IAMLP != 0 )
+        if ( strcmp(symbol,"BTC") == 0 && myinfo->blocktrail_apikey[0] != 0 )
         {
             sprintf(url,"https://api.blocktrail.com/v1/btc/address/%s?api_key=%s",address,myinfo->blocktrail_apikey);
             if ( (retstr= issue_curl(url)) != 0 )

iguana/iguana_payments.c

@@ -175,7 +175,7 @@ int32_t iguana_RTbestunspent(struct supernet_info *myinfo,struct iguana_info *co
         }
         if ( iguana_RTunspent_check(myinfo,coin,unspents[i]) != 0 )
         {
-            printf("(%d u%d) %.8f already used\n",unspents[i].hdrsi,unspents[i].unspentind,dstr(atx_value));
+            //printf("(%d u%d) %.8f already used\n",unspents[i].hdrsi,unspents[i].unspentind,dstr(atx_value));
             continue;
         }
         if ( maxmode == 0 )
@@ -274,7 +274,7 @@ char *iguana_signrawtx(struct supernet_info *myinfo,struct iguana_info *coin,int
         memset(&msgtx,0,sizeof(msgtx));
         if ( V == 0 )
             V = calloc(numinputs,sizeof(*V)), flagV = 1;
-        //printf("SIGN.(%s) priv.(%s) %llx %llx\n",jprint(vins,0),jprint(privkeys,0),(long long)V->signers[0].privkey.txid,(long long)V->signers[1].privkey.txid);
+        //printf("SIGN.(%s) priv.(%s) %llx %llx (%s)\n",jprint(vins,0),jprint(privkeys,0),(long long)V->signers[0].privkey.txid,(long long)V->signers[1].privkey.txid,vins!=0?jprint(vins,0):"no vins");
         if ( V != 0 )
         {
             if ( iguana_signrawtransaction(myinfo,coin,height,&msgtx,&signedtx,signedtxidp,V,numinputs,rawtx,vins,privkeys) > 0 )
@@ -346,18 +346,26 @@ uint64_t _iguana_interest(uint32_t now,int32_t chainheight,uint32_t txlocktime,u
     int32_t minutes; uint64_t numerator=0,denominator=0,interest = 0;
     if ( (minutes= ((uint32_t)time(NULL) - 60 - txlocktime) / 60) >= 60 )
     {
+        if ( minutes > 365 * 24 * 60 )
+            minutes = 365 * 24 * 60;
+        if ( chainheight >= 250000 )
+            minutes -= 59;
         denominator = (((uint64_t)365 * 24 * 60) / minutes);
         if ( denominator == 0 )
             denominator = 1; // max KOMODO_INTEREST per transfer, do it at least annually!
         if ( value > 25000LL*SATOSHIDEN && chainheight > 155949 )
         {
             numerator = (value / 20); // assumes 5%!
-            interest = (numerator / denominator);
+            if ( chainheight < 250000 )
+                interest = (numerator / denominator);
+            else interest = (numerator * minutes) / ((uint64_t)365 * 24 * 60);
         }
         else if ( value >= 10*SATOSHIDEN )
         {
             numerator = (value * KOMODO_INTEREST);
-            interest = (numerator / denominator) / SATOSHIDEN;
+            if ( chainheight < 250000 || numerator * minutes < 365 * 24 * 60 )
+                interest = (numerator / denominator) / SATOSHIDEN;
+            else interest = ((numerator * minutes) / ((uint64_t)365 * 24 * 60)) / SATOSHIDEN;
         }
         //fprintf(stderr,"komodo_interest.%d %lld %.8f nLockTime.%u tiptime.%u minutes.%d interest %lld %.8f (%llu / %llu)\n",chainheight,(long long)value,(double)value/SATOSHIDEN,txlocktime,now,minutes,(long long)interest,(double)interest/SATOSHIDEN,(long long)numerator,(long long)denominator);
     }
@@ -394,7 +402,6 @@ uint64_t iguana_interest(struct supernet_info *myinfo,struct iguana_info *coin,b
             interest = _iguana_interest((uint32_t)time(NULL),coin->longestchain,tx->locktime,value);
         }
     }
-    char str[65]; printf("interest for %s.v%d %.8f %.8f (%s)\n",bits256_str(str,txid),vout,dstr(value),dstr(interest),retjson!=0?jprint(retjson,0):"");
     return(interest);
 }
 
@@ -442,7 +449,7 @@ char *iguana_calcrawtx(struct supernet_info *myinfo,struct iguana_info *coin,cJS
                     }
                     unspents = realloc(unspents,(1 + max) * sizeof(*unspents));
                     value = jdouble(item,"amount") * SATOSHIDEN;
-                    if ( jdouble(item,"interest") != 0 )
+                    if ( (0) && jdouble(item,"interest") != 0 )
                         printf("utxo has interest of %.8f\n",jdouble(item,"interest"));
                     iguana_outptset(myinfo,coin,&unspents[max++],jbits256(item,"txid"),jint(item,"vout"),value,spendscriptstr);
                     avail += value;
@@ -460,7 +467,7 @@ char *iguana_calcrawtx(struct supernet_info *myinfo,struct iguana_info *coin,cJS
         free(unspents);
         return(0);
     }*/
-    printf("avail %.8f satoshis %.8f, txfee %.8f burnamount %.8f vin0.scriptlen %d\n",dstr(avail),dstr(satoshis),dstr(txfee),dstr(burnamount),unspents[0].spendlen);
+    printf("avail %.8f satoshis %.8f, txfee %.8f burnamount %.8f vin0.scriptlen %d num.%d\n",dstr(avail),dstr(satoshis),dstr(txfee),dstr(burnamount),unspents[0].spendlen,num);
     if ( txobj != 0 && avail >= satoshis+txfee )
     {
         if ( (vins= iguana_RTinputsjson(myinfo,coin,&total,satoshis + txfee,unspents,num,maxmode)) != 0 )
@@ -535,7 +542,11 @@ char *iguana_calcutxorawtx(struct supernet_info *myinfo,struct iguana_info *coin
     for (i=0; i<n; i++)
     {
         item = jitem(utxos,i);
-        if ( (sobj= jobj(item,"scriptPubKey")) == 0 || (spendscriptstr= jstr(sobj,"hex")) == 0 )
+        if ( (spendscriptstr= jstr(item,"scriptPubKey")) != 0 && is_hexstr(spendscriptstr,0) > 16 )
+        {
+            
+        }
+        else if ( (sobj= jobj(item,"scriptPubKey")) == 0 || (spendscriptstr= jstr(sobj,"hex")) == 0 )
         {
             printf("no spendscript (%s)\n",jprint(item,0));
             continue;
@@ -554,6 +565,14 @@ char *iguana_calcutxorawtx(struct supernet_info *myinfo,struct iguana_info *coin
     {
         if ( (vins= iguana_RTinputsjson(myinfo,coin,&total,satoshis + txfee,unspents,num,maxmode)) != 0 )
         {
+            if ( strcmp(coin->symbol,"KMD") == 0 )
+            {
+                if ( (interests= iguana_interests(myinfo,coin,vins)) != 0 )
+                {
+                    total += interests;
+                    printf("boost total by interest %.8f\n",dstr(interests));
+                }
+            }
             if ( total < (satoshis + txfee) )
             {
                 free_json(vins);
@@ -561,7 +580,6 @@ char *iguana_calcutxorawtx(struct supernet_info *myinfo,struct iguana_info *coin
                 printf("insufficient total %.8f vs (%.8f + %.8f)\n",dstr(total),dstr(satoshis),dstr(txfee));
                 return(0);
             }
-            total += interests;
             if ( (change= (total - (satoshis + txfee))) > 10000 && (changeaddr == 0 || changeaddr[0] == 0) )
             {
                 printf("no changeaddr for %.8f\n",dstr(change));
@@ -690,6 +708,7 @@ char *sendtoaddress(struct supernet_info *myinfo,struct iguana_info *coin,char *
 
 #include "../includes/iguana_apidefs.h"
 #include "../includes/iguana_apideclares.h"
+#include "../includes/iguana_apideclares2.h"
 
 STRING_AND_INT(bitcoinrpc,sendrawtransaction,rawtx,allowhighfees)
 {
@@ -1675,4 +1694,99 @@ THREE_INTS(iguana,splitfunds,satoshis,duplicates,sendflag)
     return(jprint(retjson,1));
 }
 
+P2SH_SPENDAPI(iguana,spendmsig,activecoin,vintxid,vinvout,destaddress,destamount,destaddress2,destamount2,M,N,pubA,wifA,pubB,wifB,pubC,wifC)
+{
+    struct vin_info V; uint8_t p2sh_rmd160[20],serialized[2096],spendscript[32],pubkeys[3][65],*pubkeyptrs[3]; int32_t spendlen,height = 0;
+    char msigaddr[64],*retstr; cJSON *retjson,*txobj; struct iguana_info *active;
+    bits256 signedtxid; char *signedtx;
+    struct iguana_msgtx msgtx;
+    if ( remoteaddr != 0 )
+        return(clonestr("{\"error\":\"no remote\"}"));
+    if ( myinfo->expiration == 0 )
+        return(clonestr("{\"error\":\"need to unlock wallet\"}"));
+    if ( (active= iguana_coinfind(activecoin)) == 0 )
+        return(clonestr("{\"error\":\"activecoin isnt active\"}"));
+    if ( M > N || N > 3 )
+        return(clonestr("{\"error\":\"illegal M or N\"}"));
+    memset(&V,0,sizeof(V));
+    txobj = bitcoin_txcreate(active->symbol,active->chain->isPoS,0,coin->chain->normal_txversion,0);
+    if ( destaddress[0] != 0 && destamount > 0. )
+        bitcoin_txaddspend(active,txobj,destaddress,destamount * SATOSHIDEN);
+    if ( destaddress2[0] != 0 && destamount2 > 0. )
+        bitcoin_txaddspend(active,txobj,destaddress2,destamount2 * SATOSHIDEN);
+    if ( pubA[0] != 0 && (retstr= _setVsigner(active,&V,0,pubA,wifA)) != 0 )
+        return(retstr);
+    if ( N >= 2 && pubB[0] != 0 && (retstr= _setVsigner(active,&V,1,pubB,wifB)) != 0 )
+        return(retstr);
+    if ( N == 3 && pubC[0] != 0 && (retstr= _setVsigner(active,&V,2,pubC,wifC)) != 0 )
+        return(retstr);
+    V.M = M, V.N = N, V.type = IGUANA_SCRIPT_P2SH;
+    V.p2shlen = bitcoin_MofNspendscript(p2sh_rmd160,V.p2shscript,0,&V);
+    spendlen = bitcoin_p2shspend(spendscript,0,p2sh_rmd160);
+    if ( pubA[0] != 0 )
+    {
+        decode_hex(pubkeys[0],(int32_t)strlen(pubA)>>1,pubA);
+        pubkeyptrs[0] = pubkeys[0];
+    }
+    if ( pubB[0] != 0 )
+    {
+        decode_hex(pubkeys[1],(int32_t)strlen(pubB)>>1,pubB);
+        pubkeyptrs[1] = pubkeys[1];
+    }
+    if ( pubC[0] != 0 )
+    {
+        decode_hex(pubkeys[2],(int32_t)strlen(pubC)>>1,pubC);
+        pubkeyptrs[2] = pubkeys[2];
+    }
+    bitcoin_txinput(active,txobj,vintxid,vinvout,0xffffffff,spendscript,spendlen,V.p2shscript,V.p2shlen,pubkeyptrs,N,0,0);
+    bitcoin_address(msigaddr,active->chain->p2shtype,V.p2shscript,V.p2shlen);
+    retjson = cJSON_CreateObject();
+    if ( bitcoin_verifyvins(active,height,&signedtxid,&signedtx,&msgtx,serialized,sizeof(serialized),&V,SIGHASH_ALL,1,V.suppress_pubkeys) == 0 )
+    {
+        jaddstr(retjson,"result","msigtx");
+        if ( signedtx != 0 )
+            jaddstr(retjson,"signedtx",signedtx), free(signedtx);
+        jaddbits256(retjson,"txid",signedtxid);
+    } else jaddstr(retjson,"error","couldnt sign tx");
+    jaddstr(retjson,"msigaddr",msigaddr);
+    return(jprint(retjson,1));
+}
+
+STRING_ARRAY_OBJ_STRING(bitcoinrpc,signrawtransaction,rawtx,vins,privkeys,sighash)
+{
+    char *signedtx = 0; struct vin_info *V; bits256 signedtxid; int32_t complete,numinputs = 1; struct iguana_msgtx msgtx; cJSON *retjson; int uselessbitcoin_error = 0;
+    retjson = cJSON_CreateObject();
+    if ( remoteaddr != 0 )
+        return(clonestr("{\"error\":\"no remote\"}"));
+    if ( myinfo->expiration == 0 )
+        return(clonestr("{\"error\":\"need to unlock wallet\"}"));
+    //printf("rawtx.(%s) vins.(%s) privkeys.(%s) sighash.(%s)\n",rawtx,jprint(vins,0),jprint(privkeys,0),sighash);
+    if ( sighash == 0 || sighash[0] == 0 )
+        sighash = "ALL";
+    if ( strcmp(sighash,"ALL") != 0 )
+        jaddstr(retjson,"error","only sighash all (ALL) supported for now");
+    if ( (numinputs= cJSON_GetArraySize(vins)) > 0 )
+    {
+        V = calloc(numinputs,sizeof(*V));
+        memset(&msgtx,0,sizeof(msgtx));
+        if ( (complete= iguana_signrawtransaction(myinfo,coin,coin->blocks.hwmchain.height,&msgtx,&signedtx,&signedtxid,V,numinputs,rawtx,vins,privkeys)) >= 0 )
+        {
+            if ( signedtx != 0 )
+            {
+                jaddstr(retjson,"result",signedtx);
+                jadd(retjson,"complete",complete!=0?jtrue():jfalse());
+                free(signedtx);
+            } else jaddstr(retjson,"error",uselessbitcoin_error != 0 ? "-22" : "no transaction from verifyvins");
+        }
+        else if ( complete == -2 )
+            jaddstr(retjson,"error",uselessbitcoin_error != 0 ? "-22" : "hex2json -> json2hex error");
+        else if ( complete == -1 )
+            jaddstr(retjson,"error",uselessbitcoin_error != 0 ? "-22" : "couldnt load serialized tx or mismatched numinputs");
+        free(V);
+        //for (i=0; i<msgtx.tx_in; i++)
+        //    if ( msgtx.vins[i].redeemscript != 0 )
+        //        free(msgtx.vins[i].redeemscript), msgtx.vins[i].redeemscript = 0;
+    } else jaddstr(retjson,"error",uselessbitcoin_error != 0 ? "-22" : "no rawtx or rawtx too big");
+    return(jprint(retjson,1));
+}
 #include "../includes/iguana_apiundefs.h"

iguana/iguana_rpc.c

@@ -31,7 +31,8 @@ char *sglue(GLUEARGS,char *agent,char *method)
 //printf("userpass.(%s)\n",userpass);
     jaddstr(json,"agent",agent);
     jaddstr(json,"method",method);
-    jaddstr(json,"coin",coin->symbol);
+    if ( coin != 0 )
+        jaddstr(json,"coin",coin->symbol);
     if ( userpass != 0 )
         jaddstr(json,"userpass",userpass);
     if ( coin != 0 && coin->FULLNODE >= 0 && coin->chain->userpass[0] != 0 )

iguana/iguana_scripts.c

@@ -487,7 +487,7 @@ char *iguana_scriptaddress(struct iguana_info *coin,char *coinaddr,uint8_t *scri
 
 int32_t bitcoin_scriptget(struct iguana_info *coin,int32_t *hashtypep,uint32_t *sigsizep,uint32_t *pubkeysizep,uint8_t **userdatap,uint32_t *userdatalenp,struct vin_info *vp,uint8_t *scriptsig,int32_t len,int32_t spendtype)
 {
-    char asmstr[IGUANA_MAXSCRIPTSIZE*3]; int32_t j,n,siglen,plen; uint8_t *p2shscript;
+    int32_t j,n,siglen,plen; uint8_t *p2shscript;
     j = n = 0;
     *userdatap = 0;
     *userdatalenp = *pubkeysizep = *sigsizep = 0;
@@ -559,7 +559,7 @@ int32_t bitcoin_scriptget(struct iguana_info *coin,int32_t *hashtypep,uint32_t *
      decode_hex(vp->rmd160,20,"010966776006953d5567439e5e39f86a0d273bee");//3564a74f9ddb4372301c49154605573d7d1a88fe");
      vp->type = IGUANA_SCRIPT_76A988AC;
      }*/
-    vp->spendlen = iguana_scriptgen(coin,&vp->M,&vp->N,vp->coinaddr,vp->spendscript,asmstr,vp->rmd160,vp->type,(const struct vin_info *)vp,vp->vin.prev_vout);
+    vp->spendlen = iguana_scriptgen(coin,&vp->M,&vp->N,vp->coinaddr,vp->spendscript,0,vp->rmd160,vp->type,(const struct vin_info *)vp,vp->vin.prev_vout);
     //printf("type.%d asmstr.(%s) spendlen.%d\n",vp->type,asmstr,vp->spendlen);
     return(vp->spendlen);
 }

iguana/iguana_sign.c

@@ -568,6 +568,22 @@ void iguana_vinobjset(struct iguana_msgvin *vin,cJSON *item,uint8_t *spendscript
     }
 }
 
+int32_t iguana_vinarray_check(cJSON *vinarray,bits256 txid)
+{
+    bits256 array_txid; cJSON *item; int32_t i,n = cJSON_GetArraySize(vinarray);
+    for (i=0; i<n; i++)
+    {
+        item = jitem(vinarray,i);
+        array_txid = jbits256(item,"txid");
+        if ( bits256_cmp(array_txid,txid) == 0 )
+        {
+            printf("vinarray.[%d] duplicate\n",i);
+            return(i);
+        }
+    }
+    return(-1);
+}
+
 int32_t iguana_rwmsgtx(struct iguana_info *coin,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 i,n,len = 0,extraused=0; uint8_t spendscript[IGUANA_MAXSCRIPTSIZE],*txstart = serialized,*sigser=0; char txidstr[65]; cJSON *vinarray=0,*voutarray=0; bits256 sigtxid;
@@ -657,7 +673,7 @@ int32_t iguana_rwmsgtx(struct iguana_info *coin,int32_t height,int32_t rwflag,cJ
             jaddi(voutarray,iguana_voutjson(coin,&msg->vouts[i],i,*txidp));
     }
     len += iguana_rwnum(rwflag,&serialized[len],sizeof(msg->lock_time),&msg->lock_time);
-    //printf("lock_time.%08x len.%d\n",msg->lock_time,len);
+//printf("lock_time.%08x len.%d\n",msg->lock_time,len);
     if ( strcmp(coin->symbol,"VPN") == 0 )
     {
         uint16_t ddosflag = 0;
@@ -688,13 +704,16 @@ int32_t iguana_rwmsgtx(struct iguana_info *coin,int32_t height,int32_t rwflag,cJ
                 iguana_vinobjset(&msg->vins[i],jitem(vins,i),spendscript,sizeof(spendscript));
                 sigtxid = bitcoin_sigtxid(coin,height,sigser,maxsize*2,msg,i,msg->vins[i].spendscript,msg->vins[i].spendlen,SIGHASH_ALL,vpnstr,suppress_pubkeys);
                 //printf("after vini.%d vinscript.%p spendscript.%p spendlen.%d (%s)\n",i,msg->vins[i].vinscript,msg->vins[i].spendscript,msg->vins[i].spendlen,jprint(jitem(vins,i),0));
-                jaddi(vinarray,iguana_vinjson(coin,&msg->vins[i],sigtxid));
+                if ( iguana_vinarray_check(vinarray,msg->vins[i].prev_hash) < 0 )
+                    jaddi(vinarray,iguana_vinjson(coin,&msg->vins[i],sigtxid));
                 if ( msg->vins[i].spendscript == spendscript )
                     msg->vins[i].spendscript = 0;
-            } else jaddi(vinarray,iguana_vinjson(coin,&msg->vins[i],sigtxid));
+            } else if ( iguana_vinarray_check(vinarray,msg->vins[i].prev_hash) < 0 )
+                jaddi(vinarray,iguana_vinjson(coin,&msg->vins[i],sigtxid));
         }
         free(sigser);
         jadd(json,"vin",vinarray);
+        msg->tx_in = cJSON_GetArraySize(vinarray);
         jaddnum(json,"numvins",msg->tx_in);
     }
     if ( voutarray != 0 )
@@ -833,6 +852,7 @@ cJSON *bitcoin_data2json(struct iguana_info *coin,int32_t height,bits256 *txidp,
         jaddstr(txobj,"error","couldnt decode transaction");
         jaddstr(txobj,"coin",coin->symbol);
     }
+    //printf("msgtx.(%s)\n",jprint(txobj,0));
     if ( n != len )
     {
         int32_t i;
@@ -1013,13 +1033,13 @@ int32_t bitcoin_verifyvins(struct iguana_info *coin,int32_t height,bits256 *sign
                 {
                     flag++;
                     numsigs++;
-                    int32_t z;
+                    /*int32_t z;
                     for (z=0; z<siglen-1; z++)
                         printf("%02x",sig[z]);
                     printf(" <- sig[%d]\n",j);
                     for (z=0; z<33; z++)
                         printf("%02x",vp->signers[j].pubkey[z]);
-                    printf(" <- pub, SIG.%d.%d VERIFIED numsigs.%d vs M.%d\n",vini,j,numsigs,vp->M);
+                    printf(" <- pub, SIG.%d.%d VERIFIED numsigs.%d vs M.%d\n",vini,j,numsigs,vp->M);*/
                 }
             }
             if ( numsigs >= vp->M )
@@ -1344,71 +1364,9 @@ int32_t iguana_interpreter(struct iguana_info *coin,cJSON *logarray,int64_t nLoc
     return(0);
 }
 
-#include "../includes/iguana_apidefs.h"
-#include "../includes/iguana_apideclares.h"
-
-
-P2SH_SPENDAPI(iguana,spendmsig,activecoin,vintxid,vinvout,destaddress,destamount,destaddress2,destamount2,M,N,pubA,wifA,pubB,wifB,pubC,wifC)
-{
-    struct vin_info V; uint8_t p2sh_rmd160[20],serialized[2096],spendscript[32],pubkeys[3][65],*pubkeyptrs[3]; int32_t spendlen,height = 0;
-    char msigaddr[64],*retstr; cJSON *retjson,*txobj; struct iguana_info *active;
-    bits256 signedtxid; char *signedtx;
-    struct iguana_msgtx msgtx;
-    if ( remoteaddr != 0 )
-        return(clonestr("{\"error\":\"no remote\"}"));
-    if ( myinfo->expiration == 0 )
-        return(clonestr("{\"error\":\"need to unlock wallet\"}"));
-    if ( (active= iguana_coinfind(activecoin)) == 0 )
-        return(clonestr("{\"error\":\"activecoin isnt active\"}"));
-    if ( M > N || N > 3 )
-        return(clonestr("{\"error\":\"illegal M or N\"}"));
-    memset(&V,0,sizeof(V));
-    txobj = bitcoin_txcreate(active->symbol,active->chain->isPoS,0,coin->chain->normal_txversion,0);
-    if ( destaddress[0] != 0 && destamount > 0. )
-        bitcoin_txaddspend(active,txobj,destaddress,destamount * SATOSHIDEN);
-    if ( destaddress2[0] != 0 && destamount2 > 0. )
-        bitcoin_txaddspend(active,txobj,destaddress2,destamount2 * SATOSHIDEN);
-    if ( pubA[0] != 0 && (retstr= _setVsigner(active,&V,0,pubA,wifA)) != 0 )
-        return(retstr);
-    if ( N >= 2 && pubB[0] != 0 && (retstr= _setVsigner(active,&V,1,pubB,wifB)) != 0 )
-        return(retstr);
-    if ( N == 3 && pubC[0] != 0 && (retstr= _setVsigner(active,&V,2,pubC,wifC)) != 0 )
-        return(retstr);
-    V.M = M, V.N = N, V.type = IGUANA_SCRIPT_P2SH;
-    V.p2shlen = bitcoin_MofNspendscript(p2sh_rmd160,V.p2shscript,0,&V);
-    spendlen = bitcoin_p2shspend(spendscript,0,p2sh_rmd160);
-    if ( pubA[0] != 0 )
-    {
-        decode_hex(pubkeys[0],(int32_t)strlen(pubA)>>1,pubA);
-        pubkeyptrs[0] = pubkeys[0];
-    }
-    if ( pubB[0] != 0 )
-    {
-        decode_hex(pubkeys[1],(int32_t)strlen(pubB)>>1,pubB);
-        pubkeyptrs[1] = pubkeys[1];
-    }
-    if ( pubC[0] != 0 )
-    {
-        decode_hex(pubkeys[2],(int32_t)strlen(pubC)>>1,pubC);
-        pubkeyptrs[2] = pubkeys[2];
-    }
-    bitcoin_txinput(active,txobj,vintxid,vinvout,0xffffffff,spendscript,spendlen,V.p2shscript,V.p2shlen,pubkeyptrs,N,0,0);
-    bitcoin_address(msigaddr,active->chain->p2shtype,V.p2shscript,V.p2shlen);
-    retjson = cJSON_CreateObject();
-    if ( bitcoin_verifyvins(active,height,&signedtxid,&signedtx,&msgtx,serialized,sizeof(serialized),&V,SIGHASH_ALL,1,V.suppress_pubkeys) == 0 )
-    {
-        jaddstr(retjson,"result","msigtx");
-        if ( signedtx != 0 )
-            jaddstr(retjson,"signedtx",signedtx), free(signedtx);
-        jaddbits256(retjson,"txid",signedtxid);
-    } else jaddstr(retjson,"error","couldnt sign tx");
-    jaddstr(retjson,"msigaddr",msigaddr);
-    return(jprint(retjson,1));
-}
-
 int32_t iguana_signrawtransaction(struct supernet_info *myinfo,struct iguana_info *coin,int32_t height,struct iguana_msgtx *msgtx,char **signedtxp,bits256 *signedtxidp,struct vin_info *V,int32_t numinputs,char *rawtx,cJSON *vins,cJSON *privkeysjson)
 {
-    uint8_t *serialized,*serialized2,*serialized3,*serialized4,*extraspace,pubkeys[64][33]; int32_t finalized,i,len,n,z,plen,maxsize,complete = 0,extralen = 65536; char *checkstr,*privkeystr,*signedtx = 0; bits256 privkeys[64],privkey,txid; cJSON *item; cJSON *txobj = 0;
+    uint8_t *serialized,*serialized2,*serialized3,*serialized4,*extraspace,pubkeys[64][33]; int32_t finalized,i,len,n,z,plen,maxsize,complete = 0,extralen = 65536; char *privkeystr,*signedtx = 0; bits256 privkeys[64],privkey,txid; cJSON *item; cJSON *txobj = 0;
     maxsize = 1000000;
     memset(privkey.bytes,0,sizeof(privkey));
     if ( rawtx != 0 && rawtx[0] != 0 && (len= (int32_t)strlen(rawtx)>>1) < maxsize )
@@ -1420,30 +1378,14 @@ int32_t iguana_signrawtransaction(struct supernet_info *myinfo,struct iguana_inf
         extraspace = malloc(extralen);
         memset(msgtx,0,sizeof(*msgtx));
         decode_hex(serialized,len,rawtx);
+        // printf("call hex2json.(%s) vins.(%s)\n",rawtx,jprint(vins,0));
         if ( (txobj= bitcoin_hex2json(coin,height,&txid,msgtx,rawtx,extraspace,extralen,serialized4,vins,V->suppress_pubkeys)) != 0 )
         {
-            if ( (0) && vins != 0 )
-                printf("txobj.(%s)\n",jprint(txobj,0));
-            if ( jobj(txobj,"error") != 0 )
-            {
-                printf("txobj.(%s)\n",jprint(txobj,0));
-            }
-            if ( (0) && (checkstr= bitcoin_json2hex(myinfo,coin,&txid,txobj,V)) != 0 ) // no guarantee of identical regen
-            {
-                if ( strcmp(rawtx,checkstr) != 0 )
-                {
-                    printf("RAW.(%s) ->\nNEW.(%s)\n",rawtx,checkstr);
-                    //free_json(txobj);
-                    //free(checkstr);
-                    //free(serialized), free(serialized2), free(serialized3), free(serialized4);
-                    //free(extraspace);
-                    //return(-2);
-                }
-                free(checkstr);
-            }
+            //printf("back from bitcoin_hex2json (%s)\n",jprint(vins,0));
         } else fprintf(stderr,"no txobj from bitcoin_hex2json\n");
         if ( (numinputs= cJSON_GetArraySize(vins)) > 0 )
         {
+            //printf("numinputs.%d msgtx.%d\n",numinputs,msgtx->tx_in);
             memset(msgtx,0,sizeof(*msgtx));
             if ( iguana_rwmsgtx(coin,height,0,0,serialized,maxsize,msgtx,&txid,"",extraspace,65536,vins,V->suppress_pubkeys) > 0 && numinputs == msgtx->tx_in )
             {
@@ -1463,6 +1405,7 @@ int32_t iguana_signrawtransaction(struct supernet_info *myinfo,struct iguana_inf
                             iguana_ensure_privkey(myinfo,coin,privkey);
                     }
                 }
+                //printf("after privkeys tx_in.%d\n",msgtx->tx_in);
                 for (i=0; i<msgtx->tx_in; i++)
                 {
                     if ( msgtx->vins[i].p2shlen != 0 )
@@ -1473,18 +1416,13 @@ int32_t iguana_signrawtransaction(struct supernet_info *myinfo,struct iguana_inf
                         sigsize = 0;
                         flag = (msgtx->vins[i].vinscript[0] == 0);
                         type = bitcoin_scriptget(coin,&hashtype,&sigsize,&pubkeysize,&userdata,&userdatalen,&mainvin,msgtx->vins[i].vinscript+flag,msgtx->vins[i].scriptlen-flag,0);
-                        if ( flag != 0 && pubkeysize == 33 ) // jl777: need to generalize this
-                        {
-                            for (k=0; k<sigsize; k++)
-                                printf("%02x",mainvin.signers[0].sig[k]);
-                        }
-                        printf(" main vinscript type.%d sigsize.%d pubkeysize.%d\n",type,sigsize,pubkeysize);
+                        //printf("i.%d flag.%d type.%d scriptlen.%d\n",i,flag,type,msgtx->vins[i].scriptlen);
                         if ( msgtx->vins[i].redeemscript != 0 )
                         {
                             //for (j=0; j<msgtx->vins[i].p2shlen; j++)
                             //    printf("%02x",msgtx->vins[i].redeemscript[j]);
                             bitcoin_address(coinaddr,coin->chain->p2shtype,msgtx->vins[i].redeemscript,msgtx->vins[i].p2shlen);
-                            type = iguana_calcrmd160(coin,0,&mvin,msgtx->vins[i].redeemscript,msgtx->vins[i].p2shlen,zero,0,01);
+                            type = iguana_calcrmd160(coin,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 )
@@ -1512,12 +1450,12 @@ int32_t iguana_signrawtransaction(struct supernet_info *myinfo,struct iguana_inf
                                             for (z=0; z<33; z++)
                                                 V[i].signers[j].pubkey[z] = pubkeys[k][z];
                                         }
-                                        printf("%s -> V[%d].signer.[%d] <- privkey.%d\n",mvin.signers[j].coinaddr,i,j,k);
+                                        //printf("%s -> V[%d].signer.[%d] <- privkey.%d\n",mvin.signers[j].coinaddr,i,j,k);
                                         break;
                                     }
                                 }
                             }
-                            printf("type.%d p2sh.[%d] -> %s M.%d N.%d\n",type,i,mvin.coinaddr,mvin.M,mvin.N);
+                            //printf("type.%d p2sh.[%d] -> %s M.%d N.%d\n",type,i,mvin.coinaddr,mvin.M,mvin.N);
                         }
                     }
                     if ( i < V->N )
@@ -1535,16 +1473,17 @@ int32_t iguana_signrawtransaction(struct supernet_info *myinfo,struct iguana_inf
                     }
                 }
                 finalized = iguana_vininfo_create(myinfo,coin,serialized2,maxsize,msgtx,vins,numinputs,V);
+                //printf("finalized.%d\n",finalized);
                 if ( (complete= bitcoin_verifyvins(coin,height,signedtxidp,&signedtx,msgtx,serialized3,maxsize,V,SIGHASH_ALL,1,V->suppress_pubkeys)) > 0 && signedtx != 0 )
                 {
                     int32_t tmp; char str[65];
                     if ( (tmp= iguana_interpreter(coin,0,iguana_lockval(finalized,jint(txobj,"locktime")),V,numinputs)) < 0 )
                     {
-                        //printf("iguana_interpreter %d error.(%s)\n",tmp,signedtx);
+                        printf("iguana_interpreter %d error.(%s)\n",tmp,signedtx);
                         complete = 0;
                     } else printf("%s signed\n",bits256_str(str,*signedtxidp));
-                }
-            }
+                } else printf("complete.%d\n",complete);
+            } else printf("rwmsgtx error\n");
         } else fprintf(stderr,"no inputs in vins.(%s)\n",vins!=0?jprint(vins,0):"null");
         free(extraspace);
         free(serialized), free(serialized2), free(serialized3), free(serialized4);
@@ -1555,43 +1494,4 @@ int32_t iguana_signrawtransaction(struct supernet_info *myinfo,struct iguana_inf
     return(complete);
 }
 
-STRING_ARRAY_OBJ_STRING(bitcoinrpc,signrawtransaction,rawtx,vins,privkeys,sighash)
-{
-    char *signedtx = 0; struct vin_info *V; bits256 signedtxid; int32_t complete,numinputs = 1; struct iguana_msgtx msgtx; cJSON *retjson; int uselessbitcoin_error = 0;
-    retjson = cJSON_CreateObject();
-    if ( remoteaddr != 0 )
-        return(clonestr("{\"error\":\"no remote\"}"));
-    if ( myinfo->expiration == 0 )
-        return(clonestr("{\"error\":\"need to unlock wallet\"}"));
-    //printf("rawtx.(%s) vins.(%s) privkeys.(%s) sighash.(%s)\n",rawtx,jprint(vins,0),jprint(privkeys,0),sighash);
-    if ( sighash == 0 || sighash[0] == 0 )
-        sighash = "ALL";
-    if ( strcmp(sighash,"ALL") != 0 )
-        jaddstr(retjson,"error","only sighash all (ALL) supported for now");
-    if ( (numinputs= cJSON_GetArraySize(vins)) > 0 )
-    {
-        V = calloc(numinputs,sizeof(*V));
-        memset(&msgtx,0,sizeof(msgtx));
-        if ( (complete= iguana_signrawtransaction(myinfo,coin,coin->blocks.hwmchain.height,&msgtx,&signedtx,&signedtxid,V,numinputs,rawtx,vins,privkeys)) >= 0 )
-        {
-            if ( signedtx != 0 )
-            {
-                jaddstr(retjson,"result",signedtx);
-                jadd(retjson,"complete",complete!=0?jtrue():jfalse());
-                free(signedtx);
-            } else jaddstr(retjson,"error",uselessbitcoin_error != 0 ? "-22" : "no transaction from verifyvins");
-        }
-        else if ( complete == -2 )
-            jaddstr(retjson,"error",uselessbitcoin_error != 0 ? "-22" : "hex2json -> json2hex error");
-        else if ( complete == -1 )
-            jaddstr(retjson,"error",uselessbitcoin_error != 0 ? "-22" : "couldnt load serialized tx or mismatched numinputs");
-        free(V);
-        //for (i=0; i<msgtx.tx_in; i++)
-        //    if ( msgtx.vins[i].redeemscript != 0 )
-        //        free(msgtx.vins[i].redeemscript), msgtx.vins[i].redeemscript = 0;
-    } else jaddstr(retjson,"error",uselessbitcoin_error != 0 ? "-22" : "no rawtx or rawtx too big");
-    return(jprint(retjson,1));
-}
-
-#include "../includes/iguana_apiundefs.h"
 

iguana/iguana_tradebots.c

@@ -221,6 +221,7 @@ char *tradebot_control(struct supernet_info *myinfo,char *exchangestr,char *boti
 
 #include "../includes/iguana_apidefs.h"
 #include "../includes/iguana_apideclares.h"
+#include "../includes/iguana_apideclares2.h"
 
 HASH_ARRAY_STRING(tradebot,liquidity,hash,vals,targetcoin)
 {

iguana/iguana_unspents.c

@@ -916,7 +916,7 @@ void iguana_unspents_mark(struct supernet_info *myinfo,struct iguana_info *coin,
                         printf("slot.[%d] <- %s/v%d\n",firstslot,bits256_str(str,txid),vout);
                         coin->markedunspents[firstslot] = txid;
                         coin->markedunspents[firstslot].ushorts[15] = vout;
-                        if ( coin->utxofp == 0 )
+                        if ( (0) && coin->utxofp == 0 )
                         {
                             sprintf(fname,"%s/%s/utxo.dat",GLOBAL_DBDIR,coin->symbol), OS_compatible_path(fname);
                             if ( (coin->utxofp= fopen(fname,"rb+")) == 0 )
@@ -939,6 +939,7 @@ void iguana_unspents_mark(struct supernet_info *myinfo,struct iguana_info *coin,
 void iguana_unspents_markinit(struct supernet_info *myinfo,struct iguana_info *coin)
 {
     char *filestr,fname[1024]; FILE *fp; long filesize; bits256 filetxid; cJSON *array,*item; int32_t i,filevout,n,firstslot;
+return;
     sprintf(fname,"%s/%s/utxo.dat",GLOBAL_DBDIR,coin->symbol), OS_compatible_path(fname);
     if ( (fp= fopen(fname,"rb")) != 0 )
     {
@@ -948,7 +949,7 @@ void iguana_unspents_markinit(struct supernet_info *myinfo,struct iguana_info *c
             {
                 if ( firstslot >= 0 )
                 {
-                    char str[65]; printf("%s slot.[%d] <- %s/v%d\n",fname,firstslot,bits256_str(str,filetxid),filevout);
+                    //char str[65]; printf("%s slot.[%d] <- %s/v%d\n",fname,firstslot,bits256_str(str,filetxid),filevout);
                     coin->markedunspents[firstslot] = filetxid;
                     coin->markedunspents[firstslot].ushorts[15] = filevout;
                 }
@@ -974,7 +975,7 @@ void iguana_unspents_markinit(struct supernet_info *myinfo,struct iguana_info *c
                     {
                         if ( firstslot >= 0 )
                         {
-                            char str[65]; printf("slot.[%d] <- %s/v%d\n",firstslot,bits256_str(str,filetxid),filevout);
+                            //char str[65]; printf("slot.[%d] <- %s/v%d\n",firstslot,bits256_str(str,filetxid),filevout);
                             coin->markedunspents[firstslot] = filetxid;
                             coin->markedunspents[firstslot].ushorts[15] = filevout;
                         }
@@ -1798,6 +1799,7 @@ void iguana_utxoaddrs_purge(struct iguana_info *coin)
 
 #include "../includes/iguana_apidefs.h"
 #include "../includes/iguana_apideclares.h"
+#include "../includes/iguana_apideclares2.h"
 
 STRING_AND_INT(iguana,snapshot,symbol,height)
 {

iguana/iguana_wallet.c

@@ -995,6 +995,7 @@ cJSON *iguana_privkeysjson(struct supernet_info *myinfo,struct iguana_info *coin
 
 #include "../includes/iguana_apidefs.h"
 #include "../includes/iguana_apideclares.h"
+#include "../includes/iguana_apideclares2.h"
 
 int64_t iguana_addressreceived(struct supernet_info *myinfo,struct iguana_info *coin,cJSON *json,char *remoteaddr,cJSON *txids,cJSON *vouts,cJSON *unspents,cJSON *spends,char *coinaddr,int32_t minconf,int32_t firstheight)
 {
@@ -1360,7 +1361,16 @@ TWOSTRINGS_AND_INT(bitcoinrpc,walletpassphrase,password,permanentfile,timeout)
     if ( coin != 0 )
     {
         bitcoin_address(coin->changeaddr,coin->chain->pubtype,myinfo->persistent_pubkey33,33);
+        if ( coin->FULLNODE < 0 )
+        {
+            char wifstr[64];
+            bitcoin_priv2wif(wifstr,myinfo->persistent_priv,coin->chain->wiftype);
+            jumblr_importprivkey(myinfo,coin,wifstr);
+        }
     }
+    if ( bits256_nonz(myinfo->persistent_priv) != 0 )
+        smartaddress_add(myinfo,myinfo->persistent_priv,"","");
+
     //basilisk_unspents_update(myinfo,coin);
     return(retstr);
 }

iguana/kmd_lookup.h

@@ -117,7 +117,7 @@ int32_t kmd_transactionvin(struct iguana_info *coin,bits256 spendtxid,int32_t vi
         }
         return(0);
     }
-    char str[65]; printf("vin error %s vout.%d of %d vs ptr %p [%d] spent.%p\n",bits256_str(str,txid),vout,ptr!=0?ptr->numvouts:-1,ptr,ptr!=0?ptr->numvouts:-1,spendptr);
+    char str[65]; printf("%s.vin error %s vout.%d of %d vs ptr %p [%d] spent.%p\n",coin->symbol,bits256_str(str,txid),vout,ptr!=0?ptr->numvouts:-1,ptr,ptr!=0?ptr->numvouts:-1,spendptr);
     return(-1);
 }
 
@@ -203,11 +203,11 @@ FILE *kmd_txidinit(struct iguana_info *coin)
         {
             if ( (tx= kmd_transactionalloc(T.txid,T.height,T.timestamp,T.numvouts,T.numvins)) != 0 )
             {
-                //printf("INIT %s.[%d] vins.[%d] ht.%d %u\n",bits256_str(str,T.txid),T.numvouts,T.numvins,T.height,T.timestamp);
+                //char str[65]; printf("INIT %s.[%d] vins.[%d] ht.%d %u\n",bits256_str(str,T.txid),T.numvouts,T.numvins,T.height,T.timestamp);
                 if ( (ptr= kmd_transactionadd(coin,tx,T.numvouts,T.numvins)) != 0 )
                 {
                     if ( ptr != kmd_transaction(coin,tx->txid) )
-                        printf("ERROR: %p != %p for ht.%d\n",ptr,kmd_transaction(coin,tx->txid),tx->height);
+                        printf("%s ERROR: %p != %p for ht.%d\n",coin->symbol,ptr,kmd_transaction(coin,tx->txid),tx->height);
                     ptr->fpos = lastpos;
                     ptr->numvins = T.numvins;
                     ptr->numvouts = T.numvouts;
@@ -219,7 +219,7 @@ FILE *kmd_txidinit(struct iguana_info *coin)
                         }
                         else
                         {
-                            printf("error loading vout.%d ht.%d\n",i,T.height);
+                            printf("%s error loading vout.%d ht.%d\n",coin->symbol,i,T.height);
                             break;
                         }
                     }
@@ -255,7 +255,7 @@ FILE *kmd_spendinit(struct iguana_info *coin)
                     {
                         if ( kmd_transactionvin(coin,txid,i,spenttxid,spentvout) < 0 )
                         {
-                            printf("error adding spend %s %d of %d\n",bits256_str(str,txid),i,numvins);
+                            printf("%s error adding spend %s %d of %d\n",coin->symbol,bits256_str(str,txid),i,numvins);
                             //break;
                         }
                     } else break;
@@ -277,7 +277,7 @@ FILE *kmd_spendinit(struct iguana_info *coin)
                 {
                     if ( ptr->ptrs[(i<<1) + 1] != kmd_transaction(coin,vptr->spendtxid) )
                     {
-                        printf("mismatch %s spend.%d %p %p\n",bits256_str(str,vptr->spendtxid),i,ptr->ptrs[(i<<1) + 1],kmd_transaction(coin,vptr->spendtxid));
+                        printf("%s mismatch %s spend.%d %p %p\n",coin->symbol,bits256_str(str,vptr->spendtxid),i,ptr->ptrs[(i<<1) + 1],kmd_transaction(coin,vptr->spendtxid));
                     }
                 }
             }
@@ -392,9 +392,24 @@ cJSON *kmd_gettxin(struct iguana_info *coin,bits256 txid,int32_t vout)
 
 cJSON *kmd_listaddress(struct supernet_info *myinfo,struct iguana_info *coin,char *coinaddr,int32_t mode,cJSON *array)
 {
-    struct kmd_addresshh *addr; struct kmd_transactionhh *ptr=0,*spent,*prev=0; uint8_t type_rmd160[21]; int32_t i;
+    struct kmd_addresshh *addr; struct kmd_transactionhh *ptr=0,*spent,*prev=0; uint8_t type_rmd160[21]; int32_t i; char *retstr; cJSON *retjson;
     if ( array == 0 )
         array = cJSON_CreateArray();
+    //printf("%s listaddress.(%s)\n",coin->symbol,coinaddr);
+    if ( (retstr= bitcoinrpc_validateaddress(myinfo,coin,0,0,coinaddr)) != 0 )
+    {
+        if ( (retjson= cJSON_Parse(retstr)) != 0 )
+        {
+            if ( jobj(retjson,"error") != 0 && is_cJSON_False(jobj(retjson,"error")) == 0 )
+            {
+                printf("%s\n",retstr);
+                free(retstr);
+                return(retjson);
+            }
+            free_json(retjson);
+        }
+        free(retstr);
+    }
     /*if ( time(NULL) > coin->kmd_lasttime+30 )
     {
         coin->kmd_lasttime = (uint32_t)time(NULL);
@@ -463,7 +478,7 @@ cJSON *kmd_listaddress(struct supernet_info *myinfo,struct iguana_info *coin,cha
             }
             ptr = prev;
         }
-    } else printf("no valid entry for (%s) %p %p\n",coinaddr,addr,ptr);
+    } //else printf("no valid entry for (%s) %p %p\n",coinaddr,addr,ptr);
     return(array);
 }
 
@@ -627,7 +642,7 @@ int32_t _kmd_bitcoinscan(struct iguana_info *coin)
     {
         flag = 0;
         if ( (loadheight % 10000) == 0 )
-            printf("loading ht.%d\n",loadheight);//,jprint(kmd_getbalance(coin,"*"),1));
+            printf("loading %s ht.%d vs height.%d - lag.%d kmdheight.%d\n",coin->symbol,loadheight,height,lag,coin->kmd_height);//,jprint(kmd_getbalance(coin,"*"),1));
         if ( (blockjson= kmd_blockjson(&h,coin->symbol,coin->chain->serverport,coin->chain->userpass,0,loadheight)) != 0 )
         {
             if ( (txids= jarray(&numtxids,blockjson,"tx")) != 0 )
@@ -679,9 +694,11 @@ int32_t _kmd_bitcoinscan(struct iguana_info *coin)
                                         {
                                             bitcoin_addr2rmd160(&type_rmd160[0],&type_rmd160[1],jstri(addresses,0));
                                             kmd_transactionvout(coin,ptr,j,jdouble(vout,"value")*SATOSHIDEN,type_rmd160,zero,-1);
+                                            //fprintf(stderr,"%.8f ",jdouble(vout,"value"));
                                         } // else printf("missing sobj.%p or addresses.%p (%s)\n",sobj,addresses,jprint(vout,0)); //likely OP_RETURN
                                         sobj = addresses = 0;
                                     }
+                                    //fprintf(stderr,"numvouts.%d ht.%d %s\n",numvouts,height,coin->symbol);
                                     if ( coin->kmd_txidfp != 0 )
                                     {
                                         ptr->fpos = ftell(coin->kmd_txidfp);
@@ -748,6 +765,7 @@ void kmd_bitcoinscan()
                     {
                         //if ( strcmp("KMD",coin->symbol) == 0 )
                             _kmd_bitcoinscan(coin);
+                        usleep(250000);
                     }
                 }
             }

iguana/main.c

@@ -24,6 +24,7 @@
 #include "../pnacl_main.h"
 #include "iguana777.h"
 
+
 struct iguana_jsonitem { struct queueitem DL; struct supernet_info *myinfo; uint32_t fallback,expired,allocsize; char *retjsonstr; char remoteaddr[64]; uint16_t port; char jsonstr[]; };
 
 uint16_t SuperNET_API2num(char *agent,char *method)
@@ -461,6 +462,19 @@ rm BTC.xz; mksquashfs DB/BTC BTC.xz -comp xz -b 1048576 -comp xz -Xdict-size 102
  https://github.com/vasi/squashfuse
 */
 
+void DEX_explorerloop(void *ptr)
+{
+    struct supernet_info *myinfo = ptr;
+    while ( 1 )
+    {
+        if ( myinfo->DEXEXPLORER != 0 )
+        {
+            kmd_bitcoinscan();
+        }
+        usleep(100000);
+    }
+}
+
 void mainloop(struct supernet_info *myinfo)
 {
     struct iguana_info *coin; int32_t counter=0,depth; double lastmilli = 0;
@@ -484,8 +498,6 @@ void mainloop(struct supernet_info *myinfo)
             }
             usleep(30000);
         }
-        if ( myinfo->DEXEXPLORER != 0 )
-            kmd_bitcoinscan();
         //pangea_queues(SuperNET_MYINFO(0));
         //if ( flag == 0 )
         //    usleep(100000 + isRT*100000 + (numpeers == 0)*1000000);
@@ -672,6 +684,7 @@ void iguana_ensuredirs()
     sprintf(dirname,"%s",GLOBAL_GENESISDIR), OS_ensure_directory(dirname);
     sprintf(dirname,"%s",GLOBAL_CONFSDIR), OS_ensure_directory(dirname);
     sprintf(dirname,"%s",GLOBAL_DBDIR), OS_ensure_directory(dirname);
+    sprintf(dirname,"%s/SWAPS",GLOBAL_DBDIR), OS_ensure_directory(dirname);
     sprintf(dirname,"%s/TRANSACTIONS",GLOBAL_DBDIR), OS_ensure_directory(dirname);
     sprintf(dirname,"%s/purgeable",GLOBAL_DBDIR), OS_ensure_directory(dirname);
     sprintf(dirname,"%s",GLOBAL_TMPDIR), OS_ensure_directory(dirname);
@@ -734,6 +747,29 @@ void iguana_urlinit(struct supernet_info *myinfo,int32_t ismainnet,int32_t usess
     else strcat(myinfo->NXTAPIURL,"6876/nxt");
 }
 
+void jumblr_loop(void *ptr)
+{
+    struct iguana_info *coin; char BTCaddr[64],KMDaddr[64]; bits256 privkey; uint32_t t; struct supernet_info *myinfo = ptr; int32_t mult = 10;
+    printf("JUMBLR loop\n");
+    while ( 1 )
+    {
+        if ( (coin= iguana_coinfind("KMD")) != 0 && coin->FULLNODE < 0 )
+        {
+            privkey = jumblr_privkey(myinfo,BTCaddr,KMDaddr,JUMBLR_DEPOSITPREFIX);
+            // if BTC has arrived in deposit address, invoke DEX -> KMD
+            // if BTC has arrived in destination address, invoke DEX -> BTC
+            jumblr_DEXcheck(myinfo,coin,BTCaddr,KMDaddr,privkey);
+            t = (uint32_t)time(NULL);
+            if ( myinfo->jumblr_passphrase[0] != 0 && (t % (120 * mult)) < 60 )
+            {
+                jumblr_iteration(myinfo,coin,(t % (360 * mult)) / (120 * mult),t % (120 * mult));
+            }
+            //printf("t.%u %p.%d %s\n",t,coin,coin!=0?coin->FULLNODE:0,myinfo->jumblr_passphrase);
+        }
+        sleep(55);
+    }
+}
+
 void iguana_launchdaemons(struct supernet_info *myinfo)
 {
     int32_t i; char *helperargs,helperstr[512];
@@ -749,6 +785,9 @@ void iguana_launchdaemons(struct supernet_info *myinfo)
     if ( COMMANDLINE_ARGFILE == 0 )
         iguana_launch(0,"rpcloop",iguana_rpcloop,myinfo,IGUANA_PERMTHREAD); // limit to oneprocess
     printf("launch mainloop\n");
+    OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)DEX_explorerloop,(void *)myinfo);
+    OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)jumblr_loop,(void *)myinfo);
+    OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)dpow_psockloop,(void *)myinfo);
     mainloop(myinfo);
 }
 
@@ -987,6 +1026,435 @@ void SuperNET_parsepeers(struct supernet_info *myinfo,cJSON *array,int32_t n,int
 
 #include "../includes/iguana_apidefs.h"
 #include "../includes/iguana_apideclares.h"
+#include "../includes/iguana_apideclares2.h"
+
+STRING_ARG(iguana,initfastfind,activecoin)
+{
+    if ( (coin= iguana_coinfind(activecoin)) != 0 )
+    {
+        iguana_fastfindcreate(coin);
+        return(clonestr("{\"result\":\"fast find initialized\"}"));
+    } else return(clonestr("{\"error\":\"no coin to initialize\"}"));
+}
+
+TWO_STRINGS_AND_TWO_DOUBLES(iguana,balance,activecoin,address,lastheightd,minconfd)
+{
+    int32_t lastheight,minconf,maxconf=1<<30; cJSON *array,*retjson = cJSON_CreateObject();
+    if ( activecoin != 0 && activecoin[0] != 0 )
+        coin = iguana_coinfind(activecoin);
+    if ( coin != 0 )
+    {
+        if ( (minconf= minconfd) <= 0 )
+            minconf = 1;
+        lastheight = lastheightd;
+        jaddstr(retjson,"address",address);
+        if ( bitcoin_validaddress(coin,address) < 0 )
+        {
+            jaddstr(retjson,"error","illegal address");
+            return(jprint(retjson,1));
+        }
+        jadd64bits(retjson,"RTbalance",iguana_RTbalance(coin,address));
+        array = cJSON_CreateArray();
+        jaddistr(array,address);
+        jadd(retjson,"unspents",iguana_RTlistunspent(myinfo,coin,array,minconf,maxconf,remoteaddr,1));
+        free_json(array);
+        if ( lastheight > 0 )
+            jaddnum(retjson,"RTheight",coin->RTheight);
+    }
+    return(jprint(retjson,1));
+}
+
+STRING_ARG(iguana,validate,activecoin)
+{
+    int32_t i,total,validated; struct iguana_bundle *bp; cJSON *retjson;
+    if ( (coin= iguana_coinfind(activecoin)) != 0 )
+    {
+        for (i=total=validated=0; i<coin->bundlescount; i++)
+            if ( (bp= coin->bundles[i]) != 0 )
+            {
+                validated += iguana_bundlevalidate(myinfo,coin,bp,1);
+                total += bp->n;
+            }
+        retjson = cJSON_CreateObject();
+        jaddstr(retjson,"result","validation run");
+        jaddstr(retjson,"coin",coin->symbol);
+        jaddnum(retjson,"validated",validated);
+        jaddnum(retjson,"total",total);
+        jaddnum(retjson,"bundles",coin->bundlescount);
+        jaddnum(retjson,"accuracy",(double)validated/total);
+        return(jprint(retjson,1));
+    } else return(clonestr("{\"error\":\"no active coin\"}"));
+}
+
+STRING_ARG(iguana,removecoin,activecoin)
+{
+    struct iguana_bundle *bp; int32_t i,height; char fname[1024];
+    if ( (coin= iguana_coinfind(activecoin)) != 0 )
+    {
+        coin->active = 0;
+        coin->started = 0;
+        if ( (0) )
+        {
+            for (i=0; i<IGUANA_MAXPEERS; i++)
+            {
+                sprintf(fname,"%s/%s/vouts/%04d.vouts",GLOBAL_DBDIR,coin->symbol,i), OS_removefile(fname,0);
+                sprintf(fname,"%s/%s/%04d.vins",coin->VALIDATEDIR,coin->symbol,i), OS_removefile(fname,0);
+            }
+            sprintf(fname,"%s/%s/vouts/*",GLOBAL_DBDIR,coin->symbol), OS_removefile(fname,0);
+            sprintf(fname,"%s/%s/*",coin->VALIDATEDIR,coin->symbol), OS_removefile(fname,0);
+            for (i=0; i<coin->bundlescount; i++)
+            {
+                sprintf(fname,"%s/%s/balancecrc.%d",GLOBAL_DBDIR,coin->symbol,i), OS_removefile(fname,0);
+                if ( (bp= coin->bundles[i]) != 0 )
+                {
+                    iguana_bundlepurgefiles(coin,bp);
+                    iguana_bundleremove(coin,bp->hdrsi,1);
+                }
+            }
+            for (height=0; height<coin->longestchain; height+=IGUANA_SUBDIRDIVISOR)
+            {
+                sprintf(fname,"%s/%s/%d",GLOBAL_DBDIR,coin->symbol,height/IGUANA_SUBDIRDIVISOR);
+                OS_remove_directory(fname);
+            }
+            sprintf(fname,"%s/%s/*",GLOBAL_DBDIR,coin->symbol), OS_remove_directory(fname);
+        }
+        return(clonestr("{\"result\":\"success\"}"));
+    }
+    return(clonestr("{\"error\":\"no active coin\"}"));
+}
+
+INT_ARG(bitcoinrpc,getblockhash,height)
+{
+    cJSON *retjson;
+    if ( coin->notarychain >= 0 && coin->FULLNODE == 0 )
+        return(_dex_getblockhash(myinfo,coin->symbol,height));
+    retjson = cJSON_CreateObject();
+    jaddbits256(retjson,"result",iguana_blockhash(coin,height));
+    return(jprint(retjson,1));
+}
+
+HASH_AND_TWOINTS(bitcoinrpc,getblock,blockhash,verbose,remoteonly)
+{
+    char *blockstr,*datastr; struct iguana_msgblock msg; struct iguana_block *block; cJSON *retjson; bits256 txid; int32_t len;
+    if ( coin->notarychain >= 0 && coin->FULLNODE == 0 )
+        return(_dex_getblock(myinfo,coin->symbol,blockhash));
+    retjson = cJSON_CreateObject();
+    memset(&msg,0,sizeof(msg));
+    if ( remoteonly == 0 && (block= iguana_blockfind("getblockRPC",coin,blockhash)) != 0 )
+    {
+        if ( verbose != 0 )
+            return(jprint(iguana_blockjson(myinfo,coin,block,1),1));
+        else
+        {
+            if ( (len= iguana_peerblockrequest(myinfo,coin,coin->blockspace,coin->blockspacesize,0,blockhash,0)) > 0 )
+            {
+                datastr = malloc(len*2 + 1);
+                init_hexbytes_noT(datastr,coin->blockspace,len);
+                jaddstr(retjson,"result",datastr);
+                free(datastr);
+                return(jprint(retjson,1));
+            }
+            jaddstr(retjson,"error","error getting rawblock");
+        }
+    }
+    else if ( coin->APIblockstr != 0 )
+        jaddstr(retjson,"error","already have pending request");
+    else
+    {
+        memset(txid.bytes,0,sizeof(txid));
+        if ( (blockstr= iguana_APIrequest(coin,blockhash,txid,5)) != 0 )
+        {
+            jaddstr(retjson,"result",blockstr);
+            free(blockstr);
+        } else jaddstr(retjson,"error","cant find blockhash");
+    }
+    return(jprint(retjson,1));
+}
+
+ZERO_ARGS(bitcoinrpc,getbestblockhash)
+{
+    cJSON *retjson;
+    if ( coin->notarychain >= 0 && coin->FULLNODE == 0 )
+        return(_dex_getbestblockhash(myinfo,coin->symbol));
+    retjson = cJSON_CreateObject();
+    char str[65]; jaddstr(retjson,"result",bits256_str(str,coin->blocks.hwmchain.RO.hash2));
+    return(jprint(retjson,1));
+}
+
+ZERO_ARGS(bitcoinrpc,getblockcount)
+{
+    cJSON *retjson = cJSON_CreateObject();
+    //printf("result %d\n",coin->blocks.hwmchain.height);
+    jaddnum(retjson,"result",coin->blocks.hwmchain.height);
+    return(jprint(retjson,1));
+}
+
+STRING_AND_INT(iguana,bundleaddresses,activecoin,height)
+{
+    struct iguana_info *ptr;
+    if ( (ptr= iguana_coinfind(activecoin)) != 0 )
+        return(iguana_bundleaddrs(ptr,height / coin->chain->bundlesize));
+    else return(clonestr("{\"error\":\"activecoin is not active\"}"));
+}
+
+STRING_AND_INT(iguana,PoSweights,activecoin,height)
+{
+    struct iguana_info *ptr; int32_t num,nonz,errs,bundleheight; struct iguana_pkhash *refP; uint64_t *weights,supply; cJSON *retjson;
+    if ( (ptr= iguana_coinfind(activecoin)) != 0 )
+    {
+        //for (bundleheight=coin->chain->bundlesize; bundleheight<height; bundleheight+=coin->chain->bundlesize)
+        {
+            bundleheight = (height / ptr->chain->bundlesize) * ptr->chain->bundlesize;
+            if ( (weights= iguana_PoS_weights(myinfo,ptr,&refP,&supply,&num,&nonz,&errs,bundleheight)) != 0 )
+            {
+                retjson = cJSON_CreateObject();
+                jaddstr(retjson,"result",errs == 0 ? "success" : "error");
+                jaddnum(retjson,"bundleheight",bundleheight);
+                jaddnum(retjson,"numaddresses",num);
+                jaddnum(retjson,"nonzero",nonz);
+                jaddnum(retjson,"errors",errs);
+                jaddnum(retjson,"supply",dstr(supply));
+                free(weights);
+                return(jprint(retjson,1));
+            } else return(clonestr("{\"error\":\"iguana_PoS_weights returned null\"}"));
+        }
+    }
+    return(clonestr("{\"error\":\"activecoin is not active\"}"));
+}
+
+STRING_ARG(iguana,stakers,activecoin)
+{
+    struct iguana_info *ptr; int32_t i,datalen,pkind,hdrsi; bits256 hash2; struct iguana_bundle *bp; cJSON *retjson,*array; struct iguana_pkhash *refP; struct iguana_ramchaindata *rdata; char coinaddr[64]; uint8_t refrmd160[20]; bits256 *sortbuf;
+    if ( (ptr= iguana_coinfind(activecoin)) != 0 && ptr->RTheight > ptr->chain->bundlesize )
+    {
+        hdrsi = (ptr->RTheight / ptr->chain->bundlesize) - 1;
+        if ( (bp= ptr->bundles[hdrsi]) != 0 && bp->weights != 0 && (rdata= bp->ramchain.H.data) != 0 && bp->weights != 0 )
+        {
+            sortbuf = calloc(bp->numweights,2 * sizeof(*sortbuf));
+            for (i=datalen=0; i<bp->numweights; i++)
+                datalen += iguana_rwnum(1,&((uint8_t *)sortbuf)[datalen],sizeof(bp->weights[i]),(void *)&bp->weights[i]);
+            hash2 = bits256_doublesha256(0,(uint8_t *)sortbuf,datalen);
+            refP = RAMCHAIN_PTR(rdata,Poffset);
+            retjson = cJSON_CreateObject();
+            array = cJSON_CreateArray();
+            memset(refrmd160,0,sizeof(refrmd160));
+            for (i=0; i<ptr->chain->bundlesize; i++)
+            {
+                if ( (pkind= iguana_staker_sort(ptr,&hash2,refrmd160,refP,bp->weights,bp->numweights,sortbuf)) > 0 )
+                {
+                    bitcoin_address(coinaddr,ptr->chain->pubtype,refP[pkind].rmd160,sizeof(refP[pkind].rmd160));
+                    jaddistr(array,coinaddr);
+                } else jaddistr(array,"error");
+            }
+            jaddstr(retjson,"result","success");
+            jadd(retjson,"stakers",array);
+            return(jprint(retjson,1));
+        } else return(clonestr("{\"error\":\"iguana_stakers needs PoSweights and weights\"}"));
+    }
+    return(clonestr("{\"error\":\"activecoin is not active\"}"));
+}
+
+STRING_AND_INT(iguana,bundlehashes,activecoin,height)
+{
+    struct iguana_info *ptr; struct iguana_bundle *bp; int32_t i,hdrsi; cJSON *retjson,*array; struct iguana_ramchaindata *rdata;
+    if ( (ptr= iguana_coinfind(activecoin)) != 0 )
+    {
+        hdrsi = height / coin->chain->bundlesize;
+        if ( hdrsi < coin->bundlescount && hdrsi >= 0 && (bp= coin->bundles[hdrsi]) != 0 )
+        {
+            if ( (rdata= bp->ramchain.H.data) != 0 )
+            {
+                array = cJSON_CreateArray();
+                for (i=0; i<IGUANA_NUMLHASHES; i++)
+                    jaddinum(array,rdata->lhashes[i].txid);
+                retjson = cJSON_CreateObject();
+                jaddstr(retjson,"result","success");
+                jaddbits256(retjson,"sha256",rdata->sha256);
+                jadd(retjson,"bundlehashes",array);
+                return(jprint(retjson,1));
+            } else return(clonestr("{\"error\":\"ramchain not there\"}"));
+        } else return(clonestr("{\"error\":\"height is too big\"}"));
+    } else return(clonestr("{\"error\":\"activecoin is not active\"}"));
+}
+
+// low priority RPC
+
+HASH_AND_TWOINTS(bitcoinrpc,listsinceblock,blockhash,target,flag)
+{
+    /*"transactions" : [
+     {
+     "account" : "doc test",
+     "address" : "mmXgiR6KAhZCyQ8ndr2BCfEq1wNG2UnyG6",
+     "category" : "receive",
+     "amount" : 0.10000000,
+     "vout" : 0,
+     "confirmations" : 76478,
+     "blockhash" : "000000000017c84015f254498c62a7c884a51ccd75d4dd6dbdcb6434aa3bd44d",
+     "blockindex" : 1,
+     "blocktime" : 1399294967,
+     "txid" : "85a98fdf1529f7d5156483ad020a51b7f3340e47448cf932f470b72ff01a6821",
+     "walletconflicts" : [
+     ],
+     "time" : 1399294967,
+     "timereceived" : 1418924714
+     },*/
+    cJSON *retjson = cJSON_CreateObject();
+    jaddstr(retjson,"error","low priority RPC not implemented");
+    return(jprint(retjson,1));
+}
+
+ZERO_ARGS(bitcoinrpc,gettxoutsetinfo)
+{
+    cJSON *retjson = cJSON_CreateObject();
+    jaddstr(retjson,"error","low priority RPC not implemented");
+    return(jprint(retjson,1));
+}
+
+ZERO_ARGS(bitcoinrpc,listaddressgroupings)
+{
+    if ( remoteaddr != 0 )
+        return(clonestr("{\"error\":\"no remote\"}"));
+    return(clonestr("{\"error\":\"low priority RPC not implemented\"}"));
+}
+
+SS_D_I_S(bitcoinrpc,move,fromaccount,toaccount,amount,minconf,comment)
+{
+    cJSON *retjson;
+    if ( remoteaddr != 0 )
+        return(clonestr("{\"error\":\"no remote\"}"));
+    if ( myinfo->expiration == 0 )
+        return(clonestr("{\"error\":\"need to unlock wallet\"}"));
+    retjson = cJSON_CreateObject();
+    return(jprint(retjson,1));
+}
+
+ZERO_ARGS(pax,start)
+{
+    void PAX_init();
+    PAX_init();
+    return(clonestr("{\"result\":\"PAX_init called\"}"));
+}
+
+STRING_AND_TWOINTS(mouse,change,name,x,y)
+{
+    printf("mouse (%s) x.%d y.%d\n",name,x,y);
+    return(clonestr("{\"result\":\"changed\"}"));
+}
+
+STRING_ARG(mouse,leave,name)
+{
+    printf("mouse (%s) leave\n",name);
+    return(clonestr("{\"result\":\"left\"}"));
+}
+
+STRING_AND_TWOINTS(mouse,click,name,x,y)
+{
+    printf("mouse (%s) x.%d y.%d click\n",name,x,y);
+    return(clonestr("{\"result\":\"click\"}"));
+}
+
+STRING_AND_INT(keyboard,key,name,c)
+{
+    printf(" KEY.(%s) c.%d (%c)\n",name,c,c);
+    return(clonestr("{\"result\":\"key\"}"));
+}
+
+STRING_AND_TWOINTS(mouse,image,name,x,y)
+{
+    printf("mouse CREATE (%s) x.%d y.%d\n",name,x,y);
+    return(clonestr("{\"result\":\"opened\"}"));
+}
+
+STRING_ARG(mouse,close,name)
+{
+    printf("mouse CLOSE (%s)\n",name);
+    return(clonestr("{\"result\":\"closed\"}"));
+}
+
+HASH_ARRAY_STRING(basilisk,geckotx,hash,vals,hexstr)
+{
+    struct iguana_info *btcd; char *retstr=0,*symbol; uint8_t *data,*allocptr,space[4096]; int32_t datalen; bits256 txid;
+    if ( (btcd= iguana_coinfind("BTCD")) != 0 && (symbol= jstr(vals,"symbol")) != 0 )
+    {
+        if ( (data= get_dataptr(BASILISK_HDROFFSET,&allocptr,&datalen,space,sizeof(space),hexstr)) != 0 )
+        {
+            txid = bits256_doublesha256(0,data,datalen);
+            retstr = gecko_sendrawtransaction(myinfo,symbol,data,datalen,txid,vals,hexstr);
+        } else retstr = clonestr("{\"error\":\"no tx submitted\"}");
+        if ( allocptr != 0 )
+            free(allocptr);
+        if ( retstr == 0 )
+            retstr = clonestr("{\"error\":\"couldnt create geckotx\"}");
+        return(retstr);
+    } return(clonestr("{\"error\":\"need symbol and chain and BTCD to create new gecko tx\"}"));
+}
+
+HASH_ARRAY_STRING(basilisk,geckoblock,hash,vals,hexstr)
+{
+    return(clonestr("{\"error\":\"geckoblock is an internal reporting function\"}"));
+}
+
+HASH_ARRAY_STRING(basilisk,geckoheaders,hash,vals,hexstr)
+{
+    return(clonestr("{\"error\":\"geckoheaders is an internal reporting function\"}"));
+}
+
+HASH_ARRAY_STRING(basilisk,geckoget,hash,vals,hexstr)
+{
+    struct iguana_info *btcd,*virt; char *symbol;
+    if ( (btcd= iguana_coinfind("BTCD")) != 0 && (symbol= jstr(vals,"symbol")) != 0 )
+    {
+        if ( (virt= iguana_coinfind(symbol)) != 0 )
+        {
+            basilisk_wait(myinfo,virt);
+            return(basilisk_respond_geckoget(myinfo,"GET",&coin->internaladdr,remoteaddr,0,vals,0,0,hash,0));
+        } else return(clonestr("{\"error\":\"geckoget needs virtualchain\"}"));
+    }
+    return(clonestr("{\"error\":\"geckoget needs BTCD\"}"));
+}
+
+TWO_STRINGS(SuperNET,decryptjson,password,permanentfile)
+{
+    char pass[8192],fname2[1023],destfname[1024]; cJSON *retjson; bits256 wallethash,wallet2priv;
+    safecopy(pass,password,sizeof(pass));
+    safecopy(fname2,permanentfile,sizeof(fname2));
+    wallethash = wallet2priv = GENESIS_PRIVKEY;
+    if ( strlen(pass) == sizeof(wallethash)*2 && is_hexstr(pass,(int32_t)sizeof(bits256)*2) > 0 )
+        wallethash = bits256_conv(pass);
+    if ( strlen(fname2) == sizeof(wallet2priv)*2 && is_hexstr(fname2,(int32_t)sizeof(bits256)*2) > 0 )
+        wallet2priv = bits256_conv(fname2);
+    if ( (retjson= SuperNET_decryptedjson(destfname,pass,sizeof(pass),wallethash,fname2,sizeof(fname2),wallet2priv)) != 0 )
+    {
+        //printf("decrypt pass.(%s) fname2.(%s) -> destfname.(%s)\n",pass,fname2,destfname);
+        //obj = jduplicate(jobj(retjson,"payload"));
+        //jdelete(retjson,"payload");
+        //jadd(retjson,"result",obj);
+        return(jprint(retjson,1));
+    } else return(clonestr("{\"error\":\"couldnt decrypt json file\"}"));
+}
+
+THREE_STRINGS(SuperNET,encryptjson,password,permanentfile,payload)
+{
+    char destfname[4096],pass[8192],fname2[1023]; cJSON *argjson,*retjson = cJSON_CreateObject();
+    safecopy(pass,password,sizeof(pass));
+    safecopy(fname2,permanentfile,sizeof(fname2));
+    argjson = jduplicate(json);
+    //printf("argjson.(%s)\n",jprint(argjson,0));
+    jdelete(argjson,"agent");
+    jdelete(argjson,"method");
+    jdelete(argjson,"password");
+    jdelete(argjson,"permanentfile");
+    jdelete(argjson,"timestamp");
+    jdelete(argjson,"tag");
+    if ( _SuperNET_encryptjson(myinfo,destfname,pass,sizeof(pass),fname2,sizeof(fname2),argjson) == 0 )
+    {
+        jaddstr(retjson,"result","success");
+        jaddstr(retjson,"filename",destfname);
+    } else jaddstr(retjson,"error","couldnt encrypt json file");
+    free_json(argjson);
+    return(jprint(retjson,1));
+}
+
 
 STRING_ARG(SuperNET,addr2rmd160,address)
 {
@@ -1423,7 +1891,7 @@ ZERO_ARGS(SuperNET,logout)
 
 ZERO_ARGS(SuperNET,activehandle)
 {
-    cJSON *retjson;
+    cJSON *retjson; char BTCaddr[64],KMDaddr[64];
     if ( remoteaddr != 0 )
         return(clonestr("{\"error\":\"no remote\"}"));
     retjson = SuperNET_rosettajson(myinfo,myinfo->persistent_priv,0);
@@ -1439,6 +1907,15 @@ ZERO_ARGS(SuperNET,activehandle)
         jaddstr(retjson,"status","unlocked");
         jaddnum(retjson,"duration",myinfo->expiration - time(NULL));
     } else jaddstr(retjson,"status","locked");
+    if ( myinfo->jumblr_passphrase[0] != 0 )
+    {
+        jumblr_privkey(myinfo,BTCaddr,KMDaddr,JUMBLR_DEPOSITPREFIX);
+        jaddstr(retjson,"BTCdeposit","notyet");
+        jaddstr(retjson,"KMDdeposit",KMDaddr);
+        jumblr_privkey(myinfo,BTCaddr,KMDaddr,"");
+        jaddstr(retjson,"BTCjumblr","notyet");
+        jaddstr(retjson,"KMDjumblr",KMDaddr);
+    }
     SuperNET_MYINFOadd(myinfo);
     return(jprint(retjson,1));
 }
@@ -1566,7 +2043,7 @@ FOUR_STRINGS(SuperNET,login,handle,password,permanentfile,passphrase)
             free(str);
         myinfo->expiration = (uint32_t)(time(NULL) + 3600);
         return(SuperNET_activehandle(IGUANA_CALLARGS));
-    } else return(clonestr("{\"error\":\"need passphrase\"}"));
+    } else return(clonestr("{\"error\":\"need passphrase or wallet doesnt exist\"}"));
     return(SuperNET_activehandle(IGUANA_CALLARGS));
 }
 
@@ -1578,7 +2055,7 @@ void komodo_ICO_batch(cJSON *array,int32_t batchid)
     if ( (n= cJSON_GetArraySize(array)) > 0 )
     {
         totalKMD = totalREVS = 0;
-        for (iter=3; iter<4; iter++)
+        for (iter=0; iter<1; iter++)
         for (i=0; i<n; i++)
         {
             item = jitem(array,i);
@@ -1678,7 +2155,7 @@ void iguana_main(void *arg)
     else printf("ENDIAN ERROR\n");
     mycalloc(0,0,0);
 #ifdef __APPLE__
-    char *batchstr,*batchstr2; cJSON *batchjson; long batchsize; char fname[512],fname2[512]; int32_t batchid = 12;
+    char *batchstr,*batchstr2; cJSON *batchjson; long batchsize; char fname[512],fname2[512]; int32_t batchid = 14;
     sprintf(fname,"REVS.raw"), sprintf(fname2,"REVS.rawtxids");
     if ( (0) && (batchstr= OS_filestr(&batchsize,fname)) != 0 && (batchstr2= OS_filestr(&batchsize,fname2)) != 0 )
     {
@@ -1704,6 +2181,7 @@ void iguana_main(void *arg)
     myinfo->rpcport = IGUANA_RPCPORT;
     myinfo->dpowsock = myinfo->dexsock = myinfo->pubsock = myinfo->subsock = myinfo->reqsock = myinfo->repsock = -1;
     dex_init(myinfo);
+    myinfo->psockport = 30000;
     if ( arg != 0 )
     {
         if ( strcmp((char *)arg,"OStests") == 0 )
@@ -1730,6 +2208,7 @@ void iguana_main(void *arg)
     portable_mutex_init(&myinfo->pending_mutex);
     portable_mutex_init(&myinfo->dpowmutex);
     portable_mutex_init(&myinfo->notarymutex);
+    portable_mutex_init(&myinfo->psockmutex);
 #if LIQUIDITY_PROVIDER
     myinfo->tradingexchanges[myinfo->numexchanges++] = exchange_create(clonestr("nxtae"),0);
     myinfo->tradingexchanges[myinfo->numexchanges++] = exchange_create(clonestr("bitcoin"),0);

iguana/mini-gmp.c

@@ -4394,7 +4394,7 @@ int32_t bitcoin_base58decode(uint8_t *data,char *coinaddr)
 	//memset(data,0,be_sz);
     //for (i=0; i<count; i++)
     //    data[i+zeroes] = revdata[count - 1 - i];
-    //printf("len.%d be_sz.%d zeroes.%d data[0] %02x %02x\n",be_sz+zeroes,be_sz,zeroes,data[0],data[1]);
+    //printf(" count.%d len.%d be_sz.%d zeroes.%d data[0] %02x %02x\n",(int32_t)count,be_sz+zeroes,be_sz,zeroes,data[0],data[1]);
     mpz_clear(bn), mpz_clear(bn58);
 	return(be_sz);
 }

iguana/ramchain_api.c

@@ -13,316 +13,425 @@
  *                                                                            *
  ******************************************************************************/
 
+// deprecated
 #include "iguana777.h"
+
 #include "../includes/iguana_apidefs.h"
 #include "../includes/iguana_apideclares.h"
+#include "../includes/iguana_apideclares2.h"
+
+
+STRING_ARG(iguana,peers,activecoin)
+{
+    if ( coin != 0 )
+        return(jprint(iguana_peersjson(coin,0),1));
+    else return(clonestr("{\"error\":\"peers needs coin\"}"));
+}
 
-STRING_ARG(iguana,initfastfind,activecoin)
+STRING_ARG(iguana,getconnectioncount,activecoin)
 {
-    if ( (coin= iguana_coinfind(activecoin)) != 0 )
+    int32_t i,num = 0; char buf[512];
+    if ( coin != 0 && coin->peers != 0 )
     {
-        iguana_fastfindcreate(coin);
-        return(clonestr("{\"result\":\"fast find initialized\"}"));
-    } else return(clonestr("{\"error\":\"no coin to initialize\"}"));
+        for (i=0; i<sizeof(coin->peers->active)/sizeof(*coin->peers->active); i++)
+            if ( coin->peers->active[i].usock >= 0 )
+                num++;
+        sprintf(buf,"{\"result\":\"%d\"}",num);
+        return(clonestr(buf));
+    } else return(clonestr("{\"error\":\"getconnectioncount needs coin\"}"));
 }
 
-TWO_STRINGS_AND_TWO_DOUBLES(iguana,balance,activecoin,address,lastheightd,minconfd)
+ZERO_ARGS(bitcoinrpc,getdifficulty)
 {
-    int32_t lastheight,minconf,maxconf=1<<30; cJSON *array,*retjson = cJSON_CreateObject();
-    if ( activecoin != 0 && activecoin[0] != 0 )
-        coin = iguana_coinfind(activecoin);
+    char buf[512];
     if ( coin != 0 )
     {
-        if ( (minconf= minconfd) <= 0 )
-            minconf = 1;
-        lastheight = lastheightd;
-        jaddstr(retjson,"address",address);
-        if ( bitcoin_validaddress(coin,address) < 0 )
+        sprintf(buf,"{\"result\":\"success\",\"proof-of-work\":\"%.8f\",\"search-interval\": 0}",PoW_from_compact(coin->blocks.hwmchain.RO.bits,coin->chain->unitval));
+        return(clonestr(buf));
+    } else return(clonestr("{\"error\":\"getdifficulty needs coin\"}"));
+}
+
+STRING_ARG(iguana,addcoin,newcoin)
+{
+    char *symbol,*seedip; int32_t retval;
+    if ( (symbol= newcoin) == 0 && coin != 0 )
+        symbol = coin->symbol;
+    if ( symbol != 0 )
+    {
+        if ( (seedip= jstr(json,"seedipaddr")) != 0 )
+            safecopy(myinfo->seedipaddr,seedip,sizeof(myinfo->seedipaddr));
+        printf(">> addcoin.%s seedipaddr.%s\n",symbol,myinfo->seedipaddr);
+#ifdef __PNACL__
+        //        if ( strcmp(symbol,"BTC") == 0 )
+        //            return(clonestr("{\"result\":\"BTC for chrome app is not yet\"}"));
+#endif
+        if ( (retval= iguana_launchcoin(myinfo,symbol,json,0)) > 0 )
         {
-            jaddstr(retjson,"error","illegal address");
-            return(jprint(retjson,1));
+            if ( myinfo->rpcsymbol[0] == 0 )
+                safecopy(myinfo->rpcsymbol,symbol,sizeof(myinfo->rpcsymbol));
+            return(clonestr("{\"result\":\"coin added\"}"));
         }
-        jadd64bits(retjson,"RTbalance",iguana_RTbalance(coin,address));
-        array = cJSON_CreateArray();
-        jaddistr(array,address);
-        jadd(retjson,"unspents",iguana_RTlistunspent(myinfo,coin,array,minconf,maxconf,remoteaddr,1));
-        free_json(array);
-        if ( lastheight > 0 )
-            jaddnum(retjson,"RTheight",coin->RTheight);
-    }
-    return(jprint(retjson,1));
+        else if ( retval == 0 )
+            return(clonestr("{\"result\":\"coin already there\"}"));
+        else return(clonestr("{\"error\":\"error adding coin\"}"));
+    } else return(clonestr("{\"error\":\"addcoin needs newcoin\"}"));
 }
 
-STRING_ARG(iguana,validate,activecoin)
+STRING_ARG(iguana,startcoin,activecoin)
 {
-    int32_t i,total,validated; struct iguana_bundle *bp; cJSON *retjson;
-    if ( (coin= iguana_coinfind(activecoin)) != 0 )
+    if ( coin != 0 )
     {
-        for (i=total=validated=0; i<coin->bundlescount; i++)
-            if ( (bp= coin->bundles[i]) != 0 )
-            {
-                validated += iguana_bundlevalidate(myinfo,coin,bp,1);
-                total += bp->n;
-            }
-        retjson = cJSON_CreateObject();
-        jaddstr(retjson,"result","validation run");
-        jaddstr(retjson,"coin",coin->symbol);
-        jaddnum(retjson,"validated",validated);
-        jaddnum(retjson,"total",total);
-        jaddnum(retjson,"bundles",coin->bundlescount);
-        jaddnum(retjson,"accuracy",(double)validated/total);
-        return(jprint(retjson,1));
-    } else return(clonestr("{\"error\":\"no active coin\"}"));
+        coin->active = 1;
+        return(clonestr("{\"result\":\"coin started\"}"));
+    } else return(clonestr("{\"error\":\"startcoin needs coin\"}"));
+}
+
+STRING_ARG(iguana,stopcoin,activecoin)
+{
+    if ( activecoin[0] != 0 )
+        coin = iguana_coinfind(activecoin);
+    if ( coin != 0 )
+    {
+        coin->active = 0;
+        //iguana_coinpurge(coin);
+        return(clonestr("{\"result\":\"coin stopped\"}"));
+    } else return(clonestr("{\"error\":\"stopcoin needs coin\"}"));
 }
 
-STRING_ARG(iguana,removecoin,activecoin)
+STRING_ARG(iguana,pausecoin,activecoin)
 {
-    struct iguana_bundle *bp; int32_t i,height; char fname[1024];
-    if ( (coin= iguana_coinfind(activecoin)) != 0 )
+    if ( coin != 0 )
     {
         coin->active = 0;
-        coin->started = 0;
-        if ( (0) )
+        return(clonestr("{\"result\":\"coin paused\"}"));
+    } else return(clonestr("{\"error\":\"pausecoin needs coin\"}"));
+}
+
+TWO_STRINGS(iguana,addnode,activecoin,ipaddr)
+{
+    struct iguana_peer *addr; int32_t i,n;
+    if ( coin == 0 )
+        coin = iguana_coinfind(activecoin);
+    if ( coin != 0 && strcmp(coin->symbol,"RELAY") == 0 )
+        basilisk_addrelay_info(myinfo,0,(uint32_t)calc_ipbits(ipaddr),GENESIS_PUBKEY);
+    printf("coin.%p.[%s] addnode.%s -> %s\n",coin,coin!=0?coin->symbol:"",activecoin,ipaddr);
+    if ( coin != 0 && coin->peers != 0 && ipaddr != 0 && is_ipaddr(ipaddr) != 0 )
+    {
+        //iguana_possible_peer(coin,ipaddr);
+        if ( (addr= iguana_peerslot(coin,(uint32_t)calc_ipbits(ipaddr),1)) != 0 )
         {
-            for (i=0; i<IGUANA_MAXPEERS; i++)
+            addr->supernet = 1;
+            if ( addr->usock >= 0 )
             {
-                sprintf(fname,"%s/%s/vouts/%04d.vouts",GLOBAL_DBDIR,coin->symbol,i), OS_removefile(fname,0);
-                sprintf(fname,"%s/%s/%04d.vins",coin->VALIDATEDIR,coin->symbol,i), OS_removefile(fname,0);
-            }
-            sprintf(fname,"%s/%s/vouts/*",GLOBAL_DBDIR,coin->symbol), OS_removefile(fname,0);
-            sprintf(fname,"%s/%s/*",coin->VALIDATEDIR,coin->symbol), OS_removefile(fname,0);
-            for (i=0; i<coin->bundlescount; i++)
-            {
-                sprintf(fname,"%s/%s/balancecrc.%d",GLOBAL_DBDIR,coin->symbol,i), OS_removefile(fname,0);
-                if ( (bp= coin->bundles[i]) != 0 )
+                if ( (n= coin->peers->numranked) != 0 )
                 {
-                    iguana_bundlepurgefiles(coin,bp);
-                    iguana_bundleremove(coin,bp->hdrsi,1);
+                    for (i=0; i<n; i++)
+                    {
+                        if ( addr == coin->peers->ranked[i] )
+                            break;
+                    }
+                    if ( i == n )
+                    {
+                        if ( i == IGUANA_MAXPEERS )
+                            i--;
+                        else coin->peers->numranked = n+1;
+                        coin->peers->ranked[i] = addr;
+                        addr->recvblocks = coin->peers->ranked[0]->recvblocks + 100;
+                        addr->recvtotal = coin->peers->ranked[0]->recvtotal*1.1 + 100;
+                        printf("set (%s) -> slot.%d numranked.%d\n",ipaddr,i,coin->peers->numranked);
+                    } else printf("(%s) is already peer.%d\n",ipaddr,i);
                 }
+                return(clonestr("{\"result\":\"peer was already connected\"}"));
             }
-            for (height=0; height<coin->longestchain; height+=IGUANA_SUBDIRDIVISOR)
+            if ( addr->pending == 0 )
             {
-                sprintf(fname,"%s/%s/%d",GLOBAL_DBDIR,coin->symbol,height/IGUANA_SUBDIRDIVISOR);
-                OS_remove_directory(fname);
-            }
-            sprintf(fname,"%s/%s/*",GLOBAL_DBDIR,coin->symbol), OS_remove_directory(fname);
-        }
-        return(clonestr("{\"result\":\"success\"}"));
+                addr->pending = (uint32_t)time(NULL);
+                iguana_launch(coin,"connection",iguana_startconnection,addr,IGUANA_CONNTHREAD);
+                return(clonestr("{\"result\":\"addnode submitted\"}"));
+            } else return(clonestr("{\"result\":\"addnode connection was already pending\"}"));
+        } else return(clonestr("{\"result\":\"addnode cant find peer slot\"}"));
     }
-    return(clonestr("{\"error\":\"no active coin\"}"));
+    else if ( coin == 0 )
+        return(clonestr("{\"error\":\"addnode needs active coin, do an addcoin first\"}"));
+    else return(clonestr("{\"error\":\"addnode needs ipaddr\"}"));
 }
 
-INT_ARG(bitcoinrpc,getblockhash,height)
+TWO_STRINGS(iguana,persistent,activecoin,ipaddr)
 {
-    cJSON *retjson;
-    if ( coin->notarychain >= 0 && coin->FULLNODE == 0 )
-        return(_dex_getblockhash(myinfo,coin->symbol,height));
-    retjson = cJSON_CreateObject();
-    jaddbits256(retjson,"result",iguana_blockhash(coin,height));
-    return(jprint(retjson,1));
+    int32_t i;
+    if ( coin != 0 && coin->peers != 0 && ipaddr != 0 )
+    {
+        for (i=0; i<IGUANA_MAXPEERS; i++)
+        {
+            if ( strcmp(coin->peers->active[i].ipaddr,ipaddr) == 0 )
+            {
+                coin->peers->active[i].persistent_peer = juint(json,"interval")+3;
+                return(clonestr("{\"result\":\"node marked as persistent\"}"));
+            }
+        }
+        return(clonestr("{\"result\":\"node wasnt active\"}"));
+    } else return(clonestr("{\"error\":\"persistent needs coin and ipaddr\"}"));
 }
 
-HASH_AND_TWOINTS(bitcoinrpc,getblock,blockhash,verbose,remoteonly)
+TWO_STRINGS(iguana,removenode,activecoin,ipaddr)
 {
-    char *blockstr,*datastr; struct iguana_msgblock msg; struct iguana_block *block; cJSON *retjson; bits256 txid; int32_t len;
-    if ( coin->notarychain >= 0 && coin->FULLNODE == 0 )
-        return(_dex_getblock(myinfo,coin->symbol,blockhash));
-    retjson = cJSON_CreateObject();
-    memset(&msg,0,sizeof(msg));
-    if ( remoteonly == 0 && (block= iguana_blockfind("getblockRPC",coin,blockhash)) != 0 )
+    int32_t i;
+    if ( coin != 0 && coin->peers != 0 && ipaddr != 0 )
     {
-        if ( verbose != 0 )
-            return(jprint(iguana_blockjson(myinfo,coin,block,1),1));
-        else
+        for (i=0; i<IGUANA_MAXPEERS; i++)
         {
-            if ( (len= iguana_peerblockrequest(myinfo,coin,coin->blockspace,coin->blockspacesize,0,blockhash,0)) > 0 )
+            if ( strcmp(coin->peers->active[i].ipaddr,ipaddr) == 0 )
             {
-                datastr = malloc(len*2 + 1);
-                init_hexbytes_noT(datastr,coin->blockspace,len);
-                jaddstr(retjson,"result",datastr);
-                free(datastr);
-                return(jprint(retjson,1));
+                coin->peers->active[i].rank = 0;
+                coin->peers->active[i].dead = (uint32_t)time(NULL);
+                return(clonestr("{\"result\":\"node marked as dead\"}"));
             }
-            jaddstr(retjson,"error","error getting rawblock");
         }
-    }
-    else if ( coin->APIblockstr != 0 )
-        jaddstr(retjson,"error","already have pending request");
-    else
-    {
-        memset(txid.bytes,0,sizeof(txid));
-        if ( (blockstr= iguana_APIrequest(coin,blockhash,txid,5)) != 0 )
-        {
-            jaddstr(retjson,"result",blockstr);
-            free(blockstr);
-        } else jaddstr(retjson,"error","cant find blockhash");
-    }
-    return(jprint(retjson,1));
+        return(clonestr("{\"result\":\"node wasnt active\"}"));
+    } else return(clonestr("{\"error\":\"removenode needs coin and ipaddr\"}"));
 }
 
-ZERO_ARGS(bitcoinrpc,getbestblockhash)
+TWO_STRINGS(iguana,oneshot,activecoin,ipaddr)
 {
-    cJSON *retjson;
-    if ( coin->notarychain >= 0 && coin->FULLNODE == 0 )
-        return(_dex_getbestblockhash(myinfo,coin->symbol));
-    retjson = cJSON_CreateObject();
-    char str[65]; jaddstr(retjson,"result",bits256_str(str,coin->blocks.hwmchain.RO.hash2));
-    return(jprint(retjson,1));
+    if ( coin != 0 && ipaddr != 0 )
+    {
+        iguana_possible_peer(coin,ipaddr);
+        return(clonestr("{\"result\":\"addnode submitted\"}"));
+    } else return(clonestr("{\"error\":\"addnode needs coin and ipaddr\"}"));
 }
 
-ZERO_ARGS(bitcoinrpc,getblockcount)
+cJSON *iguana_peerjson(struct iguana_info *coin,struct iguana_peer *addr)
 {
-    cJSON *retjson = cJSON_CreateObject();
-    //printf("result %d\n",coin->blocks.hwmchain.height);
-    jaddnum(retjson,"result",coin->blocks.hwmchain.height);
-    return(jprint(retjson,1));
+    cJSON *array,*json = cJSON_CreateObject();
+    jaddstr(json,"ipaddr",addr->ipaddr);
+    if ( addr->supernet != 0 )
+        jaddstr(json,"ipaddr",addr->ipaddr);
+    jaddstr(json,"supernet","yes");
+    jaddnum(json,"protover",addr->protover);
+    jaddnum(json,"relay",addr->relayflag);
+    jaddnum(json,"height",addr->height);
+    jaddnum(json,"rank",addr->rank);
+    jaddnum(json,"usock",addr->usock);
+    if ( addr->dead != 0 )
+        jaddnum(json,"dead",addr->dead);
+    jaddnum(json,"ready",addr->ready);
+    jaddnum(json,"recvblocks",addr->recvblocks);
+    jaddnum(json,"recvtotal",addr->recvtotal);
+    jaddnum(json,"lastcontact",addr->lastcontact);
+    if ( addr->numpings > 0 )
+        jaddnum(json,"aveping",addr->pingsum/addr->numpings);
+    array = cJSON_CreateObject();
+    jaddnum(array,"version",addr->msgcounts.version);
+    jaddnum(array,"verack",addr->msgcounts.verack);
+    jaddnum(array,"getaddr",addr->msgcounts.getaddr);
+    jaddnum(array,"addr",addr->msgcounts.addr);
+    jaddnum(array,"inv",addr->msgcounts.inv);
+    jaddnum(array,"getdata",addr->msgcounts.getdata);
+    jaddnum(array,"notfound",addr->msgcounts.notfound);
+    jaddnum(array,"getblocks",addr->msgcounts.getblocks);
+    jaddnum(array,"getheaders",addr->msgcounts.getheaders);
+    jaddnum(array,"headers",addr->msgcounts.headers);
+    jaddnum(array,"tx",addr->msgcounts.tx);
+    jaddnum(array,"block",addr->msgcounts.block);
+    jaddnum(array,"mempool",addr->msgcounts.mempool);
+    jaddnum(array,"ping",addr->msgcounts.ping);
+    jaddnum(array,"pong",addr->msgcounts.pong);
+    jaddnum(array,"reject",addr->msgcounts.reject);
+    jaddnum(array,"filterload",addr->msgcounts.filterload);
+    jaddnum(array,"filteradd",addr->msgcounts.filteradd);
+    jaddnum(array,"filterclear",addr->msgcounts.filterclear);
+    jaddnum(array,"merkleblock",addr->msgcounts.merkleblock);
+    jaddnum(array,"alert",addr->msgcounts.alert);
+    jadd(json,"msgcounts",array);
+    return(json);
 }
 
-STRING_AND_INT(iguana,bundleaddresses,activecoin,height)
+cJSON *iguana_peersjson(struct iguana_info *coin,int32_t addronly)
 {
-    struct iguana_info *ptr;
-    if ( (ptr= iguana_coinfind(activecoin)) != 0 )
-        return(iguana_bundleaddrs(ptr,height / coin->chain->bundlesize));
-    else return(clonestr("{\"error\":\"activecoin is not active\"}"));
+    cJSON *retjson,*array; int32_t i; struct iguana_peer *addr;
+    if ( coin == 0 || coin->peers == 0 )
+        return(0);
+    array = cJSON_CreateArray();
+    for (i=0; i<coin->MAXPEERS; i++)
+    {
+        addr = &coin->peers->active[i];
+        if ( addr->usock >= 0 && addr->ipbits != 0 && addr->ipaddr[0] != 0 )
+        {
+            if ( addronly != 0 )
+                jaddistr(array,addr->ipaddr);
+            else jaddi(array,iguana_peerjson(coin,addr));
+        }
+    }
+    if ( addronly == 0 )
+    {
+        retjson = cJSON_CreateObject();
+        jadd(retjson,"peers",array);
+        jaddnum(retjson,"maxpeers",coin->MAXPEERS);
+        jaddstr(retjson,"coin",coin->symbol);
+        return(retjson);
+    }
+    else return(array);
 }
 
-STRING_AND_INT(iguana,PoSweights,activecoin,height)
+TWO_STRINGS(iguana,nodestatus,activecoin,ipaddr)
 {
-    struct iguana_info *ptr; int32_t num,nonz,errs,bundleheight; struct iguana_pkhash *refP; uint64_t *weights,supply; cJSON *retjson;
-    if ( (ptr= iguana_coinfind(activecoin)) != 0 )
+    int32_t i; struct iguana_peer *addr;
+    if ( coin != 0 && coin->peers != 0 && ipaddr != 0 )
     {
-        //for (bundleheight=coin->chain->bundlesize; bundleheight<height; bundleheight+=coin->chain->bundlesize)
+        for (i=0; i<coin->MAXPEERS; i++)
         {
-            bundleheight = (height / ptr->chain->bundlesize) * ptr->chain->bundlesize;
-            if ( (weights= iguana_PoS_weights(myinfo,ptr,&refP,&supply,&num,&nonz,&errs,bundleheight)) != 0 )
-            {
-                retjson = cJSON_CreateObject();
-                jaddstr(retjson,"result",errs == 0 ? "success" : "error");
-                jaddnum(retjson,"bundleheight",bundleheight);
-                jaddnum(retjson,"numaddresses",num);
-                jaddnum(retjson,"nonzero",nonz);
-                jaddnum(retjson,"errors",errs);
-                jaddnum(retjson,"supply",dstr(supply));
-                free(weights);
-                return(jprint(retjson,1));
-            } else return(clonestr("{\"error\":\"iguana_PoS_weights returned null\"}"));
+            addr = &coin->peers->active[i];
+            if ( strcmp(addr->ipaddr,ipaddr) == 0 )
+                return(jprint(iguana_peerjson(coin,addr),1));
         }
-    }
-    return(clonestr("{\"error\":\"activecoin is not active\"}"));
+        return(clonestr("{\"result\":\"nodestatus couldnt find ipaddr\"}"));
+    } else return(clonestr("{\"error\":\"nodestatus needs ipaddr\"}"));
 }
 
-STRING_ARG(iguana,stakers,activecoin)
+STRING_AND_INT(iguana,maxpeers,activecoin,max)
 {
-    struct iguana_info *ptr; int32_t i,datalen,pkind,hdrsi; bits256 hash2; struct iguana_bundle *bp; cJSON *retjson,*array; struct iguana_pkhash *refP; struct iguana_ramchaindata *rdata; char coinaddr[64]; uint8_t refrmd160[20]; bits256 *sortbuf;
-    if ( (ptr= iguana_coinfind(activecoin)) != 0 && ptr->RTheight > ptr->chain->bundlesize )
+    cJSON *retjson; int32_t i; struct iguana_peer *addr;
+    if ( coin != 0 && coin->peers != 0 )
     {
-        hdrsi = (ptr->RTheight / ptr->chain->bundlesize) - 1;
-        if ( (bp= ptr->bundles[hdrsi]) != 0 && bp->weights != 0 && (rdata= bp->ramchain.H.data) != 0 && bp->weights != 0 )
+        retjson = cJSON_CreateObject();
+        if ( max > IGUANA_MAXPEERS )
+            max = IGUANA_MAXPEERS;
+        if ( max > coin->MAXPEERS )
         {
-            sortbuf = calloc(bp->numweights,2 * sizeof(*sortbuf));
-            for (i=datalen=0; i<bp->numweights; i++)
-                datalen += iguana_rwnum(1,&((uint8_t *)sortbuf)[datalen],sizeof(bp->weights[i]),(void *)&bp->weights[i]);
-            hash2 = bits256_doublesha256(0,(uint8_t *)sortbuf,datalen);
-            refP = RAMCHAIN_PTR(rdata,Poffset);
-            retjson = cJSON_CreateObject();
-            array = cJSON_CreateArray();
-            memset(refrmd160,0,sizeof(refrmd160));
-            for (i=0; i<ptr->chain->bundlesize; i++)
-            {
-                if ( (pkind= iguana_staker_sort(ptr,&hash2,refrmd160,refP,bp->weights,bp->numweights,sortbuf)) > 0 )
-                {
-                    bitcoin_address(coinaddr,ptr->chain->pubtype,refP[pkind].rmd160,sizeof(refP[pkind].rmd160));
-                    jaddistr(array,coinaddr);
-                } else jaddistr(array,"error");
-            }
-            jaddstr(retjson,"result","success");
-            jadd(retjson,"stakers",array);
-            return(jprint(retjson,1));
-        } else return(clonestr("{\"error\":\"iguana_stakers needs PoSweights and weights\"}"));
-    }
-    return(clonestr("{\"error\":\"activecoin is not active\"}"));
+            for (i=max; i<coin->MAXPEERS; i++)
+                if ( (addr= coin->peers->ranked[i]) != 0 )
+                    addr->dead = 1;
+        }
+        coin->MAXPEERS = max;
+        jaddnum(retjson,"maxpeers",coin->MAXPEERS);
+        jaddstr(retjson,"coin",coin->symbol);
+        return(jprint(retjson,1));
+    } else return(clonestr("{\"error\":\"maxpeers needs coin\"}"));
 }
 
-STRING_AND_INT(iguana,bundlehashes,activecoin,height)
+char *hmac_dispatch(char *(*hmacfunc)(char *dest,char *key,int32_t key_size,char *message),char *name,char *message,char *password)
 {
-    struct iguana_info *ptr; struct iguana_bundle *bp; int32_t i,hdrsi; cJSON *retjson,*array; struct iguana_ramchaindata *rdata;
-    if ( (ptr= iguana_coinfind(activecoin)) != 0 )
+    char hexstr[1025]; cJSON *json;
+    if ( message != 0 && password != 0 && message[0] != 0 && password[0] != 0 )
     {
-        hdrsi = height / coin->chain->bundlesize;
-        if ( hdrsi < coin->bundlescount && hdrsi >= 0 && (bp= coin->bundles[hdrsi]) != 0 )
-        {
-            if ( (rdata= bp->ramchain.H.data) != 0 )
-            {
-                array = cJSON_CreateArray();
-                for (i=0; i<IGUANA_NUMLHASHES; i++)
-                    jaddinum(array,rdata->lhashes[i].txid);
-                retjson = cJSON_CreateObject();
-                jaddstr(retjson,"result","success");
-                jaddbits256(retjson,"sha256",rdata->sha256);
-                jadd(retjson,"bundlehashes",array);
-                return(jprint(retjson,1));
-            } else return(clonestr("{\"error\":\"ramchain not there\"}"));
-        } else return(clonestr("{\"error\":\"height is too big\"}"));
-    } else return(clonestr("{\"error\":\"activecoin is not active\"}"));
+        memset(hexstr,0,sizeof(hexstr));
+        (*hmacfunc)(hexstr,password,password==0?0:(int32_t)strlen(password),message);
+        json = cJSON_CreateObject();
+        jaddstr(json,"result","hmac calculated");
+        jaddstr(json,"message",message);
+        jaddstr(json,name,hexstr);
+        return(jprint(json,1));
+    } else return(clonestr("{\"error\":\"hmac needs message and passphrase\"}"));
 }
 
-// low priority RPC
+char *hash_dispatch(void (*hashfunc)(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len),char *name,char *message)
+{
+    char hexstr[65537]; uint8_t databuf[32768]; cJSON *json;
+    if ( message != 0 && message[0] != 0 )
+    {
+        memset(hexstr,0,sizeof(hexstr));
+        (*hashfunc)(hexstr,databuf,(uint8_t *)message,(int32_t)strlen(message));
+        json = cJSON_CreateObject();
+        jaddstr(json,"result","hash calculated");
+        jaddstr(json,"message",message);
+        jaddstr(json,name,hexstr);
+        return(jprint(json,1));
+    } else return(clonestr("{\"error\":\"hash needs message\"}"));
+}
 
-HASH_AND_TWOINTS(bitcoinrpc,listsinceblock,blockhash,target,flag)
+TWO_HASHES(hash,curve25519_pair,element,scalar)
 {
-    /*"transactions" : [
-     {
-     "account" : "doc test",
-     "address" : "mmXgiR6KAhZCyQ8ndr2BCfEq1wNG2UnyG6",
-     "category" : "receive",
-     "amount" : 0.10000000,
-     "vout" : 0,
-     "confirmations" : 76478,
-     "blockhash" : "000000000017c84015f254498c62a7c884a51ccd75d4dd6dbdcb6434aa3bd44d",
-     "blockindex" : 1,
-     "blocktime" : 1399294967,
-     "txid" : "85a98fdf1529f7d5156483ad020a51b7f3340e47448cf932f470b72ff01a6821",
-     "walletconflicts" : [
-     ],
-     "time" : 1399294967,
-     "timereceived" : 1418924714
-     },*/
     cJSON *retjson = cJSON_CreateObject();
-    jaddstr(retjson,"error","low priority RPC not implemented");
+    jaddbits256(retjson,"result",curve25519(element,scalar));
     return(jprint(retjson,1));
 }
 
-ZERO_ARGS(bitcoinrpc,gettxoutsetinfo)
+STRING_ARG(hash,NXT,passphrase) { return(hash_dispatch(calc_NXTaddr,"NXT",passphrase)); }
+STRING_ARG(hash,curve25519,pubkey) { return(hash_dispatch(calc_curve25519_str,"curve25519",pubkey)); }
+STRING_ARG(hash,crc32,message) { return(hash_dispatch(calc_crc32str,"crc32",message)); }
+STRING_ARG(hash,base64_encode,message) { return(hash_dispatch(calc_base64_encodestr,"base64_encode",message)); }
+STRING_ARG(hash,base64_decode,message) { return(hash_dispatch(calc_base64_decodestr,"base64_decode",message)); }
+STRING_ARG(hash,rmd160_sha256,message) { return(hash_dispatch(rmd160ofsha256,"rmd160_sha256",message)); }
+STRING_ARG(hash,sha256_sha256,message) { return(hash_dispatch(sha256_sha256,"sha256_sha256",message)); }
+STRING_ARG(hash,hex,message) { return(hash_dispatch(calc_hexstr,"hex",message)); }
+STRING_ARG(hash,unhex,message) { return(hash_dispatch(calc_unhexstr,"unhex",message)); }
+
+STRING_ARG(hash,sha224,message) { return(hash_dispatch(calc_sha224,"sha224",message)); }
+STRING_ARG(hash,sha256,message) { return(hash_dispatch(vcalc_sha256,"sha256",message)); }
+STRING_ARG(hash,sha384,message) { return(hash_dispatch(calc_sha384,"sha384",message)); }
+STRING_ARG(hash,sha512,message) { return(hash_dispatch(calc_sha512,"sha512",message)); }
+STRING_ARG(hash,rmd128,message) { return(hash_dispatch(calc_rmd128,"rmd128",message)); }
+STRING_ARG(hash,rmd160,message) { return(hash_dispatch(calc_rmd160,"rmd160",message)); }
+STRING_ARG(hash,rmd256,message) { return(hash_dispatch(calc_rmd256,"rmd256",message)); }
+STRING_ARG(hash,rmd320,message) { return(hash_dispatch(calc_rmd320,"rmd320",message)); }
+STRING_ARG(hash,sha1,message) { return(hash_dispatch(calc_sha1,"sha1",message)); }
+STRING_ARG(hash,md2,message) { return(hash_dispatch(calc_md2str,"md2",message)); }
+STRING_ARG(hash,md4,message) { return(hash_dispatch(calc_md4str,"md4",message)); }
+STRING_ARG(hash,md5,message) { return(hash_dispatch(calc_md5str,"md5",message)); }
+STRING_ARG(hash,tiger192_3,message) { return(hash_dispatch(calc_tiger,"tiger",message)); }
+STRING_ARG(hash,whirlpool,message) { return(hash_dispatch(calc_whirlpool,"whirlpool",message)); }
+TWO_STRINGS(hmac,sha224,message,passphrase) { return(hmac_dispatch(hmac_sha224_str,"sha224",message,passphrase)); }
+TWO_STRINGS(hmac,sha256,message,passphrase) { return(hmac_dispatch(hmac_sha256_str,"sha256",message,passphrase)); }
+TWO_STRINGS(hmac,sha384,message,passphrase) { return(hmac_dispatch(hmac_sha384_str,"sha384",message,passphrase)); }
+TWO_STRINGS(hmac,sha512,message,passphrase) { return(hmac_dispatch(hmac_sha512_str,"sha512",message,passphrase)); }
+TWO_STRINGS(hmac,rmd128,message,passphrase) { return(hmac_dispatch(hmac_rmd128_str,"rmd128",message,passphrase)); }
+TWO_STRINGS(hmac,rmd160,message,passphrase) { return(hmac_dispatch(hmac_rmd160_str,"rmd160",message,passphrase)); }
+TWO_STRINGS(hmac,rmd256,message,passphrase) { return(hmac_dispatch(hmac_rmd256_str,"rmd256",message,passphrase)); }
+TWO_STRINGS(hmac,rmd320,message,passphrase) { return(hmac_dispatch(hmac_rmd320_str,"rmd320",message,passphrase)); }
+TWO_STRINGS(hmac,sha1,message,passphrase) { return(hmac_dispatch(hmac_sha1_str,"sha1",message,passphrase)); }
+TWO_STRINGS(hmac,md2,message,passphrase) { return(hmac_dispatch(hmac_md2_str,"md2",message,passphrase)); }
+TWO_STRINGS(hmac,md4,message,passphrase) { return(hmac_dispatch(hmac_md4_str,"md4",message,passphrase)); }
+TWO_STRINGS(hmac,md5,message,passphrase) { return(hmac_dispatch(hmac_md5_str,"md5",message,passphrase)); }
+TWO_STRINGS(hmac,tiger192_3,message,passphrase) { return(hmac_dispatch(hmac_tiger_str,"tiger",message,passphrase)); }
+TWO_STRINGS(hmac,whirlpool,message,passphrase) { return(hmac_dispatch(hmac_whirlpool_str,"whirlpool",message,passphrase)); }
+
+STRING_ARG(SuperNET,bitcoinrpc,setcoin)
 {
-    cJSON *retjson = cJSON_CreateObject();
-    jaddstr(retjson,"error","low priority RPC not implemented");
-    return(jprint(retjson,1));
+    char buf[1024];
+    if ( setcoin != 0 && setcoin[0] != 0 )
+    {
+        strcpy(myinfo->rpcsymbol,setcoin);
+        touppercase(myinfo->rpcsymbol);
+        printf("bitcoinrpc.%s\n",myinfo->rpcsymbol);
+        if ( iguana_launchcoin(myinfo,myinfo->rpcsymbol,json,0) < 0 )
+            return(clonestr("{\"error\":\"error creating coin\"}"));
+        else
+        {
+            sprintf(buf,"{\"result\":\"success\",\"setcoin\":\"%s\"}",setcoin);
+            return(clonestr(buf));
+        }
+    } else return(clonestr("{\"error\":\"bitcoinrpc needs setcoin value\"}"));
 }
 
-ZERO_ARGS(bitcoinrpc,listaddressgroupings)
+ZERO_ARGS(SuperNET,help)
 {
-    if ( remoteaddr != 0 )
-        return(clonestr("{\"error\":\"no remote\"}"));
-    return(clonestr("{\"error\":\"low priority RPC not implemented\"}"));
+    cJSON *helpjson,*retjson;
+    if ( (helpjson= SuperNET_helpjson()) != 0 )
+    {
+        retjson = cJSON_CreateObject();
+        jadd(retjson,"result",helpjson);
+        return(jprint(retjson,1));
+    } else return(clonestr("{\"error\":\"cant get helpjson\"}"));
 }
 
-SS_D_I_S(bitcoinrpc,move,fromaccount,toaccount,amount,minconf,comment)
+TWO_STRINGS(SuperNET,html,agentform,htmlfile)
 {
-    cJSON *retjson;
-    if ( remoteaddr != 0 )
-        return(clonestr("{\"error\":\"no remote\"}"));
-    if ( myinfo->expiration == 0 )
-        return(clonestr("{\"error\":\"need to unlock wallet\"}"));
+    char *htmlstr; cJSON *retjson; int32_t max = 4*1024*1024;
+    if ( htmlfile == 0 || htmlfile[0] == 0 )
+        htmlfile = "forms.html";
+    //if ( (fp= fopen(htmlfile,"w")) == 0 )
+    //    printf("error opening htmlfile.(%s)\n",htmlfile);
+    htmlstr = malloc(max);
+    htmlstr = SuperNET_htmlstr(htmlfile,htmlstr,max,agentform);
     retjson = cJSON_CreateObject();
+    jaddstr(retjson,"result",htmlstr);
+    free(htmlstr);
+    //if ( fp != 0 )
+    //    fclose(fp);
     return(jprint(retjson,1));
 }
 
-ZERO_ARGS(pax,start)
-{
-    void PAX_init();
-    PAX_init();
-    return(clonestr("{\"result\":\"PAX_init called\"}"));
-}
 #undef IGUANA_ARGS
+#undef _IGUANA_APIDEC_H_
 #include "../includes/iguana_apiundefs.h"
 

iguana/tests/DEXinit

@@ -0,0 +1,2 @@
+#!/bin/bash
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"InstantDEX\",\"method\":\"init\"}"

iguana/tests/KMD.batch12

@@ -0,0 +1,141 @@
+# RDTjem9CP97XPXvet1sQBb428xrmSZJSsd KMD 1568.45531762, REVS 31.12033224
+# RDTjem9CP97XPXvet1sQBb428xrmSZJSsd KMD 1568.45531762
+./komodo-cli sendtoaddress RDTjem9CP97XPXvet1sQBb428xrmSZJSsd 1568.45531762
+sleep 3
+echo  "1568.45531762 <- expected amount RDTjem9CP97XPXvet1sQBb428xrmSZJSsd"
+
+# RAvtq1kazCRZUvWvPsN7ioY2Vt1EYtgpuz KMD 73430.96919475
+./komodo-cli sendtoaddress RAvtq1kazCRZUvWvPsN7ioY2Vt1EYtgpuz 73430.96919475
+sleep 3
+echo  "73430.96919475 <- expected amount RAvtq1kazCRZUvWvPsN7ioY2Vt1EYtgpuz"
+
+# RWxT4Jfwp1Bv6RYdUMdrQ6oXt6dMsQZ8jE KMD 5689.04575312
+./komodo-cli sendtoaddress RWxT4Jfwp1Bv6RYdUMdrQ6oXt6dMsQZ8jE 5689.04575312
+sleep 3
+echo  "5689.04575312 <- expected amount RWxT4Jfwp1Bv6RYdUMdrQ6oXt6dMsQZ8jE"
+
+# RXQxetCQScefabaJaFyqCJ1FvfNwsKtvMT KMD 17817.00058850
+./komodo-cli sendtoaddress RXQxetCQScefabaJaFyqCJ1FvfNwsKtvMT 17817.00058850
+sleep 3
+echo  "17817.00058850 <- expected amount RXQxetCQScefabaJaFyqCJ1FvfNwsKtvMT"
+
+# RPqAFgwnB1hjae6Ar4Kms973uS93HbDkoB KMD 202518.10752377
+./komodo-cli sendtoaddress RPqAFgwnB1hjae6Ar4Kms973uS93HbDkoB 202518.10752377
+sleep 3
+echo  "202518.10752377 <- expected amount RPqAFgwnB1hjae6Ar4Kms973uS93HbDkoB"
+
+# RH4SXj2zZqfG4TfejyHcVpaoPoDv1Uonnf KMD 6963.60677351
+./komodo-cli sendtoaddress RH4SXj2zZqfG4TfejyHcVpaoPoDv1Uonnf 6963.60677351
+sleep 3
+echo  "6963.60677351 <- expected amount RH4SXj2zZqfG4TfejyHcVpaoPoDv1Uonnf"
+
+# RXyXDkiMmU8jdnCuyCrZHqWthU4kp9PUhv KMD 32042.52085087
+./komodo-cli sendtoaddress RXyXDkiMmU8jdnCuyCrZHqWthU4kp9PUhv 32042.52085087
+sleep 3
+echo  "32042.52085087 <- expected amount RXyXDkiMmU8jdnCuyCrZHqWthU4kp9PUhv"
+
+# RWTfFTP7c9WxLhgxd2EXSsKszpDVPXHN8A KMD 2135.12309659
+./komodo-cli sendtoaddress RWTfFTP7c9WxLhgxd2EXSsKszpDVPXHN8A 2135.12309659
+sleep 3
+echo  "2135.12309659 <- expected amount RWTfFTP7c9WxLhgxd2EXSsKszpDVPXHN8A"
+
+# RAGhCfNvxpL55JFV7h2HQa5dSEK86Jg3ic KMD 5533.00461690
+./komodo-cli sendtoaddress RAGhCfNvxpL55JFV7h2HQa5dSEK86Jg3ic 5533.00461690
+sleep 3
+echo  "5533.00461690 <- expected amount RAGhCfNvxpL55JFV7h2HQa5dSEK86Jg3ic"
+
+# RDoLVY35wbzTXZ9QgFRSAzHfAiYYG7e65i KMD 50.26846585
+./komodo-cli sendtoaddress RDoLVY35wbzTXZ9QgFRSAzHfAiYYG7e65i 50.26846585
+sleep 3
+echo  "50.26846585 <- expected amount RDoLVY35wbzTXZ9QgFRSAzHfAiYYG7e65i"
+
+# RMHZ76hvxs8n2yDnkUa122rs5gubMxhiw7 KMD 1733.05190072
+./komodo-cli sendtoaddress RMHZ76hvxs8n2yDnkUa122rs5gubMxhiw7 1733.05190072
+sleep 3
+echo  "1733.05190072 <- expected amount RMHZ76hvxs8n2yDnkUa122rs5gubMxhiw7"
+
+# RHmVdfQM3PbJayYGbYnGtsqiWD9gDt2n4y KMD 11852.83167290, REVS 139.09398517
+# RHmVdfQM3PbJayYGbYnGtsqiWD9gDt2n4y KMD 11852.83167290
+./komodo-cli sendtoaddress RHmVdfQM3PbJayYGbYnGtsqiWD9gDt2n4y 11852.83167290
+sleep 3
+echo  "11852.83167290 <- expected amount RHmVdfQM3PbJayYGbYnGtsqiWD9gDt2n4y"
+
+# RH9CANWQNvqSktmX39ruDfiNFimcToD2ur KMD 43125.33019700
+./komodo-cli sendtoaddress RH9CANWQNvqSktmX39ruDfiNFimcToD2ur 43125.33019700
+sleep 3
+echo  "43125.33019700 <- expected amount RH9CANWQNvqSktmX39ruDfiNFimcToD2ur"
+
+# RSp4ceoTDQt7fbweFBpEbvbTTH8J9SEp4b KMD 36837.09249870
+./komodo-cli sendtoaddress RSp4ceoTDQt7fbweFBpEbvbTTH8J9SEp4b 36837.09249870
+sleep 3
+echo  "36837.09249870 <- expected amount RSp4ceoTDQt7fbweFBpEbvbTTH8J9SEp4b"
+
+# RUbMmLRMeSf2xnBHspdzS2JC3e8epKmoM8 KMD 3016.26045526, REVS 59.85500000
+# RUbMmLRMeSf2xnBHspdzS2JC3e8epKmoM8 KMD 3016.26045526
+./komodo-cli sendtoaddress RUbMmLRMeSf2xnBHspdzS2JC3e8epKmoM8 3016.26045526
+sleep 3
+echo  "3016.26045526 <- expected amount RUbMmLRMeSf2xnBHspdzS2JC3e8epKmoM8"
+
+# RLWvbjH97gqjGXsRyPijDmwuKNFqsaaerb KMD 91240.39653929
+./komodo-cli sendtoaddress RLWvbjH97gqjGXsRyPijDmwuKNFqsaaerb 91240.39653929
+sleep 3
+echo  "91240.39653929 <- expected amount RLWvbjH97gqjGXsRyPijDmwuKNFqsaaerb"
+
+# RGoB4uxdk2SDs5yCerizsQ3UFD7NqJjury KMD 2440.00507548
+./komodo-cli sendtoaddress RGoB4uxdk2SDs5yCerizsQ3UFD7NqJjury 2440.00507548
+sleep 3
+echo  "2440.00507548 <- expected amount RGoB4uxdk2SDs5yCerizsQ3UFD7NqJjury"
+
+# RXQBgNYtszvmdwniLu1nteS9MX1xD75bNX KMD 3823.81289934, REVS 75.88015839
+# RXQBgNYtszvmdwniLu1nteS9MX1xD75bNX KMD 3823.81289934
+./komodo-cli sendtoaddress RXQBgNYtszvmdwniLu1nteS9MX1xD75bNX 3823.81289934
+sleep 3
+echo  "3823.81289934 <- expected amount RXQBgNYtszvmdwniLu1nteS9MX1xD75bNX"
+
+# RLyaf3XgjHruSeJd4oj83E8btck7kYPmVz KMD 2772.48246697
+./komodo-cli sendtoaddress RLyaf3XgjHruSeJd4oj83E8btck7kYPmVz 2772.48246697
+sleep 3
+echo  "2772.48246697 <- expected amount RLyaf3XgjHruSeJd4oj83E8btck7kYPmVz"
+
+# RHJ55iWUQNbKcSn8shbv1RbGuip3RSRHFv KMD 693.08132289
+./komodo-cli sendtoaddress RHJ55iWUQNbKcSn8shbv1RbGuip3RSRHFv 693.08132289
+sleep 3
+echo  "693.08132289 <- expected amount RHJ55iWUQNbKcSn8shbv1RbGuip3RSRHFv"
+
+# RQgfzPR4zeCyLWaddHysGEVzoKLZa5E4Ut KMD 10316.17621736
+./komodo-cli sendtoaddress RQgfzPR4zeCyLWaddHysGEVzoKLZa5E4Ut 10316.17621736
+sleep 3
+echo  "10316.17621736 <- expected amount RQgfzPR4zeCyLWaddHysGEVzoKLZa5E4Ut"
+
+# RAGGPNoZgxAj6ABBTwehQfVYEa1PEN4qZW KMD 29566.93551966
+./komodo-cli sendtoaddress RAGGPNoZgxAj6ABBTwehQfVYEa1PEN4qZW 29566.93551966
+sleep 3
+echo  "29566.93551966 <- expected amount RAGGPNoZgxAj6ABBTwehQfVYEa1PEN4qZW"
+
+# RNQzdseaqPikT6Df2ECFQXxW4yUr4fahqX KMD 19365.33667225
+./komodo-cli sendtoaddress RNQzdseaqPikT6Df2ECFQXxW4yUr4fahqX 19365.33667225
+sleep 3
+echo  "19365.33667225 <- expected amount RNQzdseaqPikT6Df2ECFQXxW4yUr4fahqX"
+
+# R9PwsNzuksjJzZUAAX4yfDwdSy5Y4KP25X KMD 55229.13842423
+./komodo-cli sendtoaddress R9PwsNzuksjJzZUAAX4yfDwdSy5Y4KP25X 55229.13842423
+sleep 3
+echo  "55229.13842423 <- expected amount R9PwsNzuksjJzZUAAX4yfDwdSy5Y4KP25X"
+
+# RC3DmLpKZyMD66JnKXVRHT9AVcok9xwGgB KMD 29049.45748125
+./komodo-cli sendtoaddress RC3DmLpKZyMD66JnKXVRHT9AVcok9xwGgB 29049.45748125
+sleep 3
+echo  "29049.45748125 <- expected amount RC3DmLpKZyMD66JnKXVRHT9AVcok9xwGgB"
+
+# RHy56MTg74v8AY1Eo2RgbohbMbdHjUDN47 KMD 10066.89321267
+./komodo-cli sendtoaddress RHy56MTg74v8AY1Eo2RgbohbMbdHjUDN47 10066.89321267
+sleep 3
+echo  "10066.89321267 <- expected amount RHy56MTg74v8AY1Eo2RgbohbMbdHjUDN47"
+
+# RDdUQ5t6SYYGZUdAxBk5i7QdTWvzAshxNZ KMD 2834.17657315
+./komodo-cli sendtoaddress RDdUQ5t6SYYGZUdAxBk5i7QdTWvzAshxNZ 2834.17657315
+sleep 3
+echo  "2834.17657315 <- expected amount RDdUQ5t6SYYGZUdAxBk5i7QdTWvzAshxNZ"
+
+
+# total KMD 701710.56131060 REVS 0.00000000

iguana/tests/KMD.batch12.importaddress

@@ -0,0 +1,139 @@
+# RDTjem9CP97XPXvet1sQBb428xrmSZJSsd KMD 1568.45531762, REVS 31.12033224
+# RDTjem9CP97XPXvet1sQBb428xrmSZJSsd KMD 1568.45531762
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RDTjem9CP97XPXvet1sQBb428xrmSZJSsd\",\"symbol\":\"KMD\"}" # 1568.45531762
+sleep 3
+echo  "1568.45531762 <- expected amount RDTjem9CP97XPXvet1sQBb428xrmSZJSsd"
+
+# RAvtq1kazCRZUvWvPsN7ioY2Vt1EYtgpuz KMD 73430.96919475
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RAvtq1kazCRZUvWvPsN7ioY2Vt1EYtgpuz\",\"symbol\":\"KMD\"}" # 73430.96919475
+sleep 3
+echo  "73430.96919475 <- expected amount RAvtq1kazCRZUvWvPsN7ioY2Vt1EYtgpuz"
+
+# RWxT4Jfwp1Bv6RYdUMdrQ6oXt6dMsQZ8jE KMD 5689.04575312
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RWxT4Jfwp1Bv6RYdUMdrQ6oXt6dMsQZ8jE\",\"symbol\":\"KMD\"}" # 5689.04575312
+sleep 3
+echo  "5689.04575312 <- expected amount RWxT4Jfwp1Bv6RYdUMdrQ6oXt6dMsQZ8jE"
+
+# RXQxetCQScefabaJaFyqCJ1FvfNwsKtvMT KMD 17817.00058850
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RXQxetCQScefabaJaFyqCJ1FvfNwsKtvMT\",\"symbol\":\"KMD\"}" # 17817.00058850
+sleep 3
+echo  "17817.00058850 <- expected amount RXQxetCQScefabaJaFyqCJ1FvfNwsKtvMT"
+
+# RPqAFgwnB1hjae6Ar4Kms973uS93HbDkoB KMD 202518.10752377
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RPqAFgwnB1hjae6Ar4Kms973uS93HbDkoB\",\"symbol\":\"KMD\"}" # 202518.10752377
+sleep 3
+echo  "202518.10752377 <- expected amount RPqAFgwnB1hjae6Ar4Kms973uS93HbDkoB"
+
+# RH4SXj2zZqfG4TfejyHcVpaoPoDv1Uonnf KMD 6963.60677351
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RH4SXj2zZqfG4TfejyHcVpaoPoDv1Uonnf\",\"symbol\":\"KMD\"}" # 6963.60677351
+sleep 3
+echo  "6963.60677351 <- expected amount RH4SXj2zZqfG4TfejyHcVpaoPoDv1Uonnf"
+
+# RXyXDkiMmU8jdnCuyCrZHqWthU4kp9PUhv KMD 32042.52085087
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RXyXDkiMmU8jdnCuyCrZHqWthU4kp9PUhv\",\"symbol\":\"KMD\"}" # 32042.52085087
+sleep 3
+echo  "32042.52085087 <- expected amount RXyXDkiMmU8jdnCuyCrZHqWthU4kp9PUhv"
+
+# RWTfFTP7c9WxLhgxd2EXSsKszpDVPXHN8A KMD 2135.12309659
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RWTfFTP7c9WxLhgxd2EXSsKszpDVPXHN8A\",\"symbol\":\"KMD\"}" # 2135.12309659
+sleep 3
+echo  "2135.12309659 <- expected amount RWTfFTP7c9WxLhgxd2EXSsKszpDVPXHN8A"
+
+# RAGhCfNvxpL55JFV7h2HQa5dSEK86Jg3ic KMD 5533.00461690
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RAGhCfNvxpL55JFV7h2HQa5dSEK86Jg3ic\",\"symbol\":\"KMD\"}" # 5533.00461690
+sleep 3
+echo  "5533.00461690 <- expected amount RAGhCfNvxpL55JFV7h2HQa5dSEK86Jg3ic"
+
+# RDoLVY35wbzTXZ9QgFRSAzHfAiYYG7e65i KMD 50.26846585
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RDoLVY35wbzTXZ9QgFRSAzHfAiYYG7e65i\",\"symbol\":\"KMD\"}" # 50.26846585
+sleep 3
+echo  "50.26846585 <- expected amount RDoLVY35wbzTXZ9QgFRSAzHfAiYYG7e65i"
+
+# RMHZ76hvxs8n2yDnkUa122rs5gubMxhiw7 KMD 1733.05190072
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RMHZ76hvxs8n2yDnkUa122rs5gubMxhiw7\",\"symbol\":\"KMD\"}" # 1733.05190072
+sleep 3
+echo  "1733.05190072 <- expected amount RMHZ76hvxs8n2yDnkUa122rs5gubMxhiw7"
+
+# RHmVdfQM3PbJayYGbYnGtsqiWD9gDt2n4y KMD 11852.83167290, REVS 139.09398517
+# RHmVdfQM3PbJayYGbYnGtsqiWD9gDt2n4y KMD 11852.83167290
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RHmVdfQM3PbJayYGbYnGtsqiWD9gDt2n4y\",\"symbol\":\"KMD\"}" # 11852.83167290
+sleep 3
+echo  "11852.83167290 <- expected amount RHmVdfQM3PbJayYGbYnGtsqiWD9gDt2n4y"
+
+# RH9CANWQNvqSktmX39ruDfiNFimcToD2ur KMD 43125.33019700
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RH9CANWQNvqSktmX39ruDfiNFimcToD2ur\",\"symbol\":\"KMD\"}" # 43125.33019700
+sleep 3
+echo  "43125.33019700 <- expected amount RH9CANWQNvqSktmX39ruDfiNFimcToD2ur"
+
+# RSp4ceoTDQt7fbweFBpEbvbTTH8J9SEp4b KMD 36837.09249870
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RSp4ceoTDQt7fbweFBpEbvbTTH8J9SEp4b\",\"symbol\":\"KMD\"}" # 36837.09249870
+sleep 3
+echo  "36837.09249870 <- expected amount RSp4ceoTDQt7fbweFBpEbvbTTH8J9SEp4b"
+
+# RUbMmLRMeSf2xnBHspdzS2JC3e8epKmoM8 KMD 3016.26045526, REVS 59.85500000
+# RUbMmLRMeSf2xnBHspdzS2JC3e8epKmoM8 KMD 3016.26045526
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RUbMmLRMeSf2xnBHspdzS2JC3e8epKmoM8\",\"symbol\":\"KMD\"}" # 3016.26045526
+sleep 3
+echo  "3016.26045526 <- expected amount RUbMmLRMeSf2xnBHspdzS2JC3e8epKmoM8"
+
+# RLWvbjH97gqjGXsRyPijDmwuKNFqsaaerb KMD 91240.39653929
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RLWvbjH97gqjGXsRyPijDmwuKNFqsaaerb\",\"symbol\":\"KMD\"}" # 91240.39653929
+sleep 3
+echo  "91240.39653929 <- expected amount RLWvbjH97gqjGXsRyPijDmwuKNFqsaaerb"
+
+# RGoB4uxdk2SDs5yCerizsQ3UFD7NqJjury KMD 2440.00507548
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RGoB4uxdk2SDs5yCerizsQ3UFD7NqJjury\",\"symbol\":\"KMD\"}" # 2440.00507548
+sleep 3
+echo  "2440.00507548 <- expected amount RGoB4uxdk2SDs5yCerizsQ3UFD7NqJjury"
+
+# RXQBgNYtszvmdwniLu1nteS9MX1xD75bNX KMD 3823.81289934, REVS 75.88015839
+# RXQBgNYtszvmdwniLu1nteS9MX1xD75bNX KMD 3823.81289934
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RXQBgNYtszvmdwniLu1nteS9MX1xD75bNX\",\"symbol\":\"KMD\"}" # 3823.81289934
+sleep 3
+echo  "3823.81289934 <- expected amount RXQBgNYtszvmdwniLu1nteS9MX1xD75bNX"
+
+# RLyaf3XgjHruSeJd4oj83E8btck7kYPmVz KMD 2772.48246697
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RLyaf3XgjHruSeJd4oj83E8btck7kYPmVz\",\"symbol\":\"KMD\"}" # 2772.48246697
+sleep 3
+echo  "2772.48246697 <- expected amount RLyaf3XgjHruSeJd4oj83E8btck7kYPmVz"
+
+# RHJ55iWUQNbKcSn8shbv1RbGuip3RSRHFv KMD 693.08132289
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RHJ55iWUQNbKcSn8shbv1RbGuip3RSRHFv\",\"symbol\":\"KMD\"}" # 693.08132289
+sleep 3
+echo  "693.08132289 <- expected amount RHJ55iWUQNbKcSn8shbv1RbGuip3RSRHFv"
+
+# RQgfzPR4zeCyLWaddHysGEVzoKLZa5E4Ut KMD 10316.17621736
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RQgfzPR4zeCyLWaddHysGEVzoKLZa5E4Ut\",\"symbol\":\"KMD\"}" # 10316.17621736
+sleep 3
+echo  "10316.17621736 <- expected amount RQgfzPR4zeCyLWaddHysGEVzoKLZa5E4Ut"
+
+# RAGGPNoZgxAj6ABBTwehQfVYEa1PEN4qZW KMD 29566.93551966
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RAGGPNoZgxAj6ABBTwehQfVYEa1PEN4qZW\",\"symbol\":\"KMD\"}" # 29566.93551966
+sleep 3
+echo  "29566.93551966 <- expected amount RAGGPNoZgxAj6ABBTwehQfVYEa1PEN4qZW"
+
+# RNQzdseaqPikT6Df2ECFQXxW4yUr4fahqX KMD 19365.33667225
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RNQzdseaqPikT6Df2ECFQXxW4yUr4fahqX\",\"symbol\":\"KMD\"}" # 19365.33667225
+sleep 3
+echo  "19365.33667225 <- expected amount RNQzdseaqPikT6Df2ECFQXxW4yUr4fahqX"
+
+# R9PwsNzuksjJzZUAAX4yfDwdSy5Y4KP25X KMD 55229.13842423
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"R9PwsNzuksjJzZUAAX4yfDwdSy5Y4KP25X\",\"symbol\":\"KMD\"}" # 55229.13842423
+sleep 3
+echo  "55229.13842423 <- expected amount R9PwsNzuksjJzZUAAX4yfDwdSy5Y4KP25X"
+
+# RC3DmLpKZyMD66JnKXVRHT9AVcok9xwGgB KMD 29049.45748125
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RC3DmLpKZyMD66JnKXVRHT9AVcok9xwGgB\",\"symbol\":\"KMD\"}" # 29049.45748125
+sleep 3
+echo  "29049.45748125 <- expected amount RC3DmLpKZyMD66JnKXVRHT9AVcok9xwGgB"
+
+# RHy56MTg74v8AY1Eo2RgbohbMbdHjUDN47 KMD 10066.89321267
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RHy56MTg74v8AY1Eo2RgbohbMbdHjUDN47\",\"symbol\":\"KMD\"}" # 10066.89321267
+sleep 3
+echo  "10066.89321267 <- expected amount RHy56MTg74v8AY1Eo2RgbohbMbdHjUDN47"
+
+# RDdUQ5t6SYYGZUdAxBk5i7QdTWvzAshxNZ KMD 2834.17657315
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RDdUQ5t6SYYGZUdAxBk5i7QdTWvzAshxNZ\",\"symbol\":\"KMD\"}" # 2834.17657315
+sleep 3
+echo  "2834.17657315 <- expected amount RDdUQ5t6SYYGZUdAxBk5i7QdTWvzAshxNZ"
+

iguana/tests/KMD.batch12.listunspent

@@ -0,0 +1,112 @@
+# RDTjem9CP97XPXvet1sQBb428xrmSZJSsd KMD 1568.45531762, REVS 31.12033224
+# RDTjem9CP97XPXvet1sQBb428xrmSZJSsd KMD 1568.45531762
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RDTjem9CP97XPXvet1sQBb428xrmSZJSsd\",\"symbol\":\"KMD\"}"
+echo  "1568.45531762 <- expected amount RDTjem9CP97XPXvet1sQBb428xrmSZJSsd"
+
+# RAvtq1kazCRZUvWvPsN7ioY2Vt1EYtgpuz KMD 73430.96919475
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RAvtq1kazCRZUvWvPsN7ioY2Vt1EYtgpuz\",\"symbol\":\"KMD\"}"
+echo  "73430.96919475 <- expected amount RAvtq1kazCRZUvWvPsN7ioY2Vt1EYtgpuz"
+
+# RWxT4Jfwp1Bv6RYdUMdrQ6oXt6dMsQZ8jE KMD 5689.04575312
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RWxT4Jfwp1Bv6RYdUMdrQ6oXt6dMsQZ8jE\",\"symbol\":\"KMD\"}"
+echo  "5689.04575312 <- expected amount RWxT4Jfwp1Bv6RYdUMdrQ6oXt6dMsQZ8jE"
+
+# RXQxetCQScefabaJaFyqCJ1FvfNwsKtvMT KMD 17817.00058850
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RXQxetCQScefabaJaFyqCJ1FvfNwsKtvMT\",\"symbol\":\"KMD\"}"
+echo  "17817.00058850 <- expected amount RXQxetCQScefabaJaFyqCJ1FvfNwsKtvMT"
+
+# RPqAFgwnB1hjae6Ar4Kms973uS93HbDkoB KMD 202518.10752377
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RPqAFgwnB1hjae6Ar4Kms973uS93HbDkoB\",\"symbol\":\"KMD\"}"
+echo  "202518.10752377 <- expected amount RPqAFgwnB1hjae6Ar4Kms973uS93HbDkoB"
+
+# RH4SXj2zZqfG4TfejyHcVpaoPoDv1Uonnf KMD 6963.60677351
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RH4SXj2zZqfG4TfejyHcVpaoPoDv1Uonnf\",\"symbol\":\"KMD\"}"
+echo  "6963.60677351 <- expected amount RH4SXj2zZqfG4TfejyHcVpaoPoDv1Uonnf"
+
+# RXyXDkiMmU8jdnCuyCrZHqWthU4kp9PUhv KMD 32042.52085087
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RXyXDkiMmU8jdnCuyCrZHqWthU4kp9PUhv\",\"symbol\":\"KMD\"}"
+echo  "32042.52085087 <- expected amount RXyXDkiMmU8jdnCuyCrZHqWthU4kp9PUhv"
+
+# RWTfFTP7c9WxLhgxd2EXSsKszpDVPXHN8A KMD 2135.12309659
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RWTfFTP7c9WxLhgxd2EXSsKszpDVPXHN8A\",\"symbol\":\"KMD\"}"
+echo  "2135.12309659 <- expected amount RWTfFTP7c9WxLhgxd2EXSsKszpDVPXHN8A"
+
+# RAGhCfNvxpL55JFV7h2HQa5dSEK86Jg3ic KMD 5533.00461690
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RAGhCfNvxpL55JFV7h2HQa5dSEK86Jg3ic\",\"symbol\":\"KMD\"}"
+echo  "5533.00461690 <- expected amount RAGhCfNvxpL55JFV7h2HQa5dSEK86Jg3ic"
+
+# RDoLVY35wbzTXZ9QgFRSAzHfAiYYG7e65i KMD 50.26846585
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RDoLVY35wbzTXZ9QgFRSAzHfAiYYG7e65i\",\"symbol\":\"KMD\"}"
+echo  "50.26846585 <- expected amount RDoLVY35wbzTXZ9QgFRSAzHfAiYYG7e65i"
+
+# RMHZ76hvxs8n2yDnkUa122rs5gubMxhiw7 KMD 1733.05190072
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RMHZ76hvxs8n2yDnkUa122rs5gubMxhiw7\",\"symbol\":\"KMD\"}"
+echo  "1733.05190072 <- expected amount RMHZ76hvxs8n2yDnkUa122rs5gubMxhiw7"
+
+# RHmVdfQM3PbJayYGbYnGtsqiWD9gDt2n4y KMD 11852.83167290, REVS 139.09398517
+# RHmVdfQM3PbJayYGbYnGtsqiWD9gDt2n4y KMD 11852.83167290
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RHmVdfQM3PbJayYGbYnGtsqiWD9gDt2n4y\",\"symbol\":\"KMD\"}"
+echo  "11852.83167290 <- expected amount RHmVdfQM3PbJayYGbYnGtsqiWD9gDt2n4y"
+
+# RH9CANWQNvqSktmX39ruDfiNFimcToD2ur KMD 43125.33019700
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RH9CANWQNvqSktmX39ruDfiNFimcToD2ur\",\"symbol\":\"KMD\"}"
+echo  "43125.33019700 <- expected amount RH9CANWQNvqSktmX39ruDfiNFimcToD2ur"
+
+# RSp4ceoTDQt7fbweFBpEbvbTTH8J9SEp4b KMD 36837.09249870
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RSp4ceoTDQt7fbweFBpEbvbTTH8J9SEp4b\",\"symbol\":\"KMD\"}"
+echo  "36837.09249870 <- expected amount RSp4ceoTDQt7fbweFBpEbvbTTH8J9SEp4b"
+
+# RUbMmLRMeSf2xnBHspdzS2JC3e8epKmoM8 KMD 3016.26045526, REVS 59.85500000
+# RUbMmLRMeSf2xnBHspdzS2JC3e8epKmoM8 KMD 3016.26045526
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RUbMmLRMeSf2xnBHspdzS2JC3e8epKmoM8\",\"symbol\":\"KMD\"}"
+echo  "3016.26045526 <- expected amount RUbMmLRMeSf2xnBHspdzS2JC3e8epKmoM8"
+
+# RLWvbjH97gqjGXsRyPijDmwuKNFqsaaerb KMD 91240.39653929
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RLWvbjH97gqjGXsRyPijDmwuKNFqsaaerb\",\"symbol\":\"KMD\"}"
+echo  "91240.39653929 <- expected amount RLWvbjH97gqjGXsRyPijDmwuKNFqsaaerb"
+
+# RGoB4uxdk2SDs5yCerizsQ3UFD7NqJjury KMD 2440.00507548
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RGoB4uxdk2SDs5yCerizsQ3UFD7NqJjury\",\"symbol\":\"KMD\"}"
+echo  "2440.00507548 <- expected amount RGoB4uxdk2SDs5yCerizsQ3UFD7NqJjury"
+
+# RXQBgNYtszvmdwniLu1nteS9MX1xD75bNX KMD 3823.81289934, REVS 75.88015839
+# RXQBgNYtszvmdwniLu1nteS9MX1xD75bNX KMD 3823.81289934
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RXQBgNYtszvmdwniLu1nteS9MX1xD75bNX\",\"symbol\":\"KMD\"}"
+echo  "3823.81289934 <- expected amount RXQBgNYtszvmdwniLu1nteS9MX1xD75bNX"
+
+# RLyaf3XgjHruSeJd4oj83E8btck7kYPmVz KMD 2772.48246697
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RLyaf3XgjHruSeJd4oj83E8btck7kYPmVz\",\"symbol\":\"KMD\"}"
+echo  "2772.48246697 <- expected amount RLyaf3XgjHruSeJd4oj83E8btck7kYPmVz"
+
+# RHJ55iWUQNbKcSn8shbv1RbGuip3RSRHFv KMD 693.08132289
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RHJ55iWUQNbKcSn8shbv1RbGuip3RSRHFv\",\"symbol\":\"KMD\"}"
+echo  "693.08132289 <- expected amount RHJ55iWUQNbKcSn8shbv1RbGuip3RSRHFv"
+
+# RQgfzPR4zeCyLWaddHysGEVzoKLZa5E4Ut KMD 10316.17621736
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RQgfzPR4zeCyLWaddHysGEVzoKLZa5E4Ut\",\"symbol\":\"KMD\"}"
+echo  "10316.17621736 <- expected amount RQgfzPR4zeCyLWaddHysGEVzoKLZa5E4Ut"
+
+# RAGGPNoZgxAj6ABBTwehQfVYEa1PEN4qZW KMD 29566.93551966
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RAGGPNoZgxAj6ABBTwehQfVYEa1PEN4qZW\",\"symbol\":\"KMD\"}"
+echo  "29566.93551966 <- expected amount RAGGPNoZgxAj6ABBTwehQfVYEa1PEN4qZW"
+
+# RNQzdseaqPikT6Df2ECFQXxW4yUr4fahqX KMD 19365.33667225
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RNQzdseaqPikT6Df2ECFQXxW4yUr4fahqX\",\"symbol\":\"KMD\"}"
+echo  "19365.33667225 <- expected amount RNQzdseaqPikT6Df2ECFQXxW4yUr4fahqX"
+
+# R9PwsNzuksjJzZUAAX4yfDwdSy5Y4KP25X KMD 55229.13842423
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"R9PwsNzuksjJzZUAAX4yfDwdSy5Y4KP25X\",\"symbol\":\"KMD\"}"
+echo  "55229.13842423 <- expected amount R9PwsNzuksjJzZUAAX4yfDwdSy5Y4KP25X"
+
+# RC3DmLpKZyMD66JnKXVRHT9AVcok9xwGgB KMD 29049.45748125
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RC3DmLpKZyMD66JnKXVRHT9AVcok9xwGgB\",\"symbol\":\"KMD\"}"
+echo  "29049.45748125 <- expected amount RC3DmLpKZyMD66JnKXVRHT9AVcok9xwGgB"
+
+# RHy56MTg74v8AY1Eo2RgbohbMbdHjUDN47 KMD 10066.89321267
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RHy56MTg74v8AY1Eo2RgbohbMbdHjUDN47\",\"symbol\":\"KMD\"}"
+echo  "10066.89321267 <- expected amount RHy56MTg74v8AY1Eo2RgbohbMbdHjUDN47"
+
+# RDdUQ5t6SYYGZUdAxBk5i7QdTWvzAshxNZ KMD 2834.17657315
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RDdUQ5t6SYYGZUdAxBk5i7QdTWvzAshxNZ\",\"symbol\":\"KMD\"}"
+echo  "2834.17657315 <- expected amount RDdUQ5t6SYYGZUdAxBk5i7QdTWvzAshxNZ"
+

iguana/tests/KMD.batch13

@@ -0,0 +1,147 @@
+sleep 999999
+# RTG2uSvYLnoxtxFeZJDFq2yPEqDvhTHhk2 KMD 341.29719958
+./komodo-cli sendtoaddress RTG2uSvYLnoxtxFeZJDFq2yPEqDvhTHhk2 341.29719958
+sleep 3
+echo  "341.29719958 <- expected amount RTG2uSvYLnoxtxFeZJDFq2yPEqDvhTHhk2"
+
+# RD486qQaD85849AdDPH3Xy3iyppuvxDZYf KMD 177091.93551966
+./komodo-cli sendtoaddress RD486qQaD85849AdDPH3Xy3iyppuvxDZYf 177091.93551966
+sleep 3
+echo  "177091.93551966 <- expected amount RD486qQaD85849AdDPH3Xy3iyppuvxDZYf"
+
+# RHy56MTg74v8AY1Eo2RgbohbMbdHjUDN47 KMD 10744.59269420
+./komodo-cli sendtoaddress RHy56MTg74v8AY1Eo2RgbohbMbdHjUDN47 10744.59269420
+sleep 3
+echo  "10744.59269420 <- expected amount RHy56MTg74v8AY1Eo2RgbohbMbdHjUDN47"
+
+# RC8jWr1QQsRyo1pDkue8AxGs58Wyz4F3wZ KMD 885.02977777
+./komodo-cli sendtoaddress RC8jWr1QQsRyo1pDkue8AxGs58Wyz4F3wZ 885.02977777
+sleep 3
+echo  "885.02977777 <- expected amount RC8jWr1QQsRyo1pDkue8AxGs58Wyz4F3wZ"
+
+# RDdUQ5t6SYYGZUdAxBk5i7QdTWvzAshxNZ KMD 1517.32401692
+./komodo-cli sendtoaddress RDdUQ5t6SYYGZUdAxBk5i7QdTWvzAshxNZ 1517.32401692
+sleep 3
+echo  "1517.32401692 <- expected amount RDdUQ5t6SYYGZUdAxBk5i7QdTWvzAshxNZ"
+
+# RPY5bFVqHKiSfTGhQgW6USqCA1fbD1auvP KMD 722.28571081
+./komodo-cli sendtoaddress RPY5bFVqHKiSfTGhQgW6USqCA1fbD1auvP 722.28571081
+sleep 3
+echo  "722.28571081 <- expected amount RPY5bFVqHKiSfTGhQgW6USqCA1fbD1auvP"
+
+# RS12srxPnksnwwaXrSXLjhu14hBknd26aR KMD 1859.16527880
+./komodo-cli sendtoaddress RS12srxPnksnwwaXrSXLjhu14hBknd26aR 1859.16527880
+sleep 3
+echo  "1859.16527880 <- expected amount RS12srxPnksnwwaXrSXLjhu14hBknd26aR"
+
+# RQCPDTicaag9aa9VF3Vfp97o8bTX4EW9Vw KMD 748.59289950
+./komodo-cli sendtoaddress RQCPDTicaag9aa9VF3Vfp97o8bTX4EW9Vw 748.59289950
+sleep 3
+echo  "748.59289950 <- expected amount RQCPDTicaag9aa9VF3Vfp97o8bTX4EW9Vw"
+
+# RLvFp2q8XmUpxnimcYUmpyC9vGr3woqTKy KMD 1684.62281766, REVS 33.43442069
+# RLvFp2q8XmUpxnimcYUmpyC9vGr3woqTKy KMD 1684.62281766
+./komodo-cli sendtoaddress RLvFp2q8XmUpxnimcYUmpyC9vGr3woqTKy 1684.62281766
+sleep 3
+echo  "1684.62281766 <- expected amount RLvFp2q8XmUpxnimcYUmpyC9vGr3woqTKy"
+
+# RNFgp4T5uusJXRa2Xy3zPxDe93NHBpw2Nc KMD 4850.29108411
+./komodo-cli sendtoaddress RNFgp4T5uusJXRa2Xy3zPxDe93NHBpw2Nc 4850.29108411
+sleep 3
+echo  "4850.29108411 <- expected amount RNFgp4T5uusJXRa2Xy3zPxDe93NHBpw2Nc"
+
+# RCgPPsLuB9Do1RVSTpjsD27xxGvKGwr5EJ KMD 935.39253089
+./komodo-cli sendtoaddress RCgPPsLuB9Do1RVSTpjsD27xxGvKGwr5EJ 935.39253089
+sleep 3
+echo  "935.39253089 <- expected amount RCgPPsLuB9Do1RVSTpjsD27xxGvKGwr5EJ"
+
+# RWXMMFMMSv6GZzP1qEKyTkeDmodAueEMp4 KMD 86638.13975038, REVS 819.96000000
+# RWXMMFMMSv6GZzP1qEKyTkeDmodAueEMp4 KMD 86638.13975038
+./komodo-cli sendtoaddress RWXMMFMMSv6GZzP1qEKyTkeDmodAueEMp4 86638.13975038
+sleep 3
+echo  "86638.13975038 <- expected amount RWXMMFMMSv6GZzP1qEKyTkeDmodAueEMp4"
+
+# RTdoQxvwUbqmyF8EAX5uzNGGmWuPZLAy32 KMD 50.26846585
+./komodo-cli sendtoaddress RTdoQxvwUbqmyF8EAX5uzNGGmWuPZLAy32 50.26846585
+sleep 3
+echo  "50.26846585 <- expected amount RTdoQxvwUbqmyF8EAX5uzNGGmWuPZLAy32"
+
+# RA5woupBAsRPAkaBVWiRsxWyoYdAV8v5pS KMD 3873.26099750
+./komodo-cli sendtoaddress RA5woupBAsRPAkaBVWiRsxWyoYdAV8v5pS 3873.26099750
+sleep 3
+echo  "3873.26099750 <- expected amount RA5woupBAsRPAkaBVWiRsxWyoYdAV8v5pS"
+
+# RTJXwRhuAH9iyztyuRuGC8G7DamTgSMGvT KMD 212102.44577315
+./komodo-cli sendtoaddress RTJXwRhuAH9iyztyuRuGC8G7DamTgSMGvT 212102.44577315
+sleep 3
+echo  "212102.44577315 <- expected amount RTJXwRhuAH9iyztyuRuGC8G7DamTgSMGvT"
+
+# RPEpkD8hNeLC4eJTM3VZvem43nnbVpaetZ KMD 10486.02744190
+./komodo-cli sendtoaddress RPEpkD8hNeLC4eJTM3VZvem43nnbVpaetZ 10486.02744190
+sleep 3
+echo  "10486.02744190 <- expected amount RPEpkD8hNeLC4eJTM3VZvem43nnbVpaetZ"
+
+# RHJ55iWUQNbKcSn8shbv1RbGuip3RSRHFv KMD 693.08132289
+./komodo-cli sendtoaddress RHJ55iWUQNbKcSn8shbv1RbGuip3RSRHFv 693.08132289
+sleep 3
+echo  "693.08132289 <- expected amount RHJ55iWUQNbKcSn8shbv1RbGuip3RSRHFv"
+
+# RJxAyUaeV87C1evoXNPSV8qVeKygSQk4Do KMD 3389.10337281
+./komodo-cli sendtoaddress RJxAyUaeV87C1evoXNPSV8qVeKygSQk4Do 3389.10337281
+sleep 3
+echo  "3389.10337281 <- expected amount RJxAyUaeV87C1evoXNPSV8qVeKygSQk4Do"
+
+# RKV15G5AC9HzEFVaZtYRwBLp33MaiHdHNc KMD 774.65219950
+./komodo-cli sendtoaddress RKV15G5AC9HzEFVaZtYRwBLp33MaiHdHNc 774.65219950
+sleep 3
+echo  "774.65219950 <- expected amount RKV15G5AC9HzEFVaZtYRwBLp33MaiHdHNc"
+
+# RPqAFgwnB1hjae6Ar4Kms973uS93HbDkoB KMD 190185.06275980
+./komodo-cli sendtoaddress RPqAFgwnB1hjae6Ar4Kms973uS93HbDkoB 190185.06275980
+sleep 3
+echo  "190185.06275980 <- expected amount RPqAFgwnB1hjae6Ar4Kms973uS93HbDkoB"
+
+# RLtagTCmTjMkWTBgM6ibGe12p7ufn9nWRg KMD 9683.15249375
+./komodo-cli sendtoaddress RLtagTCmTjMkWTBgM6ibGe12p7ufn9nWRg 9683.15249375
+sleep 3
+echo  "9683.15249375 <- expected amount RLtagTCmTjMkWTBgM6ibGe12p7ufn9nWRg"
+
+# RSfqroC8ApjqJgTu7p4TdBp6M6sWVSYLmF KMD 8424.34266955
+./komodo-cli sendtoaddress RSfqroC8ApjqJgTu7p4TdBp6M6sWVSYLmF 8424.34266955
+sleep 3
+echo  "8424.34266955 <- expected amount RSfqroC8ApjqJgTu7p4TdBp6M6sWVSYLmF"
+
+# R9M1LYyerZSgc6mtDVy3d4ViadhjAaSW9M KMD 6007.48089910
+./komodo-cli sendtoaddress R9M1LYyerZSgc6mtDVy3d4ViadhjAaSW9M 6007.48089910
+sleep 3
+echo  "6007.48089910 <- expected amount R9M1LYyerZSgc6mtDVy3d4ViadhjAaSW9M"
+
+# RJgEYxCjh5HkxtU4kVaYZUQ7eBS2fEeosE KMD 534.11913087
+./komodo-cli sendtoaddress RJgEYxCjh5HkxtU4kVaYZUQ7eBS2fEeosE 534.11913087
+sleep 3
+echo  "534.11913087 <- expected amount RJgEYxCjh5HkxtU4kVaYZUQ7eBS2fEeosE"
+
+# RU3EDov1PTPAY8WhG5eGUANp2rvtki1yc9 KMD 1.56326640
+./komodo-cli sendtoaddress RU3EDov1PTPAY8WhG5eGUANp2rvtki1yc9 1.56326640
+sleep 3
+echo  "1.56326640 <- expected amount RU3EDov1PTPAY8WhG5eGUANp2rvtki1yc9"
+
+# RSVA6AL1Hi65zGg24YZU9GWu8Pd9ixSKuM KMD 678.12202237
+./komodo-cli sendtoaddress RSVA6AL1Hi65zGg24YZU9GWu8Pd9ixSKuM 678.12202237
+sleep 3
+echo  "678.12202237 <- expected amount RSVA6AL1Hi65zGg24YZU9GWu8Pd9ixSKuM"
+
+# RPmxibGkVYqTSM2NcTcuxRYtha2WUeNAQE KMD 4841.57624687
+./komodo-cli sendtoaddress RPmxibGkVYqTSM2NcTcuxRYtha2WUeNAQE 4841.57624687
+sleep 3
+echo  "4841.57624687 <- expected amount RPmxibGkVYqTSM2NcTcuxRYtha2WUeNAQE"
+
+# RXyXDkiMmU8jdnCuyCrZHqWthU4kp9PUhv KMD 25665.79190427
+./komodo-cli sendtoaddress RXyXDkiMmU8jdnCuyCrZHqWthU4kp9PUhv 25665.79190427
+sleep 3
+echo  "25665.79190427 <- expected amount RXyXDkiMmU8jdnCuyCrZHqWthU4kp9PUhv"
+
+# RQgfzPR4zeCyLWaddHysGEVzoKLZa5E4Ut KMD 6627.41635888
+./komodo-cli sendtoaddress RQgfzPR4zeCyLWaddHysGEVzoKLZa5E4Ut 6627.41635888
+sleep 3
+echo  "6627.41635888 <- expected amount RQgfzPR4zeCyLWaddHysGEVzoKLZa5E4Ut"

iguana/tests/KMD.batch13.listunspent

@@ -0,0 +1,118 @@
+# RTG2uSvYLnoxtxFeZJDFq2yPEqDvhTHhk2 KMD 341.29719958
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RTG2uSvYLnoxtxFeZJDFq2yPEqDvhTHhk2\",\"symbol\":\"KMD\"}"
+echo  "341.29719958 <- expected amount RTG2uSvYLnoxtxFeZJDFq2yPEqDvhTHhk2"
+
+# RD486qQaD85849AdDPH3Xy3iyppuvxDZYf KMD 177091.93551966
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RD486qQaD85849AdDPH3Xy3iyppuvxDZYf\",\"symbol\":\"KMD\"}"
+echo  "177091.93551966 <- expected amount RD486qQaD85849AdDPH3Xy3iyppuvxDZYf"
+
+# RHy56MTg74v8AY1Eo2RgbohbMbdHjUDN47 KMD 10744.59269420
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RHy56MTg74v8AY1Eo2RgbohbMbdHjUDN47\",\"symbol\":\"KMD\"}"
+echo  "10744.59269420 <- expected amount RHy56MTg74v8AY1Eo2RgbohbMbdHjUDN47"
+
+# RC8jWr1QQsRyo1pDkue8AxGs58Wyz4F3wZ KMD 885.02977777
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RC8jWr1QQsRyo1pDkue8AxGs58Wyz4F3wZ\",\"symbol\":\"KMD\"}"
+echo  "885.02977777 <- expected amount RC8jWr1QQsRyo1pDkue8AxGs58Wyz4F3wZ"
+
+# RDdUQ5t6SYYGZUdAxBk5i7QdTWvzAshxNZ KMD 1517.32401692
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RDdUQ5t6SYYGZUdAxBk5i7QdTWvzAshxNZ\",\"symbol\":\"KMD\"}"
+echo  "1517.32401692 <- expected amount RDdUQ5t6SYYGZUdAxBk5i7QdTWvzAshxNZ"
+
+# RPY5bFVqHKiSfTGhQgW6USqCA1fbD1auvP KMD 722.28571081
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RPY5bFVqHKiSfTGhQgW6USqCA1fbD1auvP\",\"symbol\":\"KMD\"}"
+echo  "722.28571081 <- expected amount RPY5bFVqHKiSfTGhQgW6USqCA1fbD1auvP"
+
+# RS12srxPnksnwwaXrSXLjhu14hBknd26aR KMD 1859.16527880
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RS12srxPnksnwwaXrSXLjhu14hBknd26aR\",\"symbol\":\"KMD\"}"
+echo  "1859.16527880 <- expected amount RS12srxPnksnwwaXrSXLjhu14hBknd26aR"
+
+# RQCPDTicaag9aa9VF3Vfp97o8bTX4EW9Vw KMD 748.59289950
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RQCPDTicaag9aa9VF3Vfp97o8bTX4EW9Vw\",\"symbol\":\"KMD\"}"
+echo  "748.59289950 <- expected amount RQCPDTicaag9aa9VF3Vfp97o8bTX4EW9Vw"
+
+# RLvFp2q8XmUpxnimcYUmpyC9vGr3woqTKy KMD 1684.62281766, REVS 33.43442069
+# RLvFp2q8XmUpxnimcYUmpyC9vGr3woqTKy KMD 1684.62281766
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RLvFp2q8XmUpxnimcYUmpyC9vGr3woqTKy\",\"symbol\":\"KMD\"}"
+echo  "1684.62281766 <- expected amount RLvFp2q8XmUpxnimcYUmpyC9vGr3woqTKy"
+
+# RNFgp4T5uusJXRa2Xy3zPxDe93NHBpw2Nc KMD 4850.29108411
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RNFgp4T5uusJXRa2Xy3zPxDe93NHBpw2Nc\",\"symbol\":\"KMD\"}"
+echo  "4850.29108411 <- expected amount RNFgp4T5uusJXRa2Xy3zPxDe93NHBpw2Nc"
+
+# RCgPPsLuB9Do1RVSTpjsD27xxGvKGwr5EJ KMD 935.39253089
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RCgPPsLuB9Do1RVSTpjsD27xxGvKGwr5EJ\",\"symbol\":\"KMD\"}"
+echo  "935.39253089 <- expected amount RCgPPsLuB9Do1RVSTpjsD27xxGvKGwr5EJ"
+
+# RWXMMFMMSv6GZzP1qEKyTkeDmodAueEMp4 KMD 86638.13975038, REVS 819.96000000
+# RWXMMFMMSv6GZzP1qEKyTkeDmodAueEMp4 KMD 86638.13975038
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RWXMMFMMSv6GZzP1qEKyTkeDmodAueEMp4\",\"symbol\":\"KMD\"}"
+echo  "86638.13975038 <- expected amount RWXMMFMMSv6GZzP1qEKyTkeDmodAueEMp4"
+
+# RTdoQxvwUbqmyF8EAX5uzNGGmWuPZLAy32 KMD 50.26846585
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RTdoQxvwUbqmyF8EAX5uzNGGmWuPZLAy32\",\"symbol\":\"KMD\"}"
+echo  "50.26846585 <- expected amount RTdoQxvwUbqmyF8EAX5uzNGGmWuPZLAy32"
+
+# RA5woupBAsRPAkaBVWiRsxWyoYdAV8v5pS KMD 3873.26099750
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RA5woupBAsRPAkaBVWiRsxWyoYdAV8v5pS\",\"symbol\":\"KMD\"}"
+echo  "3873.26099750 <- expected amount RA5woupBAsRPAkaBVWiRsxWyoYdAV8v5pS"
+
+# RTJXwRhuAH9iyztyuRuGC8G7DamTgSMGvT KMD 212102.44577315
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RTJXwRhuAH9iyztyuRuGC8G7DamTgSMGvT\",\"symbol\":\"KMD\"}"
+echo  "212102.44577315 <- expected amount RTJXwRhuAH9iyztyuRuGC8G7DamTgSMGvT"
+
+# RPEpkD8hNeLC4eJTM3VZvem43nnbVpaetZ KMD 10486.02744190
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RPEpkD8hNeLC4eJTM3VZvem43nnbVpaetZ\",\"symbol\":\"KMD\"}"
+echo  "10486.02744190 <- expected amount RPEpkD8hNeLC4eJTM3VZvem43nnbVpaetZ"
+
+# RHJ55iWUQNbKcSn8shbv1RbGuip3RSRHFv KMD 693.08132289
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RHJ55iWUQNbKcSn8shbv1RbGuip3RSRHFv\",\"symbol\":\"KMD\"}"
+echo  "693.08132289 <- expected amount RHJ55iWUQNbKcSn8shbv1RbGuip3RSRHFv"
+
+# RJxAyUaeV87C1evoXNPSV8qVeKygSQk4Do KMD 3389.10337281
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RJxAyUaeV87C1evoXNPSV8qVeKygSQk4Do\",\"symbol\":\"KMD\"}"
+echo  "3389.10337281 <- expected amount RJxAyUaeV87C1evoXNPSV8qVeKygSQk4Do"
+
+# RKV15G5AC9HzEFVaZtYRwBLp33MaiHdHNc KMD 774.65219950
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RKV15G5AC9HzEFVaZtYRwBLp33MaiHdHNc\",\"symbol\":\"KMD\"}"
+echo  "774.65219950 <- expected amount RKV15G5AC9HzEFVaZtYRwBLp33MaiHdHNc"
+
+# RPqAFgwnB1hjae6Ar4Kms973uS93HbDkoB KMD 190185.06275980
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RPqAFgwnB1hjae6Ar4Kms973uS93HbDkoB\",\"symbol\":\"KMD\"}"
+echo  "190185.06275980 <- expected amount RPqAFgwnB1hjae6Ar4Kms973uS93HbDkoB"
+
+# RLtagTCmTjMkWTBgM6ibGe12p7ufn9nWRg KMD 9683.15249375
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RLtagTCmTjMkWTBgM6ibGe12p7ufn9nWRg\",\"symbol\":\"KMD\"}"
+echo  "9683.15249375 <- expected amount RLtagTCmTjMkWTBgM6ibGe12p7ufn9nWRg"
+
+# RSfqroC8ApjqJgTu7p4TdBp6M6sWVSYLmF KMD 8424.34266955
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RSfqroC8ApjqJgTu7p4TdBp6M6sWVSYLmF\",\"symbol\":\"KMD\"}"
+echo  "8424.34266955 <- expected amount RSfqroC8ApjqJgTu7p4TdBp6M6sWVSYLmF"
+
+# R9M1LYyerZSgc6mtDVy3d4ViadhjAaSW9M KMD 6007.48089910
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"R9M1LYyerZSgc6mtDVy3d4ViadhjAaSW9M\",\"symbol\":\"KMD\"}"
+echo  "6007.48089910 <- expected amount R9M1LYyerZSgc6mtDVy3d4ViadhjAaSW9M"
+
+# RJgEYxCjh5HkxtU4kVaYZUQ7eBS2fEeosE KMD 534.11913087
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RJgEYxCjh5HkxtU4kVaYZUQ7eBS2fEeosE\",\"symbol\":\"KMD\"}"
+echo  "534.11913087 <- expected amount RJgEYxCjh5HkxtU4kVaYZUQ7eBS2fEeosE"
+
+# RU3EDov1PTPAY8WhG5eGUANp2rvtki1yc9 KMD 1.56326640
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RU3EDov1PTPAY8WhG5eGUANp2rvtki1yc9\",\"symbol\":\"KMD\"}"
+echo  "1.56326640 <- expected amount RU3EDov1PTPAY8WhG5eGUANp2rvtki1yc9"
+
+# RSVA6AL1Hi65zGg24YZU9GWu8Pd9ixSKuM KMD 678.12202237
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RSVA6AL1Hi65zGg24YZU9GWu8Pd9ixSKuM\",\"symbol\":\"KMD\"}"
+echo  "678.12202237 <- expected amount RSVA6AL1Hi65zGg24YZU9GWu8Pd9ixSKuM"
+
+# RPmxibGkVYqTSM2NcTcuxRYtha2WUeNAQE KMD 4841.57624687
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RPmxibGkVYqTSM2NcTcuxRYtha2WUeNAQE\",\"symbol\":\"KMD\"}"
+echo  "4841.57624687 <- expected amount RPmxibGkVYqTSM2NcTcuxRYtha2WUeNAQE"
+
+# RXyXDkiMmU8jdnCuyCrZHqWthU4kp9PUhv KMD 25665.79190427
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RXyXDkiMmU8jdnCuyCrZHqWthU4kp9PUhv\",\"symbol\":\"KMD\"}"
+echo  "25665.79190427 <- expected amount RXyXDkiMmU8jdnCuyCrZHqWthU4kp9PUhv"
+
+# RQgfzPR4zeCyLWaddHysGEVzoKLZa5E4Ut KMD 6627.41635888
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"RQgfzPR4zeCyLWaddHysGEVzoKLZa5E4Ut\",\"symbol\":\"KMD\"}"
+echo  "6627.41635888 <- expected amount RQgfzPR4zeCyLWaddHysGEVzoKLZa5E4Ut"
+

iguana/tests/LPinit

@@ -1,4 +1,5 @@
 #!/bin/bash
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"bitcoinrpc\",\"method\":\"walletpassphrase\",\"password\":\"3809853923098test\",\"timeout\":86444}"
 curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"tradebot\",\"method\":\"amlp\"}"
-#curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"tradebot\",\"method\":\"liquidity\",\"targetcoin\":\"KMD\",\"vals\":{\"profit\":0.01}}"
-curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"tradebot\",\"method\":\"liquidity\",\"targetcoin\":\"MVP\",\"vals\":{\"rel\":\"USD\",\"bid\":0.09,\"ask\":0.11,\"maxvol\":100}}"
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"tradebot\",\"method\":\"liquidity\",\"targetcoin\":\"KMD\",\"vals\":{\"ask\":0.000077,\"bid\":0.000067,\"maxvol\":400,\"minvol\":100}}"
+#curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"tradebot\",\"method\":\"liquidity\",\"targetcoin\":\"MVP\",\"vals\":{\"rel\":\"USD\",\"bid\":0.09,\"ask\":0.11,\"maxvol\":100}}"

iguana/tests/REVS.batch12

@@ -0,0 +1,14 @@
+# RDTjem9CP97XPXvet1sQBb428xrmSZJSsd KMD 1568.45531762, REVS 31.12033224
+sleep 1
+fiat/revs sendtoaddress RDTjem9CP97XPXvet1sQBb428xrmSZJSsd 31.12033224
+# RHmVdfQM3PbJayYGbYnGtsqiWD9gDt2n4y KMD 11852.83167290, REVS 139.09398517
+sleep 1
+fiat/revs sendtoaddress RHmVdfQM3PbJayYGbYnGtsqiWD9gDt2n4y 139.09398517
+# RUbMmLRMeSf2xnBHspdzS2JC3e8epKmoM8 KMD 3016.26045526, REVS 59.85500000
+sleep 1
+fiat/revs sendtoaddress RUbMmLRMeSf2xnBHspdzS2JC3e8epKmoM8 59.85500000
+# RXQBgNYtszvmdwniLu1nteS9MX1xD75bNX KMD 3823.81289934, REVS 75.88015839
+sleep 1
+fiat/revs sendtoaddress RXQBgNYtszvmdwniLu1nteS9MX1xD75bNX 75.88015839
+
+# total KMD 0.00000000 REVS 305.94947580

iguana/tests/REVS.batch12.importaddress

@@ -0,0 +1,12 @@
+# RDTjem9CP97XPXvet1sQBb428xrmSZJSsd KMD 1568.45531762, REVS 31.12033224
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RDTjem9CP97XPXvet1sQBb428xrmSZJSsd\",\"symbol\":\"REVS\"}" # 31.12033224
+sleep 3
+# RHmVdfQM3PbJayYGbYnGtsqiWD9gDt2n4y KMD 11852.83167290, REVS 139.09398517
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RHmVdfQM3PbJayYGbYnGtsqiWD9gDt2n4y\",\"symbol\":\"REVS\"}" # 139.09398517
+sleep 3
+# RUbMmLRMeSf2xnBHspdzS2JC3e8epKmoM8 KMD 3016.26045526, REVS 59.85500000
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RUbMmLRMeSf2xnBHspdzS2JC3e8epKmoM8\",\"symbol\":\"REVS\"}" # 59.85500000
+sleep 3
+# RXQBgNYtszvmdwniLu1nteS9MX1xD75bNX KMD 3823.81289934, REVS 75.88015839
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"importaddress\",\"address\":\"RXQBgNYtszvmdwniLu1nteS9MX1xD75bNX\",\"symbol\":\"REVS\"}" # 75.88015839
+sleep 3

iguana/tests/amlp

@@ -1,2 +1,2 @@
 #!/bin/bash
-curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"tradebot\",\"method\":\"amlp\",\"blocktrail\":\"blocktrail_apikey\"}"
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"tradebot\",\"method\":\"amlp\",\"blocktrail\":\"e5ddfdceb58fa6c1bf9411aaeff4b6ee28cbc370\"}"

iguana/tests/cancelrefresh

@@ -0,0 +1,2 @@
+#!/bin/bash
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"basilisk\",\"method\":\"cancelrefresh\"}"

iguana/tests/crash

@@ -0,0 +1,7 @@
+../coins/basilisk/kmd
+
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"bitcoinrpc\",\"method\":\"encryptwallet\",\"passphrase\":\"amount common obey erupt ensure salon shrug digital phone vacant provide word nurse legend shaft ritual strike black fiscal circle dove tone inmate plunge\",\"timeout\":864445678904}"
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"bitcoinrpc\",\"method\":\"walletpassphrase\",\"password\":\"amount common obey erupt ensure salon shrug digital phone vacant provide word nurse legend shaft ritual strike black fiscal circle dove tone inmate plunge\",\"timeout\":864445678904}"
+
+curl --url "http://127.0.0.1:7778" --data "{\"symbol\":\"KMD\",\"agent\":\"basilisk\",\"method\":\"utxorawtx\",\"vals\":{\"timelock\":0,\"changeaddr\":\"RD5Sj6igy53nscMiFS4ECXByfqVeyV9NdG\",\"destaddr\":\"RD5Sj6igy53nscMiFS4ECXByfqVeyV9NdG\",\"txfee\":0,\"amount\":0.0001,\"sendflag\":0},\"utxos\":[{\"bestblock\":\"0000119186ecfaa8d72a7d3c62e78135043db220a6d29a9605f1fbe383bcedfb\",\"confirmations\":65549,\"value\":0.04900000,\"scriptPubKey\":{\"asm\":\"OP_DUP OP_HASH160 29a7bd36e6913b674bb2b5c65e61a6544426ddd7 OP_EQUALVERIFY OP_CHECKSIG\",\"hex\":\"76a91429a7bd36e6913b674bb2b5c65e61a6544426ddd788ac\",\"reqSigs\":1,\"type\":\"pubkeyhash\",\"addresses\":[\"RD5Sj6igy53nscMiFS4ECXByfqVeyV9NdG\"]},\"version\":1,\"coinbase\":false,\"randipbits\":579036043,\"coin\":\"KMD\",\"txid\":\"b32af9977bc8ed0e54631d27f490c79841a03bccce4d6b8181456657b06194ef\",\"vout\":0,\"amount\":0.04900000}, {\"bestblock\":\"0000119186ecfaa8d72a7d3c62e78135043db220a6d29a9605f1fbe383bcedfb\",\"confirmations\":65553,\"value\":1,\"scriptPubKey\":{\"asm\":\"OP_DUP OP_HASH160 29a7bd36e6913b674bb2b5c65e61a6544426ddd7 OP_EQUALVERIFY OP_CHECKSIG\",\"hex\":\"76a91429a7bd36e6913b674bb2b5c65e61a6544426ddd788ac\",\"reqSigs\":1,\"type\":\"pubkeyhash\",\"addresses\":[\"RD5Sj6igy53nscMiFS4ECXByfqVeyV9NdG\"]},\"version\":1,\"coinbase\":false,\"randipbits\":3795805790,\"coin\":\"KMD\",\"txid\":\"84ca2ba7f621c820ab642e358813fcc33171c9999a47bb99dcf3a309dc847419\",\"vout\":1,\"amount\":1}]}"
+

iguana/tests/dexgetO

@@ -1,2 +1,2 @@
 #!/bin/bash
-curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"gettxout\",\"vout\":1,\"txid\":\"fa3321ed55e8e96ba7221e9cc4bc54b735616649abcc9734bb73f505ee712884\",\"symbol\":\"KMD\"}"
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"gettxout\",\"vout\":1,\"txid\":\"4a1a2026718ac10bd11ccccbdd85f29faa5f0b7c3ab95a57dcf7040c5ca0420c\",\"symbol\":\"KMD\"}"

iguana/tests/dexgetT

@@ -1,2 +1,2 @@
 #!/bin/bash
-curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"gettransaction\",\"txid\":\"790211d19afd88f00537c2b847772cebe01853617528990e1c1f59eb45d2f1d9\",\"symbol\":\"KMD\"}"
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"gettransaction\",\"txid\":\"88794bbb699f130951c40dc99a27d2c7c7016e12824fd1040cbedf86980de04d\",\"symbol\":\"REVS\"}"

iguana/tests/dexgetbalance

@@ -1,2 +1,2 @@
 #!/bin/bash
-curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"getbalance\",\"address\":\"RU58D7nNLXwD29hgC2MPgtAF458gGxnPYS\",\"symbol\":\"KMD\"}"
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"getbalance\",\"address\":\"RAGhCfNvxpL55JFV7h2HQa5dSEK86Jg3ic\",\"symbol\":\"KMD\"}"

iguana/tests/dexkvupdate

@@ -1,3 +1,3 @@
 #!/bin/bash
-curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"kvupdate\",\"key\":\"test\",\"value\":\"$1\",\"flags\":0,\"symbol\":\"KMD\"}"
-curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"kvupdate\",\"key\":\"test\",\"value\":\"$1\",\"flags\":0,\"symbol\":\"KV\"}"
+#curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"kvupdate\",\"key\":\"test\",\"value\":\"$1\",\"flags\":0,\"symbol\":\"KMD\"}"
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"kvupdate\",\"key\":\"testtest\",\"value\":\"$1\",\"flags\":0,\"symbol\":\"KV\"}"

iguana/tests/dexlistunspent

@@ -1,2 +1,2 @@
 #!/bin/bash
-curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent2\",\"address\":\"RDKb3QykRJNfLKWLcbbv9z7xqbtxwB54GC\",\"symbol\":\"KMD\"}"
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listunspent\",\"address\":\"1Hgzt5xsnbfc8UTWqWKSTLRm5bEYHYBoCE\",\"symbol\":\"BTC\"}"

iguana/tests/dexpsock

@@ -0,0 +1,2 @@
+#!/bin/bash
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"psock\"}"

iguana/tests/dexsendrawtransaction

@@ -1,2 +1,2 @@
 #!/bin/bash
-curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"sendrawtransaction\",\"signedtx\":\"0100000001372105704c1303f4c928b788becce75b653b5e83d56fc25893f682875f9df00e010000006a47304402203c3e71c309fcf70d1b1b42207824b37cfec918930000b8d812844be9a8d06bae02202eafe0515f6cd775ba06be0fab6cea667a23508e69334310b959ebd7eade38c9012102320228e3f6f9b8db3d905bc21cefde46e72d622021b8fd40344ac2ab8346c287ffffffff02b0e20d000000000017a914077fa9d41d53cc38118b8280e97e4aee576d6e5a87c08c8a00000000001976a914838f4ea2f88f24b87247b72a1d66da225653e39788ac00000000\",\"symbol\":\"USD\"}"
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"sendrawtransaction\",\"signedtx\":\"01000000010c42a05c0c04f7dc575ab93a7c0b5faa9ff285ddcbcc1cd10bc18a7126201a4a010000006b483045022100814b44c4af1beeb7ab3abdd7dfd95216b48da2f47ded4137f3dca366db4a94bc0220686108f29cc1eea5c845b7571e01412a373e5077d448e021bac7e8a19ec451a20121025879c9eaa100984ee1faaeb55bcbafed5b1f565c35ed7ebaadcce0a8416e6263ffffffff0240420f00000000001976a914c5a58530ee7bec4f5ab9a8c0c63069484273276c88ac34955836020000001976a914971f98b33fb838faee190e2fab799440d8c5170288acf70ab858\",\"symbol\":\"KMD\"}"

iguana/tests/jumblrstatus

@@ -0,0 +1,2 @@
+#!/bin/bash
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"jumblr\",\"method\":\"status\"}"

iguana/tests/loop

@@ -1,8 +1,6 @@
 #!/bin/bash
-pkill iguana
 while true
 do
-../../agents/iguana
-sleep 3
+./dexgetinfo
 done
 

iguana/tests/notlp

@@ -0,0 +1,2 @@
+#!/bin/bash
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"tradebot\",\"method\":\"notlp\"}"

iguana/tests/request

@@ -1,3 +1,3 @@
 #!/bin/bash
-curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"InstantDEX\",\"method\":\"request\",\"vals\":{\"source\":\"BTCD\",\"amount\":0.03,\"dest\":\"BTC\",\"minprice\":0.002}}"
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"InstantDEX\",\"method\":\"request\",\"vals\":{\"source\":\"KMD\",\"amount\":20,\"dest\":\"USD\",\"minprice\":0.08}}"
 

iguana/tests/swaplist

@@ -0,0 +1,2 @@
+#!/bin/bash
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"InstantDEX\",\"method\":\"getswaplist\"}"

iguana/tests/test

@@ -1,3 +0,0 @@
-#!/bin/bash
-echo "{\"field\":\"requiredvalue\"}" > /tmp/foo
-./jsoncmp /tmp/foo {\"fields\":[{\"field\":\"requiredvalue\"}]}

iguana/tests/utxorawtx

@@ -1,2 +1,2 @@
 #!/bin/bash
-curl --url "http://127.0.0.1:7778" --data "{\"symbol\":\"KMD\",\"agent\":\"basilisk\",\"method\":\"utxorawtx\",\"vals\":{\"timelock\":0,\"changeaddr\":\"RNmvQtThVZAbc1tFEFmKAnJZrc9XqciNog\",\"destaddr\":\"RHfraY22xd9aAuuUJ6Yjb6HFUXh535z6Lg\",\"txfee\":0.00011,\"amount\":0.01,\"sendflag\":0},\"utxos\":[{\"bestblock\":\"000000a7d7b317af7169a156f6b4b9538293da2a3707a69aa3048998a87fbf2c\",\"confirmations\":0,\"value\":0.02,\"scriptPubKey\":{\"asm\":\"OP_DUP OP_HASH160 b7128d2ee837cf03e30a2c0e3e0181f7b9669bb6 OP_EQUALVERIFY OP_CHECKSIG\",\"hex\":\"76a914b7128d2ee837cf03e30a2c0e3e0181f7b9669bb688ac\",\"reqSigs\":1,\"type\":\"pubkeyhash\",\"addresses\":[\"RRyBxbrAPRUBCUpiJgJZYrkxqrh8x5ta9Z\"]},\"version\":1,\"coinbase\":false,\"randipbits\":3350674129,\"coin\":\"KMD\",\"txid\":\"9329814cc4c7a8cabf83627d4228c1a2090e776d669c585d824d912ce2e13b13\",\"vout\":1,\"amount\":0.02}]}"
+curl --url "http://127.0.0.1:7778" --data "{\"symbol\":\"BTC\",\"agent\":\"basilisk\",\"method\":\"utxorawtx\",\"vals\":{\"timelock\":0,\"changeaddr\":\"1P3rU1Nk1pmc2BiWC8dEy9bZa1ZbMp5jfg\",\"destaddr\":\"1P3rU1Nk1pmc2BiWC8dEy9bZa1ZbMp5jfg\",\"txfee\":0,\"amount\":0.0001,\"sendflag\":0},\"utxos\":[{\"value\":0.00100000,\"address\":\"1Hgzt5xsnbfc8UTWqWKSTLRm5bEYHYBoCE\",\"scriptPubKey\":\"76a914b7128d2ee837cf03e30a2c0e3e0181f7b9669bb688ac\",\"confirmations\":23351,\"spendable\":true}]}"

iguana/tests/walletpassphrase

@@ -1,3 +1,4 @@
 #!/bin/bash
 #curl --url "http://127.0.0.1:7778" --data "{\"method\":\"walletpassphrase\",\"params\":[\"test\", 600]}"
 curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"bitcoinrpc\",\"method\":\"walletpassphrase\",\"password\":\"test\",\"timeout\":86444}"
+curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"jumblr\",\"method\":\"setpassphrase\",\"passphrase\":\"jumblr test\"}"

includes/curl/.gitignore

@@ -0,0 +1,4 @@
+curlbuild.h
+curlver.h.dist
+stamp-h2
+stamp-h3

includes/curl/Makefile.am

@@ -0,0 +1,53 @@
+#***************************************************************************
+#                                  _   _ ____  _
+#  Project                     ___| | | |  _ \| |
+#                             / __| | | | |_) | |
+#                            | (__| |_| |  _ <| |___
+#                             \___|\___/|_| \_\_____|
+#
+# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+#
+# This software is licensed as described in the file COPYING, which
+# you should have received as part of this distribution. The terms
+# are also available at https://curl.haxx.se/docs/copyright.html.
+#
+# You may opt to use, copy, modify, merge, publish, distribute and/or sell
+# copies of the Software, and permit persons to whom the Software is
+# furnished to do so, under the terms of the COPYING file.
+#
+# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+# KIND, either express or implied.
+#
+###########################################################################
+pkginclude_HEADERS = \
+	curl.h curlver.h easy.h mprintf.h stdcheaders.h multi.h \
+	typecheck-gcc.h curlbuild.h curlrules.h
+
+pkgincludedir= $(includedir)/curl
+
+# curlbuild.h does not exist in the git tree. When the original libcurl
+# source code distribution archive file is created, curlbuild.h.dist is
+# renamed to curlbuild.h and included in the tarball so that it can be
+# used directly on non-configure systems.
+#
+# The distributed curlbuild.h will be overwritten on configure systems
+# when the configure script runs, with one that is suitable and specific
+# to the library being configured and built.
+#
+# curlbuild.h.in is the distributed template file from which the configure
+# script creates curlbuild.h at library configuration time, overwiting the
+# one included in the distribution archive.
+#
+# curlbuild.h.dist is not included in the source code distribution archive.
+
+EXTRA_DIST = curlbuild.h.in
+
+DISTCLEANFILES = curlbuild.h
+
+checksrc:
+	@@PERL@ $(top_srcdir)/lib/checksrc.pl -Wcurlbuild.h -D$(top_srcdir)/include/curl $(pkginclude_HEADERS) $(EXTRA_DIST)
+
+if CURLDEBUG
+# for debug builds, we scan the sources on all regular make invokes
+all-local: checksrc
+endif

includes/curl/curlbuild.h

@@ -0,0 +1,586 @@
+#ifndef __CURL_CURLBUILD_H
+#define __CURL_CURLBUILD_H
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at https://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ***************************************************************************/
+
+/* ================================================================ */
+/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
+/* ================================================================ */
+
+/*
+ * NOTE 1:
+ * -------
+ *
+ * See file include/curl/curlbuild.h.in, run configure, and forget
+ * that this file exists it is only used for non-configure systems.
+ * But you can keep reading if you want ;-)
+ *
+ */
+
+/* ================================================================ */
+/*                 NOTES FOR NON-CONFIGURE SYSTEMS                  */
+/* ================================================================ */
+
+/*
+ * NOTE 1:
+ * -------
+ *
+ * Nothing in this file is intended to be modified or adjusted by the
+ * curl library user nor by the curl library builder.
+ *
+ * If you think that something actually needs to be changed, adjusted
+ * or fixed in this file, then, report it on the libcurl development
+ * mailing list: https://cool.haxx.se/mailman/listinfo/curl-library/
+ *
+ * Try to keep one section per platform, compiler and architecture,
+ * otherwise, if an existing section is reused for a different one and
+ * later on the original is adjusted, probably the piggybacking one can
+ * be adversely changed.
+ *
+ * In order to differentiate between platforms/compilers/architectures
+ * use only compiler built in predefined preprocessor symbols.
+ *
+ * This header file shall only export symbols which are 'curl' or 'CURL'
+ * prefixed, otherwise public name space would be polluted.
+ *
+ * NOTE 2:
+ * -------
+ *
+ * For any given platform/compiler curl_off_t must be typedef'ed to a
+ * 64-bit wide signed integral data type. The width of this data type
+ * must remain constant and independent of any possible large file
+ * support settings.
+ *
+ * As an exception to the above, curl_off_t shall be typedef'ed to a
+ * 32-bit wide signed integral data type if there is no 64-bit type.
+ *
+ * As a general rule, curl_off_t shall not be mapped to off_t. This
+ * rule shall only be violated if off_t is the only 64-bit data type
+ * available and the size of off_t is independent of large file support
+ * settings. Keep your build on the safe side avoiding an off_t gating.
+ * If you have a 64-bit off_t then take for sure that another 64-bit
+ * data type exists, dig deeper and you will find it.
+ *
+ * NOTE 3:
+ * -------
+ *
+ * Right now you might be staring at file include/curl/curlbuild.h.dist or
+ * at file include/curl/curlbuild.h, this is due to the following reason:
+ * file include/curl/curlbuild.h.dist is renamed to include/curl/curlbuild.h
+ * when the libcurl source code distribution archive file is created.
+ *
+ * File include/curl/curlbuild.h.dist is not included in the distribution
+ * archive. File include/curl/curlbuild.h is not present in the git tree.
+ *
+ * The distributed include/curl/curlbuild.h file is only intended to be used
+ * on systems which can not run the also distributed configure script.
+ *
+ * On systems capable of running the configure script, the configure process
+ * will overwrite the distributed include/curl/curlbuild.h file with one that
+ * is suitable and specific to the library being configured and built, which
+ * is generated from the include/curl/curlbuild.h.in template file.
+ *
+ * If you check out from git on a non-configure platform, you must run the
+ * appropriate buildconf* script to set up curlbuild.h and other local files.
+ *
+ */
+
+/* ================================================================ */
+/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
+/* ================================================================ */
+
+#ifdef CURL_SIZEOF_LONG
+#  error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined
+#endif
+
+#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
+#  error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined
+#endif
+
+#ifdef CURL_SIZEOF_CURL_SOCKLEN_T
+#  error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined
+#endif
+
+#ifdef CURL_TYPEOF_CURL_OFF_T
+#  error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined
+#endif
+
+#ifdef CURL_FORMAT_CURL_OFF_T
+#  error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined
+#endif
+
+#ifdef CURL_FORMAT_CURL_OFF_TU
+#  error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined
+#endif
+
+#ifdef CURL_FORMAT_OFF_T
+#  error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined
+#endif
+
+#ifdef CURL_SIZEOF_CURL_OFF_T
+#  error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined
+#endif
+
+#ifdef CURL_SUFFIX_CURL_OFF_T
+#  error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined
+#endif
+
+#ifdef CURL_SUFFIX_CURL_OFF_TU
+#  error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined
+#endif
+
+/* ================================================================ */
+/*    EXTERNAL INTERFACE SETTINGS FOR NON-CONFIGURE SYSTEMS ONLY    */
+/* ================================================================ */
+
+#if defined(__DJGPP__) || defined(__GO32__)
+#  if defined(__DJGPP__) && (__DJGPP__ > 1)
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long long
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
+#    define CURL_FORMAT_OFF_T          "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     LL
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
+#  else
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
+#    define CURL_FORMAT_OFF_T          "%ld"
+#    define CURL_SIZEOF_CURL_OFF_T     4
+#    define CURL_SUFFIX_CURL_OFF_T     L
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
+#  endif
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(__SALFORDC__)
+#  define CURL_SIZEOF_LONG           4
+#  define CURL_TYPEOF_CURL_OFF_T     long
+#  define CURL_FORMAT_CURL_OFF_T     "ld"
+#  define CURL_FORMAT_CURL_OFF_TU    "lu"
+#  define CURL_FORMAT_OFF_T          "%ld"
+#  define CURL_SIZEOF_CURL_OFF_T     4
+#  define CURL_SUFFIX_CURL_OFF_T     L
+#  define CURL_SUFFIX_CURL_OFF_TU    UL
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(__BORLANDC__)
+#  if (__BORLANDC__ < 0x520)
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
+#    define CURL_FORMAT_OFF_T          "%ld"
+#    define CURL_SIZEOF_CURL_OFF_T     4
+#    define CURL_SUFFIX_CURL_OFF_T     L
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
+#  else
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     __int64
+#    define CURL_FORMAT_CURL_OFF_T     "I64d"
+#    define CURL_FORMAT_CURL_OFF_TU    "I64u"
+#    define CURL_FORMAT_OFF_T          "%I64d"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     i64
+#    define CURL_SUFFIX_CURL_OFF_TU    ui64
+#  endif
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(__TURBOC__)
+#  define CURL_SIZEOF_LONG           4
+#  define CURL_TYPEOF_CURL_OFF_T     long
+#  define CURL_FORMAT_CURL_OFF_T     "ld"
+#  define CURL_FORMAT_CURL_OFF_TU    "lu"
+#  define CURL_FORMAT_OFF_T          "%ld"
+#  define CURL_SIZEOF_CURL_OFF_T     4
+#  define CURL_SUFFIX_CURL_OFF_T     L
+#  define CURL_SUFFIX_CURL_OFF_TU    UL
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(__WATCOMC__)
+#  if defined(__386__)
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     __int64
+#    define CURL_FORMAT_CURL_OFF_T     "I64d"
+#    define CURL_FORMAT_CURL_OFF_TU    "I64u"
+#    define CURL_FORMAT_OFF_T          "%I64d"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     i64
+#    define CURL_SUFFIX_CURL_OFF_TU    ui64
+#  else
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
+#    define CURL_FORMAT_OFF_T          "%ld"
+#    define CURL_SIZEOF_CURL_OFF_T     4
+#    define CURL_SUFFIX_CURL_OFF_T     L
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
+#  endif
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(__POCC__)
+#  if (__POCC__ < 280)
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
+#    define CURL_FORMAT_OFF_T          "%ld"
+#    define CURL_SIZEOF_CURL_OFF_T     4
+#    define CURL_SUFFIX_CURL_OFF_T     L
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
+#  elif defined(_MSC_VER)
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     __int64
+#    define CURL_FORMAT_CURL_OFF_T     "I64d"
+#    define CURL_FORMAT_CURL_OFF_TU    "I64u"
+#    define CURL_FORMAT_OFF_T          "%I64d"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     i64
+#    define CURL_SUFFIX_CURL_OFF_TU    ui64
+#  else
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long long
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
+#    define CURL_FORMAT_OFF_T          "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     LL
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
+#  endif
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(__LCC__)
+#  define CURL_SIZEOF_LONG           4
+#  define CURL_TYPEOF_CURL_OFF_T     long
+#  define CURL_FORMAT_CURL_OFF_T     "ld"
+#  define CURL_FORMAT_CURL_OFF_TU    "lu"
+#  define CURL_FORMAT_OFF_T          "%ld"
+#  define CURL_SIZEOF_CURL_OFF_T     4
+#  define CURL_SUFFIX_CURL_OFF_T     L
+#  define CURL_SUFFIX_CURL_OFF_TU    UL
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(__SYMBIAN32__)
+#  if defined(__EABI__)  /* Treat all ARM compilers equally */
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long long
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
+#    define CURL_FORMAT_OFF_T          "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     LL
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
+#  elif defined(__CW32__)
+#    pragma longlong on
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long long
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
+#    define CURL_FORMAT_OFF_T          "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     LL
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
+#  elif defined(__VC32__)
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     __int64
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
+#    define CURL_FORMAT_OFF_T          "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     LL
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
+#  endif
+#  define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(__MWERKS__)
+#  define CURL_SIZEOF_LONG           4
+#  define CURL_TYPEOF_CURL_OFF_T     long long
+#  define CURL_FORMAT_CURL_OFF_T     "lld"
+#  define CURL_FORMAT_CURL_OFF_TU    "llu"
+#  define CURL_FORMAT_OFF_T          "%lld"
+#  define CURL_SIZEOF_CURL_OFF_T     8
+#  define CURL_SUFFIX_CURL_OFF_T     LL
+#  define CURL_SUFFIX_CURL_OFF_TU    ULL
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(_WIN32_WCE)
+#  define CURL_SIZEOF_LONG           4
+#  define CURL_TYPEOF_CURL_OFF_T     __int64
+#  define CURL_FORMAT_CURL_OFF_T     "I64d"
+#  define CURL_FORMAT_CURL_OFF_TU    "I64u"
+#  define CURL_FORMAT_OFF_T          "%I64d"
+#  define CURL_SIZEOF_CURL_OFF_T     8
+#  define CURL_SUFFIX_CURL_OFF_T     i64
+#  define CURL_SUFFIX_CURL_OFF_TU    ui64
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(__MINGW32__)
+#  define CURL_SIZEOF_LONG           4
+#  define CURL_TYPEOF_CURL_OFF_T     long long
+#  define CURL_FORMAT_CURL_OFF_T     "I64d"
+#  define CURL_FORMAT_CURL_OFF_TU    "I64u"
+#  define CURL_FORMAT_OFF_T          "%I64d"
+#  define CURL_SIZEOF_CURL_OFF_T     8
+#  define CURL_SUFFIX_CURL_OFF_T     LL
+#  define CURL_SUFFIX_CURL_OFF_TU    ULL
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(__VMS)
+#  if defined(__VAX)
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
+#    define CURL_FORMAT_OFF_T          "%ld"
+#    define CURL_SIZEOF_CURL_OFF_T     4
+#    define CURL_SUFFIX_CURL_OFF_T     L
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
+#  else
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long long
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
+#    define CURL_FORMAT_OFF_T          "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     LL
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
+#  endif
+#  define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(__OS400__)
+#  if defined(__ILEC400__)
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long long
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
+#    define CURL_FORMAT_OFF_T          "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     LL
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
+#    define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
+#    define CURL_SIZEOF_CURL_SOCKLEN_T 4
+#    define CURL_PULL_SYS_TYPES_H      1
+#    define CURL_PULL_SYS_SOCKET_H     1
+#  endif
+
+#elif defined(__MVS__)
+#  if defined(__IBMC__) || defined(__IBMCPP__)
+#    if defined(_ILP32)
+#      define CURL_SIZEOF_LONG           4
+#    elif defined(_LP64)
+#      define CURL_SIZEOF_LONG           8
+#    endif
+#    if defined(_LONG_LONG)
+#      define CURL_TYPEOF_CURL_OFF_T     long long
+#      define CURL_FORMAT_CURL_OFF_T     "lld"
+#      define CURL_FORMAT_CURL_OFF_TU    "llu"
+#      define CURL_FORMAT_OFF_T          "%lld"
+#      define CURL_SIZEOF_CURL_OFF_T     8
+#      define CURL_SUFFIX_CURL_OFF_T     LL
+#      define CURL_SUFFIX_CURL_OFF_TU    ULL
+#    elif defined(_LP64)
+#      define CURL_TYPEOF_CURL_OFF_T     long
+#      define CURL_FORMAT_CURL_OFF_T     "ld"
+#      define CURL_FORMAT_CURL_OFF_TU    "lu"
+#      define CURL_FORMAT_OFF_T          "%ld"
+#      define CURL_SIZEOF_CURL_OFF_T     8
+#      define CURL_SUFFIX_CURL_OFF_T     L
+#      define CURL_SUFFIX_CURL_OFF_TU    UL
+#    else
+#      define CURL_TYPEOF_CURL_OFF_T     long
+#      define CURL_FORMAT_CURL_OFF_T     "ld"
+#      define CURL_FORMAT_CURL_OFF_TU    "lu"
+#      define CURL_FORMAT_OFF_T          "%ld"
+#      define CURL_SIZEOF_CURL_OFF_T     4
+#      define CURL_SUFFIX_CURL_OFF_T     L
+#      define CURL_SUFFIX_CURL_OFF_TU    UL
+#    endif
+#    define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
+#    define CURL_SIZEOF_CURL_SOCKLEN_T 4
+#    define CURL_PULL_SYS_TYPES_H      1
+#    define CURL_PULL_SYS_SOCKET_H     1
+#  endif
+
+#elif defined(__370__)
+#  if defined(__IBMC__) || defined(__IBMCPP__)
+#    if defined(_ILP32)
+#      define CURL_SIZEOF_LONG           4
+#    elif defined(_LP64)
+#      define CURL_SIZEOF_LONG           8
+#    endif
+#    if defined(_LONG_LONG)
+#      define CURL_TYPEOF_CURL_OFF_T     long long
+#      define CURL_FORMAT_CURL_OFF_T     "lld"
+#      define CURL_FORMAT_CURL_OFF_TU    "llu"
+#      define CURL_FORMAT_OFF_T          "%lld"
+#      define CURL_SIZEOF_CURL_OFF_T     8
+#      define CURL_SUFFIX_CURL_OFF_T     LL
+#      define CURL_SUFFIX_CURL_OFF_TU    ULL
+#    elif defined(_LP64)
+#      define CURL_TYPEOF_CURL_OFF_T     long
+#      define CURL_FORMAT_CURL_OFF_T     "ld"
+#      define CURL_FORMAT_CURL_OFF_TU    "lu"
+#      define CURL_FORMAT_OFF_T          "%ld"
+#      define CURL_SIZEOF_CURL_OFF_T     8
+#      define CURL_SUFFIX_CURL_OFF_T     L
+#      define CURL_SUFFIX_CURL_OFF_TU    UL
+#    else
+#      define CURL_TYPEOF_CURL_OFF_T     long
+#      define CURL_FORMAT_CURL_OFF_T     "ld"
+#      define CURL_FORMAT_CURL_OFF_TU    "lu"
+#      define CURL_FORMAT_OFF_T          "%ld"
+#      define CURL_SIZEOF_CURL_OFF_T     4
+#      define CURL_SUFFIX_CURL_OFF_T     L
+#      define CURL_SUFFIX_CURL_OFF_TU    UL
+#    endif
+#    define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
+#    define CURL_SIZEOF_CURL_SOCKLEN_T 4
+#    define CURL_PULL_SYS_TYPES_H      1
+#    define CURL_PULL_SYS_SOCKET_H     1
+#  endif
+
+#elif defined(TPF)
+#  define CURL_SIZEOF_LONG           8
+#  define CURL_TYPEOF_CURL_OFF_T     long
+#  define CURL_FORMAT_CURL_OFF_T     "ld"
+#  define CURL_FORMAT_CURL_OFF_TU    "lu"
+#  define CURL_FORMAT_OFF_T          "%ld"
+#  define CURL_SIZEOF_CURL_OFF_T     8
+#  define CURL_SUFFIX_CURL_OFF_T     L
+#  define CURL_SUFFIX_CURL_OFF_TU    UL
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+/* ===================================== */
+/*    KEEP MSVC THE PENULTIMATE ENTRY    */
+/* ===================================== */
+
+#elif defined(_MSC_VER)
+#  if (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     __int64
+#    define CURL_FORMAT_CURL_OFF_T     "I64d"
+#    define CURL_FORMAT_CURL_OFF_TU    "I64u"
+#    define CURL_FORMAT_OFF_T          "%I64d"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     i64
+#    define CURL_SUFFIX_CURL_OFF_TU    ui64
+#  else
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
+#    define CURL_FORMAT_OFF_T          "%ld"
+#    define CURL_SIZEOF_CURL_OFF_T     4
+#    define CURL_SUFFIX_CURL_OFF_T     L
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
+#  endif
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+/* ===================================== */
+/*    KEEP GENERIC GCC THE LAST ENTRY    */
+/* ===================================== */
+
+#elif defined(__GNUC__)
+#  if !defined(__LP64__) && (defined(__ILP32__) || \
+      defined(__i386__) || defined(__ppc__) || defined(__arm__) || \
+      defined(__sparc__) || defined(__mips__) || defined(__sh__))
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long long
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
+#    define CURL_FORMAT_OFF_T          "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     LL
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
+#  elif defined(__LP64__) || \
+        defined(__x86_64__) || defined(__ppc64__) || defined(__sparc64__)
+#    define CURL_SIZEOF_LONG           8
+#    define CURL_TYPEOF_CURL_OFF_T     long
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
+#    define CURL_FORMAT_OFF_T          "%ld"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     L
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
+#  endif
+#  define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+#  define CURL_PULL_SYS_TYPES_H      1
+#  define CURL_PULL_SYS_SOCKET_H     1
+
+#else
+#  error "Unknown non-configure build target!"
+   Error Compilation_aborted_Unknown_non_configure_build_target
+#endif
+
+/* CURL_PULL_SYS_TYPES_H is defined above when inclusion of header file  */
+/* sys/types.h is required here to properly make type definitions below. */
+#ifdef CURL_PULL_SYS_TYPES_H
+#  include <sys/types.h>
+#endif
+
+/* CURL_PULL_SYS_SOCKET_H is defined above when inclusion of header file  */
+/* sys/socket.h is required here to properly make type definitions below. */
+#ifdef CURL_PULL_SYS_SOCKET_H
+#  include <sys/socket.h>
+#endif
+
+/* Data type definition of curl_socklen_t. */
+
+#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
+  typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
+#endif
+
+/* Data type definition of curl_off_t. */
+
+#ifdef CURL_TYPEOF_CURL_OFF_T
+  typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
+#endif
+
+#endif /* __CURL_CURLBUILD_H */

includes/curl/curlbuild.h.cmake

@@ -0,0 +1,197 @@
+#ifndef __CURL_CURLBUILD_H
+#define __CURL_CURLBUILD_H
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at https://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ***************************************************************************/
+
+/* ================================================================ */
+/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
+/* ================================================================ */
+
+/*
+ * NOTE 1:
+ * -------
+ *
+ * Nothing in this file is intended to be modified or adjusted by the
+ * curl library user nor by the curl library builder.
+ *
+ * If you think that something actually needs to be changed, adjusted
+ * or fixed in this file, then, report it on the libcurl development
+ * mailing list: https://cool.haxx.se/mailman/listinfo/curl-library/
+ *
+ * This header file shall only export symbols which are 'curl' or 'CURL'
+ * prefixed, otherwise public name space would be polluted.
+ *
+ * NOTE 2:
+ * -------
+ *
+ * Right now you might be staring at file include/curl/curlbuild.h.in or
+ * at file include/curl/curlbuild.h, this is due to the following reason:
+ *
+ * On systems capable of running the configure script, the configure process
+ * will overwrite the distributed include/curl/curlbuild.h file with one that
+ * is suitable and specific to the library being configured and built, which
+ * is generated from the include/curl/curlbuild.h.in template file.
+ *
+ */
+
+/* ================================================================ */
+/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
+/* ================================================================ */
+
+#ifdef CURL_SIZEOF_LONG
+#error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined
+#endif
+
+#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
+#error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined
+#endif
+
+#ifdef CURL_SIZEOF_CURL_SOCKLEN_T
+#error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined
+#endif
+
+#ifdef CURL_TYPEOF_CURL_OFF_T
+#error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined
+#endif
+
+#ifdef CURL_FORMAT_CURL_OFF_T
+#error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined
+#endif
+
+#ifdef CURL_FORMAT_CURL_OFF_TU
+#error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined
+#endif
+
+#ifdef CURL_FORMAT_OFF_T
+#error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined
+#endif
+
+#ifdef CURL_SIZEOF_CURL_OFF_T
+#error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined
+#endif
+
+#ifdef CURL_SUFFIX_CURL_OFF_T
+#error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined
+#endif
+
+#ifdef CURL_SUFFIX_CURL_OFF_TU
+#error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined
+#endif
+
+/* ================================================================ */
+/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
+/* ================================================================ */
+
+/* Configure process defines this to 1 when it finds out that system  */
+/* header file ws2tcpip.h must be included by the external interface. */
+#cmakedefine CURL_PULL_WS2TCPIP_H
+#ifdef CURL_PULL_WS2TCPIP_H
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
+#  include <windows.h>
+#  include <winsock2.h>
+#  include <ws2tcpip.h>
+#endif
+
+/* Configure process defines this to 1 when it finds out that system   */
+/* header file sys/types.h must be included by the external interface. */
+#cmakedefine CURL_PULL_SYS_TYPES_H
+#ifdef CURL_PULL_SYS_TYPES_H
+#  include <sys/types.h>
+#endif
+
+/* Configure process defines this to 1 when it finds out that system */
+/* header file stdint.h must be included by the external interface.  */
+#cmakedefine CURL_PULL_STDINT_H
+#ifdef CURL_PULL_STDINT_H
+#  include <stdint.h>
+#endif
+
+/* Configure process defines this to 1 when it finds out that system  */
+/* header file inttypes.h must be included by the external interface. */
+#cmakedefine CURL_PULL_INTTYPES_H
+#ifdef CURL_PULL_INTTYPES_H
+#  include <inttypes.h>
+#endif
+
+/* Configure process defines this to 1 when it finds out that system    */
+/* header file sys/socket.h must be included by the external interface. */
+#cmakedefine CURL_PULL_SYS_SOCKET_H
+#ifdef CURL_PULL_SYS_SOCKET_H
+#  include <sys/socket.h>
+#endif
+
+/* Configure process defines this to 1 when it finds out that system  */
+/* header file sys/poll.h must be included by the external interface. */
+#cmakedefine CURL_PULL_SYS_POLL_H
+#ifdef CURL_PULL_SYS_POLL_H
+#  include <sys/poll.h>
+#endif
+
+/* The size of `long', as computed by sizeof. */
+#define CURL_SIZEOF_LONG ${CURL_SIZEOF_LONG}
+
+/* Integral data type used for curl_socklen_t. */
+#define CURL_TYPEOF_CURL_SOCKLEN_T ${CURL_TYPEOF_CURL_SOCKLEN_T}
+
+/* The size of `curl_socklen_t', as computed by sizeof. */
+#define CURL_SIZEOF_CURL_SOCKLEN_T ${CURL_SIZEOF_CURL_SOCKLEN_T}
+
+/* Data type definition of curl_socklen_t. */
+typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
+
+/* Signed integral data type used for curl_off_t. */
+#define CURL_TYPEOF_CURL_OFF_T ${CURL_TYPEOF_CURL_OFF_T}
+
+/* Data type definition of curl_off_t. */
+typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
+
+/* curl_off_t formatting string directive without "%" conversion specifier. */
+#define CURL_FORMAT_CURL_OFF_T "${CURL_FORMAT_CURL_OFF_T}"
+
+/* unsigned curl_off_t formatting string without "%" conversion specifier. */
+#define CURL_FORMAT_CURL_OFF_TU "${CURL_FORMAT_CURL_OFF_TU}"
+
+/* curl_off_t formatting string directive with "%" conversion specifier. */
+#define CURL_FORMAT_OFF_T "${CURL_FORMAT_OFF_T}"
+
+/* The size of `curl_off_t', as computed by sizeof. */
+#define CURL_SIZEOF_CURL_OFF_T ${CURL_SIZEOF_CURL_OFF_T}
+
+/* curl_off_t constant suffix. */
+#define CURL_SUFFIX_CURL_OFF_T ${CURL_SUFFIX_CURL_OFF_T}
+
+/* unsigned curl_off_t constant suffix. */
+#define CURL_SUFFIX_CURL_OFF_TU ${CURL_SUFFIX_CURL_OFF_TU}
+
+#endif /* __CURL_CURLBUILD_H */

includes/curl/curlbuild.h.dist

@@ -0,0 +1,586 @@
+#ifndef __CURL_CURLBUILD_H
+#define __CURL_CURLBUILD_H
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at https://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ***************************************************************************/
+
+/* ================================================================ */
+/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
+/* ================================================================ */
+
+/*
+ * NOTE 1:
+ * -------
+ *
+ * See file include/curl/curlbuild.h.in, run configure, and forget
+ * that this file exists it is only used for non-configure systems.
+ * But you can keep reading if you want ;-)
+ *
+ */
+
+/* ================================================================ */
+/*                 NOTES FOR NON-CONFIGURE SYSTEMS                  */
+/* ================================================================ */
+
+/*
+ * NOTE 1:
+ * -------
+ *
+ * Nothing in this file is intended to be modified or adjusted by the
+ * curl library user nor by the curl library builder.
+ *
+ * If you think that something actually needs to be changed, adjusted
+ * or fixed in this file, then, report it on the libcurl development
+ * mailing list: https://cool.haxx.se/mailman/listinfo/curl-library/
+ *
+ * Try to keep one section per platform, compiler and architecture,
+ * otherwise, if an existing section is reused for a different one and
+ * later on the original is adjusted, probably the piggybacking one can
+ * be adversely changed.
+ *
+ * In order to differentiate between platforms/compilers/architectures
+ * use only compiler built in predefined preprocessor symbols.
+ *
+ * This header file shall only export symbols which are 'curl' or 'CURL'
+ * prefixed, otherwise public name space would be polluted.
+ *
+ * NOTE 2:
+ * -------
+ *
+ * For any given platform/compiler curl_off_t must be typedef'ed to a
+ * 64-bit wide signed integral data type. The width of this data type
+ * must remain constant and independent of any possible large file
+ * support settings.
+ *
+ * As an exception to the above, curl_off_t shall be typedef'ed to a
+ * 32-bit wide signed integral data type if there is no 64-bit type.
+ *
+ * As a general rule, curl_off_t shall not be mapped to off_t. This
+ * rule shall only be violated if off_t is the only 64-bit data type
+ * available and the size of off_t is independent of large file support
+ * settings. Keep your build on the safe side avoiding an off_t gating.
+ * If you have a 64-bit off_t then take for sure that another 64-bit
+ * data type exists, dig deeper and you will find it.
+ *
+ * NOTE 3:
+ * -------
+ *
+ * Right now you might be staring at file include/curl/curlbuild.h.dist or
+ * at file include/curl/curlbuild.h, this is due to the following reason:
+ * file include/curl/curlbuild.h.dist is renamed to include/curl/curlbuild.h
+ * when the libcurl source code distribution archive file is created.
+ *
+ * File include/curl/curlbuild.h.dist is not included in the distribution
+ * archive. File include/curl/curlbuild.h is not present in the git tree.
+ *
+ * The distributed include/curl/curlbuild.h file is only intended to be used
+ * on systems which can not run the also distributed configure script.
+ *
+ * On systems capable of running the configure script, the configure process
+ * will overwrite the distributed include/curl/curlbuild.h file with one that
+ * is suitable and specific to the library being configured and built, which
+ * is generated from the include/curl/curlbuild.h.in template file.
+ *
+ * If you check out from git on a non-configure platform, you must run the
+ * appropriate buildconf* script to set up curlbuild.h and other local files.
+ *
+ */
+
+/* ================================================================ */
+/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
+/* ================================================================ */
+
+#ifdef CURL_SIZEOF_LONG
+#  error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined
+#endif
+
+#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
+#  error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined
+#endif
+
+#ifdef CURL_SIZEOF_CURL_SOCKLEN_T
+#  error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined
+#endif
+
+#ifdef CURL_TYPEOF_CURL_OFF_T
+#  error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined
+#endif
+
+#ifdef CURL_FORMAT_CURL_OFF_T
+#  error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined
+#endif
+
+#ifdef CURL_FORMAT_CURL_OFF_TU
+#  error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined
+#endif
+
+#ifdef CURL_FORMAT_OFF_T
+#  error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined
+#endif
+
+#ifdef CURL_SIZEOF_CURL_OFF_T
+#  error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined
+#endif
+
+#ifdef CURL_SUFFIX_CURL_OFF_T
+#  error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined
+#endif
+
+#ifdef CURL_SUFFIX_CURL_OFF_TU
+#  error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined
+#endif
+
+/* ================================================================ */
+/*    EXTERNAL INTERFACE SETTINGS FOR NON-CONFIGURE SYSTEMS ONLY    */
+/* ================================================================ */
+
+#if defined(__DJGPP__) || defined(__GO32__)
+#  if defined(__DJGPP__) && (__DJGPP__ > 1)
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long long
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
+#    define CURL_FORMAT_OFF_T          "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     LL
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
+#  else
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
+#    define CURL_FORMAT_OFF_T          "%ld"
+#    define CURL_SIZEOF_CURL_OFF_T     4
+#    define CURL_SUFFIX_CURL_OFF_T     L
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
+#  endif
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(__SALFORDC__)
+#  define CURL_SIZEOF_LONG           4
+#  define CURL_TYPEOF_CURL_OFF_T     long
+#  define CURL_FORMAT_CURL_OFF_T     "ld"
+#  define CURL_FORMAT_CURL_OFF_TU    "lu"
+#  define CURL_FORMAT_OFF_T          "%ld"
+#  define CURL_SIZEOF_CURL_OFF_T     4
+#  define CURL_SUFFIX_CURL_OFF_T     L
+#  define CURL_SUFFIX_CURL_OFF_TU    UL
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(__BORLANDC__)
+#  if (__BORLANDC__ < 0x520)
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
+#    define CURL_FORMAT_OFF_T          "%ld"
+#    define CURL_SIZEOF_CURL_OFF_T     4
+#    define CURL_SUFFIX_CURL_OFF_T     L
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
+#  else
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     __int64
+#    define CURL_FORMAT_CURL_OFF_T     "I64d"
+#    define CURL_FORMAT_CURL_OFF_TU    "I64u"
+#    define CURL_FORMAT_OFF_T          "%I64d"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     i64
+#    define CURL_SUFFIX_CURL_OFF_TU    ui64
+#  endif
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(__TURBOC__)
+#  define CURL_SIZEOF_LONG           4
+#  define CURL_TYPEOF_CURL_OFF_T     long
+#  define CURL_FORMAT_CURL_OFF_T     "ld"
+#  define CURL_FORMAT_CURL_OFF_TU    "lu"
+#  define CURL_FORMAT_OFF_T          "%ld"
+#  define CURL_SIZEOF_CURL_OFF_T     4
+#  define CURL_SUFFIX_CURL_OFF_T     L
+#  define CURL_SUFFIX_CURL_OFF_TU    UL
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(__WATCOMC__)
+#  if defined(__386__)
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     __int64
+#    define CURL_FORMAT_CURL_OFF_T     "I64d"
+#    define CURL_FORMAT_CURL_OFF_TU    "I64u"
+#    define CURL_FORMAT_OFF_T          "%I64d"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     i64
+#    define CURL_SUFFIX_CURL_OFF_TU    ui64
+#  else
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
+#    define CURL_FORMAT_OFF_T          "%ld"
+#    define CURL_SIZEOF_CURL_OFF_T     4
+#    define CURL_SUFFIX_CURL_OFF_T     L
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
+#  endif
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(__POCC__)
+#  if (__POCC__ < 280)
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
+#    define CURL_FORMAT_OFF_T          "%ld"
+#    define CURL_SIZEOF_CURL_OFF_T     4
+#    define CURL_SUFFIX_CURL_OFF_T     L
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
+#  elif defined(_MSC_VER)
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     __int64
+#    define CURL_FORMAT_CURL_OFF_T     "I64d"
+#    define CURL_FORMAT_CURL_OFF_TU    "I64u"
+#    define CURL_FORMAT_OFF_T          "%I64d"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     i64
+#    define CURL_SUFFIX_CURL_OFF_TU    ui64
+#  else
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long long
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
+#    define CURL_FORMAT_OFF_T          "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     LL
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
+#  endif
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(__LCC__)
+#  define CURL_SIZEOF_LONG           4
+#  define CURL_TYPEOF_CURL_OFF_T     long
+#  define CURL_FORMAT_CURL_OFF_T     "ld"
+#  define CURL_FORMAT_CURL_OFF_TU    "lu"
+#  define CURL_FORMAT_OFF_T          "%ld"
+#  define CURL_SIZEOF_CURL_OFF_T     4
+#  define CURL_SUFFIX_CURL_OFF_T     L
+#  define CURL_SUFFIX_CURL_OFF_TU    UL
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(__SYMBIAN32__)
+#  if defined(__EABI__)  /* Treat all ARM compilers equally */
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long long
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
+#    define CURL_FORMAT_OFF_T          "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     LL
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
+#  elif defined(__CW32__)
+#    pragma longlong on
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long long
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
+#    define CURL_FORMAT_OFF_T          "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     LL
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
+#  elif defined(__VC32__)
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     __int64
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
+#    define CURL_FORMAT_OFF_T          "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     LL
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
+#  endif
+#  define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(__MWERKS__)
+#  define CURL_SIZEOF_LONG           4
+#  define CURL_TYPEOF_CURL_OFF_T     long long
+#  define CURL_FORMAT_CURL_OFF_T     "lld"
+#  define CURL_FORMAT_CURL_OFF_TU    "llu"
+#  define CURL_FORMAT_OFF_T          "%lld"
+#  define CURL_SIZEOF_CURL_OFF_T     8
+#  define CURL_SUFFIX_CURL_OFF_T     LL
+#  define CURL_SUFFIX_CURL_OFF_TU    ULL
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(_WIN32_WCE)
+#  define CURL_SIZEOF_LONG           4
+#  define CURL_TYPEOF_CURL_OFF_T     __int64
+#  define CURL_FORMAT_CURL_OFF_T     "I64d"
+#  define CURL_FORMAT_CURL_OFF_TU    "I64u"
+#  define CURL_FORMAT_OFF_T          "%I64d"
+#  define CURL_SIZEOF_CURL_OFF_T     8
+#  define CURL_SUFFIX_CURL_OFF_T     i64
+#  define CURL_SUFFIX_CURL_OFF_TU    ui64
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(__MINGW32__)
+#  define CURL_SIZEOF_LONG           4
+#  define CURL_TYPEOF_CURL_OFF_T     long long
+#  define CURL_FORMAT_CURL_OFF_T     "I64d"
+#  define CURL_FORMAT_CURL_OFF_TU    "I64u"
+#  define CURL_FORMAT_OFF_T          "%I64d"
+#  define CURL_SIZEOF_CURL_OFF_T     8
+#  define CURL_SUFFIX_CURL_OFF_T     LL
+#  define CURL_SUFFIX_CURL_OFF_TU    ULL
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(__VMS)
+#  if defined(__VAX)
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
+#    define CURL_FORMAT_OFF_T          "%ld"
+#    define CURL_SIZEOF_CURL_OFF_T     4
+#    define CURL_SUFFIX_CURL_OFF_T     L
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
+#  else
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long long
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
+#    define CURL_FORMAT_OFF_T          "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     LL
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
+#  endif
+#  define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+#elif defined(__OS400__)
+#  if defined(__ILEC400__)
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long long
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
+#    define CURL_FORMAT_OFF_T          "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     LL
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
+#    define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
+#    define CURL_SIZEOF_CURL_SOCKLEN_T 4
+#    define CURL_PULL_SYS_TYPES_H      1
+#    define CURL_PULL_SYS_SOCKET_H     1
+#  endif
+
+#elif defined(__MVS__)
+#  if defined(__IBMC__) || defined(__IBMCPP__)
+#    if defined(_ILP32)
+#      define CURL_SIZEOF_LONG           4
+#    elif defined(_LP64)
+#      define CURL_SIZEOF_LONG           8
+#    endif
+#    if defined(_LONG_LONG)
+#      define CURL_TYPEOF_CURL_OFF_T     long long
+#      define CURL_FORMAT_CURL_OFF_T     "lld"
+#      define CURL_FORMAT_CURL_OFF_TU    "llu"
+#      define CURL_FORMAT_OFF_T          "%lld"
+#      define CURL_SIZEOF_CURL_OFF_T     8
+#      define CURL_SUFFIX_CURL_OFF_T     LL
+#      define CURL_SUFFIX_CURL_OFF_TU    ULL
+#    elif defined(_LP64)
+#      define CURL_TYPEOF_CURL_OFF_T     long
+#      define CURL_FORMAT_CURL_OFF_T     "ld"
+#      define CURL_FORMAT_CURL_OFF_TU    "lu"
+#      define CURL_FORMAT_OFF_T          "%ld"
+#      define CURL_SIZEOF_CURL_OFF_T     8
+#      define CURL_SUFFIX_CURL_OFF_T     L
+#      define CURL_SUFFIX_CURL_OFF_TU    UL
+#    else
+#      define CURL_TYPEOF_CURL_OFF_T     long
+#      define CURL_FORMAT_CURL_OFF_T     "ld"
+#      define CURL_FORMAT_CURL_OFF_TU    "lu"
+#      define CURL_FORMAT_OFF_T          "%ld"
+#      define CURL_SIZEOF_CURL_OFF_T     4
+#      define CURL_SUFFIX_CURL_OFF_T     L
+#      define CURL_SUFFIX_CURL_OFF_TU    UL
+#    endif
+#    define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
+#    define CURL_SIZEOF_CURL_SOCKLEN_T 4
+#    define CURL_PULL_SYS_TYPES_H      1
+#    define CURL_PULL_SYS_SOCKET_H     1
+#  endif
+
+#elif defined(__370__)
+#  if defined(__IBMC__) || defined(__IBMCPP__)
+#    if defined(_ILP32)
+#      define CURL_SIZEOF_LONG           4
+#    elif defined(_LP64)
+#      define CURL_SIZEOF_LONG           8
+#    endif
+#    if defined(_LONG_LONG)
+#      define CURL_TYPEOF_CURL_OFF_T     long long
+#      define CURL_FORMAT_CURL_OFF_T     "lld"
+#      define CURL_FORMAT_CURL_OFF_TU    "llu"
+#      define CURL_FORMAT_OFF_T          "%lld"
+#      define CURL_SIZEOF_CURL_OFF_T     8
+#      define CURL_SUFFIX_CURL_OFF_T     LL
+#      define CURL_SUFFIX_CURL_OFF_TU    ULL
+#    elif defined(_LP64)
+#      define CURL_TYPEOF_CURL_OFF_T     long
+#      define CURL_FORMAT_CURL_OFF_T     "ld"
+#      define CURL_FORMAT_CURL_OFF_TU    "lu"
+#      define CURL_FORMAT_OFF_T          "%ld"
+#      define CURL_SIZEOF_CURL_OFF_T     8
+#      define CURL_SUFFIX_CURL_OFF_T     L
+#      define CURL_SUFFIX_CURL_OFF_TU    UL
+#    else
+#      define CURL_TYPEOF_CURL_OFF_T     long
+#      define CURL_FORMAT_CURL_OFF_T     "ld"
+#      define CURL_FORMAT_CURL_OFF_TU    "lu"
+#      define CURL_FORMAT_OFF_T          "%ld"
+#      define CURL_SIZEOF_CURL_OFF_T     4
+#      define CURL_SUFFIX_CURL_OFF_T     L
+#      define CURL_SUFFIX_CURL_OFF_TU    UL
+#    endif
+#    define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
+#    define CURL_SIZEOF_CURL_SOCKLEN_T 4
+#    define CURL_PULL_SYS_TYPES_H      1
+#    define CURL_PULL_SYS_SOCKET_H     1
+#  endif
+
+#elif defined(TPF)
+#  define CURL_SIZEOF_LONG           8
+#  define CURL_TYPEOF_CURL_OFF_T     long
+#  define CURL_FORMAT_CURL_OFF_T     "ld"
+#  define CURL_FORMAT_CURL_OFF_TU    "lu"
+#  define CURL_FORMAT_OFF_T          "%ld"
+#  define CURL_SIZEOF_CURL_OFF_T     8
+#  define CURL_SUFFIX_CURL_OFF_T     L
+#  define CURL_SUFFIX_CURL_OFF_TU    UL
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+/* ===================================== */
+/*    KEEP MSVC THE PENULTIMATE ENTRY    */
+/* ===================================== */
+
+#elif defined(_MSC_VER)
+#  if (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     __int64
+#    define CURL_FORMAT_CURL_OFF_T     "I64d"
+#    define CURL_FORMAT_CURL_OFF_TU    "I64u"
+#    define CURL_FORMAT_OFF_T          "%I64d"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     i64
+#    define CURL_SUFFIX_CURL_OFF_TU    ui64
+#  else
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
+#    define CURL_FORMAT_OFF_T          "%ld"
+#    define CURL_SIZEOF_CURL_OFF_T     4
+#    define CURL_SUFFIX_CURL_OFF_T     L
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
+#  endif
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+
+/* ===================================== */
+/*    KEEP GENERIC GCC THE LAST ENTRY    */
+/* ===================================== */
+
+#elif defined(__GNUC__)
+#  if !defined(__LP64__) && (defined(__ILP32__) || \
+      defined(__i386__) || defined(__ppc__) || defined(__arm__) || \
+      defined(__sparc__) || defined(__mips__) || defined(__sh__))
+#    define CURL_SIZEOF_LONG           4
+#    define CURL_TYPEOF_CURL_OFF_T     long long
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
+#    define CURL_FORMAT_OFF_T          "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     LL
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
+#  elif defined(__LP64__) || \
+        defined(__x86_64__) || defined(__ppc64__) || defined(__sparc64__)
+#    define CURL_SIZEOF_LONG           8
+#    define CURL_TYPEOF_CURL_OFF_T     long
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
+#    define CURL_FORMAT_OFF_T          "%ld"
+#    define CURL_SIZEOF_CURL_OFF_T     8
+#    define CURL_SUFFIX_CURL_OFF_T     L
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
+#  endif
+#  define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+#  define CURL_PULL_SYS_TYPES_H      1
+#  define CURL_PULL_SYS_SOCKET_H     1
+
+#else
+#  error "Unknown non-configure build target!"
+   Error Compilation_aborted_Unknown_non_configure_build_target
+#endif
+
+/* CURL_PULL_SYS_TYPES_H is defined above when inclusion of header file  */
+/* sys/types.h is required here to properly make type definitions below. */
+#ifdef CURL_PULL_SYS_TYPES_H
+#  include <sys/types.h>
+#endif
+
+/* CURL_PULL_SYS_SOCKET_H is defined above when inclusion of header file  */
+/* sys/socket.h is required here to properly make type definitions below. */
+#ifdef CURL_PULL_SYS_SOCKET_H
+#  include <sys/socket.h>
+#endif
+
+/* Data type definition of curl_socklen_t. */
+
+#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
+  typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
+#endif
+
+/* Data type definition of curl_off_t. */
+
+#ifdef CURL_TYPEOF_CURL_OFF_T
+  typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
+#endif
+
+#endif /* __CURL_CURLBUILD_H */

includes/curl/curlbuild.h.in

@@ -0,0 +1,197 @@
+#ifndef __CURL_CURLBUILD_H
+#define __CURL_CURLBUILD_H
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at https://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ***************************************************************************/
+
+/* ================================================================ */
+/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
+/* ================================================================ */
+
+/*
+ * NOTE 1:
+ * -------
+ *
+ * Nothing in this file is intended to be modified or adjusted by the
+ * curl library user nor by the curl library builder.
+ *
+ * If you think that something actually needs to be changed, adjusted
+ * or fixed in this file, then, report it on the libcurl development
+ * mailing list: https://cool.haxx.se/mailman/listinfo/curl-library/
+ *
+ * This header file shall only export symbols which are 'curl' or 'CURL'
+ * prefixed, otherwise public name space would be polluted.
+ *
+ * NOTE 2:
+ * -------
+ *
+ * Right now you might be staring at file include/curl/curlbuild.h.in or
+ * at file include/curl/curlbuild.h, this is due to the following reason:
+ *
+ * On systems capable of running the configure script, the configure process
+ * will overwrite the distributed include/curl/curlbuild.h file with one that
+ * is suitable and specific to the library being configured and built, which
+ * is generated from the include/curl/curlbuild.h.in template file.
+ *
+ */
+
+/* ================================================================ */
+/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
+/* ================================================================ */
+
+#ifdef CURL_SIZEOF_LONG
+#error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined
+#endif
+
+#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
+#error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined
+#endif
+
+#ifdef CURL_SIZEOF_CURL_SOCKLEN_T
+#error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined
+#endif
+
+#ifdef CURL_TYPEOF_CURL_OFF_T
+#error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined
+#endif
+
+#ifdef CURL_FORMAT_CURL_OFF_T
+#error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined
+#endif
+
+#ifdef CURL_FORMAT_CURL_OFF_TU
+#error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined
+#endif
+
+#ifdef CURL_FORMAT_OFF_T
+#error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined
+#endif
+
+#ifdef CURL_SIZEOF_CURL_OFF_T
+#error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined
+#endif
+
+#ifdef CURL_SUFFIX_CURL_OFF_T
+#error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined
+#endif
+
+#ifdef CURL_SUFFIX_CURL_OFF_TU
+#error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h"
+   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined
+#endif
+
+/* ================================================================ */
+/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
+/* ================================================================ */
+
+/* Configure process defines this to 1 when it finds out that system  */
+/* header file ws2tcpip.h must be included by the external interface. */
+#undef CURL_PULL_WS2TCPIP_H
+#ifdef CURL_PULL_WS2TCPIP_H
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
+#  include <windows.h>
+#  include <winsock2.h>
+#  include <ws2tcpip.h>
+#endif
+
+/* Configure process defines this to 1 when it finds out that system   */
+/* header file sys/types.h must be included by the external interface. */
+#undef CURL_PULL_SYS_TYPES_H
+#ifdef CURL_PULL_SYS_TYPES_H
+#  include <sys/types.h>
+#endif
+
+/* Configure process defines this to 1 when it finds out that system */
+/* header file stdint.h must be included by the external interface.  */
+#undef CURL_PULL_STDINT_H
+#ifdef CURL_PULL_STDINT_H
+#  include <stdint.h>
+#endif
+
+/* Configure process defines this to 1 when it finds out that system  */
+/* header file inttypes.h must be included by the external interface. */
+#undef CURL_PULL_INTTYPES_H
+#ifdef CURL_PULL_INTTYPES_H
+#  include <inttypes.h>
+#endif
+
+/* Configure process defines this to 1 when it finds out that system    */
+/* header file sys/socket.h must be included by the external interface. */
+#undef CURL_PULL_SYS_SOCKET_H
+#ifdef CURL_PULL_SYS_SOCKET_H
+#  include <sys/socket.h>
+#endif
+
+/* Configure process defines this to 1 when it finds out that system  */
+/* header file sys/poll.h must be included by the external interface. */
+#undef CURL_PULL_SYS_POLL_H
+#ifdef CURL_PULL_SYS_POLL_H
+#  include <sys/poll.h>
+#endif
+
+/* The size of `long', as computed by sizeof. */
+#undef CURL_SIZEOF_LONG
+
+/* Integral data type used for curl_socklen_t. */
+#undef CURL_TYPEOF_CURL_SOCKLEN_T
+
+/* The size of `curl_socklen_t', as computed by sizeof. */
+#undef CURL_SIZEOF_CURL_SOCKLEN_T
+
+/* Data type definition of curl_socklen_t. */
+typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
+
+/* Signed integral data type used for curl_off_t. */
+#undef CURL_TYPEOF_CURL_OFF_T
+
+/* Data type definition of curl_off_t. */
+typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
+
+/* curl_off_t formatting string directive without "%" conversion specifier. */
+#undef CURL_FORMAT_CURL_OFF_T
+
+/* unsigned curl_off_t formatting string without "%" conversion specifier. */
+#undef CURL_FORMAT_CURL_OFF_TU
+
+/* curl_off_t formatting string directive with "%" conversion specifier. */
+#undef CURL_FORMAT_OFF_T
+
+/* The size of `curl_off_t', as computed by sizeof. */
+#undef CURL_SIZEOF_CURL_OFF_T
+
+/* curl_off_t constant suffix. */
+#undef CURL_SUFFIX_CURL_OFF_T
+
+/* unsigned curl_off_t constant suffix. */
+#undef CURL_SUFFIX_CURL_OFF_TU
+
+#endif /* __CURL_CURLBUILD_H */

includes/curl/curlrules.h

@@ -0,0 +1,262 @@
+#ifndef __CURL_CURLRULES_H
+#define __CURL_CURLRULES_H
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at https://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ***************************************************************************/
+
+/* ================================================================ */
+/*                    COMPILE TIME SANITY CHECKS                    */
+/* ================================================================ */
+
+/*
+ * NOTE 1:
+ * -------
+ *
+ * All checks done in this file are intentionally placed in a public
+ * header file which is pulled by curl/curl.h when an application is
+ * being built using an already built libcurl library. Additionally
+ * this file is also included and used when building the library.
+ *
+ * If compilation fails on this file it is certainly sure that the
+ * problem is elsewhere. It could be a problem in the curlbuild.h
+ * header file, or simply that you are using different compilation
+ * settings than those used to build the library.
+ *
+ * Nothing in this file is intended to be modified or adjusted by the
+ * curl library user nor by the curl library builder.
+ *
+ * Do not deactivate any check, these are done to make sure that the
+ * library is properly built and used.
+ *
+ * You can find further help on the libcurl development mailing list:
+ * https://cool.haxx.se/mailman/listinfo/curl-library/
+ *
+ * NOTE 2
+ * ------
+ *
+ * Some of the following compile time checks are based on the fact
+ * that the dimension of a constant array can not be a negative one.
+ * In this way if the compile time verification fails, the compilation
+ * will fail issuing an error. The error description wording is compiler
+ * dependent but it will be quite similar to one of the following:
+ *
+ *   "negative subscript or subscript is too large"
+ *   "array must have at least one element"
+ *   "-1 is an illegal array size"
+ *   "size of array is negative"
+ *
+ * If you are building an application which tries to use an already
+ * built libcurl library and you are getting this kind of errors on
+ * this file, it is a clear indication that there is a mismatch between
+ * how the library was built and how you are trying to use it for your
+ * application. Your already compiled or binary library provider is the
+ * only one who can give you the details you need to properly use it.
+ */
+
+/*
+ * Verify that some macros are actually defined.
+ */
+
+#ifndef CURL_SIZEOF_LONG
+#  error "CURL_SIZEOF_LONG definition is missing!"
+   Error Compilation_aborted_CURL_SIZEOF_LONG_is_missing
+#endif
+
+#ifndef CURL_TYPEOF_CURL_SOCKLEN_T
+#  error "CURL_TYPEOF_CURL_SOCKLEN_T definition is missing!"
+   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_is_missing
+#endif
+
+#ifndef CURL_SIZEOF_CURL_SOCKLEN_T
+#  error "CURL_SIZEOF_CURL_SOCKLEN_T definition is missing!"
+   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_is_missing
+#endif
+
+#ifndef CURL_TYPEOF_CURL_OFF_T
+#  error "CURL_TYPEOF_CURL_OFF_T definition is missing!"
+   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_is_missing
+#endif
+
+#ifndef CURL_FORMAT_CURL_OFF_T
+#  error "CURL_FORMAT_CURL_OFF_T definition is missing!"
+   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_is_missing
+#endif
+
+#ifndef CURL_FORMAT_CURL_OFF_TU
+#  error "CURL_FORMAT_CURL_OFF_TU definition is missing!"
+   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_is_missing
+#endif
+
+#ifndef CURL_FORMAT_OFF_T
+#  error "CURL_FORMAT_OFF_T definition is missing!"
+   Error Compilation_aborted_CURL_FORMAT_OFF_T_is_missing
+#endif
+
+#ifndef CURL_SIZEOF_CURL_OFF_T
+#  error "CURL_SIZEOF_CURL_OFF_T definition is missing!"
+   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_is_missing
+#endif
+
+#ifndef CURL_SUFFIX_CURL_OFF_T
+#  error "CURL_SUFFIX_CURL_OFF_T definition is missing!"
+   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_is_missing
+#endif
+
+#ifndef CURL_SUFFIX_CURL_OFF_TU
+#  error "CURL_SUFFIX_CURL_OFF_TU definition is missing!"
+   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_is_missing
+#endif
+
+/*
+ * Macros private to this header file.
+ */
+
+#define CurlchkszEQ(t, s) sizeof(t) == s ? 1 : -1
+
+#define CurlchkszGE(t1, t2) sizeof(t1) >= sizeof(t2) ? 1 : -1
+
+/*
+ * Verify that the size previously defined and expected for long
+ * is the same as the one reported by sizeof() at compile time.
+ */
+
+typedef char
+  __curl_rule_01__
+    [CurlchkszEQ(long, CURL_SIZEOF_LONG)];
+
+/*
+ * Verify that the size previously defined and expected for
+ * curl_off_t is actually the the same as the one reported
+ * by sizeof() at compile time.
+ */
+
+typedef char
+  __curl_rule_02__
+    [CurlchkszEQ(curl_off_t, CURL_SIZEOF_CURL_OFF_T)];
+
+/*
+ * Verify at compile time that the size of curl_off_t as reported
+ * by sizeof() is greater or equal than the one reported for long
+ * for the current compilation.
+ */
+
+typedef char
+  __curl_rule_03__
+    [CurlchkszGE(curl_off_t, long)];
+
+/*
+ * Verify that the size previously defined and expected for
+ * curl_socklen_t is actually the the same as the one reported
+ * by sizeof() at compile time.
+ */
+
+typedef char
+  __curl_rule_04__
+    [CurlchkszEQ(curl_socklen_t, CURL_SIZEOF_CURL_SOCKLEN_T)];
+
+/*
+ * Verify at compile time that the size of curl_socklen_t as reported
+ * by sizeof() is greater or equal than the one reported for int for
+ * the current compilation.
+ */
+
+typedef char
+  __curl_rule_05__
+    [CurlchkszGE(curl_socklen_t, int)];
+
+/* ================================================================ */
+/*          EXTERNALLY AND INTERNALLY VISIBLE DEFINITIONS           */
+/* ================================================================ */
+
+/*
+ * CURL_ISOCPP and CURL_OFF_T_C definitions are done here in order to allow
+ * these to be visible and exported by the external libcurl interface API,
+ * while also making them visible to the library internals, simply including
+ * curl_setup.h, without actually needing to include curl.h internally.
+ * If some day this section would grow big enough, all this should be moved
+ * to its own header file.
+ */
+
+/*
+ * Figure out if we can use the ## preprocessor operator, which is supported
+ * by ISO/ANSI C and C++. Some compilers support it without setting __STDC__
+ * or  __cplusplus so we need to carefully check for them too.
+ */
+
+#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \
+  defined(__HP_aCC) || defined(__BORLANDC__) || defined(__LCC__) || \
+  defined(__POCC__) || defined(__SALFORDC__) || defined(__HIGHC__) || \
+  defined(__ILEC400__)
+  /* This compiler is believed to have an ISO compatible preprocessor */
+#define CURL_ISOCPP
+#else
+  /* This compiler is believed NOT to have an ISO compatible preprocessor */
+#undef CURL_ISOCPP
+#endif
+
+/*
+ * Macros for minimum-width signed and unsigned curl_off_t integer constants.
+ */
+
+#if defined(__BORLANDC__) && (__BORLANDC__ == 0x0551)
+#  define __CURL_OFF_T_C_HLPR2(x) x
+#  define __CURL_OFF_T_C_HLPR1(x) __CURL_OFF_T_C_HLPR2(x)
+#  define CURL_OFF_T_C(Val)  __CURL_OFF_T_C_HLPR1(Val) ## \
+                             __CURL_OFF_T_C_HLPR1(CURL_SUFFIX_CURL_OFF_T)
+#  define CURL_OFF_TU_C(Val) __CURL_OFF_T_C_HLPR1(Val) ## \
+                             __CURL_OFF_T_C_HLPR1(CURL_SUFFIX_CURL_OFF_TU)
+#else
+#  ifdef CURL_ISOCPP
+#    define __CURL_OFF_T_C_HLPR2(Val,Suffix) Val ## Suffix
+#  else
+#    define __CURL_OFF_T_C_HLPR2(Val,Suffix) Val/**/Suffix
+#  endif
+#  define __CURL_OFF_T_C_HLPR1(Val,Suffix) __CURL_OFF_T_C_HLPR2(Val,Suffix)
+#  define CURL_OFF_T_C(Val)  __CURL_OFF_T_C_HLPR1(Val,CURL_SUFFIX_CURL_OFF_T)
+#  define CURL_OFF_TU_C(Val) __CURL_OFF_T_C_HLPR1(Val,CURL_SUFFIX_CURL_OFF_TU)
+#endif
+
+/*
+ * Get rid of macros private to this header file.
+ */
+
+#undef CurlchkszEQ
+#undef CurlchkszGE
+
+/*
+ * Get rid of macros not intended to exist beyond this point.
+ */
+
+#undef CURL_PULL_WS2TCPIP_H
+#undef CURL_PULL_SYS_TYPES_H
+#undef CURL_PULL_SYS_SOCKET_H
+#undef CURL_PULL_SYS_POLL_H
+#undef CURL_PULL_STDINT_H
+#undef CURL_PULL_INTTYPES_H
+
+#undef CURL_TYPEOF_CURL_SOCKLEN_T
+#undef CURL_TYPEOF_CURL_OFF_T
+
+#ifdef CURL_NO_OLDIES
+#undef CURL_FORMAT_OFF_T /* not required since 7.19.0 - obsoleted in 7.20.0 */
+#endif
+
+#endif /* __CURL_CURLRULES_H */

includes/curl/curlver.h

@@ -0,0 +1,77 @@
+#ifndef __CURL_CURLVER_H
+#define __CURL_CURLVER_H
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at https://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ***************************************************************************/
+
+/* This header file contains nothing but libcurl version info, generated by
+   a script at release-time. This was made its own header file in 7.11.2 */
+
+/* This is the global package copyright */
+#define LIBCURL_COPYRIGHT "1996 - 2017 Daniel Stenberg, <daniel@haxx.se>."
+
+/* This is the version number of the libcurl package from which this header
+   file origins: */
+#define LIBCURL_VERSION "7.54.0-DEV"
+
+/* The numeric version number is also available "in parts" by using these
+   defines: */
+#define LIBCURL_VERSION_MAJOR 7
+#define LIBCURL_VERSION_MINOR 54
+#define LIBCURL_VERSION_PATCH 0
+
+/* This is the numeric version of the libcurl version number, meant for easier
+   parsing and comparions by programs. The LIBCURL_VERSION_NUM define will
+   always follow this syntax:
+
+         0xXXYYZZ
+
+   Where XX, YY and ZZ are the main version, release and patch numbers in
+   hexadecimal (using 8 bits each). All three numbers are always represented
+   using two digits.  1.2 would appear as "0x010200" while version 9.11.7
+   appears as "0x090b07".
+
+   This 6-digit (24 bits) hexadecimal number does not show pre-release number,
+   and it is always a greater number in a more recent release. It makes
+   comparisons with greater than and less than work.
+
+   Note: This define is the full hex number and _does not_ use the
+   CURL_VERSION_BITS() macro since curl's own configure script greps for it
+   and needs it to contain the full number.
+*/
+#define LIBCURL_VERSION_NUM 0x073600
+
+/*
+ * This is the date and time when the full source package was created. The
+ * timestamp is not stored in git, as the timestamp is properly set in the
+ * tarballs by the maketgz script.
+ *
+ * The format of the date should follow this template:
+ *
+ * "Mon Feb 12 11:35:33 UTC 2007"
+ */
+#define LIBCURL_TIMESTAMP "DEV"
+
+#define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|z)
+#define CURL_AT_LEAST_VERSION(x,y,z) \
+  (LIBCURL_VERSION_NUM >= CURL_VERSION_BITS(x, y, z))
+
+#endif /* __CURL_CURLVER_H */

includes/curl/easy.h

@@ -0,0 +1,102 @@
+#ifndef __CURL_EASY_H
+#define __CURL_EASY_H
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at https://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ***************************************************************************/
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+CURL_EXTERN CURL *curl_easy_init(void);
+CURL_EXTERN CURLcode curl_easy_setopt(CURL *curl, CURLoption option, ...);
+CURL_EXTERN CURLcode curl_easy_perform(CURL *curl);
+CURL_EXTERN void curl_easy_cleanup(CURL *curl);
+
+/*
+ * NAME curl_easy_getinfo()
+ *
+ * DESCRIPTION
+ *
+ * Request internal information from the curl session with this function.  The
+ * third argument MUST be a pointer to a long, a pointer to a char * or a
+ * pointer to a double (as the documentation describes elsewhere).  The data
+ * pointed to will be filled in accordingly and can be relied upon only if the
+ * function returns CURLE_OK.  This function is intended to get used *AFTER* a
+ * performed transfer, all results from this function are undefined until the
+ * transfer is completed.
+ */
+CURL_EXTERN CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ...);
+
+
+/*
+ * NAME curl_easy_duphandle()
+ *
+ * DESCRIPTION
+ *
+ * Creates a new curl session handle with the same options set for the handle
+ * passed in. Duplicating a handle could only be a matter of cloning data and
+ * options, internal state info and things like persistent connections cannot
+ * be transferred. It is useful in multithreaded applications when you can run
+ * curl_easy_duphandle() for each new thread to avoid a series of identical
+ * curl_easy_setopt() invokes in every thread.
+ */
+CURL_EXTERN CURL *curl_easy_duphandle(CURL *curl);
+
+/*
+ * NAME curl_easy_reset()
+ *
+ * DESCRIPTION
+ *
+ * Re-initializes a CURL handle to the default values. This puts back the
+ * handle to the same state as it was in when it was just created.
+ *
+ * It does keep: live connections, the Session ID cache, the DNS cache and the
+ * cookies.
+ */
+CURL_EXTERN void curl_easy_reset(CURL *curl);
+
+/*
+ * NAME curl_easy_recv()
+ *
+ * DESCRIPTION
+ *
+ * Receives data from the connected socket. Use after successful
+ * curl_easy_perform() with CURLOPT_CONNECT_ONLY option.
+ */
+CURL_EXTERN CURLcode curl_easy_recv(CURL *curl, void *buffer, size_t buflen,
+                                    size_t *n);
+
+/*
+ * NAME curl_easy_send()
+ *
+ * DESCRIPTION
+ *
+ * Sends data over the connected socket. Use after successful
+ * curl_easy_perform() with CURLOPT_CONNECT_ONLY option.
+ */
+CURL_EXTERN CURLcode curl_easy_send(CURL *curl, const void *buffer,
+                                    size_t buflen, size_t *n);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif

includes/curl/mprintf.h

@@ -0,0 +1,50 @@
+#ifndef __CURL_MPRINTF_H
+#define __CURL_MPRINTF_H
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at https://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ***************************************************************************/
+
+#include <stdarg.h>
+#include <stdio.h> /* needed for FILE */
+#include "curl.h"  /* for CURL_EXTERN */
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+CURL_EXTERN int curl_mprintf(const char *format, ...);
+CURL_EXTERN int curl_mfprintf(FILE *fd, const char *format, ...);
+CURL_EXTERN int curl_msprintf(char *buffer, const char *format, ...);
+CURL_EXTERN int curl_msnprintf(char *buffer, size_t maxlength,
+                               const char *format, ...);
+CURL_EXTERN int curl_mvprintf(const char *format, va_list args);
+CURL_EXTERN int curl_mvfprintf(FILE *fd, const char *format, va_list args);
+CURL_EXTERN int curl_mvsprintf(char *buffer, const char *format, va_list args);
+CURL_EXTERN int curl_mvsnprintf(char *buffer, size_t maxlength,
+                                const char *format, va_list args);
+CURL_EXTERN char *curl_maprintf(const char *format, ...);
+CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* __CURL_MPRINTF_H */

includes/curl/multi.h

@@ -0,0 +1,439 @@
+#ifndef __CURL_MULTI_H
+#define __CURL_MULTI_H
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at https://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ***************************************************************************/
+/*
+  This is an "external" header file. Don't give away any internals here!
+
+  GOALS
+
+  o Enable a "pull" interface. The application that uses libcurl decides where
+    and when to ask libcurl to get/send data.
+
+  o Enable multiple simultaneous transfers in the same thread without making it
+    complicated for the application.
+
+  o Enable the application to select() on its own file descriptors and curl's
+    file descriptors simultaneous easily.
+
+*/
+
+/*
+ * This header file should not really need to include "curl.h" since curl.h
+ * itself includes this file and we expect user applications to do #include
+ * <curl/curl.h> without the need for especially including multi.h.
+ *
+ * For some reason we added this include here at one point, and rather than to
+ * break existing (wrongly written) libcurl applications, we leave it as-is
+ * but with this warning attached.
+ */
+#include "curl.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#if defined(BUILDING_LIBCURL) || defined(CURL_STRICTER)
+typedef struct Curl_multi CURLM;
+#else
+typedef void CURLM;
+#endif
+
+typedef enum {
+  CURLM_CALL_MULTI_PERFORM = -1, /* please call curl_multi_perform() or
+                                    curl_multi_socket*() soon */
+  CURLM_OK,
+  CURLM_BAD_HANDLE,      /* the passed-in handle is not a valid CURLM handle */
+  CURLM_BAD_EASY_HANDLE, /* an easy handle was not good/valid */
+  CURLM_OUT_OF_MEMORY,   /* if you ever get this, you're in deep sh*t */
+  CURLM_INTERNAL_ERROR,  /* this is a libcurl bug */
+  CURLM_BAD_SOCKET,      /* the passed in socket argument did not match */
+  CURLM_UNKNOWN_OPTION,  /* curl_multi_setopt() with unsupported option */
+  CURLM_ADDED_ALREADY,   /* an easy handle already added to a multi handle was
+                            attempted to get added - again */
+  CURLM_LAST
+} CURLMcode;
+
+/* just to make code nicer when using curl_multi_socket() you can now check
+   for CURLM_CALL_MULTI_SOCKET too in the same style it works for
+   curl_multi_perform() and CURLM_CALL_MULTI_PERFORM */
+#define CURLM_CALL_MULTI_SOCKET CURLM_CALL_MULTI_PERFORM
+
+/* bitmask bits for CURLMOPT_PIPELINING */
+#define CURLPIPE_NOTHING   0L
+#define CURLPIPE_HTTP1     1L
+#define CURLPIPE_MULTIPLEX 2L
+
+typedef enum {
+  CURLMSG_NONE, /* first, not used */
+  CURLMSG_DONE, /* This easy handle has completed. 'result' contains
+                   the CURLcode of the transfer */
+  CURLMSG_LAST /* last, not used */
+} CURLMSG;
+
+struct CURLMsg {
+  CURLMSG msg;       /* what this message means */
+  CURL *easy_handle; /* the handle it concerns */
+  union {
+    void *whatever;    /* message-specific data */
+    CURLcode result;   /* return code for transfer */
+  } data;
+};
+typedef struct CURLMsg CURLMsg;
+
+/* Based on poll(2) structure and values.
+ * We don't use pollfd and POLL* constants explicitly
+ * to cover platforms without poll(). */
+#define CURL_WAIT_POLLIN    0x0001
+#define CURL_WAIT_POLLPRI   0x0002
+#define CURL_WAIT_POLLOUT   0x0004
+
+struct curl_waitfd {
+  curl_socket_t fd;
+  short events;
+  short revents; /* not supported yet */
+};
+
+/*
+ * Name:    curl_multi_init()
+ *
+ * Desc:    inititalize multi-style curl usage
+ *
+ * Returns: a new CURLM handle to use in all 'curl_multi' functions.
+ */
+CURL_EXTERN CURLM *curl_multi_init(void);
+
+/*
+ * Name:    curl_multi_add_handle()
+ *
+ * Desc:    add a standard curl handle to the multi stack
+ *
+ * Returns: CURLMcode type, general multi error code.
+ */
+CURL_EXTERN CURLMcode curl_multi_add_handle(CURLM *multi_handle,
+                                            CURL *curl_handle);
+
+ /*
+  * Name:    curl_multi_remove_handle()
+  *
+  * Desc:    removes a curl handle from the multi stack again
+  *
+  * Returns: CURLMcode type, general multi error code.
+  */
+CURL_EXTERN CURLMcode curl_multi_remove_handle(CURLM *multi_handle,
+                                               CURL *curl_handle);
+
+ /*
+  * Name:    curl_multi_fdset()
+  *
+  * Desc:    Ask curl for its fd_set sets. The app can use these to select() or
+  *          poll() on. We want curl_multi_perform() called as soon as one of
+  *          them are ready.
+  *
+  * Returns: CURLMcode type, general multi error code.
+  */
+CURL_EXTERN CURLMcode curl_multi_fdset(CURLM *multi_handle,
+                                       fd_set *read_fd_set,
+                                       fd_set *write_fd_set,
+                                       fd_set *exc_fd_set,
+                                       int *max_fd);
+
+/*
+ * Name:     curl_multi_wait()
+ *
+ * Desc:     Poll on all fds within a CURLM set as well as any
+ *           additional fds passed to the function.
+ *
+ * Returns:  CURLMcode type, general multi error code.
+ */
+CURL_EXTERN CURLMcode curl_multi_wait(CURLM *multi_handle,
+                                      struct curl_waitfd extra_fds[],
+                                      unsigned int extra_nfds,
+                                      int timeout_ms,
+                                      int *ret);
+
+ /*
+  * Name:    curl_multi_perform()
+  *
+  * Desc:    When the app thinks there's data available for curl it calls this
+  *          function to read/write whatever there is right now. This returns
+  *          as soon as the reads and writes are done. This function does not
+  *          require that there actually is data available for reading or that
+  *          data can be written, it can be called just in case. It returns
+  *          the number of handles that still transfer data in the second
+  *          argument's integer-pointer.
+  *
+  * Returns: CURLMcode type, general multi error code. *NOTE* that this only
+  *          returns errors etc regarding the whole multi stack. There might
+  *          still have occurred problems on invidual transfers even when this
+  *          returns OK.
+  */
+CURL_EXTERN CURLMcode curl_multi_perform(CURLM *multi_handle,
+                                         int *running_handles);
+
+ /*
+  * Name:    curl_multi_cleanup()
+  *
+  * Desc:    Cleans up and removes a whole multi stack. It does not free or
+  *          touch any individual easy handles in any way. We need to define
+  *          in what state those handles will be if this function is called
+  *          in the middle of a transfer.
+  *
+  * Returns: CURLMcode type, general multi error code.
+  */
+CURL_EXTERN CURLMcode curl_multi_cleanup(CURLM *multi_handle);
+
+/*
+ * Name:    curl_multi_info_read()
+ *
+ * Desc:    Ask the multi handle if there's any messages/informationals from
+ *          the individual transfers. Messages include informationals such as
+ *          error code from the transfer or just the fact that a transfer is
+ *          completed. More details on these should be written down as well.
+ *
+ *          Repeated calls to this function will return a new struct each
+ *          time, until a special "end of msgs" struct is returned as a signal
+ *          that there is no more to get at this point.
+ *
+ *          The data the returned pointer points to will not survive calling
+ *          curl_multi_cleanup().
+ *
+ *          The 'CURLMsg' struct is meant to be very simple and only contain
+ *          very basic informations. If more involved information is wanted,
+ *          we will provide the particular "transfer handle" in that struct
+ *          and that should/could/would be used in subsequent
+ *          curl_easy_getinfo() calls (or similar). The point being that we
+ *          must never expose complex structs to applications, as then we'll
+ *          undoubtably get backwards compatibility problems in the future.
+ *
+ * Returns: A pointer to a filled-in struct, or NULL if it failed or ran out
+ *          of structs. It also writes the number of messages left in the
+ *          queue (after this read) in the integer the second argument points
+ *          to.
+ */
+CURL_EXTERN CURLMsg *curl_multi_info_read(CURLM *multi_handle,
+                                          int *msgs_in_queue);
+
+/*
+ * Name:    curl_multi_strerror()
+ *
+ * Desc:    The curl_multi_strerror function may be used to turn a CURLMcode
+ *          value into the equivalent human readable error string.  This is
+ *          useful for printing meaningful error messages.
+ *
+ * Returns: A pointer to a zero-terminated error message.
+ */
+CURL_EXTERN const char *curl_multi_strerror(CURLMcode);
+
+/*
+ * Name:    curl_multi_socket() and
+ *          curl_multi_socket_all()
+ *
+ * Desc:    An alternative version of curl_multi_perform() that allows the
+ *          application to pass in one of the file descriptors that have been
+ *          detected to have "action" on them and let libcurl perform.
+ *          See man page for details.
+ */
+#define CURL_POLL_NONE   0
+#define CURL_POLL_IN     1
+#define CURL_POLL_OUT    2
+#define CURL_POLL_INOUT  3
+#define CURL_POLL_REMOVE 4
+
+#define CURL_SOCKET_TIMEOUT CURL_SOCKET_BAD
+
+#define CURL_CSELECT_IN   0x01
+#define CURL_CSELECT_OUT  0x02
+#define CURL_CSELECT_ERR  0x04
+
+typedef int (*curl_socket_callback)(CURL *easy,      /* easy handle */
+                                    curl_socket_t s, /* socket */
+                                    int what,        /* see above */
+                                    void *userp,     /* private callback
+                                                        pointer */
+                                    void *socketp);  /* private socket
+                                                        pointer */
+/*
+ * Name:    curl_multi_timer_callback
+ *
+ * Desc:    Called by libcurl whenever the library detects a change in the
+ *          maximum number of milliseconds the app is allowed to wait before
+ *          curl_multi_socket() or curl_multi_perform() must be called
+ *          (to allow libcurl's timed events to take place).
+ *
+ * Returns: The callback should return zero.
+ */
+typedef int (*curl_multi_timer_callback)(CURLM *multi,    /* multi handle */
+                                         long timeout_ms, /* see above */
+                                         void *userp);    /* private callback
+                                                             pointer */
+
+CURL_EXTERN CURLMcode curl_multi_socket(CURLM *multi_handle, curl_socket_t s,
+                                        int *running_handles);
+
+CURL_EXTERN CURLMcode curl_multi_socket_action(CURLM *multi_handle,
+                                               curl_socket_t s,
+                                               int ev_bitmask,
+                                               int *running_handles);
+
+CURL_EXTERN CURLMcode curl_multi_socket_all(CURLM *multi_handle,
+                                            int *running_handles);
+
+#ifndef CURL_ALLOW_OLD_MULTI_SOCKET
+/* This macro below was added in 7.16.3 to push users who recompile to use
+   the new curl_multi_socket_action() instead of the old curl_multi_socket()
+*/
+#define curl_multi_socket(x,y,z) curl_multi_socket_action(x,y,0,z)
+#endif
+
+/*
+ * Name:    curl_multi_timeout()
+ *
+ * Desc:    Returns the maximum number of milliseconds the app is allowed to
+ *          wait before curl_multi_socket() or curl_multi_perform() must be
+ *          called (to allow libcurl's timed events to take place).
+ *
+ * Returns: CURLM error code.
+ */
+CURL_EXTERN CURLMcode curl_multi_timeout(CURLM *multi_handle,
+                                         long *milliseconds);
+
+#undef CINIT /* re-using the same name as in curl.h */
+
+#ifdef CURL_ISOCPP
+#define CINIT(name,type,num) CURLMOPT_ ## name = CURLOPTTYPE_ ## type + num
+#else
+/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
+#define LONG          CURLOPTTYPE_LONG
+#define OBJECTPOINT   CURLOPTTYPE_OBJECTPOINT
+#define FUNCTIONPOINT CURLOPTTYPE_FUNCTIONPOINT
+#define OFF_T         CURLOPTTYPE_OFF_T
+#define CINIT(name,type,number) CURLMOPT_/**/name = type + number
+#endif
+
+typedef enum {
+  /* This is the socket callback function pointer */
+  CINIT(SOCKETFUNCTION, FUNCTIONPOINT, 1),
+
+  /* This is the argument passed to the socket callback */
+  CINIT(SOCKETDATA, OBJECTPOINT, 2),
+
+    /* set to 1 to enable pipelining for this multi handle */
+  CINIT(PIPELINING, LONG, 3),
+
+   /* This is the timer callback function pointer */
+  CINIT(TIMERFUNCTION, FUNCTIONPOINT, 4),
+
+  /* This is the argument passed to the timer callback */
+  CINIT(TIMERDATA, OBJECTPOINT, 5),
+
+  /* maximum number of entries in the connection cache */
+  CINIT(MAXCONNECTS, LONG, 6),
+
+  /* maximum number of (pipelining) connections to one host */
+  CINIT(MAX_HOST_CONNECTIONS, LONG, 7),
+
+  /* maximum number of requests in a pipeline */
+  CINIT(MAX_PIPELINE_LENGTH, LONG, 8),
+
+  /* a connection with a content-length longer than this
+     will not be considered for pipelining */
+  CINIT(CONTENT_LENGTH_PENALTY_SIZE, OFF_T, 9),
+
+  /* a connection with a chunk length longer than this
+     will not be considered for pipelining */
+  CINIT(CHUNK_LENGTH_PENALTY_SIZE, OFF_T, 10),
+
+  /* a list of site names(+port) that are blacklisted from
+     pipelining */
+  CINIT(PIPELINING_SITE_BL, OBJECTPOINT, 11),
+
+  /* a list of server types that are blacklisted from
+     pipelining */
+  CINIT(PIPELINING_SERVER_BL, OBJECTPOINT, 12),
+
+  /* maximum number of open connections in total */
+  CINIT(MAX_TOTAL_CONNECTIONS, LONG, 13),
+
+   /* This is the server push callback function pointer */
+  CINIT(PUSHFUNCTION, FUNCTIONPOINT, 14),
+
+  /* This is the argument passed to the server push callback */
+  CINIT(PUSHDATA, OBJECTPOINT, 15),
+
+  CURLMOPT_LASTENTRY /* the last unused */
+} CURLMoption;
+
+
+/*
+ * Name:    curl_multi_setopt()
+ *
+ * Desc:    Sets options for the multi handle.
+ *
+ * Returns: CURLM error code.
+ */
+CURL_EXTERN CURLMcode curl_multi_setopt(CURLM *multi_handle,
+                                        CURLMoption option, ...);
+
+
+/*
+ * Name:    curl_multi_assign()
+ *
+ * Desc:    This function sets an association in the multi handle between the
+ *          given socket and a private pointer of the application. This is
+ *          (only) useful for curl_multi_socket uses.
+ *
+ * Returns: CURLM error code.
+ */
+CURL_EXTERN CURLMcode curl_multi_assign(CURLM *multi_handle,
+                                        curl_socket_t sockfd, void *sockp);
+
+
+/*
+ * Name: curl_push_callback
+ *
+ * Desc: This callback gets called when a new stream is being pushed by the
+ *       server. It approves or denies the new stream.
+ *
+ * Returns: CURL_PUSH_OK or CURL_PUSH_DENY.
+ */
+#define CURL_PUSH_OK   0
+#define CURL_PUSH_DENY 1
+
+struct curl_pushheaders;  /* forward declaration only */
+
+CURL_EXTERN char *curl_pushheader_bynum(struct curl_pushheaders *h,
+                                        size_t num);
+CURL_EXTERN char *curl_pushheader_byname(struct curl_pushheaders *h,
+                                         const char *name);
+
+typedef int (*curl_push_callback)(CURL *parent,
+                                  CURL *easy,
+                                  size_t num_headers,
+                                  struct curl_pushheaders *headers,
+                                  void *userp);
+
+#ifdef __cplusplus
+} /* end of extern "C" */
+#endif
+
+#endif

includes/curl/stdcheaders.h

@@ -0,0 +1,33 @@
+#ifndef __STDC_HEADERS_H
+#define __STDC_HEADERS_H
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at https://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ***************************************************************************/
+
+#include <sys/types.h>
+
+size_t fread(void *, size_t, size_t, FILE *);
+size_t fwrite(const void *, size_t, size_t, FILE *);
+
+int strcasecmp(const char *, const char *);
+int strncasecmp(const char *, const char *, size_t);
+
+#endif /* __STDC_HEADERS_H */

includes/curl/typecheck-gcc.h

@@ -0,0 +1,624 @@
+#ifndef __CURL_TYPECHECK_GCC_H
+#define __CURL_TYPECHECK_GCC_H
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at https://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ***************************************************************************/
+
+/* wraps curl_easy_setopt() with typechecking */
+
+/* To add a new kind of warning, add an
+ *   if(_curl_is_sometype_option(_curl_opt))
+ *     if(!_curl_is_sometype(value))
+ *       _curl_easy_setopt_err_sometype();
+ * block and define _curl_is_sometype_option, _curl_is_sometype and
+ * _curl_easy_setopt_err_sometype below
+ *
+ * NOTE: We use two nested 'if' statements here instead of the && operator, in
+ *       order to work around gcc bug #32061.  It affects only gcc 4.3.x/4.4.x
+ *       when compiling with -Wlogical-op.
+ *
+ * To add an option that uses the same type as an existing option, you'll just
+ * need to extend the appropriate _curl_*_option macro
+ */
+#define curl_easy_setopt(handle, option, value)                               \
+__extension__ ({                                                              \
+  __typeof__(option) _curl_opt = option;                                     \
+  if(__builtin_constant_p(_curl_opt)) {                                       \
+    if(_curl_is_long_option(_curl_opt))                                       \
+      if(!_curl_is_long(value))                                               \
+        _curl_easy_setopt_err_long();                                         \
+    if(_curl_is_off_t_option(_curl_opt))                                      \
+      if(!_curl_is_off_t(value))                                              \
+        _curl_easy_setopt_err_curl_off_t();                                   \
+    if(_curl_is_string_option(_curl_opt))                                     \
+      if(!_curl_is_string(value))                                             \
+        _curl_easy_setopt_err_string();                                       \
+    if(_curl_is_write_cb_option(_curl_opt))                                   \
+      if(!_curl_is_write_cb(value))                                           \
+        _curl_easy_setopt_err_write_callback();                               \
+    if((_curl_opt) == CURLOPT_READFUNCTION)                                   \
+      if(!_curl_is_read_cb(value))                                            \
+        _curl_easy_setopt_err_read_cb();                                      \
+    if((_curl_opt) == CURLOPT_IOCTLFUNCTION)                                  \
+      if(!_curl_is_ioctl_cb(value))                                           \
+        _curl_easy_setopt_err_ioctl_cb();                                     \
+    if((_curl_opt) == CURLOPT_SOCKOPTFUNCTION)                                \
+      if(!_curl_is_sockopt_cb(value))                                         \
+        _curl_easy_setopt_err_sockopt_cb();                                   \
+    if((_curl_opt) == CURLOPT_OPENSOCKETFUNCTION)                             \
+      if(!_curl_is_opensocket_cb(value))                                      \
+        _curl_easy_setopt_err_opensocket_cb();                                \
+    if((_curl_opt) == CURLOPT_PROGRESSFUNCTION)                               \
+      if(!_curl_is_progress_cb(value))                                        \
+        _curl_easy_setopt_err_progress_cb();                                  \
+    if((_curl_opt) == CURLOPT_DEBUGFUNCTION)                                  \
+      if(!_curl_is_debug_cb(value))                                           \
+        _curl_easy_setopt_err_debug_cb();                                     \
+    if((_curl_opt) == CURLOPT_SSL_CTX_FUNCTION)                               \
+      if(!_curl_is_ssl_ctx_cb(value))                                         \
+        _curl_easy_setopt_err_ssl_ctx_cb();                                   \
+    if(_curl_is_conv_cb_option(_curl_opt))                                    \
+      if(!_curl_is_conv_cb(value))                                            \
+        _curl_easy_setopt_err_conv_cb();                                      \
+    if((_curl_opt) == CURLOPT_SEEKFUNCTION)                                   \
+      if(!_curl_is_seek_cb(value))                                            \
+        _curl_easy_setopt_err_seek_cb();                                      \
+    if(_curl_is_cb_data_option(_curl_opt))                                    \
+      if(!_curl_is_cb_data(value))                                            \
+        _curl_easy_setopt_err_cb_data();                                      \
+    if((_curl_opt) == CURLOPT_ERRORBUFFER)                                    \
+      if(!_curl_is_error_buffer(value))                                       \
+        _curl_easy_setopt_err_error_buffer();                                 \
+    if((_curl_opt) == CURLOPT_STDERR)                                         \
+      if(!_curl_is_FILE(value))                                               \
+        _curl_easy_setopt_err_FILE();                                         \
+    if(_curl_is_postfields_option(_curl_opt))                                 \
+      if(!_curl_is_postfields(value))                                         \
+        _curl_easy_setopt_err_postfields();                                   \
+    if((_curl_opt) == CURLOPT_HTTPPOST)                                       \
+      if(!_curl_is_arr((value), struct curl_httppost))                        \
+        _curl_easy_setopt_err_curl_httpost();                                 \
+    if(_curl_is_slist_option(_curl_opt))                                      \
+      if(!_curl_is_arr((value), struct curl_slist))                           \
+        _curl_easy_setopt_err_curl_slist();                                   \
+    if((_curl_opt) == CURLOPT_SHARE)                                          \
+      if(!_curl_is_ptr((value), CURLSH))                                      \
+        _curl_easy_setopt_err_CURLSH();                                       \
+  }                                                                           \
+  curl_easy_setopt(handle, _curl_opt, value);                                 \
+})
+
+/* wraps curl_easy_getinfo() with typechecking */
+/* FIXME: don't allow const pointers */
+#define curl_easy_getinfo(handle, info, arg)                                  \
+__extension__ ({                                                              \
+  __typeof__(info) _curl_info = info;                                        \
+  if(__builtin_constant_p(_curl_info)) {                                      \
+    if(_curl_is_string_info(_curl_info))                                      \
+      if(!_curl_is_arr((arg), char *))                                        \
+        _curl_easy_getinfo_err_string();                                      \
+    if(_curl_is_long_info(_curl_info))                                        \
+      if(!_curl_is_arr((arg), long))                                          \
+        _curl_easy_getinfo_err_long();                                        \
+    if(_curl_is_double_info(_curl_info))                                      \
+      if(!_curl_is_arr((arg), double))                                        \
+        _curl_easy_getinfo_err_double();                                      \
+    if(_curl_is_slist_info(_curl_info))                                       \
+      if(!_curl_is_arr((arg), struct curl_slist *))                           \
+        _curl_easy_getinfo_err_curl_slist();                                  \
+  }                                                                           \
+  curl_easy_getinfo(handle, _curl_info, arg);                                 \
+})
+
+/* TODO: typechecking for curl_share_setopt() and curl_multi_setopt(),
+ * for now just make sure that the functions are called with three
+ * arguments
+ */
+#define curl_share_setopt(share,opt,param) curl_share_setopt(share,opt,param)
+#define curl_multi_setopt(handle,opt,param) curl_multi_setopt(handle,opt,param)
+
+
+/* the actual warnings, triggered by calling the _curl_easy_setopt_err*
+ * functions */
+
+/* To define a new warning, use _CURL_WARNING(identifier, "message") */
+#define _CURL_WARNING(id, message)                                            \
+  static void __attribute__((__warning__(message)))                           \
+  __attribute__((__unused__)) __attribute__((__noinline__))                   \
+  id(void) { __asm__(""); }
+
+_CURL_WARNING(_curl_easy_setopt_err_long,
+  "curl_easy_setopt expects a long argument for this option")
+_CURL_WARNING(_curl_easy_setopt_err_curl_off_t,
+  "curl_easy_setopt expects a curl_off_t argument for this option")
+_CURL_WARNING(_curl_easy_setopt_err_string,
+              "curl_easy_setopt expects a "
+              "string ('char *' or char[]) argument for this option"
+  )
+_CURL_WARNING(_curl_easy_setopt_err_write_callback,
+  "curl_easy_setopt expects a curl_write_callback argument for this option")
+_CURL_WARNING(_curl_easy_setopt_err_read_cb,
+  "curl_easy_setopt expects a curl_read_callback argument for this option")
+_CURL_WARNING(_curl_easy_setopt_err_ioctl_cb,
+  "curl_easy_setopt expects a curl_ioctl_callback argument for this option")
+_CURL_WARNING(_curl_easy_setopt_err_sockopt_cb,
+  "curl_easy_setopt expects a curl_sockopt_callback argument for this option")
+_CURL_WARNING(_curl_easy_setopt_err_opensocket_cb,
+              "curl_easy_setopt expects a "
+              "curl_opensocket_callback argument for this option"
+  )
+_CURL_WARNING(_curl_easy_setopt_err_progress_cb,
+  "curl_easy_setopt expects a curl_progress_callback argument for this option")
+_CURL_WARNING(_curl_easy_setopt_err_debug_cb,
+  "curl_easy_setopt expects a curl_debug_callback argument for this option")
+_CURL_WARNING(_curl_easy_setopt_err_ssl_ctx_cb,
+  "curl_easy_setopt expects a curl_ssl_ctx_callback argument for this option")
+_CURL_WARNING(_curl_easy_setopt_err_conv_cb,
+  "curl_easy_setopt expects a curl_conv_callback argument for this option")
+_CURL_WARNING(_curl_easy_setopt_err_seek_cb,
+  "curl_easy_setopt expects a curl_seek_callback argument for this option")
+_CURL_WARNING(_curl_easy_setopt_err_cb_data,
+              "curl_easy_setopt expects a "
+              "private data pointer as argument for this option")
+_CURL_WARNING(_curl_easy_setopt_err_error_buffer,
+              "curl_easy_setopt expects a "
+              "char buffer of CURL_ERROR_SIZE as argument for this option")
+_CURL_WARNING(_curl_easy_setopt_err_FILE,
+  "curl_easy_setopt expects a 'FILE *' argument for this option")
+_CURL_WARNING(_curl_easy_setopt_err_postfields,
+  "curl_easy_setopt expects a 'void *' or 'char *' argument for this option")
+_CURL_WARNING(_curl_easy_setopt_err_curl_httpost,
+              "curl_easy_setopt expects a 'struct curl_httppost *' "
+              "argument for this option")
+_CURL_WARNING(_curl_easy_setopt_err_curl_slist,
+  "curl_easy_setopt expects a 'struct curl_slist *' argument for this option")
+_CURL_WARNING(_curl_easy_setopt_err_CURLSH,
+  "curl_easy_setopt expects a CURLSH* argument for this option")
+
+_CURL_WARNING(_curl_easy_getinfo_err_string,
+  "curl_easy_getinfo expects a pointer to 'char *' for this info")
+_CURL_WARNING(_curl_easy_getinfo_err_long,
+  "curl_easy_getinfo expects a pointer to long for this info")
+_CURL_WARNING(_curl_easy_getinfo_err_double,
+  "curl_easy_getinfo expects a pointer to double for this info")
+_CURL_WARNING(_curl_easy_getinfo_err_curl_slist,
+  "curl_easy_getinfo expects a pointer to 'struct curl_slist *' for this info")
+
+/* groups of curl_easy_setops options that take the same type of argument */
+
+/* To add a new option to one of the groups, just add
+ *   (option) == CURLOPT_SOMETHING
+ * to the or-expression. If the option takes a long or curl_off_t, you don't
+ * have to do anything
+ */
+
+/* evaluates to true if option takes a long argument */
+#define _curl_is_long_option(option)                                          \
+  (0 < (option) && (option) < CURLOPTTYPE_OBJECTPOINT)
+
+#define _curl_is_off_t_option(option)                                         \
+  ((option) > CURLOPTTYPE_OFF_T)
+
+/* evaluates to true if option takes a char* argument */
+#define _curl_is_string_option(option)                                        \
+  ((option) == CURLOPT_ABSTRACT_UNIX_SOCKET ||                                \
+   (option) == CURLOPT_ACCEPT_ENCODING ||                                     \
+   (option) == CURLOPT_CAINFO ||                                              \
+   (option) == CURLOPT_CAPATH ||                                              \
+   (option) == CURLOPT_COOKIE ||                                              \
+   (option) == CURLOPT_COOKIEFILE ||                                          \
+   (option) == CURLOPT_COOKIEJAR ||                                           \
+   (option) == CURLOPT_COOKIELIST ||                                          \
+   (option) == CURLOPT_CRLFILE ||                                             \
+   (option) == CURLOPT_CUSTOMREQUEST ||                                       \
+   (option) == CURLOPT_DEFAULT_PROTOCOL ||                                    \
+   (option) == CURLOPT_DNS_INTERFACE ||                                       \
+   (option) == CURLOPT_DNS_LOCAL_IP4 ||                                       \
+   (option) == CURLOPT_DNS_LOCAL_IP6 ||                                       \
+   (option) == CURLOPT_DNS_SERVERS ||                                         \
+   (option) == CURLOPT_EGDSOCKET ||                                           \
+   (option) == CURLOPT_FTPPORT ||                                             \
+   (option) == CURLOPT_FTP_ACCOUNT ||                                         \
+   (option) == CURLOPT_FTP_ALTERNATIVE_TO_USER ||                             \
+   (option) == CURLOPT_INTERFACE ||                                           \
+   (option) == CURLOPT_ISSUERCERT ||                                          \
+   (option) == CURLOPT_KEYPASSWD ||                                           \
+   (option) == CURLOPT_KRBLEVEL ||                                            \
+   (option) == CURLOPT_LOGIN_OPTIONS ||                                       \
+   (option) == CURLOPT_MAIL_AUTH ||                                           \
+   (option) == CURLOPT_MAIL_FROM ||                                           \
+   (option) == CURLOPT_NETRC_FILE ||                                          \
+   (option) == CURLOPT_NOPROXY ||                                             \
+   (option) == CURLOPT_PASSWORD ||                                            \
+   (option) == CURLOPT_PINNEDPUBLICKEY ||                                     \
+   (option) == CURLOPT_PROXY ||                                               \
+   (option) == CURLOPT_PROXYPASSWORD ||                                       \
+   (option) == CURLOPT_PROXYUSERNAME ||                                       \
+   (option) == CURLOPT_PROXYUSERPWD ||                                        \
+   (option) == CURLOPT_PROXY_SERVICE_NAME ||                                  \
+   (option) == CURLOPT_RANDOM_FILE ||                                         \
+   (option) == CURLOPT_RANGE ||                                               \
+   (option) == CURLOPT_REFERER ||                                             \
+   (option) == CURLOPT_RTSP_SESSION_ID ||                                     \
+   (option) == CURLOPT_RTSP_STREAM_URI ||                                     \
+   (option) == CURLOPT_RTSP_TRANSPORT ||                                      \
+   (option) == CURLOPT_SERVICE_NAME ||                                        \
+   (option) == CURLOPT_SOCKS5_GSSAPI_SERVICE ||                               \
+   (option) == CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 ||                             \
+   (option) == CURLOPT_SSH_KNOWNHOSTS ||                                      \
+   (option) == CURLOPT_SSH_PRIVATE_KEYFILE ||                                 \
+   (option) == CURLOPT_SSH_PUBLIC_KEYFILE ||                                  \
+   (option) == CURLOPT_SSLCERT ||                                             \
+   (option) == CURLOPT_SSLCERTTYPE ||                                         \
+   (option) == CURLOPT_SSLENGINE ||                                           \
+   (option) == CURLOPT_SSLKEY ||                                              \
+   (option) == CURLOPT_SSLKEYTYPE ||                                          \
+   (option) == CURLOPT_SSL_CIPHER_LIST ||                                     \
+   (option) == CURLOPT_TLSAUTH_PASSWORD ||                                    \
+   (option) == CURLOPT_TLSAUTH_TYPE ||                                        \
+   (option) == CURLOPT_TLSAUTH_USERNAME ||                                    \
+   (option) == CURLOPT_UNIX_SOCKET_PATH ||                                    \
+   (option) == CURLOPT_URL ||                                                 \
+   (option) == CURLOPT_USERAGENT ||                                           \
+   (option) == CURLOPT_USERNAME ||                                            \
+   (option) == CURLOPT_USERPWD ||                                             \
+   (option) == CURLOPT_XOAUTH2_BEARER ||                                      \
+   0)
+
+/* evaluates to true if option takes a curl_write_callback argument */
+#define _curl_is_write_cb_option(option)                                      \
+  ((option) == CURLOPT_HEADERFUNCTION ||                                      \
+   (option) == CURLOPT_WRITEFUNCTION)
+
+/* evaluates to true if option takes a curl_conv_callback argument */
+#define _curl_is_conv_cb_option(option)                                       \
+  ((option) == CURLOPT_CONV_TO_NETWORK_FUNCTION ||                            \
+   (option) == CURLOPT_CONV_FROM_NETWORK_FUNCTION ||                          \
+   (option) == CURLOPT_CONV_FROM_UTF8_FUNCTION)
+
+/* evaluates to true if option takes a data argument to pass to a callback */
+#define _curl_is_cb_data_option(option)                                       \
+  ((option) == CURLOPT_CHUNK_DATA ||                                          \
+   (option) == CURLOPT_CLOSESOCKETDATA ||                                     \
+   (option) == CURLOPT_DEBUGDATA ||                                           \
+   (option) == CURLOPT_FNMATCH_DATA ||                                        \
+   (option) == CURLOPT_HEADERDATA ||                                          \
+   (option) == CURLOPT_INTERLEAVEDATA ||                                      \
+   (option) == CURLOPT_IOCTLDATA ||                                           \
+   (option) == CURLOPT_OPENSOCKETDATA ||                                      \
+   (option) == CURLOPT_PRIVATE ||                                             \
+   (option) == CURLOPT_PROGRESSDATA ||                                        \
+   (option) == CURLOPT_READDATA ||                                            \
+   (option) == CURLOPT_SEEKDATA ||                                            \
+   (option) == CURLOPT_SOCKOPTDATA ||                                         \
+   (option) == CURLOPT_SSH_KEYDATA ||                                         \
+   (option) == CURLOPT_SSL_CTX_DATA ||                                        \
+   (option) == CURLOPT_WRITEDATA ||                                           \
+   0)
+
+/* evaluates to true if option takes a POST data argument (void* or char*) */
+#define _curl_is_postfields_option(option)                                    \
+  ((option) == CURLOPT_POSTFIELDS ||                                          \
+   (option) == CURLOPT_COPYPOSTFIELDS ||                                      \
+   0)
+
+/* evaluates to true if option takes a struct curl_slist * argument */
+#define _curl_is_slist_option(option)                                         \
+  ((option) == CURLOPT_HTTP200ALIASES ||                                      \
+   (option) == CURLOPT_HTTPHEADER ||                                          \
+   (option) == CURLOPT_MAIL_RCPT ||                                           \
+   (option) == CURLOPT_POSTQUOTE ||                                           \
+   (option) == CURLOPT_PREQUOTE ||                                            \
+   (option) == CURLOPT_PROXYHEADER ||                                         \
+   (option) == CURLOPT_QUOTE ||                                               \
+   (option) == CURLOPT_RESOLVE ||                                             \
+   (option) == CURLOPT_TELNETOPTIONS ||                                       \
+   0)
+
+/* groups of curl_easy_getinfo infos that take the same type of argument */
+
+/* evaluates to true if info expects a pointer to char * argument */
+#define _curl_is_string_info(info)                                            \
+  (CURLINFO_STRING < (info) && (info) < CURLINFO_LONG)
+
+/* evaluates to true if info expects a pointer to long argument */
+#define _curl_is_long_info(info)                                              \
+  (CURLINFO_LONG < (info) && (info) < CURLINFO_DOUBLE)
+
+/* evaluates to true if info expects a pointer to double argument */
+#define _curl_is_double_info(info)                                            \
+  (CURLINFO_DOUBLE < (info) && (info) < CURLINFO_SLIST)
+
+/* true if info expects a pointer to struct curl_slist * argument */
+#define _curl_is_slist_info(info)                                             \
+  (CURLINFO_SLIST < (info))
+
+
+/* typecheck helpers -- check whether given expression has requested type*/
+
+/* For pointers, you can use the _curl_is_ptr/_curl_is_arr macros,
+ * otherwise define a new macro. Search for __builtin_types_compatible_p
+ * in the GCC manual.
+ * NOTE: these macros MUST NOT EVALUATE their arguments! The argument is
+ * the actual expression passed to the curl_easy_setopt macro. This
+ * means that you can only apply the sizeof and __typeof__ operators, no
+ * == or whatsoever.
+ */
+
+/* XXX: should evaluate to true iff expr is a pointer */
+#define _curl_is_any_ptr(expr)                                                \
+  (sizeof(expr) == sizeof(void *))
+
+/* evaluates to true if expr is NULL */
+/* XXX: must not evaluate expr, so this check is not accurate */
+#define _curl_is_NULL(expr)                                                   \
+  (__builtin_types_compatible_p(__typeof__(expr), __typeof__(NULL)))
+
+/* evaluates to true if expr is type*, const type* or NULL */
+#define _curl_is_ptr(expr, type)                                              \
+  (_curl_is_NULL(expr) ||                                                     \
+   __builtin_types_compatible_p(__typeof__(expr), type *) ||                  \
+   __builtin_types_compatible_p(__typeof__(expr), const type *))
+
+/* evaluates to true if expr is one of type[], type*, NULL or const type* */
+#define _curl_is_arr(expr, type)                                              \
+  (_curl_is_ptr((expr), type) ||                                              \
+   __builtin_types_compatible_p(__typeof__(expr), type []))
+
+/* evaluates to true if expr is a string */
+#define _curl_is_string(expr)                                                 \
+  (_curl_is_arr((expr), char) ||                                              \
+   _curl_is_arr((expr), signed char) ||                                       \
+   _curl_is_arr((expr), unsigned char))
+
+/* evaluates to true if expr is a long (no matter the signedness)
+ * XXX: for now, int is also accepted (and therefore short and char, which
+ * are promoted to int when passed to a variadic function) */
+#define _curl_is_long(expr)                                                   \
+  (__builtin_types_compatible_p(__typeof__(expr), long) ||                    \
+   __builtin_types_compatible_p(__typeof__(expr), signed long) ||             \
+   __builtin_types_compatible_p(__typeof__(expr), unsigned long) ||           \
+   __builtin_types_compatible_p(__typeof__(expr), int) ||                     \
+   __builtin_types_compatible_p(__typeof__(expr), signed int) ||              \
+   __builtin_types_compatible_p(__typeof__(expr), unsigned int) ||            \
+   __builtin_types_compatible_p(__typeof__(expr), short) ||                   \
+   __builtin_types_compatible_p(__typeof__(expr), signed short) ||            \
+   __builtin_types_compatible_p(__typeof__(expr), unsigned short) ||          \
+   __builtin_types_compatible_p(__typeof__(expr), char) ||                    \
+   __builtin_types_compatible_p(__typeof__(expr), signed char) ||             \
+   __builtin_types_compatible_p(__typeof__(expr), unsigned char))
+
+/* evaluates to true if expr is of type curl_off_t */
+#define _curl_is_off_t(expr)                                                  \
+  (__builtin_types_compatible_p(__typeof__(expr), curl_off_t))
+
+/* evaluates to true if expr is abuffer suitable for CURLOPT_ERRORBUFFER */
+/* XXX: also check size of an char[] array? */
+#define _curl_is_error_buffer(expr)                                           \
+  (_curl_is_NULL(expr) ||                                                     \
+   __builtin_types_compatible_p(__typeof__(expr), char *) ||                  \
+   __builtin_types_compatible_p(__typeof__(expr), char[]))
+
+/* evaluates to true if expr is of type (const) void* or (const) FILE* */
+#if 0
+#define _curl_is_cb_data(expr)                                                \
+  (_curl_is_ptr((expr), void) ||                                              \
+   _curl_is_ptr((expr), FILE))
+#else /* be less strict */
+#define _curl_is_cb_data(expr)                                                \
+  _curl_is_any_ptr(expr)
+#endif
+
+/* evaluates to true if expr is of type FILE* */
+#define _curl_is_FILE(expr)                                                   \
+  (__builtin_types_compatible_p(__typeof__(expr), FILE *))
+
+/* evaluates to true if expr can be passed as POST data (void* or char*) */
+#define _curl_is_postfields(expr)                                             \
+  (_curl_is_ptr((expr), void) ||                                              \
+   _curl_is_arr((expr), char))
+
+/* FIXME: the whole callback checking is messy...
+ * The idea is to tolerate char vs. void and const vs. not const
+ * pointers in arguments at least
+ */
+/* helper: __builtin_types_compatible_p distinguishes between functions and
+ * function pointers, hide it */
+#define _curl_callback_compatible(func, type)                                 \
+  (__builtin_types_compatible_p(__typeof__(func), type) ||                    \
+   __builtin_types_compatible_p(__typeof__(func), type*))
+
+/* evaluates to true if expr is of type curl_read_callback or "similar" */
+#define _curl_is_read_cb(expr)                                          \
+  (_curl_is_NULL(expr) ||                                                     \
+   __builtin_types_compatible_p(__typeof__(expr), __typeof__(fread)) ||       \
+   __builtin_types_compatible_p(__typeof__(expr), curl_read_callback) ||      \
+   _curl_callback_compatible((expr), _curl_read_callback1) ||                 \
+   _curl_callback_compatible((expr), _curl_read_callback2) ||                 \
+   _curl_callback_compatible((expr), _curl_read_callback3) ||                 \
+   _curl_callback_compatible((expr), _curl_read_callback4) ||                 \
+   _curl_callback_compatible((expr), _curl_read_callback5) ||                 \
+   _curl_callback_compatible((expr), _curl_read_callback6))
+typedef size_t (_curl_read_callback1)(char *, size_t, size_t, void *);
+typedef size_t (_curl_read_callback2)(char *, size_t, size_t, const void *);
+typedef size_t (_curl_read_callback3)(char *, size_t, size_t, FILE *);
+typedef size_t (_curl_read_callback4)(void *, size_t, size_t, void *);
+typedef size_t (_curl_read_callback5)(void *, size_t, size_t, const void *);
+typedef size_t (_curl_read_callback6)(void *, size_t, size_t, FILE *);
+
+/* evaluates to true if expr is of type curl_write_callback or "similar" */
+#define _curl_is_write_cb(expr)                                               \
+  (_curl_is_read_cb(expr) ||                                            \
+   __builtin_types_compatible_p(__typeof__(expr), __typeof__(fwrite)) ||      \
+   __builtin_types_compatible_p(__typeof__(expr), curl_write_callback) ||     \
+   _curl_callback_compatible((expr), _curl_write_callback1) ||                \
+   _curl_callback_compatible((expr), _curl_write_callback2) ||                \
+   _curl_callback_compatible((expr), _curl_write_callback3) ||                \
+   _curl_callback_compatible((expr), _curl_write_callback4) ||                \
+   _curl_callback_compatible((expr), _curl_write_callback5) ||                \
+   _curl_callback_compatible((expr), _curl_write_callback6))
+typedef size_t (_curl_write_callback1)(const char *, size_t, size_t, void *);
+typedef size_t (_curl_write_callback2)(const char *, size_t, size_t,
+                                       const void *);
+typedef size_t (_curl_write_callback3)(const char *, size_t, size_t, FILE *);
+typedef size_t (_curl_write_callback4)(const void *, size_t, size_t, void *);
+typedef size_t (_curl_write_callback5)(const void *, size_t, size_t,
+                                       const void *);
+typedef size_t (_curl_write_callback6)(const void *, size_t, size_t, FILE *);
+
+/* evaluates to true if expr is of type curl_ioctl_callback or "similar" */
+#define _curl_is_ioctl_cb(expr)                                         \
+  (_curl_is_NULL(expr) ||                                                     \
+   __builtin_types_compatible_p(__typeof__(expr), curl_ioctl_callback) ||     \
+   _curl_callback_compatible((expr), _curl_ioctl_callback1) ||                \
+   _curl_callback_compatible((expr), _curl_ioctl_callback2) ||                \
+   _curl_callback_compatible((expr), _curl_ioctl_callback3) ||                \
+   _curl_callback_compatible((expr), _curl_ioctl_callback4))
+typedef curlioerr (_curl_ioctl_callback1)(CURL *, int, void *);
+typedef curlioerr (_curl_ioctl_callback2)(CURL *, int, const void *);
+typedef curlioerr (_curl_ioctl_callback3)(CURL *, curliocmd, void *);
+typedef curlioerr (_curl_ioctl_callback4)(CURL *, curliocmd, const void *);
+
+/* evaluates to true if expr is of type curl_sockopt_callback or "similar" */
+#define _curl_is_sockopt_cb(expr)                                       \
+  (_curl_is_NULL(expr) ||                                                     \
+   __builtin_types_compatible_p(__typeof__(expr), curl_sockopt_callback) ||   \
+   _curl_callback_compatible((expr), _curl_sockopt_callback1) ||              \
+   _curl_callback_compatible((expr), _curl_sockopt_callback2))
+typedef int (_curl_sockopt_callback1)(void *, curl_socket_t, curlsocktype);
+typedef int (_curl_sockopt_callback2)(const void *, curl_socket_t,
+                                      curlsocktype);
+
+/* evaluates to true if expr is of type curl_opensocket_callback or
+   "similar" */
+#define _curl_is_opensocket_cb(expr)                                    \
+  (_curl_is_NULL(expr) ||                                                     \
+   __builtin_types_compatible_p(__typeof__(expr), curl_opensocket_callback) ||\
+   _curl_callback_compatible((expr), _curl_opensocket_callback1) ||           \
+   _curl_callback_compatible((expr), _curl_opensocket_callback2) ||           \
+   _curl_callback_compatible((expr), _curl_opensocket_callback3) ||           \
+   _curl_callback_compatible((expr), _curl_opensocket_callback4))
+typedef curl_socket_t (_curl_opensocket_callback1)
+  (void *, curlsocktype, struct curl_sockaddr *);
+typedef curl_socket_t (_curl_opensocket_callback2)
+  (void *, curlsocktype, const struct curl_sockaddr *);
+typedef curl_socket_t (_curl_opensocket_callback3)
+  (const void *, curlsocktype, struct curl_sockaddr *);
+typedef curl_socket_t (_curl_opensocket_callback4)
+  (const void *, curlsocktype, const struct curl_sockaddr *);
+
+/* evaluates to true if expr is of type curl_progress_callback or "similar" */
+#define _curl_is_progress_cb(expr)                                      \
+  (_curl_is_NULL(expr) ||                                                     \
+   __builtin_types_compatible_p(__typeof__(expr), curl_progress_callback) ||  \
+   _curl_callback_compatible((expr), _curl_progress_callback1) ||             \
+   _curl_callback_compatible((expr), _curl_progress_callback2))
+typedef int (_curl_progress_callback1)(void *,
+    double, double, double, double);
+typedef int (_curl_progress_callback2)(const void *,
+    double, double, double, double);
+
+/* evaluates to true if expr is of type curl_debug_callback or "similar" */
+#define _curl_is_debug_cb(expr)                                         \
+  (_curl_is_NULL(expr) ||                                                     \
+   __builtin_types_compatible_p(__typeof__(expr), curl_debug_callback) ||     \
+   _curl_callback_compatible((expr), _curl_debug_callback1) ||                \
+   _curl_callback_compatible((expr), _curl_debug_callback2) ||                \
+   _curl_callback_compatible((expr), _curl_debug_callback3) ||                \
+   _curl_callback_compatible((expr), _curl_debug_callback4) ||                \
+   _curl_callback_compatible((expr), _curl_debug_callback5) ||                \
+   _curl_callback_compatible((expr), _curl_debug_callback6) ||                \
+   _curl_callback_compatible((expr), _curl_debug_callback7) ||                \
+   _curl_callback_compatible((expr), _curl_debug_callback8))
+typedef int (_curl_debug_callback1) (CURL *,
+    curl_infotype, char *, size_t, void *);
+typedef int (_curl_debug_callback2) (CURL *,
+    curl_infotype, char *, size_t, const void *);
+typedef int (_curl_debug_callback3) (CURL *,
+    curl_infotype, const char *, size_t, void *);
+typedef int (_curl_debug_callback4) (CURL *,
+    curl_infotype, const char *, size_t, const void *);
+typedef int (_curl_debug_callback5) (CURL *,
+    curl_infotype, unsigned char *, size_t, void *);
+typedef int (_curl_debug_callback6) (CURL *,
+    curl_infotype, unsigned char *, size_t, const void *);
+typedef int (_curl_debug_callback7) (CURL *,
+    curl_infotype, const unsigned char *, size_t, void *);
+typedef int (_curl_debug_callback8) (CURL *,
+    curl_infotype, const unsigned char *, size_t, const void *);
+
+/* evaluates to true if expr is of type curl_ssl_ctx_callback or "similar" */
+/* this is getting even messier... */
+#define _curl_is_ssl_ctx_cb(expr)                                       \
+  (_curl_is_NULL(expr) ||                                                     \
+   __builtin_types_compatible_p(__typeof__(expr), curl_ssl_ctx_callback) ||   \
+   _curl_callback_compatible((expr), _curl_ssl_ctx_callback1) ||              \
+   _curl_callback_compatible((expr), _curl_ssl_ctx_callback2) ||              \
+   _curl_callback_compatible((expr), _curl_ssl_ctx_callback3) ||              \
+   _curl_callback_compatible((expr), _curl_ssl_ctx_callback4) ||              \
+   _curl_callback_compatible((expr), _curl_ssl_ctx_callback5) ||              \
+   _curl_callback_compatible((expr), _curl_ssl_ctx_callback6) ||              \
+   _curl_callback_compatible((expr), _curl_ssl_ctx_callback7) ||              \
+   _curl_callback_compatible((expr), _curl_ssl_ctx_callback8))
+typedef CURLcode (_curl_ssl_ctx_callback1)(CURL *, void *, void *);
+typedef CURLcode (_curl_ssl_ctx_callback2)(CURL *, void *, const void *);
+typedef CURLcode (_curl_ssl_ctx_callback3)(CURL *, const void *, void *);
+typedef CURLcode (_curl_ssl_ctx_callback4)(CURL *, const void *, const void *);
+#ifdef HEADER_SSL_H
+/* hack: if we included OpenSSL's ssl.h, we know about SSL_CTX
+ * this will of course break if we're included before OpenSSL headers...
+ */
+typedef CURLcode (_curl_ssl_ctx_callback5)(CURL *, SSL_CTX, void *);
+typedef CURLcode (_curl_ssl_ctx_callback6)(CURL *, SSL_CTX, const void *);
+typedef CURLcode (_curl_ssl_ctx_callback7)(CURL *, const SSL_CTX, void *);
+typedef CURLcode (_curl_ssl_ctx_callback8)(CURL *, const SSL_CTX,
+                                           const void *);
+#else
+typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback5;
+typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback6;
+typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback7;
+typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback8;
+#endif
+
+/* evaluates to true if expr is of type curl_conv_callback or "similar" */
+#define _curl_is_conv_cb(expr)                                          \
+  (_curl_is_NULL(expr) ||                                                     \
+   __builtin_types_compatible_p(__typeof__(expr), curl_conv_callback) ||      \
+   _curl_callback_compatible((expr), _curl_conv_callback1) ||                 \
+   _curl_callback_compatible((expr), _curl_conv_callback2) ||                 \
+   _curl_callback_compatible((expr), _curl_conv_callback3) ||                 \
+   _curl_callback_compatible((expr), _curl_conv_callback4))
+typedef CURLcode (*_curl_conv_callback1)(char *, size_t length);
+typedef CURLcode (*_curl_conv_callback2)(const char *, size_t length);
+typedef CURLcode (*_curl_conv_callback3)(void *, size_t length);
+typedef CURLcode (*_curl_conv_callback4)(const void *, size_t length);
+
+/* evaluates to true if expr is of type curl_seek_callback or "similar" */
+#define _curl_is_seek_cb(expr)                                          \
+  (_curl_is_NULL(expr) ||                                                     \
+   __builtin_types_compatible_p(__typeof__(expr), curl_seek_callback) ||      \
+   _curl_callback_compatible((expr), _curl_seek_callback1) ||                 \
+   _curl_callback_compatible((expr), _curl_seek_callback2))
+typedef CURLcode (*_curl_seek_callback1)(void *, curl_off_t, int);
+typedef CURLcode (*_curl_seek_callback2)(const void *, curl_off_t, int);
+
+
+#endif /* __CURL_TYPECHECK_GCC_H */

includes/iguana_apideclares.h

@@ -13,6 +13,12 @@
  *                                                                            *
  ******************************************************************************/
 
+#ifdef _IGUANA_APIDEC_H_
+emit compiler error if recursively being included
+#endif
+#ifndef _IGUANA_APIDEC_H_
+#define _IGUANA_APIDEC_H_
+
 STRING_ARG(dpow,pending,fiat);
 ZERO_ARGS(dpow,notarychains);
 STRING_ARG(dpow,active,maskhex);
@@ -49,6 +55,8 @@ HASH_AND_STRING_AND_INT(dex,gettxin,txid,symbol,vout);
 TWO_STRINGS(dex,listspent,symbol,address);
 TWO_STRINGS(dex,getbalance,symbol,address);
 STRING_ARG(dex,explorer,symbol);
+STRING_ARG(dex,getmessage,argstr);
+STRING_ARG(dex,psock,argstr);
 
 HASH_ARRAY_STRING(basilisk,genesis_opreturn,hash,vals,hexstr);
 HASH_ARRAY_STRING(basilisk,history,hash,vals,hexstr);
@@ -57,6 +65,7 @@ HASH_ARRAY_STRING(basilisk,balances,hash,vals,hexstr);
 HASH_ARRAY_STRING(basilisk,value,hash,vals,hexstr);
 HASH_ARRAY_STRING(basilisk,rawtx,hash,vals,hexstr);
 TWO_STRINGS(basilisk,refresh,symbol,address);
+ZERO_ARGS(basilisk,cancelrefresh);
 STRING_ARRAY_OBJ_STRING(basilisk,utxorawtx,symbol,utxos,vals,ignore);
 
 HASH_ARRAY_STRING(basilisk,getmessage,hash,vals,hexstr);
@@ -186,6 +195,9 @@ STRING_AND_INT(iguana,bundlehashes,activecoin,height);
 STRING_AND_INT(iguana,PoSweights,activecoin,height);
 STRING_ARG(iguana,stakers,activecoin);
 
+STRING_ARG(jumblr,setpassphrase,passphrase);
+ZERO_ARGS(jumblr,status);
+
 ZERO_ARGS(InstantDEX,allcoins);
 STRING_ARG(InstantDEX,available,source);
 HASH_ARRAY_STRING(InstantDEX,request,hash,vals,hexstr);
@@ -211,6 +223,8 @@ STRING_AND_INT(InstantDEX,pollgap,exchange,pollgap);
 ZERO_ARGS(InstantDEX,allexchanges);
 STRING_ARG(InstantDEX,allpairs,exchange);
 THREE_STRINGS(InstantDEX,supports,exchange,base,rel);
+ZERO_ARGS(InstantDEX,init);
+ZERO_ARGS(InstantDEX,getswaplist);
 
 //THREE_STRINGS(atomic,approve,myorderid,otherid,txname);
 //THREE_STRINGS(atomic,claim,myorderid,otherid,txname);
@@ -322,6 +336,8 @@ STRING_ARG(hash,base64_decode,message);
 STRING_ARG(hash,rmd160_sha256,message);
 STRING_ARG(hash,sha256_sha256,message);
 
+#ifndef WIN32
+
 STRING_ARG(hash,sha224,message);
 STRING_ARG(hash,sha256,message);
 STRING_ARG(hash,sha384,message);
@@ -351,3 +367,7 @@ TWO_STRINGS(hmac,md4,message,passphrase);
 TWO_STRINGS(hmac,md5,message,passphrase);
 TWO_STRINGS(hmac,tiger192_3,message,passphrase);
 TWO_STRINGS(hmac,whirlpool,message,passphrase);
+
+#endif
+
+#endif

includes/iguana_apideclares2.h

@@ -0,0 +1,31 @@
+#ifdef WIN32
+STRING_ARG(hash, sha224, message);
+STRING_ARG(hash, sha256, message);
+STRING_ARG(hash, sha384, message);
+STRING_ARG(hash, sha512, message);
+STRING_ARG(hash, rmd128, message);
+STRING_ARG(hash, rmd160, message);
+STRING_ARG(hash, rmd256, message);
+STRING_ARG(hash, rmd320, message);
+STRING_ARG(hash, sha1, message);
+STRING_ARG(hash, md2, message);
+STRING_ARG(hash, md4, message);
+STRING_ARG(hash, md5, message);
+STRING_ARG(hash, tiger192_3, message);
+STRING_ARG(hash, whirlpool, message);
+
+TWO_STRINGS(hmac, sha224, message, passphrase);
+TWO_STRINGS(hmac, sha256, message, passphrase);
+TWO_STRINGS(hmac, sha384, message, passphrase);
+TWO_STRINGS(hmac, sha512, message, passphrase);
+TWO_STRINGS(hmac, rmd128, message, passphrase);
+TWO_STRINGS(hmac, rmd160, message, passphrase);
+TWO_STRINGS(hmac, rmd256, message, passphrase);
+TWO_STRINGS(hmac, rmd320, message, passphrase);
+TWO_STRINGS(hmac, sha1, message, passphrase);
+TWO_STRINGS(hmac, md2, message, passphrase);
+TWO_STRINGS(hmac, md4, message, passphrase);
+TWO_STRINGS(hmac, md5, message, passphrase);
+TWO_STRINGS(hmac, tiger192_3, message, passphrase);
+TWO_STRINGS(hmac, whirlpool, message, passphrase);
+#endif

includes/iguana_apiundefs.h

@@ -49,3 +49,5 @@
 #undef IGUANA_ARGS
 #undef IGUANA_CALLARGS
 
+#undef _IGUANA_APIDEC_H_
+

includes/iguana_funcs.h

@@ -15,6 +15,10 @@
 
 #ifndef H_IGUANAFUNCS_H
 #define H_IGUANAFUNCS_H
+#define SIGHASH_ALL 1
+
+cJSON *SuperNET_helpjson();
+
 // peers
 int32_t iguana_verifypeer(struct iguana_info *coin,void *key,void *value,int32_t itemind,int32_t itemsize);
 int32_t iguana_peermetrics(struct supernet_info *myinfo,struct iguana_info *coin);
@@ -316,6 +320,10 @@ int32_t bitcoin_changescript(struct iguana_info *coin,uint8_t *changescript,int3
 //cJSON *bitcoin_addinput(struct iguana_info *coin,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);
 int32_t bitcoin_verifytx(struct iguana_info *coin,bits256 *signedtxidp,char **signedtx,char *rawtxstr,struct vin_info *V,int32_t numinputs);
 int32_t bitcoin_verify(void *ctx,uint8_t *sig,int32_t siglen,bits256 txhash2,uint8_t *pubkey,int32_t plen);
+cJSON *SuperNET_decryptedjson(char *destfname,char *passphrase,int32_t passsize,bits256 wallethash,char *fname2fa,int32_t fnamesize,bits256 wallet2priv);
+int32_t bitcoin_txaddspend(struct iguana_info *coin,cJSON *txobj,char *destaddress,uint64_t satoshis);
+char *_setVsigner(struct iguana_info *coin,struct vin_info *V,int32_t ind,char *pubstr,char *wifstr);
+
 char *bitcoin_json2hex(struct supernet_info *myinfo,struct iguana_info *coin,bits256 *txidp,cJSON *txjson,struct vin_info *V);
 int32_t bitcoin_addr2rmd160(uint8_t *addrtypep,uint8_t rmd160[20],char *coinaddr);
 char *issue_startForging(struct supernet_info *myinfo,char *secret);
@@ -518,6 +526,7 @@ int32_t iguana_unspentind2txid(struct supernet_info *myinfo,struct iguana_info *
 int32_t iguana_RTunspent_check(struct supernet_info *myinfo,struct iguana_info *coin,struct iguana_outpoint outpt);
 char *basilisk_bitcoinrawtx(struct supernet_info *myinfo,struct iguana_info *coin,char *remoteaddr,uint32_t basilisktag,int32_t timeoutmillis,cJSON *valsobj,struct vin_info *V);
 int32_t iguana_markedunspents_find(struct iguana_info *coin,int32_t *firstslotp,bits256 txid,int32_t vout);
+void jumblr_opidsupdate(struct supernet_info *myinfo,struct iguana_info *coin);
 
 char *iguana_signrawtx(struct supernet_info *myinfo,struct iguana_info *coin,int32_t height,bits256 *signedtxidp,int32_t *completedp,cJSON *vins,char *rawtx,cJSON *privkey,struct vin_info *V);
 bits256 scrypt_blockhash(const void *input);
@@ -596,6 +605,11 @@ void basilisk_ensurerelay(struct supernet_info *myinfo,struct iguana_info *notar
 void dpow_nanomsginit(struct supernet_info *myinfo,char *ipaddr);
 int32_t iguana_datachain_scan(struct supernet_info *myinfo,struct iguana_info *coin,uint8_t rmd160[20]);
 void basilisk_requests_poll(struct supernet_info *myinfo);
+void dpow_psockloop(void *_ptr);
+int32_t smartaddress_add(struct supernet_info *myinfo,bits256 privkey,char *BTCaddr,char *KMDaddr);
+int32_t smartaddress(struct supernet_info *myinfo,bits256 *privkeyp,char *coinaddr);
+int32_t smartaddress_pubkey(struct supernet_info *myinfo,bits256 *privkeyp,bits256 pubkey);
+int32_t smartaddress_pubkey33(struct supernet_info *myinfo,bits256 *privkeyp,uint8_t *pubkey33);
 
 void iguana_RTreset(struct iguana_info *coin);
 void iguana_RTpurge(struct iguana_info *coin,int32_t lastheight);
@@ -614,6 +628,11 @@ uint64_t *iguana_PoS_weights(struct supernet_info *myinfo,struct iguana_info *co
 int32_t iguana_staker_sort(struct iguana_info *coin,bits256 *hash2p,uint8_t *refrmd160,struct iguana_pkhash *refP,uint64_t *weights,int32_t numweights,bits256 *sortbuf);
 bits256 mpz_div64(bits256 hash,uint64_t divval);
 void iguana_walletinitcheck(struct supernet_info *myinfo,struct iguana_info *coin);
+void jumblr_iteration(struct supernet_info *myinfo,struct iguana_info *coin,int32_t selector,int32_t modval);
+void jumblr_DEXcheck(struct supernet_info *myinfo,struct iguana_info *coinkmd,char *BTCaddr,char *KMDaddr,bits256 privkey);
+bits256 jumblr_privkey(struct supernet_info *myinfo,char *BTCaddr,char *KMDaddr,char *prefix);
+char *jumblr_importprivkey(struct supernet_info *myinfo,struct iguana_info *coin,char *wifstr);
+int64_t iguana_esttxfee(struct supernet_info *myinfo,struct iguana_info *coin,char *rawtx,char *signedtx,int32_t numvins);
 
 // ------------------------------------------------------[ Preparation ]----
 // Initialise a gfshare context for producing shares

includes/iguana_structs.h

@@ -531,6 +531,7 @@ struct iguana_info
     uint32_t utxoaddrlastcount,*utxoaddroffsets,lastunspentsupdate; uint8_t *utxoaddrtable; bits256 utxoaddrhash;
     FILE *utxofp;
     bits256 markedunspents[1024];
+    uint64_t estimatedfee;
     char seedipaddr[64]; 
     uint32_t lastbesthashtime; bits256 lastbesthash; int32_t lastbestheight;
     struct iguana_block *RTblocks[65536]; uint8_t *RTrawdata[65536]; int32_t RTrecvlens[65536],RTnumtx[65536];