zec
/
librustzcash
mirror of https://github.com/zcash/librustzcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Documentation improvements. 

Co-authored-by: Jack Grigg <thestr4d@gmail.com>
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira-Emma Hopwood 2024-06-27 03:17:07 +01:00
parent 6471d4c27a
commit ec4a6d0cad
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zcash_client_backend/src/data_api/error.rs
View File

@ -36,8 +36,12 @@ pub enum Error<DataSourceError, CommitmentTreeError, SelectionError, FeeError> {
/// An error in transaction proposal construction
Proposal(ProposalError),
/// The proposal was structurally valid, but spending shielded outputs of prior multi-step
/// transaction steps is not yet supported.
/// The proposal was structurally valid, but tries to do one of these unsupported things:
/// * spending a prior shielded output or non-ephemeral change output;
/// * leaving an ephemeral output unspent;
/// * paying to an output pool for which the corresponding feature is not enabled;
/// * paying to a TEX address if the "transparent-inputs" feature is not enabled;
/// * paying to a TEX address in a transaction that has shielded inputs.
ProposalNotSupported,
/// No account could be found corresponding to a provided spending key.

3
zcash_client_backend/src/data_api/wallet.rs
View File

@ -677,7 +677,8 @@ where
#[allow(unused_variables)]
let step_index = prior_step_results.len();
// We only support spending transparent payments or ephemeral outputs from a prior step.
// We only support spending transparent payments or transparent ephemeral outputs from a
// prior step.
//
// TODO: Maybe support spending prior shielded outputs at some point? Doing so would require
// a higher-level approach in the wallet that waits for transactions with shielded outputs to

7
zcash_client_backend/src/data_api/wallet/input_selection.rs
View File

@ -370,6 +370,9 @@ where
let mut orchard_outputs = vec![];
let mut payment_pools = BTreeMap::new();
// In a ZIP 320 pair, tr0 refers to the first transaction request that
// collects shielded value and sends it to an ephemeral address, and tr1
// refers to the second transaction request that pays the TEX addresses.
#[cfg(feature = "transparent-inputs")]
let mut tr1_transparent_outputs = vec![];
#[cfg(feature = "transparent-inputs")]
@ -597,8 +600,8 @@ where
if let Some(tr1_balance) = tr1_balance_opt {
// Construct two new `TransactionRequest`s:
// * `tr0` excludes the TEX outputs, and in their place includes
// a single additional "change" output to the transparent pool.
// * `tr1` spends from that change output to each TEX output.
// a single additional ephemeral output to the transparent pool.
// * `tr1` spends from that ephemeral output to each TEX output.
// The ephemeral output should always be at the last change index.
assert_eq!(

3
zcash_client_sqlite/src/wallet/transparent.rs
View File

@ -517,7 +517,8 @@ pub(crate) fn get_transparent_address_metadata<P: consensus::Parameters>(
///
/// The following three locations in the wallet's key tree are searched:
/// - Transparent receivers that have been generated as part of a Unified Address.
/// - Transparent ephemeral addresses that have been reserved.
/// - Transparent ephemeral addresses that have been reserved or are within
/// the gap limit from the last reserved address.
/// - "Legacy transparent addresses" (at BIP 44 address index 0 within an account).
///
/// Returns `Ok(None)` if the transparent output's recipient address is not in any of the