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

Merge pull request #20 from jl777/dPoW

Browse Source 
test
This commit is contained in:
jl777
2016-10-03 08:37:40 -03:00
committed by GitHub
parent 2bc0bb9875 1cf67c7040
commit 1599111fb2
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/bitcoind.cpp
View File

@@ -106,6 +106,10 @@ bool AppInit(int argc, char* argv[])
fprintf(stderr, "Error: Invalid combination of -regtest and -testnet.\n"); fprintf(stderr, "Error: Invalid combination of -regtest and -testnet.\n");
return false; return false;
} }
extern int32_t IS_KOMODO_NOTARY;
extern std::string NOTARY_PUBKEY;
IS_KOMODO_NOTARY = GetBoolArg("-notary", false);
NOTARY_PUBKEY = GetArg("-pubkey", "");
// Command-line RPC // Command-line RPC
bool fCommandLine = false; bool fCommandLine = false;

5
src/init.cpp
View File

@@ -1479,11 +1479,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
// Generate coins in the background // Generate coins in the background
if (pwalletMain) if (pwalletMain)
GenerateBitcoins(GetBoolArg("-gen", false), pwalletMain, GetArg("-genproclimit", 1)); GenerateBitcoins(GetBoolArg("-gen", false), pwalletMain, GetArg("-genproclimit", 1));
extern int32_t IS_KOMODO_NOTARY;
extern std::string NOTARY_PUBKEY;
IS_KOMODO_NOTARY = GetBoolArg("-notary", false);
NOTARY_PUBKEY = GetArg("-pubkey", "");
#endif #endif
// ********************************************************* Step 11: finished // ********************************************************* Step 11: finished