aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Corallo <git@bluematt.me>2013-06-13 22:28:03 +0200
committerMatt Corallo <git@bluematt.me>2013-06-13 22:28:03 +0200
commitb1f15b218be8dfd1d2dbd375d469794bb7326748 (patch)
tree352477d43c623219e262d3e9db5149ab01e1ba76
parentd1020b780a1493c6a709f70756b2af54a7126f40 (diff)
Remove broken option to skip input checking for wallet txn.
-rw-r--r--src/main.cpp19
-rw-r--r--src/main.h4
-rw-r--r--src/rpcrawtransaction.cpp2
-rw-r--r--src/wallet.cpp4
-rw-r--r--src/wallet.h2
5 files changed, 15 insertions, 16 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 98921e1423..f0c08d273f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -694,7 +694,7 @@ void CTxMemPool::pruneSpent(const uint256 &hashTx, CCoins &coins)
}
}
-bool CTxMemPool::accept(CValidationState &state, CTransaction &tx, bool fCheckInputs, bool fLimitFree,
+bool CTxMemPool::accept(CValidationState &state, CTransaction &tx, bool fLimitFree,
bool* pfMissingInputs)
{
if (pfMissingInputs)
@@ -751,7 +751,6 @@ bool CTxMemPool::accept(CValidationState &state, CTransaction &tx, bool fCheckIn
}
}
- if (fCheckInputs)
{
CCoinsView dummy;
CCoinsViewCache view(dummy);
@@ -968,15 +967,15 @@ int CMerkleTx::GetBlocksToMaturity() const
}
-bool CMerkleTx::AcceptToMemoryPool(bool fCheckInputs, bool fLimitFree)
+bool CMerkleTx::AcceptToMemoryPool(bool fLimitFree)
{
CValidationState state;
- return mempool.accept(state, *this, fCheckInputs, fLimitFree, NULL);
+ return mempool.accept(state, *this, fLimitFree, NULL);
}
-bool CWalletTx::AcceptWalletTransaction(bool fCheckInputs)
+bool CWalletTx::AcceptWalletTransaction()
{
{
LOCK(mempool.cs);
@@ -987,10 +986,10 @@ bool CWalletTx::AcceptWalletTransaction(bool fCheckInputs)
{
uint256 hash = tx.GetHash();
if (!mempool.exists(hash) && pcoinsTip->HaveCoins(hash))
- tx.AcceptToMemoryPool(fCheckInputs, false);
+ tx.AcceptToMemoryPool(false);
}
}
- return AcceptToMemoryPool(fCheckInputs, false);
+ return AcceptToMemoryPool(false);
}
return false;
}
@@ -1865,7 +1864,7 @@ bool SetBestChain(CValidationState &state, CBlockIndex* pindexNew)
BOOST_FOREACH(CTransaction& tx, vResurrect) {
// ignore validation errors in resurrected transactions
CValidationState stateDummy;
- mempool.accept(stateDummy, tx, true, false, NULL);
+ mempool.accept(stateDummy, tx, false, NULL);
}
// Delete redundant memory transactions that are in the connected branch
@@ -3507,7 +3506,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
bool fMissingInputs = false;
CValidationState state;
- if (mempool.accept(state, tx, true, true, &fMissingInputs))
+ if (mempool.accept(state, tx, true, &fMissingInputs))
{
RelayTransaction(tx, inv.hash, vMsg);
mapAlreadyAskedFor.erase(inv);
@@ -3530,7 +3529,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
// Use a dummy CValidationState so someone can't setup nodes to counter-DoS based on orphan resolution (that is, feeding people an invalid transaction based on LegitTxX in order to get anyone relaying LegitTxX banned)
CValidationState stateDummy;
- if (mempool.accept(stateDummy, tx, true, true, &fMissingInputs2))
+ if (mempool.accept(stateDummy, tx, true, &fMissingInputs2))
{
printf(" accepted orphan tx %s\n", inv.hash.ToString().c_str());
RelayTransaction(tx, inv.hash, vMsg);
diff --git a/src/main.h b/src/main.h
index f20fad98a4..87f1dbfa8f 100644
--- a/src/main.h
+++ b/src/main.h
@@ -478,7 +478,7 @@ public:
int GetDepthInMainChain() const { CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet); }
bool IsInMainChain() const { return GetDepthInMainChain() > 0; }
int GetBlocksToMaturity() const;
- bool AcceptToMemoryPool(bool fCheckInputs=true, bool fLimitFree=true);
+ bool AcceptToMemoryPool(bool fLimitFree=true);
};
@@ -1334,7 +1334,7 @@ public:
std::map<uint256, CTransaction> mapTx;
std::map<COutPoint, CInPoint> mapNextTx;
- bool accept(CValidationState &state, CTransaction &tx, bool fCheckInputs, bool fLimitFree, bool* pfMissingInputs);
+ bool accept(CValidationState &state, CTransaction &tx, bool fLimitFree, bool* pfMissingInputs);
bool addUnchecked(const uint256& hash, CTransaction &tx);
bool remove(const CTransaction &tx, bool fRecursive = false);
bool removeConflicts(const CTransaction &tx);
diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp
index 917c2f5de9..61cb4e390e 100644
--- a/src/rpcrawtransaction.cpp
+++ b/src/rpcrawtransaction.cpp
@@ -555,7 +555,7 @@ Value sendrawtransaction(const Array& params, bool fHelp)
if (!fHave) {
// push to local node
CValidationState state;
- if (!mempool.accept(state, tx, true, false, NULL))
+ if (!mempool.accept(state, tx, false, NULL))
throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX rejected"); // TODO: report validation state
}
}
diff --git a/src/wallet.cpp b/src/wallet.cpp
index 9a4a92cd5f..4cd04bb6e2 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -852,7 +852,7 @@ void CWallet::ReacceptWalletTransactions()
{
// Re-accept any txes of ours that aren't already in a block
if (!wtx.IsCoinBase())
- wtx.AcceptWalletTransaction(false);
+ wtx.AcceptWalletTransaction();
}
}
if (fMissing)
@@ -1365,7 +1365,7 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey)
mapRequestCount[wtxNew.GetHash()] = 0;
// Broadcast
- if (!wtxNew.AcceptToMemoryPool(true, false))
+ if (!wtxNew.AcceptToMemoryPool(false))
{
// This must not fail. The transaction has already been signed and recorded.
printf("CommitTransaction() : Error: Transaction not valid");
diff --git a/src/wallet.h b/src/wallet.h
index a0688b8a02..2b3131261c 100644
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -689,7 +689,7 @@ public:
int GetRequestCount() const;
void AddSupportingTransactions();
- bool AcceptWalletTransaction(bool fCheckInputs=true);
+ bool AcceptWalletTransaction();
void RelayWalletTransaction();
};