mirror of
https://github.com/Xahau/xahaud.git
synced 2026-10-09 13:28:02 +00:00
Merge fixHookExitOutOfBounds into fix20261001 (#836)
This commit is contained in:
@@ -244,9 +244,9 @@
|
||||
<< "Tried to accept/rollback but specified " \
|
||||
"memory outside of the wasm instance " \
|
||||
<< "limit when specifying a reason string"; \
|
||||
if (!view.rules().enabled(fixHookExitOutOfBounds)) \
|
||||
if (!view.rules().enabled(fix20261001)) \
|
||||
return OUT_OF_BOUNDS; \
|
||||
/* fixHookExitOutOfBounds: terminate as a rollback so the \
|
||||
/* fix20261001: terminate as a rollback so the \
|
||||
failure is visible in HookExecution metadata */ \
|
||||
hookCtx.result.exitType = hook_api::ExitType::ROLLBACK; \
|
||||
hookCtx.result.exitCode = (int64_t)OUT_OF_BOUNDS; \
|
||||
|
||||
@@ -36,7 +36,6 @@
|
||||
|
||||
XRPL_FIX (20261001, Supported::yes, VoteBehavior::DefaultYes)
|
||||
XRPL_FIX (HookNameValidation, Supported::yes, VoteBehavior::DefaultYes)
|
||||
XRPL_FIX (HookExitOutOfBounds, Supported::yes, VoteBehavior::DefaultNo)
|
||||
XRPL_FEATURE(HookOnV2_1, Supported::yes, VoteBehavior::DefaultNo)
|
||||
XRPL_FEATURE(OnChainManifests, Supported::yes, VoteBehavior::DefaultNo)
|
||||
XRPL_FIX (HookMap, Supported::yes, VoteBehavior::DefaultYes)
|
||||
|
||||
@@ -3526,9 +3526,7 @@ public:
|
||||
{
|
||||
for (auto const& hook_wasm : {accept_oob_wasm, rollback_oob_wasm})
|
||||
{
|
||||
Env env{
|
||||
*this,
|
||||
withFix ? features : features - fixHookExitOutOfBounds};
|
||||
Env env{*this, withFix ? features : features - fix20261001};
|
||||
|
||||
auto const alice = Account{"alice"};
|
||||
auto const bob = Account{"bob"};
|
||||
|
||||
Reference in New Issue
Block a user