Replace libwally with bitcoin core

Author: giahuy98

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "third_party/libwally-core"]
-	path = third_party/libwally-core
-	url = https://github.com/ElementsProject/libwally-core

CMakeLists.txt

@@ -10,28 +10,12 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 option(BUILD_TESTING "Build unit tests" OFF)
 
 if (ANDROID)
-    add_library(wally SHARED IMPORTED)
-    set_target_properties(wally PROPERTIES IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/third_party/libwally-core/release/lib/${ANDROID_ABI}/libwallycore.so")
-    set_target_properties(wally PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${PROJECT_SOURCE_DIR}/third_party/libwally-core/release/include")
 
 elseif(WIN32)
-    message(FATAL_ERROR "Not support yet!")
 elseif(IOS)
-    add_library(secp256k1 STATIC IMPORTED)
-    set_target_properties(secp256k1 PROPERTIES IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/third_party/libwally-core/build/iphoneos/libsecp256k1.a")
 
-    add_library(wally STATIC IMPORTED)
-    set_target_properties(wally PROPERTIES IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/third_party/libwally-core/build/iphoneos/libwallycore.a")
-    set_target_properties(wally PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${PROJECT_SOURCE_DIR}/third_party/libwally-core/include")
-    target_link_libraries(wally INTERFACE secp256k1)
 else()
-    add_library(secp256k1 STATIC IMPORTED)
-    set_target_properties(secp256k1 PROPERTIES IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/third_party/libwally-core/src/secp256k1/.libs/libsecp256k1.a")
 
-    add_library(wally SHARED IMPORTED)
-    set_target_properties(wally PROPERTIES IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/third_party/libwally-core/src/.libs/libwallycore.so")
-    set_target_properties(wally PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${PROJECT_SOURCE_DIR}/third_party/libwally-core/include")
-    target_link_libraries(wally INTERFACE secp256k1)
 endif()
 
 add_library(tap-protocol STATIC
@@ -52,21 +36,21 @@ add_library(tap-protocol STATIC
         src/hwi_tapsigner.cpp
         )
 
-add_subdirectory(third_party/bitcoin-core)
+add_subdirectory(contrib/bitcoin-core)
 
 target_link_libraries(tap-protocol 
-        PRIVATE wally bitcoin-core
+        PRIVATE bitcoin-core
         )
 
 target_include_directories(${PROJECT_NAME}
         PUBLIC ${PROJECT_SOURCE_DIR}/include
-        PUBLIC ${PROJECT_SOURCE_DIR}/third_party/include
+        PUBLIC ${PROJECT_SOURCE_DIR}/contrib/include
         )
 
 target_compile_definitions(${PROJECT_NAME} PRIVATE TAPPROTOCOL_LIBRARY)
 
 target_precompile_headers(${PROJECT_NAME}
-        PRIVATE ${PROJECT_SOURCE_DIR}/third_party/include/nlohmann/json.hpp)
+        PRIVATE ${PROJECT_SOURCE_DIR}/contrib/include/nlohmann/json.hpp)
 
 #set(CPACK_PROJECT_NAME ${PROJECT_NAME})
 #set(CPACK_PROJECT_VERSION ${PROJECT_VERSION})
@@ -78,7 +62,7 @@ if (BUILD_TESTING)
     add_library(test_main OBJECT tests/unit.cpp)
 
     target_include_directories(test_main
-            PUBLIC ${PROJECT_SOURCE_DIR}/tests/third_party/doctest
+            PUBLIC ${PROJECT_SOURCE_DIR}/tests/contrib/doctest
             PUBLIC ${Boost_INCLUDE_DIRS}
             )
     target_link_libraries(test_main ${Boost_LIBRARIES})
@@ -95,7 +79,7 @@ if (BUILD_TESTING)
         add_executable(${testcase} ${file} $<TARGET_OBJECTS:test_main>)
         target_link_libraries(${testcase} ${PROJECT_NAME})
         target_include_directories(${testcase} PUBLIC
-                "${PROJECT_SOURCE_DIR}/tests/third_party/doctest"
+                "${PROJECT_SOURCE_DIR}/tests/contrib/doctest"
                 "${PROJECT_SOURCE_DIR}/include"
                 )
 

README.md

@@ -17,25 +17,14 @@ add_subdirectory(tap-protocol)
 target_link_libraries("${PROJECT_NAME}" PUBLIC tap-protocol)
 ```
 
-## Build libwally-core ([detail](https://github.com/ElementsProject/libwally-core#building))
+## Build secp256k1
 ```
-# For Android
-# https://github.com/ElementsProject/libwally-core#android
-# you may wanna export ANDROID_NDK=/path/to/android-ndk # r22 is the minimum supported version
-$ cd third_party/libwally-core
-$ ./tools/build_android_libraries.sh
-
-# For Linux, MacOS, iOS
-# https://github.com/ElementsProject/libwally-core#building
-$ cd third_party/libwally-core
-$ ./tools/autogen.sh
-$ ./configure --disable-tests
-$ make
+cd contrib/bitcoin-core/src/secp256k1
+./configure --disable-shared --with-pic --enable-benchmark=no --enable-module-recovery --enable-module-schnorrsig --enable-module-ecdh --enable-experimental
 ```
 
 # Use with JNI
 
-
 Android Intent that handle NFC event
 
 ```

contrib/bitcoin-core/CMakeLists.txt

@@ -0,0 +1,90 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(bitcoin-core LANGUAGES CXX)
+#set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+add_library(${PROJECT_NAME} STATIC
+        src/amount.h
+        src/streams.h
+        src/psbt.h
+        src/psbt.cpp
+        src/uint256.h
+        src/uint256.cpp
+        src/attributes.h
+        src/compat/endian.h
+        src/compat/byteswap.h
+        src/prevector.h
+        src/span.h
+
+        src/support/lockedpool.h
+        src/support/lockedpool.cpp
+        src/support/allocators/zeroafterfree.h
+        src/support/allocators/secure.h
+        src/support/cleanse.h
+        src/support/cleanse.cpp
+        src/util/strencodings.h
+        src/util/strencodings.cpp
+        src/util/string.h
+        src/util/string.cpp
+
+        src/tinyformat.h
+
+        src/prevector.h
+        src/serialize.h
+
+        src/crypto/common.h
+        src/crypto/sha256.h
+        src/crypto/sha256.cpp
+        src/crypto/sha512.h
+        src/crypto/sha512.cpp
+        src/crypto/ripemd160.h
+        src/crypto/ripemd160.cpp
+
+        src/script/keyorigin.h
+        src/script/script.h
+        src/script/script.cpp
+
+        src/hash.h
+        src/hash.cpp
+
+        src/version.h
+        src/crypto/hmac_sha512.h
+        src/crypto/hmac_sha512.cpp
+        src/crypto/hmac_sha256.h
+        src/crypto/hmac_sha256.cpp
+
+        src/primitives/transaction.h
+        src/primitives/transaction.cpp
+        src/pubkey.h
+        src/pubkey.cpp
+        src/script/sign.h
+        src/script/sign.cpp
+        src/script/standard.h
+        src/script/standard.cpp
+
+        src/script/interpreter.h
+        src/script/interpreter.cpp
+        src/script/script_error.h
+        src/script/script_error.cpp
+        src/util/hash_type.h
+        src/crypto/sha1.h
+        src/crypto/sha1.cpp
+        src/base58.h
+        src/base58.cpp
+
+        )
+
+
+add_library(libsecp256k1 STATIC IMPORTED)
+set_target_properties(libsecp256k1 PROPERTIES IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/src/secp256k1/.libs/libsecp256k1.a)
+set_target_properties(libsecp256k1 PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${PROJECT_SOURCE_DIR}/src/secp256k1/include)
+
+target_include_directories(${PROJECT_NAME}
+        PUBLIC src
+        )
+
+target_link_libraries(${PROJECT_NAME}
+        PUBLIC libsecp256k1
+        )