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

emitdetails bug

Browse Source
This commit is contained in:
Richard Holland
2022-06-07 09:42:27 +00:00
parent d26f6ff995
commit e3c792e68b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ripple/app/hook/impl/applyHook.cpp
View File

@@ -2648,7 +2648,6 @@ DEFINE_HOOK_FUNCTION(
!emitDetails.isFieldPresent(sfEmitBurden) || !emitDetails.isFieldPresent(sfEmitBurden) ||
!emitDetails.isFieldPresent(sfEmitParentTxnID) || !emitDetails.isFieldPresent(sfEmitParentTxnID) ||
!emitDetails.isFieldPresent(sfEmitNonce) || !emitDetails.isFieldPresent(sfEmitNonce) ||
!emitDetails.isFieldPresent(sfEmitCallback) ||
!emitDetails.isFieldPresent(sfEmitHookHash)) !emitDetails.isFieldPresent(sfEmitHookHash))
{ {
JLOG(j.trace()) JLOG(j.trace())
@@ -2668,7 +2667,11 @@ DEFINE_HOOK_FUNCTION(
uint64_t bur = emitDetails.getFieldU64(sfEmitBurden); uint64_t bur = emitDetails.getFieldU64(sfEmitBurden);
ripple::uint256 const& pTxnID = emitDetails.getFieldH256(sfEmitParentTxnID); ripple::uint256 const& pTxnID = emitDetails.getFieldH256(sfEmitParentTxnID);
ripple::uint256 const& nonce = emitDetails.getFieldH256(sfEmitNonce); ripple::uint256 const& nonce = emitDetails.getFieldH256(sfEmitNonce);
auto const& callback = emitDetails.getAccountID(sfEmitCallback);
std::optional<ripple::AccountID> callback;
if (emitDetails.isFieldPresent(sfEmitCallback))
callback = emitDetails.getAccountID(sfEmitCallback);
auto const& hash = emitDetails.getFieldH256(sfEmitHookHash); auto const& hash = emitDetails.getFieldH256(sfEmitHookHash);
uint32_t gen_proper = etxn_generation(hookCtx, memoryCtx); uint32_t gen_proper = etxn_generation(hookCtx, memoryCtx);
@@ -2708,7 +2711,7 @@ DEFINE_HOOK_FUNCTION(
return EMISSION_FAILURE; return EMISSION_FAILURE;
} }
if (callback != hookCtx.result.account) if (callback && *callback != hookCtx.result.account)
{ {
JLOG(j.trace()) JLOG(j.trace())
<< "HookEmit[" << HC_ACC() << "]: sfEmitCallback account must be the account " << "HookEmit[" << HC_ACC() << "]: sfEmitCallback account must be the account "