deploy: 5651d80

zcash · Dec 30, 2024 · 1d9479c · 1d9479c
1 parent 1d97ff0
commit 1d9479c
Show file tree

Hide file tree

Showing 255 changed files with 2,396 additions and 2,224 deletions.
diff --git a/rustdoc/latest/search-index.js b/rustdoc/latest/search-index.js
diff --git a/rustdoc/latest/search.desc/zcash_client_backend/zcash_client_backend-desc-0-.js b/rustdoc/latest/search.desc/zcash_client_backend/zcash_client_backend-desc-0-.js
diff --git a/rustdoc/latest/search.desc/zcash_keys/zcash_keys-desc-0-.js b/rustdoc/latest/search.desc/zcash_keys/zcash_keys-desc-0-.js
diff --git a/rustdoc/latest/search.desc/zcash_primitives/zcash_primitives-desc-0-.js b/rustdoc/latest/search.desc/zcash_primitives/zcash_primitives-desc-0-.js
diff --git a/rustdoc/latest/search.desc/zcash_protocol/zcash_protocol-desc-0-.js b/rustdoc/latest/search.desc/zcash_protocol/zcash_protocol-desc-0-.js
diff --git a/rustdoc/latest/src/zcash_address/kind/unified/address.rs.html b/rustdoc/latest/src/zcash_address/kind/unified/address.rs.html
@@ -435,7 +435,7 @@
 <a href="#434" id="434">434</a>
 <a href="#435" id="435">435</a>
 <a href="#436" id="436">436</a>
-<a href="#437" id="437">437</a></pre></div><pre class="rust"><code><span class="kw">use </span>zcash_protocol::PoolType;
+<a href="#437" id="437">437</a></pre></div><pre class="rust"><code><span class="kw">use </span>zcash_protocol::{constants, PoolType};
 
 <span class="kw">use super</span>::{private::SealedItem, ParseError, Typecode};
 
@@ -573,17 +573,17 @@
     /// Defined in [ZIP 316][zip-0316].
     ///
     /// [zip-0316]: https://zips.z.cash/zip-0316
-    </span><span class="kw">const </span>MAINNET: <span class="kw-2">&amp;</span><span class="lifetime">'static </span>str = <span class="string">"u"</span>;
+    </span><span class="kw">const </span>MAINNET: <span class="kw-2">&amp;</span><span class="lifetime">'static </span>str = constants::mainnet::HRP_UNIFIED_ADDRESS;
 
     <span class="doccomment">/// The HRP for a Bech32m-encoded testnet Unified Address.
     ///
     /// Defined in [ZIP 316][zip-0316].
     ///
     /// [zip-0316]: https://zips.z.cash/zip-0316
-    </span><span class="kw">const </span>TESTNET: <span class="kw-2">&amp;</span><span class="lifetime">'static </span>str = <span class="string">"utest"</span>;
+    </span><span class="kw">const </span>TESTNET: <span class="kw-2">&amp;</span><span class="lifetime">'static </span>str = constants::testnet::HRP_UNIFIED_ADDRESS;
 
     <span class="doccomment">/// The HRP for a Bech32m-encoded regtest Unified Address.
-    </span><span class="kw">const </span>REGTEST: <span class="kw-2">&amp;</span><span class="lifetime">'static </span>str = <span class="string">"uregtest"</span>;
+    </span><span class="kw">const </span>REGTEST: <span class="kw-2">&amp;</span><span class="lifetime">'static </span>str = constants::regtest::HRP_UNIFIED_ADDRESS;
 
     <span class="kw">fn </span>from_inner(receivers: Vec&lt;<span class="self">Self</span>::Item&gt;) -&gt; <span class="self">Self </span>{
         <span class="self">Self</span>(receivers)

diff --git a/rustdoc/latest/src/zcash_address/kind/unified/fvk.rs.html b/rustdoc/latest/src/zcash_address/kind/unified/fvk.rs.html
@@ -377,8 +377,14 @@
 <a href="#376" id="376">376</a>
 <a href="#377" id="377">377</a>
 <a href="#378" id="378">378</a>
-<a href="#379" id="379">379</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::vec::Vec;
+<a href="#379" id="379">379</a>
+<a href="#380" id="380">380</a>
+<a href="#381" id="381">381</a>
+<a href="#382" id="382">382</a>
+<a href="#383" id="383">383</a>
+<a href="#384" id="384">384</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::vec::Vec;
 <span class="kw">use </span>core::convert::{TryFrom, TryInto};
+<span class="kw">use </span>zcash_protocol::constants;
 
 <span class="kw">use super</span>::{
     private::{SealedContainer, SealedItem},
@@ -507,17 +513,21 @@
     /// Defined in [ZIP 316][zip-0316].
     ///
     /// [zip-0316]: https://zips.z.cash/zip-0316
-    </span><span class="kw">const </span>MAINNET: <span class="kw-2">&amp;</span><span class="lifetime">'static </span>str = <span class="string">"uview"</span>;
+    </span><span class="kw">const </span>MAINNET: <span class="kw-2">&amp;</span><span class="lifetime">'static </span>str = constants::mainnet::HRP_UNIFIED_FVK;
 
     <span class="doccomment">/// The HRP for a Bech32m-encoded testnet Unified FVK.
     ///
     /// Defined in [ZIP 316][zip-0316].
     ///
     /// [zip-0316]: https://zips.z.cash/zip-0316
-    </span><span class="kw">const </span>TESTNET: <span class="kw-2">&amp;</span><span class="lifetime">'static </span>str = <span class="string">"uviewtest"</span>;
+    </span><span class="kw">const </span>TESTNET: <span class="kw-2">&amp;</span><span class="lifetime">'static </span>str = constants::testnet::HRP_UNIFIED_FVK;
 
     <span class="doccomment">/// The HRP for a Bech32m-encoded regtest Unified FVK.
-    </span><span class="kw">const </span>REGTEST: <span class="kw-2">&amp;</span><span class="lifetime">'static </span>str = <span class="string">"uviewregtest"</span>;
+    ///
+    /// Defined in [ZIP 316][zip-0316].
+    ///
+    /// [zip-0316]: https://zips.z.cash/zip-0316
+    </span><span class="kw">const </span>REGTEST: <span class="kw-2">&amp;</span><span class="lifetime">'static </span>str = constants::regtest::HRP_UNIFIED_FVK;
 
     <span class="kw">fn </span>from_inner(fvks: Vec&lt;<span class="self">Self</span>::Item&gt;) -&gt; <span class="self">Self </span>{
         <span class="self">Self</span>(fvks)

diff --git a/rustdoc/latest/src/zcash_address/kind/unified/ivk.rs.html b/rustdoc/latest/src/zcash_address/kind/unified/ivk.rs.html
@@ -359,8 +359,10 @@
 <a href="#358" id="358">358</a>
 <a href="#359" id="359">359</a>
 <a href="#360" id="360">360</a>
-<a href="#361" id="361">361</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::vec::Vec;
+<a href="#361" id="361">361</a>
+<a href="#362" id="362">362</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::vec::Vec;
 <span class="kw">use </span>core::convert::{TryFrom, TryInto};
+<span class="kw">use </span>zcash_protocol::constants;
 
 <span class="kw">use super</span>::{
     private::{SealedContainer, SealedItem},
@@ -494,17 +496,17 @@
     /// Defined in [ZIP 316][zip-0316].
     ///
     /// [zip-0316]: https://zips.z.cash/zip-0316
-    </span><span class="kw">const </span>MAINNET: <span class="kw-2">&amp;</span><span class="lifetime">'static </span>str = <span class="string">"uivk"</span>;
+    </span><span class="kw">const </span>MAINNET: <span class="kw-2">&amp;</span><span class="lifetime">'static </span>str = constants::mainnet::HRP_UNIFIED_IVK;
 
     <span class="doccomment">/// The HRP for a Bech32m-encoded testnet Unified IVK.
     ///
     /// Defined in [ZIP 316][zip-0316].
     ///
     /// [zip-0316]: https://zips.z.cash/zip-0316
-    </span><span class="kw">const </span>TESTNET: <span class="kw-2">&amp;</span><span class="lifetime">'static </span>str = <span class="string">"uivktest"</span>;
+    </span><span class="kw">const </span>TESTNET: <span class="kw-2">&amp;</span><span class="lifetime">'static </span>str = constants::testnet::HRP_UNIFIED_IVK;
 
     <span class="doccomment">/// The HRP for a Bech32m-encoded regtest Unified IVK.
-    </span><span class="kw">const </span>REGTEST: <span class="kw-2">&amp;</span><span class="lifetime">'static </span>str = <span class="string">"uivkregtest"</span>;
+    </span><span class="kw">const </span>REGTEST: <span class="kw-2">&amp;</span><span class="lifetime">'static </span>str = constants::regtest::HRP_UNIFIED_IVK;
 
     <span class="kw">fn </span>from_inner(ivks: Vec&lt;<span class="self">Self</span>::Item&gt;) -&gt; <span class="self">Self </span>{
         <span class="self">Self</span>(ivks)

diff --git a/rustdoc/latest/src/zcash_client_backend/data_api.rs.html b/rustdoc/latest/src/zcash_client_backend/data_api.rs.html
@@ -2548,10 +2548,7 @@
 <a href="#2547" id="2547">2547</a>
 <a href="#2548" id="2548">2548</a>
 <a href="#2549" id="2549">2549</a>
-<a href="#2550" id="2550">2550</a>
-<a href="#2551" id="2551">2551</a>
-<a href="#2552" id="2552">2552</a>
-<a href="#2553" id="2553">2553</a></pre></div><pre class="rust"><code><span class="doccomment">//! # Utilities for Zcash wallet construction
+<a href="#2550" id="2550">2550</a></pre></div><pre class="rust"><code><span class="doccomment">//! # Utilities for Zcash wallet construction
 //!
 //! This module defines a set of APIs for wallet data persistence, and provides a suite of methods
 //! based upon these APIs that can be used to implement a fully functional Zcash wallet. At
@@ -2621,22 +2618,18 @@
 <span class="kw">use </span>incrementalmerkletree::{frontier::Frontier, Retention};
 <span class="kw">use </span>shardtree::{error::ShardTreeError, store::ShardStore, ShardTree};
 
-<span class="kw">use </span>::transparent::bundle::OutPoint;
 <span class="kw">use </span>zcash_keys::{
     address::UnifiedAddress,
     keys::{
         UnifiedAddressRequest, UnifiedFullViewingKey, UnifiedIncomingViewingKey, UnifiedSpendingKey,
     },
 };
-<span class="kw">use </span>zcash_primitives::{
-    block::BlockHash,
-    transaction::{Transaction, TxId},
-};
+<span class="kw">use </span>zcash_primitives::{block::BlockHash, transaction::Transaction};
 <span class="kw">use </span>zcash_protocol::{
     consensus::BlockHeight,
     memo::{Memo, MemoBytes},
     value::{BalanceError, Zatoshis},
-    ShieldedProtocol,
+    ShieldedProtocol, TxId,
 };
 <span class="kw">use </span>zip32::fingerprint::SeedFingerprint;
 
@@ -2652,8 +2645,9 @@
 
 <span class="attr">#[cfg(feature = <span class="string">"transparent-inputs"</span>)]
 </span><span class="kw">use </span>{
-    <span class="kw">crate</span>::wallet::TransparentAddressMetadata, ::transparent::address::TransparentAddress,
+    <span class="kw">crate</span>::wallet::TransparentAddressMetadata,
     std::ops::Range,
+    transparent::{address::TransparentAddress, bundle::OutPoint, keys::NonHardenedChildIndex},
 };
 
 <span class="attr">#[cfg(feature = <span class="string">"test-dependencies"</span>)]
@@ -4018,7 +4012,7 @@
     </span><span class="kw">fn </span>get_known_ephemeral_addresses(
         <span class="kw-2">&amp;</span><span class="self">self</span>,
         _account: <span class="self">Self</span>::AccountId,
-        _index_range: <span class="prelude-ty">Option</span>&lt;Range&lt;u32&gt;&gt;,
+        _index_range: <span class="prelude-ty">Option</span>&lt;Range&lt;NonHardenedChildIndex&gt;&gt;,
     ) -&gt; <span class="prelude-ty">Result</span>&lt;Vec&lt;(TransparentAddress, TransparentAddressMetadata)&gt;, <span class="self">Self</span>::Error&gt; {
         <span class="prelude-val">Ok</span>(<span class="macro">vec!</span>[])
     }
@@ -4519,7 +4513,7 @@
 /// This type is capable of representing both shielded and transparent outputs.
 </span><span class="kw">pub struct </span>SentTransactionOutput&lt;AccountId&gt; {
     output_index: usize,
-    recipient: Recipient&lt;AccountId, Note, OutPoint&gt;,
+    recipient: Recipient&lt;AccountId&gt;,
     value: Zatoshis,
     memo: <span class="prelude-ty">Option</span>&lt;MemoBytes&gt;,
 }
@@ -4536,7 +4530,7 @@
     /// * `memo` - the memo that was sent with this output
     </span><span class="kw">pub fn </span>from_parts(
         output_index: usize,
-        recipient: Recipient&lt;AccountId, Note, OutPoint&gt;,
+        recipient: Recipient&lt;AccountId&gt;,
         value: Zatoshis,
         memo: <span class="prelude-ty">Option</span>&lt;MemoBytes&gt;,
     ) -&gt; <span class="self">Self </span>{
@@ -4559,7 +4553,7 @@
     }
     <span class="doccomment">/// Returns the recipient address of the transaction, or the account id and
     /// resulting note/outpoint for wallet-internal outputs.
-    </span><span class="kw">pub fn </span>recipient(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="kw-2">&amp;</span>Recipient&lt;AccountId, Note, OutPoint&gt; {
+    </span><span class="kw">pub fn </span>recipient(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="kw-2">&amp;</span>Recipient&lt;AccountId&gt; {
         <span class="kw-2">&amp;</span><span class="self">self</span>.recipient
     }
     <span class="doccomment">/// Returns the value of the newly created output.

diff --git a/rustdoc/latest/src/zcash_client_backend/data_api/testing.rs.html b/rustdoc/latest/src/zcash_client_backend/data_api/testing.rs.html
@@ -2824,7 +2824,8 @@
 <a href="#2823" id="2823">2823</a>
 <a href="#2824" id="2824">2824</a>
 <a href="#2825" id="2825">2825</a>
-<a href="#2826" id="2826">2826</a></pre></div><pre class="rust"><code><span class="doccomment">//! Utilities for testing wallets based upon the [`crate::data_api`] traits.
+<a href="#2826" id="2826">2826</a>
+<a href="#2827" id="2827">2827</a></pre></div><pre class="rust"><code><span class="doccomment">//! Utilities for testing wallets based upon the [`crate::data_api`] traits.
 
 </span><span class="kw">use </span>std::{
     collections::{BTreeMap, HashMap},
@@ -2834,11 +2835,6 @@
     num::NonZeroU32,
 };
 
-<span class="kw">use </span>::sapling::{
-    note_encryption::{sapling_note_encryption, SaplingDomain},
-    util::generate_random_rseed,
-    zip32::DiversifiableFullViewingKey,
-};
 <span class="kw">use </span>assert_matches::assert_matches;
 <span class="kw">use </span>group::ff::Field;
 <span class="kw">use </span>incrementalmerkletree::{Marking, Retention};
@@ -2849,6 +2845,11 @@
 <span class="kw">use </span>shardtree::{error::ShardTreeError, store::memory::MemoryShardStore, ShardTree};
 <span class="kw">use </span>subtle::ConditionallySelectable;
 
+<span class="kw">use </span>::sapling::{
+    note_encryption::{sapling_note_encryption, SaplingDomain},
+    util::generate_random_rseed,
+    zip32::DiversifiableFullViewingKey,
+};
 <span class="kw">use </span>zcash_address::ZcashAddress;
 <span class="kw">use </span>zcash_keys::{
     address::{Address, UnifiedAddress},
@@ -2870,38 +2871,39 @@
 <span class="kw">use </span>zip32::{fingerprint::SeedFingerprint, DiversifierIndex};
 <span class="kw">use </span>zip321::Payment;
 
-<span class="kw">use crate</span>::{
-    fees::{
-        standard::{<span class="self">self</span>, SingleOutputChangeStrategy},
-        ChangeStrategy, DustOutputPolicy, StandardFeeRule,
-    },
-    proposal::Proposal,
-    proto::compact_formats::{
-        <span class="self">self</span>, CompactBlock, CompactSaplingOutput, CompactSaplingSpend, CompactTx,
-    },
-    wallet::{Note, NoteId, OvkPolicy, ReceivedNote, WalletTransparentOutput},
-};
-
 <span class="kw">use super</span>::{
     chain::{scan_cached_blocks, BlockSource, ChainState, CommitmentTreeRoot, ScanSummary},
+    error::Error,
     scanning::ScanRange,
     wallet::{
         create_proposed_transactions,
         input_selection::{GreedyInputSelector, InputSelector},
         propose_standard_transfer_to_address, propose_transfer,
     },
     Account, AccountBalance, AccountBirthday, AccountMeta, AccountPurpose, AccountSource,
-    BlockMetadata, DecryptedTransaction, InputSource, NullifierQuery, ScannedBlock, SeedRelevance,
-    SentTransaction, SpendableNotes, TransactionDataRequest, TransactionStatus,
+    BlockMetadata, DecryptedTransaction, InputSource, NoteFilter, NullifierQuery, ScannedBlock,
+    SeedRelevance, SentTransaction, SpendableNotes, TransactionDataRequest, TransactionStatus,
     WalletCommitmentTrees, WalletRead, WalletSummary, WalletTest, WalletWrite,
     SAPLING_SHARD_HEIGHT,
 };
-<span class="kw">use super</span>::{error::Error, NoteFilter};
+<span class="kw">use crate</span>::{
+    fees::{
+        standard::{<span class="self">self</span>, SingleOutputChangeStrategy},
+        ChangeStrategy, DustOutputPolicy, StandardFeeRule,
+    },
+    proposal::Proposal,
+    proto::compact_formats::{
+        <span class="self">self</span>, CompactBlock, CompactSaplingOutput, CompactSaplingSpend, CompactTx,
+    },
+    wallet::{Note, NoteId, OvkPolicy, ReceivedNote, WalletTransparentOutput},
+};
 
 <span class="attr">#[cfg(feature = <span class="string">"transparent-inputs"</span>)]
 </span><span class="kw">use </span>{
-    <span class="kw">super</span>::wallet::input_selection::ShieldingSelector, <span class="kw">crate</span>::wallet::TransparentAddressMetadata,
-    ::transparent::address::TransparentAddress, std::ops::Range,
+    <span class="kw">super</span>::wallet::input_selection::ShieldingSelector,
+    <span class="kw">crate</span>::wallet::TransparentAddressMetadata,
+    ::transparent::{address::TransparentAddress, keys::NonHardenedChildIndex},
+    std::ops::Range,
 };
 
 <span class="attr">#[cfg(feature = <span class="string">"orchard"</span>)]
@@ -5450,7 +5452,7 @@
     </span><span class="kw">fn </span>get_known_ephemeral_addresses(
         <span class="kw-2">&amp;</span><span class="self">self</span>,
         _account: <span class="self">Self</span>::AccountId,
-        _index_range: <span class="prelude-ty">Option</span>&lt;Range&lt;u32&gt;&gt;,
+        _index_range: <span class="prelude-ty">Option</span>&lt;Range&lt;NonHardenedChildIndex&gt;&gt;,
     ) -&gt; <span class="prelude-ty">Result</span>&lt;Vec&lt;(TransparentAddress, TransparentAddressMetadata)&gt;, <span class="self">Self</span>::Error&gt; {
         <span class="prelude-val">Ok</span>(<span class="macro">vec!</span>[])
     }

diff --git a/rustdoc/latest/src/zcash_client_backend/data_api/testing/pool.rs.html b/rustdoc/latest/src/zcash_client_backend/data_api/testing/pool.rs.html
@@ -3202,7 +3202,13 @@
 <a href="#3201" id="3201">3201</a>
 <a href="#3202" id="3202">3202</a>
 <a href="#3203" id="3203">3203</a>
-<a href="#3204" id="3204">3204</a></pre></div><pre class="rust"><code><span class="kw">use </span>std::{
+<a href="#3204" id="3204">3204</a>
+<a href="#3205" id="3205">3205</a>
+<a href="#3206" id="3206">3206</a>
+<a href="#3207" id="3207">3207</a>
+<a href="#3208" id="3208">3208</a>
+<a href="#3209" id="3209">3209</a>
+<a href="#3210" id="3210">3210</a></pre></div><pre class="rust"><code><span class="kw">use </span>std::{
     cmp::Eq,
     convert::Infallible,
     hash::Hash,
@@ -4031,7 +4037,13 @@
     // the start of the gap to index 12. This also tests the `index_range` parameter.
     </span><span class="kw">let </span>newer_known_addrs = st
         .wallet()
-        .get_known_ephemeral_addresses(account_id, <span class="prelude-val">Some</span>(<span class="number">5</span>..<span class="number">100</span>))
+        .get_known_ephemeral_addresses(
+            account_id,
+            <span class="prelude-val">Some</span>(
+                NonHardenedChildIndex::from_index(<span class="number">5</span>).unwrap()
+                    ..NonHardenedChildIndex::from_index(<span class="number">100</span>).unwrap(),
+            ),
+        )
         .unwrap();
     <span class="macro">assert_eq!</span>(newer_known_addrs.len(), (GAP_LIMIT <span class="kw">as </span>usize) + <span class="number">12 </span>- <span class="number">5</span>);
     <span class="macro">assert!</span>(newer_known_addrs.starts_with(<span class="kw-2">&amp;</span>new_known_addrs[<span class="number">5</span>..]));