DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

test

Browse Source
This commit is contained in:
jl777
2016-12-05 20:51:58 +02:00
parent b0ab0450b9
commit f8b5c1642c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/komodo_utils.h
View File

@@ -1317,9 +1317,9 @@ void komodo_configfile(char *symbol,uint16_t port)
sprintf(buf,"%s.conf",symbol); sprintf(buf,"%s.conf",symbol);
BITCOIND_PORT = port; BITCOIND_PORT = port;
#ifdef WIN32 #ifdef WIN32
sprintf(fname,"%s\\%s",GetDataDir(false).string().c_str(),buf); sprintf(fname,"%s\\assets\\%s",GetDataDir(false).string().c_str(),buf);
#else #else
sprintf(fname,"%s/%s",GetDataDir(false).string().c_str(),buf); sprintf(fname,"%s/assets/%s",GetDataDir(false).string().c_str(),buf);
#endif #endif
if ( (fp= fopen(fname,"rb")) == 0 ) if ( (fp= fopen(fname,"rb")) == 0 )
{ {

5
src/main.cpp
View File

@@ -550,7 +550,6 @@ CBlockTreeDB *pblocktree = NULL;
// Komodo globals // Komodo globals
#define KOMODO_TESTNET_EXPIRATION 100000
#define KOMODO_PAX #define KOMODO_PAX
#define KOMODO_ZCASH #define KOMODO_ZCASH
#include "komodo.h" #include "komodo.h"
@@ -2155,8 +2154,8 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
} }
bool fScriptChecks = (!fCheckpointsEnabled || pindex->nHeight >= Checkpoints::GetTotalBlocksEstimate(chainparams.Checkpoints())); bool fScriptChecks = (!fCheckpointsEnabled || pindex->nHeight >= Checkpoints::GetTotalBlocksEstimate(chainparams.Checkpoints()));
if ( KOMODO_TESTNET_EXPIRATION != 0 && pindex->nHeight > KOMODO_TESTNET_EXPIRATION ) // "testnet" //if ( KOMODO_TESTNET_EXPIRATION != 0 && pindex->nHeight > KOMODO_TESTNET_EXPIRATION ) // "testnet"
return(false); // return(false);
// Do not allow blocks that contain transactions which 'overwrite' older transactions, // Do not allow blocks that contain transactions which 'overwrite' older transactions,
// unless those are already completely spent. // unless those are already completely spent.
BOOST_FOREACH(const CTransaction& tx, block.vtx) { BOOST_FOREACH(const CTransaction& tx, block.vtx) {

3
src/util.cpp
View File

@@ -526,7 +526,8 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific)
path /= BaseParams().DataDir(); path /= BaseParams().DataDir();
fs::create_directories(path); fs::create_directories(path);
std::string assetpath = path + "/assets";
boost::filesystem::create_directory(assetpath);
return path; return path;
} }