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

Merge remote-tracking branch 'zcash/master' into dPoW

Browse Source
This commit is contained in:
jl777
2016-10-17 15:28:00 -03:00
parent 9e211e057f 6a7acc29a1
commit 3a672e7b11
205 changed files with 4205 additions and 2995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/init.cpp
View File

@@ -532,6 +532,11 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
RenameThread("bitcoin-loadblk");
// -reindex
if (fReindex) {
#ifdef ENABLE_WALLET
if (pwalletMain) {
pwalletMain->ClearNoteWitnessCache();
}
#endif
CImportingNow imp;
int nFile = 0;
while (true) {
@@ -608,8 +613,8 @@ static void ZC_LoadParams()
struct timeval tv_start, tv_end;
float elapsed;
boost::filesystem::path pk_path = ZC_GetParamsDir() / "z9-proving.key";
boost::filesystem::path vk_path = ZC_GetParamsDir() / "z9-verifying.key";
boost::filesystem::path pk_path = ZC_GetParamsDir() / "beta2-proving.key";
boost::filesystem::path vk_path = ZC_GetParamsDir() / "beta2-verifying.key";
pzcashParams = ZCJoinSplit::Unopened();