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

move sig check

Browse Source
This commit is contained in:
Denis Angell
2023-07-03 12:24:29 +02:00
parent 08e7059b8c
commit 4f7fed3708
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -388,25 +388,12 @@ Import::preflight(PreflightContext const& ctx)
<< tx.getTransactionID();
return temMALFORMED;
}
// manifest signing (ephemeral) key
auto const signingKey = m->signingKey;
// decode blob
auto const data = base64_decode((*xpop)[jss::validation][jss::unl][jss::blob].asString());
auto const sig = strUnHex((*xpop)[jss::validation][jss::unl][jss::signature].asString());
if (!sig ||
!ripple::verify(
signingKey,
makeSlice(data),
makeSlice(*sig)))
{
JLOG(ctx.j.warn())
<< "Import: unl blob not signed correctly "
<< tx.getTransactionID();
return temMALFORMED;
}
Json::Reader r;
Json::Value list;
@@ -456,7 +443,7 @@ Import::preflight(PreflightContext const& ctx)
if (validUntil <= validFrom)
{
JLOG(ctx.j.warn())
<< "Import: unl blob validUnil <= validFrom "
<< "Import: unl blob validUntil <= validFrom "
<< tx.getTransactionID();
return temMALFORMED;
}
@@ -477,6 +464,19 @@ Import::preflight(PreflightContext const& ctx)
return temMALFORMED;
}
auto const sig = strUnHex((*xpop)[jss::validation][jss::unl][jss::signature].asString());
if (!sig ||
!ripple::verify(
signingKey,
makeSlice(data),
makeSlice(*sig)))
{
JLOG(ctx.j.warn())
<< "Import: unl blob not signed correctly "
<< tx.getTransactionID();
return temMALFORMED;
}
auto const tx_hash = stpTrans->getTransactionID();//sha512Half(HashPrefix::transactionID, *rawTx);
JLOG(ctx.j.trace()) << "tx_hash (computed): " << tx_hash;
@@ -924,12 +924,12 @@ Import::preclaim(PreclaimContext const& ctx)
auto pkHex = strUnHex(strPk);
if (!pkHex)
return tefINTERNAL;
auto const pkType = publicKeyType(makeSlice(*pkHex));
if (!pkType)
return tefINTERNAL;
PublicKey const pk (makeSlice(*pkHex));
PublicKey const pk (makeSlice(*pkHex));
// check on ledger
if (auto const unlRep = ctx.view.read(keylet::UNLReport()); unlRep)
@@ -1045,7 +1045,6 @@ Import::doApply()
}
else if (tt == ttREGULAR_KEY_SET)
{
JLOG(ctx_.journal.warn()) << "SetRegularKey";
// key import: regular key
setRegularKey = stpTrans->getAccountID(sfRegularKey);
}
@@ -1068,7 +1067,6 @@ Import::doApply()
if (create)
{
// Create the account.
JLOG(ctx_.journal.warn()) << "create - create account";
std::uint32_t const seqno{
view().rules().enabled(featureDeletableAccounts) ? view().seq()
: 1};