Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion builds/cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ endif()

# Find secp256k1
#------------------------------------------------------------------------------
find_package( Secp256K1 0.1.0.20 REQUIRED )
find_package( Secp256K1 0.5.1.0 REQUIRED )

# Define project common includes for build.
#------------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
<Import Project="$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
Expand All @@ -150,7 +150,7 @@
<Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets'))" />
</Target>
<ItemGroup>
<ProjectReference Include="..\libbitcoin-system\libbitcoin-system.vcxproj">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
<package id="boost_url-vc143" version="1.86.0" targetFramework="Native" />
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
<package id="secp256k1_vc143" version="0.6.1" targetFramework="Native" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@
<Import Project="$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Expand All @@ -422,7 +422,7 @@
<Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets'))" />
</Target>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2022/libbitcoin-system-test/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
<package id="boost_url-vc143" version="1.86.0" targetFramework="Native" />
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
<package id="secp256k1_vc143" version="0.6.1" targetFramework="Native" />
<package id="boost_unit_test_framework-vc143" version="1.86.0" targetFramework="Native" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@
<Import Project="$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
Expand All @@ -717,7 +717,7 @@
<Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.6.1\build\native\secp256k1_vc143.targets'))" />
</Target>
<ItemGroup>
<Natvis Include="..\..\debug.natvis" />
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2022/libbitcoin-system/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
<package id="boost_url-vc143" version="1.86.0" targetFramework="Native" />
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
<package id="secp256k1_vc143" version="0.6.1" targetFramework="Native" />
</packages>
12 changes: 6 additions & 6 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -485,13 +485,13 @@ AS_CASE([${host_os}],

AC_MSG_NOTICE([dl_LIBS : ${dl_LIBS}])

# Require secp256k1 of at least version 0.1.0.20 and output ${secp256k1_CPPFLAGS/LIBS/PKG}.
# Require secp256k1 of at least version 0.5.1.0 and output ${secp256k1_CPPFLAGS/LIBS/PKG}.
#------------------------------------------------------------------------------
PKG_CHECK_MODULES([secp256k1], [libsecp256k1 >= 0.1.0.20],
[secp256k1_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libsecp256k1 >= 0.1.0.20" 2>/dev/null`"
secp256k1_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libsecp256k1 >= 0.1.0.20" 2>/dev/null`"],
[AC_MSG_ERROR([libsecp256k1 >= 0.1.0.20 is required but was not found.])])
AC_SUBST([secp256k1_PKG], ['libsecp256k1 >= 0.1.0.20'])
PKG_CHECK_MODULES([secp256k1], [libsecp256k1 >= 0.5.1.0],
[secp256k1_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libsecp256k1 >= 0.5.1.0" 2>/dev/null`"
secp256k1_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libsecp256k1 >= 0.5.1.0" 2>/dev/null`"],
[AC_MSG_ERROR([libsecp256k1 >= 0.5.1.0 is required but was not found.])])
AC_SUBST([secp256k1_PKG], ['libsecp256k1 >= 0.5.1.0'])
AC_SUBST([secp256k1_CPPFLAGS], [${secp256k1_CFLAGS}])
AS_IF([test x${secp256k1_INCLUDEDIR} != "x"],
[AC_SUBST([secp256k1_ISYS_CPPFLAGS], ["-isystem${secp256k1_INCLUDEDIR} ${secp256k1_OTHER_CFLAGS}"])],
Expand Down
1 change: 1 addition & 0 deletions include/bitcoin/system.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
#include <bitcoin/system/config/transaction.hpp>
#include <bitcoin/system/config/url.hpp>
#include <bitcoin/system/config/utilities.hpp>
#include <bitcoin/system/config/version.hpp>
#include <bitcoin/system/crypto/aes256.hpp>
#include <bitcoin/system/crypto/crypto.hpp>
#include <bitcoin/system/crypto/der_parser.hpp>
Expand Down
5 changes: 5 additions & 0 deletions include/bitcoin/system/allocator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,12 @@ class allocator
auto ptr = allocate_object<Type>();
construct_guard<Type> guard{ arena_, ptr };
construct<Type>(ptr, std::forward<Args>(args)...);

// Bogus warning (under LTCG only).
BC_PUSH_WARNING(UNREACHABLE_CODE)
guard.arena_ = nullptr;
BC_POP_WARNING()

return ptr;
}

Expand Down
1 change: 1 addition & 0 deletions include/bitcoin/system/warnings.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
#define THROW_FROM_NOEXCEPT 4297
#define TRUNCATED_CONSTANT 4310
#define LOCAL_VARIABLE_NOT_INITIALIZED 4700
#define UNREACHABLE_CODE 4702
#define NOT_INLINED 4714
#define DISCARDING_NON_DISCARDABLE 4834

Expand Down
2 changes: 1 addition & 1 deletion libbitcoin-system.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Version: @PACKAGE_VERSION@
#==============================================================================
# Dependencies that publish package configuration.
#------------------------------------------------------------------------------
Requires: @icu_i18n_PKG@ libsecp256k1 >= 0.1.0.20
Requires: @icu_i18n_PKG@ libsecp256k1 >= 0.5.1.0

# Include directory and any other required compiler flags.
#------------------------------------------------------------------------------
Expand Down
Loading