New: Rust changes to support auto-shielding.
This commit is contained in:
parent
2115ecde6a
commit
5f90675b87
39
Cargo.toml
39
Cargo.toml
|
@ -22,13 +22,14 @@ zcash_primitives = "0.4"
|
||||||
zcash_proofs = "0.4"
|
zcash_proofs = "0.4"
|
||||||
|
|
||||||
#### Temporary additions: ####################################
|
#### Temporary additions: ####################################
|
||||||
base58 = "0.1.0"
|
#base58 = "0.1.0"
|
||||||
protobuf = "2"
|
#protobuf = "2"
|
||||||
sha2 = "0.9"
|
#sha2 = "0.9"
|
||||||
bs58 = { version = "0.3", features = ["check"] }
|
#bs58 = { version = "0.3", features = ["check"] }
|
||||||
hdwallet = "0.2.2"
|
#hdwallet = "0.2.2"
|
||||||
ripemd160 = "0.9"
|
#ripemd160 = "0.9"
|
||||||
secp256k1 = "0.17.2"
|
hdwallet = { git = "https://github.com/nuttycom/hdwallet", rev = "72f1f7a56c114eed484cefd6d402b7ef28158712"}
|
||||||
|
secp256k1 = "0.19"
|
||||||
##############################################################
|
##############################################################
|
||||||
|
|
||||||
# update-sapling-tree dependencies
|
# update-sapling-tree dependencies
|
||||||
|
@ -50,20 +51,22 @@ protobuf-codegen-pure = "2.14"
|
||||||
#zcash_proofs = { git = 'https://github.com/zcash/librustzcash.git', rev='04a2bd4ad86980e0c2862706bd402b85b9dd1965' }
|
#zcash_proofs = { git = 'https://github.com/zcash/librustzcash.git', rev='04a2bd4ad86980e0c2862706bd402b85b9dd1965' }
|
||||||
|
|
||||||
# Uncomment this to test librustzcash changes locally
|
# Uncomment this to test librustzcash changes locally
|
||||||
[patch.crates-io]
|
|
||||||
zcash_client_backend = { path = '../../clones/librustzcash/zcash_client_backend' }
|
|
||||||
zcash_client_sqlite = { path = '../../clones/librustzcash/zcash_client_sqlite' }
|
|
||||||
zcash_primitives = { path = '../../clones/librustzcash/zcash_primitives' }
|
|
||||||
zcash_proofs = { path = '../../clones/librustzcash/zcash_proofs' }
|
|
||||||
|
|
||||||
#[patch.crates-io]
|
#[patch.crates-io]
|
||||||
#zcash_client_backend = {git = "https://github.com/nuttycom/librustzcash", branch = "data_access_api"}
|
#zcash_client_backend = { path = '../../clones/librustzcash/zcash_client_backend' }
|
||||||
#zcash_client_sqlite = {git = "https://github.com/nuttycom/librustzcash", branch = "data_access_api"}
|
#zcash_client_sqlite = { path = '../../clones/librustzcash/zcash_client_sqlite' }
|
||||||
#zcash_primitives = {git = "https://github.com/nuttycom/librustzcash", branch = "data_access_api"}
|
#zcash_primitives = { path = '../../clones/librustzcash/zcash_primitives' }
|
||||||
#zcash_proofs = {git = "https://github.com/nuttycom/librustzcash", branch = "data_access_api"}
|
#zcash_proofs = { path = '../../clones/librustzcash/zcash_proofs' }
|
||||||
|
|
||||||
|
# Uncomment this to test someone else's librustzcash changes in a branch
|
||||||
|
[patch.crates-io]
|
||||||
|
zcash_client_backend = {git = "https://github.com/gmale/librustzcash", branch = "autoshield-poc-daa-edits"}
|
||||||
|
zcash_client_sqlite = {git = "https://github.com/gmale/librustzcash", branch = "autoshield-poc-daa-edits"}
|
||||||
|
zcash_primitives = {git = "https://github.com/gmale/librustzcash", branch = "autoshield-poc-daa-edits"}
|
||||||
|
zcash_proofs = {git = "https://github.com/gmale/librustzcash", branch = "autoshield-poc-daa-edits"}
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
mainnet = ["zcash_client_sqlite/mainnet", "zcash_client_backend/transparent-inputs", "zcash_primitives/transparent-inputs"]
|
mainnet = ["zcash_client_sqlite/mainnet", "zcash_client_sqlite/transparent-inputs", "zcash_client_backend/transparent-inputs", "zcash_primitives/transparent-inputs"]
|
||||||
|
testnet = ["zcash_client_backend/transparent-inputs", "zcash_primitives/transparent-inputs"]
|
||||||
updater = ["bls12_381", "futures", "grpc", "grpc-protobuf", "httpbis", "tls-api", "tls-api-rustls"]
|
updater = ["bls12_381", "futures", "grpc", "grpc-protobuf", "httpbis", "tls-api", "tls-api-rustls"]
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
|
|
10
build.rs
10
build.rs
|
@ -1,10 +0,0 @@
|
||||||
use protobuf_codegen_pure;
|
|
||||||
|
|
||||||
fn main() {
|
|
||||||
protobuf_codegen_pure::Codegen::new()
|
|
||||||
.out_dir("src/main/rust")
|
|
||||||
.inputs(&["src/main/proto/local_rpc_types.proto"])
|
|
||||||
.includes(&["src/main/proto"])
|
|
||||||
.run()
|
|
||||||
.expect("Protobuf codegen failed");
|
|
||||||
}
|
|
|
@ -1,22 +0,0 @@
|
||||||
syntax = "proto3";
|
|
||||||
package cash.z.ecc.android.sdk.rpc;
|
|
||||||
option go_package = "walletrpc";
|
|
||||||
|
|
||||||
message TransactionDataList {
|
|
||||||
repeated bytes data = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
message TransparentTransactionList {
|
|
||||||
repeated TransparentTransaction transactions = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
message TransparentTransaction {
|
|
||||||
uint32 protoVersion = 1; // the version of this wire format, for storage
|
|
||||||
uint32 expiryHeight = 2;
|
|
||||||
bool hasShieldedOutputs = 3;
|
|
||||||
bool hasShieldedSpends = 4;
|
|
||||||
uint32 height = 5;
|
|
||||||
int64 value = 6;
|
|
||||||
string toAddress = 7;
|
|
||||||
string fromAddress = 8;
|
|
||||||
}
|
|
|
@ -1,20 +1,19 @@
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate log;
|
extern crate log;
|
||||||
|
|
||||||
|
use std::convert::{TryFrom, TryInto};
|
||||||
|
use std::panic;
|
||||||
|
use std::path::Path;
|
||||||
|
use std::ptr;
|
||||||
|
|
||||||
use android_logger::Config;
|
use android_logger::Config;
|
||||||
use base58::ToBase58;
|
|
||||||
use failure::format_err;
|
use failure::format_err;
|
||||||
use hdwallet::{ExtendedPrivKey, KeyIndex};
|
|
||||||
use jni::{
|
use jni::{
|
||||||
JNIEnv,
|
JNIEnv,
|
||||||
objects::{JClass, JString},
|
objects::{JClass, JString},
|
||||||
sys::{jboolean, jbyteArray, jint, jlong, JNI_FALSE, JNI_TRUE, jobjectArray, jstring},
|
sys::{jboolean, jbyteArray, jint, jlong, JNI_FALSE, JNI_TRUE, jobjectArray, jstring},
|
||||||
};
|
};
|
||||||
use log::Level;
|
use log::Level;
|
||||||
use std::convert::{TryFrom, TryInto};
|
|
||||||
use std::panic;
|
|
||||||
use std::path::Path;
|
|
||||||
use std::ptr;
|
|
||||||
use zcash_client_backend::{
|
use zcash_client_backend::{
|
||||||
address::RecipientAddress,
|
address::RecipientAddress,
|
||||||
data_api::{
|
data_api::{
|
||||||
|
@ -24,46 +23,46 @@ use zcash_client_backend::{
|
||||||
WalletRead, WalletWrite,
|
WalletRead, WalletWrite,
|
||||||
},
|
},
|
||||||
encoding::{
|
encoding::{
|
||||||
decode_extended_full_viewing_key, decode_extended_spending_key,
|
AddressCodec, decode_extended_full_viewing_key,
|
||||||
encode_extended_full_viewing_key, encode_extended_spending_key, encode_payment_address,
|
decode_extended_spending_key, encode_extended_full_viewing_key, encode_extended_spending_key,
|
||||||
|
encode_payment_address,
|
||||||
},
|
},
|
||||||
keys::spending_key,
|
keys::{
|
||||||
wallet::{AccountId, OvkPolicy},
|
derive_secret_key_from_seed, derive_transparent_address_from_secret_key,
|
||||||
|
spending_key, Wif,
|
||||||
|
},
|
||||||
|
wallet::{AccountId, OvkPolicy, WalletTransparentOutput},
|
||||||
};
|
};
|
||||||
|
use zcash_client_backend::data_api::wallet::shield_funds;
|
||||||
use zcash_client_sqlite::{
|
use zcash_client_sqlite::{
|
||||||
|
BlockDB,
|
||||||
error::SqliteClientError,
|
error::SqliteClientError,
|
||||||
wallet::init::{init_accounts_table, init_blocks_table, init_wallet_db},
|
NoteId,
|
||||||
BlockDB, NoteId, WalletDB,
|
wallet::init::{init_accounts_table, init_blocks_table, init_wallet_db}, wallet::put_received_transparent_utxo, WalletDB,
|
||||||
};
|
};
|
||||||
use zcash_primitives::{
|
use zcash_primitives::{
|
||||||
block::BlockHash,
|
block::BlockHash,
|
||||||
consensus::{self, BlockHeight, BranchId, Parameters},
|
consensus::{BlockHeight, BranchId, Parameters},
|
||||||
legacy::TransparentAddress,
|
legacy::TransparentAddress,
|
||||||
note_encryption::Memo,
|
note_encryption::Memo,
|
||||||
transaction::{components::Amount, Transaction},
|
transaction::{
|
||||||
|
components::{Amount, OutPoint},
|
||||||
|
Transaction
|
||||||
|
},
|
||||||
zip32::ExtendedFullViewingKey,
|
zip32::ExtendedFullViewingKey,
|
||||||
};
|
};
|
||||||
#[cfg(feature = "mainnet")]
|
#[cfg(feature = "mainnet")]
|
||||||
use zcash_primitives::consensus::{MainNetwork, MAIN_NETWORK};
|
use zcash_primitives::consensus::{MAIN_NETWORK, MainNetwork};
|
||||||
|
|
||||||
#[cfg(not(feature = "mainnet"))]
|
#[cfg(not(feature = "mainnet"))]
|
||||||
use zcash_primitives::consensus::{TestNetwork, TEST_NETWORK};
|
use zcash_primitives::consensus::{TEST_NETWORK, TestNetwork};
|
||||||
|
use zcash_proofs::prover::LocalTxProver;
|
||||||
|
use secp256k1::key::SecretKey;
|
||||||
|
|
||||||
use local_rpc_types::{TransactionDataList, TransparentTransaction, TransparentTransactionList};
|
use crate::utils::exception::unwrap_exc_or;
|
||||||
use protobuf::{parse_from_bytes, Message};
|
use zcash_client_sqlite::wallet::get_unspent_transparent_utxos;
|
||||||
use sha2::{Digest, Sha256};
|
|
||||||
|
|
||||||
use hdwallet::{ExtendedPrivKey, KeyIndex};
|
|
||||||
use secp256k1::{PublicKey, Secp256k1};
|
|
||||||
|
|
||||||
mod utils;
|
mod utils;
|
||||||
|
|
||||||
// /////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
// Temporary Imports
|
|
||||||
mod local_rpc_types;
|
|
||||||
// use crate::extended_key::{key_index::KeyIndex, ExtendedPrivKey, ExtendedPubKey, KeySeed};
|
|
||||||
// /////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
#[cfg(debug_assertions)]
|
#[cfg(debug_assertions)]
|
||||||
fn print_debug_state() {
|
fn print_debug_state() {
|
||||||
debug!("WARNING! Debugging enabled! This will likely slow things down 10X!");
|
debug!("WARNING! Debugging enabled! This will likely slow things down 10X!");
|
||||||
|
@ -404,7 +403,7 @@ pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_initBlocksT
|
||||||
}
|
}
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_getAddress(
|
pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_getShieldedAddress(
|
||||||
env: JNIEnv<'_>,
|
env: JNIEnv<'_>,
|
||||||
_: JClass<'_>,
|
_: JClass<'_>,
|
||||||
db_data: JString<'_>,
|
db_data: JString<'_>,
|
||||||
|
@ -492,9 +491,9 @@ pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_getBalance(
|
||||||
.map(|(h, _)| h)
|
.map(|(h, _)| h)
|
||||||
.ok_or(format_err!("height not available; scan required."))
|
.ok_or(format_err!("height not available; scan required."))
|
||||||
})
|
})
|
||||||
.and_then(|height| {
|
.and_then(|anchor| {
|
||||||
(&db_data)
|
(&db_data)
|
||||||
.get_balance_at(account, height)
|
.get_balance_at(account, anchor)
|
||||||
.map_err(|e| format_err!("Error while fetching verified balance: {}", e))
|
.map_err(|e| format_err!("Error while fetching verified balance: {}", e))
|
||||||
})
|
})
|
||||||
.map(|amount| amount.into())
|
.map(|amount| amount.into())
|
||||||
|
@ -502,6 +501,76 @@ pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_getBalance(
|
||||||
unwrap_exc_or(&env, res, -1)
|
unwrap_exc_or(&env, res, -1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_getVerifiedTransparentBalance(
|
||||||
|
env: JNIEnv<'_>,
|
||||||
|
_: JClass<'_>,
|
||||||
|
db_data: JString<'_>,
|
||||||
|
address: JString<'_>,
|
||||||
|
) -> jlong {
|
||||||
|
let res = panic::catch_unwind(|| {
|
||||||
|
let db_data = wallet_db(&env, NETWORK, db_data)?;
|
||||||
|
let addr = utils::java_string_to_rust(&env, address);
|
||||||
|
let taddr = TransparentAddress::decode(&NETWORK, &addr).unwrap();
|
||||||
|
|
||||||
|
let amount = (&db_data)
|
||||||
|
.get_target_and_anchor_heights()
|
||||||
|
.map_err(|e| format_err!("Error while fetching anchor height: {}", e))
|
||||||
|
.and_then(|opt_anchor| {
|
||||||
|
opt_anchor
|
||||||
|
.map(|(h, _)| h)
|
||||||
|
.ok_or(format_err!("height not available; scan required."))
|
||||||
|
})
|
||||||
|
.and_then(|anchor| {
|
||||||
|
(&db_data)
|
||||||
|
.get_unspent_transparent_utxos(&taddr, anchor - 10)
|
||||||
|
.map_err(|e| format_err!("Error while fetching verified balance: {}", e))
|
||||||
|
})?
|
||||||
|
.iter()
|
||||||
|
.map(|utxo| utxo.value)
|
||||||
|
.sum::<Amount>();
|
||||||
|
|
||||||
|
Ok(amount.into())
|
||||||
|
});
|
||||||
|
|
||||||
|
unwrap_exc_or(&env, res, -1)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_getTotalTransparentBalance(
|
||||||
|
env: JNIEnv<'_>,
|
||||||
|
_: JClass<'_>,
|
||||||
|
db_data: JString<'_>,
|
||||||
|
address: JString<'_>,
|
||||||
|
) -> jlong {
|
||||||
|
let res = panic::catch_unwind(|| {
|
||||||
|
let db_data = wallet_db(&env, NETWORK, db_data)?;
|
||||||
|
let addr = utils::java_string_to_rust(&env, address);
|
||||||
|
let taddr = TransparentAddress::decode(&NETWORK, &addr).unwrap();
|
||||||
|
|
||||||
|
let amount = (&db_data)
|
||||||
|
.get_target_and_anchor_heights()
|
||||||
|
.map_err(|e| format_err!("Error while fetching anchor height: {}", e))
|
||||||
|
.and_then(|opt_anchor| {
|
||||||
|
opt_anchor
|
||||||
|
.map(|(h, _)| h)
|
||||||
|
.ok_or(format_err!("height not available; scan required."))
|
||||||
|
})
|
||||||
|
.and_then(|anchor| {
|
||||||
|
(&db_data)
|
||||||
|
.get_unspent_transparent_utxos(&taddr, anchor)
|
||||||
|
.map_err(|e| format_err!("Error while fetching verified balance: {}", e))
|
||||||
|
})?
|
||||||
|
.iter()
|
||||||
|
.map(|utxo| utxo.value)
|
||||||
|
.sum::<Amount>();
|
||||||
|
|
||||||
|
Ok(amount.into())
|
||||||
|
});
|
||||||
|
|
||||||
|
unwrap_exc_or(&env, res, -1)
|
||||||
|
}
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_getVerifiedBalance(
|
pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_getVerifiedBalance(
|
||||||
env: JNIEnv<'_>,
|
env: JNIEnv<'_>,
|
||||||
|
@ -652,6 +721,48 @@ pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_scanBlocks(
|
||||||
unwrap_exc_or(&env, res, JNI_FALSE)
|
unwrap_exc_or(&env, res, JNI_FALSE)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_putUtxo(
|
||||||
|
env: JNIEnv<'_>,
|
||||||
|
_: JClass<'_>,
|
||||||
|
db_data: JString<'_>,
|
||||||
|
address: JString<'_>,
|
||||||
|
txid_bytes: jbyteArray,
|
||||||
|
index: jint,
|
||||||
|
script: jbyteArray,
|
||||||
|
value: jlong,
|
||||||
|
height: jint,
|
||||||
|
) -> jboolean {
|
||||||
|
// debug!("For height {} found consensus branch {:?}", height, branch);
|
||||||
|
debug!("preparing to store UTXO in db_data");
|
||||||
|
let res = panic::catch_unwind(|| {
|
||||||
|
let txid_bytes = env.convert_byte_array(txid_bytes).unwrap();
|
||||||
|
let mut txid = [0u8; 32];
|
||||||
|
txid.copy_from_slice(&txid_bytes);
|
||||||
|
|
||||||
|
let script = env.convert_byte_array(script).unwrap();
|
||||||
|
let db_data = wallet_db(&env, NETWORK, db_data)?;
|
||||||
|
let mut db_data = db_data.get_update_ops()?;
|
||||||
|
let addr = utils::java_string_to_rust(&env, address);
|
||||||
|
let address = TransparentAddress::decode(&NETWORK, &addr).unwrap();
|
||||||
|
|
||||||
|
let output = WalletTransparentOutput {
|
||||||
|
address: address,
|
||||||
|
outpoint: OutPoint::new(txid, index as u32),
|
||||||
|
script: script,
|
||||||
|
value: Amount::from_i64(value).unwrap(),
|
||||||
|
height: BlockHeight::from(height as u32),
|
||||||
|
};
|
||||||
|
|
||||||
|
debug!("Storing UTXO in db_data");
|
||||||
|
match put_received_transparent_utxo(&mut db_data, &output) {
|
||||||
|
Ok(_) => Ok(JNI_TRUE),
|
||||||
|
Err(e) => Err(format_err!("Error while inserting UTXO: {}", e)),
|
||||||
|
}
|
||||||
|
});
|
||||||
|
unwrap_exc_or(&env, res, JNI_FALSE)
|
||||||
|
}
|
||||||
|
|
||||||
// ADDED BY ANDROID
|
// ADDED BY ANDROID
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_scanBlockBatch(
|
pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_scanBlockBatch(
|
||||||
|
@ -674,53 +785,34 @@ pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_scanBlockBa
|
||||||
unwrap_exc_or(&env, res, JNI_FALSE)
|
unwrap_exc_or(&env, res, JNI_FALSE)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
// PROOF-OF-CONCEPT FOR PROTOBUF COMMUNICATION WITH SDK
|
|
||||||
// ////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_parseTransactionDataList(
|
pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_tool_DerivationTool_deriveTransparentSecretKeyFromSeed(
|
||||||
env: JNIEnv<'_>,
|
env: JNIEnv<'_>,
|
||||||
_: JClass<'_>,
|
_: JClass<'_>,
|
||||||
tx_data_list: jbyteArray,
|
seed: jbyteArray,
|
||||||
) -> jbyteArray {
|
account: jint,
|
||||||
let err_val: Vec<u8> = Vec::new();
|
index: jint,
|
||||||
let res_err = env.byte_array_from_slice(&err_val).unwrap();
|
) -> jstring {
|
||||||
let res = panic::catch_unwind(|| {
|
let res = panic::catch_unwind(|| {
|
||||||
let tx_data_bytes = env.convert_byte_array(tx_data_list)?;
|
let seed = env.convert_byte_array(seed).unwrap();
|
||||||
let input_tx_data = parse_from_bytes::<TransactionDataList>(&tx_data_bytes)?;
|
let account = if account >= 0 {
|
||||||
let mut tx_list = TransparentTransactionList::new();
|
account as u32
|
||||||
let mut txs = protobuf::RepeatedField::<TransparentTransaction>::new();
|
} else {
|
||||||
for data in input_tx_data.data.iter() {
|
return Err(format_err!("account argument must be positive"));
|
||||||
let mut tx = TransparentTransaction::new();
|
};
|
||||||
let parsed = Transaction::read(&data[..])?;
|
let index = if index >= 0 {
|
||||||
tx.set_expiryHeight(parsed.expiry_height.into());
|
index as u32
|
||||||
// Note: the wrong value is returned here (negative numbers)
|
} else {
|
||||||
tx.set_value(i64::from(parsed.value_balance));
|
return Err(format_err!("index argument must be positive"));
|
||||||
tx.set_hasShieldedSpends(parsed.shielded_spends.len() > 0);
|
};
|
||||||
tx.set_hasShieldedOutputs(parsed.shielded_outputs.len() > 0);
|
let sk = derive_secret_key_from_seed(&NETWORK, &seed, AccountId(account), index).unwrap();
|
||||||
|
let sk_wif = Wif::from_secret_key(&sk, true);
|
||||||
for (_n, vout) in parsed.vout.iter().enumerate() {
|
let output = env
|
||||||
match vout.script_pubkey.address() {
|
.new_string(sk_wif.0)
|
||||||
// NOTE : this logic below doesn't work. No address is parsed.
|
.expect("Couldn't create Java string for private key!");
|
||||||
Some(TransparentAddress::PublicKey(hash)) => {
|
Ok(output.into_inner())
|
||||||
tx.set_toAddress(
|
|
||||||
hash.to_base58check(&NETWORK.b58_pubkey_address_prefix(), &[]),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
_ => {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
txs.push(tx);
|
|
||||||
}
|
|
||||||
|
|
||||||
tx_list.set_transactions(txs);
|
|
||||||
match env.byte_array_from_slice(&tx_list.write_to_bytes()?) {
|
|
||||||
Ok(result) => Ok(result),
|
|
||||||
Err(e) => Err(format_err!("Error while parsing transaction: {}", e)),
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
unwrap_exc_or(&env, res, res_err)
|
unwrap_exc_or(&env, res, ptr::null_mut())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
|
@ -728,38 +820,50 @@ pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_tool_DerivationTool_deriveT
|
||||||
env: JNIEnv<'_>,
|
env: JNIEnv<'_>,
|
||||||
_: JClass<'_>,
|
_: JClass<'_>,
|
||||||
seed: jbyteArray,
|
seed: jbyteArray,
|
||||||
|
account: jint,
|
||||||
|
index: jint,
|
||||||
) -> jstring {
|
) -> jstring {
|
||||||
let res = panic::catch_unwind(|| {
|
let res = panic::catch_unwind(|| {
|
||||||
let seed = env.convert_byte_array(seed).unwrap();
|
let seed = env.convert_byte_array(seed).unwrap();
|
||||||
|
let account = if account >= 0 {
|
||||||
// modified from: https://github.com/adityapk00/zecwallet-light-cli/blob/master/lib/src/lightwallet.rs
|
account as u32
|
||||||
|
} else {
|
||||||
let ext_t_key = ExtendedPrivKey::with_seed(&seed).unwrap();
|
return Err(format_err!("account argument must be positive"));
|
||||||
let address_sk = ext_t_key
|
};
|
||||||
.derive_private_key(KeyIndex::hardened_from_normalize_index(44).unwrap())
|
let index = if index >= 0 {
|
||||||
.unwrap()
|
index as u32
|
||||||
.derive_private_key(
|
} else {
|
||||||
KeyIndex::hardened_from_normalize_index(NETWORK.coin_type()).unwrap(),
|
return Err(format_err!("index argument must be positive"));
|
||||||
)
|
};
|
||||||
.unwrap()
|
let sk = derive_secret_key_from_seed(&NETWORK, &seed, AccountId(account), index);
|
||||||
.derive_private_key(KeyIndex::hardened_from_normalize_index(0).unwrap())
|
let taddr = derive_transparent_address_from_secret_key(sk.unwrap())
|
||||||
.unwrap()
|
.encode(&NETWORK);
|
||||||
.derive_private_key(KeyIndex::Normal(0))
|
|
||||||
.unwrap()
|
|
||||||
.derive_private_key(KeyIndex::Normal(0))
|
|
||||||
.unwrap()
|
|
||||||
.private_key;
|
|
||||||
let secp = Secp256k1::new();
|
|
||||||
let pk = PublicKey::from_secret_key(&secp, &address_sk);
|
|
||||||
let mut hash160 = ripemd160::Ripemd160::new();
|
|
||||||
hash160.update(Sha256::digest(&pk.serialize()[..].to_vec()));
|
|
||||||
let address_string = hash160
|
|
||||||
.finalize()
|
|
||||||
.to_base58check(&NETWORK.b58_pubkey_address_prefix(), &[]);
|
|
||||||
|
|
||||||
let output = env
|
let output = env
|
||||||
.new_string(address_string)
|
.new_string(taddr)
|
||||||
|
.expect("Couldn't create Java string for taddr!");
|
||||||
|
Ok(output.into_inner())
|
||||||
|
});
|
||||||
|
unwrap_exc_or(&env, res, ptr::null_mut())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_tool_DerivationTool_deriveTransparentAddressFromSecretKey(
|
||||||
|
env: JNIEnv<'_>,
|
||||||
|
_: JClass<'_>,
|
||||||
|
secret_key: JString<'_>,
|
||||||
|
) -> jstring {
|
||||||
|
let res = panic::catch_unwind(|| {
|
||||||
|
let tsk_wif = utils::java_string_to_rust(&env, secret_key);
|
||||||
|
let sk:SecretKey = (&Wif(tsk_wif)).try_into().expect("invalid private key WIF");
|
||||||
|
let taddr =
|
||||||
|
derive_transparent_address_from_secret_key(sk)
|
||||||
|
.encode(&NETWORK);
|
||||||
|
|
||||||
|
let output = env
|
||||||
|
.new_string(taddr)
|
||||||
.expect("Couldn't create Java string!");
|
.expect("Couldn't create Java string!");
|
||||||
|
|
||||||
Ok(output.into_inner())
|
Ok(output.into_inner())
|
||||||
});
|
});
|
||||||
unwrap_exc_or(&env, res, ptr::null_mut())
|
unwrap_exc_or(&env, res, ptr::null_mut())
|
||||||
|
@ -860,6 +964,64 @@ pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_createToAdd
|
||||||
unwrap_exc_or(&env, res, -1)
|
unwrap_exc_or(&env, res, -1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_shieldToAddress(
|
||||||
|
env: JNIEnv<'_>,
|
||||||
|
_: JClass<'_>,
|
||||||
|
db_data: JString<'_>,
|
||||||
|
account: jint,
|
||||||
|
extsk: JString<'_>,
|
||||||
|
tsk: JString<'_>,
|
||||||
|
memo: jbyteArray,
|
||||||
|
spend_params: JString<'_>,
|
||||||
|
output_params: JString<'_>,
|
||||||
|
) -> jlong {
|
||||||
|
let res = panic::catch_unwind(|| {
|
||||||
|
let db_data = wallet_db(&env, NETWORK, db_data)?;
|
||||||
|
let mut db_data = db_data.get_update_ops()?;
|
||||||
|
let account = if account == 0 {
|
||||||
|
account as u32
|
||||||
|
} else {
|
||||||
|
return Err(format_err!("account argument {} must be positive", account));
|
||||||
|
};
|
||||||
|
let extsk = utils::java_string_to_rust(&env, extsk);
|
||||||
|
let tsk_wif = utils::java_string_to_rust(&env, tsk);
|
||||||
|
let memo_bytes = env.convert_byte_array(memo).unwrap();
|
||||||
|
let spend_params = utils::java_string_to_rust(&env, spend_params);
|
||||||
|
let output_params = utils::java_string_to_rust(&env, output_params);
|
||||||
|
let extsk =
|
||||||
|
match decode_extended_spending_key(NETWORK.hrp_sapling_extended_spending_key(), &extsk)
|
||||||
|
{
|
||||||
|
Ok(Some(extsk)) => extsk,
|
||||||
|
Ok(None) => {
|
||||||
|
return Err(format_err!("ExtendedSpendingKey is for the wrong network"));
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
return Err(format_err!("Invalid ExtendedSpendingKey: {}", e));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let sk:SecretKey = (&Wif(tsk_wif)).try_into().expect("invalid private key WIF");
|
||||||
|
|
||||||
|
let memo = Memo::from_bytes(&memo_bytes).unwrap();
|
||||||
|
|
||||||
|
let prover = LocalTxProver::new(Path::new(&spend_params), Path::new(&output_params));
|
||||||
|
|
||||||
|
shield_funds(
|
||||||
|
&mut db_data,
|
||||||
|
&NETWORK,
|
||||||
|
prover,
|
||||||
|
AccountId(account),
|
||||||
|
&sk,
|
||||||
|
&extsk,
|
||||||
|
&memo,
|
||||||
|
10
|
||||||
|
)
|
||||||
|
.map_err(|e| format_err!("Error while shielding transaction: {}", e))
|
||||||
|
});
|
||||||
|
unwrap_exc_or(&env, res, -1)
|
||||||
|
}
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_branchIdForHeight(
|
pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_branchIdForHeight(
|
||||||
env: JNIEnv<'_>,
|
env: JNIEnv<'_>,
|
||||||
|
@ -874,33 +1036,3 @@ pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_branchIdFor
|
||||||
});
|
});
|
||||||
unwrap_exc_or(&env, res, -1)
|
unwrap_exc_or(&env, res, -1)
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
|
||||||
// Helper code from: https://github.com/adityapk00/zecwallet-light-cli/blob/master/lib/src/lightwallet.rs
|
|
||||||
//
|
|
||||||
|
|
||||||
/// A trait for converting a [u8] to base58 encoded string.
|
|
||||||
pub trait ToBase58Check {
|
|
||||||
/// Converts a value of `self` to a base58 value, returning the owned string.
|
|
||||||
/// The version is a coin-specific prefix that is added.
|
|
||||||
/// The suffix is any bytes that we want to add at the end (like the "iscompressed" flag for
|
|
||||||
/// Secret key encoding)
|
|
||||||
fn to_base58check(&self, version: &[u8], suffix: &[u8]) -> String;
|
|
||||||
}
|
|
||||||
impl ToBase58Check for [u8] {
|
|
||||||
fn to_base58check(&self, version: &[u8], suffix: &[u8]) -> String {
|
|
||||||
let mut payload: Vec<u8> = Vec::new();
|
|
||||||
payload.extend_from_slice(version);
|
|
||||||
payload.extend_from_slice(self);
|
|
||||||
payload.extend_from_slice(suffix);
|
|
||||||
|
|
||||||
let mut checksum = double_sha256(&payload);
|
|
||||||
payload.append(&mut checksum[..4].to_vec());
|
|
||||||
payload.to_base58()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
pub fn double_sha256(payload: &[u8]) -> Vec<u8> {
|
|
||||||
let h1 = Sha256::digest(&payload);
|
|
||||||
let h2 = Sha256::digest(&h1);
|
|
||||||
h2.to_vec()
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue