Merge pull request #64 from ZclassicCommunity/update_boost

update boost to 1.80 and fetch params
ZclassicCommunity · Sep 26, 2022 · 06eb09f · 06eb09f
2 parents acb4b71 + 172674f
commit 06eb09f
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 8 deletions.
diff --git a/configure.ac b/configure.ac
@@ -736,7 +736,7 @@ fi
 # These packages don't provide pkgconfig config files across all
 # platforms, so we use older autoconf detection mechanisms:
 AC_CHECK_HEADER([gmp.h],,AC_MSG_ERROR(libgmp headers missing))
-AC_CHECK_LIB([gmp],[[__gmpn_sub_n]],GMP_LIBS=-lgmp, [AC_MSG_ERROR(libgmp missing)])
+AC_CHECK_LIB([gmp],[__gmpn_sub_n],GMP_LIBS=-lgmp, [AC_MSG_ERROR(libgmp missing)])
 
 AC_CHECK_HEADER([gmpxx.h],,AC_MSG_ERROR(libgmpxx headers missing))
 AC_CHECK_LIB([gmpxx],[main],GMPXX_LIBS=-lgmpxx, [AC_MSG_ERROR(libgmpxx missing)])

diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk
@@ -1,8 +1,8 @@
 package=boost
-$(package)_version=1_69_0
-$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/1.69.0/source
+$(package)_version=1_80_0
+$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source
 $(package)_file_name=$(package)_$($(package)_version).tar.bz2
-$(package)_sha256_hash=8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406
+$(package)_sha256_hash=1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0
 
 define $(package)_set_vars
 $(package)_config_opts_release=variant=release

diff --git a/src/crypto/equihash.h b/src/crypto/equihash.h
@@ -17,6 +17,7 @@
 #include <memory>
 #include <set>
 #include <vector>
+#include <stdexcept>
 
 #include <boost/static_assert.hpp>
 

diff --git a/src/gtest/test_deprecation.cpp b/src/gtest/test_deprecation.cpp
@@ -9,10 +9,12 @@
 #include "util.h"
 #include "utilstrencodings.h"
 
+
 #include <boost/filesystem/operations.hpp>
 #include <fstream>
 
 using ::testing::StrictMock;
+using namespace boost::placeholders;
 
 static const std::string CLIENT_VERSION_STR = FormatVersion(CLIENT_VERSION);
 extern std::atomic<bool> fRequestShutdown;

diff --git a/src/httpserver.cpp b/src/httpserver.cpp
@@ -12,6 +12,7 @@
 #include "sync.h"
 #include "ui_interface.h"
 
+#include <deque>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/scheduler.cpp b/src/scheduler.cpp
@@ -7,7 +7,7 @@
 #include "reverselock.h"
 
 #include <assert.h>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <utility>
 
 CScheduler::CScheduler() : nThreadsServicingQueue(0), stopRequested(false), stopWhenEmpty(false)

diff --git a/src/test/scheduler_tests.cpp b/src/test/scheduler_tests.cpp
@@ -7,7 +7,7 @@
 
 #include "test/test_bitcoin.h"
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <boost/random/uniform_int_distribution.hpp>
 #include <boost/thread.hpp>

diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
@@ -5,6 +5,8 @@
 
 #include "validationinterface.h"
 
+using namespace boost::placeholders;
+
 static CMainSignals g_signals;
 
 CMainSignals& GetMainSignals()

diff --git a/zcutil/fetch-params.sh b/zcutil/fetch-params.sh
@@ -8,7 +8,7 @@ else
     PARAMS_DIR="$HOME/.zcash-params"
 fi
 
-SPROUT_PKEY_NAME='sprout-proving.key'
+SPROUT_PKEY_NAME='sprout-proving.key.deprecated-sworn-elves'
 SPROUT_VKEY_NAME='sprout-verifying.key'
 SAPLING_SPEND_NAME='sapling-spend.params'
 SAPLING_OUTPUT_NAME='sapling-output.params'
@@ -197,7 +197,7 @@ EOF
     cd "$PARAMS_DIR"
 
     # Sprout parameters:
-    fetch_params "$SPROUT_PKEY_NAME" "$PARAMS_DIR/$SPROUT_PKEY_NAME" "8bc20a7f013b2b58970cddd2e7ea028975c88ae7ceb9259a5344a16bc2c0eef7"
+    fetch_params "$SPROUT_PKEY_NAME" "$PARAMS_DIR/sprout-proving.key" "8bc20a7f013b2b58970cddd2e7ea028975c88ae7ceb9259a5344a16bc2c0eef7"
     fetch_params "$SPROUT_VKEY_NAME" "$PARAMS_DIR/$SPROUT_VKEY_NAME" "4bd498dae0aacfd8e98dc306338d017d9c08dd0918ead18172bd0aec2fc5df82"
 
     # Sapling parameters: