Merge branch 'spvdex' of https://github.com/jl777/SuperNET into dev-d…

…ecker-spvdex
DeckerSU · Oct 16, 2017 · 89f6719 · 89f6719
2 parents 2a2cbcb + 3046871
commit 89f6719
Show file tree

Hide file tree

Showing 32 changed files with 981 additions and 481 deletions.
diff --git a/crypto777/OS_portable.h b/crypto777/OS_portable.h
@@ -40,7 +40,7 @@
 #include <sys/types.h>
 #include <time.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #define sleep(x) Sleep(1000*(x))
 #include "../OSlibs/win/mingw.h"
 #include "../OSlibs/win/mman.h"

diff --git a/crypto777/bitcoind_RPC.c b/crypto777/bitcoind_RPC.c
@@ -55,17 +55,18 @@ char *post_process_bitcoind_RPC(char *debugstr,char *command,char *rpcstr,char *
     long i,j,len;
     char *retstr = 0;
     cJSON *json,*result,*error;
+    usleep(2500);
     //printf("<<<<<<<<<<< bitcoind_RPC: %s post_process_bitcoind_RPC.%s.[%s]\n",debugstr,command,rpcstr);
     if ( command == 0 || rpcstr == 0 || rpcstr[0] == 0 )
     {
         if ( strcmp(command,"signrawtransaction") != 0 && strcmp(command,"getrawtransaction") != 0 )
-            printf("<<<<<<<<<<< bitcoind_RPC: %s post_process_bitcoind_RPC.%s.[%s]\n",debugstr,command,rpcstr);
+            printf("<<<<<<<<<<< A bitcoind_RPC: %s post_process_bitcoind_RPC.%s.[%s]\n",debugstr,command,params);
         return(rpcstr);
     }
     json = cJSON_Parse(rpcstr);
     if ( json == 0 )
     {
-        printf("<<<<<<<<<<< bitcoind_RPC: %s post_process_bitcoind_RPC.%s can't parse.(%s) params.(%s)\n",debugstr,command,rpcstr,params);
+        printf("<<<<<<<<<<< B bitcoind_RPC: %s post_process_bitcoind_RPC.%s can't parse.(%s) params.(%s)\n",debugstr,command,rpcstr,params);
         free(rpcstr);
         return(0);
     }
@@ -227,7 +228,7 @@ char *bitcoind_RPC(char **retstrp,char *debugstr,char *url,char *userpass,char *
         {
             count++;
             elapsedsum += (OS_milliseconds() - starttime);
-            if ( (count % 10000) == 0)
+            if ( (count % 100000) == 0)
                 printf("%d: ave %9.6f | elapsed %.3f millis | bitcoind_RPC.(%s) url.(%s)\n",count,elapsedsum/count,(OS_milliseconds() - starttime),command,url);
             if ( retstrp != 0 )
             {

diff --git a/crypto777/iguana_OS.c b/crypto777/iguana_OS.c
@@ -30,7 +30,7 @@
 
 char *OS_mvstr()
 {
-#ifdef __WIN32
+#ifdef _WIN32
     return("rename");
 #else
     return("mv");
@@ -659,7 +659,7 @@ int64_t OS_copyfile(char *src,char *dest,int32_t cmpflag)
     {
         if ( (destfp= fopen(OS_compatible_path(dest),"wb")) != 0 )
         {
-#ifdef WIN32
+#ifdef _WIN32
 			allocsize = 1024 * 1024 * 8L;
 #else
             allocsize = 1024 * 1024 * 128L;

diff --git a/crypto777/jpeg/unix/jmemname.c b/crypto777/jpeg/unix/jmemname.c
@@ -11,7 +11,7 @@
  * Also, the problem of determining the amount of memory available
  * is shoved onto the user.
  */
-#ifndef WIN32
+#ifndef _WIN32
 #include <unistd.h>
 #endif
 

diff --git a/iguana/exchanges/LP_coins.c b/iguana/exchanges/LP_coins.c
@@ -100,7 +100,7 @@ void LP_statefname(char *fname,char *symbol,char *assetname,char *str,char *name
         return;
     }
     sprintf(fname,"%s",LP_getdatadir());
-#ifdef WIN32
+#ifdef _WIN32
     strcat(fname,"\\");
 #else
     strcat(fname,"/");
@@ -138,15 +138,15 @@ void LP_statefname(char *fname,char *symbol,char *assetname,char *str,char *name
 #endif
         if ( strcmp(symbol,"KMD") != 0 )
         {
-#ifdef WIN32
+#ifdef _WIN32
             strcat(fname,"\\");
 #else
             strcat(fname,"/");
 #endif
             strcat(fname,assetname);
         }
     }
-#ifdef WIN32
+#ifdef _WIN32
     strcat(fname,"\\");
 #else
     strcat(fname,"/");
@@ -299,6 +299,11 @@ uint16_t LP_coininit(struct iguana_info *coin,char *symbol,char *name,char *asse
     coin->inactive = (uint32_t)time(NULL);
     coin->bussock = LP_coinbus(busport);
     coin->ctx = bitcoin_ctx();
+    if ( assetname != 0 && strcmp(name,assetname) == 0 )
+    {
+        printf("%s is assetchain\n",symbol);
+        coin->isassetchain = 1;
+    }
     if ( strcmp(symbol,"KMD") == 0 || (assetname != 0 && assetname[0] != 0) )
         name2 = 0;
     else name2 = name;