wallet: Match output depth.

A txn in the chain tip is at depth=1

configure.ac

@@ -4,7 +4,7 @@ define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 18)
 define(_CLIENT_VERSION_REVISION, 1)
 define(_CLIENT_VERSION_PARTICL, 4)
-define(_CLIENT_VERSION_BUILD, 0)
+define(_CLIENT_VERSION_BUILD, 1)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)

src/anon.cpp

@@ -137,7 +137,7 @@ bool VerifyMLSAG(const CTransaction &tx, CValidationState &state)
             vCommitments.push_back(ao.commitment);
             vpInCommits[i+k*nCols] = vCommitments.back().data;
 
-            if (state.m_spend_height - ao.nBlockHeight < consensus.nMinRCTOutputDepth) {
+            if (state.m_spend_height - ao.nBlockHeight + 1 < consensus.nMinRCTOutputDepth) {
                 LogPrint(BCLog::RINGCT, "%s: Low input depth %s\n", __func__, state.m_spend_height - ao.nBlockHeight);
                 return state.DoS(0, false, REJECT_NONSTANDARD, "bad-anonin-depth");
             }

src/chainparams.cpp

@@ -809,7 +809,7 @@ class CRegTestParams : public CChainParams {
         // By default assume that the signatures in ancestors of this block are valid.
         consensus.defaultAssumeValid = uint256S("0x00");
 
-        consensus.nMinRCTOutputDepth = 1;
+        consensus.nMinRCTOutputDepth = 2;
 
         pchMessageStart[0] = 0x09;
         pchMessageStart[1] = 0x12;

src/wallet/hdwallet.cpp

@@ -4854,7 +4854,7 @@ int CHDWallet::PickHidingOutputs(std::vector<std::vector<int64_t> > &vMI,
         if (!pblocktree->ReadRCTOutput(nLastRCTOutIndex, ao)) {
             return wserrorN(1, sError, __func__, _("Anon output not found in db, %d"), nLastRCTOutIndex);
         }
-        if (ao.nBlockHeight > nBestHeight - (consensusParams.nMinRCTOutputDepth)) {
+        if (nBestHeight - ao.nBlockHeight + 1 < consensusParams.nMinRCTOutputDepth) {
             nLastRCTOutIndex--;
             continue;
         }