a more sanitized check for received transaction: check commitment whenever receive a tranaction

pvc2104 · pvc2104 · commit b62a4f0e3a46 · 2019-10-31T23:09:22.000+07:00
diff --git a/src/wallet.cpp b/src/wallet.cpp
@@ -7040,10 +7040,20 @@ bool CWallet::RevealTxOutAmount(const CTransaction& tx, const CTxOut& out, CAmou
                 uint256 mask = out.maskValue.mask;
                 CKey decodedMask;
                 ECDHInfo::Decode(mask.begin(), val.begin(), sharedSec, decodedMask, amount);
-                amountMap[out.scriptPubKey] = amount;
-                blindMap[out.scriptPubKey] = decodedMask;
-                blind.Set(blindMap[out.scriptPubKey].begin(), blindMap[out.scriptPubKey].end(), true);
-                return true;
+                std::vector<unsigned char> commitment;
+                if (CreateCommitment(decodedMask.begin(), amount, commitment)) {
+                    //make sure the amount and commitment are matched
+                    if (commitment == out.commitment) {
+                        amountMap[out.scriptPubKey] = amount;
+                        blindMap[out.scriptPubKey] = decodedMask;
+                        blind.Set(blindMap[out.scriptPubKey].begin(), blindMap[out.scriptPubKey].end(), true);
+                        return true;
+                    } else {
+                        amount = 0;
+                        amountMap[out.scriptPubKey] = amount;
+                        return false;
+                    }
+                }
             }
         }
     }
