Skip to content

Add migrate_zcashd_wallet command. #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nuttycom merged 15 commits into from
Sep 15, 2025
Merged

Add migrate_zcashd_wallet command. #152

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
79a3ad9
Update to zcash/librustzcash@10caf455e3f52744b5392af226a408b05721f70f
nuttycom Apr 3, 2025
9d1d0ad
Include network information with database connections.
nuttycom Sep 12, 2025
d50ac7f
Add `migrate_zcashd_wallet` command.
nuttycom Apr 3, 2025
0eac2d4
Skip coinbase transactions in transparent tree traversal.
nuttycom May 30, 2025
11d48e8
rpc (z_sendmany): Allow spending of funds held by imported transparen…
nuttycom Sep 12, 2025
908526c
migrate_zcashd_wallet: Decrypt and store wallet transactions as part …
nuttycom Sep 12, 2025
ffc5c37
trivial: Move errors to bottom of `migrate_zcashd_wallet`
nuttycom Sep 12, 2025
d348cc9
Apply suggestions from code review
nuttycom Sep 12, 2025
c013767
rpc (z_sendmany): Build transaction proposal synchronously.
nuttycom Sep 12, 2025
0db5435
Use `zcash` forks of `zewif` crates & fix license exemptions.
nuttycom Sep 12, 2025
cb94bf3
Put zcashd import and transparent key import functionality behind fea…
nuttycom Sep 12, 2025
f53923b
Apply suggestions from code review
nuttycom Sep 13, 2025
e46fb92
Add required feature flags to tests, and update CI to test with all f…
str4d Sep 14, 2025
bb3e630
Run acceptance tests last to avoid non-determinism
nuttycom Sep 15, 2025
be4d76f
cli: Add progress updates to `zallet migrate-zcashd-wallet`
str4d Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,264 changes: 1,112 additions & 152 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 23 additions & 13 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,10 @@ zcash_protocol = "0.6"
orchard = "0.11"
sapling = { package = "sapling-crypto", version = "0.5" }
transparent = { package = "zcash_transparent", version = "0.4" }
zcash_keys = "0.10"
zcash_keys = { version = "0.10", features = ["transparent-inputs", "sapling", "orchard", "transparent-key-encoding"] }
zcash_primitives = "0.24"
zcash_proofs = "0.24"
secp256k1 = "0.29"

# Zcash chain state
zaino-fetch = "0.1"
Expand All @@ -101,7 +102,7 @@ zebra-state = "2.0"
deadpool = "0.12"
deadpool-sqlite = "0.9"
deadpool-sync = "0.1"
incrementalmerkletree = "0.8"
incrementalmerkletree = "0.8.2"
rusqlite = { version = "0.32", features = ["time"] }
schemerz = "0.2"
schemerz-rusqlite = "0.320.0"
Expand All @@ -113,6 +114,12 @@ zcash_client_backend = "0.19"
zcash_client_sqlite = "0.17"
zcash_note_encryption = "0.4"
zip32 = "0.2"
bip32 = "0.2"

# Zcashd wallet migration
zewif = { version = "0.1" }
zewif-zcashd = { version = "0.1" }
anyhow = "1.0"

# lightwalletd (temporary)
tonic = "0.13"
Expand All @@ -123,17 +130,20 @@ age = { git = "https://github.com/str4d/rage.git", rev = "84dc1e9f641994388f107c
abscissa_core = { git = "https://github.com/iqlusioninc/abscissa.git", rev = "fdb60678fb3a883decf63d6d3ebc512abd20406f" }
abscissa_tokio = { git = "https://github.com/iqlusioninc/abscissa.git", rev = "fdb60678fb3a883decf63d6d3ebc512abd20406f" }

equihash = { git = "https://github.com/zcash/librustzcash.git", rev = "8be259c579762f1b0f569453a20c0d0dbeae6c07" }
transparent = { package = "zcash_transparent", git = "https://github.com/zcash/librustzcash.git", rev = "8be259c579762f1b0f569453a20c0d0dbeae6c07" }
zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "8be259c579762f1b0f569453a20c0d0dbeae6c07" }
zcash_client_backend = { git = "https://github.com/zcash/librustzcash.git", rev = "8be259c579762f1b0f569453a20c0d0dbeae6c07" }
zcash_client_sqlite = { git = "https://github.com/zcash/librustzcash.git", rev = "8be259c579762f1b0f569453a20c0d0dbeae6c07" }
zcash_encoding = { git = "https://github.com/zcash/librustzcash.git", rev = "8be259c579762f1b0f569453a20c0d0dbeae6c07" }
zcash_history = { git = "https://github.com/zcash/librustzcash.git", rev = "8be259c579762f1b0f569453a20c0d0dbeae6c07" }
zcash_keys = { git = "https://github.com/zcash/librustzcash.git", rev = "8be259c579762f1b0f569453a20c0d0dbeae6c07" }
zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "8be259c579762f1b0f569453a20c0d0dbeae6c07" }
zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "8be259c579762f1b0f569453a20c0d0dbeae6c07" }
zcash_protocol = { git = "https://github.com/zcash/librustzcash.git", rev = "8be259c579762f1b0f569453a20c0d0dbeae6c07" }
equihash = { git = "https://github.com/zcash/librustzcash.git", rev = "10caf455e3f52744b5392af226a408b05721f70f" }
transparent = { package = "zcash_transparent", git = "https://github.com/zcash/librustzcash.git", rev = "10caf455e3f52744b5392af226a408b05721f70f" }
zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "10caf455e3f52744b5392af226a408b05721f70f" }
zcash_client_backend = { git = "https://github.com/zcash/librustzcash.git", rev = "10caf455e3f52744b5392af226a408b05721f70f" }
zcash_client_sqlite = { git = "https://github.com/zcash/librustzcash.git", rev = "10caf455e3f52744b5392af226a408b05721f70f" }
zcash_encoding = { git = "https://github.com/zcash/librustzcash.git", rev = "10caf455e3f52744b5392af226a408b05721f70f" }
zcash_history = { git = "https://github.com/zcash/librustzcash.git", rev = "10caf455e3f52744b5392af226a408b05721f70f" }
zcash_keys = { git = "https://github.com/zcash/librustzcash.git", rev = "10caf455e3f52744b5392af226a408b05721f70f" }
zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "10caf455e3f52744b5392af226a408b05721f70f" }
zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "10caf455e3f52744b5392af226a408b05721f70f" }
zcash_protocol = { git = "https://github.com/zcash/librustzcash.git", rev = "10caf455e3f52744b5392af226a408b05721f70f" }

zewif = { git = "https://github.com/zcash/zewif.git", rev = "f84f80612813ba00a0a8a9a5f060bd217fa981cc" }
zewif-zcashd = { git = "https://github.com/zcash/zewif-zcashd.git", rev = "02a98d6236e24819904e084180da9ba0f5c9b5d0" }
Copy link
Copy Markdown
Collaborator

@str4d str4d Sep 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is this commit from? I can't find it anywhere.

Copy link
Copy Markdown
Collaborator

@str4d str4d Sep 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The zewif commit is the tip of zcash/zewif#1.

The zewif-zcashd commit does not correspond to either the tip of https://github.com/zcash/zewif-zcashd or any PR opened on it.

Copy link
Copy Markdown
Contributor Author

@nuttycom nuttycom Sep 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

zcash/zewif#1 for zewif
https://github.com/zcash/zewif-zcashd/tree/fix/wallettx_sapling_parsing for zewif-zcashd. It's on PR #1 from my fork; I've also now pushed it to the zcash org repo.

Copy link
Copy Markdown
Collaborator

@str4d str4d Sep 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not on zcash/zewif-zcashd#1 which is very confusing to me, because I do now see it on that branch.


zaino-fetch = { git = "https://github.com/Electric-Coin-Company/zaino.git", rev = "1004733f3303b1c48b6df6db610c54401554683c" }
zaino-proto = { git = "https://github.com/Electric-Coin-Company/zaino.git", rev = "1004733f3303b1c48b6df6db610c54401554683c" }
Expand Down
16 changes: 15 additions & 1 deletion deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,22 @@ allow = [
]
exceptions = [
{ name = "arrayref", allow = ["BSD-2-Clause"] },
{ name = "bc-components", allow = ["BSD-2-Clause-Patent"] },
{ name = "bc-crypto", allow = ["BSD-2-Clause-Patent"] },
{ name = "bc-envelope", allow = ["BSD-2-Clause-Patent"] },
{ name = "bc-rand", allow = ["BSD-2-Clause-Patent"] },
{ name = "bc-shamir", allow = ["BSD-2-Clause-Patent"] },
{ name = "bc-tags", allow = ["BSD-2-Clause-Patent"] },
{ name = "bc-ur", allow = ["BSD-2-Clause-Patent"] },
{ name = "bindgen", allow = ["BSD-3-Clause"] },
{ name = "bitcoin-private", allow = ["CC0-1.0"] },
{ name = "bitcoin_hashes", allow = ["CC0-1.0"] },
{ name = "const_format", allow = ["Zlib"] },
{ name = "const_format_proc_macros", allow = ["Zlib"] },
{ name = "curve25519-dalek", allow = ["BSD-3-Clause"] },
{ name = "dcbor", allow = ["BSD-2-Clause-Patent"] },
{ name = "doctest-file", allow = ["0BSD"] },
{ name = "ed25519-dalek", allow = ["BSD-3-Clause"] },
{ name = "human_bytes", allow = ["BSD-2-Clause"] },
{ name = "icu_collections", allow = ["Unicode-3.0"] },
{ name = "icu_locid", allow = ["Unicode-3.0"] },
Expand All @@ -36,15 +47,18 @@ exceptions = [
{ name = "icu_properties_data", allow = ["Unicode-3.0"] },
{ name = "icu_provider", allow = ["Unicode-3.0"] },
{ name = "icu_provider_macros", allow = ["Unicode-3.0"] },
{ name = "known-values", allow = ["BSD-2-Clause-Patent"] },
{ name = "libloading", allow = ["ISC"] },
{ name = "litemap", allow = ["Unicode-3.0"] },
{ name = "matchit", allow = ["BSD-3-Clause"] },
# Copyleft license. Temporary exception until Zebra stops depending on `dirs`.
{ name = "minicbor", allow = ["BlueOak-1.0.0"] },
{ name = "option-ext", allow = ["MPL-2.0"] },
{ name = "recvmsg", allow = ["0BSD"] },
{ name = "ring", allow = ["ISC"] },
{ name = "rustls-webpki", allow = ["ISC"] },
{ name = "secp256k1", allow = ["CC0-1.0"] },
{ name = "secp256k1-sys", allow = ["CC0-1.0"] },
{ name = "sskr", allow = ["BSD-2-Clause-Patent"] },
{ name = "subtle", allow = ["BSD-3-Clause"] },
{ name = "tinystr", allow = ["Unicode-3.0"] },
{ name = "unicode-ident", allow = ["Unicode-3.0"] },
Expand Down
6 changes: 3 additions & 3 deletions supply-chain/audits.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ importable = false

[[trusted.equihash]]
criteria = "safe-to-deploy"
user-id = 6289
user-id = 6289 # Jack Grigg (str4d)
start = "2020-06-26"
end = "2026-03-22"

Expand All @@ -260,7 +260,7 @@ end = "2026-03-04"

[[trusted.f4jumble]]
criteria = "safe-to-deploy"
user-id = 6289
user-id = 6289 # Jack Grigg (str4d)
start = "2021-09-22"
end = "2026-03-04"

Expand Down Expand Up @@ -416,7 +416,7 @@ end = "2026-03-04"

[[trusted.zcash_history]]
criteria = "safe-to-deploy"
user-id = 6289
user-id = 6289 # Jack Grigg (str4d)
start = "2024-03-01"
end = "2026-04-08"

Expand Down
Loading
Loading