Skip to content

Clone v0.19 libconsensus sources. #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 28, 2019
Merged

Clone v0.19 libconsensus sources. #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf7bd24
Set --enable-endomorphism by default (regenerated).
evoskuil Oct 28, 2019
a825c91
Update libsecp256k1 nuget dependency version (msvc).
evoskuil Oct 28, 2019
38f2ae8
Clone v0.19 libconsensus sources.
evoskuil Oct 28, 2019
c54a2ea
Regenerate artifacts for libconsensus v0.19 source file changes.
evoskuil Oct 28, 2019
955c2c6
Adapt libbitcoin-consensus wrapper to libconsensus interface change.
evoskuil Oct 28, 2019
bf3baf7
Update to latest libsecp256k1.
evoskuil Oct 28, 2019
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
6 changes: 4 additions & 2 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ src_libbitcoin_consensus_la_CPPFLAGS = -I${srcdir}/include -I${srcdir}/src -I${s
src_libbitcoin_consensus_la_LIBADD = ${secp256k1_LIBS}
src_libbitcoin_consensus_la_SOURCES = \
src/clone/amount.h \
src/clone/attributes.h \
src/clone/hash.cpp \
src/clone/hash.h \
src/clone/prevector.h \
src/clone/pubkey.cpp \
src/clone/pubkey.h \
src/clone/serialize.h \
src/clone/span.h \
src/clone/tinyformat.h \
src/clone/uint256.cpp \
src/clone/uint256.h \
src/clone/utilstrencodings.cpp \
src/clone/utilstrencodings.h \
src/clone/version.h \
src/clone/compat/byteswap.h \
src/clone/compat/endian.h \
Expand All @@ -68,6 +68,8 @@ src_libbitcoin_consensus_la_SOURCES = \
src/clone/script/script.cpp \
src/clone/script/script.h \
src/clone/script/script_error.h \
src/clone/util/strencodings.cpp \
src/clone/util/strencodings.h \
src/consensus/consensus.cpp \
src/consensus/consensus.hpp

Expand Down
6 changes: 4 additions & 2 deletions builds/cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,17 +361,17 @@ endif()
#------------------------------------------------------------------------------
add_library( ${CANONICAL_LIB_NAME}
"../../src/clone/amount.h"
"../../src/clone/attributes.h"
"../../src/clone/hash.cpp"
"../../src/clone/hash.h"
"../../src/clone/prevector.h"
"../../src/clone/pubkey.cpp"
"../../src/clone/pubkey.h"
"../../src/clone/serialize.h"
"../../src/clone/span.h"
"../../src/clone/tinyformat.h"
"../../src/clone/uint256.cpp"
"../../src/clone/uint256.h"
"../../src/clone/utilstrencodings.cpp"
"../../src/clone/utilstrencodings.h"
"../../src/clone/version.h"
"../../src/clone/compat/byteswap.h"
"../../src/clone/compat/endian.h"
Expand All @@ -393,6 +393,8 @@ add_library( ${CANONICAL_LIB_NAME}
"../../src/clone/script/script.cpp"
"../../src/clone/script/script.h"
"../../src/clone/script/script_error.h"
"../../src/clone/util/strencodings.cpp"
"../../src/clone/util/strencodings.h"
"../../src/consensus/consensus.cpp"
"../../src/consensus/consensus.hpp" )

Expand Down
4 changes: 2 additions & 2 deletions builds/msvc/vs2013/libbitcoin-consensus-test/libbitcoin-consensus-test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,15 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
<ImportGroup Label="ExtensionSettings">
<Import Project="$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets')" />
<Import Project="$(NuGetPackageRoot)boost.1.57.0.0\build\native\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.57.0.0\build\native\boost.targets')" />
<Import Project="$(NuGetPackageRoot)boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.57.0.0\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.57.0.0\build\native\boost.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets'))" />
</Target>
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2013/libbitcoin-consensus-test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
|
-->
<packages>
<package id="secp256k1_vc120" version="0.1.0.16" targetFramework="Native" />
<package id="secp256k1_vc120" version="0.1.0.17" targetFramework="Native" />
<package id="boost" version="1.57.0.0" targetFramework="Native" />
<package id="boost_unit_test_framework-vc120" version="1.57.0.0" targetFramework="Native" />
</packages>
10 changes: 6 additions & 4 deletions builds/msvc/vs2013/libbitcoin-consensus/libbitcoin-consensus.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<ClCompile Include="..\..\..\..\src\clone\script\interpreter.cpp" />
<ClCompile Include="..\..\..\..\src\clone\script\script.cpp" />
<ClCompile Include="..\..\..\..\src\clone\uint256.cpp" />
<ClCompile Include="..\..\..\..\src\clone\utilstrencodings.cpp" />
<ClCompile Include="..\..\..\..\src\clone\util\strencodings.cpp" />
<ClCompile Include="..\..\..\..\src\consensus\consensus.cpp" />
</ItemGroup>
<ItemGroup>
Expand All @@ -93,6 +93,7 @@
<ClInclude Include="..\..\..\..\include\bitcoin\consensus\export.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\consensus\version.hpp" />
<ClInclude Include="..\..\..\..\src\clone\amount.h" />
<ClInclude Include="..\..\..\..\src\clone\attributes.h" />
<ClInclude Include="..\..\..\..\src\clone\compat\byteswap.h" />
<ClInclude Include="..\..\..\..\src\clone\compat\endian.h" />
<ClInclude Include="..\..\..\..\src\clone\crypto\common.h" />
Expand All @@ -109,9 +110,10 @@
<ClInclude Include="..\..\..\..\src\clone\script\script.h" />
<ClInclude Include="..\..\..\..\src\clone\script\script_error.h" />
<ClInclude Include="..\..\..\..\src\clone\serialize.h" />
<ClInclude Include="..\..\..\..\src\clone\span.h" />
<ClInclude Include="..\..\..\..\src\clone\tinyformat.h" />
<ClInclude Include="..\..\..\..\src\clone\uint256.h" />
<ClInclude Include="..\..\..\..\src\clone\utilstrencodings.h" />
<ClInclude Include="..\..\..\..\src\clone\util\strencodings.h" />
<ClInclude Include="..\..\..\..\src\clone\version.h" />
<ClInclude Include="..\..\..\..\src\consensus\consensus.hpp" />
<ClInclude Include="..\..\resource.h" />
Expand All @@ -125,12 +127,12 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
<ImportGroup Label="ExtensionSettings">
<Import Project="$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets'))" />
</Target>
</Project>
25 changes: 17 additions & 8 deletions builds/msvc/vs2013/libbitcoin-consensus/libbitcoin-consensus.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="include">
<UniqueIdentifier>{6C521D95-00CE-4120-0000-000000000007}</UniqueIdentifier>
<UniqueIdentifier>{6C521D95-00CE-4120-0000-000000000008}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin">
<UniqueIdentifier>{6C521D95-00CE-4120-0000-000000000008}</UniqueIdentifier>
<UniqueIdentifier>{6C521D95-00CE-4120-0000-000000000009}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\consensus">
<UniqueIdentifier>{6C521D95-00CE-4120-0000-000000000009}</UniqueIdentifier>
<UniqueIdentifier>{6C521D95-00CE-4120-0000-00000000000A}</UniqueIdentifier>
</Filter>
<Filter Include="resource">
<UniqueIdentifier>{6C521D95-00CE-4120-0000-00000000000A}</UniqueIdentifier>
<UniqueIdentifier>{6C521D95-00CE-4120-0000-00000000000B}</UniqueIdentifier>
</Filter>
<Filter Include="src">
<UniqueIdentifier>{6C521D95-00CE-4120-0000-000000000000}</UniqueIdentifier>
Expand All @@ -37,6 +37,9 @@
<Filter Include="src\clone\script">
<UniqueIdentifier>{6C521D95-00CE-4120-0000-000000000006}</UniqueIdentifier>
</Filter>
<Filter Include="src\clone\util">
<UniqueIdentifier>{6C521D95-00CE-4120-0000-000000000007}</UniqueIdentifier>
</Filter>
<Filter Include="src\consensus">
<UniqueIdentifier>{6C521D95-00CE-4120-0000-000000000002}</UniqueIdentifier>
</Filter>
Expand Down Expand Up @@ -75,8 +78,8 @@
<ClCompile Include="..\..\..\..\src\clone\uint256.cpp">
<Filter>src\clone</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\clone\utilstrencodings.cpp">
<Filter>src\clone</Filter>
<ClCompile Include="..\..\..\..\src\clone\util\strencodings.cpp">
<Filter>src\clone\util</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\consensus\consensus.cpp">
<Filter>src\consensus</Filter>
Expand All @@ -98,6 +101,9 @@
<ClInclude Include="..\..\..\..\src\clone\amount.h">
<Filter>src\clone</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\clone\attributes.h">
<Filter>src\clone</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\clone\compat\byteswap.h">
<Filter>src\clone\compat</Filter>
</ClInclude>
Expand Down Expand Up @@ -146,14 +152,17 @@
<ClInclude Include="..\..\..\..\src\clone\serialize.h">
<Filter>src\clone</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\clone\span.h">
<Filter>src\clone</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\clone\tinyformat.h">
<Filter>src\clone</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\clone\uint256.h">
<Filter>src\clone</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\clone\utilstrencodings.h">
<Filter>src\clone</Filter>
<ClInclude Include="..\..\..\..\src\clone\util\strencodings.h">
<Filter>src\clone\util</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\clone\version.h">
<Filter>src\clone</Filter>
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2013/libbitcoin-consensus/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
|
-->
<packages>
<package id="secp256k1_vc120" version="0.1.0.16" targetFramework="Native" />
<package id="secp256k1_vc120" version="0.1.0.17" targetFramework="Native" />
</packages>
4 changes: 2 additions & 2 deletions builds/msvc/vs2015/libbitcoin-consensus-test/libbitcoin-consensus-test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,15 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
<ImportGroup Label="ExtensionSettings">
<Import Project="$(NuGetPackageRoot)secp256k1-vc140.0.1.0.16\build\native\secp256k1-vc140.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1-vc140.0.1.0.16\build\native\secp256k1-vc140.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1-vc140.0.1.0.17\build\native\secp256k1-vc140.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1-vc140.0.1.0.17\build\native\secp256k1-vc140.targets')" />
<Import Project="$(NuGetPackageRoot)boost.1.64.0.0\build\native\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.64.0.0\build\native\boost.targets')" />
<Import Project="$(NuGetPackageRoot)boost_unit_test_framework-vc140.1.64.0.0\build\native\boost_unit_test_framework-vc140.targets" Condition="Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc140.1.64.0.0\build\native\boost_unit_test_framework-vc140.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1-vc140.0.1.0.16\build\native\secp256k1-vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1-vc140.0.1.0.16\build\native\secp256k1-vc140.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1-vc140.0.1.0.17\build\native\secp256k1-vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1-vc140.0.1.0.17\build\native\secp256k1-vc140.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.64.0.0\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.64.0.0\build\native\boost.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc140.1.64.0.0\build\native\boost_unit_test_framework-vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_unit_test_framework-vc140.1.64.0.0\build\native\boost_unit_test_framework-vc140.targets'))" />
</Target>
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/vs2015/libbitcoin-consensus-test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
|
-->
<packages>
<package id="secp256k1-vc140" version="0.1.0.16" targetFramework="Native" />
<package id="secp256k1-vc140" version="0.1.0.17" targetFramework="Native" />
<package id="boost" version="1.64.0.0" targetFramework="Native" />
<package id="boost_unit_test_framework-vc140" version="1.64.0.0" targetFramework="Native" />
</packages>
10 changes: 6 additions & 4 deletions builds/msvc/vs2015/libbitcoin-consensus/libbitcoin-consensus.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<ClCompile Include="..\..\..\..\src\clone\script\interpreter.cpp" />
<ClCompile Include="..\..\..\..\src\clone\script\script.cpp" />
<ClCompile Include="..\..\..\..\src\clone\uint256.cpp" />
<ClCompile Include="..\..\..\..\src\clone\utilstrencodings.cpp" />
<ClCompile Include="..\..\..\..\src\clone\util\strencodings.cpp" />
<ClCompile Include="..\..\..\..\src\consensus\consensus.cpp" />
</ItemGroup>
<ItemGroup>
Expand All @@ -93,6 +93,7 @@
<ClInclude Include="..\..\..\..\include\bitcoin\consensus\export.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\consensus\version.hpp" />
<ClInclude Include="..\..\..\..\src\clone\amount.h" />
<ClInclude Include="..\..\..\..\src\clone\attributes.h" />
<ClInclude Include="..\..\..\..\src\clone\compat\byteswap.h" />
<ClInclude Include="..\..\..\..\src\clone\compat\endian.h" />
<ClInclude Include="..\..\..\..\src\clone\crypto\common.h" />
Expand All @@ -109,9 +110,10 @@
<ClInclude Include="..\..\..\..\src\clone\script\script.h" />
<ClInclude Include="..\..\..\..\src\clone\script\script_error.h" />
<ClInclude Include="..\..\..\..\src\clone\serialize.h" />
<ClInclude Include="..\..\..\..\src\clone\span.h" />
<ClInclude Include="..\..\..\..\src\clone\tinyformat.h" />
<ClInclude Include="..\..\..\..\src\clone\uint256.h" />
<ClInclude Include="..\..\..\..\src\clone\utilstrencodings.h" />
<ClInclude Include="..\..\..\..\src\clone\util\strencodings.h" />
<ClInclude Include="..\..\..\..\src\clone\version.h" />
<ClInclude Include="..\..\..\..\src\consensus\consensus.hpp" />
<ClInclude Include="..\..\resource.h" />
Expand All @@ -125,12 +127,12 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
<ImportGroup Label="ExtensionSettings">
<Import Project="$(NuGetPackageRoot)secp256k1-vc140.0.1.0.16\build\native\secp256k1-vc140.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1-vc140.0.1.0.16\build\native\secp256k1-vc140.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1-vc140.0.1.0.17\build\native\secp256k1-vc140.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1-vc140.0.1.0.17\build\native\secp256k1-vc140.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1-vc140.0.1.0.16\build\native\secp256k1-vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1-vc140.0.1.0.16\build\native\secp256k1-vc140.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1-vc140.0.1.0.17\build\native\secp256k1-vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1-vc140.0.1.0.17\build\native\secp256k1-vc140.targets'))" />
</Target>
</Project>
Loading