neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Implement BIP69 outside of CTxIn/CTxOut (#1514)

Browse Source 
Apply BIP69 on transaction creation only, fix inputs order to match the BIP
This commit is contained in:
UdjinM6 2017-07-10 17:42:59 +03:00 committed by GitHub
parent 7abac068b6
commit 397ea95dbb
3 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/primitives/transaction.h
View File

@ -199,11 +199,6 @@ public:
return !(a == b); return !(a == b);
} }
friend bool operator<(const CTxOut& a, const CTxOut& b)
{
return a.nValue < b.nValue || (a.nValue == b.nValue && a.scriptPubKey < b.scriptPubKey);
}
std::string ToString() const; std::string ToString() const;
}; };
@ -338,4 +333,32 @@ struct CMutableTransaction
}; };
/** Implementation of BIP69
* https://github.com/bitcoin/bips/blob/master/bip-0069.mediawiki
*/
struct CompareInputBIP69
{
inline bool operator()(const CTxIn& a, const CTxIn& b) const
{
if (a.prevout.hash == b.prevout.hash) return a.prevout.n < b.prevout.n;
uint256 hasha = a.prevout.hash;
uint256 hashb = b.prevout.hash;
typedef std::reverse_iterator<const unsigned char*> rev_it;
rev_it rita = rev_it(hasha.end());
rev_it ritb = rev_it(hashb.end());
return std::lexicographical_compare(rita, rita + hasha.size(), ritb, ritb + hashb.size());
}
};
struct CompareOutputBIP69
{
inline bool operator()(const CTxOut& a, const CTxOut& b) const
{
return a.nValue < b.nValue || (a.nValue == b.nValue && a.scriptPubKey < b.scriptPubKey);
}
};
#endif // BITCOIN_PRIMITIVES_TRANSACTION_H #endif // BITCOIN_PRIMITIVES_TRANSACTION_H

5
src/privatesend-server.cpp
View File

@ -320,9 +320,8 @@ void CPrivateSendServer::CreateFinalTransaction()
txNew.vin.push_back(txdsin); txNew.vin.push_back(txdsin);
} }
// BIP69 https://github.com/kristovatlas/bips/blob/master/bip-0069.mediawiki sort(txNew.vin.begin(), txNew.vin.end(), CompareInputBIP69());
sort(txNew.vin.begin(), txNew.vin.end()); sort(txNew.vout.begin(), txNew.vout.end(), CompareOutputBIP69());
sort(txNew.vout.begin(), txNew.vout.end());
finalMutableTransaction = txNew; finalMutableTransaction = txNew;
LogPrint("privatesend", "CPrivateSendServer::CreateFinalTransaction -- finalMutableTransaction=%s", txNew.ToString()); LogPrint("privatesend", "CPrivateSendServer::CreateFinalTransaction -- finalMutableTransaction=%s", txNew.ToString());

5
src/wallet/wallet.cpp
View File

@ -3425,9 +3425,8 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
txNew.vin.push_back(txin); txNew.vin.push_back(txin);
} }
// BIP69 https://github.com/kristovatlas/bips/blob/master/bip-0069.mediawiki sort(txNew.vin.begin(), txNew.vin.end(), CompareInputBIP69());
sort(txNew.vin.begin(), txNew.vin.end()); sort(txNew.vout.begin(), txNew.vout.end(), CompareOutputBIP69());
sort(txNew.vout.begin(), txNew.vout.end());
// If there was change output added before, we must update its position now // If there was change output added before, we must update its position now
if (nChangePosRet != -1) { if (nChangePosRet != -1) {