[Dev]: Dev<->Master

.clang-format

@@ -12,7 +12,7 @@ PointerAlignment: Left
 IncludeCategories:
   - Regex:           '^"\.\./'
     Priority:        2
-  - Regex:           '^<(TrustWalletCore|TrezorCrypto)/'
+  - Regex:           '^<(TrustWalletCore)/'
     Priority:        3
   - Regex:           '<.*>'
     Priority:        4

.github/workflows/codegen-v2.yml

@@ -21,7 +21,7 @@ jobs:
           tools/install-sys-dependencies-linux
 
       - name: Run sccache-cache
-        uses: mozilla-actions/[email protected].3
+        uses: mozilla-actions/[email protected].8
 
       - name: Install Rust dependencies
         run: |

.github/workflows/linux-ci-rust.yml

@@ -29,7 +29,7 @@ jobs:
           tools/install-sys-dependencies-linux
 
       - name: Run sccache-cache
-        uses: mozilla-actions/[email protected].3
+        uses: mozilla-actions/[email protected].8
 
       - name: Cache Rust
         uses: Swatinem/rust-cache@v2
@@ -74,7 +74,7 @@ jobs:
           tools/install-sys-dependencies-linux
 
       - name: Run sccache-cache
-        uses: mozilla-actions/[email protected].3
+        uses: mozilla-actions/[email protected].8
 
       - name: Cache Rust
         uses: Swatinem/rust-cache@v2
@@ -105,7 +105,7 @@ jobs:
           tools/install-sys-dependencies-mac
 
       - name: Run sccache-cache
-        uses: mozilla-actions/[email protected].3
+        uses: mozilla-actions/[email protected].8
 
       - name: Cache Rust
         uses: Swatinem/rust-cache@v2

.github/workflows/linux-ci.yml

@@ -54,8 +54,7 @@ jobs:
         CXX: /usr/bin/clang++
     - name: Build and test
       run: |
-        ninja -Cbuild tests TrezorCryptoTests
-        build/trezor-crypto/crypto/tests/TrezorCryptoTests
+        ninja -Cbuild tests
         build/tests/tests --gtest_output=xml
       env:
         CC: /usr/bin/clang

.gitignore

@@ -37,21 +37,11 @@ codegen-v2/bindings/
 
 src/Generated/*.h
 src/Generated/*.cpp
+include/TrustWalletCore/Generated/*.h
 include/TrustWalletCore/TWHRP.h
 include/TrustWalletCore/TW*Proto.h
 include/TrustWalletCore/TWEthereumChainID.h
 
-# Generated
-include/TrustWalletCore/TWTONAddressConverter.h
-include/TrustWalletCore/TWFFITest.h
-include/TrustWalletCore/TWTONWallet.h
-include/TrustWalletCore/TWTONMessageSigner.h
-include/TrustWalletCore/TWMessageSigner.h
-include/TrustWalletCore/TWWalletConnectRequest.h
-include/TrustWalletCore/TWSolanaTransaction.h
-include/TrustWalletCore/TWCryptoBoxPublicKey.h
-include/TrustWalletCore/TWCryptoBoxSecretKey.h
-
 # Wasm
 emsdk/
 wasm-build/

CMakeLists.txt

@@ -29,7 +29,6 @@ target_link_directories(${PROJECT_NAME}_INTERFACE INTERFACE ${PREFIX}/lib)
 target_link_directories(${PROJECT_NAME}_INTERFACE INTERFACE ${WALLET_CORE_RS_TARGET_DIR}/release)
 set_project_warnings(${PROJECT_NAME}_INTERFACE)
 
-add_subdirectory(trezor-crypto)
 set(WALLET_CORE_RS_LIB libwallet_core_rs.a)
 
 set(WALLET_CORE_BINDGEN ${WALLET_CORE_RS_TARGET_DIR}/release/${WALLET_CORE_RS_LIB})
@@ -72,7 +71,7 @@ if (${ANDROID})
     elseif (${CMAKE_ANDROID_ARCH_ABI} STREQUAL "x86_64")
         set(WALLET_CORE_BINDGEN ${WALLET_CORE_RS_TARGET_DIR}/x86_64-linux-android/release/${WALLET_CORE_RS_LIB})
     endif ()
-    target_link_libraries(TrustWalletCore PUBLIC ${WALLET_CORE_BINDGEN} ${PROJECT_NAME}_INTERFACE PRIVATE TrezorCrypto protobuf ${log-lib} Boost::boost)
+    target_link_libraries(TrustWalletCore PUBLIC ${WALLET_CORE_BINDGEN} ${PROJECT_NAME}_INTERFACE PRIVATE protobuf ${log-lib} Boost::boost)
 elseif (${TW_COMPILE_JAVA})
     message("Configuring for JNI")
     file(GLOB_RECURSE core_sources src/*.c src/*.cc src/*.cpp src/*.h jni/cpp/*.cpp jni/cpp/*.h)
@@ -90,12 +89,12 @@ elseif (${TW_COMPILE_JAVA})
     add_library(TrustWalletCore SHARED ${sources} ${PROTO_SRCS} ${PROTO_HDRS})
     find_package(JNI REQUIRED)
     target_include_directories(TrustWalletCore PRIVATE ${JNI_INCLUDE_DIRS})
-    target_link_libraries(TrustWalletCore PUBLIC ${WALLET_CORE_BINDGEN} ${PROJECT_NAME}_INTERFACE PRIVATE TrezorCrypto protobuf Boost::boost)
+    target_link_libraries(TrustWalletCore PUBLIC ${WALLET_CORE_BINDGEN} ${PROJECT_NAME}_INTERFACE PRIVATE protobuf Boost::boost)
 else ()
     message("Configuring standalone")
     file(GLOB_RECURSE sources src/*.c src/*.cc src/*.cpp src/*.h)
     add_library(TrustWalletCore STATIC ${sources} ${PROTO_SRCS} ${PROTO_HDRS})
-    target_link_libraries(TrustWalletCore PUBLIC ${WALLET_CORE_BINDGEN} ${PROJECT_NAME}_INTERFACE PRIVATE TrezorCrypto protobuf Boost::boost)
+    target_link_libraries(TrustWalletCore PUBLIC ${WALLET_CORE_BINDGEN} ${PROJECT_NAME}_INTERFACE PRIVATE protobuf Boost::boost)
 endif ()
 
 if (TW_CODE_COVERAGE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")

Dockerfile

@@ -38,7 +38,7 @@ ENV CXX=/usr/bin/clang++-14
 RUN wget "https://sh.rustup.rs" -O rustup.sh \
     && sh rustup.sh -y
 ENV PATH="/root/.cargo/bin:${PATH}"
-RUN rustup default nightly-2024-06-13
+RUN rustup default nightly-2025-01-16
 RUN cargo install --force cbindgen \
     && rustup target add wasm32-unknown-emscripten
 

WalletCore.podspec

@@ -37,8 +37,6 @@ Pod::Spec.new do |s|
       'swift/Sources/*.{swift,h,m,cpp}',
       'swift/Sources/Extensions/*.swift',
       'swift/Sources/Generated/*.{swift,h}',
-      'trezor-crypto/crypto/**/*.{c,h}',
-      'trezor-crypto/include/**/*.{h}',
       "#{protobuf_source_dir}/src/google/protobuf/any.cc",
       "#{protobuf_source_dir}/src/google/protobuf/any.pb.cc",
       "#{protobuf_source_dir}/src/google/protobuf/any_lite.cc",
@@ -125,32 +123,25 @@ Pod::Spec.new do |s|
       "#{protobuf_source_dir}/src/google/protobuf/wrappers.pb.cc"
 
     ss.exclude_files = 
-      'trezor-crypto/include/TrezorCrypto/base58.h',
-      'trezor-crypto/crypto/monero',
-      'trezor-crypto/crypto/tests',
-      'trezor-crypto/crypto/tools',
-      'trezor-crypto/crypto/rand.c',
+      'src/rand.cpp',
       'swift/Sources/Generated/WalletCore.h'
 
     ss.public_header_files =
       'include/**/*.h',
       'swift/Sources/*.h'
 
     ss.preserve_paths =
-      'trezor-crypto/crypto/*.{table}',
       "#{protobuf_source_dir}/src/**/*.{h,inc}",
       "#{include_dir}/nlohmann/**/*.hpp",
       'src/proto/*.proto'
 
     ss.xcconfig = {
       'HEADER_SEARCH_PATHS' => '$(inherited) ' \
         '$(SRCROOT)/../../wallet-core ' \
-        '${SRCROOT}/../../trezor-crypto/crypto ',
       'SYSTEM_HEADER_SEARCH_PATHS' => '$(inherited) ' \
         '/usr/local/include ' \
         '${SRCROOT}/../../include ' \
         '${SRCROOT}/../../../build/local/include ' \
-        "${SRCROOT}/../../trezor-crypto/include " \
         "${SRCROOT}/../../protobuf ",
       'GCC_WARN_UNUSED_FUNCTION' => 'NO',
       'GCC_WARN_64_TO_32_BIT_CONVERSION' => 'NO',

android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/acala/TestAcalaAddress.kt

@@ -18,7 +18,7 @@ class TestAcalaAddress {
 
     @Test
     fun testAddress() {
-        val key = PrivateKey("0x9066aa168c379a403becb235c15e7129c133c244e56a757ab07bc369288bcab0".toHexByteArray())
+        val key = PrivateKey("0x9066aa168c379a403becb235c15e7129c133c244e56a757ab07bc369288bcab0".toHexByteArray(), CoinType.ACALA.curve())
         val pubkey = key.publicKeyEd25519
         val address = AnyAddress(pubkey, CoinType.ACALA)
         assertEquals(address.description(), "269ZCS3WLGydTN8ynhyhZfzJrXkePUcdhwgLQs6TWFs5wVL5")

android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/acalaevm/TestAcalaEVMAddress.kt

@@ -17,7 +17,7 @@ class TestAcalaEVMAddress {
 
     @Test
     fun testAddress() {
-        val key = PrivateKey("828c4c48c2cef521f0251920891ed79e871faa24f64f43cde83d07bc99f8dbf0".toHexByteArray())
+        val key = PrivateKey("828c4c48c2cef521f0251920891ed79e871faa24f64f43cde83d07bc99f8dbf0".toHexByteArray(), CoinType.ACALAEVM.curve())
         val pubkey = key.getPublicKeySecp256k1(false)
         val address = AnyAddress(pubkey, CoinType.ACALAEVM)
         val expected = AnyAddress("0xe32DC46bfBF78D1eada7b0a68C96903e01418D64", CoinType.ACALAEVM)

android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/agoric/TestAgoricAddress.kt

@@ -19,7 +19,7 @@ class TestAgoricAddress {
     @Test
     fun testAddress() {
 
-        val key = PrivateKey("037048190544fa57651452f477c096de4f3073e7835cf3845b04602563a73f73".toHexByteArray())
+        val key = PrivateKey("037048190544fa57651452f477c096de4f3073e7835cf3845b04602563a73f73".toHexByteArray(), CoinType.AGORIC.curve())
         val pubkey = key.getPublicKeySecp256k1(true)
         val address = AnyAddress(pubkey, CoinType.AGORIC)
         val expected = AnyAddress("agoric18zvvgk6j3eq5wd7mqxccgt20gz2w94cy88aek5", CoinType.AGORIC)

android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/agoric/TestAgoricSigner.kt

@@ -22,7 +22,7 @@ class TestAgoricSigner {
 
     @Test
     fun AgoricTransactionSigning() {
-        val key = PrivateKey("037048190544fa57651452f477c096de4f3073e7835cf3845b04602563a73f73".toHexByteArray())
+        val key = PrivateKey("037048190544fa57651452f477c096de4f3073e7835cf3845b04602563a73f73".toHexByteArray(), CoinType.AGORIC.curve())
         val publicKey = key.getPublicKeySecp256k1(true)
         val from = AnyAddress(publicKey, CoinType.AGORIC).description()
 

android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/aion/TestAion.kt

@@ -22,7 +22,7 @@ class TestAionAddress {
 
     @Test
     fun testAddressFromPublicKey() {
-        val privateKey = PrivateKey("db33ffdf82c7ba903daf68d961d3c23c20471a8ce6b408e52d579fd8add80cc9".toHexByteArray())
+        val privateKey = PrivateKey("db33ffdf82c7ba903daf68d961d3c23c20471a8ce6b408e52d579fd8add80cc9".toHexByteArray(), CoinType.AION.curve())
         val publicKey = privateKey.getPublicKeyEd25519()
         val address = AnyAddress(publicKey, CoinType.AION)
 

android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/algorand/TestAlgorandAddress.kt

@@ -14,7 +14,7 @@ class TestAlgorandAddress {
 
     @Test
     fun testAddress() {
-        val key = PrivateKey("a6c4394041e64fe93d889386d7922af1b9a87f12e433762759608e61434d6cf7".toHexByteArray())
+        val key = PrivateKey("a6c4394041e64fe93d889386d7922af1b9a87f12e433762759608e61434d6cf7".toHexByteArray(), CoinType.ALGORAND.curve())
         val pubkey = key.publicKeyEd25519
         val address = AnyAddress(pubkey, CoinType.ALGORAND)
         val expected = AnyAddress("ADIYK65L3XR5ODNNCUIQVEET455L56MRKJHRBX5GU4TZI2752QIWK4UL5A", CoinType.ALGORAND)

android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bandchain/TestBandChainAddress.kt

@@ -19,7 +19,7 @@ class TestBandChainAddress {
     @Test
     fun testAddress() {
 
-        val key = PrivateKey("1037f828ca313f4c9e120316e8e9ff25e17f07fe66ba557d5bc5e2eeb7cba8f6".toHexByteArray())
+        val key = PrivateKey("1037f828ca313f4c9e120316e8e9ff25e17f07fe66ba557d5bc5e2eeb7cba8f6".toHexByteArray(), CoinType.BANDCHAIN.curve())
         val publicKey = key.getPublicKeySecp256k1(true)
         val address = AnyAddress(publicKey, CoinType.BANDCHAIN)
         val expected = AnyAddress("band1jf9aaj9myrzsnmpdr7twecnaftzmku2mgms4n3", CoinType.BANDCHAIN)

android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bandchain/TestBandChainSigner.kt

@@ -10,6 +10,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Test
 import wallet.core.java.AnySigner
 import wallet.core.jni.AnyAddress
+import wallet.core.jni.CoinType
 import wallet.core.jni.CoinType.BANDCHAIN
 import wallet.core.jni.PrivateKey
 import wallet.core.jni.proto.Cosmos
@@ -24,7 +25,7 @@ class TestBandChainSigner {
     @Test
     fun testSigningTransaction() {
         val key =
-            PrivateKey("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005".toHexByteArray())
+            PrivateKey("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005".toHexByteArray(), CoinType.BANDCHAIN.curve())
         val publicKey = key.getPublicKeySecp256k1(true)
         val from = AnyAddress(publicKey, BANDCHAIN).description()
 

android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/binance/TestBinanceTransactionSigning.kt

@@ -17,11 +17,11 @@ class TestBinanceTransactionSigning {
         System.loadLibrary("TrustWalletCore")
     }
 
-    val testKey = PrivateKey("eeba3f6f2db26ced519a3d4c43afff101db957a21d54d25dc7fd235c404d7a5d".toHexBytes())
+    val testKey = PrivateKey("eeba3f6f2db26ced519a3d4c43afff101db957a21d54d25dc7fd235c404d7a5d".toHexBytes(), BINANCE.curve())
 
     @Test
     fun testSignBinanceTransaction() {
-        val privateKey = PrivateKey("95949f757db1f57ca94a5dff23314accbe7abee89597bf6a3c7382c84d7eb832".toHexBytes())
+        val privateKey = PrivateKey("95949f757db1f57ca94a5dff23314accbe7abee89597bf6a3c7382c84d7eb832".toHexBytes(), BINANCE.curve())
         val publicKey = privateKey.getPublicKeySecp256k1(true)
 
         val signingInput = Binance.SigningInput.newBuilder()

android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bitcoin/TestBitcoinPsbt.kt

@@ -64,7 +64,7 @@ class TestBitcoinPsbt {
     fun testPlanThorSwap() {
         // Successfully broadcasted tx: https://mempool.space/tx/634a416e82ac710166725f6a4090ac7b5db69687e86b2d2e38dcb3d91c956c32
 
-        val privateKey = PrivateKey("f00ffbe44c5c2838c13d2778854ac66b75e04eb6054f0241989e223223ad5e55".toHexBytes())
+        val privateKey = PrivateKey("f00ffbe44c5c2838c13d2778854ac66b75e04eb6054f0241989e223223ad5e55".toHexBytes(), CoinType.BITCOIN.curve())
         val publicKey = privateKey.getPublicKeySecp256k1(true)
         val psbt = "70736274ff0100bc0200000001147010db5fbcf619067c1090fec65c131443fbc80fb4aaeebe940e44206098c60000000000ffffffff0360ea000000000000160014f22a703617035ef7f490743d50f26ae08c30d0a70000000000000000426a403d3a474149412e41544f4d3a636f736d6f7331737377797a666d743675396a373437773537753438746778646575393573757a666c6d7175753a303a743a35303e12000000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d000000000001011f6603010000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d00000000".toHexBytesInByteString()
 

android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bitcoin/TestBitcoinSigning.kt

@@ -169,7 +169,7 @@ class TestBitcoinSigning {
         val dustSatoshis = 546.toLong()
         val txId = Numeric.hexStringToByteArray("8ec895b4d30adb01e38471ca1019bfc8c3e5fbd1f28d9e7b5653260d89989008").reversedArray()
 
-        val privateKey = PrivateKey(privateKeyData)
+        val privateKey = PrivateKey(privateKeyData, CoinType.BITCOIN.curve())
         val publicKey = ByteString.copyFrom(privateKey.getPublicKeySecp256k1(true).data())
 
         val utxo0 = BitcoinV2.Input.newBuilder()
@@ -235,7 +235,7 @@ class TestBitcoinSigning {
         val dustSatoshis = 546.toLong()
         val txIdCommit = Numeric.hexStringToByteArray("797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1").reversedArray()
 
-        val privateKey = PrivateKey(privateKeyData)
+        val privateKey = PrivateKey(privateKeyData, CoinType.BITCOIN.curve())
         val publicKey = ByteString.copyFrom(privateKey.getPublicKeySecp256k1(true).data())
 
         val utxo0 = BitcoinV2.Input.newBuilder()
@@ -295,7 +295,7 @@ class TestBitcoinSigning {
         val txIdInscription = Numeric.hexStringToByteArray("7046dc2689a27e143ea2ad1039710885147e9485ab6453fa7e87464aa7dd3eca").reversedArray()
         val txIdForFees = Numeric.hexStringToByteArray("797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1").reversedArray()
 
-        val privateKey = PrivateKey(privateKeyData)
+        val privateKey = PrivateKey(privateKeyData, CoinType.BITCOIN.curve())
         val publicKey = ByteString.copyFrom(privateKey.getPublicKeySecp256k1(true).data())
         val bobAddress = "bc1qazgc2zhu2kmy42py0vs8d7yff67l3zgpwfzlpk"
 

android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bitcoindiamond/TestBitcoinDiamondAddress.kt

@@ -18,7 +18,7 @@ class TestBitcoinDiamondAddress {
 
     @Test
     fun testAddress() {
-        val key = PrivateKey("d2b9f2846d3adcead910ee0124a3ba7ae29e8a4729787d27f9bea1f532928eee".toHexByteArray())
+        val key = PrivateKey("d2b9f2846d3adcead910ee0124a3ba7ae29e8a4729787d27f9bea1f532928eee".toHexByteArray(), CoinType.BITCOINDIAMOND.curve())
         val pubkey = key.getPublicKeySecp256k1(true);
         val address = AnyAddress(pubkey, CoinType.BITCOINDIAMOND)
         val expected = AnyAddress("1G15VvshDxwFTnahZZECJfFwEkq9fP79o8", CoinType.BITCOINDIAMOND)

android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bluzelle/TestBluzelleAddress.kt

@@ -19,7 +19,7 @@ class TestBluzelleAddress {
     @Test
     fun testAddressPublicKey() {
 
-        val key = PrivateKey("1037f828ca313f4c9e120316e8e9ff25e17f07fe66ba557d5bc5e2eeb7cba8f6".toHexByteArray())
+        val key = PrivateKey("1037f828ca313f4c9e120316e8e9ff25e17f07fe66ba557d5bc5e2eeb7cba8f6".toHexByteArray(), CoinType.BLUZELLE.curve())
         val publicKey = key.getPublicKeySecp256k1(true)
         val expectedAddress = "bluzelle1jf9aaj9myrzsnmpdr7twecnaftzmku2myvn4dg"
         val actualAddress = AnyAddress(publicKey, CoinType.BLUZELLE).description()

android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bluzelle/TestBluzelleSigner.kt

@@ -13,6 +13,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Test
 import wallet.core.java.AnySigner
 import wallet.core.jni.AnyAddress
+import wallet.core.jni.CoinType
 import wallet.core.jni.CoinType.BLUZELLE
 import wallet.core.jni.PrivateKey
 import wallet.core.jni.proto.Cosmos
@@ -29,7 +30,7 @@ class TestBluzelleSigner {
 
         // Submitted Realworld tx for the following test : https://bigdipper.net.bluzelle.com/transactions/B3A7F30539CCDF72D210BC995FAF65B43F9BE04FA9F8AFAE0EC969660744002F
         val key =
-            PrivateKey("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005".toHexByteArray())
+            PrivateKey("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005".toHexByteArray(), CoinType.BLUZELLE.curve())
         val publicKey = key.getPublicKeySecp256k1(true)
         val from = AnyAddress(publicKey, BLUZELLE).description()
 

android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cardano/TestCardanoAddress.kt

@@ -18,7 +18,7 @@ class TestCardanoAddress {
 
     @Test
     fun testAddress() {
-        val key = PrivateKey("b0884d248cb301edd1b34cf626ba6d880bb3ae8fd91b4696446999dc4f0b5744309941d56938e943980d11643c535e046653ca6f498c014b88f2ad9fd6e71effbf36a8fa9f5e11eb7a852c41e185e3969d518e66e6893c81d3fc7227009952d4639aadd8b6499ae39b78018b79255fbd8f585cbda9cbb9e907a72af86afb7a05d41a57c2dec9a6a19d6bf3b1fa784f334f3a0048d25ccb7b78a7b44066f9ba7bed7f28be986cbe06819165f2ee41b403678a098961013cf4a2f3e9ea61fb6c1a".toHexByteArray())
+        val key = PrivateKey("b0884d248cb301edd1b34cf626ba6d880bb3ae8fd91b4696446999dc4f0b5744309941d56938e943980d11643c535e046653ca6f498c014b88f2ad9fd6e71effbf36a8fa9f5e11eb7a852c41e185e3969d518e66e6893c81d3fc7227009952d4639aadd8b6499ae39b78018b79255fbd8f585cbda9cbb9e907a72af86afb7a05d41a57c2dec9a6a19d6bf3b1fa784f334f3a0048d25ccb7b78a7b44066f9ba7bed7f28be986cbe06819165f2ee41b403678a098961013cf4a2f3e9ea61fb6c1a".toHexByteArray(), CoinType.CARDANO.curve())
         val pubkey = key.publicKeyEd25519Cardano
         val address = AnyAddress(pubkey, CoinType.CARDANO)
         val expected = AnyAddress("addr1qx4z6twzknkkux0hhp0kq6hvdfutczp56g56y5em8r8mgvxalp7nkkk25vuspleke2zltaetmlwrfxv7t049cq9jmwjswmfw6t", CoinType.CARDANO)

android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cardano/TestCardanoSigning.kt

@@ -78,7 +78,7 @@ class TestCardanoSigning {
     /// https://cardanoscan.io/transaction/0203ce2c91f59f169a26e9ef91254639d2b7911afac9c7c0ae64539f88ba46a5
     @Test
     fun testSignTransferFromLegacy() {
-        val privateKey = PrivateKey("98f266d1aac660179bc2f456033941238ee6b2beb8ed0f9f34c9902816781f5a9903d1d395d6ab887b65ea5e344ef09b449507c21a75f0ce8c59d0ed1c6764eba7f484aa383806735c46fd769c679ee41f8952952036a6e2338ada940b8a91f4e890ca4eb6bec44bf751b5a843174534af64d6ad1f44e0613db78a7018781f5aa151d2997f52059466b715d8eefab30a78b874ae6ef4931fa58bb21ef8ce2423d46f19d0fbf75afb0b9a24e31d533f4fd74cee3b56e162568e8defe37123afc4".toHexByteArray())
+        val privateKey = PrivateKey("98f266d1aac660179bc2f456033941238ee6b2beb8ed0f9f34c9902816781f5a9903d1d395d6ab887b65ea5e344ef09b449507c21a75f0ce8c59d0ed1c6764eba7f484aa383806735c46fd769c679ee41f8952952036a6e2338ada940b8a91f4e890ca4eb6bec44bf751b5a843174534af64d6ad1f44e0613db78a7018781f5aa151d2997f52059466b715d8eefab30a78b874ae6ef4931fa58bb21ef8ce2423d46f19d0fbf75afb0b9a24e31d533f4fd74cee3b56e162568e8defe37123afc4".toHexByteArray(), CoinType.CARDANO.curve())
         var publicKey = privateKey.publicKeyEd25519Cardano
         var byronAddress = wallet.core.jni.Cardano.getByronAddress(publicKey)
 

android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/confluxespace/TestConfluxeSpaceAddress.kt

@@ -17,7 +17,7 @@ class TestConfluxeSpaceAddress {
 
     @Test
     fun testAddress() {
-        val key = PrivateKey("828c4c48c2cef521f0251920891ed79e871faa24f64f43cde83d07bc99f8dbf0".toHexByteArray())
+        val key = PrivateKey("828c4c48c2cef521f0251920891ed79e871faa24f64f43cde83d07bc99f8dbf0".toHexByteArray(), CoinType.CONFLUXESPACE.curve())
         val pubkey = key.getPublicKeySecp256k1(false)
         val address = AnyAddress(pubkey, CoinType.CONFLUXESPACE)
         val expected = AnyAddress("0xe32DC46bfBF78D1eada7b0a68C96903e01418D64", CoinType.CONFLUXESPACE)