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

Align with the latest librustzcash changes.

This commit is contained in:
Kevin Gorham 2021-02-11 00:42:52 -05:00
parent ae95b53ce1
commit 2115ecde6a
No known key found for this signature in database
GPG Key ID: CCA55602DF49FC38
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -63,7 +63,7 @@ zcash_proofs = { path = '../../clones/librustzcash/zcash_proofs' }
#zcash_proofs = {git = "https://github.com/nuttycom/librustzcash", branch = "data_access_api"}
[features]
mainnet = ["zcash_client_sqlite/mainnet"]
mainnet = ["zcash_client_sqlite/mainnet", "zcash_client_backend/transparent-inputs", "zcash_primitives/transparent-inputs"]
updater = ["bls12_381", "futures", "grpc", "grpc-protobuf", "httpbis", "tls-api", "tls-api-rustls"]
[lib]

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

@ -542,7 +542,7 @@ pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_getReceived
let res = panic::catch_unwind(|| {
let db_data = wallet_db(&env, NETWORK, db_data)?;
let memo = match (&db_data).get_received_memo_as_utf8(NoteId(id_note)) {
let memo = match (&db_data).get_memo_as_utf8(NoteId::ReceivedNoteId(id_note)) {
Ok(memo) => memo.unwrap_or_default(),
Err(e) => return Err(format_err!("Error while fetching memo: {}", e)),
};
@ -564,7 +564,7 @@ pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_getSentMemo
let db_data = wallet_db(&env, NETWORK, db_data)?;
let memo = (&db_data)
.get_sent_memo_as_utf8(NoteId(id_note))
.get_memo_as_utf8(NoteId::SentNoteId(id_note))
.map(|memo| memo.unwrap_or_default())
.map_err(|e| format_err!("Error while fetching memo: {}", e))?;
@ -663,7 +663,8 @@ pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_scanBlockBa
) -> jboolean {
let res = panic::catch_unwind(|| {
let db_cache = block_db(&env, db_cache)?;
let mut db_data = wallet_db(&env, NETWORK, db_data)?;
let db_data = wallet_db(&env, NETWORK, db_data)?;
let mut db_data = db_data.get_update_ops()?;
match scan_cached_blocks(&NETWORK, &db_cache, &mut db_data, Some(limit as u32)) {
Ok(()) => Ok(JNI_TRUE),

6
src/main/rust/local_rpc_types.rs
View File

@ -1,4 +1,4 @@
// This file is generated by rust-protobuf 2.18.1. Do not edit
// This file is generated by rust-protobuf 2.22.0. Do not edit
// @generated
// https://github.com/rust-lang/rust-clippy/issues/702
@ -21,7 +21,7 @@
/// Generated files are compatible only with the same version
/// of protobuf runtime.
// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_18_1;
// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0;
#[derive(PartialEq,Clone,Default)]
pub struct TransactionDataList {
@ -776,7 +776,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\
static file_descriptor_proto_lazy: ::protobuf::rt::LazyV2<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::rt::LazyV2::INIT;
fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto {
::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap()
::protobuf::Message::parse_from_bytes(file_descriptor_proto_data).unwrap()
}
pub fn file_descriptor_proto() -> &'static ::protobuf::descriptor::FileDescriptorProto {