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

Merge branch 'duke' into delete_verus

Browse Source
This commit is contained in:
Jonathan "Duke" Leto
2019-11-26 19:41:56 -08:00
parent c342938f59 16ca87226b
commit d7d4d3879b
4 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/init.cpp
View File

@@ -809,11 +809,13 @@ static void ZC_LoadParams(
struct timeval tv_start, tv_end;
float elapsed;
bool found = false;
char cwd[1024];
getcwd(cwd, sizeof(cwd));
LogPrintf("Looking for sapling params, PWD=%s\n", cwd);
// Some people have previous partial downloads of zcash params, so check that last
// Sapling Param Search path: . /usr/share/hush .. ../hush3 ./Contents/MacOS/ ~/.zcash-params
LogPrintf("Looking for sapling params...");
gettimeofday(&tv_start, 0);
// PWD
@@ -855,11 +857,21 @@ static void ZC_LoadParams(
}
if (!found) {
// DMG Support: Apple just has to do things differently...
sapling_spend = boost::filesystem::path("Contents/MacOS") / "hush3" / "sapling-spend.params";
sapling_output = boost::filesystem::path("Contents/MacOS") / "hush3" / "sapling-output.params";
// This will only work when SD is installed into /Applications, which is the only supported method
sapling_spend = boost::filesystem::path("/Applications/silentdragon.app/Contents/MacOS") / "sapling-spend.params";
sapling_output = boost::filesystem::path("/Applications/silentdragon.app/Contents/MacOS") / "sapling-output.params";
if (files_exist(sapling_spend, sapling_output)) {
fprintf(stderr,"Found sapling params in ../Contents/MacOS\n");
fprintf(stderr,"Found sapling params in /Applications/Contents/MacOS\n");
found = true;
}
}
if (!found) {
// DMG Support: Apple just has to do things differently...
sapling_spend = boost::filesystem::path("./silentdragon.app/Contents/MacOS") / "sapling-spend.params";
sapling_output = boost::filesystem::path("./silentdragon.app/Contents/MacOS") / "sapling-output.params";
if (files_exist(sapling_spend, sapling_output)) {
fprintf(stderr,"Found sapling params in /Applications/Contents/MacOS\n");
found = true;
}
}