From 71756ca5ec2ab1d7afea6a2f9bb4c3e165a51450 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Fri, 22 Nov 2019 22:57:22 -0800 Subject: [PATCH 1/5] Show PWD in debug.log to help debug DMG param location --- src/init.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index 9b65b0b3e..afd77535b 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -810,11 +810,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 @@ -857,8 +859,8 @@ 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"; + sapling_spend = boost::filesystem::path("silentdragon.app/Contents/MacOS") / "hush3" / "sapling-spend.params"; + sapling_output = boost::filesystem::path("silentdragon.app/Contents/MacOS") / "hush3" / "sapling-output.params"; if (files_exist(sapling_spend, sapling_output)) { fprintf(stderr,"Found sapling params in ../Contents/MacOS\n"); found = true; From 7d9ddc2a1c313e8f84e03c9ea59c1cf26358b142 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Sun, 24 Nov 2019 09:09:22 -0800 Subject: [PATCH 2/5] Fix DMG support and try to support installation into /Applications --- src/init.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index afd77535b..82320cfbf 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -858,11 +858,21 @@ static void ZC_LoadParams( } if (!found) { - // DMG Support: Apple just has to do things differently... - sapling_spend = boost::filesystem::path("silentdragon.app/Contents/MacOS") / "hush3" / "sapling-spend.params"; - sapling_output = boost::filesystem::path("silentdragon.app/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; } } From 97f1e68b7da7fca3487a09aca15db8bbf21c1d00 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Mon, 25 Nov 2019 15:18:27 -0800 Subject: [PATCH 3/5] Update libsodium url --- depends/packages/libsodium.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depends/packages/libsodium.mk b/depends/packages/libsodium.mk index 179ebe86c..df1ac5f32 100644 --- a/depends/packages/libsodium.mk +++ b/depends/packages/libsodium.mk @@ -1,6 +1,6 @@ package=libsodium $(package)_version=1.0.15 -$(package)_download_path=https://download.libsodium.org/libsodium/releases/old +$(package)_download_path=https://download.libsodium.org/libsodium/releases/old/unsupported $(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_sha256_hash=fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4 $(package)_dependencies= From 643e2aeddefcf62521badb4260ea7f8454d760e4 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Mon, 25 Nov 2019 16:28:56 -0800 Subject: [PATCH 4/5] bump version to 3.2.2 --- configure.ac | 2 +- src/clientversion.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 6a3e0534f..b1ce69a7e 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 3) define(_CLIENT_VERSION_MINOR, 2) -define(_CLIENT_VERSION_REVISION, 1) +define(_CLIENT_VERSION_REVISION, 2) define(_CLIENT_VERSION_BUILD, 50) define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50))) define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1))) diff --git a/src/clientversion.h b/src/clientversion.h index 2cb13cb2e..0a8fa3d32 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -34,7 +34,7 @@ // Must be kept in sync with configure.ac ! #define CLIENT_VERSION_MAJOR 3 #define CLIENT_VERSION_MINOR 2 -#define CLIENT_VERSION_REVISION 1 +#define CLIENT_VERSION_REVISION 2 #define CLIENT_VERSION_BUILD 50 //! Set to true for release, false for prerelease or test build From ebec245da701fe9f999877f59de6a6f0741c8aa7 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Mon, 25 Nov 2019 16:30:24 -0800 Subject: [PATCH 5/5] Upgrade to latest libsodium --- depends/packages/libsodium.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/depends/packages/libsodium.mk b/depends/packages/libsodium.mk index df1ac5f32..d57e9886a 100644 --- a/depends/packages/libsodium.mk +++ b/depends/packages/libsodium.mk @@ -1,8 +1,8 @@ package=libsodium -$(package)_version=1.0.15 -$(package)_download_path=https://download.libsodium.org/libsodium/releases/old/unsupported +$(package)_version=1.0.18 +$(package)_download_path=https://download.libsodium.org/libsodium/releases $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4 +$(package)_sha256_hash=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1 $(package)_dependencies= $(package)_config_opts=