LarryRuane
diff --git a/‎.github/ISSUE_TEMPLATE.md
+1-1 b/‎.github/ISSUE_TEMPLATE.md
+1-1
diff --git a/‎doc/payment-api.md
+3-3 b/‎doc/payment-api.md
+3-3
diff --git a/‎doc/security-warnings.md
+1-1 b/‎doc/security-warnings.md
+1-1
diff --git a/‎doc/zmq.md
+3-3 b/‎doc/zmq.md
+3-3
diff --git a/‎src/addrman.h
+1-1 b/‎src/addrman.h
+1-1
diff --git a/‎src/asyncrpcoperation.h
+1-1 b/‎src/asyncrpcoperation.h
+1-1
diff --git a/‎src/base58.h
+1-1 b/‎src/base58.h
+1-1
diff --git a/‎src/coins.h
+1-1 b/‎src/coins.h
+1-1
diff --git a/‎src/consensus/params.h
+1-1 b/‎src/consensus/params.h
+1-1
diff --git a/‎src/gtest/test_mempool.cpp
+1-1 b/‎src/gtest/test_mempool.cpp
+1-1
diff --git a/‎src/httprpc.cpp
+1-1 b/‎src/httprpc.cpp
+1-1
diff --git a/‎src/init.cpp
+1-1 b/‎src/init.cpp
+1-1
diff --git a/‎src/main.cpp
+2-2 b/‎src/main.cpp
+2-2
diff --git a/‎src/merkleblock.cpp
+2-2 b/‎src/merkleblock.cpp
+2-2
diff --git a/‎src/merkleblock.h
+1-1 b/‎src/merkleblock.h
+1-1
diff --git a/‎src/miner.cpp
+1-1 b/‎src/miner.cpp
+1-1
diff --git a/‎src/net.cpp
+1-1 b/‎src/net.cpp
+1-1
diff --git a/‎src/netbase.cpp
+1-1 b/‎src/netbase.cpp
+1-1
diff --git a/‎src/netbase.h
+1-1 b/‎src/netbase.h
+1-1
diff --git a/‎src/policy/fees.h
+4-4 b/‎src/policy/fees.h
+4-4
diff --git a/‎src/pow/tromp/equi_miner.h
+1-1 b/‎src/pow/tromp/equi_miner.h
+1-1
diff --git a/‎src/rest.cpp
+2-2 b/‎src/rest.cpp
+2-2
@@ -37,6 +37,6 @@ Run `zcashd --version` to find out
 This includes the relevant contents of `~/.zcash/debug.log`. You can paste raw text, attach the file directly in the issue or link to the text via a pastebin type site.
 Please also include any non-standard things you did during compilation (extra flags, dependency version changes etc.) if applicable.
 
-### Do you have a back up of `~/.zcash` directory and/or take a VM snapshot?
+### Do you have a backup of `~/.zcash` directory and/or take a VM snapshot?
 - Backing up / making a copy of the `~/.zcash` directory might help make the problem reproducible. Please redact appropriately.
 - Taking a VM snapshot is really helpful for interactively testing fixes
@@ -46,7 +46,7 @@ RPC parameter conventions:
 
 Command | Parameters | Description
 --- | --- | ---
-z_getbalance<br>| address [minconf=1] | Returns the balance of a taddr or zaddr belonging to the node’s wallet.<br><br>Optionally set the minimum number of confirmations a private or transaction transaction must have in order to be included in the balance.  Use 0 to count unconfirmed transactions.
+z_getbalance<br>| address [minconf=1] | Returns the balance of a taddr or zaddr belonging to the node’s wallet.<br><br>Optionally set the minimum number of confirmations a private or transparent transaction must have in order to be included in the balance.  Use 0 to count unconfirmed transactions.
 z_gettotalbalance<br>| [minconf=1] | Return the total value of funds stored in the node’s wallet.<br><br>Optionally set the minimum number of confirmations a private or transparent transaction must have in order to be included in the balance.  Use 0 to count unconfirmed transactions.<br><br>Output:<br>{<br>"transparent" : 1.23,<br>"private" : 4.56,<br>"total" : 5.79}
 
 ### Addresses
@@ -72,7 +72,7 @@ Command | Parameters | Description
 --- | --- | ---
 z_listreceivedbyaddress<br> | zaddr [minconf=1] | Return a list of amounts received by a zaddr belonging to the node’s wallet.<br><br>Optionally set the minimum number of confirmations which a received amount must have in order to be included in the result.  Use 0 to count unconfirmed transactions.<br><br>Output:<br>[{<br>“txid”: “4a0f…”,<br>“amount”: 0.54,<br>“memo”:”F0FF…”,}, {...}, {...}<br>]
 z_sendmany<br> | fromaddress amounts [minconf=1] [fee=0.0001] | _This is an Asynchronous RPC call_<br><br>Send funds from an address to multiple outputs.  The address can be either a taddr or a zaddr.<br><br>Amounts is a list containing key/value pairs corresponding to the addresses and amount to pay.  Each output address can be in taddr or zaddr format.<br><br>When sending to a zaddr, you also have the option of attaching a memo in hexadecimal format.<br><br>**NOTE:**When sending coinbase funds to a zaddr, the node's wallet does not allow any change. Put another way, spending a partial amount of a coinbase utxo is not allowed. This is not a consensus rule but a local wallet rule due to the current implementation of z_sendmany. In future, this rule may be removed.<br><br>Example of Outputs parameter:<br>[{“address”:”t123…”, “amount”:0.005},<br>,{“address”:”z010…”,”amount”:0.03, “memo”:”f508af…”}]<br><br>Optionally set the minimum number of confirmations which a private or transparent transaction must have in order to be used as an input.  When sending from a zaddr, minconf must be greater than zero.<br><br>Optionally set a transaction fee, which by default is 0.0001 ZEC.<br><br>Any transparent change will be sent to a new transparent address.  Any private change will be sent back to the zaddr being used as the source of funds.<br><br>Returns an operationid.  You use the operationid value with z_getoperationstatus and z_getoperationresult to obtain the result of sending funds, which if successful, will be a txid.
-z_shieldcoinbase<br> | fromaddress toaddress [fee=0.0001] [limit=50] | _This is an Asynchronous RPC call_<br><br>Shield transparent coinbase funds by sending to a shielded z address.  Utxos selected for shielding will be locked.  If there is an error, they are unlocked.  The RPC call `listlockunspent` can be used to return a list of locked utxos.<br><br>The number of coinbase utxos selected for shielding can be set with the limit parameter, which has a default value of 50.  If the parameter is set to 0, the number of utxos selected is limited by the `-mempooltxinputlimit` option.  Any limit is constrained by a consensus rule defining a maximum transaction size of 100000 bytes.  <br><br>The from address is a taddr or "*" for all taddrs belonging to the wallet.  The to address is a zaddr. The default fee is 0.0001.<br><br>Returns an object containing an operationid which can be used with z_getoperationstatus and z_getoperationresult, along with key-value pairs regarding how many utxos are being shielded in this trasaction and what remains to be shielded.
+z_shieldcoinbase<br> | fromaddress toaddress [fee=0.0001] [limit=50] | _This is an Asynchronous RPC call_<br><br>Shield transparent coinbase funds by sending to a shielded z address.  Utxos selected for shielding will be locked.  If there is an error, they are unlocked.  The RPC call `listlockunspent` can be used to return a list of locked utxos.<br><br>The number of coinbase utxos selected for shielding can be set with the limit parameter, which has a default value of 50.  If the parameter is set to 0, the number of utxos selected is limited by the `-mempooltxinputlimit` option.  Any limit is constrained by a consensus rule defining a maximum transaction size of 100000 bytes.  <br><br>The from address is a taddr or "*" for all taddrs belonging to the wallet.  The to address is a zaddr. The default fee is 0.0001.<br><br>Returns an object containing an operationid which can be used with z_getoperationstatus and z_getoperationresult, along with key-value pairs regarding how many utxos are being shielded in this transaction and what remains to be shielded.
 
 ### Operations
 
@@ -159,7 +159,7 @@ RPC_WALLET_ERROR (-4) | _Unspecified problem with wallet_
 "Could not find previous JoinSplit anchor" | Try restarting node with `-reindex`.
 "Error decrypting output note of previous JoinSplit: __"  |
 "Could not find witness for note commitment" | Try restarting node with `-rescan`.
-"Witness for note commitment is null" | Missing witness for note commitement.
+"Witness for note commitment is null" | Missing witness for note commitment.
 "Witness for spendable note does not have same anchor as change input" | Invalid anchor for spendable note witness.
 "Not enough funds to pay miners fee" | Retry with sufficient funds.
 "Missing hex data for raw transaction" | Raw transaction data is null.
 
@@ -42,7 +42,7 @@ Wallet encryption is disabled, for several reasons:
 
 You should use full-disk encryption (or encryption of your home directory) to
 protect your wallet at rest, and should assume (even unprivileged) users who are
-runnng on your OS can read your wallet.dat file.
+running on your OS can read your wallet.dat file.
 
 Side-Channel Attacks
 --------------------
 
@@ -2,11 +2,11 @@
 
 [ZeroMQ](http://zeromq.org/) is a lightweight wrapper around TCP
 connections, inter-process communication, and shared-memory,
-providing various message-oriented semantics such as publish/subcribe,
+providing various message-oriented semantics such as publish/subscribe,
 request/reply, and push/pull.
 
 The Zcash daemon can be configured to act as a trusted "border
-router", implementing the zcash wire protocol and relay, making
+router", implementing the Zcash wire protocol and relay, making
 consensus decisions, maintaining the local blockchain database,
 broadcasting locally generated transactions into the network, and
 providing a queryable RPC interface to interact on a polled basis for
@@ -102,6 +102,6 @@ and just the tip will be notified. It is up to the subscriber to
 retrieve the chain from the last known block to the new tip.
 
 There are several possibilities that ZMQ notification can get lost
-during transmission depending on the communication type your are
+during transmission depending on the communication type you are
 using. Zcashd appends an up-counting sequence number to each
 notification which allows listeners to detect lost notifications.
@@ -234,7 +234,7 @@ class CAddrMan
     //! Select an address to connect to, if newOnly is set to true, only the new table is selected from.
     CAddrInfo Select_(bool newOnly);
 
-    //! Wraps GetRandInt to allow tests to override RandomInt and make it determinismistic.
+    //! Wraps GetRandInt to allow tests to override RandomInt and make it deterministic.
     virtual int RandomInt(int nMax);
 
 #ifdef DEBUG_ADDRMAN
 
@@ -24,7 +24,7 @@ using namespace std;
  * 
  * To subclass AsyncRPCOperation, implement the main() method.
  * Update the operation status as work is underway and completes.
- * If main() can be interrupted, inmplement the cancel() method.
+ * If main() can be interrupted, implement the cancel() method.
  */
 
 typedef std::string AsyncRPCOperationId;
 
@@ -194,7 +194,7 @@ template<typename K, int Size, CChainParams::Base58Type Type> class CBitcoinExtK
     K GetKey() {
         K ret;
         if (vchData.size() == Size) {
-            //if base58 encouded data not holds a ext key, return a !IsValid() key
+            //if base58 encoded data not holds a ext key, return a !IsValid() key
             ret.Decode(&vchData[0]);
         }
         return ret;
 
@@ -167,7 +167,7 @@ class CCoins
         nSize += ::GetSerializeSize(VARINT(nCode), nType, nVersion);
         // spentness bitmask
         nSize += nMaskSize;
-        // txouts themself
+        // txouts
         for (unsigned int i = 0; i < vout.size(); i++)
             if (!vout[i].IsNull())
                 nSize += ::GetSerializeSize(CTxOutCompressor(REF(vout[i])), nType, nVersion);
 
@@ -16,7 +16,7 @@ namespace Consensus {
  * Being array indices, these MUST be numbered consecutively.
  *
  * The order of these indices MUST match the order of the upgrades on-chain, as
- * several functions depends on the enum being sorted.
+ * several functions depend on the enum being sorted.
  */
 enum UpgradeIndex {
     // Sprout must be first
 
@@ -118,7 +118,7 @@ TEST(Mempool, TxInputLimit) {
     // Set a limit
     mapArgs["-mempooltxinputlimit"] = "10";
 
-    // Check it stil fails as expected
+    // Check it still fails as expected
     CValidationState state2;
     EXPECT_FALSE(AcceptToMemoryPool(pool, state2, tx1, false, &missingInputs));
     EXPECT_EQ(state2.GetRejectReason(), "bad-txns-version-too-low");
 
@@ -17,7 +17,7 @@
 static const char* WWW_AUTH_HEADER_DATA = "Basic realm=\"jsonrpc\"";
 
 /** Simple one-shot callback timer to be used by the RPC mechanism to e.g.
- * re-lock the wellet.
+ * re-lock the wallet.
  */
 class HTTPRPCTimer : public RPCTimerBase
 {
 
@@ -332,7 +332,7 @@ std::string HelpMessage(HelpMessageMode mode)
     const bool showDebug = GetBoolArg("-help-debug", false);
 
     // When adding new options to the categories, please keep and ensure alphabetical ordering.
-    // Do not translate _(...) -help-debug options, Many technical terms, and only a very small audience, so is unnecessary stress to translators
+    // Do not translate _(...) -help-debug options, many technical terms, and only a very small audience, so is unnecessary stress to translators
 
     string strUsage = HelpMessageGroup(_("Options:"));
     strUsage += HelpMessageOpt("-?", _("This help message"));
 
@@ -468,7 +468,7 @@ void FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<CBl
         }
 
         // Iterate over those blocks in vToFetch (in forward direction), adding the ones that
-        // are not yet downloaded and not in flight to vBlocks. In the mean time, update
+        // are not yet downloaded and not in flight to vBlocks. In the meantime, update
         // pindexLastCommonBlock as long as all ancestors are already downloaded, or if it's
         // already part of our chain (and therefore don't need it even if pruned).
         BOOST_FOREACH(CBlockIndex* pindex, vToFetch) {
@@ -2143,7 +2143,7 @@ void PartitionCheck(bool (*initialDownloadCheck)(), CCriticalSection& cs, const
     while (i->GetBlockTime() >= startTime) {
         ++nBlocks;
         i = i->pprev;
-        if (i == NULL) return; // Ran out of chain, we must not be fully sync'ed
+        if (i == NULL) return; // Ran out of chain, we must not be fully synced
     }
 
     // How likely is it to find that many by chance?
 
@@ -62,12 +62,12 @@ CMerkleBlock::CMerkleBlock(const CBlock& block, const std::set<uint256>& txids)
 
 uint256 CPartialMerkleTree::CalcHash(int height, unsigned int pos, const std::vector<uint256> &vTxid) {
     if (height == 0) {
-        // hash at height 0 is the txids themself
+        // hash at height 0 is the txid itself
         return vTxid[pos];
     } else {
         // calculate left hash
         uint256 left = CalcHash(height-1, pos*2, vTxid), right;
-        // calculate right hash if not beyond the end of the array - copy left hash otherwise1
+        // calculate right hash if not beyond the end of the array - copy left hash otherwise
         if (pos*2+1 < CalcTreeWidth(height-1))
             right = CalcHash(height-1, pos*2+1, vTxid);
         else
 
@@ -67,7 +67,7 @@ class CPartialMerkleTree
         return (nTransactions+(1 << height)-1) >> height;
     }
 
-    /** calculate the hash of a node in the merkle tree (at leaf level: the txid's themselves) */
+    /** calculate the hash of a node in the merkle tree (at leaf level: the txid itself) */
     uint256 CalcHash(int height, unsigned int pos, const std::vector<uint256> &vTxid);
 
     /** recursive function that traverses tree nodes, storing the data as bits and hashes */
 
@@ -658,7 +658,7 @@ void static BitcoinMiner()
                     equi eq(1);
                     eq.setstate(&curr_state);
 
-                    // Intialization done, start algo driver.
+                    // Initialization done, start algo driver.
                     eq.digit0(0);
                     eq.xfull = eq.bfull = eq.hfull = 0;
                     eq.showbsizes(0);
 
@@ -1074,7 +1074,7 @@ void ThreadSocketHandler()
                 //   happens when optimistic write failed, we choose to first drain the
                 //   write buffer in this case before receiving more. This avoids
                 //   needlessly queueing received data, if the remote peer is not themselves
-                //   receiving data. This means properly utilizing TCP flow control signalling.
+                //   receiving data. This means properly utilizing TCP flow control signaling.
                 // * Otherwise, if there is no (complete) message in the receive buffer,
                 //   or there is space left in the buffer, select() for receiving data.
                 // * (if neither of the above applies, there is certainly one message
 
@@ -140,7 +140,7 @@ bool static LookupIntern(const char *pszName, std::vector<CNetAddr>& vIP, unsign
         return false;
 
     do {
-        // Should set the timeout limit to a resonable value to avoid
+        // Should set the timeout limit to a reasonable value to avoid
         // generating unnecessary checking call during the polling loop,
         // while it can still response to stop request quick enough.
         // 2 seconds looks fine in our situation.
 
@@ -61,7 +61,7 @@ class CNetAddr
         bool IsIPv4() const;    // IPv4 mapped address (::FFFF:0:0/96, 0.0.0.0/0)
         bool IsIPv6() const;    // IPv6 address (not mapped IPv4, not Tor)
         bool IsRFC1918() const; // IPv4 private networks (10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12)
-        bool IsRFC2544() const; // IPv4 inter-network communcations (192.18.0.0/15)
+        bool IsRFC2544() const; // IPv4 inter-network communications (192.18.0.0/15)
         bool IsRFC6598() const; // IPv4 ISP-level NAT (100.64.0.0/10)
         bool IsRFC5737() const; // IPv4 documentation addresses (192.0.2.0/24, 198.51.100.0/24, 203.0.113.0/24)
         bool IsRFC3849() const; // IPv6 documentation address (2001:0DB8::/32)
 
@@ -28,7 +28,7 @@ class CTxMemPoolEntry;
  * included in blocks before transactions of lower fee/priority.   So for
  * example if you wanted to know what fee you should put on a transaction to
  * be included in a block within the next 5 blocks, you would start by looking
- * at the bucket with with the highest fee transactions and verifying that a
+ * at the bucket with the highest fee transactions and verifying that a
  * sufficiently high percentage of them were confirmed within 5 blocks and
  * then you would look at the next highest fee bucket, and so on, stopping at
  * the last bucket to pass the test.   The average fee of transactions in this
@@ -71,7 +71,7 @@ static const double DEFAULT_DECAY = .998;
 
 /**
  * We will instantiate two instances of this class, one to track transactions
- * that were included in a block due to fee, and one for tx's included due to
+ * that were included in a block due to fee, and one for txs included due to
  * priority.  We will lump transactions into a bucket according to their approximate
  * fee or priority and then track how long it took for those txs to be included
  * in a block. There is always a bucket into which any given double value
@@ -100,7 +100,7 @@ class TxConfirmStats
     // and calcuate the totals for the current block to update the moving averages
     std::vector<std::vector<int> > curBlockConf; // curBlockConf[Y][X]
 
-    // Sum the total priority/fee of all tx's in each bucket
+    // Sum the total priority/fee of all txs in each bucket
     // Track the historical moving average of this total over blocks
     std::vector<double> avg;
     // and calculate the total for the current block to update the moving average
@@ -217,7 +217,7 @@ static const double FEE_SPACING = 1.1;
 static const double PRI_SPACING = 2;
 
 /**
- *  We want to be able to estimate fees or priorities that are needed on tx's to be included in
+ *  We want to be able to estimate fees or priorities that are needed on txs to be included in
  * a certain number of blocks.  Every time a block is added to the best chain, this class records
  * stats on the transactions included in that block
  */
 
@@ -3,7 +3,7 @@
 
 // Fix N, K, such that n = N/(k+1) is integer
 // Fix M = 2^{n+1} hashes each of length N bits,
-// H_0, ... , H_{M-1}, generated fom (n+1)-bit indices.
+// H_0, ... , H_{M-1}, generated from (n+1)-bit indices.
 // Problem: find binary tree on 2^K distinct indices,
 // for which the exclusive-or of leaf hashes is all 0s.
 // Additionally, it should satisfy the Wagner conditions:
 
@@ -405,7 +405,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
         boost::split(uriParts, strUriParams, boost::is_any_of("/"));
     }
 
-    // throw exception in case of a empty request
+    // throw exception in case of an empty request
     std::string strRequestMutable = req->ReadBody();
     if (strRequestMutable.length() == 0 && uriParts.size() == 0)
         return RESTERR(req, HTTP_INTERNAL_SERVER_ERROR, "Error: empty request");
@@ -485,7 +485,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
     if (vOutPoints.size() > MAX_GETUTXOS_OUTPOINTS)
         return RESTERR(req, HTTP_INTERNAL_SERVER_ERROR, strprintf("Error: max outpoints exceeded (max: %d, tried: %d)", MAX_GETUTXOS_OUTPOINTS, vOutPoints.size()));
 
-    // check spentness and form a bitmap (as well as a JSON capable human-readble string representation)
+    // check spentness and form a bitmap (as well as a JSON capable human-readable string representation)
     vector<unsigned char> bitmap;
     vector<CCoin> outs;
     std::string bitmapStringRepresentation;
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ using namespace std;`
`24`	`24`	`*`
`25`	`25`	`* To subclass AsyncRPCOperation, implement the main() method.`
`26`	`26`	`* Update the operation status as work is underway and completes.`
`27`		`- * If main() can be interrupted, inmplement the cancel() method.`
	`27`	`+ * If main() can be interrupted, implement the cancel() method.`
`28`	`28`	`*/`
`29`	`29`
`30`	`30`	`typedef std::string AsyncRPCOperationId;`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ template<typename K, int Size, CChainParams::Base58Type Type> class CBitcoinExtK`
`194`	`194`	`K GetKey() {`
`195`	`195`	`K ret;`
`196`	`196`	`if (vchData.size() == Size) {`
`197`		`- //if base58 encouded data not holds a ext key, return a !IsValid() key`
	`197`	`+ //if base58 encoded data not holds a ext key, return a !IsValid() key`
`198`	`198`	`ret.Decode(&vchData[0]);`
`199`	`199`	`}`
`200`	`200`	`return ret;`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace Consensus {`
`16`	`16`	`* Being array indices, these MUST be numbered consecutively.`
`17`	`17`	`*`
`18`	`18`	`* The order of these indices MUST match the order of the upgrades on-chain, as`
`19`		`- * several functions depends on the enum being sorted.`
	`19`	`+ * several functions depend on the enum being sorted.`
`20`	`20`	`*/`
`21`	`21`	`enum UpgradeIndex {`
`22`	`22`	`// Sprout must be first`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`static const char* WWW_AUTH_HEADER_DATA = "Basic realm=\"jsonrpc\"";`
`18`	`18`
`19`	`19`	`/** Simple one-shot callback timer to be used by the RPC mechanism to e.g.`
`20`		`- * re-lock the wellet.`
	`20`	`+ * re-lock the wallet.`
`21`	`21`	`*/`
`22`	`22`	`class HTTPRPCTimer : public RPCTimerBase`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ class CPartialMerkleTree`
`67`	`67`	`return (nTransactions+(1 << height)-1) >> height;`
`68`	`68`	`}`
`69`	`69`
`70`		`- /** calculate the hash of a node in the merkle tree (at leaf level: the txid's themselves) */`
	`70`	`+ /** calculate the hash of a node in the merkle tree (at leaf level: the txid itself) */`
`71`	`71`	`uint256 CalcHash(int height, unsigned int pos, const std::vector<uint256> &vTxid);`
`72`	`72`
`73`	`73`	`/** recursive function that traverses tree nodes, storing the data as bits and hashes */`