From 88aeb4f5accbb36ee097f1b2aea2c9ec51597133 Mon Sep 17 00:00:00 2001 From: Kevin Gorham Date: Wed, 18 Dec 2019 23:30:19 -0500 Subject: [PATCH] Correct hardcoded CoinType. --- src/main/rust/lib.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/rust/lib.rs b/src/main/rust/lib.rs index 640a8d66..512c43bc 100644 --- a/src/main/rust/lib.rs +++ b/src/main/rust/lib.rs @@ -46,11 +46,11 @@ use crate::utils::exception::unwrap_exc_or; #[cfg(feature = "mainnet")] use zcash_client_backend::constants::mainnet::{ - HRP_SAPLING_EXTENDED_FULL_VIEWING_KEY, HRP_SAPLING_EXTENDED_SPENDING_KEY, + COIN_TYPE, HRP_SAPLING_EXTENDED_FULL_VIEWING_KEY, HRP_SAPLING_EXTENDED_SPENDING_KEY }; #[cfg(not(feature = "mainnet"))] use zcash_client_backend::constants::testnet::{ - HRP_SAPLING_EXTENDED_FULL_VIEWING_KEY, HRP_SAPLING_EXTENDED_SPENDING_KEY, + COIN_TYPE, HRP_SAPLING_EXTENDED_FULL_VIEWING_KEY, HRP_SAPLING_EXTENDED_SPENDING_KEY }; #[no_mangle] @@ -102,7 +102,7 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_RustBackend_initAccountsTabl }; let extsks: Vec<_> = (0..accounts) - .map(|account| spending_key(&seed, 1, account)) + .map(|account| spending_key(&seed, COIN_TYPE, account)) .collect(); let extfvks: Vec<_> = extsks.iter().map(ExtendedFullViewingKey::from).collect(); @@ -144,7 +144,7 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_RustBackend_deriveExtendedSp }; let extsks: Vec<_> = (0..accounts) - .map(|account| spending_key(&seed, 1, account)) + .map(|account| spending_key(&seed, COIN_TYPE, account)) .collect(); Ok(utils::rust_vec_to_java( @@ -179,7 +179,7 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_RustBackend_deriveExtendedFu }; let extfvks: Vec<_> = (0..accounts) - .map(|account| ExtendedFullViewingKey::from(&spending_key(&seed, 1, account))) + .map(|account| ExtendedFullViewingKey::from(&spending_key(&seed, COIN_TYPE, account))) .collect(); Ok(utils::rust_vec_to_java(