Merge all Komodo changes, including proof of stake, crypto conditions, passport, etc.

This commit is contained in:
miketout
2018-05-02 03:24:21 -07:00
483 changed files with 62307 additions and 3553 deletions

View File

@@ -680,9 +680,8 @@ void ReadConfigFile(map<string, string>& mapSettingsRet,
}
// If datadir is changed in .conf file:
ClearDatadirCache();
extern uint16_t BITCOIND_PORT;
BITCOIND_PORT = GetArg("-rpcport",BaseParams().RPCPort());
//fprintf(stderr,"from conf file %s RPC %u, used to be %u\n",ASSETCHAINS_SYMBOL,BITCOIND_PORT,BITCOIND_PORT);
extern uint16_t BITCOIND_RPCPORT;
BITCOIND_RPCPORT = GetArg("-rpcport",BaseParams().RPCPort());
}
#ifndef _WIN32