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

fix ledger header accounting for genesismint/import

Browse Source
This commit is contained in:
Richard Holland
2023-08-01 08:38:21 +00:00
parent 264f25c2a6
commit febdb1c9c2
3 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/ripple/app/tx/impl/GenesisMint.cpp
View File

@@ -22,6 +22,7 @@
#include <ripple/ledger/View.h>
#include <ripple/protocol/Feature.h>
#include <ripple/protocol/Indexes.h>
#include <ripple/app/tx/impl/Import.h>
namespace ripple {
@@ -154,9 +155,17 @@ GenesisMint::doApply()
{
auto const& dests = ctx_.tx.getFieldArray(sfGenesisMints);
STAmount dropsAdded { 0 };
for (auto const& dest: dests)
{
auto const amt = dest[~sfAmount];
if (amt && !isXRP(*amt))
{
JLOG(ctx_.journal.warn()) << "GenesisMint: Non-xrp amount.";
return tecINTERNAL;
}
auto const flags = dest[~sfGovernanceFlags];
auto const marks = dest[~sfGovernanceMarks];
@@ -178,22 +187,30 @@ GenesisMint::doApply()
sle->setFieldU32(sfSequence, seqno);
if (amt)
{
sle->setFieldAmount(sfBalance, *amt);
dropsAdded += *amt;
}
else // give them 2 XRP if the account didn't exist, same as ttIMPORT
sle->setFieldAmount(sfBalance, XRPAmount {2 * DROPS_PER_XRP});
{
sle->setFieldAmount(sfBalance, Import::INITIAL_IMPORT_XRP);
dropsAdded += Import::INITIAL_IMPORT_XRP;
}
}
else if (amt)
{
// Credit the account
STAmount startBal = sle->getFieldAmount(sfBalance);
STAmount finalBal = startBal + *amt;
if (finalBal > startBal)
sle->setFieldAmount(sfBalance, finalBal);
else
if (finalBal <= startBal)
{
JLOG(ctx_.journal.warn())
<< "GenesisMint: cannot credit " << dest << " due to balance overflow";
return tecINTERNAL;
}
sle->setFieldAmount(sfBalance, finalBal);
dropsAdded += *amt;
}
// set flags and marks as applicable
@@ -208,7 +225,17 @@ GenesisMint::doApply()
else
view().update(sle);
}
// update ledger header
if (dropsAdded <= beast::zero || dropsAdded.xrp() + view().info().drops < view().info().drops)
{
JLOG(ctx_.journal.warn())
<< "GenesisMint: dropsAdded overflowed\n";
return tecINTERNAL;
}
ctx_.rawView().rawDestroyXRP(-dropsAdded.xrp());
return tesSUCCESS;
}

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

@@ -1204,6 +1204,15 @@ Import::doApply()
}
}
// update ledger header
if (burn <= beast::zero || burn.xrp() + view().info().drops < view().info().drops)
{
JLOG(ctx_.journal.warn())
<< "Import: ledger header overflowed\n";
return tecINTERNAL;
}
ctx_.rawView().rawDestroyXRP(-burn.xrp());
return tesSUCCESS;
}

3
src/test/app/Import_test.cpp
View File

@@ -3770,7 +3770,8 @@ class Import_test : public beast::unit_test::suite
auto const postAlice = env.balance(alice);
BEAST_EXPECT(postAlice == preAlice + XRP(1000) + XRP(2));
auto const postCoins = env.current()->info().drops;
// BEAST_EXPECT(postCoins == preCoins + XRP(10000));
BEAST_EXPECT(postCoins == preCoins + XRP(10000));
std::cout << "===> postCoins: " << postCoins << "\n";
// 99'999'999'999'900'000 // <- postCoins is
// 99'999'999'999'910'000 // <- should be
}