test

iguana/iguana_chains.c

@@ -320,6 +320,7 @@ uint64_t iguana_miningreward(struct iguana_info *coin,uint32_t blocknum)
 
 void iguana_chainparms(struct iguana_chain *chain,cJSON *argjson)
 {
+    extern char Userhome[];
     char *path,*conf,*hexstr,genesisblock[1024],str[65]; bits256 hash; uint16_t port; cJSON *rpair,*genesis,*rewards,*item; int32_t i,n,m;
     if ( strcmp(chain->symbol,"NXT") != 0 )
     {
@@ -350,10 +351,13 @@ void iguana_chainparms(struct iguana_chain *chain,cJSON *argjson)
             chain->txfee = (uint64_t)(SATOSHIDEN * jdouble(argjson,"txfee"));
         chain->use_addmultisig = juint(argjson,"useaddmultisig");
         chain->do_opreturn = juint(argjson,"do_opreturn");
-        if ( jobj(argjson,"oldtx_format") != 0 )
+        if ( jobj(argjson,"hastimestamp") != 0 )
+            chain->hastimestamp = juint(argjson,"hastimestamp");
+        else if ( jobj(argjson,"oldtx_format") != 0 )
             chain->hastimestamp = !juint(argjson,"oldtx_format");
         if ( jstr(argjson,"userhome") != 0 )
             strcpy(chain->userhome,jstr(argjson,"userhome"));
+        else strcpy(chain->userhome,Userhome);
         if ( (port= extract_userpass(chain->serverport,chain->userpass,chain->symbol,chain->userhome,path,conf)) != 0 )
             chain->portrpc = port;
         printf("COIN.%s serverport.(%s) userpass.(%s) port.%u\n",chain->symbol,chain->serverport,chain->userpass,chain->portrpc);
@@ -392,7 +396,6 @@ void iguana_chainparms(struct iguana_chain *chain,cJSON *argjson)
             chain->ramchainport = chain->portp2p - 1;
         if ( (chain->portrpc= juint(argjson,"rpc")) == 0 )
             chain->portrpc = chain->portp2p + 1;
-        chain->hastimestamp = juint(argjson,"hastimestamp");
         if ( (rewards= jarray(&n,argjson,"rewards")) != 0 )
         {
             for (i=0; i<n; i++)

iguana/main.c

@@ -35,6 +35,7 @@ int32_t Showmode,Autofold,PANGEA_MAXTHREADS = 1;
 
 struct category_info *Categories;
 struct iguana_info *Coins[IGUANA_MAXCOINS];
+char Userhome[512];
 int32_t USE_JAY,FIRST_EXTERNAL,IGUANA_disableNXT,Debuglevel;
 uint32_t prices777_NXTBLOCK,MAX_DEPTH = 100;
 queue_t helperQ,jsonQ,finishedQ,bundlesQ;
@@ -1030,9 +1031,8 @@ maingen(int argc, char** argv)
 
 void iguana_main(void *arg)
 {
-    int32_t usessl = 0, ismainnet = 1;
-    struct supernet_info *myinfo; char *tmpstr,*helperargs,*coinargs,helperstr[512]; int32_t i;
-
+    cJSON *argjson; int32_t usessl = 0, ismainnet = 1;  int32_t i;
+    struct supernet_info *myinfo; char *tmpstr,*helperargs,*coinargs,helperstr[512];
     mycalloc(0,0,0);
     myinfo = SuperNET_MYINFO(0);
     FILE *fp; int32_t iter; void ztest(); ztest();
@@ -1084,6 +1084,11 @@ void iguana_main(void *arg)
     OS_ensure_directory("confs");
     OS_ensure_directory("DB"), OS_ensure_directory("DB/ECB");
     OS_ensure_directory("tmp");
+    if ( arg != 0 && (argjson= cJSON_Parse(arg)) != 0 )
+    {
+        safecopy(Userhome,jstr(argjson,"userhome"),sizeof(Userhome));
+        free_json(argjson);
+    }
     if ( (tmpstr= SuperNET_JSON(myinfo,cJSON_Parse("{\"agent\":\"SuperNET\",\"method\":\"help\"}"),0)) != 0 )
     {
         if ( (API_json= cJSON_Parse(tmpstr)) != 0 && (API_json= jobj(API_json,"result")) != 0 )