Skip to content

Commit bc15606

Browse files
evoskuilevoskuil
authored
Merge pull request #1771 from evoskuil/master
Regenerate artifacts (bump secp256k1 versions).
2 parents c83554e + 12b2201 commit bc15606

File tree

12 files changed

+24
-17
lines changed

12 files changed

+24
-17
lines changed

‎builds/cmake/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ endif()
376376

377377
# Find secp256k1
378378
#------------------------------------------------------------------------------
379-
find_package( Secp256K1 0.1.0.20 REQUIRED )
379+
find_package( Secp256K1 0.5.1.0 REQUIRED )
380380

381381
# Define project common includes for build.
382382
#------------------------------------------------------------------------------

‎builds/msvc/vs2022/libbitcoin-system-examples/libbitcoin-system-examples.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
<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')" />
139139
<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')" />
140140
<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')" />
141-
<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')" />
141+
<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')" />
142142
</ImportGroup>
143143
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
144144
<PropertyGroup>
@@ -150,7 +150,7 @@
150150
<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'))" />
151151
<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'))" />
152152
<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'))" />
153-
<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'))" />
153+
<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'))" />
154154
</Target>
155155
<ItemGroup>
156156
<ProjectReference Include="..\libbitcoin-system\libbitcoin-system.vcxproj">

‎builds/msvc/vs2022/libbitcoin-system-examples/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
1313
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
1414
<package id="boost_url-vc143" version="1.86.0" targetFramework="Native" />
15-
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
15+
<package id="secp256k1_vc143" version="0.6.1" targetFramework="Native" />
1616
</packages>

‎builds/msvc/vs2022/libbitcoin-system-test/libbitcoin-system-test.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@
409409
<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')" />
410410
<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')" />
411411
<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')" />
412-
<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')" />
412+
<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')" />
413413
<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')" />
414414
</ImportGroup>
415415
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -422,7 +422,7 @@
422422
<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'))" />
423423
<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'))" />
424424
<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'))" />
425-
<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'))" />
425+
<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'))" />
426426
<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'))" />
427427
</Target>
428428
<ItemGroup>

‎builds/msvc/vs2022/libbitcoin-system-test/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
1313
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
1414
<package id="boost_url-vc143" version="1.86.0" targetFramework="Native" />
15-
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
15+
<package id="secp256k1_vc143" version="0.6.1" targetFramework="Native" />
1616
<package id="boost_unit_test_framework-vc143" version="1.86.0" targetFramework="Native" />
1717
</packages>

‎builds/msvc/vs2022/libbitcoin-system/libbitcoin-system.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@
705705
<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')" />
706706
<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')" />
707707
<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')" />
708-
<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')" />
708+
<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')" />
709709
</ImportGroup>
710710
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
711711
<PropertyGroup>
@@ -717,7 +717,7 @@
717717
<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'))" />
718718
<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'))" />
719719
<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'))" />
720-
<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'))" />
720+
<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'))" />
721721
</Target>
722722
<ItemGroup>
723723
<Natvis Include="..\..\debug.natvis" />

‎builds/msvc/vs2022/libbitcoin-system/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
1313
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
1414
<package id="boost_url-vc143" version="1.86.0" targetFramework="Native" />
15-
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
15+
<package id="secp256k1_vc143" version="0.6.1" targetFramework="Native" />
1616
</packages>

‎configure.ac‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -485,13 +485,13 @@ AS_CASE([${host_os}],
485485

486486
AC_MSG_NOTICE([dl_LIBS : ${dl_LIBS}])
487487

488-
# Require secp256k1 of at least version 0.1.0.20 and output ${secp256k1_CPPFLAGS/LIBS/PKG}.
488+
# Require secp256k1 of at least version 0.5.1.0 and output ${secp256k1_CPPFLAGS/LIBS/PKG}.
489489
#------------------------------------------------------------------------------
490-
PKG_CHECK_MODULES([secp256k1], [libsecp256k1 >= 0.1.0.20],
491-
[secp256k1_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libsecp256k1 >= 0.1.0.20" 2>/dev/null`"
492-
secp256k1_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libsecp256k1 >= 0.1.0.20" 2>/dev/null`"],
493-
[AC_MSG_ERROR([libsecp256k1 >= 0.1.0.20 is required but was not found.])])
494-
AC_SUBST([secp256k1_PKG], ['libsecp256k1 >= 0.1.0.20'])
490+
PKG_CHECK_MODULES([secp256k1], [libsecp256k1 >= 0.5.1.0],
491+
[secp256k1_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libsecp256k1 >= 0.5.1.0" 2>/dev/null`"
492+
secp256k1_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libsecp256k1 >= 0.5.1.0" 2>/dev/null`"],
493+
[AC_MSG_ERROR([libsecp256k1 >= 0.5.1.0 is required but was not found.])])
494+
AC_SUBST([secp256k1_PKG], ['libsecp256k1 >= 0.5.1.0'])
495495
AC_SUBST([secp256k1_CPPFLAGS], [${secp256k1_CFLAGS}])
496496
AS_IF([test x${secp256k1_INCLUDEDIR} != "x"],
497497
[AC_SUBST([secp256k1_ISYS_CPPFLAGS], ["-isystem${secp256k1_INCLUDEDIR} ${secp256k1_OTHER_CFLAGS}"])],

‎include/bitcoin/system.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
#include <bitcoin/system/config/transaction.hpp>
8787
#include <bitcoin/system/config/url.hpp>
8888
#include <bitcoin/system/config/utilities.hpp>
89+
#include <bitcoin/system/config/version.hpp>
8990
#include <bitcoin/system/crypto/aes256.hpp>
9091
#include <bitcoin/system/crypto/crypto.hpp>
9192
#include <bitcoin/system/crypto/der_parser.hpp>

‎include/bitcoin/system/allocator.hpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,12 @@ class allocator
118118
auto ptr = allocate_object<Type>();
119119
construct_guard<Type> guard{ arena_, ptr };
120120
construct<Type>(ptr, std::forward<Args>(args)...);
121+
122+
// Bogus warning (under LTCG only).
123+
BC_PUSH_WARNING(UNREACHABLE_CODE)
121124
guard.arena_ = nullptr;
125+
BC_POP_WARNING()
126+
122127
return ptr;
123128
}
124129

0 commit comments

Comments
 (0)