From 25d4b5e081a940975de357ada7e8d3af99b41f45 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Wed, 7 Aug 2019 17:39:32 -0700 Subject: [PATCH] Teach SD to look in various places for sapling params --- src/connection.cpp | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/src/connection.cpp b/src/connection.cpp index 046bd51..d6e13b6 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -574,14 +574,31 @@ QString ConnectionLoader::zcashParamsDir() { bool ConnectionLoader::verifyParams() { QDir paramsDir(zcashParamsDir()); - qDebug() << "Verifying param files exist"; + qDebug() << "Verifying sapling param files exist"; - if (!QFile(paramsDir.filePath("sapling-output.params")).exists()) return false; - if (!QFile(paramsDir.filePath("sapling-spend.params")).exists()) return false; - qDebug() << "All param files found!"; + if( QFile( QDir(".").filePath("sapling-output.params") ).exists() && QFile( QDir(".").filePath("sapling-output.params") ).exists() ) { + qDebug() << "Found params in ."; + return true; + } - return true; + if( QFile( QDir("..").filePath("sapling-output.params") ).exists() && QFile( QDir("..").filePath("sapling-output.params") ).exists() ) { + qDebug() << "Found params in .."; + return true; + } + + if( QFile( QDir("..").filePath("hush3/sapling-output.params") ).exists() && QFile( QDir("..").filePath("hush3/sapling-output.params") ).exists() ) { + qDebug() << "Found params in ../hush3"; + return true; + } + + if (QFile(paramsDir.filePath("sapling-output.params")).exists() && QFile(paramsDir.filePath("sapling-spend.params")).exists()) { + qDebug() << "Found params in " << paramsDir; + return true; + } + + qDebug() << "Did not find Sapling params!"; + return false; } /**