Merge branch 'master' into s/rust-zcash

trustwallet · Jan 27, 2025 · cc98404 · cc98404
2 parents 87b0012 + 5c94194
commit cc98404
Show file tree

Hide file tree

Showing 25 changed files with 694 additions and 135 deletions.
diff --git a/.gitignore b/.gitignore
@@ -36,6 +36,7 @@ swift/wallet-core/
 codegen-v2/bindings/
 
 src/Generated/*.cpp
+include/Generated/TrustWalletCore/*.h
 include/TrustWalletCore/TWHRP.h
 include/TrustWalletCore/TW*Proto.h
 include/TrustWalletCore/TWEthereumChainID.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -111,6 +111,7 @@ endif ()
 target_include_directories(TrustWalletCore
         PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/Generated>
         $<INSTALL_INTERFACE:include>
         PRIVATE
         ${CMAKE_CURRENT_SOURCE_DIR}/src

diff --git a/codegen-v2/Cargo.lock b/codegen-v2/Cargo.lock
diff --git a/codegen-v2/Cargo.toml b/codegen-v2/Cargo.toml
@@ -21,3 +21,4 @@ serde_yaml = "0.9.21"
 toml_edit = "0.21.0"
 handlebars = "4.3.6"
 heck = "0.4.1"
+regex = "1.11.1"