diff --git a/iguana/iguana777.c b/iguana/iguana777.c index 9e710b1d4..5a23c2f87 100755 --- a/iguana/iguana777.c +++ b/iguana/iguana777.c @@ -858,6 +858,7 @@ struct iguana_info *iguana_setcoin(char *symbol,void *launched,int32_t maxpeers, sprintf(dirname,"%s/ro",GLOBAL_DBDIR), OS_ensure_directory(dirname); sprintf(dirname,"%s/ro/%s",GLOBAL_DBDIR,symbol), OS_ensure_directory(dirname); sprintf(dirname,"%s/%s",GLOBAL_DBDIR,symbol), OS_ensure_directory(dirname); + sprintf(dirname,"%s/purgeable/%s",GLOBAL_DBDIR,symbol), OS_ensure_directory(dirname); sprintf(dirname,"%s/%s/validated",GLOBAL_DBDIR,symbol), OS_ensure_directory(dirname); sprintf(dirname,"%s/%s/accounts",GLOBAL_DBDIR,symbol), OS_ensure_directory(dirname); sprintf(dirname,"%s/%s/spends",GLOBAL_DBDIR,symbol), OS_ensure_directory(dirname); diff --git a/iguana/iguana_chains.c b/iguana/iguana_chains.c index a68f17f5a..3ceeebbda 100755 --- a/iguana/iguana_chains.c +++ b/iguana/iguana_chains.c @@ -434,14 +434,14 @@ struct iguana_chain *iguana_chainfind(char *name,cJSON *argjson,int32_t createfl { if ( createflag != 0 && argjson != 0 ) { - iguana_chaininit(chain,strcmp(chain->symbol,"BTC") == 0,argjson); + iguana_chaininit(chain,strcmp(chain->symbol,"BTCD") != 0,argjson); return(chain); } continue; } if ( strcmp(name,chain->symbol) == 0 ) { - iguana_chaininit(chain,strcmp(chain->symbol,"BTC") == 0,argjson); + iguana_chaininit(chain,strcmp(chain->symbol,"BTCD") != 0,argjson); return(chain); } } diff --git a/iguana/iguana_init.c b/iguana/iguana_init.c index 31ba3c166..0b825b713 100755 --- a/iguana/iguana_init.c +++ b/iguana/iguana_init.c @@ -266,7 +266,7 @@ void iguana_parseline(struct iguana_info *coin,int32_t iter,FILE *fp) { j = (int32_t)strlen(line) - 1; line[j] = 0; - //printf("parse line.(%s) maxpeers.%d\n",line,coin->MAXPEERS); + printf("parse line.(%s) maxpeers.%d\n",line,coin->MAXPEERS); if ( iter == 0 ) { if ( m < coin->MAXPEERS-3 )//&& m < 77.7 ) diff --git a/iguana/iguana_msg.c b/iguana/iguana_msg.c index b1cf9d989..22d3a0a74 100755 --- a/iguana/iguana_msg.c +++ b/iguana/iguana_msg.c @@ -570,12 +570,12 @@ int32_t iguana_msgparser(struct iguana_info *coin,struct iguana_peer *addr,struc bloom = intvectors = srvmsg = -1; if ( addr != 0 ) { + //printf("iguana_msgparser from (%s) parse.(%s) len.%d\n",addr->ipaddr,H->command,recvlen); //iguana_peerblockrequest(coin,addr->blockspace,IGUANA_MAXPACKETSIZE,addr,iguana_blockhash(coin,100),0); addr->lastcontact = (uint32_t)time(NULL); strcpy(addr->lastcommand,H->command); if ( strncmp(H->command,"SuperNET",strlen("SuperNET")) == 0 ) { - //printf("iguana_msgparser from (%s) parse.(%s) len.%d\n",addr->ipaddr,H->command,recvlen); addr->supernet = 1; addr->msgcounts.verack++; len = recvlen; diff --git a/iguana/main.c b/iguana/main.c index 0ba9d6900..a72134cf3 100755 --- a/iguana/main.c +++ b/iguana/main.c @@ -312,7 +312,7 @@ char *SuperNET_processJSON(struct supernet_info *myinfo,cJSON *json,char *remote } jsonstr = jprint(json,0); //printf("RPC? (%s)\n",jsonstr); - if ( (remoteaddr == 0 || remoteaddr[0] == 0 || jstr(json,"immediate") != 0) && port == IGUANA_RPCPORT ) + if ( jstr(json,"immediate") != 0 || ((remoteaddr == 0 || remoteaddr[0] == 0) && port == IGUANA_RPCPORT) ) retjsonstr = SuperNET_jsonstr(myinfo,jsonstr,remoteaddr,port); else retjsonstr = iguana_blockingjsonstr(myinfo,jsonstr,tag,timeout,remoteaddr,port); if ( retjsonstr != 0 ) @@ -1163,9 +1163,9 @@ void iguana_appletests(struct supernet_info *myinfo) //printf("shash -> %s sha256x2 %s\n",bits256_str(str,shash),bits256_str(str2,hash2)); getchar(); } - if ( 0 ) + if ( 1 ) { - if ( 1 && (str= SuperNET_JSON(myinfo,cJSON_Parse("{\"userhome\":\"/Users/jimbolaptop/Library/Application Support\",\"RELAY\":1,\"VALIDATE\":1,\"prefetchlag\":-1,\"agent\":\"iguana\",\"method\":\"addcoin\",\"startpend\":4,\"endpend\":4,\"services\":129,\"maxpeers\":128,\"newcoin\":\"LTC\",\"active\":1,\"numhelpers\":4,\"poll\":100}"),0,9334)) != 0 ) + if ( 1 && (str= SuperNET_JSON(myinfo,cJSON_Parse("{\"immediate\":\"yes\",\"userhome\":\"/Users/jimbolaptop/Library/Application Support\",\"RELAY\":1,\"VALIDATE\":1,\"prefetchlag\":-1,\"agent\":\"iguana\",\"method\":\"addcoin\",\"startpend\":4,\"endpend\":4,\"services\":128,\"maxpeers\":128,\"newcoin\":\"LTC\",\"active\":1,\"numhelpers\":4,\"poll\":100}"),0,9334)) != 0 ) { free(str); if ( 0 && (str= SuperNET_JSON(myinfo,cJSON_Parse("{\"userhome\":\"/Users/jimbolaptop/Library/Application Support\",\"RELAY\":0,\"VALIDATE\":0,\"prefetchlag\":-1,\"agent\":\"iguana\",\"method\":\"addcoin\",\"startpend\":4,\"endpend\":4,\"services\":129,\"maxpeers\":64,\"newcoin\":\"BTC\",\"active\":0,\"numhelpers\":4,\"poll\":100}"),0,8334)) != 0 ) @@ -1231,6 +1231,7 @@ void iguana_ensuredirs() sprintf(dirname,"%s",GLOBAL_HELPDIR), OS_ensure_directory(dirname); sprintf(dirname,"%s",GLOBAL_CONFSDIR), OS_ensure_directory(dirname); sprintf(dirname,"%s",GLOBAL_DBDIR), OS_ensure_directory(dirname); + sprintf(dirname,"%s/purgeable",GLOBAL_DBDIR), OS_ensure_directory(dirname); sprintf(dirname,"%s",GLOBAL_TMPDIR), OS_ensure_directory(dirname); sprintf(dirname,"%s",GLOBAL_VALIDATEDIR), OS_ensure_directory(dirname); sprintf(dirname,"%s/ECB",GLOBAL_DBDIR), OS_ensure_directory(dirname); @@ -1343,6 +1344,7 @@ void iguana_main(void *arg) exchange_create("bitcoin",0); argjson = arg != 0 ? cJSON_Parse(arg) : cJSON_Parse("{}"); iguana_coinadd("BTC",argjson); + ///iguana_coinadd("LTC",argjson); free_json(argjson); iguana_helpinit(myinfo); iguana_commandline(myinfo,arg);