zec
/
zcash-android-wallet-sdk
mirror of https://github.com/zcash/zcash-android-wallet-sdk.git

Merge pull request #9 from zcash/edition-and-cleanups 

Edition and cleanups
This commit is contained in:
str4d 2019-02-11 11:25:22 -05:00 committed by GitHub
parent c4231fb404 6d86b2cf16
commit 9171c3b32d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 106 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -7,6 +7,7 @@ authors = [
] ]
description = "JNI backend for the Android wallet SDK" description = "JNI backend for the Android wallet SDK"
publish = false publish = false
edition = "2018"
[dependencies] [dependencies]
android_logger = "0.6" android_logger = "0.6"

204
src/main/rust/lib.rs
View File

@ -1,33 +1,15 @@
extern crate failure;
#[macro_use] #[macro_use]
extern crate log; extern crate log;
extern crate android_logger;
extern crate ff;
extern crate jni;
extern crate log_panics;
extern crate pairing;
extern crate protobuf;
extern crate rand;
extern crate rusqlite;
extern crate sapling_crypto;
extern crate time;
extern crate zcash_client_backend;
extern crate zcash_primitives;
extern crate zip32;
#[cfg(test)]
extern crate tempfile;
mod sql; mod sql;
mod utils;
const SAPLING_CONSENSUS_BRANCH_ID: u32 = 0x76b8_09bb; const SAPLING_CONSENSUS_BRANCH_ID: u32 = 0x76b8_09bb;
use android_logger::Filter; use android_logger::Filter;
use jni::{ use jni::{
objects::{JClass, JString}, objects::{JClass, JString},
sys::{jboolean, jbyteArray, jint, jlong, jobjectArray, jsize, jstring, JNI_FALSE, JNI_TRUE}, sys::{jboolean, jbyteArray, jint, jlong, jobjectArray, jstring, JNI_FALSE, JNI_TRUE},
JNIEnv, JNIEnv,
}; };
use log::Level; use log::Level;
@ -37,11 +19,12 @@ use zcash_client_backend::{
encoding::{ encoding::{
decode_extended_spending_key, decode_payment_address, encode_extended_spending_key, decode_extended_spending_key, decode_payment_address, encode_extended_spending_key,
}, },
keystore::spending_key,
note_encryption::Memo, note_encryption::Memo,
prover::LocalTxProver, prover::LocalTxProver,
}; };
use zcash_primitives::transaction::components::Amount; use zcash_primitives::transaction::components::Amount;
use zip32::{ChildIndex, ExtendedFullViewingKey, ExtendedSpendingKey}; use zip32::ExtendedFullViewingKey;
use crate::sql::{ use crate::sql::{
get_address, get_balance, init_accounts_table, init_blocks_table, init_data_database, get_address, get_balance, init_accounts_table, init_blocks_table, init_data_database,
@ -49,7 +32,10 @@ use crate::sql::{
}; };
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initLogs(_env: JNIEnv, _: JClass) { pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initLogs(
_env: JNIEnv<'_>,
_: JClass<'_>,
) {
android_logger::init_once( android_logger::init_once(
Filter::default().with_min_level(Level::Trace), Filter::default().with_min_level(Level::Trace),
Some("cash.z.rust.logs"), Some("cash.z.rust.logs"),
@ -62,14 +48,11 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initLogs(_env:
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initDataDb( pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initDataDb(
env: JNIEnv, env: JNIEnv<'_>,
_: JClass, _: JClass<'_>,
db_data: JString, db_data: JString<'_>,
) -> jboolean { ) -> jboolean {
let db_data: String = env let db_data = utils::java_string_to_rust(&env, db_data);
.get_string(db_data)
.expect("Couldn't get Java string!")
.into();
match init_data_database(&db_data) { match init_data_database(&db_data) {
Ok(()) => JNI_TRUE, Ok(()) => JNI_TRUE,
@ -82,31 +65,18 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initDataDb(
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initAccountsTable( pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initAccountsTable(
env: JNIEnv, env: JNIEnv<'_>,
_: JClass, _: JClass<'_>,
db_data: JString, db_data: JString<'_>,
seed: jbyteArray, seed: jbyteArray,
accounts: jint, accounts: jint,
) -> jobjectArray { ) -> jobjectArray {
let db_data: String = env let db_data = utils::java_string_to_rust(&env, db_data);
.get_string(db_data)
.expect("Couldn't get Java string!")
.into();
let seed = env.convert_byte_array(seed).unwrap(); let seed = env.convert_byte_array(seed).unwrap();
let ret = if accounts >= 0 { let ret = if accounts >= 0 {
let master = ExtendedSpendingKey::master(&seed);
let extsks: Vec<_> = (0..accounts as u32) let extsks: Vec<_> = (0..accounts as u32)
.map(|account| { .map(|account| spending_key(&seed, 1, account))
ExtendedSpendingKey::from_path(
&master,
&[
ChildIndex::Hardened(32),
ChildIndex::Hardened(1),
ChildIndex::Hardened(account),
],
)
})
.collect(); .collect();
let extfvks: Vec<_> = extsks.iter().map(ExtendedFullViewingKey::from).collect(); let extfvks: Vec<_> = extsks.iter().map(ExtendedFullViewingKey::from).collect();
@ -127,36 +97,30 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initAccountsTab
vec![] vec![]
}; };
let jempty = env.new_string("").expect("Couldn't create Java string!"); utils::rust_vec_to_java(
let jret = env &env,
.new_object_array(ret.len() as jsize, "java/lang/String", *jempty) ret,
.expect("Couldn't create Java array!"); "java/lang/String",
for (i, extsk) in ret.into_iter().enumerate() { |env, extsk| {
let jextsk = env env.new_string(encode_extended_spending_key(
.new_string(encode_extended_spending_key(
HRP_SAPLING_EXTENDED_SPENDING_KEY_TEST, HRP_SAPLING_EXTENDED_SPENDING_KEY_TEST,
&extsk, &extsk,
)) ))
.expect("Couldn't create Java string!"); },
env.set_object_array_element(jret, i as jsize, *jextsk) |env| env.new_string(""),
.expect("Couldn't set Java array element!"); )
}
jret
} }
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initBlocksTable( pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initBlocksTable(
env: JNIEnv, env: JNIEnv<'_>,
_: JClass, _: JClass<'_>,
db_data: JString, db_data: JString<'_>,
height: jint, height: jint,
time: jlong, time: jlong,
sapling_tree: jbyteArray, sapling_tree: jbyteArray,
) -> jboolean { ) -> jboolean {
let db_data: String = env let db_data = utils::java_string_to_rust(&env, db_data);
.get_string(db_data)
.expect("Couldn't get Java string!")
.into();
let time = if time >= 0 && time <= jlong::from(u32::max_value()) { let time = if time >= 0 && time <= jlong::from(u32::max_value()) {
time as u32 time as u32
} else { } else {
@ -176,15 +140,12 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initBlocksTable
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getAddress( pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getAddress(
env: JNIEnv, env: JNIEnv<'_>,
_: JClass, _: JClass<'_>,
db_data: JString, db_data: JString<'_>,
account: jint, account: jint,
) -> jstring { ) -> jstring {
let db_data: String = env let db_data = utils::java_string_to_rust(&env, db_data);
.get_string(db_data)
.expect("Couldn't get Java string!")
.into();
let addr = match account { let addr = match account {
acc if acc >= 0 => match get_address(&db_data, acc as u32) { acc if acc >= 0 => match get_address(&db_data, acc as u32) {
@ -208,15 +169,12 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getAddress(
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getBalance( pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getBalance(
env: JNIEnv, env: JNIEnv<'_>,
_: JClass, _: JClass<'_>,
db_data: JString, db_data: JString<'_>,
account: jint, account: jint,
) -> jlong { ) -> jlong {
let db_data: String = env let db_data = utils::java_string_to_rust(&env, db_data);
.get_string(db_data)
.expect("Couldn't get Java string!")
.into();
let account = if account >= 0 { let account = if account >= 0 {
account as u32 account as u32
} else { } else {
@ -235,15 +193,12 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getBalance(
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getReceivedMemoAsUtf8( pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getReceivedMemoAsUtf8(
env: JNIEnv, env: JNIEnv<'_>,
_: JClass, _: JClass<'_>,
db_data: JString, db_data: JString<'_>,
id_note: jlong, id_note: jlong,
) -> jstring { ) -> jstring {
let db_data: String = env let db_data = utils::java_string_to_rust(&env, db_data);
.get_string(db_data)
.expect("Couldn't get Java string!")
.into();
let memo = match crate::sql::get_received_memo_as_utf8(db_data, id_note) { let memo = match crate::sql::get_received_memo_as_utf8(db_data, id_note) {
Ok(memo) => memo.unwrap_or_default(), Ok(memo) => memo.unwrap_or_default(),
@ -260,15 +215,12 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getReceivedMemo
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getSentMemoAsUtf8( pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getSentMemoAsUtf8(
env: JNIEnv, env: JNIEnv<'_>,
_: JClass, _: JClass<'_>,
db_data: JString, db_data: JString<'_>,
id_note: jlong, id_note: jlong,
) -> jstring { ) -> jstring {
let db_data: String = env let db_data = utils::java_string_to_rust(&env, db_data);
.get_string(db_data)
.expect("Couldn't get Java string!")
.into();
let memo = match crate::sql::get_sent_memo_as_utf8(db_data, id_note) { let memo = match crate::sql::get_sent_memo_as_utf8(db_data, id_note) {
Ok(memo) => memo.unwrap_or_default(), Ok(memo) => memo.unwrap_or_default(),
@ -285,19 +237,13 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_getSentMemoAsUt
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_scanBlocks( pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_scanBlocks(
env: JNIEnv, env: JNIEnv<'_>,
_: JClass, _: JClass<'_>,
db_cache: JString, db_cache: JString<'_>,
db_data: JString, db_data: JString<'_>,
) -> jboolean { ) -> jboolean {
let db_cache: String = env let db_cache = utils::java_string_to_rust(&env, db_cache);
.get_string(db_cache) let db_data = utils::java_string_to_rust(&env, db_data);
.expect("Couldn't get Java string!")
.into();
let db_data: String = env
.get_string(db_data)
.expect("Couldn't get Java string!")
.into();
match scan_cached_blocks(&db_cache, &db_data) { match scan_cached_blocks(&db_cache, &db_data) {
Ok(()) => JNI_TRUE, Ok(()) => JNI_TRUE,
@ -310,48 +256,30 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_scanBlocks(
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_sendToAddress( pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_sendToAddress(
env: JNIEnv, env: JNIEnv<'_>,
_: JClass, _: JClass<'_>,
db_data: JString, db_data: JString<'_>,
account: jint, account: jint,
extsk: JString, extsk: JString<'_>,
to: JString, to: JString<'_>,
value: jlong, value: jlong,
memo: JString, memo: JString<'_>,
spend_params: JString, spend_params: JString<'_>,
output_params: JString, output_params: JString<'_>,
) -> jlong { ) -> jlong {
let db_data: String = env let db_data = utils::java_string_to_rust(&env, db_data);
.get_string(db_data)
.expect("Couldn't get Java string!")
.into();
let account = if account >= 0 { let account = if account >= 0 {
account as u32 account as u32
} else { } else {
error!("account argument must be positive"); error!("account argument must be positive");
return -1; return -1;
}; };
let extsk: String = env let extsk = utils::java_string_to_rust(&env, extsk);
.get_string(extsk) let to = utils::java_string_to_rust(&env, to);
.expect("Couldn't get Java string!")
.into();
let to: String = env
.get_string(to)
.expect("Couldn't get Java string!")
.into();
let value = Amount(value); let value = Amount(value);
let memo: String = env let memo = utils::java_string_to_rust(&env, memo);
.get_string(memo) let spend_params = utils::java_string_to_rust(&env, spend_params);
.expect("Couldn't get Java string!") let output_params = utils::java_string_to_rust(&env, output_params);
.into();
let spend_params: String = env
.get_string(spend_params)
.expect("Couldn't get Java string!")
.into();
let output_params: String = env
.get_string(output_params)
.expect("Couldn't get Java string!")
.into();
let extsk = match decode_extended_spending_key(HRP_SAPLING_EXTENDED_SPENDING_KEY_TEST, &extsk) { let extsk = match decode_extended_spending_key(HRP_SAPLING_EXTENDED_SPENDING_KEY_TEST, &extsk) {
Ok(extsk) => extsk, Ok(extsk) => extsk,

39
src/main/rust/utils.rs Normal file
View File

@ -0,0 +1,39 @@
use jni::{
descriptors::Desc,
errors::Result as JNIResult,
objects::{JClass, JObject, JString},
sys::{jobjectArray, jsize},
JNIEnv,
};
use std::ops::Deref;
pub(crate) fn java_string_to_rust(env: &JNIEnv<'_>, jstring: JString<'_>) -> String {
env.get_string(jstring)
.expect("Couldn't get Java string!")
.into()
}
pub(crate) fn rust_vec_to_java<'a, T, U, V, F, G>(
env: &JNIEnv<'a>,
data: Vec<T>,
element_class: U,
element_map: F,
empty_element: G,
) -> jobjectArray
where
U: Desc<'a, JClass<'a>>,
V: Deref<Target = JObject<'a>>,
F: Fn(&JNIEnv<'a>, T) -> JNIResult<V>,
G: Fn(&JNIEnv<'a>) -> JNIResult<V>,
{
let jempty = empty_element(env).expect("Couldn't create Java string!");
let jret = env
.new_object_array(data.len() as jsize, element_class, *jempty)
.expect("Couldn't create Java array!");
for (i, elem) in data.into_iter().enumerate() {
let jelem = element_map(env, elem).expect("Couldn't map element to Java!");
env.set_object_array_element(jret, i as jsize, *jelem)
.expect("Couldn't set Java array element!");
}
jret
}