ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-11-19 18:15:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

better filter to remove false positives on regular key

Browse Source
This commit is contained in:
Richard Holland
2025-02-01 14:52:03 +11:00
parent 053ffd7b18
commit 2c4ef51106
2 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/ripple/app/rdb/backend/RWDBDatabase.h
View File

@@ -51,15 +51,43 @@ private:
auto const& txn = accountTx.first;
auto const& meta = accountTx.second;
// Search metadata
// Search metadata, excluding RegularKey false positives
Blob const metaBlob = meta->getAsObject().getSerializer().peekData();
if (metaBlob.size() >= account.size() &&
std::search(
metaBlob.begin(),
metaBlob.end(),
account.data(),
account.data() + account.size()) != metaBlob.end())
return true;
if (metaBlob.size() >= account.size())
{
auto it = metaBlob.begin();
while (true)
{
// Find next occurrence of account
it = std::search(
it,
metaBlob.end(),
account.data(),
account.data() + account.size());
if (it == metaBlob.end())
break;
// Check if this is a RegularKey field (0x8814 prefix)
if (it >= metaBlob.begin() + 2)
{
auto prefix = *(it - 2);
auto prefix2 = *(it - 1);
if (prefix != 0x88 || prefix2 != 0x14)
{
// Found account not preceded by RegularKey prefix
return true;
}
}
else
{
// Too close to start to be RegularKey
return true;
}
++it; // Move past this occurrence
}
}
// Search transaction blob
Blob const txnBlob = txn->getSTransaction()->getSerializer().peekData();

14
src/ripple/app/rdb/backend/detail/impl/Node.cpp
View File

@@ -765,8 +765,18 @@ transactionsSQL(
std::string sql;
std::string filterClause = options.strict ? "AND (hex(TxnMeta) LIKE '%" +
accountHex + "%' OR hex(RawTxn) LIKE '%" + accountHex + "%')"
// For metadata search:
// 1. Look for account ID not preceded by 8814 (RegularKey field)
// 2. OR look for account in raw transaction
std::string filterClause = options.strict ? "AND (("
"hex(TxnMeta) LIKE '%" +
accountHex +
"%' AND "
"hex(TxnMeta) NOT LIKE '%8814" +
accountHex +
"%'"
") OR hex(RawTxn) LIKE '%" +
accountHex + "%')"
: "";
if (count)