Browse Source

Fix some bugs in mac param support

pull/102/head
Jonathan "Duke" Leto 5 years ago
parent
commit
4470c4fe09
  1. 16
      src/connection.cpp

16
src/connection.cpp

@ -215,13 +215,13 @@ void ConnectionLoader::createZcashConf() {
}
void ConnectionLoader::downloadParams(std::function<void(void)> cb) {
void ConnectionLoader::downloadParams(std::function<void(void)> cb) {
main->logger->write("Adding params to download queue");
// Add all the files to the download queue
downloadQueue = new QQueue<QUrl>();
client = new QNetworkAccessManager(main);
//TODO: we never execute this
//Currently we fallback to this in rare edgecases, it's not normally executed
downloadQueue->enqueue(QUrl("https://z.cash/downloads/sapling-output.params"));
downloadQueue->enqueue(QUrl("https://z.cash/downloads/sapling-spend.params"));
@ -609,9 +609,15 @@ bool ConnectionLoader::verifyParams() {
return true;
}
// this is to support hushd inside a .dmg file, where the binaries are not at the root directory, but they are executed from the root dir of the .dmg
if( QFile( QDir("..").filePath("./silentdragon.app/Contents/MacOS/sapling-output.params") ).exists() && QFile( QDir("..").filePath("./silentdragon.app/Contents/MacOS/hush3/sapling-spend.params") ).exists() ) {
qDebug() << "Found params in ../silentdragon.app/Contents/MacOS";
// this is to support SD on mac in /Applications1
if( QFile( QDir("/Applications").filePath("silentdragon.app/Contents/MacOS/sapling-output.params") ).exists() && QFile( QDir("/Applications").filePath("./silentdragon.app/Contents/MacOS/sapling-spend.params") ).exists() ) {
qDebug() << "Found params in /Applications/silentdragon.app/Contents/MacOS";
return true;
}
// this is to support SD on mac inside a DMG
if( QFile( QDir("./").filePath("silentdragon.app/Contents/MacOS/sapling-output.params") ).exists() && QFile( QDir("./").filePath("./silentdragon.app/Contents/MacOS/sapling-spend.params") ).exists() ) {
qDebug() << "Found params in ./silentdragon.app/Contents/MacOS";
return true;
}

Loading…
Cancel
Save