ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup lsfPasswordSpent and sfRegularKey

Browse Source
This commit is contained in:
Denis Angell
2023-07-20 22:15:36 +02:00
parent a919e440ae
commit 55b28f9bf1
1 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/ripple/app/tx/impl/Import.cpp
View File

@@ -1033,25 +1033,6 @@ Import::doApply()
return tefINTERNAL;
}
if (setRegularKey)
{
if (*setRegularKey == noAccount())
{
if (sle->isFieldPresent(sfRegularKey))
{
JLOG(ctx_.journal.warn()) << "Import: clearing SetRegularKey "
<< " acc: " << id;
sle->makeFieldAbsent(sfRegularKey);
}
}
else
{
JLOG(ctx_.journal.warn()) << "Import: actioning SetRegularKey "
<< *setRegularKey << " acc: " << id;
sle->setAccountID(sfRegularKey, *setRegularKey);
}
}
if (create)
{
// Create the account.
@@ -1076,24 +1057,40 @@ Import::doApply()
return tefINTERNAL;
}
if (tt == ttREGULAR_KEY_SET)
{
if (*setRegularKey == noAccount())
{
if (sle->isFieldPresent(sfRegularKey))
{
JLOG(ctx_.journal.warn()) << "Import: clearing SetRegularKey "
<< " acc: " << id;
sle->makeFieldAbsent(sfRegularKey);
}
}
else
{
JLOG(ctx_.journal.warn()) << "Import: actioning SetRegularKey "
<< *setRegularKey << " acc: " << id;
sle->setAccountID(sfRegularKey, *setRegularKey);
}
}
if (create)
{
// if the account is created using non-master key
if (!signedWithMaster)
{
// set regular key to no account if not regular key tx
if (!setRegularKey)
if (*setRegularKey == noAccount())
{
// set regular key to no account if not regular key tx
JLOG(ctx_.journal.warn()) << "Import: keying of " << id << " is unclear - set regular key to noAccount()";
sle->setAccountID(sfRegularKey, noAccount());
}
// disable master
JLOG(ctx_.journal.warn()) << "Import: keying of " << id << " is unclear - disable master";
sle->setFieldU32(sfFlags, lsfDisableMaster);
}
if (setRegularKey && burn == beast::zero)
{
sle->setFieldU32(sfFlags, lsfPasswordSpent);
}
view().insert(sle);
}
else
@@ -1101,6 +1098,12 @@ Import::doApply()
// account already exists
sle->setFieldU32(sfImportSequence, importSequence);
sle->setFieldAmount(sfBalance, finalBal);
// set password spent flag if user exists and fee is 0
if (burn == beast::zero)
{
sle->setFieldU32(sfFlags, lsfPasswordSpent);
}
view().update(sle);
}