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

fix(import): use ledger time for VL freshness

Browse Source
This commit is contained in:
Nicholas Dudfield
2026-06-28 19:45:36 +07:00
parent 4a12f4c231
commit a0866d1559
1 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/xrpld/app/tx/detail/Import.cpp
View File

@@ -540,7 +540,6 @@ Import::preflight(PreflightContext const& ctx)
list.isMember(jss::effective) ? list[jss::effective].asUInt() : 0}};
auto const validUntil = TimeKeeper::time_point{
TimeKeeper::duration{list[jss::expiration].asUInt()}};
auto const now = ctx.app.timeKeeper().now();
if (validUntil <= validFrom)
{
JLOG(ctx.j.warn()) << "Import: unl blob validUntil <= validFrom "
@@ -548,20 +547,6 @@ Import::preflight(PreflightContext const& ctx)
return temMALFORMED;
}
if (validUntil <= now)
{
JLOG(ctx.j.warn()) << "Import: unl blob expired "
<< tx.getTransactionID();
return temMALFORMED;
}
if (validFrom > now)
{
JLOG(ctx.j.warn()) << "Import: unl blob not yet valid "
<< tx.getTransactionID();
return temMALFORMED;
}
auto const sig =
strUnHex((*xpop)[jss::validation][jss::unl][jss::signature].asString());
if (!sig || !ripple::verify(*signingKey, makeSlice(data), makeSlice(*sig)))
@@ -1137,6 +1122,36 @@ Import::preclaim(PreclaimContext const& ctx)
return tefINTERNAL;
}
auto const data =
base64_decode((*xpop)[jss::validation][jss::unl][jss::blob].asString());
Json::Reader r;
Json::Value list;
if (!r.parse(data, list))
{
JLOG(ctx.j.warn())
<< "Import: during preclaim could not parse unl blob, bailing.";
return tefINTERNAL;
}
auto const validFrom = TimeKeeper::time_point{TimeKeeper::duration{
list.isMember(jss::effective) ? list[jss::effective].asUInt() : 0}};
auto const validUntil = TimeKeeper::time_point{
TimeKeeper::duration{list[jss::expiration].asUInt()}};
auto const now = ctx.view.parentCloseTime();
if (validUntil <= now)
{
JLOG(ctx.j.warn())
<< "Import: unl blob expired at parent ledger close time.";
return temMALFORMED;
}
if (validFrom > now)
{
JLOG(ctx.j.warn())
<< "Import: unl blob not yet valid at parent ledger close time.";
return temMALFORMED;
}
// Shared XPOP verification includes the source VL anti-downgrade ratchet.
// A shadow ticket is the callback replay latch; it does not replace the
// requirement that imports use the newest validator list this chain has