dash/blackcoin-more
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make it compile

Browse Source
This commit is contained in:
lateminer
2018-10-14 14:22:03 +03:00
parent 7d639de831
commit 43e6bbc312
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bitcoin-tx.cpp
View File

@@ -499,7 +499,7 @@ static void MutateTxSign(CMutableTransaction& tx, const string& flagStr)
// ... and merge in other signatures:
BOOST_FOREACH(const CTransaction& txv, txVariants) {
txin.scriptSig = CombineSignatures(prevPubKey, mergedTx, i, amount, txin.scriptSig, txv.vin[i].scriptSig);
txin.scriptSig = CombineSignatures(prevPubKey, MutableTransactionSignatureChecker(&mergedTx, i, amount), txin.scriptSig, txv.vin[i].scriptSig);
}
if (!VerifyScript(txin.scriptSig, prevPubKey, STANDARD_SCRIPT_VERIFY_FLAGS, MutableTransactionSignatureChecker(&mergedTx, i, amount)))
fComplete = false;

4
src/main.cpp
View File

@@ -1119,12 +1119,12 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
{
COutPoint outpoint = txin.prevout;
// A respend is a tx that conflicts with a member of the pool
auto itConflicting = pool.mapNextTx.find(txin.prevout);
auto itConflicting = pool.mapNextTx.find(outpoint);
if (itConflicting != pool.mapNextTx.end())
{
fRespend = true;
// Relay only one tx per respent outpoint, but not if tx is equivalent to pool member
if (!doubleSpendFilter.contains(outpoint) && !tx.IsEquivalentTo(*pool.mapNextTx[outpoint].ptx))
if (!doubleSpendFilter.contains(outpoint) && !tx.IsEquivalentTo(*itConflicting->second))
{
relayForOutpoint = outpoint;
break;