Merge branch 'main' into fix-address-crawler-timing

ZcashFoundation · Jan 4, 2022 · 84535f2 · 84535f2
2 parents f200886 + 9b12716
commit 84535f2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/zebra-consensus/src/block/subsidy/funding_streams.rs b/zebra-consensus/src/block/subsidy/funding_streams.rs
@@ -49,7 +49,7 @@ pub fn funding_stream_values(
     Ok(results)
 }
 
-/// Returns the minumum height after the first halving
+/// Returns the minimum height after the first halving
 /// as described in [protocol specification §7.10][7.10]
 ///
 /// [7.10]: https://zips.z.cash/protocol/protocol.pdf#fundingstreams

diff --git a/zebra-consensus/src/parameters/subsidy.rs b/zebra-consensus/src/parameters/subsidy.rs
@@ -74,7 +74,7 @@ pub const FUNDING_STREAM_RECEIVERS_NUMBER: usize = FundingStreamReceiver::receiv
 pub const FUNDING_STREAM_RECEIVER_DENOMINATOR: u64 = 100;
 
 lazy_static! {
-    /// The numerator for each funding stream reciever category
+    /// The numerator for each funding stream receiver category
     /// as described in [protocol specification §7.10.1][7.10.1].
     ///
     /// [7.10.1]: https://zips.z.cash/protocol/protocol.pdf#zip214fundingstreams
@@ -97,7 +97,7 @@ lazy_static! {
         hash_map
     };
 
-    /// Convinient storage for all addresses, for all receivers and networks
+    /// Convenient storage for all addresses, for all receivers and networks
     pub static ref FUNDING_STREAM_ADDRESSES: HashMap<Network, HashMap<FundingStreamReceiver, Vec<String>>> = {
         let mut addresses_by_network = HashMap::with_capacity(2);
 

diff --git a/zebra-consensus/src/primitives/groth16/params.rs b/zebra-consensus/src/primitives/groth16/params.rs
@@ -25,7 +25,7 @@ lazy_static::lazy_static! {
     /// Groth16 Zero-Knowledge Proof parameters for the Sapling and Sprout circuits.
     ///
     /// When this static is accessed:
-    /// - the parameters are downloded if needed, then cached to a shared directory,
+    /// - the parameters are downloaded if needed, then cached to a shared directory,
     /// - the file hashes are checked, for both newly downloaded and previously cached files,
     /// - the parameters are loaded into Zebra.
     ///

diff --git a/zebra-state/src/service/pending_utxos.rs b/zebra-state/src/service/pending_utxos.rs
@@ -39,7 +39,7 @@ impl PendingUtxos {
     /// [`transparent::OutPoint`] that the [`Utxo`] has arrived.
     pub fn respond(&mut self, outpoint: &transparent::OutPoint, utxo: transparent::Utxo) {
         if let Some(sender) = self.0.remove(outpoint) {
-            // Adding the outpoint as a field lets us crossreference
+            // Adding the outpoint as a field lets us cross-reference
             // with the trace of the verification that made the request.
             tracing::trace!(?outpoint, "found pending UTXO");
             let _ = sender.send(utxo);

diff --git a/zebrad/src/commands/download.rs b/zebrad/src/commands/download.rs
@@ -1,6 +1,6 @@
 //! `download` subcommand - pre-download required parameter files
 //!
-//! `zebrad download` automatically downloads required paramter files the first time it is run.
+//! `zebrad download` automatically downloads required parameter files the first time it is run.
 //!
 //! This command should be used if you're launching lots of `zebrad start` instances for testing,
 //! or you want to include the parameter files in a distribution package.