Merge branch 'dev' of https://github.com/jl777/SuperNET into etomic

# Conflicts:
#	.gitignore

.gitignore

@@ -271,3 +271,4 @@ etomic_build/client/unparsed.txt
 etomic_build/seed/DB
 etomic_build/seed/stats.log
 etomic_build/seed/unparsed.txt
+iguana/exchanges/manychains

basilisk/basilisk.c

@@ -947,17 +947,17 @@ void basilisks_loop(void *arg)
 //fprintf(stderr,"E ");
             if ( myinfo->numdpows == 1 )
             {
-                iguana_dPoWupdate(myinfo,&myinfo->DPOWS[0]);
+                iguana_dPoWupdate(myinfo,myinfo->DPOWS[0]);
                 endmilli = startmilli + 100;
             }
             else if ( myinfo->numdpows > 1 )
             {
-                dp = &myinfo->DPOWS[counter % myinfo->numdpows];
+                dp = myinfo->DPOWS[counter % myinfo->numdpows];
                 iguana_dPoWupdate(myinfo,dp);
                 //if ( (counter % myinfo->numdpows) != 0 )
                 {
                     //fprintf(stderr,"F ");
-                    iguana_dPoWupdate(myinfo,&myinfo->DPOWS[0]);
+                    iguana_dPoWupdate(myinfo,myinfo->DPOWS[0]);
                 }
                 endmilli = startmilli + 30;
             }

basilisk/basilisk_bitcoin.c

@@ -609,7 +609,7 @@ char *iguana_utxoduplicates(struct supernet_info *myinfo,struct iguana_info *coi
             {
                 if ( *completedp != 0 )
                 {
-                    printf("splitfunds signedtx.(%s)\n",signedtx);
+                    printf("splitfunds %s signedtx.(%s)\n",coin->symbol,signedtx);
                     if ( sendflag != 0 )
                         iguana_sendrawtransaction(myinfo,coin,signedtx);
                     free(rawtx);

iguana/SuperNET_keys.c

@@ -310,13 +310,70 @@ int32_t _SuperNET_encryptjson(struct supernet_info *myinfo,char *destfname,char
     return(0);
 }
 
+int32_t curve25519_donna(uint8_t *mypublic,const uint8_t *secret,const uint8_t *basepoint);
+
+static const char base58_chars[] = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
+
+int32_t iguana_wifstr_valid(char *wifstr)
+{
+    bits256 privkey,cmpkey; uint8_t wiftype; char cmpstr[128],cmpstr2[128]; int32_t i,len,n,a,A;
+    if ( (len= (int32_t)strlen(wifstr)) < 50 || len > 54 )
+    {
+        //printf("len.%d is wrong for wif %s\n",len,wifstr);
+        return(0);
+    }
+    memset(privkey.bytes,0,sizeof(privkey));
+    memset(cmpkey.bytes,0,sizeof(cmpkey));
+    for (i=n=a=A=0; wifstr[i]!=0; i++)
+    {
+        if ( strchr(base58_chars,wifstr[i]) == 0 )
+            return(0);
+        if ( wifstr[i] >= '1' && wifstr[i] <= '9' )
+            n++;
+        else if ( wifstr[i] >= 'A' && wifstr[i] <= 'Z' )
+            A++;
+        else if ( wifstr[i] >= 'a' && wifstr[i] <= 'z' )
+            a++;
+    }
+    if ( n == 0 || A == 0 || a == 0 )
+        return(0);
+    if ( A > 5*a || a > 5*A || a > n*20 || A > n*20 ) // unlikely it is a real wif
+    {
+        printf("reject wif %s due to n.%d a.%d A.%d (%d %d %d %d)\n",wifstr,n,a,A,A > 5*a,a < 5*A,a > n*20,A > n*20);
+        return(0);
+    }
+    bitcoin_wif2priv(&wiftype,&privkey,wifstr);
+    bitcoin_priv2wif(cmpstr,privkey,wiftype);
+    if ( strcmp(cmpstr,wifstr) == 0 )
+    {
+        //printf("%s is valid wif\n",wifstr);
+        return(1);
+    }
+    else if ( bits256_nonz(privkey) != 0 )
+    {
+        bitcoin_wif2priv(&wiftype,&cmpkey,cmpstr);
+        bitcoin_priv2wiflong(cmpstr2,privkey,wiftype);
+        if ( bits256_cmp(privkey,cmpkey) == 0 )
+            return(1);
+        char str[65],str2[65]; printf("mismatched wifstr %s -> %s -> %s %s %s\n",wifstr,bits256_str(str,privkey),cmpstr,bits256_str(str2,cmpkey),cmpstr2);
+    }
+    char str[65]; printf("%s is not a wif, privkey.%s\n",wifstr,bits256_str(str,privkey));
+    return(0);
+}
+
 void SuperNET_setkeys(struct supernet_info *myinfo,void *pass,int32_t passlen,int32_t dosha256)
 {
-    bits256 hash;
+    static uint8_t basepoint[32] = {9}; bits256 hash; uint8_t addrtype,usedwif = 0;
     if ( dosha256 != 0 )
     {
         memcpy(myinfo->secret,pass,passlen+1);
-        myinfo->myaddr.nxt64bits = conv_NXTpassword(myinfo->persistent_priv.bytes,myinfo->myaddr.persistent.bytes,pass,passlen);
+        if ( iguana_wifstr_valid((char *)pass) > 0 )
+        {
+            usedwif = 1;
+            bitcoin_wif2priv(&addrtype,&myinfo->persistent_priv,(char *)pass);
+            curve25519_donna(myinfo->myaddr.persistent.bytes,myinfo->persistent_priv.bytes,basepoint);
+        }
+        else myinfo->myaddr.nxt64bits = conv_NXTpassword(myinfo->persistent_priv.bytes,myinfo->myaddr.persistent.bytes,pass,passlen);
     }
     else
     {
@@ -329,6 +386,8 @@ void SuperNET_setkeys(struct supernet_info *myinfo,void *pass,int32_t passlen,in
     bitcoin_pubkey33(myinfo->ctx,myinfo->persistent_pubkey33,myinfo->persistent_priv);
     bitcoin_address(myinfo->myaddr.BTC,0,myinfo->persistent_pubkey33,33);
     bitcoin_address(myinfo->myaddr.BTCD,60,myinfo->persistent_pubkey33,33);
+    if ( (0) && usedwif != 0 )
+        printf("usedwif for %s %s\n",myinfo->myaddr.BTCD,myinfo->myaddr.BTC);
 }
 
 void SuperNET_parsemyinfo(struct supernet_info *myinfo,cJSON *msgjson)

iguana/coins/beer_7776

@@ -0,0 +1,2 @@
+#!/bin/bash
+curl --url "http://127.0.0.1:7776" --data "{\"conf\":\"BEER.conf\",\"path\":\"${HOME#"/"}/.komodo/BEER\",\"unitval\":\"20\",\"zcash\":1,\"RELAY\":-1,\"VALIDATE\":0,\"prefetchlag\":-1,\"poll\":100,\"active\":1,\"agent\":\"iguana\",\"method\":\"addcoin\",\"startpend\":4,\"endpend\":4,\"services\":129,\"maxpeers\":8,\"newcoin\":\"BEER\",\"name\":\"BEER\",\"hasheaders\":1,\"useaddmultisig\":0,\"netmagic\":\"9fecbb6e\",\"p2p\":8922,\"rpc\":8923,\"pubval\":60,\"p2shval\":85,\"wifval\":188,\"txfee_satoshis\":\"10000\",\"isPoS\":0,\"minoutput\":10000,\"minconfirms\":2,\"genesishash\":\"027e3758c3a65b12aa1046462b486d0a63bfa1beae327897f56c5cfb7daaae71\",\"protover\":170002,\"genesisblock\":\"0100000000000000000000000000000000000000000000000000000000000000000000003ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a000000000000000000000000000000000000000000000000000000000000000029ab5f490f0f0f200b00000000000000000000000000000000000000000000000000000000000000fd4005000d5ba7cda5d473947263bf194285317179d2b0d307119c2e7cc4bd8ac456f0774bd52b0cd9249be9d40718b6397a4c7bbd8f2b3272fed2823cd2af4bd1632200ba4bf796727d6347b225f670f292343274cc35099466f5fb5f0cd1c105121b28213d15db2ed7bdba490b4cedc69742a57b7c25af24485e523aadbb77a0144fc76f79ef73bd8530d42b9f3b9bed1c135ad1fe152923fafe98f95f76f1615e64c4abb1137f4c31b218ba2782bc15534788dda2cc08a0ee2987c8b27ff41bd4e31cd5fb5643dfe862c9a02ca9f90c8c51a6671d681d04ad47e4b53b1518d4befafefe8cadfb912f3d03051b1efbf1dfe37b56e93a741d8dfd80d576ca250bee55fab1311fc7b3255977558cdda6f7d6f875306e43a14413facdaed2f46093e0ef1e8f8a963e1632dcbeebd8e49fd16b57d49b08f9762de89157c65233f60c8e38a1f503a48c555f8ec45dedecd574a37601323c27be597b956343107f8bd80f3a925afaf30811df83c402116bb9c1e5231c70fff899a7c82f73c902ba54da53cc459b7bf1113db65cc8f6914d3618560ea69abd13658fa7b6af92d374d6eca9529f8bd565166e4fcbf2a8dfb3c9b69539d4d2ee2e9321b85b331925df195915f2757637c2805e1d4131e1ad9ef9bc1bb1c732d8dba4738716d351ab30c996c8657bab39567ee3b29c6d054b711495c0d52e1cd5d8e55b4f0f0325b97369280755b46a02afd54be4ddd9f77c22272b8bbb17ff5118fedbae2564524e797bd28b5f74f7079d532ccc059807989f94d267f47e724b3f1ecfe00ec9e6541c961080d8891251b84b4480bc292f6a180bea089fef5bbda56e1e41390d7c0e85ba0ef530f7177413481a226465a36ef6afe1e2bca69d2078712b3912bba1a99b1fbff0d355d6ffe726d2bb6fbc103c4ac5756e5bee6e47e17424ebcbf1b63d8cb90ce2e40198b4f4198689daea254307e52a25562f4c1455340f0ffeb10f9d8e914775e37d0edca019fb1b9c6ef81255ed86bc51c5391e0591480f66e2d88c5f4fd7277697968656a9b113ab97f874fdd5f2465e5559533e01ba13ef4a8f7a21d02c30c8ded68e8c54603ab9c8084ef6d9eb4e92c75b078539e2ae786ebab6dab73a09e0aa9ac575bcefb29e930ae656e58bcb513f7e3c17e079dce4f05b5dbc18c2a872b22509740ebe6a3903e00ad1abc55076441862643f93606e3dc35e8d9f2caef3ee6be14d513b2e062b21d0061de3bd56881713a1a5c17f5ace05e1ec09da53f99442df175a49bd154aa96e4949decd52fed79ccf7ccbce32941419c314e374e4a396ac553e17b5340336a1a25c22f9e42a243ba5404450b650acfc826a6e432971ace776e15719515e1634ceb9a4a35061b668c74998d3dfb5827f6238ec015377e6f9c94f38108768cf6e5c8b132e0303fb5a200368f845ad9d46343035a6ff94031df8d8309415bb3f6cd5ede9c135fdabcc030599858d803c0f85be7661c88984d88faa3d26fb0e9aac0056a53f1b5d0baed713c853c4a2726869a0a124a8a5bbc0fc0ef80c8ae4cb53636aa02503b86a1eb9836fcc259823e2692d921d88e1ffc1e6cb2bde43939ceb3f32a611686f539f8f7c9f0bf00381f743607d40960f06d347d1cd8ac8a51969c25e37150efdf7aa4c2037a2fd0516fb444525ab157a0ed0a7412b2fa69b217fe397263153782c0f64351fbdf2678fa0dc8569912dcd8e3ccad38f34f23bbbce14c6a26ac24911b308b82c7e43062d180baeac4ba7153858365c72c63dcf5f6a5b08070b730adb017aeae925b7d0439979e2679f45ed2f25a7edcfd2fb77a8794630285ccb0a071f5cce410b46dbf9750b0354aae8b65574501cc69efb5b6a43444074fee116641bb29da56c2b4a7f456991fc92b2\",\"debug\":0,\"seedipaddr\":\"78.47.196.146\"}"

iguana/coins/pizza_7776

@@ -0,0 +1,2 @@
+#!/bin/bash
+curl --url "http://127.0.0.1:7776" --data "{\"conf\":\"PIZZA.conf\",\"path\":\"${HOME#"/"}/.komodo/PIZZA\",\"unitval\":\"20\",\"zcash\":1,\"RELAY\":-1,\"VALIDATE\":0,\"prefetchlag\":-1,\"poll\":100,\"active\":1,\"agent\":\"iguana\",\"method\":\"addcoin\",\"startpend\":4,\"endpend\":4,\"services\":129,\"maxpeers\":8,\"newcoin\":\"PIZZA\",\"name\":\"PIZZA\",\"hasheaders\":1,\"useaddmultisig\":0,\"netmagic\":\"adbe523c\",\"p2p\":11607,\"rpc\":11608,\"pubval\":60,\"p2shval\":85,\"wifval\":188,\"txfee_satoshis\":\"10000\",\"isPoS\":0,\"minoutput\":10000,\"minconfirms\":2,\"genesishash\":\"027e3758c3a65b12aa1046462b486d0a63bfa1beae327897f56c5cfb7daaae71\",\"protover\":170002,\"genesisblock\":\"0100000000000000000000000000000000000000000000000000000000000000000000003ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a000000000000000000000000000000000000000000000000000000000000000029ab5f490f0f0f200b00000000000000000000000000000000000000000000000000000000000000fd4005000d5ba7cda5d473947263bf194285317179d2b0d307119c2e7cc4bd8ac456f0774bd52b0cd9249be9d40718b6397a4c7bbd8f2b3272fed2823cd2af4bd1632200ba4bf796727d6347b225f670f292343274cc35099466f5fb5f0cd1c105121b28213d15db2ed7bdba490b4cedc69742a57b7c25af24485e523aadbb77a0144fc76f79ef73bd8530d42b9f3b9bed1c135ad1fe152923fafe98f95f76f1615e64c4abb1137f4c31b218ba2782bc15534788dda2cc08a0ee2987c8b27ff41bd4e31cd5fb5643dfe862c9a02ca9f90c8c51a6671d681d04ad47e4b53b1518d4befafefe8cadfb912f3d03051b1efbf1dfe37b56e93a741d8dfd80d576ca250bee55fab1311fc7b3255977558cdda6f7d6f875306e43a14413facdaed2f46093e0ef1e8f8a963e1632dcbeebd8e49fd16b57d49b08f9762de89157c65233f60c8e38a1f503a48c555f8ec45dedecd574a37601323c27be597b956343107f8bd80f3a925afaf30811df83c402116bb9c1e5231c70fff899a7c82f73c902ba54da53cc459b7bf1113db65cc8f6914d3618560ea69abd13658fa7b6af92d374d6eca9529f8bd565166e4fcbf2a8dfb3c9b69539d4d2ee2e9321b85b331925df195915f2757637c2805e1d4131e1ad9ef9bc1bb1c732d8dba4738716d351ab30c996c8657bab39567ee3b29c6d054b711495c0d52e1cd5d8e55b4f0f0325b97369280755b46a02afd54be4ddd9f77c22272b8bbb17ff5118fedbae2564524e797bd28b5f74f7079d532ccc059807989f94d267f47e724b3f1ecfe00ec9e6541c961080d8891251b84b4480bc292f6a180bea089fef5bbda56e1e41390d7c0e85ba0ef530f7177413481a226465a36ef6afe1e2bca69d2078712b3912bba1a99b1fbff0d355d6ffe726d2bb6fbc103c4ac5756e5bee6e47e17424ebcbf1b63d8cb90ce2e40198b4f4198689daea254307e52a25562f4c1455340f0ffeb10f9d8e914775e37d0edca019fb1b9c6ef81255ed86bc51c5391e0591480f66e2d88c5f4fd7277697968656a9b113ab97f874fdd5f2465e5559533e01ba13ef4a8f7a21d02c30c8ded68e8c54603ab9c8084ef6d9eb4e92c75b078539e2ae786ebab6dab73a09e0aa9ac575bcefb29e930ae656e58bcb513f7e3c17e079dce4f05b5dbc18c2a872b22509740ebe6a3903e00ad1abc55076441862643f93606e3dc35e8d9f2caef3ee6be14d513b2e062b21d0061de3bd56881713a1a5c17f5ace05e1ec09da53f99442df175a49bd154aa96e4949decd52fed79ccf7ccbce32941419c314e374e4a396ac553e17b5340336a1a25c22f9e42a243ba5404450b650acfc826a6e432971ace776e15719515e1634ceb9a4a35061b668c74998d3dfb5827f6238ec015377e6f9c94f38108768cf6e5c8b132e0303fb5a200368f845ad9d46343035a6ff94031df8d8309415bb3f6cd5ede9c135fdabcc030599858d803c0f85be7661c88984d88faa3d26fb0e9aac0056a53f1b5d0baed713c853c4a2726869a0a124a8a5bbc0fc0ef80c8ae4cb53636aa02503b86a1eb9836fcc259823e2692d921d88e1ffc1e6cb2bde43939ceb3f32a611686f539f8f7c9f0bf00381f743607d40960f06d347d1cd8ac8a51969c25e37150efdf7aa4c2037a2fd0516fb444525ab157a0ed0a7412b2fa69b217fe397263153782c0f64351fbdf2678fa0dc8569912dcd8e3ccad38f34f23bbbce14c6a26ac24911b308b82c7e43062d180baeac4ba7153858365c72c63dcf5f6a5b08070b730adb017aeae925b7d0439979e2679f45ed2f25a7edcfd2fb77a8794630285ccb0a071f5cce410b46dbf9750b0354aae8b65574501cc69efb5b6a43444074fee116641bb29da56c2b4a7f456991fc92b2\",\"debug\":0,\"seedipaddr\":\"78.47.196.146\"}"

iguana/dPoW.h

@@ -16,10 +16,11 @@
 #ifndef INCLUDE_DPOW_H
 #define INCLUDE_DPOW_H
 
-#define DPOW_MAXMOMDEPTH (1440 * 7)
+//#define DPOW_MAXMOMDEPTH (1440 * 7)
 
 #define DPOW_FIRSTRATIFY 1000
 
+#define DPOW_MAXFREQ 100
 #define DPOW_CHECKPOINTFREQ 10
 #define DPOW_MINSIGS 13
 #define DPOW_MIN_ASSETCHAIN_SIGS 11
@@ -137,7 +138,7 @@ struct dpow_info
     struct dpow_hashheight approved[DPOW_FIFOSIZE],notarized[DPOW_FIFOSIZE];
     bits256 activehash,lastnotarized,srctx[DPOW_MAXTX],desttx[DPOW_MAXTX];
     uint32_t SRCREALTIME,lastsrcupdate,destupdated,srcconfirms,numdesttx,numsrctx,lastsplit,cancelratify;
-    int32_t lastheight,maxblocks,SRCHEIGHT,SHORTFLAG,ratifying;
+    int32_t lastheight,maxblocks,SRCHEIGHT,SHORTFLAG,ratifying,minsigs,freq;
     struct pax_transaction *PAX;
     portable_mutex_t paxmutex,dexmutex;
     uint32_t ipbits[128],numipbits;

iguana/dpow/dpow_fsm.c

@@ -230,185 +230,31 @@ int32_t dpow_opreturn_parsesrc(bits256 *blockhashp,int32_t *heightp,bits256 *txi
     return(-1);
 }
 
-int32_t dpow_txhasnotarization(uint64_t *signedmaskp,int32_t *nothtp,struct supernet_info *myinfo,struct iguana_info *coin,bits256 txid,int32_t height,struct komodo_ccdataMoMoM *mdata)
-{
-    cJSON *txobj,*vins,*vin,*vouts,*vout,*spentobj,*sobj; char *hexstr; uint8_t script[256]; bits256 spenttxid; uint64_t notarymask=0; int32_t i,j,numnotaries,len,spentvout,numvins,numvouts,hasnotarization = 0;
-    if ( (txobj= dpow_gettransaction(myinfo,coin,txid)) != 0 )
-    {
-        if ( (vins= jarray(&numvins,txobj,"vin")) != 0 )
-        {
-            if ( numvins >= DPOW_MIN_ASSETCHAIN_SIGS )
-            {
-                notarymask = numnotaries = 0;
-                for (i=0; i<numvins; i++)
-                {
-                    vin = jitem(vins,i);
-                    spenttxid = jbits256(vin,"txid");
-                    spentvout = jint(vin,"vout");
-                    if ( (spentobj= dpow_gettransaction(myinfo,coin,spenttxid)) != 0 )
-                    {
-                        if ( (vouts= jarray(&numvouts,spentobj,"vout")) != 0 )
-                        {
-                            if ( spentvout < numvouts )
-                            {
-                                vout = jitem(vouts,spentvout);
-                                if ( (sobj= jobj(vout,"scriptPubKey")) != 0 && (hexstr= jstr(sobj,"hex")) != 0 && (len= is_hexstr(hexstr,0)) == 35*2 )
-                                {
-                                    len >>= 1;
-                                    decode_hex(script,len,hexstr);
-                                    if ( script[0] == 33 && script[34] == 0xac )
-                                    {
-                                        for (j=0; j<Notaries_num; j++)
-                                        {
-                                            if ( strncmp(Notaries_elected[j][1],hexstr+2,66) == 0 )
-                                            {
-                                                if ( ((1LL << j) & notarymask) == 0 )
-                                                {
-                                                    //printf("n%d ",j);
-                                                    numnotaries++;
-                                                    notarymask |= (1LL << j);
-                                                    break;
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        free_json(spentobj);
-                    }
-                }
-                if ( numnotaries > 0 )
-                {
-                    if ( numnotaries >= DPOW_MIN_ASSETCHAIN_SIGS )
-                    {
-                        hasnotarization = 1;
-                        *nothtp = 0;
-                        if ( (vouts= jarray(&numvouts,txobj,"vout")) != 0 )
-                        {
-                            bits256 blockhash,txid,MoM; uint32_t MoMdepth; char symbol[65];//,str[65],str2[65],str3[65];
-                            vout = jitem(vouts,numvouts-1);
-                            if ( (sobj= jobj(vout,"scriptPubKey")) != 0 && (hexstr= jstr(sobj,"hex")) != 0 && (len= is_hexstr(hexstr,0)) > 36*2 && len < sizeof(script)*2 )
-                            {
-                                len >>= 1;
-                                decode_hex(script,len,hexstr);
-                                if ( dpow_opreturn_parsesrc(&blockhash,nothtp,&txid,symbol,&MoM,&MoMdepth,script,len,mdata) > 0 && strcmp(symbol,coin->symbol) == 0 )
-                                {
-                                    // if ( Notaries_port != DPOW_SOCKPORT ) // keep going till valid MoM found, useful for new chains without any MoM
-                                    {
-                                        if ( bits256_nonz(MoM) == 0 || MoMdepth == 0 || *nothtp >= height || *nothtp < 0 )
-                                        {
-                                            *nothtp = 0;
-                                        }
-                                    }
-                                    if ( mdata->pairs != 0 && mdata->numpairs > 0 )
-                                    {
-                                        for (j=0; j<mdata->numpairs; j++)
-                                        {
-                                            if ( mdata->pairs[j].notarization_height > coin->MoMoMheight )
-                                            {
-                                                coin->MoMoMheight = mdata->pairs[j].notarization_height;
-                                                printf("set %s MoMoMheight <- %d\n",coin->symbol,coin->MoMoMheight);
-                                            }
-                                        }
-                                    }
-                                    //printf("%s.%d notarizationht.%d %s -> %s MoM.%s [%d]\n",symbol,height,*nothtp,bits256_str(str,blockhash),bits256_str(str2,txid),bits256_str(str3,MoM),MoMdepth);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        free_json(txobj);
-    }
-    if ( hasnotarization != 0 )
-        (*signedmaskp) = notarymask;
-    return(hasnotarization);
-}
-
-int32_t dpow_hasnotarization(uint64_t *signedmaskp,int32_t *nothtp,struct supernet_info *myinfo,struct iguana_info *coin,cJSON *blockjson,int32_t ht,struct komodo_ccdataMoMoM *mdata)
-{
-    int32_t i,n,hasnotarization = 0; bits256 txid; cJSON *txarray;
-    *nothtp = 0;
-    *signedmaskp = 0;
-    memset(mdata,0,sizeof(*mdata));
-    if ( (txarray= jarray(&n,blockjson,"tx")) != 0 )
-    {
-        for (i=0; i<n; i++)
-        {
-            txid = jbits256i(txarray,i);
-            hasnotarization += dpow_txhasnotarization(signedmaskp,nothtp,myinfo,coin,txid,ht,mdata);
-        }
-    }
-    return(hasnotarization);
-}
-
 bits256 dpow_calcMoM(uint32_t *MoMdepthp,struct supernet_info *myinfo,struct iguana_info *coin,int32_t height)
 {
-    struct komodo_ccdataMoMoM mdata; bits256 MoM,blockhash,merkle,*merkles; cJSON *blockjson; uint64_t signedmask; int32_t breakht=0,notht=0,ht,maxdepth = DPOW_MAXMOMDEPTH,MoMdepth = 0;
+    bits256 MoM; cJSON *MoMjson,*infojson; int32_t prevMoMheight;
+    *MoMdepthp = 0;
     memset(MoM.bytes,0,sizeof(MoM));
-    blockhash = dpow_getblockhash(myinfo,coin,height);
-    //printf("start MoM calc %s height.%d\n",coin->symbol,height);
-    if ( (blockjson= dpow_getblock(myinfo,coin,blockhash)) != 0 )
+    if ( (infojson= dpow_getinfo(myinfo,coin)) != 0 )
     {
-        merkle = jbits256(blockjson,"merkleroot");
-        free_json(blockjson);
-        if ( bits256_nonz(merkle) != 0 )
+        if ( (prevMoMheight= jint(infojson,"prevMoMheight")) >= 0 )
         {
-            merkles = calloc(4*maxdepth+1,sizeof(*merkles));
-            merkles[MoMdepth++] = merkle;
-            ht = height - MoMdepth;
-            while ( MoMdepth < maxdepth && ht > breakht && ht > 0 )
+            if ( prevMoMheight == 0 )
+                prevMoMheight = 1;
+            *MoMdepthp = (height - prevMoMheight);
+            //printf("%s ht.%d prevMoM.%d -> depth %d\n",coin->symbol,height,prevMoMheight,*MoMdepthp);
+            if ( *MoMdepthp > 1440*30 )
+                *MoMdepthp = 1440*30;
+            if ( *MoMdepthp > 0 && (MoMjson= issue_calcMoM(coin,height,*MoMdepthp)) != 0 )
             {
-                //fprintf(stderr,"%s.%d ",coin->symbol,ht);
-                blockhash = dpow_getblockhash(myinfo,coin,ht);
-                if ( (blockjson= dpow_getblock(myinfo,coin,blockhash)) != 0 )
-                {
-                    if ( breakht == 0 && dpow_hasnotarization(&signedmask,&notht,myinfo,coin,blockjson,ht,&mdata) > 0 )
-                    {
-                        breakht = notht;
-                        printf("%s has notarization at %d for breakht.%d\n",coin->symbol,ht,notht);
-                    }
-                    merkle = jbits256(blockjson,"merkleroot");
-                    free_json(blockjson);
-                    if ( bits256_nonz(merkle) != 0 )
-                        merkles[MoMdepth++] = merkle;
-                    else
-                    {
-                        printf("%s MoMdepth.%d ht.%d from height.%d, null merkleroot\n",coin->symbol,MoMdepth,ht,height);
-                        MoMdepth = 0;
-                        if ( mdata.pairs != 0 )
-                            free(mdata.pairs);
-                        break;
-                    }
-                }
-                else
-                {
-                    printf("%s MoMdepth.%d ht.%d from height.%d, no blockhash\n",coin->symbol,MoMdepth,ht,height);
-                    MoMdepth = 0;
-                    if ( mdata.pairs != 0 )
-                        free(mdata.pairs);
-                    break;
-                }
-                ht = height - MoMdepth;
-                usleep(10000);
-            }
-            if ( MoMdepth > 0 )
-            {
-                MoM = iguana_merkle(coin->symbol,merkles,MoMdepth);
-                char str[65]; printf("%s from height.%d ht.%d MoMdepth.%d -> MoM %s\n",coin->symbol,height,ht,MoMdepth,bits256_str(str,MoM));
+                MoM = jbits256(MoMjson,"MoM");
+                free_json(MoMjson);
             }
-            else
-            {
-                printf("unexpected %s from height.%d MoMdepth.%d vs max.%d\n",coin->symbol,height,MoMdepth,maxdepth);
-                MoMdepth = 0;
-            }
-            free(merkles);
-        } else printf("%s.ht%d null merkles\n",coin->symbol,height);
-    } else printf("%s.ht%d null block\n",coin->symbol,height);
-    *MoMdepthp = MoMdepth;
-    //printf("done MoM calc %s height.%d MoMdepth.%d\n",coin->symbol,height,MoMdepth);
+        }
+        free_json(infojson);
+    }
+    if ( bits256_nonz(MoM) == 0 )
+        *MoMdepthp = 0;
     return(MoM);
 }
 
@@ -439,13 +285,14 @@ void dpow_statemachinestart(void *ptr)
         return;
     }
     MoMdepth = 0;
-    portable_mutex_lock(&src->MoM_mutex);
-    MoM = dpow_calcMoM(&MoMdepth,myinfo,src,checkpoint.blockhash.height);
-    portable_mutex_unlock(&src->MoM_mutex);
+    memset(&MoM,0,sizeof(MoM));
     if ( strcmp(src->symbol,"KMD") == 0 )
         kmdheight = checkpoint.blockhash.height;
     else if ( strcmp(dest->symbol,"KMD") == 0 )
+    {
+        MoM = dpow_calcMoM(&MoMdepth,myinfo,src,checkpoint.blockhash.height);
         kmdheight = dest->longestchain;
+    }
     if ( (bp= dp->blocks[checkpoint.blockhash.height]) == 0 )
     {
         bp = calloc(1,sizeof(*bp));
@@ -573,6 +420,7 @@ void dpow_statemachinestart(void *ptr)
             printf(" statemachinestart this node %s %s is not official notary numnotaries.%d kmdht.%d bpht.%d\n",srcaddr,destaddr,bp->numnotaries,kmdheight,bp->height);
             free(ptr);
             dp->ratifying -= bp->isratify;
+            exit(-1);
             return;
         }
         printf("myind.%d\n",myind);
@@ -585,7 +433,7 @@ void dpow_statemachinestart(void *ptr)
         return;
     }
     bp->myind = myind;
-    printf("[%d] notarize %s->%s %s ht.%d minsigs.%d duration.%d start.%u\n",bp->myind,dp->symbol,dp->dest,bits256_str(str,checkpoint.blockhash.hash),checkpoint.blockhash.height,minsigs,duration,checkpoint.timestamp);
+    printf("[%d] notarize %s->%s %s ht.%d minsigs.%d duration.%d start.%u MoM[%d] %s\n",bp->myind,dp->symbol,dp->dest,bits256_str(str,checkpoint.blockhash.hash),checkpoint.blockhash.height,minsigs,duration,checkpoint.timestamp,bp->MoMdepth,bits256_str(str2,bp->MoM));
     if ( bp->isratify != 0 && memcmp(bp->notaries[0].pubkey,bp->ratified_pubkeys[0],33) != 0 )
     {
         for (i=0; i<33; i++)
@@ -663,7 +511,7 @@ void dpow_statemachinestart(void *ptr)
         extralen = dpow_paxpending(extras,sizeof(extras),&bp->paxwdcrc,bp->MoM,bp->MoMdepth,src_or_dest,bp);
         bp->notaries[bp->myind].paxwdcrc = bp->paxwdcrc;
     }
-    printf("PAXWDCRC.%x myind.%d isratify.%d DPOW.%s statemachine checkpoint.%d %s start.%u+dur.%d vs %ld\n",bp->paxwdcrc,bp->myind,bp->isratify,src->symbol,checkpoint.blockhash.height,bits256_str(str,checkpoint.blockhash.hash),starttime,bp->duration,time(NULL));
+    printf("PAXWDCRC.%x myind.%d isratify.%d DPOW.%s statemachine checkpoint.%d %s start.%u+dur.%d vs %ld MoM[%d] %s\n",bp->paxwdcrc,bp->myind,bp->isratify,src->symbol,checkpoint.blockhash.height,bits256_str(str,checkpoint.blockhash.hash),starttime,bp->duration,time(NULL),bp->MoMdepth,bits256_str(str2,bp->MoM));
     for (i=0; i<sizeof(srchash); i++)
         srchash.bytes[i] = dp->minerkey33[i+1];
     //printf("start utxosync start.%u %u\n",starttime,(uint32_t)time(NULL));
@@ -673,7 +521,7 @@ void dpow_statemachinestart(void *ptr)
     {
         if ( bp->isratify == 0 )
         {
-            if ( myinfo->DPOWS[0].ratifying != 0 )
+            if ( myinfo->DPOWS[0]->ratifying != 0 )
             {
                 printf("break due to already ratifying\n");
                 break;

iguana/dpow/dpow_network.c

@@ -1901,7 +1901,7 @@ void dpow_notarize_update(struct supernet_info *myinfo,struct dpow_info *dp,stru
                 printf("mypaxcrc.%x\n",bp->paxwdcrc);
         }
         char str[65];
-        if ( (rand() % 130) == 0 || strcmp(dp->symbol,"CHIPS") == 0 )
+        if ( (rand() % 130) == 0 )//|| strcmp(dp->symbol,"KMD") == 0 )
             printf("%p ht.%d [%d] ips.%d %s NOTARIZE.%d matches.%d paxmatches.%d bestmatches.%d bestk.%d %llx recv.%llx sigmasks.(%llx %llx) senderind.%d state.%x (%x %x %x) MoM.%s [%d]\n",bp,bp->height,bp->myind,dp->numipbits,dp->symbol,bp->minsigs,matches,paxmatches,bestmatches,bp->bestk,(long long)bp->bestmask,(long long)bp->recvmask,(long long)(bp->bestk>=0?bp->destsigsmasks[bp->bestk]:0),(long long)(bp->bestk>=0?bp->srcsigsmasks[bp->bestk]:0),senderind,bp->state,bp->hashmsg.uints[0],bp->desttxid.uints[0],bp->srctxid.uints[0],bits256_str(str,bp->MoM),bp->MoMdepth);
     }
 }
@@ -2066,9 +2066,9 @@ int32_t dpow_nanomsg_update(struct supernet_info *myinfo)
                         dp = 0;
                         for (i=0; i<myinfo->numdpows; i++)
                         {
-                            if ( strcmp(np->symbol,myinfo->DPOWS[i].symbol) == 0 )
+                            if ( strcmp(np->symbol,myinfo->DPOWS[i]->symbol) == 0 )
                             {
-                                dp = &myinfo->DPOWS[i];
+                                dp = myinfo->DPOWS[i];
                                 break;
                             }
                         }

iguana/dpow/dpow_rpc.c

@@ -72,16 +72,18 @@ cJSON *dpow_getinfo(struct supernet_info *myinfo,struct iguana_info *coin)
 }
 
 char *Notaries_elected[65][2];
-char *seeds[] = { "78.47.196.146", "5.9.102.210", "149.56.29.163", "191.235.80.138", "88.198.65.74", "94.102.63.226", "129.232.225.202", "104.255.64.3", "52.72.135.200", "149.56.28.84", "103.18.58.150", "221.121.144.140", "123.249.79.12", "103.18.58.146", "27.50.93.252", "176.9.0.233", "94.102.63.227", "167.114.227.223", "27.50.68.219", "192.99.233.217", "94.102.63.217", "45.64.168.216" };
-int32_t Notaries_numseeds = (int32_t)(sizeof(seeds)/sizeof(*seeds)),Notaries_num,Notaries_BTCminsigs = DPOW_MINSIGS,Notaries_minsigs = DPOW_MIN_ASSETCHAIN_SIGS;
+//char *seeds[] = { "78.47.196.146", "5.9.102.210", "149.56.29.163", "191.235.80.138", "88.198.65.74", "94.102.63.226", "129.232.225.202", "104.255.64.3", "52.72.135.200", "149.56.28.84", "103.18.58.150", "221.121.144.140", "123.249.79.12", "103.18.58.146", "27.50.93.252", "176.9.0.233", "94.102.63.227", "167.114.227.223", "27.50.68.219", "192.99.233.217", "94.102.63.217", "45.64.168.216" };
+int32_t Notaries_numseeds;// = (int32_t)(sizeof(seeds)/sizeof(*seeds))
+int32_t Notaries_num,Notaries_BTCminsigs = DPOW_MINSIGS;
+int32_t Notaries_minsigs = DPOW_MIN_ASSETCHAIN_SIGS;
 uint16_t Notaries_port = DPOW_SOCKPORT;
 char *Notaries_seeds[65];
 
 int32_t komodo_initjson(char *fname)
 {
     char *fstr,*field,*hexstr; cJSON *argjson,*array,*item; long fsize; uint16_t port; int32_t i,n,num,retval = -1;
-    for (i=0; i<Notaries_numseeds; i++)
-        Notaries_seeds[i] = seeds[i];
+    //for (i=0; i<Notaries_numseeds; i++)
+    //    Notaries_seeds[i] = seeds[i];
     if ( (fstr= OS_filestr(&fsize,fname)) != 0 )
     {
         if ( (argjson= cJSON_Parse(fstr)) != 0 )
@@ -99,6 +101,7 @@ int32_t komodo_initjson(char *fname)
                     Notaries_seeds[i] = clonestr(jstri(array,i));
                     printf("%s ",Notaries_seeds[i]);
                 }
+                Notaries_numseeds = i;
                 printf("Notaries_numseeds.%d\n",Notaries_numseeds);
             }
             if ( (array= jarray(&n,argjson,"notaries")) != 0 && n <= 64 )
@@ -226,6 +229,21 @@ bits256 dpow_getbestblockhash(struct supernet_info *myinfo,struct iguana_info *c
     return(blockhash);
 }
 
+cJSON *issue_calcMoM(struct iguana_info *coin,int32_t height,int32_t MoMdepth)
+{
+    char buf[128],*retstr=0; cJSON *retjson = 0;
+    if ( coin->FULLNODE < 0 )
+    {
+        sprintf(buf,"[\"%d\", \"%d\"]",height,MoMdepth);
+        if ( (retstr= bitcoind_passthru(coin->symbol,coin->chain->serverport,coin->chain->userpass,"calc_MoM",buf)) != 0 )
+        {
+            retjson = cJSON_Parse(retstr);
+            //printf("MoM.%s -> %s\n",buf,retstr);
+            free(retstr);
+        }
+    }
+    return(retjson);
+}
 
 cJSON *dpow_MoMoMdata(struct iguana_info *coin,char *symbol,int32_t kmdheight)
 {
@@ -1149,7 +1167,7 @@ void dpow_issuer_voutupdate(struct dpow_info *dp,char *symbol,int32_t isspecial,
         if ( script[offset] == 'W' && strcmp(dp->symbol,"KMD") != 0 )
         {
             // if valid add to pricefeed for issue
-            printf("WITHDRAW ht.%d txi.%d vout.%d %.8f opretlen.%d\n",height,txi,vout,dstr(fiatoshis),opretlen);
+            printf("notary vout.%s ht.%d txi.%d vout.%d %.8f opretlen.%d\n",symbol,height,txi,vout,dstr(fiatoshis),opretlen);
             if ( opretlen == 38 ) // any KMD tx
             {
                 offset++;

iguana/dpow/dpow_tx.c

@@ -226,7 +226,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 ( bp->MoMdepth > 0 && (strcmp(bp->destcoin->symbol,"KMD") == 0 || strcmp(bp->srccoin->symbol,"KMD") == 0) )
+    if ( bp->MoMdepth > 0 && strcmp(bp->destcoin->symbol,"KMD") == 0 ) // || strcmp(bp->srccoin->symbol,"KMD") == 0) )
     {
         n = dpow_paxpending(extras,sizeof(extras),&paxwdcrc,bp->MoM,bp->MoMdepth,src_or_dest,bp);
     }

iguana/elected.new

@@ -0,0 +1,84 @@
+{
+"port": 7775,
+"BTCminsigs": 14,
+"minsigs": 13,
+"seeds": [
+   "95.213.205.222",
+   "167.114.208.203",
+   "139.99.122.140",
+   "104.255.168.213",
+   "78.47.196.146",
+   "138.121.203.226",
+   "167.99.69.47",
+   "139.99.144.122",
+   "77.95.229.63",
+   "37.9.62.186",
+   "145.239.204.33",
+   "74.208.210.191"
+],
+"notaries": [
+   {"dev1_jl777": "03b7621b44118017a16043f19b30cc8a4cfe068ac4e42417bae16ba460c80f3828" },
+   {"dev2_kolo": "030f34af4b908fb8eb2099accb56b8d157d49f6cfb691baa80fdd34f385efed961" },
+   {"dev3_kolo": "025af9d2b2a05338478159e9ac84543968fd18c45fd9307866b56f33898653b014" },
+   {"dev4_decker": "028eea44a09674dda00d88ffd199a09c9b75ba9782382cc8f1e97c0fd565fe5707" },
+   {"a-team_SH": "03b59ad322b17cb94080dc8e6dc10a0a865de6d47c16fb5b1a0b5f77f9507f3cce" },
+   {"artik_AR": "029acf1dcd9f5ff9c455f8bb717d4ae0c703e089d16cf8424619c491dff5994c90" },
+   {"artik_EU": "03f54b2c24f82632e3cdebe4568ba0acf487a80f8a89779173cdb78f74514847ce" },
+   {"artik_NA": "0224e31f93eff0cc30eaf0b2389fbc591085c0e122c4d11862c1729d090106c842" },
+   {"artik_SH": "02bdd8840a34486f38305f311c0e2ae73e84046f6e9c3dd3571e32e58339d20937" },
+   {"badass_EU": "0209d48554768dd8dada988b98aca23405057ac4b5b46838a9378b95c3e79b9b9e" },
+   {"badass_NA": "02afa1a9f948e1634a29dc718d218e9d150c531cfa852843a1643a02184a63c1a7" },
+   {"batman_AR": "033ecb640ec5852f42be24c3bf33ca123fb32ced134bed6aa2ba249cf31b0f2563" },
+   {"batman_SH": "02ca5898931181d0b8aafc75ef56fce9c43656c0b6c9f64306e7c8542f6207018c" },
+   {"ca333_EU": "03fc87b8c804f12a6bd18efd43b0ba2828e4e38834f6b44c0bfee19f966a12ba99" },
+   {"chainmakers_EU": "02f3b08938a7f8d2609d567aebc4989eeded6e2e880c058fdf092c5da82c3bc5ee" },
+   {"chainmakers_NA": "0276c6d1c65abc64c8559710b8aff4b9e33787072d3dda4ec9a47b30da0725f57a" },
+   {"chainstrike_SH": "0370bcf10575d8fb0291afad7bf3a76929734f888228bc49e35c5c49b336002153" },
+   {"cipi_AR": "02c4f89a5b382750836cb787880d30e23502265054e1c327a5bfce67116d757ce8" },
+   {"cipi_NA": "02858904a2a1a0b44df4c937b65ee1f5b66186ab87a751858cf270dee1d5031f18" },
+   {"crackers_EU": "03bc819982d3c6feb801ec3b720425b017d9b6ee9a40746b84422cbbf929dc73c3" },
+   {"crackers_NA": "03205049103113d48c7c7af811b4c8f194dafc43a50d5313e61a22900fc1805b45" },
+   {"dwy_EU": "0259c646288580221fdf0e92dbeecaee214504fdc8bbdf4a3019d6ec18b7540424" },
+   {"emmanux_SH": "033f316114d950497fc1d9348f03770cd420f14f662ab2db6172df44c389a2667a" },
+   {"etszombi_EU": "0281b1ad28d238a2b217e0af123ce020b79e91b9b10ad65a7917216eda6fe64bf7" },
+   {"fullmoon_AR": "03380314c4f42fa854df8c471618751879f9e8f0ff5dbabda2bd77d0f96cb35676" },
+   {"fullmoon_NA": "030216211d8e2a48bae9e5d7eb3a42ca2b7aae8770979a791f883869aea2fa6eef" },
+   {"fullmoon_SH": "03f34282fa57ecc7aba8afaf66c30099b5601e98dcbfd0d8a58c86c20d8b692c64" },
+   {"goldenman_EU": "02d6f13a8f745921cdb811e32237bb98950af1a5952be7b3d429abd9152f8e388d" },
+   {"indenodes_AR": "02ec0fa5a40f47fd4a38ea5c89e375ad0b6ddf4807c99733c9c3dc15fb978ee147" },
+   {"indenodes_EU": "0221387ff95c44cb52b86552e3ec118a3c311ca65b75bf807c6c07eaeb1be8303c" },
+   {"indenodes_NA": "02698c6f1c9e43b66e82dbb163e8df0e5a2f62f3a7a882ca387d82f86e0b3fa988" },
+   {"indenodes_SH": "0334e6e1ec8285c4b85bd6dae67e17d67d1f20e7328efad17ce6fd24ae97cdd65e" },
+   {"jackson_AR": "038ff7cfe34cb13b524e0941d5cf710beca2ffb7e05ddf15ced7d4f14fbb0a6f69" },
+   {"jeezy_EU": "023cb3e593fb85c5659688528e9a4f1c4c7f19206edc7e517d20f794ba686fd6d6" },
+   {"karasugoi_NA": "02a348b03b9c1a8eac1b56f85c402b041c9bce918833f2ea16d13452309052a982" },
+   {"komodoninja_EU": "038e567b99806b200b267b27bbca2abf6a3e8576406df5f872e3b38d30843cd5ba" },
+   {"komodoninja_SH": "033178586896915e8456ebf407b1915351a617f46984001790f0cce3d6f3ada5c2" },
+   {"komodopioneers_SH": "033ace50aedf8df70035b962a805431363a61cc4e69d99d90726a2d48fb195f68c" },
+   {"libscott_SH": "03301a8248d41bc5dc926088a8cf31b65e2daf49eed7eb26af4fb03aae19682b95" },
+   {"lukechilds_AR": "031aa66313ee024bbee8c17915cf7d105656d0ace5b4a43a3ab5eae1e14ec02696" },
+   {"madmax_AR": "03891555b4a4393d655bf76f0ad0fb74e5159a615b6925907678edc2aac5e06a75" },
+   {"meshbits_AR": "02957fd48ae6cb361b8a28cdb1b8ccf5067ff68eb1f90cba7df5f7934ed8eb4b2c" },
+   {"meshbits_SH": "025c6e94877515dfd7b05682b9cc2fe4a49e076efe291e54fcec3add78183c1edb" },
+   {"metaphilibert_AR": "02adad675fae12b25fdd0f57250b0caf7f795c43f346153a31fe3e72e7db1d6ac6" },
+   {"metaphilibert_SH": "0284af1a5ef01503e6316a2ca4abf8423a794e9fc17ac6846f042b6f4adedc3309" },
+   {"patchkez_SH": "0296270f394140640f8fa15684fc11255371abb6b9f253416ea2734e34607799c4" },
+   {"pbca26_NA": "0276aca53a058556c485bbb60bdc54b600efe402a8b97f0341a7c04803ce204cb5" },
+   {"peer2cloud_AR": "034e5563cb885999ae1530bd66fab728e580016629e8377579493b386bf6cebb15" },
+   {"peer2cloud_SH": "03396ac453b3f23e20f30d4793c5b8ab6ded6993242df4f09fd91eb9a4f8aede84" },
+   {"polycryptoblog_NA": "02708dcda7c45fb54b78469673c2587bfdd126e381654819c4c23df0e00b679622" },
+   {"hyper_AR": "020f2f984d522051bd5247b61b080b4374a7ab389d959408313e8062acad3266b4" },
+   {"hyper_EU": "03d00cf9ceace209c59fb013e112a786ad583d7de5ca45b1e0df3b4023bb14bf51" },
+   {"hyper_SH": "0383d0b37f59f4ee5e3e98a47e461c861d49d0d90c80e9e16f7e63686a2dc071f3" },
+   {"hyper_NA": "03d91c43230336c0d4b769c9c940145a8c53168bf62e34d1bccd7f6cfc7e5592de" },
+   {"popcornbag_AR": "02761f106fb34fbfc5ddcc0c0aa831ed98e462a908550b280a1f7bd32c060c6fa3" },
+   {"popcornbag_NA": "03c6085c7fdfff70988fda9b197371f1caf8397f1729a844790e421ee07b3a93e8" },
+   {"alien_AR": "0348d9b1fc6acf81290405580f525ee49b4749ed4637b51a28b18caa26543b20f0" },
+   {"alien_EU": "020aab8308d4df375a846a9e3b1c7e99597b90497efa021d50bcf1bbba23246527" },
+   {"thegaltmines_NA": "031bea28bec98b6380958a493a703ddc3353d7b05eb452109a773eefd15a32e421" },
+   {"titomane_AR": "029d19215440d8cb9cc6c6b7a4744ae7fb9fb18d986e371b06aeb34b64845f9325" },
+   {"titomane_EU": "0360b4805d885ff596f94312eed3e4e17cb56aa8077c6dd78d905f8de89da9499f" },
+   {"titomane_SH": "03573713c5b20c1e682a2e8c0f8437625b3530f278e705af9b6614de29277a435b" },
+   {"webworker01_NA": "03bb7d005e052779b1586f071834c5facbb83470094cff5112f0072b64989f97d7" },
+   {"xrobesx_NA": "03f0cc6d142d14a40937f12dbd99dbd9021328f45759e26f1877f2a838876709e1" }
+]}

iguana/exchanges/LP_coins.c

@@ -367,6 +367,9 @@ struct iguana_info *LP_coinadd(struct iguana_info *cdata)
     portable_mutex_lock(&LP_coinmutex);
     HASH_ADD_KEYPTR(hh,LP_coins,coin->symbol,strlen(coin->symbol),coin);
     portable_mutex_unlock(&LP_coinmutex);
+    strcpy(coin->validateaddress,"validateaddress");
+    strcpy(coin->getinfostr,"getinfo");
+    strcpy(coin->estimatefeestr,"estimatefee");
     return(coin);
 }
 

iguana/exchanges/LP_commands.c

@@ -120,6 +120,7 @@ cancel(uuid)\n\
 buy(base, rel, price, relvolume, timeout=10, duration=3600, nonce)\n\
 sell(base, rel, price, basevolume, timeout=10, duration=3600, nonce)\n\
 withdraw(coin, outputs[], broadcast=0)\n\
+txblast(coin, utxotxid, utxovout, utxovalue, txfee, passphrase, outputs[], broadcast=0)\n\
 sendrawtransaction(coin, signedtx)\n\
 swapstatus(pending=0, fast=0)\n\
 swapstatus(coin, limit=10)\n\
@@ -655,6 +656,12 @@ jpg(srcfile, destfile, power2=7, password, data="", required, ind=0)\n\
             {
                 return(jprint(LP_gettx("stats_JSON",coin,jbits256(argjson,"txid"),0),1));
             }
+            else if ( strcmp(method,"txblast") == 0 )
+            {
+                if ( (ptr= LP_coinsearch(coin)) != 0 )
+                    return(LP_txblast(ptr,argjson));
+                else return(clonestr("{\"error\":\"cant find coind\"}"));
+            }
             else if ( strcmp(method,"withdraw") == 0 )
             {
                 if ( (ptr= LP_coinsearch(coin)) != 0 )

iguana/exchanges/LP_include.h

@@ -306,7 +306,7 @@ struct iguana_info
     int32_t numutxos,notarized,longestchain,firstrefht,firstscanht,lastscanht,height; uint16_t busport,did_addrutxo_reset;
     uint32_t txversion,dPoWtime,lastautosplit,lastresetutxo,loadedcache,electrumlist,lastunspent,importedprivkey,lastpushtime,lastutxosync,addr_listunspent_requested,lastutxos,updaterate,counter,inactive,lastmempool,lastgetinfo,ratetime,heighttime,lastmonitor,obooktime;
     uint8_t pubtype,p2shtype,isPoS,wiftype,wiftaddr,taddr,noimportprivkey_flag,userconfirms,isassetchain,maxconfirms;
-    char symbol[128],smartaddr[64],userpass[1024],serverport[128],instantdex_address[64],estimatefeestr[32],getinfostr[32],etomic[64];
+    char symbol[128],smartaddr[64],userpass[1024],serverport[128],instantdex_address[64],estimatefeestr[32],getinfostr[32],etomic[64],validateaddress[64];
     // portfolio
     double price_kmd,force,perc,goal,goalperc,relvolume,rate;
     void *electrum; void *ctx;
@@ -459,7 +459,7 @@ struct LP_trade
     uint64_t aliceid;
     int64_t besttrust,bestunconfcredits;
     double bestprice;
-    uint32_t negotiationdone,bestresponse,connectsent,firsttime,lasttime,firstprocessed,lastprocessed,newtime;
+    uint32_t negotiationdone,bestresponse,connectsent,firsttime,lasttime,firstprocessed,lastprocessed,newtime,cancelled;
     char pairstr[64],funcid,iambob;
     struct LP_quoteinfo Qs[4],Q;
 };
@@ -575,6 +575,7 @@ int64_t LP_dynamictrust(int64_t credits,bits256 pubkey,int64_t kmdvalue);
 struct LP_address *LP_addressfind(struct iguana_info *coin,char *coinaddr);
 int64_t LP_outpoint_amount(char *symbol,bits256 txid,int32_t vout);
 void LP_initpeers(int32_t pubsock,struct LP_peerinfo *mypeer,char *myipaddr,uint16_t myport,uint16_t netid,char *seednode);
+int32_t LP_trades_canceluuid(char *uuidstr);
 int _decreasing_uint64(const void *a,const void *b);
 int32_t LP_alice_eligible(uint32_t quotetime);
 int32_t LP_is_slowcoin(char *symbol);

iguana/exchanges/LP_ordermatch.c

@@ -625,11 +625,20 @@ int32_t LP_alice_eligible(uint32_t quotetime)
 
 char *LP_cancel_order(char *uuidstr)
 {
-    if ( uuidstr != 0 && strcmp(LP_Alicequery.uuidstr,uuidstr) == 0 )
+    int32_t num = 0; cJSON *retjson;
+    if ( uuidstr != 0 )
     {
-        LP_failedmsg(LP_Alicequery.R.requestid,LP_Alicequery.R.quoteid,-9998,LP_Alicequery.uuidstr);
-        LP_alicequery_clear();
-        return(clonestr("{\"result\":\"success\",\"status\":\"uuid canceled\"}"));
+        num = LP_trades_canceluuid(uuidstr);
+        retjson = cJSON_CreateObject();
+        jaddstr(retjson,"result","success");
+        jaddnum(retjson,"numentries",num);
+        if ( strcmp(LP_Alicequery.uuidstr,uuidstr) == 0 )
+        {
+            LP_failedmsg(LP_Alicequery.R.requestid,LP_Alicequery.R.quoteid,-9998,LP_Alicequery.uuidstr);
+            LP_alicequery_clear();
+            jaddstr(retjson,"status","uuid canceled");
+        } else jaddstr(retjson,"status","will stop trade negotiation, but if swap started it wont cancel");
+        return(jprint(retjson,1));
     }
     return(clonestr("{\"error\":\"uuid not cancellable\"}"));
 }
@@ -1148,6 +1157,30 @@ int32_t LP_trades_bestpricecheck(void *ctx,struct LP_trade *tp)
     return(0);
 }
 
+int32_t LP_trades_canceluuid(char *uuidstr)
+{
+    int32_t num = 0; struct LP_trade *qtp,*tp,*tmp;
+    HASH_ITER(hh,LP_trades,tp,tmp)
+    {
+        if ( strcmp(tp->Q.uuidstr,uuidstr) == 0 )
+        {
+            tp->cancelled = (uint32_t)time(NULL);
+            num++;
+        }
+    }
+    DL_FOREACH_SAFE(LP_tradesQ,qtp,tmp)
+    {
+        if ( strcmp(qtp->Q.uuidstr,uuidstr) == 0 )
+        {
+            qtp->cancelled = (uint32_t)time(NULL);
+            num++;
+        }
+    }
+    if ( num > 0 )
+        fprintf(stderr,"uuid.%s %d cancelled\n",uuidstr,num);
+    return(num);
+}
+
 void LP_tradesloop(void *ctx)
 {
     struct LP_trade *qtp,*tp,*tmp; struct LP_quoteinfo *qp,Q; uint32_t now; int32_t timeout,funcid,flag,nonz; struct iguana_info *coin; struct LP_pubkey_info *pubp;
@@ -1160,7 +1193,7 @@ void LP_tradesloop(void *ctx)
         nonz = 0;
         HASH_ITER(hh,LP_trades,tp,tmp)
         {
-            if ( tp->negotiationdone != 0 )
+            if ( tp->negotiationdone != 0 || tp->cancelled != 0 )
                 continue;
             //printf("check %s\n",tp->Q.uuidstr+32);
             timeout = LP_AUTOTRADE_TIMEOUT;
@@ -1202,7 +1235,7 @@ void LP_tradesloop(void *ctx)
                 timeout += LP_AUTOTRADE_TIMEOUT * .5;
             if ( (coin= LP_coinfind(tp->Q.destcoin)) != 0 && coin->electrum != 0 )
                 timeout += LP_AUTOTRADE_TIMEOUT * .5;
-            if ( now > tp->firstprocessed+timeout*10 )
+            if ( now > tp->firstprocessed+timeout*10 || tp->cancelled != 0 )
             {
                 //printf("purge swap aliceid.%llu\n",(long long)tp->aliceid);
                 portable_mutex_lock(&LP_tradesmutex);
@@ -1220,9 +1253,17 @@ void LP_tradesloop(void *ctx)
             portable_mutex_lock(&LP_tradesmutex);
             DL_DELETE(LP_tradesQ,qtp);
             HASH_FIND(hh,LP_trades,&qtp->aliceid,sizeof(qtp->aliceid),tp);
+            if ( tp != 0 && tp->cancelled != 0 )
+                
+            {
+                fprintf(stderr,"purging cancelled %s funcid.%d\n",tp->Q.uuidstr,tp->funcid);
+                HASH_DELETE(hh,LP_trades,tp);
+                free(tp);
+                continue;
+            }
             if ( tp == 0 )
             {
-                if ( now > Q.timestamp+LP_AUTOTRADE_TIMEOUT*2 ) // eat expired
+                if ( now > Q.timestamp+LP_AUTOTRADE_TIMEOUT*2 || qtp->cancelled != 0 ) // eat expired
                     free(qtp);
                 else
                 {

iguana/exchanges/LP_rpc.c

@@ -49,18 +49,19 @@ cJSON *bitcoin_json(struct iguana_info *coin,char *method,char *params)
     // bitcoind_passthru callers: "importaddress", "estimatefee", "getblockhash", "sendrawtransaction", "signrawtransaction"
     if ( coin != 0 )
     {
-        //printf("issue.(%s, %s, %s, %s, %s)\n",coin->symbol,coin->serverport,coin->userpass,method,params);
+        //if ( strcmp(method,"listunspent") == 0 )
+        //    printf("issue.(%s, %s, %s, %s, %s)\n",coin->symbol,coin->serverport,coin->userpass,method,params);
         if ( coin->electrum != 0 && (strcmp(method,"getblock") == 0 || strcmp(method,"paxprice") == 0 || strcmp(method,"getrawmempool") == 0) )
             return(cJSON_Parse("{\"error\":\"illegal electrum call\"}"));
-        if ( coin->inactive == 0 || strcmp(method,"importprivkey") == 0  || strcmp(method,"validateaddress") == 0 || strcmp(method,"getrawtransaction") == 0 || strcmp(method,"getblock") == 0 || strcmp(method,"getinfo") == 0 || strcmp(method,"getblockchaininfo") == 0 )
+        if ( coin->inactive == 0 || strcmp(method,"getrawtransaction") == 0 || strcmp(method,"getblock") == 0 || strcmp(method,"getinfo") == 0 || strcmp(method,"getblockchaininfo") == 0 || strcmp(method,"importprivkey") == 0 || strcmp(method,"validateaddress") == 0 || strcmp(method,"getaddressinfo") == 0 || strcmp(method,"importaddress") == 0 )
         {
             if ( coin->electrum == 0 )
             {
                 retstr = bitcoind_passthru(coin->symbol,coin->serverport,coin->userpass,method,params);
-                if ( 0 && strcmp("KMD",coin->symbol) == 0 )
-                    printf("%s.(%s %s): %s.%s -> (%s)\n",coin->symbol,coin->serverport,coin->userpass,method,params,retstr);
                 if ( retstr != 0 && retstr[0] != 0 )
                 {
+                    //if ( strcmp(method,"listunspent") == 0 )
+                    //    printf("%s.(%s %s): %s.%s -> (%s)\n",coin->symbol,coin->serverport,coin->userpass,method,params,retstr);
                     retjson = cJSON_Parse(retstr);
                     free(retstr);
                 }
@@ -76,7 +77,7 @@ cJSON *bitcoin_json(struct iguana_info *coin,char *method,char *params)
                     }
                 }
             }
-        } else retjson = cJSON_Parse("{\"result\":\"disabled\"}");
+        } //else retjson = cJSON_Parse("{\"result\":\"disabled\"}");
     } else printf("bitcoin_json cant talk to NULL coin\n");
     return(retjson);
 }
@@ -343,7 +344,19 @@ cJSON *LP_validateaddress(char *symbol,char *address)
     else
     {
         sprintf(buf,"[\"%s\"]",address);
-        return(bitcoin_json(coin,"validateaddress",buf));
+        if ( coin->validateaddress[0] == 0 )
+            strcpy(coin->validateaddress,"validateaddress");
+        if ( (retjson= bitcoin_json(coin,coin->validateaddress,buf)) != 0 )
+        {
+            if ( jobj(retjson,"error") == 0 && jobj(retjson,"ismine") == 0 && strcmp(coin->validateaddress,"validateaddress") == 0 )
+            {
+                printf("autochange %s validateaddress -> getaddressinfo\n",coin->symbol);
+                strcpy(coin->validateaddress,"getaddressinfo");
+                free(retjson);
+                return(bitcoin_json(coin,coin->validateaddress,buf));
+            }
+        }
+        return(retjson);
     }
 }
 
@@ -417,6 +430,7 @@ cJSON *LP_listunspent(char *symbol,char *coinaddr,bits256 reftxid,bits256 reftxi
                 usecache = 0;
             else if ( time(NULL) > ap->unspenttime+3 )
                 usecache = 0;
+            usecache = 0; // disable unspents cache for native
             //printf("%s %s usecache.%d iswatched.%d\n",coin->symbol,coinaddr,usecache,LP_address_iswatchonly(symbol,coinaddr));
             if ( usecache != 0 && (retstr= LP_unspents_filestr(symbol,coinaddr)) != 0 )
             {
@@ -435,9 +449,10 @@ cJSON *LP_listunspent(char *symbol,char *coinaddr,bits256 reftxid,bits256 reftxi
             else numconfs = 1;
             sprintf(buf,"[%d, 99999999, [\"%s\"]]",numconfs,coinaddr);
             retjson = bitcoin_json(coin,"listunspent",buf);
-//printf("LP_listunspent.(%s %s) -> %s\n",symbol,coinaddr,jprint(retjson,0));
+//printf("LP_listunspent.(%s %s) -> %s\n",symbol,buf,jprint(retjson,0));
             if ( (n= cJSON_GetArraySize(retjson)) > 0 )
             {
+                char str[65];
                 array = cJSON_CreateArray();
                 for (i=0; i<n; i++)
                 {
@@ -448,7 +463,7 @@ cJSON *LP_listunspent(char *symbol,char *coinaddr,bits256 reftxid,bits256 reftxi
                     {
                         jaddi(array,jduplicate(item));
                         free_json(txjson);
-                    }
+                    } //else printf("%s/v%d is spent\n",bits256_str(str,txid),vout);
                 }
                 free_json(retjson);
                 retjson = array;
@@ -626,7 +641,7 @@ int32_t LP_importaddress(char *symbol,char *address)
         sprintf(buf,"[\"%s\", \"%s\", false]",address,address);
         if ( (retstr= bitcoind_passthru(symbol,coin->serverport,coin->userpass,"importaddress",buf)) != 0 )
         {
-            //printf("importaddress.(%s %s) -> (%s)\n",symbol,address,retstr);
+            printf("importaddress.(%s %s) -> (%s)\n",symbol,address,retstr);
             free(retstr);
         } //else printf("importaddress.(%s %s)\n",symbol,address);
         return(1);

iguana/exchanges/LP_signatures.c

@@ -459,7 +459,7 @@ char *LP_pricepings(void *ctx,char *myipaddr,int32_t pubsock,char *base,char *re
 
 char *LP_postprice_recv(cJSON *argjson)
 {
-    bits256 pubkey; double price; char *base,*rel,*argstr;
+    bits256 pubkey; double price; uint8_t pubkey33[33]; char *base,*rel,*argstr,coinaddr[64];
     //printf("PRICE POSTED.(%s)\n",jprint(argjson,0));
     if ( (base= jstr(argjson,"base")) != 0 && (rel= jstr(argjson,"rel")) != 0 && (price= jdouble(argjson,"price")) > SMALLVAL )
     {
@@ -482,7 +482,17 @@ char *LP_postprice_recv(cJSON *argjson)
             }
             else
             {
-                printf("sig failure.(%s)\n",jprint(argjson,0));
+                if ( jstr(argjson,"pubsecp") != 0 )
+                {
+                    static char lasterror[64];
+                    decode_hex(pubkey33,33,jstr(argjson,"pubsecp"));
+                    bitcoin_address("KMD",coinaddr,0,60,pubkey33,33);
+                    if ( strcmp(coinaddr,lasterror) != 0 )
+                    {
+                        printf("sig failure.(%s) %s\n",jprint(argjson,0),coinaddr);
+                        strcpy(lasterror,coinaddr);
+                    }
+                }
                 return(clonestr("{\"error\":\"sig failure\"}"));
             }
         }

iguana/exchanges/LP_socket.c

@@ -619,6 +619,7 @@ cJSON *electrum_address_listunspent(char *symbol,struct electrum_info *ep,cJSON
         else if ( G.LP_pendingswaps != 0 && time(NULL) > ap->unspenttime+13 )
             usecache = 0;
     }
+    usecache = 0; // disable unspents cache
     if ( usecache == 0 || electrumflag > 1 )
     {
         if ( strcmp(symbol,"BCH") == 0 )

iguana/exchanges/LP_transaction.c

@@ -1518,6 +1518,262 @@ char *LP_opreturndecrypt(void *ctx,char *symbol,bits256 utxotxid,char *passphras
     return(jprint(retjson,1));
 }
 
+char *LP_createblasttransaction(uint64_t *changep,int32_t *changeoutp,cJSON **txobjp,cJSON **vinsp,struct vin_info *V,struct iguana_info *coin,bits256 utxotxid,int32_t utxovout,uint64_t utxovalue,bits256 privkey,cJSON *outputs,int64_t txfee)
+{
+    static void *ctx;
+    cJSON *txobj,*item,*vins; uint8_t addrtype,rmd160[20],pubkey33[33],tmptype,data[8192+64],script[8192],spendscript[256]; char *coinaddr,*rawtxbytes,*scriptstr,spendscriptstr[128],blastaddr[64],wifstr[64]; bits256 txid; uint32_t locktime,crc32,timestamp; int64_t change=0,adjust=0,total,value,amount = 0; int32_t i,offset,len,scriptlen,spendlen,suppress_pubkeys,ignore_cltverr,numvouts=0;
+    if ( ctx == 0 )
+        ctx = bitcoin_ctx();
+    *txobjp = *vinsp = 0;
+    *changep = 0;
+    *changeoutp = -1;
+    if ( coin == 0 || outputs == 0 || (numvouts= cJSON_GetArraySize(outputs)) <= 0 )
+    {
+        fprintf(stderr,"LP_createblasttransaction: illegal coin.%p outputs.%p or arraysize.%d, error\n",coin,outputs,numvouts);
+        return(0);
+    }
+    amount = txfee;
+    for (i=0; i<numvouts; i++)
+    {
+        item = jitem(outputs,i);
+        if ( (coinaddr= jfieldname(item)) != 0 )
+        {
+            if ( 0 && LP_address_isvalid(coin->symbol,coinaddr) <= 0 )
+            {
+                fprintf(stderr,"%s LP_createblasttransaction %s i.%d of %d is invalid\n",coin->symbol,coinaddr,i,numvouts);
+                return(0);
+            }
+            if ( (value= SATOSHIDEN * jdouble(item,coinaddr)) <= 0 )
+            {
+                fprintf(stderr,"LP_createblasttransaction: cant get value %s i.%d of %d %s\n",coinaddr,i,numvouts,jprint(outputs,0));
+                return(0);
+            }
+            amount += value;
+            //printf("vout.%d %.8f -> total %.8f\n",i,dstr(value),dstr(amount));
+        }
+        else
+        {
+            fprintf(stderr,"LP_createblasttransaction: cant get fieldname.%d of %d %s\n",i,numvouts,jprint(outputs,0));
+            return(0);
+        }
+    }
+    ignore_cltverr = 0;
+    suppress_pubkeys = 1;
+    memset(V,0,sizeof(*V));
+    V->N = V->M = 1;
+    V->signers[0].privkey = privkey;
+    bitcoin_priv2wif(coin->symbol,coin->wiftaddr,wifstr,privkey,coin->wiftype);
+    bitcoin_priv2pub(ctx,coin->symbol,pubkey33,blastaddr,privkey,coin->taddr,coin->pubtype);
+    bitcoin_addr2rmd160("KMD",coin->taddr,&tmptype,rmd160,blastaddr);
+    V->suppress_pubkeys = suppress_pubkeys;
+    V->ignore_cltverr = ignore_cltverr;
+    change = (utxovalue - amount);
+    timestamp = (uint32_t)time(NULL);
+    locktime = 0;
+    txobj = bitcoin_txcreate(coin->symbol,coin->isPoS,locktime,coin->txversion,timestamp);
+    scriptlen = bitcoin_standardspend(script,0,rmd160);
+    init_hexbytes_noT(spendscriptstr,script,scriptlen);
+    vins = cJSON_CreateArray();
+    jaddi(vins,LP_inputjson(utxotxid,utxovout,spendscriptstr));
+    jdelete(txobj,"vin");
+    jadd(txobj,"vin",jduplicate(vins));
+    *vinsp = vins;
+    for (i=0; i<numvouts; i++)
+    {
+        item = jitem(outputs,i);
+        if ( (coinaddr= jfieldname(item)) != 0 )
+        {
+            if ( (value= SATOSHIDEN * jdouble(item,coinaddr)) <= 0 )
+            {
+                fprintf(stderr,"LP_createblasttransaction: cant get value i.%d of %d %s\n",i,numvouts,jprint(outputs,0));
+                free_json(txobj);
+                return(0);
+            }
+            if ( (scriptstr= jstr(item,"script")) != 0 )
+            {
+                spendlen = (int32_t)strlen(scriptstr) >> 1;
+                if ( spendlen < sizeof(script) )
+                {
+                    decode_hex(spendscript,spendlen,scriptstr);
+                    //printf("i.%d using external script.(%s) %d\n",i,scriptstr,spendlen);
+                }
+                else
+                {
+                    fprintf(stderr,"LP_createblasttransaction: custom script.%d too long %d\n",i,spendlen);
+                    free_json(txobj);
+                    return(0);
+                }
+            }
+            else
+            {
+                bitcoin_addr2rmd160(coin->symbol,coin->taddr,&addrtype,rmd160,coinaddr);
+                if ( addrtype == coin->pubtype )
+                    spendlen = bitcoin_standardspend(spendscript,0,rmd160);
+                else spendlen = bitcoin_p2shspend(spendscript,0,rmd160);
+                if ( i == numvouts-1 && strcmp(coinaddr,coin->smartaddr) == 0 && change != 0 )
+                {
+                    value += change;
+                    change = 0;
+                }
+            }
+            txobj = bitcoin_txoutput(txobj,spendscript,spendlen,value + adjust);
+        }
+        else
+        {
+            fprintf(stderr,"LP_createblasttransaction: cant get fieldname.%d of %d %s\n",i,numvouts,jprint(outputs,0));
+            free_json(txobj);
+            return(0);
+        }
+    }
+    if ( change < 6000 )
+        change = 0;
+    *changep = change;
+    if ( change != 0 )
+    {
+        txobj = bitcoin_txoutput(txobj,script,scriptlen,change);
+        *changeoutp = numvouts;
+    }
+    if ( (rawtxbytes= bitcoin_json2hex(coin->symbol,coin->isPoS,&txid,txobj,V)) == 0 )
+        fprintf(stderr,"LP_createblasttransaction: error making rawtx suppress.%d\n",suppress_pubkeys);
+    *txobjp = txobj;
+    return(rawtxbytes);
+}
+
+char *bitcoin_signrawtransaction(int32_t *completedp,bits256 *signedtxidp,struct iguana_info *coin,char *rawtx,char *wifstr)
+{
+    char *retstr,*paramstr,*hexstr,*signedtx = 0; int32_t len; uint8_t *data; cJSON *signedjson;
+    *completedp = 0;
+    memset(signedtxidp,0,sizeof(*signedtxidp));
+    paramstr = calloc(1,200000+1);
+    sprintf(paramstr,"[\"%s\", null, [\"%s\"]]",rawtx,wifstr);
+    if ( (retstr= bitcoind_passthru(coin->symbol,coin->serverport,coin->userpass,"signrawtransaction",paramstr)) != 0 )
+    {
+        //printf("%s signed -> %s\n",coin->symbol,retstr);
+        if ( (signedjson= cJSON_Parse(retstr)) != 0 )
+        {
+            if ( (hexstr= jstr(signedjson,"hex")) != 0 )
+            {
+                len = (int32_t)strlen(hexstr);
+                signedtx = calloc(1,len+1);
+                strcpy(signedtx,hexstr);
+                *completedp = is_cJSON_True(jobj(signedjson,"complete"));
+                len >>= 1;
+                data = malloc(len);
+                decode_hex(data,len,hexstr);
+                *signedtxidp = bits256_calctxid(coin->symbol,data,len);
+                free(data);
+            }
+            free_json(signedjson);
+        }
+        free(retstr);
+    }
+    free(paramstr);
+    return(signedtx);
+}
+
+char *LP_txblast(struct iguana_info *coin,cJSON *argjson)
+{
+    static void *ctx;
+    int32_t broadcast,i,num,numblast,utxovout,completed=0,numvouts,changeout; char *passphrase,changeaddr[64],vinaddr[64],wifstr[65],blastaddr[65],str[65],*signret,*signedtx=0,*rawtx=0; struct vin_info V; uint32_t locktime,starttime; uint8_t pubkey33[33]; cJSON *retjson,*item,*outputs,*vins=0,*txobj=0,*privkeys=0; struct iguana_msgtx msgtx; bits256 privkey,pubkey,checktxid,utxotxid,signedtxid; uint64_t txfee,utxovalue,change;
+    if ( ctx == 0 )
+        ctx = bitcoin_ctx();
+    if ( (passphrase= jstr(argjson,"password")) == 0 )
+        return(clonestr("{\"error\":\"need password\"}"));
+    outputs = jarray(&numvouts,argjson,"outputs");
+    utxotxid = jbits256(argjson,"utxotxid");
+    utxovout = jint(argjson,"utxovout");
+    if ( (numblast= jint(argjson,"numblast")) == 0 )
+        numblast = 1000000;
+    utxovalue = j64bits(argjson,"utxovalue");
+    txfee = juint(argjson,"txfee");
+    broadcast = juint(argjson,"broadcast");
+    conv_NXTpassword(privkey.bytes,pubkey.bytes,(uint8_t *)passphrase,(int32_t)strlen(passphrase));
+    privkey.bytes[0] &= 248, privkey.bytes[31] &= 127, privkey.bytes[31] |= 64;
+    bitcoin_priv2wif(coin->symbol,coin->wiftaddr,wifstr,privkey,coin->wiftype);
+    bitcoin_priv2pub(ctx,coin->symbol,pubkey33,blastaddr,privkey,coin->taddr,coin->pubtype);
+    safecopy(vinaddr,blastaddr,sizeof(vinaddr));
+    safecopy(changeaddr,blastaddr,sizeof(changeaddr));
+    privkeys = cJSON_CreateArray();
+    jaddistr(privkeys,wifstr);
+    starttime = (uint32_t)time(NULL);
+    for (i=0; i<numblast; i++)
+    {
+        if ( (rawtx= LP_createblasttransaction(&change,&changeout,&txobj,&vins,&V,coin,utxotxid,utxovout,utxovalue,privkey,outputs,txfee)) != 0 )
+        {
+            completed = 0;
+            memset(&msgtx,0,sizeof(msgtx));
+            memset(signedtxid.bytes,0,sizeof(signedtxid));
+            if ( (signedtx= bitcoin_signrawtransaction(&completed,&signedtxid,coin,rawtx,wifstr)) == 0 )
+            //if ( (completed= iguana_signrawtransaction(ctx,coin->symbol,coin->wiftaddr,coin->taddr,coin->pubtype,coin->p2shtype,coin->isPoS,coin->longestchain,&msgtx,&signedtx,&signedtxid,&V,1,rawtx,vins,privkeys,coin->zcash)) < 0 )
+                printf("LP_txblast: couldnt sign blast tx %s\n",bits256_str(str,signedtxid));
+            else if ( completed == 0 )
+            {
+                printf("LP_txblast incomplete signing blast tx (%s)\n",jprint(vins,0));
+                break;
+            }
+            else
+            {
+                if ( broadcast != 0 )
+                {
+                    if ( (signret= LP_sendrawtransaction(coin->symbol,signedtx)) != 0 )
+                    {
+                        printf("LP_txblast.%s broadcast (%s) vs %s\n",coin->symbol,bits256_str(str,signedtxid),signret);
+                        if ( is_hexstr(signret,0) == 64 )
+                        {
+                            decode_hex(checktxid.bytes,32,signret);
+                            if ( bits256_cmp(checktxid,signedtxid) == 0 )
+                            {
+                                printf("blaster i.%d of %d: %s/v%d %.8f\n",i,numblast,bits256_str(str,signedtxid),changeout,dstr(change));
+                            } else break;
+                        }
+                        else
+                        {
+                            printf("error sending tx:\n \"%s\" null '[\"%s\"]'\n",rawtx,wifstr);
+                            break;
+                        }
+                        free(signret);
+                    }
+                    else
+                    {
+                        fprintf(stderr,"null return from LP_sendrawtransaction\n");
+                        break;
+                    }
+                } else printf("blaster i.%d of %d: %s/v%d %.8f %s\n",i,numblast,bits256_str(str,signedtxid),changeout,dstr(change),signedtx);
+            }
+        }
+        else
+        {
+            fprintf(stderr,"error creating txblast rawtransaction\n");
+            break;
+        }
+        if ( txobj != 0 )
+            free_json(txobj), txobj = 0;
+        if ( rawtx != 0 )
+            free(rawtx), rawtx = 0;
+        if ( signedtx != 0 )
+            free(signedtx), signedtx = 0;
+        if ( changeout < 0 || change == 0 )
+            break;
+        utxotxid = signedtxid;
+        utxovout = changeout;
+        utxovalue = change;
+        // good place to update outputs[] for a fully programmable blast
+    }
+    free_json(privkeys), privkeys = 0;
+    retjson = cJSON_CreateObject();
+    jaddstr(retjson,"result","success");
+    jaddstr(retjson,"blastaddr",blastaddr);
+    jaddnum(retjson,"broadcast",broadcast);
+    jaddnum(retjson,"numblast",numblast);
+    jaddnum(retjson,"completed",i);
+    jaddbits256(retjson,"lastutxo",utxotxid);
+    jaddnum(retjson,"lastutxovout",utxovout);
+    jaddnum(retjson,"lastutxovalue",dstr(utxovalue));
+    jaddnum(retjson,"elapsed",(uint32_t)time(NULL) - starttime);
+    jaddnum(retjson,"tx/sec",(double)i / ((uint32_t)time(NULL) - starttime + 1));
+    return(jprint(retjson,1));
+}
+
 char *LP_withdraw(struct iguana_info *coin,cJSON *argjson)
 {
     static void *ctx;

iguana/exchanges/LP_utxo.c

@@ -548,6 +548,7 @@ struct LP_address *LP_address_utxo_reset(int32_t *nump,struct iguana_info *coin)
     portable_mutex_lock(&coin->addressutxo_mutex);
     if ( (array= LP_listunspent(coin->symbol,coin->smartaddr,zero,zero)) != 0 )
     {
+        //printf("%s array.%s\n",coin->symbol,jprint(array,0));
         portable_mutex_lock(&coin->addrmutex);
         portable_mutex_lock(&LP_gcmutex);
         DL_FOREACH_SAFE(ap->utxos,up,tmp)

iguana/exchanges/cancel

@@ -0,0 +1,3 @@
+#!/bin/bash
+source userpass
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"cancel\",\"uuid\":\"<uuidstr>\"}"

iguana/exchanges/install

@@ -1,5 +1,5 @@
 #!/bin/bash
-cp install updateprices get_supernet trackbtc auto_chipskmd auto_chipsbtc pendingswaps fundvalue balances dynamictrust getcoin kickstart tradesarray claim deposit10 deposit1 invreset sendrawtransaction processfiles stop millis mnzservers bot_buy bot_list bot_statuslist bot_pause bot_resume bot_sell bot_settings bot_status bot_stop guistats pubkeystats pendings coinswaps baserelswaps setpassphrase notarizations getrawtransaction parselog statsdisp m_js trust trusted setconfirms balance listunspent electrum snapshot_balance snapshot_loop secretaddresses dividends snapshot goals goal portfolio autoprice deletemessages getmessages debug buy sell bestfit orderbook client client_osx client_static run coins disable enable myprice myprices getcoins getpeers getpeersIP getprices help inv setprice status ../dexscripts
+cp install updateprices get_supernet trackbtc auto_chipskmd auto_chipsbtc pendingswaps fundvalue balances dynamictrust getcoin kickstart tradesarray claim deposit10 deposit1 invreset sendrawtransaction processfiles stop millis mnzservers bot_buy bot_list bot_statuslist bot_pause bot_resume bot_sell bot_settings bot_status bot_stop guistats pubkeystats pendings coinswaps baserelswaps setpassphrase notarizations getrawtransaction parselog statsdisp m_js trust trusted setconfirms balance listunspent electrum snapshot_balance snapshot_loop secretaddresses dividends snapshot goals goal portfolio autoprice deletemessages getmessages debug buy sell bestfit orderbook client client_osx client_static coins disable enable myprice myprices getcoins getpeers getpeersIP getprices help inv setprice status ../dexscripts
 cp coins.json ..
 cd ../dexscripts
 #cp ../exchanges/passphrase ../exchanges/userpass .

iguana/exchanges/splitfunds

@@ -2,5 +2,5 @@
 source userpass
 export address=RGPido1EWcPWngDfkAcn4M4HXYt8avR4vs
 export script=2103f82c8c363d23076420a39904f9616d59c26a3d8dc7c51f67d8d3a94335431970ac
-curl --url "http://127.0.0.1:7783" --data "{\"broadcast\":1,\"userpass\":\"$userpass\",\"method\":\"withdraw\",\"coin\":\"$1\",\"outputs\":[{\"$address\":0.0005,\"script\":\"$script\"}, {\"$address\":0.0005,\"script\":\"$script\"}, {\"$address\":0.0005,\"script\":\"$script\"}, {\"$address\":0.0005,\"script\":\"$script\"}, {\"$address\":0.0005,\"script\":\"$script\"}, {\"$address\":0.0005,\"script\":\"$script\"}, {\"$address\":0.0005,\"script\":\"$script\"}, {\"$address\":0.0005,\"script\":\"$script\"}, {\"$address\":0.0005,\"script\":\"$script\"}, {\"$address\":0.0005,\"script\":\"$script\"}, {\"RGPido1EWcPWngDfkAcn4M4HXYt8avR4vs\":0.0001}]}"
+curl --url "http://127.0.0.1:7783" --data "{\"broadcast\":1,\"userpass\":\"$userpass\",\"method\":\"withdraw\",\"coin\":\"$1\",\"outputs\":[{\"$address\":0.0001,\"script\":\"$script\"}, {\"$address\":0.0001,\"script\":\"$script\"}, {\"$address\":0.0001,\"script\":\"$script\"}, {\"$address\":0.0001,\"script\":\"$script\"}, {\"$address\":0.0001,\"script\":\"$script\"}, {\"$address\":0.0001,\"script\":\"$script\"}, {\"$address\":0.0001,\"script\":\"$script\"}, {\"$address\":0.0001,\"script\":\"$script\"}, {\"$address\":0.0001,\"script\":\"$script\"}, {\"$address\":0.0001,\"script\":\"$script\"}, {\"$address\":0.0001}]}"
 

iguana/exchanges/txblast

@@ -0,0 +1,4 @@
+#!/bin/bash
+source userpass
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"broadcast\":1,\"numblast\":1000,\"password\":\"default\",\"utxotxid\":\"bf8b73b2f72fbff1546811749eba3a028bce6320e5cdf2ae1ae414277661fb13\",\"utxovout\":1,\"utxovalue\":100000000,\"txfee\":20000,\"method\":\"txblast\",\"coin\":\"PIZZA\",\"outputs\":[{\"RUgW6fLfVsLJ87Ng4zJTqNedJSKYQ9ToAf\":0.0001}, {\"RLMHGUQginEGrnRtHoFBPZhLC9jeVdt1th\":0.0001}]}"
+

iguana/iguana777.h

@@ -167,7 +167,7 @@ struct supernet_info
     uint8_t *pingbuf;
     struct basilisk_request DEXaccept;
     FILE *dexfp;
-    struct dpow_info DPOWS[1024]; int32_t numdpows,dpowsock,dexsock,pubsock,repsock,subsock,reqsock;
+    struct dpow_info *DPOWS[8192]; int32_t numdpows,dpowsock,dexsock,pubsock,repsock,subsock,reqsock;
     struct delayedPoW_info dPoW;
     struct basilisk_spend *spends; int32_t numspends;
     char bindaddr[64];

iguana/iguana_notary.c

@@ -60,10 +60,11 @@ void dpow_checkpointset(struct supernet_info *myinfo,struct dpow_checkpoint *che
 
 void dpow_srcupdate(struct supernet_info *myinfo,struct dpow_info *dp,int32_t height,bits256 hash,uint32_t timestamp,uint32_t blocktime)
 {
-    struct komodo_ccdataMoMoM mdata; void **ptrs; char str[65]; cJSON *blockjson; struct iguana_info *coin; struct dpow_checkpoint checkpoint; int32_t freq,minsigs,i,ht,notht; uint64_t signedmask; struct dpow_block *bp;
+    //struct komodo_ccdataMoMoM mdata; cJSON *blockjson; uint64_t signedmask; struct iguana_info *coin;
+    void **ptrs; char str[65]; struct dpow_checkpoint checkpoint; int32_t i,ht;  struct dpow_block *bp;
     dpow_checkpointset(myinfo,&dp->last,height,hash,timestamp,blocktime);
     checkpoint = dp->srcfifo[dp->srcconfirms];
-    if ( strcmp("BTC",dp->dest) == 0 )
+    /*if ( strcmp("BTC",dp->dest) == 0 )
     {
         freq = DPOW_CHECKPOINTFREQ;
         minsigs = Notaries_BTCminsigs; //DPOW_MINSIGS;
@@ -71,12 +72,12 @@ void dpow_srcupdate(struct supernet_info *myinfo,struct dpow_info *dp,int32_t he
     else
     {
         minsigs = Notaries_minsigs; //DPOW_MIN_ASSETCHAIN_SIGS;
-        if ( strcmp("CHIPS",dp->symbol) == 0 )
-            freq = 100;
+        if ( strcmp("CHIPS",dp->symbol) == 0 || strncmp("TEST",dp->symbol,4) == 0)
+            freq = DPOW_MAXFREQ;
         else freq = 1;
-    }
+    }*/
     dpow_fifoupdate(myinfo,dp->srcfifo,dp->last);
-    if ( strcmp(dp->dest,"KMD") == 0 || strcmp(dp->dest,"CHAIN") == 0 )
+    /*if ( strcmp(dp->dest,"KMD") == 0 )//|| strcmp(dp->dest,"CHAIN") == 0 )
     {
         //if ( dp->SRCREALTIME == 0 )
         //    return;
@@ -97,7 +98,7 @@ void dpow_srcupdate(struct supernet_info *myinfo,struct dpow_info *dp,int32_t he
                         if ( height > 0 && blocktime > 0 )
                         {
                             dpow_checkpointset(myinfo,&dp->last,height,hash,timestamp,blocktime);
-                            if ( (0) && strcmp("CHIPS",dp->symbol) == 0 )
+                            if ( (0) && strcmp("KMD",dp->symbol) == 0 )
                                 printf("dynamic set %s/%s %s <- height.%d\n",dp->symbol,dp->dest,bits256_str(str,hash),height);
                             checkpoint = dp->last;
                         } else return;
@@ -111,22 +112,24 @@ void dpow_srcupdate(struct supernet_info *myinfo,struct dpow_info *dp,int32_t he
                             printf("lastnotarized.(%s) is current checkpoint, skip\n",bits256_str(str,dp->lastnotarized));
                             return;
                         }
-                        if ( (0) && strcmp("CHIPS",dp->symbol) == 0 )
+                        if ( (0) && strcmp("KMD",dp->symbol) == 0 )
                             printf("checkpoint.(%s) is not active and not lastnotarized\n",bits256_str(str,checkpoint.blockhash.hash));
                     } else return;
                 } else return;
             } else return;
         } else return;
-    }
-    if ( bits256_nonz(checkpoint.blockhash.hash) != 0 && (checkpoint.blockhash.height % freq) == 0 )
+    }*/
+    if ( dp->freq <= 0 )
+        dp->freq = 1;
+    if ( bits256_nonz(checkpoint.blockhash.hash) != 0 && (checkpoint.blockhash.height % dp->freq) == 0 )
     {
-        if ( (0) && strcmp("CHIPS",dp->symbol) == 0 )
-            printf("%s/%s src ht.%d dest.%u nonz.%d %s minsigs.%d\n",dp->symbol,dp->dest,checkpoint.blockhash.height,dp->destupdated,bits256_nonz(checkpoint.blockhash.hash),bits256_str(str,dp->last.blockhash.hash),minsigs);
+        if ( (0) && strcmp("KMD",dp->symbol) == 0 )
+            printf("%s/%s src ht.%d dest.%u nonz.%d %s minsigs.%d freq.%d\n",dp->symbol,dp->dest,checkpoint.blockhash.height,dp->destupdated,bits256_nonz(checkpoint.blockhash.hash),bits256_str(str,dp->last.blockhash.hash),dp->minsigs,dp->freq);
         dpow_heightfind(myinfo,dp,checkpoint.blockhash.height + 1000);
         ptrs = calloc(1,sizeof(void *)*5 + sizeof(struct dpow_checkpoint) + sizeof(pthread_t));
         ptrs[0] = (void *)myinfo;
         ptrs[1] = (void *)dp;
-        ptrs[2] = (void *)(uint64_t)minsigs;
+        ptrs[2] = (void *)(uint64_t)dp->minsigs;
         if ( strcmp(dp->dest,"KMD") != 0 )
             ptrs[3] = (void *)DPOW_DURATION;
         else ptrs[3] = (void *)(DPOW_DURATION * 60); // essentially try forever for assetchains
@@ -137,13 +140,13 @@ void dpow_srcupdate(struct supernet_info *myinfo,struct dpow_info *dp,int32_t he
         if ( OS_thread_create((void *)((uint64_t)&ptrs[5] + sizeof(struct dpow_checkpoint)),NULL,(void *)dpow_statemachinestart,(void *)ptrs) != 0 )
         {
         }
-        if ( ht > 500 )
+        if ( ht > DPOW_MAXFREQ*5 )
         {
             if ( (0) && strcmp("CHIPS",dp->symbol) == 0 )
                 printf("ht.%d maxblocks.%d\n",ht,dp->maxblocks);
-            for (i=ht-500; i>ht-10000&&i>100; i--)
+            for (i=ht-DPOW_MAXFREQ*5; i>ht-DPOW_MAXFREQ*100&&i>DPOW_MAXFREQ; i--)
             {
-                if ( (i % 100) != 0 && (bp= dp->blocks[i]) != 0 && bp->state == 0xffffffff )
+                if ( (i % DPOW_MAXFREQ) != 0 && (bp= dp->blocks[i]) != 0 && bp->state == 0xffffffff )
                 {
                     dp->blocks[i] = 0;
                     Numallocated--;
@@ -292,9 +295,14 @@ void dpow_addresses()
 #include "../includes/iguana_apideclares.h"
 #include "../includes/iguana_apideclares2.h"
 
-THREE_STRINGS(iguana,dpow,symbol,dest,pubkey)
+THREE_STRINGS_AND_DOUBLE(iguana,dpow,symbol,dest,pubkey,freq)
 {
-    char *retstr,srcaddr[64],destaddr[64]; struct iguana_info *src,*destcoin; cJSON *ismine; int32_t i,srcvalid,destvalid; struct dpow_info *dp = &myinfo->DPOWS[myinfo->numdpows];
+    char *retstr,srcaddr[64],destaddr[64]; struct iguana_info *src,*destcoin; cJSON *ismine; int32_t i,srcvalid,destvalid; struct dpow_info *dp;
+    if ( (dp= myinfo->DPOWS[myinfo->numdpows]) == 0 )
+        myinfo->DPOWS[myinfo->numdpows] = calloc(1,sizeof(*dp));
+    if ( (dp= myinfo->DPOWS[myinfo->numdpows]) == 0 )
+        return(clonestr("{\"error\":\"dPoW cant allocate memory\"}"));
+    memset(dp,0,sizeof(*dp));
     destvalid = srcvalid = 0;
     if ( myinfo->NOTARY.RELAYID < 0 )
     {
@@ -329,7 +337,7 @@ THREE_STRINGS(iguana,dpow,symbol,dest,pubkey)
     if ( myinfo->numdpows > 1 )
     {
         for (i=1; i<myinfo->numdpows; i++)
-            if ( strcmp(symbol,myinfo->DPOWS[i].symbol) == 0 )
+            if ( strcmp(symbol,myinfo->DPOWS[i]->symbol) == 0 )
             {
                 dp->symbol[0] = 0;
                 return(clonestr("{\"error\":\"cant dPoW same coin again\"}"));
@@ -348,6 +356,20 @@ THREE_STRINGS(iguana,dpow,symbol,dest,pubkey)
     }
     if ( dp->srcconfirms > DPOW_FIFOSIZE )
         dp->srcconfirms = DPOW_FIFOSIZE;
+    if ( strcmp("BTC",dp->dest) == 0 )
+    {
+        dp->freq = DPOW_CHECKPOINTFREQ;
+        dp->minsigs = Notaries_BTCminsigs; //DPOW_MINSIGS;
+    }
+    else
+    {
+        dp->minsigs = Notaries_minsigs; //DPOW_MIN_ASSETCHAIN_SIGS;
+        if ( strcmp("CHIPS",dp->symbol) == 0 || strncmp("TEST",dp->symbol,4) == 0)
+            dp->freq = DPOW_MAXFREQ;
+        else if ( freq >= 2 )
+            dp->freq = freq;
+        else dp->freq = 1;
+    }
     src = iguana_coinfind(dp->symbol);
     destcoin = iguana_coinfind(dp->dest);
     if ( src == 0 || destcoin == 0 )
@@ -378,9 +400,6 @@ THREE_STRINGS(iguana,dpow,symbol,dest,pubkey)
         free(retstr);
         retstr = 0;
     }
-    for (i=0; i<33; i++)
-        printf("%02x",dp->minerkey33[i]);
-    printf(" DPOW with pubkey.(%s) %s.valid%d %s -> %s %s.valid%d\n",tmp,srcaddr,srcvalid,dp->symbol,dp->dest,destaddr,destvalid);
     if ( srcvalid <= 0 || destvalid <= 0 )
     {
         dp->symbol[0] = 0;
@@ -393,7 +412,7 @@ THREE_STRINGS(iguana,dpow,symbol,dest,pubkey)
     }
     if ( dp->blocks == 0 )
     {
-        dp->maxblocks = 1000000;
+        dp->maxblocks = 10000;
         dp->blocks = calloc(dp->maxblocks,sizeof(*dp->blocks));
     }
     portable_mutex_init(&dp->paxmutex);
@@ -403,6 +422,9 @@ THREE_STRINGS(iguana,dpow,symbol,dest,pubkey)
     //uint8_t buf[32768];
     //dpow_paxpending(buf);
     myinfo->numdpows++;
+    for (i=0; i<33; i++)
+        printf("%02x",dp->minerkey33[i]);
+    printf(" DPOW with pubkey.(%s) %s.valid%d %s -> %s %s.valid%d, num.%d freq.%d minsigs.%d\n",tmp,srcaddr,srcvalid,dp->symbol,dp->dest,destaddr,destvalid,myinfo->numdpows,dp->freq,dp->minsigs);
     return(clonestr("{\"result\":\"success\"}"));
 }
 
@@ -466,7 +488,7 @@ STRING_ARG(dpow,pending,fiat)
         base[i] = 0;
         for (i=0; i<myinfo->numdpows; i++)
         {
-            dp = &myinfo->DPOWS[i];
+            dp = myinfo->DPOWS[i];
             if ( strcmp(dp->symbol,base) == 0  )
                 return(jprint(dpow_withdraws_pending(dp),1));
         }
@@ -579,6 +601,121 @@ void iguana_notarystats(int32_t totals[64],int32_t dispflag)
     }
 }
 
+// slow and should be redone to use calc_MoM rpc
+int32_t dpow_txhasnotarization(uint64_t *signedmaskp,int32_t *nothtp,struct supernet_info *myinfo,struct iguana_info *coin,bits256 txid,int32_t height,struct komodo_ccdataMoMoM *mdata)
+{
+    cJSON *txobj,*vins,*vin,*vouts,*vout,*spentobj,*sobj; char *hexstr; uint8_t script[256]; bits256 spenttxid; uint64_t notarymask=0; int32_t i,j,numnotaries,len,spentvout,numvins,numvouts,hasnotarization = 0;
+    if ( (txobj= dpow_gettransaction(myinfo,coin,txid)) != 0 )
+    {
+        if ( (vins= jarray(&numvins,txobj,"vin")) != 0 )
+        {
+            if ( numvins >= DPOW_MIN_ASSETCHAIN_SIGS )
+            {
+                notarymask = numnotaries = 0;
+                for (i=0; i<numvins; i++)
+                {
+                    vin = jitem(vins,i);
+                    spenttxid = jbits256(vin,"txid");
+                    spentvout = jint(vin,"vout");
+                    if ( (spentobj= dpow_gettransaction(myinfo,coin,spenttxid)) != 0 )
+                    {
+                        if ( (vouts= jarray(&numvouts,spentobj,"vout")) != 0 )
+                        {
+                            if ( spentvout < numvouts )
+                            {
+                                vout = jitem(vouts,spentvout);
+                                if ( (sobj= jobj(vout,"scriptPubKey")) != 0 && (hexstr= jstr(sobj,"hex")) != 0 && (len= is_hexstr(hexstr,0)) == 35*2 )
+                                {
+                                    len >>= 1;
+                                    decode_hex(script,len,hexstr);
+                                    if ( script[0] == 33 && script[34] == 0xac )
+                                    {
+                                        for (j=0; j<Notaries_num; j++)
+                                        {
+                                            if ( strncmp(Notaries_elected[j][1],hexstr+2,66) == 0 )
+                                            {
+                                                if ( ((1LL << j) & notarymask) == 0 )
+                                                {
+                                                    //printf("n%d ",j);
+                                                    numnotaries++;
+                                                    notarymask |= (1LL << j);
+                                                    break;
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        free_json(spentobj);
+                    }
+                }
+                if ( numnotaries > 0 )
+                {
+                    if ( numnotaries >= DPOW_MIN_ASSETCHAIN_SIGS )
+                    {
+                        hasnotarization = 1;
+                        *nothtp = 0;
+                        if ( (vouts= jarray(&numvouts,txobj,"vout")) != 0 )
+                        {
+                            bits256 blockhash,txid,MoM; uint32_t MoMdepth; char symbol[65];//,str[65],str2[65],str3[65];
+                            vout = jitem(vouts,numvouts-1);
+                            if ( (sobj= jobj(vout,"scriptPubKey")) != 0 && (hexstr= jstr(sobj,"hex")) != 0 && (len= is_hexstr(hexstr,0)) > 36*2 && len < sizeof(script)*2 )
+                            {
+                                len >>= 1;
+                                decode_hex(script,len,hexstr);
+                                if ( dpow_opreturn_parsesrc(&blockhash,nothtp,&txid,symbol,&MoM,&MoMdepth,script,len,mdata) > 0 && strcmp(symbol,coin->symbol) == 0 )
+                                {
+                                    // if ( Notaries_port != DPOW_SOCKPORT ) // keep going till valid MoM found, useful for new chains without any MoM
+                                    {
+                                        if ( bits256_nonz(MoM) == 0 || MoMdepth == 0 || *nothtp >= height || *nothtp < 0 )
+                                        {
+                                            *nothtp = 0;
+                                        }
+                                    }
+                                    if ( mdata->pairs != 0 && mdata->numpairs > 0 )
+                                    {
+                                        for (j=0; j<mdata->numpairs; j++)
+                                        {
+                                            if ( mdata->pairs[j].notarization_height > coin->MoMoMheight )
+                                            {
+                                                coin->MoMoMheight = mdata->pairs[j].notarization_height;
+                                                printf("set %s MoMoMheight <- %d\n",coin->symbol,coin->MoMoMheight);
+                                            }
+                                        }
+                                    }
+                                    //printf("%s.%d notarizationht.%d %s -> %s MoM.%s [%d]\n",symbol,height,*nothtp,bits256_str(str,blockhash),bits256_str(str2,txid),bits256_str(str3,MoM),MoMdepth);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        free_json(txobj);
+    }
+    if ( hasnotarization != 0 )
+        (*signedmaskp) = notarymask;
+    return(hasnotarization);
+}
+
+int32_t dpow_hasnotarization(uint64_t *signedmaskp,int32_t *nothtp,struct supernet_info *myinfo,struct iguana_info *coin,cJSON *blockjson,int32_t ht,struct komodo_ccdataMoMoM *mdata)
+{
+    int32_t i,n,hasnotarization = 0; bits256 txid; cJSON *txarray;
+    *nothtp = 0;
+    *signedmaskp = 0;
+    memset(mdata,0,sizeof(*mdata));
+    if ( (txarray= jarray(&n,blockjson,"tx")) != 0 )
+    {
+        for (i=0; i<n; i++)
+        {
+            txid = jbits256i(txarray,i);
+            hasnotarization += dpow_txhasnotarization(signedmaskp,nothtp,myinfo,coin,txid,ht,mdata);
+        }
+    }
+    return(hasnotarization);
+}
+
 STRING_AND_TWOINTS(dpow,notarizations,symbol,height,numblocks)
 {
     struct komodo_ccdataMoMoM mdata; int32_t i,j,ht,maxheight,notht,masksums[64]; uint64_t signedmask; cJSON *retjson,*blockjson,*item,*array; bits256 blockhash;
@@ -720,9 +857,13 @@ STRING_AND_INT(dpow,fundnotaries,symbol,numblocks)
     return(clonestr("{\"result\":\"success\"}"));
 }
 
+extern char *Notaries_elected[65][2];
+
 STRING_ARG(dpow,active,maskhex)
 {
-    uint8_t data[8],revdata[8],pubkeys[64][33]; char pubkeystr[67]; int32_t i,len,current,n; uint64_t mask; cJSON *infojson,*retjson,*array = cJSON_CreateArray();
+    uint8_t data[8],revdata[8],pubkeys[64][33]; char pubkeystr[67]; int32_t i,len,current,n; uint64_t mask; cJSON *infojson,*retjson,*array,*notarray;
+    array = cJSON_CreateArray();
+    notarray = cJSON_CreateArray();
     if ( (infojson= dpow_getinfo(myinfo,coin)) != 0 )
     {
         current = jint(infojson,"blocks");
@@ -731,13 +872,13 @@ STRING_ARG(dpow,active,maskhex)
     n = komodo_notaries("KMD",pubkeys,current);
     if ( maskhex == 0 || maskhex[0] == 0 )
     {
-        mask = myinfo->DPOWS[0].lastrecvmask;
+        mask = myinfo->DPOWS[0]->lastrecvmask;
         for (i=0; i<n; i++)
         {
             if ( ((1LL << i) & mask) != 0 )
             {
                 init_hexbytes_noT(pubkeystr,pubkeys[i],33);
-                printf("(%d %llx %s) ",i,(long long)(1LL << i),pubkeystr);
+                //printf("(%d %llx %s) ",i,(long long)(1LL << i),pubkeystr);
                 jaddistr(array,pubkeystr);
             }
         }
@@ -746,7 +887,7 @@ STRING_ARG(dpow,active,maskhex)
         jadd(retjson,"notaries",array);
         return(jprint(retjson,1));
     }
-    printf("dpow active (%s)\n",maskhex);
+    //printf("dpow active (%s)\n",maskhex);
     if ( (len= (int32_t)strlen(maskhex)) <= 16 )
     {
         len >>= 1;
@@ -756,23 +897,29 @@ STRING_ARG(dpow,active,maskhex)
             revdata[i] = data[len-1-i];
         mask = 0;
         memcpy(&mask,revdata,sizeof(revdata));
-        for (i=0; i<len; i++)
-            printf("%02x",data[i]);
-        printf(" <- hex mask.%llx\n",(long long)mask);
+        //for (i=0; i<len; i++)
+        //    printf("%02x",data[i]);
+        //printf(" <- hex mask.%llx\n",(long long)mask);
         for (i=0; i<(len<<3); i++)
+        {
             if ( ((1LL << i) & mask) != 0 )
             {
-                init_hexbytes_noT(pubkeystr,pubkeys[i],33);
-                printf("(%d %llx %s) ",i,(long long)(1LL << i),pubkeystr);
-                jaddistr(array,pubkeystr);
+                //init_hexbytes_noT(pubkeystr,pubkeys[i],33);
+                //printf("(%d %llx %s) ",i,(long long)(1LL << i),pubkeystr);
+                jaddistr(array,Notaries_elected[i][0]);
             }
-        return(jprint(array,1));
+            else jaddistr(notarray,Notaries_elected[i][0]);
+        }
+        retjson = cJSON_CreateObject();
+        jadd(retjson,"set",array);
+        jadd(retjson,"not",notarray);
+        return(jprint(retjson,1));
     } else return(clonestr("{\"error\":\"maskhex too long\"}"));
 }
 
 ZERO_ARGS(dpow,cancelratify)
 {
-    myinfo->DPOWS[0].cancelratify = 1;
+    myinfo->DPOWS[0]->cancelratify = 1;
     return(clonestr("{\"result\":\"queued dpow cancel ratify\"}"));
 }
 
@@ -787,18 +934,18 @@ TWOINTS_AND_ARRAY(dpow,ratify,minsigs,timestamp,ratified)
     ptrs[0] = (void *)myinfo;
     if ( (source= jstr(json,"source")) == 0 )
         source = "KMD";
-    ptrs[1] = (void *)&myinfo->DPOWS[0];
+    ptrs[1] = (void *)myinfo->DPOWS[0];
     for (i=0; i<myinfo->numdpows; i++)
-        if ( strcmp(myinfo->DPOWS[0].symbol,source) == 0 )
+        if ( strcmp(myinfo->DPOWS[0]->symbol,source) == 0 )
         {
-            ptrs[1] = (void *)&myinfo->DPOWS[i];
+            ptrs[1] = (void *)myinfo->DPOWS[i];
             break;
         }
     ptrs[2] = (void *)(long)minsigs;
     ptrs[3] = (void *)DPOW_RATIFYDURATION;
     ptrs[4] = (void *)jprint(ratified,0);
     memcpy(&ptrs[5],&checkpoint,sizeof(checkpoint));
-    myinfo->DPOWS[0].cancelratify = 0;
+    myinfo->DPOWS[0]->cancelratify = 0;
     if ( OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)dpow_statemachinestart,(void *)ptrs) != 0 )
     {
     }

iguana/m_notary_run

@@ -16,9 +16,10 @@ source pubkey.txt
 sleep 4
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"SuperNET\",\"method\":\"myipaddr\",\"ipaddr\":\"$myip\"}"
 sleep 3
-tests/addnotarys_7776
+curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"addnotary\",\"ipaddr\":\"78.47.196.146\"}"
+#tests/addnotarys_7776
 coins/btc_7776
-coins/ltc_7776
+#coins/ltc_7776
 coins/kmd_7776
 coins/chips_7776
 ./wp_7776
@@ -53,4 +54,5 @@ coins/prlpay_7776
 #curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"passthru\",\"method\":\"paxfiats\",\"timeout\":900000}"
 
 #curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"addnotary\",\"ipaddr\":\"$myip\"}"
+sleep 30
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"KMD\",\"pubkey\":\"$pubkey\"}"

iguana/tests/active

@@ -0,0 +1,2 @@
+#!/bin/bash
+curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"dpow\",\"method\":\"active\",\"maskhex\":\"7fc27f67df27e619\"}"

includes/iguana_apideclares.h

@@ -174,7 +174,7 @@ STRING_AND_INT(iguana,snapshot,symbol,height);
 INT_ARRAY_STRING(iguana,dividends,height,vals,symbol);
 THREE_STRINGS(iguana,passthru,asset,function,hex);
 STRING_ARG(iguana,initfastfind,activecoin);
-THREE_STRINGS(iguana,dpow,symbol,dest,pubkey);
+THREE_STRINGS_AND_DOUBLE(iguana,dpow,symbol,dest,pubkey,freq);
 STRING_ARG(iguana,peers,activecoin);
 STRING_AND_INT(iguana,maxpeers,activecoin,max);
 STRING_ARG(iguana,getconnectioncount,activecoin);