Skip to content
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

replace old libsecp256k1 fork with upstream & remove GMP dependency #128

Merged
merged 3 commits into from
Apr 24, 2022
Merged

replace old libsecp256k1 fork with upstream & remove GMP dependency #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7eb4ea3
replace old libsecp256k1 fork with upstream & remove gmp dep
spoonincode Apr 22, 2022
3320b70
bump fc submod to main
spoonincode Apr 23, 2022
31e61b8
bump fc submod to main
spoonincode Apr 24, 2022
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
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ configure_file(${CMAKE_SOURCE_DIR}/libraries/softfloat/COPYING.txt
${CMAKE_BINARY_DIR}/licenses/eosio/LICENSE.softfloat COPYONLY)
configure_file(${CMAKE_SOURCE_DIR}/libraries/wasm-jit/LICENSE
${CMAKE_BINARY_DIR}/licenses/eosio/LICENSE.wavm COPYONLY)
configure_file(${CMAKE_SOURCE_DIR}/libraries/fc/secp256k1/upstream/COPYING
configure_file(${CMAKE_SOURCE_DIR}/libraries/fc/secp256k1/secp256k1/COPYING
${CMAKE_BINARY_DIR}/licenses/eosio/LICENSE.secp256k1 COPYONLY)
configure_file(${CMAKE_SOURCE_DIR}/libraries/fc/include/fc/crypto/webauthn_json/license.txt
${CMAKE_BINARY_DIR}/licenses/eosio/LICENSE.rapidjson COPYONLY)
Expand All @@ -224,7 +224,7 @@ configure_file(${CMAKE_SOURCE_DIR}/libraries/eos-vm/LICENSE
install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ COMPONENT base)
install(FILES libraries/softfloat/COPYING.txt DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.softfloat COMPONENT base)
install(FILES libraries/wasm-jit/LICENSE DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.wavm COMPONENT base)
install(FILES libraries/fc/secp256k1/upstream/COPYING DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.secp256k1 COMPONENT base)
install(FILES libraries/fc/secp256k1/secp256k1/COPYING DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.secp256k1 COMPONENT base)
install(FILES libraries/fc/include/fc/crypto/webauthn_json/license.txt DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.rapidjson COMPONENT base)
install(FILES libraries/fc/src/network/LICENSE.go DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ COMPONENT base)
install(FILES libraries/yubihsm/LICENSE DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/licenses/eosio/ RENAME LICENSE.yubihsm COMPONENT base)
Expand Down
1 change: 0 additions & 1 deletion CMakeModules/EosioTester.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ macro(add_eosio_test_executable test_name)
${libchainbase}
${libbuiltins}
${libsecp256k1}
@GMP_LIBRARIES@

${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY}
Expand Down
1 change: 0 additions & 1 deletion CMakeModules/EosioTesterBuild.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ macro(add_eosio_test_executable test_name)
${libchainbase}
${libbuiltins}
${libsecp256k1}
@GMP_LIBRARIES@

${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY}
Expand Down
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ apt-get update && apt-get install \
jq \
libboost-all-dev \
libcurl4-openssl-dev \
libgmp-dev \
libssl-dev \
libtinfo5 \
libusb-1.0-0-dev \
Expand Down
3 changes: 0 additions & 3 deletions libraries/chain/include/eosio/chain/types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@ namespace eosio { namespace chain {
using fc::flat_multimap;
using fc::flat_set;
using std::variant;
using fc::ecc::range_proof_type;
using fc::ecc::range_proof_info;
using fc::ecc::commitment_type;

using public_key_type = fc::crypto::public_key;
using private_key_type = fc::crypto::private_key;
Expand Down
2 changes: 1 addition & 1 deletion libraries/fc
Open in desktop
Submodule fc updated 22 files
+3 −3 .gitmodules
+0 −64 CMakeModules/FindGMP.cmake
+0 −40 include/fc/crypto/elliptic.hpp
+0 −1 include/fc/crypto/elliptic_r1.hpp
+1 −0 include/fc/variant.hpp
+2 −0 include/fc/variant_object.hpp
+26 −30 secp256k1/CMakeLists.txt
+11 −0 secp256k1/config/libsecp256k1-config.h
+0 −21 secp256k1/config_with_gmp/libsecp256k1-config.h
+0 −20 secp256k1/config_without_gmp/libsecp256k1-config.h
+1 −0 secp256k1/secp256k1
+0 −1 secp256k1/upstream
+1 −1 src/crypto/_elliptic_impl_priv.hpp
+0 −9 src/crypto/elliptic_common.cpp
+13 −7 src/crypto/elliptic_impl_priv.cpp
+0 −9 src/crypto/elliptic_r1.cpp
+20 −127 src/crypto/elliptic_secp256k1.cpp
+31 −0 src/variant.cpp
+11 −0 src/variant_object.cpp
+1 −0 test/CMakeLists.txt
+4 −0 test/variant_estimated_size/CMakeLists.txt
+157 −0 test/variant_estimated_size/test_variant_estimated_size.cpp