Skip to content

Master <> Dev Merge #4435

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

Merged
merged 11 commits into from
Jul 1, 2025
Merged

Master <> Dev Merge #4435

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2b0ce85
Merge branch 'dev' of github.com:trustwallet/wallet-core into dev
gupnik Jun 30, 2025
eaf1391
Tries to fix memory leak
gupnik Jul 1, 2025
b2feb14
More memory leak fixes
gupnik Jul 1, 2025
838729c
More fixes
gupnik Jul 1, 2025
28f13df
Fix
gupnik Jul 1, 2025
74d19bf
Fix hd_node_public as well
gupnik Jul 1, 2025
756890d
Fix wasm test
gupnik Jul 1, 2025
b5d1058
Fix path for TWEthereum
gupnik Jul 1, 2025
3347e88
Fix Barz Path as well
gupnik Jul 1, 2025
e7e49c7
Fixes flutter build
gupnik Jul 1, 2025
82da948
Update coverage
gupnik Jul 1, 2025
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
17 changes: 9 additions & 8 deletions rust/tw_crypto/tests/hd_node_ffi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,7 @@ fn test_derive_xpub_pub_vs_priv_pub() {
let public_key_hex = hex::encode(public_key_bytes, false);
assert_eq!(public_key_hex, expected_public_key1);

unsafe { tw_hd_node_public_delete(derived_node_ptr) };
unsafe { tw_hd_node_public_delete(hd_node_ptr) };
}

Expand Down Expand Up @@ -653,6 +654,7 @@ fn test_derive_xpub_pub_vs_priv_pub() {
assert_eq!(public_key_hex, expected_public_key2);

unsafe { tw_hd_node_public_delete(derived_node_ptr) };
unsafe { tw_hd_node_public_delete(hd_node_ptr) };
Copy link
Collaborator

@satoshiotomakan satoshiotomakan Jul 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI, you can use TWWrapper<T> class in the future

}

// zpriv -> privateKey -> publicKey
Expand Down Expand Up @@ -884,10 +886,10 @@ fn test_bip39_vectors() {
let hd_node_ptr = unsafe { tw_hd_node_create_with_seed(seed_data.ptr(), curve.to_raw()) };
let hd_node = unsafe { TWHDNode::from_ptr_as_ref(hd_node_ptr).unwrap() };

let xprv_ptr =
unsafe { tw_hd_node_extended_private_key(hd_node, version, base58_hasher as u32) };
let xprv_string = TWStringHelper::wrap(xprv_ptr);
let xprv_string = xprv_string.to_string().unwrap();
let xprv_ptr = TWStringHelper::wrap(unsafe {
tw_hd_node_extended_private_key(hd_node, version, base58_hasher as u32)
});
let xprv_string = xprv_ptr.to_string().unwrap();
assert_eq!(xprv_string, xprv);

unsafe { tw_hd_node_delete(hd_node_ptr) };
Expand Down Expand Up @@ -927,11 +929,10 @@ fn test_extended_public_key_iost_ffi() {
unsafe { tw_hd_node_derive_from_path(hd_node, path_string.ptr(), pubkey_hasher as u32) };
let derived_node = unsafe { TWHDNode::from_ptr_as_ref(derived_node_ptr).unwrap() };

let ext_pub_key = unsafe {
let ext_pub_key = TWStringHelper::wrap(unsafe {
tw_hd_node_extended_public_key(derived_node, pub_hd_version, base58_hasher as u32)
};
let ext_pub_key_string = TWStringHelper::wrap(ext_pub_key);
let ext_pub_key_string = ext_pub_key_string.to_string().unwrap();
});
let ext_pub_key_string = ext_pub_key.to_string().unwrap();
assert_eq!(ext_pub_key_string, "xpub6CazMhni6xNtFaEeRqeaa2S3LyfrQWXk8YoEykEUyKpYyxqxG18HSo3e8Kkco5YkEddiCEF1pav6gXy71sGFKMux9rcdc8TCEfZG662hhxg");

unsafe { tw_hd_node_delete(derived_node_ptr) };
Expand Down
Loading