Skip to content

Syncing txrecord #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
presstab merged 3 commits into from
Jun 2, 2018
Merged

Syncing txrecord #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f8ac10
Don't perform full signature checks and PoS checks on blocks older th…
presstab Jun 1, 2018
f0786a3
Fix segfault on repairwallet.
presstab Jun 1, 2018
fd4c2c5
Use the actual time from the transaction for QT transaction records.
presstab Jun 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 37 additions & 41 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1569,7 +1569,8 @@ bool CBlock::DisconnectBlock(CTxDB& txdb, CBlockIndex* pindex)
bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
{
// Check it again in case a previous version let a bad block in
if (!CheckBlock(!fJustCheck, !fJustCheck))
bool fFullCheck = pindex->nHeight >= Checkpoints::GetTotalBlocksEstimate();
if (!CheckBlock(!fJustCheck, !fJustCheck, fFullCheck))
return false;

// Do not allow blocks that contain transactions which 'overwrite' older transactions,
Expand Down Expand Up @@ -1602,14 +1603,13 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
int64 nValueIn = 0;
int64 nValueOut = 0;
unsigned int nSigOps = 0;
BOOST_FOREACH(CTransaction& tx, vtx)
{
for (CTransaction& tx : vtx) {
uint256 hashTx = tx.GetHash();

if (fEnforceBIP30) {
CTxIndex txindexOld;
if (txdb.ReadTxIndex(hashTx, txindexOld)) {
BOOST_FOREACH(CDiskTxPos &pos, txindexOld.vSpent)
for (CDiskTxPos &pos : txindexOld.vSpent)
if (pos.IsNull())
return false;
}
Expand Down Expand Up @@ -1677,16 +1677,16 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)

// Keep track of any vote proposals that were added to the blockchain
CVoteDB voteDB;
BOOST_FOREACH (const CTransaction& tx, vtx) {
uint256 txid = tx.GetHash();
if (count(vQueuedProposals.begin(), vQueuedProposals.end(), txid)) {
CVoteProposal proposal;
if (ProposalFromTransaction(tx, proposal)) {
mapProposals[txid] = proposal.GetHash();
if (!voteDB.WriteProposal(txid, proposal)) {
printf("%s : failed to record proposal to db\n", __func__);
} else {
if (!proposalManager.Add(proposal))
if (vQueuedProposals.size()) {
for (const CTransaction& tx : vtx) {
uint256 txid = tx.GetHash();
if (count(vQueuedProposals.begin(), vQueuedProposals.end(), txid)) {
CVoteProposal proposal;
if (ProposalFromTransaction(tx, proposal)) {
mapProposals[txid] = proposal.GetHash();
if (!voteDB.WriteProposal(txid, proposal))
printf("%s : failed to record proposal to db\n", __func__);
else if (!proposalManager.Add(proposal))
printf("%s: failed to add proposal %s to manager\n", __func__, txid.GetHex().c_str());
}
}
Expand All @@ -1696,8 +1696,8 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
//Record new votes to the tally
if (pindex->pprev) {
if (fTestNet || pindex->nHeight >= (int)VOTING_START)
pindex->tally = CVoteTally(pindex->pprev->tally);
map<uint256, VoteLocation> mapActive = proposalManager.GetActive(pindex->nHeight);
pindex->tally = CVoteTally(pindex->pprev->tally);
std::map<uint256, VoteLocation> mapActive = proposalManager.GetActive(pindex->nHeight);
pindex->tally.SetNewPositions(mapActive);
pindex->tally.ProcessNewVotes(static_cast<uint32_t>(pindex->nVersion));
}
Expand All @@ -1707,18 +1707,14 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
return error("Connect() : WriteBlockIndex for pindex failed");

// Write queued txindex changes
for (map<uint256, CTxIndex>::iterator mi = mapQueuedChanges.begin(); mi != mapQueuedChanges.end(); ++mi)
{
for (auto mi = mapQueuedChanges.begin(); mi != mapQueuedChanges.end(); ++mi) {
if (!txdb.UpdateTxIndex((*mi).first, (*mi).second))
return error("ConnectBlock() : UpdateTxIndex failed");
}

uint256 prevHash = 0;
if(pindex->pprev)
{
prevHash = pindex->pprev->GetBlockHash();
// printf("==> Got prevHash = %s\n", prevHash.ToString().c_str());
}

if (vtx[0].GetValueOut() > GetProofOfWorkReward(pindex->nHeight, nFees, prevHash))
return false;
Expand All @@ -1734,7 +1730,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
}

// Watch for transactions paying to me
BOOST_FOREACH(CTransaction& tx, vtx)
for (CTransaction& tx : vtx)
SyncWithWallets(tx, this, true);

return true;
Expand Down Expand Up @@ -2152,7 +2148,7 @@ bool CBlock::AddToBlockIndex(unsigned int nFile, unsigned int nBlockPos)
}


bool CBlock::CheckBlock(bool fCheckPOW, bool fCheckMerkleRoot) const
bool CBlock::CheckBlock(bool fCheckPOW, bool fCheckMerkleRoot, bool fFullCheck) const
{
// These are checks that are independent of context
// that can be verified before saving an orphan block.
Expand Down Expand Up @@ -2193,31 +2189,28 @@ bool CBlock::CheckBlock(bool fCheckPOW, bool fCheckMerkleRoot) const
return DoS(50, error("CheckBlock() : coinstake timestamp violation nTimeBlock=%lld nTimeTx=%u", GetBlockTime(), vtx[1].nTime));

// Check transactions
BOOST_FOREACH(const CTransaction& tx, vtx)
set<uint256> uniqueTx;
for (const CTransaction& tx : vtx)
{
if (!tx.CheckTransaction())
if (fFullCheck && !tx.CheckTransaction())
return DoS(tx.nDoS, error("CheckBlock() : CheckTransaction failed"));

// ppcoin: check transaction timestamp
if (GetBlockTime() < (int64)tx.nTime)
return DoS(50, error("CheckBlock() : block timestamp earlier than transaction timestamp"));

uniqueTx.insert(tx.GetHash());
}

// Check for duplicate txids. This is caught by ConnectInputs(),
// but catching it earlier avoids a potential DoS attack:
set<uint256> uniqueTx;
BOOST_FOREACH(const CTransaction& tx, vtx)
{
uniqueTx.insert(tx.GetHash());
}
if (uniqueTx.size() != vtx.size())
return DoS(100, error("CheckBlock() : duplicate transaction"));

unsigned int nSigOps = 0;
BOOST_FOREACH(const CTransaction& tx, vtx)
{
for (const CTransaction& tx : vtx)
nSigOps += tx.GetLegacySigOpCount();
}

if (nSigOps > MAX_BLOCK_SIGOPS)
return DoS(100, error("CheckBlock() : out-of-bounds SigOpCount"));

Expand All @@ -2226,7 +2219,7 @@ bool CBlock::CheckBlock(bool fCheckPOW, bool fCheckMerkleRoot) const
return DoS(100, error("CheckBlock() : hashMerkleRoot mismatch"));

// ppcoin: check block signature
if (!CheckBlockSignature())
if (fFullCheck && !CheckBlockSignature())
return DoS(100, error("CheckBlock() : bad block signature"));

return true;
Expand All @@ -2247,9 +2240,8 @@ bool CBlock::AcceptBlock()
CBlockIndex* pindexPrev = (*mi).second;
int nHeight = pindexPrev->nHeight+1;


if (IsProofOfWork() && nHeight > POW_CUTOFF_HEIGHT)
return DoS(100, error("AcceptBlock() : No proof-of-work allowed anymore (height = %d)", nHeight));
return DoS(100, error("AcceptBlock() : No proof-of-work allowed anymore (height = %d)", nHeight));

// Check proof-of-work or proof-of-stake
if (nBits != GetNextTargetRequired(pindexPrev, IsProofOfStake()))
Expand All @@ -2260,7 +2252,7 @@ bool CBlock::AcceptBlock()
return error("AcceptBlock() : block's timestamp is too early");

// Check that all transactions are finalized
BOOST_FOREACH(const CTransaction& tx, vtx)
for (const CTransaction& tx : vtx)
if (!tx.IsFinal(nHeight, GetBlockTime()))
return DoS(10, error("AcceptBlock() : contains a non-final transaction"));

Expand Down Expand Up @@ -2292,7 +2284,7 @@ bool CBlock::AcceptBlock()
if (hashBestChain == hash)
{
LOCK(cs_vNodes);
BOOST_FOREACH(CNode* pnode, vNodes)
for (CNode* pnode : vNodes)
if (nBestHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : nBlockEstimate))
pnode->PushInventory(CInv(MSG_BLOCK, hash));
}
Expand Down Expand Up @@ -2370,6 +2362,11 @@ bool ProcessBlock(CNode* pfrom, CBlock* pblock, std::string& strErr)
return error("ProcessBlock() : duplicate proof-of-stake (%s, %d) for block %s", pblock->GetProofOfStake().first.ToString().c_str(), pblock->GetProofOfStake().second, hash.ToString().c_str());
}

// If this block is before the last hardened checkpoint, then do not perform complete signature checks
bool fFullCheck = true;
if (mapBlockIndex.count(pblock->hashPrevBlock))
fFullCheck = mapBlockIndex.at(pblock->hashPrevBlock)->nHeight > Checkpoints::GetTotalBlocksEstimate();

// Preliminary checks
if (!pblock->CheckBlock())
return error("ProcessBlock() : CheckBlock FAILED");
Expand All @@ -2378,11 +2375,11 @@ bool ProcessBlock(CNode* pfrom, CBlock* pblock, std::string& strErr)
if (pblock->IsProofOfStake())
{
uint256 hashProofOfStake = 0;
if (!CheckProofOfStake(pblock->vtx[1], pblock->nBits, hashProofOfStake))
{
if (fFullCheck && !CheckProofOfStake(pblock->vtx[1], pblock->nBits, hashProofOfStake)) {
printf("WARNING: ProcessBlock(): check proof-of-stake failed for block %s\n", hash.ToString().c_str());
return false;
}

if (!mapProofOfStake.count(hash)) // add to mapProofOfStake
mapProofOfStake.insert(make_pair(hash, hashProofOfStake));
}
Expand Down Expand Up @@ -2448,7 +2445,6 @@ bool ProcessBlock(CNode* pfrom, CBlock* pblock, std::string& strErr)
if (!pwalletMain->MultiSend() )
printf("ERROR While trying to use MultiSend");


// presstab HyperStake: enable of disable staking based on block difficulty
if(pwalletMain->fStakeRequirement)
{
Expand Down
4 changes: 2 additions & 2 deletions src/main.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -959,7 +959,7 @@ class CBlock
uint256 BuildMerkleTree() const
{
vMerkleTree.clear();
BOOST_FOREACH(const CTransaction& tx, vtx)
for (const CTransaction& tx : vtx)
vMerkleTree.push_back(tx.GetHash());
int j = 0;
for (int nSize = vtx.size(); nSize > 1; nSize = (nSize + 1) / 2)
Expand Down Expand Up @@ -1067,7 +1067,7 @@ class CBlock
bool ReadFromDisk(const CBlockIndex* pindex, bool fReadTransactions=true);
bool SetBestChain(CTxDB& txdb, CBlockIndex* pindexNew);
bool AddToBlockIndex(unsigned int nFile, unsigned int nBlockPos);
bool CheckBlock(bool fCheckPOW=true, bool fCheckMerkleRoot=true) const;
bool CheckBlock(bool fCheckPOW=true, bool fCheckMerkleRoot=true, bool fFullCheck=true) const;
bool AcceptBlock();
bool GetCoinAge(uint64& nCoinAge) const; // ppcoin: calculate total coin age spent in block
bool SignBlock(const CKeyStore& keystore);
Expand Down
2 changes: 1 addition & 1 deletion src/qt/transactionrecord.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ bool TransactionRecord::showTransaction(const CWalletTx &wtx)
QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *wallet, const CWalletTx &wtx)
{
QList<TransactionRecord> parts;
int64 nTime = wtx.GetTxTime();
int64 nTime = wtx.nTime;
int64 nCredit = wtx.GetCredit(true);
int64 nDebit = wtx.GetDebit();
int64 nNet = nCredit - nDebit;
Expand Down
15 changes: 8 additions & 7 deletions src/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2460,13 +2460,14 @@ void CWallet::FixSpentCoins(int& nMismatchFound, int64& nBalanceInQuestion, int&
// needs to be located above the readtxindex code or else it will not be triggered
if(!pcoin->IsConfirmedInMainChain() && (GetTime() - pcoin->GetTxTime()) > (60*10)) //give the tx 10 minutes before considering it failed
{
nOrphansFound++;
if (!fCheckOnly)
{
EraseFromWallet(hash);
NotifyTransactionChanged(this, hash, CT_DELETED);
}
printf("FixSpentCoins %s rejected transaction %s\n", fCheckOnly ? "found" : "removed", hash.ToString().c_str());
nOrphansFound++;
if (!fCheckOnly)
{
EraseFromWallet(hash);
NotifyTransactionChanged(this, hash, CT_DELETED);
}
printf("FixSpentCoins %s rejected transaction %s\n", fCheckOnly ? "found" : "removed", hash.ToString().c_str());
continue;
}

// Find the corresponding transaction index
Expand Down