Merge pull request #511 from jl777/spvdex

prevent unspent from being swapped

crypto777/iguana_utils.c

@@ -992,6 +992,7 @@ int32_t RS_encode(char *rsaddr,uint64_t id)
             rsaddr[j++] = '-';
     }
     rsaddr[j] = 0;
+    //printf("%llu -> NXT RS (%s)\n",(long long)id,rsaddr);
     return(0);
 }
 
@@ -1122,6 +1123,7 @@ void calc_NXTaddr(char *hexstr,uint8_t *buf,uint8_t *msg,int32_t len)
 {
     uint8_t mysecret[32]; uint64_t nxt64bits;
     nxt64bits = conv_NXTpassword(mysecret,buf,msg,len);
+    //printf("call RSencode with %llu\n",(long long)nxt64bits);
     RS_encode(hexstr,nxt64bits);
 }
 

iguana/exchanges/LP_commands.c

@@ -181,6 +181,7 @@ zeroconf_claim(address, expiration=0)\n\
         jdelete(argjson,"userpass");
         if ( strcmp(method,"passphrase") == 0 )
         {
+            char coinaddr[64];
             G.USERPASS_COUNTER = 1;
             if ( LP_passphrase_init(jstr(argjson,"passphrase"),jstr(argjson,"gui")) < 0 )
                 return(clonestr("{\"error\":\"couldnt change passphrase\"}"));
@@ -189,6 +190,11 @@ zeroconf_claim(address, expiration=0)\n\
                 jaddstr(retjson,"result","success");
                 jaddstr(retjson,"userpass",G.USERPASS);
                 jaddbits256(retjson,"mypubkey",G.LP_mypub25519);
+                bitcoin_address(coinaddr,0,60,G.LP_myrmd160,20);
+                jaddstr(retjson,"KMD",coinaddr);
+                bitcoin_address(coinaddr,0,0,G.LP_myrmd160,20);
+                jaddstr(retjson,"BTC",coinaddr);
+                jaddstr(retjson,"NXT",G.LP_NXTaddr);
                 return(jprint(retjson,1));
             }
         }

iguana/exchanges/LP_include.h

@@ -477,6 +477,7 @@ uint16_t LP_psock_get(char *connectaddr,char *publicaddr,int32_t ispaired);
 //void LP_utxo_clientpublish(struct LP_utxoinfo *utxo);
 int32_t LP_coinbus(uint16_t coin_busport);
 int32_t LP_nanomsg_recvs(void *ctx);
+int32_t LP_numconfirms(char *symbol,char *coinaddr,bits256 txid,int32_t vout,int32_t mempool);
 void LP_aliceid(uint32_t tradeid,uint64_t aliceid,char *event,uint32_t requestid,uint32_t quoteid);
 cJSON *LP_cache_transaction(struct iguana_info *coin,bits256 txid,uint8_t *serialized,int32_t len);
 cJSON *LP_transaction_fromdata(struct iguana_info *coin,bits256 txid,uint8_t *serialized,int32_t len);

iguana/exchanges/LP_nativeDEX.c

@@ -18,13 +18,13 @@
 //  marketmaker
 //
 // prune expired/spent deposits from instantdex.json
+// -CPU usage spike after 12 hours
 // verify claim works
 // big BTC swaps
 // https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki for signing BCH/BTG
 //
 // compress packets
 // cancel bid/ask
-// portfolio:
 // portfolio to set prices from historical
 // portfolio value based on ask?
 // USD paxprice based USDvalue in portfolio
@@ -121,7 +121,7 @@ struct LP_globals
     uint8_t LP_myrmd160[20],LP_pubsecp[33];
     uint32_t LP_sessionid,counter;
     int32_t LP_IAMLP,LP_pendingswaps,USERPASS_COUNTER,LP_numprivkeys,initializing,waiting,LP_numskips;
-    char USERPASS[65],USERPASS_WIFSTR[64],LP_myrmd160str[41],gui[16];
+    char USERPASS[65],USERPASS_WIFSTR[64],LP_myrmd160str[41],gui[16],LP_NXTaddr[64];
     struct LP_privkey LP_privkeys[100];
 } G;
 

iguana/exchanges/LP_privkey.c

@@ -208,6 +208,7 @@ bits256 LP_privkeycalc(void *ctx,uint8_t *pubkey33,bits256 *pubkeyp,struct iguan
     bits256 privkey,userpub,zero,userpass,checkkey; char tmpstr[128]; cJSON *retjson; uint8_t tmptype;
     if ( passphrase != 0 && passphrase[0] != 0 )
     {
+        calc_NXTaddr(G.LP_NXTaddr,userpub.bytes,(uint8_t *)passphrase,(int32_t)strlen(passphrase));
         conv_NXTpassword(privkey.bytes,pubkeyp->bytes,(uint8_t *)passphrase,(int32_t)strlen(passphrase));
         //vcalc_sha256(0,checkkey.bytes,(uint8_t *)passphrase,(int32_t)strlen(passphrase));
         //printf("SHA256.(%s) ",bits256_str(pstr,checkkey));

iguana/exchanges/LP_rpc.c

@@ -206,6 +206,93 @@ cJSON *LP_NXT_decrypt(uint64_t txnum,char *account,char *data,char *nonce,char *
     return(retjson);
 }
 
+int64_t NXTventure_qty(uint64_t assetid)
+{
+    char url[1024],*retstr; uint64_t qty=0; cJSON *retjson;
+    sprintf(url,"http://127.0.0.1:7876/nxt?requestType=getAccountAssets&account=NXT-XRK4-5HYK-5965-9FH4Z&includeAssetInfo=true");
+    if ( (retstr= issue_curlt(url,LP_HTTP_TIMEOUT)) != 0 )
+    {
+        printf("NXT_venture_qty(%s)\n",retstr);
+        if ( (retjson= cJSON_Parse(retstr)) != 0 )
+        {
+            free_json(retjson);
+        }
+        free(retstr);
+    }
+    //NXT_venture_qty({"accountAssets":[{"quantityQNT":"3900000000","unconfirmedQuantityQNT":"3900000000","decimals":4,"name":"ATOMIC","asset":"11694807213441909013"},{"quantityQNT":"2900000000","unconfirmedQuantityQNT":"2900000000","decimals":8,"name":"NSC","asset":"6775372232354238105"},{"quantityQNT":"750000000","unconfirmedQuantityQNT":"750000000","decimals":4,"name":"omnigames","asset":"7441230892853180965"},{"quantityQNT":"607438148","unconfirmedQuantityQNT":"607438148","decimals":4,"name":"ARDR","asset":"12422608354438203866"},{"quantityQNT":"451991779","unconfirmedQuantityQNT":"451991779","decimals":4,"name":"SuperNET","asset":"12071612744977229797"},{"quantityQNT":"146960000","unconfirmedQuantityQNT":"146960000","decimals":4,"name":"Privatebet","asset":"17083334802666450484"},{"quantityQNT":"79500188","unconfirmedQuantityQNT":"79500188","decimals":3,"name":"crypto777","asset":"13476425053110940554"},{"quantityQNT":"1495473","unconfirmedQuantityQNT":"1495473","decimals":0,"name":"jl777hodl","asset":"6932037131189568014"},{"quantityQNT":"500000","unconfirmedQuantityQNT":"500000","decimals":0,"name":"Boost","asset":"9719950459730291994"},{"quantityQNT":"200000","unconfirmedQuantityQNT":"200000","decimals":0,"name":"NXTforex","asset":"15245281832566929110"},{"quantityQNT":"150000","unconfirmedQuantityQNT":"150000","decimals":0,"name":"NXTsharks","asset":"8049009002993773168"},{"quantityQNT":"100000","unconfirmedQuantityQNT":"100000","decimals":5,"name":"solarweb","asset":"13604572534081373849"},{"quantityQNT":"75000","unconfirmedQuantityQNT":"75000","decimals":0,"name":"SNN","asset":"15113552914305929842"},{"quantityQNT":"57299","unconfirmedQuantityQNT":"57299","decimals":2,"name":"SLEUTH","asset":"4174874835406708311"},{"quantityQNT":"18801","unconfirmedQuantityQNT":"18801","decimals":2,"name":"BTCDdev","asset":"15131486578879082754"},{"quantityQNT":"18767","unconfirmedQuantityQNT":"18767","decimals":2,"name":"longzai","asset":"10955830010602647139"},{"quantityQNT":"13000","unconfirmedQuantityQNT":"13000","decimals":0,"name":"NXTventure","asset":"16212446818542881180"},{"quantityQNT":"7250","unconfirmedQuantityQNT":"7250","decimals":0,"name":"InstantDEX","asset":"15344649963748848799"},{"quantityQNT":"2873","unconfirmedQuantityQNT":"2873","decimals":4,"name":"EDinar","asset":"17740527756732147253"},{"quantityQNT":"39","unconfirmedQuantityQNT":"39","decimals":0,"name":"JebBush","asset":"1929419574701797581"},{"quantityQNT":"30","unconfirmedQuantityQNT":"30","decimals":0,"name":"Hilary","asset":"11814755740231942504"}],"requestProcessingTime":1})
+    return(qty);
+}
+
+void *curl_post(void **cHandlep,char *url,char *userpass,char *postfields,char *hdr0,char *hdr1,char *hdr2,char *hdr3);
+
+void NXTventure_liquidation()
+{
+    /*{"quantityQNT":"607438148","unconfirmedQuantityQNT":"607438148","decimals":4,"name":"ARDR","asset":""},
+    {"quantityQNT":"451991779","unconfirmedQuantityQNT":"451991779","decimals":4,"name":"SuperNET","asset":"12071612744977229797"},
+    {"quantityQNT":"146960000","unconfirmedQuantityQNT":"146960000","decimals":4,"name":"Privatebet","asset":"17083334802666450484"},
+    {"quantityQNT":"79500188","unconfirmedQuantityQNT":"79500188","decimals":3,"name":"crypto777","asset":"13476425053110940554"},
+    {"quantityQNT":"1495473","unconfirmedQuantityQNT":"1495473","decimals":0,"name":"jl777hodl","asset":"6932037131189568014"},
+    {"quantityQNT":"7250","unconfirmedQuantityQNT":"7250","decimals":0,"name":"InstantDEX","asset":"15344649963748848799"},*/
+    char *assetids[][4] =
+    {
+        { "12422608354438203866", "607438148", "ARDR", "10000" },
+        { "12071612744977229797", "451991779", "SuperNET", "10000" },
+        { "17083334802666450484", "146960000", "Privatebet", "10000" },
+        { "13476425053110940554", "79500188", "crypto777", "1000" },
+        { "6932037131189568014", "1495473", "jl777hodl", "1" },
+        { "15344649963748848799", "7250", "InstantDEX", "1" },
+    };
+    void *cHandle=0; char *retstr,*retstr2,url[1024],*account; uint64_t txid,qty,qtyA,assetid,sum; double ratio; cJSON *array,*retjson2,*item,*retjson; int32_t i,j,decimals,numassetids=(int32_t)(sizeof(assetids)/sizeof(*assetids)),n=0;
+    char *passphrase = "";
+    sprintf(url,"http://127.0.0.1:7876/nxt?requestType=getAssetAccounts&asset=16212446818542881180");
+    if ( (retstr= issue_curlt(url,LP_HTTP_TIMEOUT)) != 0 )
+    {
+        if ( (retjson= cJSON_Parse(retstr)) != 0 )
+        {
+            if ( (array= jarray(&n,retjson,"accountAssets")) != 0 )
+            {
+                for (j=0; j<numassetids; j++)
+                {
+                    assetid = calc_nxt64bits(assetids[j][0]);
+                    qtyA = calc_nxt64bits(assetids[j][1]);
+                    decimals = (int32_t)calc_nxt64bits(assetids[j][3]);
+                    printf("distribute %llu QNT of %s assetid %llu %.8f\n",(long long)qtyA,assetids[j][2],(long long)assetid,(double)qtyA / decimals);
+                    sum = 0;
+                    for (i=0; i<n; i++)
+                    {
+                        item = jitem(array,i);
+                        qty = j64bits(item,"quantityQNT");
+                        ratio = (double)qty / (1000000. - 13000.);
+                        if ( (account= jstr(item,"accountRS")) != 0 && qtyA*ratio >= 1 )
+                        {
+                            if ( strcmp(account,"NXT-XRK4-5HYK-5965-9FH4Z") != 0 )
+                            {
+                                sum += (long long)(qtyA * ratio);
+                                sprintf(url,"requestType=transferAsset&secretPhrase=%s&recipient=%s&asset=%llu&quantityQNT=%llu&feeNQT=100000000&deadline=60",passphrase,account,(long long)assetid,(long long)(qtyA * ratio));
+                                if ( (retstr2= curl_post(&cHandle,"http://127.0.0.1:7876/nxt","",url,"","","","")) != 0 )
+                                {
+                                    if ( (retjson2= cJSON_Parse(retstr2)) != 0 )
+                                    {
+                                        txid = j64bits(retjson2,"transaction");
+                                        printf("%s %.6f %8llu QNT %s -> %llu %.8f txid %llu\n",account,ratio,(long long)qtyA,assetids[j][2],(long long)(qtyA * ratio),((double)(long long)(qtyA * ratio))/decimals,(long long)txid);
+                                        free_json(retjson2);
+                                    }
+                                    free(retstr2);
+                                }
+                                usleep(250000);
+                            }
+                        }
+                    }
+                    printf("%s distribution total %llu QNT %.8f\n",assetids[j][2],(long long)sum,(double)sum/decimals);
+                }
+            }
+            free_json(retjson);
+        }
+        printf("NXTventure assethodlers.%d\n",n);
+        free(retstr);
+    }
+}
+
 cJSON *LP_NXT_redeems()
 {
     char url[1024],*retstr,*recv,*method,*msgstr,assetname[128]; uint64_t totals[20],mult,txnum,assetid,qty; int32_t i,ind,numtx,past_marker=0; cJSON *item,*attach,*decjson,*array,*msgjson,*encjson,*retjson=0;
@@ -887,9 +974,9 @@ double _LP_getestimatedrate(struct iguana_info *coin)
                 rate = atof(retstr) / 1024.;
                 if ( rate < 0.00000020 )
                     rate = 0.00000020;
-                rate *= 1.1;
+                rate *= 1.5;
                 if ( coin->electrum != 0 )
-                    rate *= 1.667;
+                    rate *= 1.5;
                 if ( fabs(rate - coin->rate) > SMALLVAL )
                     printf("t%u estimated rate.(%s) (%s) -> %.8f %.8f\n",coin->ratetime,coin->symbol,retstr,rate,coin->rate);
                 coin->rate = rate;

iguana/exchanges/LP_socket.c

@@ -1016,6 +1016,19 @@ void LP_dedicatedloop(void *arg)
                         len += n;
                         if ( ep->buf[len - 1] == '\n' )
                             break;
+                        memset(&fds,0,sizeof(fds));
+                        fds.fd = ep->sock;
+                        fds.events = POLLIN;
+                        if ( poll(&fds,1,1000) <= 0 )
+                        {
+                            printf("no more electrum data after a second\n");
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        printf("no more electrum data when expected\n");
+                        break;
                     }
                 }
                 if ( len > 0 )

iguana/exchanges/LP_utxo.c

@@ -479,6 +479,8 @@ struct LP_address *LP_address_utxo_reset(struct iguana_info *coin)
                 if ( (txobj= LP_gettxout(coin->symbol,coin->smartaddr,txid,vout)) == 0 )
                     continue;
                 else free_json(txobj);
+                if ( LP_numconfirms(coin->symbol,coin->smartaddr,txid,vout,0) <= 0 )
+                    return(0);
                 LP_address_utxoadd(now,"withdraw",coin,coin->smartaddr,txid,vout,value,height,-1);
                 if ( (up= LP_address_utxofind(coin,coin->smartaddr,txid,vout)) == 0 )
                     printf("couldnt find just added %s/%d ht.%d %.8f\n",bits256_str(str,txid),vout,height,dstr(value));
@@ -976,38 +978,16 @@ int32_t LP_iseligible(uint64_t *valp,uint64_t *val2p,int32_t iambob,char *symbol
                     strcpy(destaddr,destaddr2);
                 if ( coin != 0 )
                 {
-                    /*if ( coin->electrum != 0 )
-                    {
-                        if ( (tx= LP_transactionfind(coin,txid)) != 0 && vout < tx->numvouts && tx->outpoints[vout].spendheight > 0 )
-                        {
-                            //printf("txid spent\n");
-                            return(0);
-                        }
-                        if ( (tx= LP_transactionfind(coin,txid2)) != 0 && vout2 < tx->numvouts && tx->outpoints[vout2].spendheight > 0 )
-                        {
-                            //printf("txid2 spent\n");
-                            return(0);
-                        }
-                        if ( (up= LP_address_utxofind(coin,destaddr,txid,vout)) != 0 && up->spendheight > 0 )
-                        {
-                            //printf("txid %s spentB\n",destaddr);
-                            return(0);
-                        }
-                        if ( (up= LP_address_utxofind(coin,destaddr,txid2,vout2)) != 0 && up->spendheight > 0 )
-                        {
-                            //printf("txid2 %s spentB\n",destaddr);
-                            return(0);
-                        }
-                    }
-                    else*/
-                    {
-                        if ( (txobj= LP_gettxout(coin->symbol,destaddr,txid,vout)) == 0 )
-                            return(0);
-                        else free_json(txobj);
-                        if ( (txobj= LP_gettxout(coin->symbol,destaddr,txid2,vout2)) == 0 )
-                            return(0);
-                        else free_json(txobj);
-                    }
+                    if ( (txobj= LP_gettxout(coin->symbol,destaddr,txid,vout)) == 0 )
+                        return(0);
+                    else free_json(txobj);
+                    if ( (txobj= LP_gettxout(coin->symbol,destaddr,txid2,vout2)) == 0 )
+                        return(0);
+                    else free_json(txobj);
+                    if ( LP_numconfirms(coin->symbol,destaddr,txid,vout,0) <= 0 )
+                        return(0);
+                    if ( LP_numconfirms(coin->symbol,destaddr,txid2,vout2,0) <= 0 )
+                        return(0);
                 }
                 return(1);
             }

iguana/exchanges/sell

@@ -1,3 +1,3 @@
 #!/bin/bash
 source userpass
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"sell\",\"base\":\"KMD\",\"rel\":\"BTC\",\"basevolume\":10.0\",\"price\":0.0005}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"sell\",\"base\":\"KMD\",\"rel\":\"BTC\",\"basevolume\":10.0,\"price\":0.0005}"