Blossom activation.
This commit is contained in:
parent
8a365115f1
commit
b47b10427e
10
Cargo.toml
10
Cargo.toml
|
@ -22,23 +22,23 @@ protobuf = { version = "2", optional = true }
|
||||||
|
|
||||||
[dependencies.ff]
|
[dependencies.ff]
|
||||||
git = "https://github.com/str4d/librustzcash.git"
|
git = "https://github.com/str4d/librustzcash.git"
|
||||||
rev = "1cbeac9d593d65938870797fb8dbafa352644d34"
|
rev = "f3f5338282eeda6d9f5bff69f6930a5473c95925"
|
||||||
|
|
||||||
[dependencies.pairing]
|
[dependencies.pairing]
|
||||||
git = "https://github.com/str4d/librustzcash.git"
|
git = "https://github.com/str4d/librustzcash.git"
|
||||||
rev = "1cbeac9d593d65938870797fb8dbafa352644d34"
|
rev = "f3f5338282eeda6d9f5bff69f6930a5473c95925"
|
||||||
|
|
||||||
[dependencies.zcash_client_backend]
|
[dependencies.zcash_client_backend]
|
||||||
git = "https://github.com/str4d/librustzcash.git"
|
git = "https://github.com/str4d/librustzcash.git"
|
||||||
rev = "1cbeac9d593d65938870797fb8dbafa352644d34"
|
rev = "f3f5338282eeda6d9f5bff69f6930a5473c95925"
|
||||||
|
|
||||||
[dependencies.zcash_client_sqlite]
|
[dependencies.zcash_client_sqlite]
|
||||||
git = "https://github.com/str4d/librustzcash.git"
|
git = "https://github.com/str4d/librustzcash.git"
|
||||||
rev = "1cbeac9d593d65938870797fb8dbafa352644d34"
|
rev = "f3f5338282eeda6d9f5bff69f6930a5473c95925"
|
||||||
|
|
||||||
[dependencies.zcash_primitives]
|
[dependencies.zcash_primitives]
|
||||||
git = "https://github.com/str4d/librustzcash.git"
|
git = "https://github.com/str4d/librustzcash.git"
|
||||||
rev = "1cbeac9d593d65938870797fb8dbafa352644d34"
|
rev = "f3f5338282eeda6d9f5bff69f6930a5473c95925"
|
||||||
|
|
||||||
[dependencies.zcash_proofs]
|
[dependencies.zcash_proofs]
|
||||||
git = "https://github.com/str4d/librustzcash.git"
|
git = "https://github.com/str4d/librustzcash.git"
|
||||||
|
|
|
@ -15,7 +15,6 @@ use std::panic;
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
use std::ptr;
|
use std::ptr;
|
||||||
use zcash_client_backend::{
|
use zcash_client_backend::{
|
||||||
constants::SAPLING_CONSENSUS_BRANCH_ID,
|
|
||||||
encoding::{
|
encoding::{
|
||||||
decode_extended_spending_key, encode_extended_full_viewing_key,
|
decode_extended_spending_key, encode_extended_full_viewing_key,
|
||||||
encode_extended_spending_key,
|
encode_extended_spending_key,
|
||||||
|
@ -36,6 +35,7 @@ use zcash_client_sqlite::{
|
||||||
};
|
};
|
||||||
use zcash_primitives::{
|
use zcash_primitives::{
|
||||||
block::BlockHash,
|
block::BlockHash,
|
||||||
|
consensus::BranchId,
|
||||||
note_encryption::Memo,
|
note_encryption::Memo,
|
||||||
transaction::components::Amount,
|
transaction::components::Amount,
|
||||||
zip32::{ExtendedFullViewingKey, ExtendedSpendingKey},
|
zip32::{ExtendedFullViewingKey, ExtendedSpendingKey},
|
||||||
|
@ -541,14 +541,14 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_RustBackend_createToAddress(
|
||||||
|
|
||||||
create_to_address(
|
create_to_address(
|
||||||
&db_data,
|
&db_data,
|
||||||
SAPLING_CONSENSUS_BRANCH_ID,
|
BranchId::Blossom,
|
||||||
prover,
|
prover,
|
||||||
(account, &extsk),
|
(account, &extsk),
|
||||||
&to,
|
&to,
|
||||||
value,
|
value,
|
||||||
memo,
|
memo,
|
||||||
)
|
)
|
||||||
.map_err(|e| format_err!("Error while sending funds: {}", e))
|
.map_err(|e| format_err!("Error while creating transaction: {}", e))
|
||||||
});
|
});
|
||||||
unwrap_exc_or(&env, res, -1)
|
unwrap_exc_or(&env, res, -1)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue