From 7eb4ea38df6bc09dbedd0484ec427c872252b53f Mon Sep 17 00:00:00 2001 From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com> Date: Fri, 22 Apr 2022 15:02:44 -0400 Subject: [PATCH 1/3] replace old libsecp256k1 fork with upstream & remove gmp dep --- CMakeLists.txt | 4 ++-- CMakeModules/EosioTester.cmake.in | 1 - CMakeModules/EosioTesterBuild.cmake.in | 1 - README.md | 1 - libraries/chain/include/eosio/chain/types.hpp | 3 --- libraries/fc | 2 +- 6 files changed, 3 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c692597c7..5d3bb5733d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) @@ -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) diff --git a/CMakeModules/EosioTester.cmake.in b/CMakeModules/EosioTester.cmake.in index 9134d4e157..44c8e5fcbb 100644 --- a/CMakeModules/EosioTester.cmake.in +++ b/CMakeModules/EosioTester.cmake.in @@ -102,7 +102,6 @@ macro(add_eosio_test_executable test_name) ${libchainbase} ${libbuiltins} ${libsecp256k1} - @GMP_LIBRARIES@ ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} diff --git a/CMakeModules/EosioTesterBuild.cmake.in b/CMakeModules/EosioTesterBuild.cmake.in index 9ce4f8c654..d13e7312bf 100644 --- a/CMakeModules/EosioTesterBuild.cmake.in +++ b/CMakeModules/EosioTesterBuild.cmake.in @@ -100,7 +100,6 @@ macro(add_eosio_test_executable test_name) ${libchainbase} ${libbuiltins} ${libsecp256k1} - @GMP_LIBRARIES@ ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} diff --git a/README.md b/README.md index 2ad9eee65e..ecb118d961 100644 --- a/README.md +++ b/README.md @@ -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 \ diff --git a/libraries/chain/include/eosio/chain/types.hpp b/libraries/chain/include/eosio/chain/types.hpp index 61d3857b41..db0ab61ba2 100644 --- a/libraries/chain/include/eosio/chain/types.hpp +++ b/libraries/chain/include/eosio/chain/types.hpp @@ -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; diff --git a/libraries/fc b/libraries/fc index be72648bc6..3c1a3208b8 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit be72648bc6e11bf9718f3e89f435b551f145d0bf +Subproject commit 3c1a3208b865b46fcf4779100bd28ca4fdaaa621 From 3320b70d7bbac9dfe2748390d979d0d33aa02647 Mon Sep 17 00:00:00 2001 From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com> Date: Sat, 23 Apr 2022 16:54:05 -0400 Subject: [PATCH 2/3] bump fc submod to main --- libraries/fc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/fc b/libraries/fc index 3c1a3208b8..3add801cbe 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 3c1a3208b865b46fcf4779100bd28ca4fdaaa621 +Subproject commit 3add801cbe68314187b69106bd7a5f66fa34febd From 31e61b81c2433679fc402b9408651dbc94f8987d Mon Sep 17 00:00:00 2001 From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com> Date: Sun, 24 Apr 2022 00:04:10 -0400 Subject: [PATCH 3/3] bump fc submod to main --- libraries/fc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/fc b/libraries/fc index 3add801cbe..0d6491292b 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 3add801cbe68314187b69106bd7a5f66fa34febd +Subproject commit 0d6491292b6cf2b10b1eafb4d53a55604e639793