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

[#524] Migrate to `zcash/librustzcash` revision with NU5 awareness 

This enables mobile wallets to send transactions after NU5 activation.
The wallets will however still not support receiving v5 transactions.
This commit is contained in:
str4d 2022-05-19 20:41:34 +01:00 committed by GitHub
parent 7c0d02cee7
commit f8b3c0926c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,6 +1,10 @@
Change Log
==========
Version 1.5.0-beta01
------------------------------------
- New: Transactions can be created after NU5 activation.
Version 1.4.0-beta01
------------------------------------
- Main entrypoint to the SDK has changed. See [MIGRATIONS.md](MIGRATIONS.md)

12
sdk-lib/Cargo.lock generated
View File

@ -468,7 +468,7 @@ dependencies = [
[[package]]
name = "equihash"
version = "0.1.0"
source = "git+https://github.com/zcash/librustzcash?branch=autoshielding-poc-sdk-dnm#8e3e7de50c3c35bd7c18988bb629dd1baeb1a3d1"
source = "git+https://github.com/zcash/librustzcash.git?rev=098dcc2ae02841e6a2b17bbb6253de970b1ff41c#098dcc2ae02841e6a2b17bbb6253de970b1ff41c"
dependencies = [
"blake2b_simd",
"byteorder",
@ -1552,7 +1552,7 @@ dependencies = [
[[package]]
name = "zcash_client_backend"
version = "0.5.0"
source = "git+https://github.com/zcash/librustzcash?branch=autoshielding-poc-sdk-dnm#8e3e7de50c3c35bd7c18988bb629dd1baeb1a3d1"
source = "git+https://github.com/zcash/librustzcash.git?rev=098dcc2ae02841e6a2b17bbb6253de970b1ff41c#098dcc2ae02841e6a2b17bbb6253de970b1ff41c"
dependencies = [
"base64",
"bech32",
@ -1581,7 +1581,7 @@ dependencies = [
[[package]]
name = "zcash_client_sqlite"
version = "0.3.0"
source = "git+https://github.com/zcash/librustzcash?branch=autoshielding-poc-sdk-dnm#8e3e7de50c3c35bd7c18988bb629dd1baeb1a3d1"
source = "git+https://github.com/zcash/librustzcash.git?rev=098dcc2ae02841e6a2b17bbb6253de970b1ff41c#098dcc2ae02841e6a2b17bbb6253de970b1ff41c"
dependencies = [
"bech32",
"bs58",
@ -1600,7 +1600,7 @@ dependencies = [
[[package]]
name = "zcash_note_encryption"
version = "0.0.0"
source = "git+https://github.com/zcash/librustzcash?branch=autoshielding-poc-sdk-dnm#8e3e7de50c3c35bd7c18988bb629dd1baeb1a3d1"
source = "git+https://github.com/zcash/librustzcash.git?rev=098dcc2ae02841e6a2b17bbb6253de970b1ff41c#098dcc2ae02841e6a2b17bbb6253de970b1ff41c"
dependencies = [
"blake2b_simd",
"byteorder",
@ -1614,7 +1614,7 @@ dependencies = [
[[package]]
name = "zcash_primitives"
version = "0.5.0"
source = "git+https://github.com/zcash/librustzcash?branch=autoshielding-poc-sdk-dnm#8e3e7de50c3c35bd7c18988bb629dd1baeb1a3d1"
source = "git+https://github.com/zcash/librustzcash.git?rev=098dcc2ae02841e6a2b17bbb6253de970b1ff41c#098dcc2ae02841e6a2b17bbb6253de970b1ff41c"
dependencies = [
"aes",
"bitvec 0.18.5",
@ -1644,7 +1644,7 @@ dependencies = [
[[package]]
name = "zcash_proofs"
version = "0.5.0"
source = "git+https://github.com/zcash/librustzcash?branch=autoshielding-poc-sdk-dnm#8e3e7de50c3c35bd7c18988bb629dd1baeb1a3d1"
source = "git+https://github.com/zcash/librustzcash.git?rev=098dcc2ae02841e6a2b17bbb6253de970b1ff41c#098dcc2ae02841e6a2b17bbb6253de970b1ff41c"
dependencies = [
"bellman",
"blake2b_simd",

25
sdk-lib/Cargo.toml
View File

@ -25,11 +25,14 @@ zcash_proofs = "0.5"
secp256k1 = "0.19"
##############################################################
#[patch.crates-io]
#zcash_client_backend = { git = 'https://github.com/zcash/librustzcash.git', rev='04a2bd4ad86980e0c2862706bd402b85b9dd1965' }
#zcash_client_sqlite = { git = 'https://github.com/zcash/librustzcash.git', rev='04a2bd4ad86980e0c2862706bd402b85b9dd1965' }
#zcash_primitives = { git = 'https://github.com/zcash/librustzcash.git', rev='04a2bd4ad86980e0c2862706bd402b85b9dd1965' }
#zcash_proofs = { git = 'https://github.com/zcash/librustzcash.git', rev='04a2bd4ad86980e0c2862706bd402b85b9dd1965' }
# Revision corresponds to the partially-complete auto-shielding version, with the NU5
# consensus branch ID and activation heights backported onto it.
# https://github.com/zcash/librustzcash/pull/555
[patch.crates-io]
zcash_client_backend = { git = 'https://github.com/zcash/librustzcash.git', rev='098dcc2ae02841e6a2b17bbb6253de970b1ff41c' }
zcash_client_sqlite = { git = 'https://github.com/zcash/librustzcash.git', rev='098dcc2ae02841e6a2b17bbb6253de970b1ff41c' }
zcash_primitives = { git = 'https://github.com/zcash/librustzcash.git', rev='098dcc2ae02841e6a2b17bbb6253de970b1ff41c' }
zcash_proofs = { git = 'https://github.com/zcash/librustzcash.git', rev='098dcc2ae02841e6a2b17bbb6253de970b1ff41c' }
## Uncomment this to test librustzcash changes locally
#[patch.crates-io]
@ -38,12 +41,12 @@ secp256k1 = "0.19"
#zcash_primitives = { path = '../../clones/librustzcash/zcash_primitives' }
#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/zcash/librustzcash", branch = "autoshielding-poc-sdk-dnm"}
zcash_client_sqlite = {git = "https://github.com/zcash/librustzcash", branch = "autoshielding-poc-sdk-dnm"}
zcash_primitives = {git = "https://github.com/zcash/librustzcash", branch = "autoshielding-poc-sdk-dnm"}
zcash_proofs = {git = "https://github.com/zcash/librustzcash", branch = "autoshielding-poc-sdk-dnm"}
## Uncomment this to test someone else's librustzcash changes in a branch
#[patch.crates-io]
#zcash_client_backend = { git = "https://github.com/zcash/librustzcash", branch = "branch-name" }
#zcash_client_sqlite = { git = "https://github.com/zcash/librustzcash", branch = "branch-name" }
#zcash_primitives = { git = "https://github.com/zcash/librustzcash", branch = "branch-name" }
#zcash_proofs = { git = "https://github.com/zcash/librustzcash", branch = "branch-name" }
[features]
mainnet = ["zcash_client_sqlite/mainnet"]