Update librustzcash.
This commit is contained in:
Kevin Gorham
parent
215788dd27
commit
01bbd12e73
File diff suppressed because it is too large
Load Diff
28
Cargo.toml
28
Cargo.toml
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "zcash-android-wallet-sdk"
|
||||
version = "0.0.1"
|
||||
version = "0.0.4"
|
||||
authors = [
|
||||
"Jack Grigg <jack@z.cash>",
|
||||
"Kevin Gorham <kevin.gorham@z.cash>",
|
||||
|
|
@ -24,30 +24,30 @@ tls-api = { version = "0.1", optional = true }
|
|||
tls-api-rustls = { version = "0.1", optional = true }
|
||||
|
||||
[dependencies.ff]
|
||||
git = "https://github.com/str4d/librustzcash.git"
|
||||
rev = "c72d374e28bea0c249a898f2c470ed3d58773d0c"
|
||||
git = "https://github.com/zcash/librustzcash.git"
|
||||
rev = "f55f094ef69c2caeaa941bcf851dac8cb5fa9942"
|
||||
|
||||
[dependencies.pairing]
|
||||
git = "https://github.com/str4d/librustzcash.git"
|
||||
rev = "c72d374e28bea0c249a898f2c470ed3d58773d0c"
|
||||
git = "https://github.com/zcash/librustzcash.git"
|
||||
rev = "f55f094ef69c2caeaa941bcf851dac8cb5fa9942"
|
||||
|
||||
[dependencies.zcash_client_backend]
|
||||
git = "https://github.com/str4d/librustzcash.git"
|
||||
rev = "c72d374e28bea0c249a898f2c470ed3d58773d0c"
|
||||
git = "https://github.com/zcash/librustzcash.git"
|
||||
rev = "f55f094ef69c2caeaa941bcf851dac8cb5fa9942"
|
||||
|
||||
[dependencies.zcash_client_sqlite]
|
||||
git = "https://github.com/str4d/librustzcash.git"
|
||||
rev = "c72d374e28bea0c249a898f2c470ed3d58773d0c"
|
||||
git = "https://github.com/zcash/librustzcash.git"
|
||||
rev = "f55f094ef69c2caeaa941bcf851dac8cb5fa9942"
|
||||
|
||||
[dependencies.zcash_primitives]
|
||||
git = "https://github.com/str4d/librustzcash.git"
|
||||
rev = "c72d374e28bea0c249a898f2c470ed3d58773d0c"
|
||||
git = "https://github.com/zcash/librustzcash.git"
|
||||
rev = "f55f094ef69c2caeaa941bcf851dac8cb5fa9942"
|
||||
|
||||
[dependencies.zcash_proofs]
|
||||
git = "https://github.com/str4d/librustzcash.git"
|
||||
rev = "c72d374e28bea0c249a898f2c470ed3d58773d0c"
|
||||
git = "https://github.com/zcash/librustzcash.git"
|
||||
rev = "f55f094ef69c2caeaa941bcf851dac8cb5fa9942"
|
||||
|
||||
#[patch.'https://github.com/str4d/librustzcash.git']
|
||||
#[patch.'https://github.com/zcash/librustzcash.git']
|
||||
#ff = { path = '../../clones/librustzcash/ff' }
|
||||
#pairing = { path = '../../clones/librustzcash/pairing' }
|
||||
#zcash_client_backend = { path = '../../clones/librustzcash/zcash_client_backend' }
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ buildscript {
|
|||
}
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:4.0.0'
|
||||
classpath 'com.android.tools.build:gradle:4.0.1'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
|
||||
classpath "org.jetbrains.kotlin:kotlin-allopen:${versions.kotlin}"
|
||||
classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.10.1"
|
||||
|
|
@ -270,7 +270,7 @@ dependencies {
|
|||
|
||||
// sample mnemonic plugin
|
||||
androidTestImplementation 'com.github.zcash:zcash-android-wallet-plugins:1.0.1'
|
||||
androidTestImplementation 'cash.z.ecc.android:kotlin-bip39:1.0.0-beta08'
|
||||
androidTestImplementation 'cash.z.ecc.android:kotlin-bip39:1.0.0-beta09'
|
||||
}
|
||||
|
||||
taskTree{
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@ object Deps {
|
|||
const val kotlinVersion = "1.3.72"
|
||||
const val group = "cash.z.ecc.android"
|
||||
const val artifactName = "zcash-android-wallet-sdk"
|
||||
const val versionName = "1.1.0-beta02"
|
||||
const val versionCode = 1_01_00_202 // last digits are alpha(0XX) beta(2XX) rc(4XX) release(8XX). Ex: 1_08_04_401 is an release candidate build of version 1.8.4 and 1_08_04_800 would be the final release.
|
||||
const val versionName = "1.1.0-beta03"
|
||||
const val versionCode = 1_01_00_203 // last digits are alpha(0XX) beta(2XX) rc(4XX) release(8XX). Ex: 1_08_04_401 is an release candidate build of version 1.8.4 and 1_08_04_800 would be the final release.
|
||||
const val description = "This lightweight SDK connects Android to Zcash. It welds together Rust and Kotlin in a minimal way, allowing third-party Android apps to send and receive shielded transactions easily, securely and privately."
|
||||
const val githubUrl = "https://github.com/zcash/zcash-android-wallet-sdk"
|
||||
|
||||
// publishing
|
||||
const val publishingDryRun = true
|
||||
const val publishingDryRun = false
|
||||
val publishingTarget = Publication.Mainnet
|
||||
|
||||
object Publication {
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ use zcash_client_sqlite::{
|
|||
get_verified_balance,
|
||||
},
|
||||
scan::{decrypt_and_store_transaction, scan_cached_blocks},
|
||||
transact::create_to_address,
|
||||
transact::{create_to_address, OvkPolicy},
|
||||
};
|
||||
|
||||
use zcash_primitives::{
|
||||
|
|
@ -62,7 +62,6 @@ use zcash_client_backend::constants::testnet::{
|
|||
COIN_TYPE, HRP_SAPLING_EXTENDED_FULL_VIEWING_KEY, HRP_SAPLING_EXTENDED_SPENDING_KEY,
|
||||
HRP_SAPLING_PAYMENT_ADDRESS,
|
||||
};
|
||||
use zcash_client_backend::encoding::decode_extended_full_viewing_key;
|
||||
|
||||
#[no_mangle]
|
||||
pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_initLogs(
|
||||
|
|
@ -670,6 +669,7 @@ pub unsafe extern "C" fn Java_cash_z_ecc_android_sdk_jni_RustBackend_createToAdd
|
|||
&to,
|
||||
value,
|
||||
memo,
|
||||
OvkPolicy::Sender,
|
||||
)
|
||||
.map_err(|e| format_err!("Error while creating transaction: {}", e))
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in New Issue