|
|
|
@ -288,7 +288,7 @@ bool CTransaction::AreInputsStandard(const MapPrevTx& mapInputs) const
@@ -288,7 +288,7 @@ bool CTransaction::AreInputsStandard(const MapPrevTx& mapInputs) const
|
|
|
|
|
if (IsCoinBase()) |
|
|
|
|
return true; // Coinbases don't use vin normally
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < vin.size(); i++) |
|
|
|
|
for (unsigned int i = 0; i < vin.size(); i++) |
|
|
|
|
{ |
|
|
|
|
const CTxOut& prev = GetOutputFor(vin[i], mapInputs); |
|
|
|
|
|
|
|
|
@ -484,7 +484,7 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
@@ -484,7 +484,7 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
|
|
|
|
|
|
|
|
|
|
// Check for conflicts with in-memory transactions
|
|
|
|
|
CTransaction* ptxOld = NULL; |
|
|
|
|
for (int i = 0; i < vin.size(); i++) |
|
|
|
|
for (unsigned int i = 0; i < vin.size(); i++) |
|
|
|
|
{ |
|
|
|
|
COutPoint outpoint = vin[i].prevout; |
|
|
|
|
if (mapNextTx.count(outpoint)) |
|
|
|
@ -500,7 +500,7 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
@@ -500,7 +500,7 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
|
|
|
|
|
return false; |
|
|
|
|
if (!IsNewerThan(*ptxOld)) |
|
|
|
|
return false; |
|
|
|
|
for (int i = 0; i < vin.size(); i++) |
|
|
|
|
for (unsigned int i = 0; i < vin.size(); i++) |
|
|
|
|
{ |
|
|
|
|
COutPoint outpoint = vin[i].prevout; |
|
|
|
|
if (!mapNextTx.count(outpoint) || mapNextTx[outpoint].ptx != ptxOld) |
|
|
|
@ -603,7 +603,7 @@ bool CTransaction::AddToMemoryPoolUnchecked()
@@ -603,7 +603,7 @@ bool CTransaction::AddToMemoryPoolUnchecked()
|
|
|
|
|
LOCK(cs_mapTransactions); |
|
|
|
|
uint256 hash = GetHash(); |
|
|
|
|
mapTransactions[hash] = *this; |
|
|
|
|
for (int i = 0; i < vin.size(); i++) |
|
|
|
|
for (unsigned int i = 0; i < vin.size(); i++) |
|
|
|
|
mapNextTx[vin[i].prevout] = CInPoint(&mapTransactions[hash], i); |
|
|
|
|
nTransactionsUpdated++; |
|
|
|
|
++nPooledTx; |
|
|
|
@ -989,7 +989,7 @@ bool CTransaction::FetchInputs(CTxDB& txdb, const map<uint256, CTxIndex>& mapTes
@@ -989,7 +989,7 @@ bool CTransaction::FetchInputs(CTxDB& txdb, const map<uint256, CTxIndex>& mapTes
|
|
|
|
|
if (IsCoinBase()) |
|
|
|
|
return true; // Coinbase transactions have no inputs to fetch.
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < vin.size(); i++) |
|
|
|
|
for (unsigned int i = 0; i < vin.size(); i++) |
|
|
|
|
{ |
|
|
|
|
COutPoint prevout = vin[i].prevout; |
|
|
|
|
if (inputsRet.count(prevout.hash)) |
|
|
|
@ -1034,7 +1034,7 @@ bool CTransaction::FetchInputs(CTxDB& txdb, const map<uint256, CTxIndex>& mapTes
@@ -1034,7 +1034,7 @@ bool CTransaction::FetchInputs(CTxDB& txdb, const map<uint256, CTxIndex>& mapTes
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Make sure all prevout.n's are valid:
|
|
|
|
|
for (int i = 0; i < vin.size(); i++) |
|
|
|
|
for (unsigned int i = 0; i < vin.size(); i++) |
|
|
|
|
{ |
|
|
|
|
const COutPoint prevout = vin[i].prevout; |
|
|
|
|
assert(inputsRet.count(prevout.hash) != 0); |
|
|
|
@ -1071,7 +1071,7 @@ int64 CTransaction::GetValueIn(const MapPrevTx& inputs) const
@@ -1071,7 +1071,7 @@ int64 CTransaction::GetValueIn(const MapPrevTx& inputs) const
|
|
|
|
|
return 0; |
|
|
|
|
|
|
|
|
|
int64 nResult = 0; |
|
|
|
|
for (int i = 0; i < vin.size(); i++) |
|
|
|
|
for (unsigned int i = 0; i < vin.size(); i++) |
|
|
|
|
{ |
|
|
|
|
nResult += GetOutputFor(vin[i], inputs).nValue; |
|
|
|
|
} |
|
|
|
@ -1085,7 +1085,7 @@ int CTransaction::GetP2SHSigOpCount(const MapPrevTx& inputs) const
@@ -1085,7 +1085,7 @@ int CTransaction::GetP2SHSigOpCount(const MapPrevTx& inputs) const
|
|
|
|
|
return 0; |
|
|
|
|
|
|
|
|
|
int nSigOps = 0; |
|
|
|
|
for (int i = 0; i < vin.size(); i++) |
|
|
|
|
for (unsigned int i = 0; i < vin.size(); i++) |
|
|
|
|
{ |
|
|
|
|
const CTxOut& prevout = GetOutputFor(vin[i], inputs); |
|
|
|
|
if (prevout.scriptPubKey.IsPayToScriptHash()) |
|
|
|
@ -1106,7 +1106,7 @@ bool CTransaction::ConnectInputs(MapPrevTx inputs,
@@ -1106,7 +1106,7 @@ bool CTransaction::ConnectInputs(MapPrevTx inputs,
|
|
|
|
|
{ |
|
|
|
|
int64 nValueIn = 0; |
|
|
|
|
int64 nFees = 0; |
|
|
|
|
for (int i = 0; i < vin.size(); i++) |
|
|
|
|
for (unsigned int i = 0; i < vin.size(); i++) |
|
|
|
|
{ |
|
|
|
|
COutPoint prevout = vin[i].prevout; |
|
|
|
|
assert(inputs.count(prevout.hash) > 0); |
|
|
|
@ -1185,7 +1185,7 @@ bool CTransaction::ClientConnectInputs()
@@ -1185,7 +1185,7 @@ bool CTransaction::ClientConnectInputs()
|
|
|
|
|
{ |
|
|
|
|
LOCK(cs_mapTransactions); |
|
|
|
|
int64 nValueIn = 0; |
|
|
|
|
for (int i = 0; i < vin.size(); i++) |
|
|
|
|
for (unsigned int i = 0; i < vin.size(); i++) |
|
|
|
|
{ |
|
|
|
|
// Get prev tx from single transactions in memory
|
|
|
|
|
COutPoint prevout = vin[i].prevout; |
|
|
|
@ -1396,7 +1396,7 @@ bool static Reorganize(CTxDB& txdb, CBlockIndex* pindexNew)
@@ -1396,7 +1396,7 @@ bool static Reorganize(CTxDB& txdb, CBlockIndex* pindexNew)
|
|
|
|
|
|
|
|
|
|
// Connect longer branch
|
|
|
|
|
vector<CTransaction> vDelete; |
|
|
|
|
for (int i = 0; i < vConnect.size(); i++) |
|
|
|
|
for (unsigned int i = 0; i < vConnect.size(); i++) |
|
|
|
|
{ |
|
|
|
|
CBlockIndex* pindex = vConnect[i]; |
|
|
|
|
CBlock block; |
|
|
|
@ -1635,7 +1635,7 @@ bool CBlock::CheckBlock() const
@@ -1635,7 +1635,7 @@ bool CBlock::CheckBlock() const
|
|
|
|
|
// First transaction must be coinbase, the rest must not be
|
|
|
|
|
if (vtx.empty() || !vtx[0].IsCoinBase()) |
|
|
|
|
return DoS(100, error("CheckBlock() : first tx is not coinbase")); |
|
|
|
|
for (int i = 1; i < vtx.size(); i++) |
|
|
|
|
for (unsigned int i = 1; i < vtx.size(); i++) |
|
|
|
|
if (vtx[i].IsCoinBase()) |
|
|
|
|
return DoS(100, error("CheckBlock() : more than one coinbase")); |
|
|
|
|
|
|
|
|
@ -1771,7 +1771,7 @@ bool ProcessBlock(CNode* pfrom, CBlock* pblock)
@@ -1771,7 +1771,7 @@ bool ProcessBlock(CNode* pfrom, CBlock* pblock)
|
|
|
|
|
// Recursively process any orphan blocks that depended on this one
|
|
|
|
|
vector<uint256> vWorkQueue; |
|
|
|
|
vWorkQueue.push_back(hash); |
|
|
|
|
for (int i = 0; i < vWorkQueue.size(); i++) |
|
|
|
|
for (unsigned int i = 0; i < vWorkQueue.size(); i++) |
|
|
|
|
{ |
|
|
|
|
uint256 hashPrev = vWorkQueue[i]; |
|
|
|
|
for (multimap<uint256, CBlock*>::iterator mi = mapOrphanBlocksByPrev.lower_bound(hashPrev); |
|
|
|
@ -1995,7 +1995,7 @@ void PrintBlockTree()
@@ -1995,7 +1995,7 @@ void PrintBlockTree()
|
|
|
|
|
|
|
|
|
|
// put the main timechain first
|
|
|
|
|
vector<CBlockIndex*>& vNext = mapNext[pindex]; |
|
|
|
|
for (int i = 0; i < vNext.size(); i++) |
|
|
|
|
for (unsigned int i = 0; i < vNext.size(); i++) |
|
|
|
|
{ |
|
|
|
|
if (vNext[i]->pnext) |
|
|
|
|
{ |
|
|
|
@ -2005,7 +2005,7 @@ void PrintBlockTree()
@@ -2005,7 +2005,7 @@ void PrintBlockTree()
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// iterate children
|
|
|
|
|
for (int i = 0; i < vNext.size(); i++) |
|
|
|
|
for (unsigned int i = 0; i < vNext.size(); i++) |
|
|
|
|
vStack.push_back(make_pair(nCol+i, vNext[i])); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
@ -2360,7 +2360,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
@@ -2360,7 +2360,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
CTxDB txdb("r"); |
|
|
|
|
for (int nInv = 0; nInv < vInv.size(); nInv++) |
|
|
|
|
for (unsigned int nInv = 0; nInv < vInv.size(); nInv++) |
|
|
|
|
{ |
|
|
|
|
const CInv &inv = vInv[nInv]; |
|
|
|
|
|
|
|
|
@ -2536,7 +2536,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
@@ -2536,7 +2536,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
|
|
|
|
|
vWorkQueue.push_back(inv.hash); |
|
|
|
|
|
|
|
|
|
// Recursively process any orphan transactions that depended on this one
|
|
|
|
|
for (int i = 0; i < vWorkQueue.size(); i++) |
|
|
|
|
for (unsigned int i = 0; i < vWorkQueue.size(); i++) |
|
|
|
|
{ |
|
|
|
|
uint256 hashPrev = vWorkQueue[i]; |
|
|
|
|
for (multimap<uint256, CDataStream*>::iterator mi = mapOrphanTransactionsByPrev.lower_bound(hashPrev); |
|
|
|
@ -3294,7 +3294,7 @@ void FormatHashBuffers(CBlock* pblock, char* pmidstate, char* pdata, char* phash
@@ -3294,7 +3294,7 @@ void FormatHashBuffers(CBlock* pblock, char* pmidstate, char* pdata, char* phash
|
|
|
|
|
FormatHashBlocks(&tmp.hash1, sizeof(tmp.hash1)); |
|
|
|
|
|
|
|
|
|
// Byte swap all the input buffer
|
|
|
|
|
for (int i = 0; i < sizeof(tmp)/4; i++) |
|
|
|
|
for (unsigned int i = 0; i < sizeof(tmp)/4; i++) |
|
|
|
|
((unsigned int*)&tmp)[i] = ByteReverse(((unsigned int*)&tmp)[i]); |
|
|
|
|
|
|
|
|
|
// Precalc the first half of the first hash, which stays constant
|
|
|
|
@ -3419,7 +3419,7 @@ void static BitcoinMiner(CWallet *pwallet)
@@ -3419,7 +3419,7 @@ void static BitcoinMiner(CWallet *pwallet)
|
|
|
|
|
// Check if something found
|
|
|
|
|
if (nNonceFound != -1) |
|
|
|
|
{ |
|
|
|
|
for (int i = 0; i < sizeof(hash)/4; i++) |
|
|
|
|
for (unsigned int i = 0; i < sizeof(hash)/4; i++) |
|
|
|
|
((unsigned int*)&hash)[i] = ByteReverse(((unsigned int*)&hash)[i]); |
|
|
|
|
|
|
|
|
|
if (hash <= hashTarget) |
|
|
|
|