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

Remove SegWit related checks added by backporting of Bitcoin #8295

Browse Source 
Also remove nBlockMinSize check from addPackageTxs. Removed by SegWit
related commits in Bitcoin.
This commit is contained in:
Alexander Block 2017-09-18 13:22:21 +02:00
parent f9f3b8d938
commit 6a993236be
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/miner.cpp
View File

@ -212,24 +212,11 @@ bool BlockAssembler::TestPackage(uint64_t packageSize, unsigned int packageSigOp
// Perform transaction-level checks before adding to block: // Perform transaction-level checks before adding to block:
// - transaction finality (locktime) // - transaction finality (locktime)
// - premature witness (in case segwit transactions are added to mempool before
// segwit activation)
// - serialized size (in case -blockmaxsize is in use)
bool BlockAssembler::TestPackageTransactions(const CTxMemPool::setEntries& package) bool BlockAssembler::TestPackageTransactions(const CTxMemPool::setEntries& package)
{ {
uint64_t nPotentialBlockSize = nBlockSize; // only used with fNeedSizeAccounting
BOOST_FOREACH (const CTxMemPool::txiter it, package) { BOOST_FOREACH (const CTxMemPool::txiter it, package) {
if (!IsFinalTx(it->GetTx(), nHeight, nLockTimeCutoff)) if (!IsFinalTx(it->GetTx(), nHeight, nLockTimeCutoff))
return false; return false;
if (!fIncludeWitness && !it->GetTx().wit.IsNull())
return false;
if (fNeedSizeAccounting) {
uint64_t nTxSize = ::GetSerializeSize(it->GetTx(), SER_NETWORK, PROTOCOL_VERSION);
if (nPotentialBlockSize + nTxSize >= nBlockMaxSize) {
return false;
}
nPotentialBlockSize += nTxSize;
}
} }
return true; return true;
} }
@ -421,7 +408,7 @@ void BlockAssembler::addPackageTxs()
packageSigOps = modit->nSigOpCountWithAncestors; packageSigOps = modit->nSigOpCountWithAncestors;
} }
if (packageFees < ::minRelayTxFee.GetFee(packageSize) && nBlockSize >= nBlockMinSize) { if (packageFees < ::minRelayTxFee.GetFee(packageSize)) {
// Everything else we might consider has a lower fee rate // Everything else we might consider has a lower fee rate
return; return;
} }

2
src/miner.h
View File

@ -188,7 +188,7 @@ private:
/** Test if a new package would "fit" in the block */ /** Test if a new package would "fit" in the block */
bool TestPackage(uint64_t packageSize, unsigned int packageSigOps); bool TestPackage(uint64_t packageSize, unsigned int packageSigOps);
/** Perform checks on each transaction in a package: /** Perform checks on each transaction in a package:
* locktime, premature-witness, serialized size (if necessary) * locktime
* These checks should always succeed, and they're here * These checks should always succeed, and they're here
* only as an extra check in case of suboptimal node configuration */ * only as an extra check in case of suboptimal node configuration */
bool TestPackageTransactions(const CTxMemPool::setEntries& package); bool TestPackageTransactions(const CTxMemPool::setEntries& package);