ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-04-29 15:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that an account is not deleted with a non-zero owner count

Browse Source 
- Updates the AccountRootsDeletedClean invariant
This commit is contained in:
Ed Hennis
2025-04-30 12:46:03 -04:00
parent b97811d45c
commit ceeb11aee0
2 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/test/ledger/Invariants_test.cpp
View File

@@ -209,12 +209,32 @@ class Invariants_test : public beast::unit_test::suite
doInvariantCheck(
{{"account deletion left behind a non-zero balance"}},
[&](Account const& A1, Account const& A2, ApplyContext& ac) {
// Add an object to the ledger for account A1, then delete
// A1
// A1 has a balance. Delete A1
auto const a1 = A1.id();
auto const sleA1 = ac.view().peek(keylet::account(a1));
if (!sleA1)
return false;
if (!BEAST_EXPECT(*sleA1->at(sfBalance) != beast::zero))
return false;
ac.view().erase(sleA1);
return true;
},
XRPAmount{},
STTx{ttACCOUNT_DELETE, [](STObject& tx) {}});
doInvariantCheck(
{{"account deletion left behind a non-zero owner count"}},
[&](Account const& A1, Account const& A2, ApplyContext& ac) {
// Increment A1's owner count, then delete A1
auto const a1 = A1.id();
auto const sleA1 = ac.view().peek(keylet::account(a1));
if (!sleA1)
return false;
sleA1->at(sfBalance) = beast::zero;
BEAST_EXPECT(sleA1->at(sfOwnerCount) == 0);
adjustOwnerCount(ac.view(), sleA1, 1, ac.journal);
ac.view().erase(sleA1);
@@ -268,6 +288,7 @@ class Invariants_test : public beast::unit_test::suite
if (!sle)
return false;
sle->at(sfBalance) = beast::zero;
sle->at(sfOwnerCount) = 0;
ac.view().erase(sle);
return true;
},
@@ -299,6 +320,7 @@ class Invariants_test : public beast::unit_test::suite
BEAST_EXPECT(sle->at(~sfAMMID) == ammKey);
sle->at(sfBalance) = beast::zero;
sle->at(sfOwnerCount) = 0;
ac.view().erase(sle);
return true;
@@ -362,6 +384,7 @@ class Invariants_test : public beast::unit_test::suite
ac.view().emptyDirDelete(ownerDirKeylet));
sle->at(sfBalance) = beast::zero;
sle->at(sfOwnerCount) = 0;
ac.view().erase(sle);
return true;

14
src/xrpld/app/tx/detail/InvariantCheck.cpp
View File

@@ -473,7 +473,19 @@ AccountRootsDeletedClean::finalize(
XRPL_ASSERT(
enforce,
"ripple::AccountRootsDeletedClean::finalize : "
"account deletion left behind a non-zero balance");
"deleted account has zero balance");
if (enforce)
return false;
}
// An account should not be deleted with a non-zero owner count
if (after->at(sfOwnerCount) != 0)
{
JLOG(j.fatal()) << "Invariant failed: account deletion left "
"behind a non-zero owner count";
XRPL_ASSERT(
enforce,
"ripple::AccountRootsDeletedClean::finalize : "
"deleted account has zero owner count");
if (enforce)
return false;
}