mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#28059: refactor: Make more transaction size variables signed

Browse Source 
92de74ef18 refactor: Make more transaction size variables signed (Hennadii Stepanov)

Pull request description:

  This PR is a continuation of https://github.com/bitcoin/bitcoin/pull/23962 and it:
  - gets rid of two static casts,
  - addresses https://github.com/bitcoin/bitcoin/pull/23962#issuecomment-1593289706,
  - is useful for https://github.com/bitcoin/bitcoin/pull/25972, see the failed ARM and multiprocess CI jobs.

ACKs for top commit:
  MarcoFalke:
    lgtm ACK 92de74ef18  🥔
  glozow:
    ACK 92de74ef18

Tree-SHA512: 84225961af8e08439664e75661b98fe86560217e891e5633a28316bf248d88df317a0c6b5a5f6b03feb2b0e0fd40a1f91dd4a85a0610d567470805bf47a84487
This commit is contained in:
glozow committed 2023-08-03 11:45:51 +01:00
2 parents 532bd1f2e7 92de74ef18
commit 7c66a4b610
2 files changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/txmempool.cpp
+5 -5
View File
@@ -155,12 +155,12 @@ void CTxMemPool::UpdateTransactionsFromBlock(const std::vector<uint256>& vHashes
} }
util::Result<CTxMemPool::setEntries> CTxMemPool::CalculateAncestorsAndCheckLimits( util::Result<CTxMemPool::setEntries> CTxMemPool::CalculateAncestorsAndCheckLimits(
size_t entry_size, int64_t entry_size,
size_t entry_count, size_t entry_count,
CTxMemPoolEntry::Parents& staged_ancestors, CTxMemPoolEntry::Parents& staged_ancestors,
const Limits& limits) const const Limits& limits) const
{ {
size_t totalSizeWithAncestors = entry_size; int64_t totalSizeWithAncestors = entry_size;
setEntries ancestors; setEntries ancestors;
while (!staged_ancestors.empty()) { while (!staged_ancestors.empty()) {
@@ -171,11 +171,11 @@ util::Result<CTxMemPool::setEntries> CTxMemPool::CalculateAncestorsAndCheckLimit
staged_ancestors.erase(stage); staged_ancestors.erase(stage);
totalSizeWithAncestors += stageit->GetTxSize(); totalSizeWithAncestors += stageit->GetTxSize();
if (stageit->GetSizeWithDescendants() + entry_size > static_cast<uint64_t>(limits.descendant_size_vbytes)) { if (stageit->GetSizeWithDescendants() + entry_size > limits.descendant_size_vbytes) {
return util::Error{Untranslated(strprintf("exceeds descendant size limit for tx %s [limit: %u]", stageit->GetTx().GetHash().ToString(), limits.descendant_size_vbytes))}; return util::Error{Untranslated(strprintf("exceeds descendant size limit for tx %s [limit: %u]", stageit->GetTx().GetHash().ToString(), limits.descendant_size_vbytes))};
} else if (stageit->GetCountWithDescendants() + entry_count > static_cast<uint64_t>(limits.descendant_count)) { } else if (stageit->GetCountWithDescendants() + entry_count > static_cast<uint64_t>(limits.descendant_count)) {
return util::Error{Untranslated(strprintf("too many descendants for tx %s [limit: %u]", stageit->GetTx().GetHash().ToString(), limits.descendant_count))}; return util::Error{Untranslated(strprintf("too many descendants for tx %s [limit: %u]", stageit->GetTx().GetHash().ToString(), limits.descendant_count))};
} else if (totalSizeWithAncestors > static_cast<uint64_t>(limits.ancestor_size_vbytes)) { } else if (totalSizeWithAncestors > limits.ancestor_size_vbytes) {
return util::Error{Untranslated(strprintf("exceeds ancestor size limit [limit: %u]", limits.ancestor_size_vbytes))}; return util::Error{Untranslated(strprintf("exceeds ancestor size limit [limit: %u]", limits.ancestor_size_vbytes))};
} }
@@ -201,7 +201,7 @@ bool CTxMemPool::CheckPackageLimits(const Package& package,
std::string &errString) const std::string &errString) const
{ {
CTxMemPoolEntry::Parents staged_ancestors; CTxMemPoolEntry::Parents staged_ancestors;
size_t total_size = 0; int64_t total_size = 0;
for (const auto& tx : package) { for (const auto& tx : package) {
total_size += GetVirtualTransactionSize(*tx); total_size += GetVirtualTransactionSize(*tx);
for (const auto& input : tx->vin) { for (const auto& input : tx->vin) {
src/txmempool.h
+1 -1
View File
@@ -442,7 +442,7 @@ private:
* *
* @return all in-mempool ancestors, or an error if any ancestor or descendant limits were hit * @return all in-mempool ancestors, or an error if any ancestor or descendant limits were hit
*/ */
util::Result<setEntries> CalculateAncestorsAndCheckLimits(size_t entry_size, util::Result<setEntries> CalculateAncestorsAndCheckLimits(int64_t entry_size,
size_t entry_count, size_t entry_count,
CTxMemPoolEntry::Parents &staged_ancestors, CTxMemPoolEntry::Parents &staged_ancestors,
const Limits& limits const Limits& limits