ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2026-08-23 08:20:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(hooks): report exports separately from emits

Browse Source
This commit is contained in:
Nicholas Dudfield
2026-06-26 20:20:09 +07:00
parent 4e217fcc8f
commit 5dc214ab48
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/test/app/Export_test.cpp
View File

@@ -485,7 +485,7 @@ struct Export_test : public beast::unit_test::suite
json(jss::HookParameters, params),
ter(tesSUCCESS));
// Verify hook fired successfully with exactly 1 emission.
// Verify hook fired successfully with exactly 1 export.
{
auto const m = env.meta();
BEAST_EXPECT(m);
@@ -496,12 +496,14 @@ struct Export_test : public beast::unit_test::suite
// result=3 is ExitType::ACCEPT
BEAST_EXPECT(execs[0].getFieldU8(sfHookResult) == 3);
BEAST_EXPECT(execs[0].getFieldU16(sfHookEmitCount) == 1);
BEAST_EXPECT(execs[0].getFieldU16(sfHookEmitCount) == 0);
BEAST_EXPECT(execs[0].getFieldU16(sfHookExportCount) == 1);
BEAST_EXPECT(execs[0].getFieldU64(sfHookReturnCode) == 0);
// Emissions metadata should be present.
BEAST_EXPECT(m->isFieldPresent(sfHookEmissions));
BEAST_EXPECT(m->getFieldArray(sfHookEmissions).size() == 1);
// HookEmissions tracks normal emitted transactions. Export wrappers
// use the emitted directory for scheduling but are counted
// separately as HookExportCount.
BEAST_EXPECT(!m->isFieldPresent(sfHookEmissions));
// The emitted dir should NOT be empty (ttEXPORT is in it).
BEAST_EXPECT(!dirIsEmpty(*env.current(), keylet::emittedDir()));

8
src/xrpld/app/hook/detail/applyHook.cpp
View File

@@ -1533,8 +1533,12 @@ hook::finalizeHookResult(
.getField(sfEmitDetails)
.downcast<STObject>();
emission_txnid.emplace_back(
id, emitDetails.getFieldH256(sfEmitNonce));
if (ptr->getTxnType() == ttEXPORT)
exported_txnid.emplace_back(id);
else
emission_txnid.emplace_back(
id, emitDetails.getFieldH256(sfEmitNonce));
sleEmitted = std::make_shared<SLE>(emittedId);
// RH TODO: add a new constructor to STObject to avoid this