Implement CTransaction::IsEquivalentTo(...)

dgenr8 · dgenr8 · commit b2b361926215 · 2015-04-11T19:03:58.000-07:00
Define CTransaction::IsEquivalentTo(const CTransaction&amp; tx)

True if only scriptSigs are different.  In other words, true if
the two transactions are malleability clones.  In other words,
true if the two transactions have the same effect on the
outside universe.

In the wallet, only SyncMetaData for equivalent transactions.
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
@@ -87,6 +87,15 @@ CTransaction& CTransaction::operator=(const CTransaction &tx) {
     return *this;
 }
 
+bool CTransaction::IsEquivalentTo(const CTransaction& tx) const
+{
+	CMutableTransaction tx1 = *this;
+	CMutableTransaction tx2 = tx;
+	for (unsigned int i = 0; i < tx1.vin.size(); i++) tx1.vin[i].scriptSig = CScript();
+	for (unsigned int i = 0; i < tx2.vin.size(); i++) tx2.vin[i].scriptSig = CScript();
+	return CTransaction(tx1) == CTransaction(tx2);
+}
+
 CAmount CTransaction::GetValueOut() const
 {
     CAmount nValueOut = 0;
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
@@ -222,6 +222,9 @@ class CTransaction
         return hash;
     }
 
+    // True if only scriptSigs are different
+    bool IsEquivalentTo(const CTransaction& tx) const;
+
     // Return sum of txouts.
     CAmount GetValueOut() const;
     // GetValueIn() is a method on CCoinsViewCache, because
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -417,6 +417,7 @@ void CWallet::SyncMetaData(pair<TxSpends::iterator, TxSpends::iterator> range)
         const uint256& hash = it->second;
         CWalletTx* copyTo = &mapWallet[hash];
         if (copyFrom == copyTo) continue;
+        if (!copyFrom->IsEquivalentTo(*copyTo)) continue;
         copyTo->mapValue = copyFrom->mapValue;
         copyTo->vOrderForm = copyFrom->vOrderForm;
         // fTimeReceivedIsTxTime not copied on purpose

Original file line number	Diff line number	Diff line change
`@@ -222,6 +222,9 @@ class CTransaction`
`222`	`222`	`return hash;`
`223`	`223`	`}`
`224`	`224`
	`225`	`+ // True if only scriptSigs are different`
	`226`	`+ bool IsEquivalentTo(const CTransaction& tx) const;`
	`227`	`+`
`225`	`228`	`// Return sum of txouts.`
`226`	`229`	`CAmount GetValueOut() const;`
`227`	`230`	`// GetValueIn() is a method on CCoinsViewCache, because`