Merge remote-tracking branch 'upstream/dev' into hook-api-unittest

This commit is contained in:
tequ
2025-11-25 11:54:30 +09:00
14 changed files with 222 additions and 78 deletions

View File

@@ -927,7 +927,13 @@ HookAPI::etxn_fee_base(ripple::Slice const& txBlob) const
SerialIter sitTrans(txBlob);
std::unique_ptr<STTx const> stpTrans =
std::make_unique<STTx const>(std::ref(sitTrans));
return Transactor::calculateBaseFee(
if (!hookCtx.applyCtx.view().rules().enabled(fixEtxnFeeBase))
return Transactor::calculateBaseFee(
*(applyCtx.app.openLedger().current()), *stpTrans)
.drops();
return invoke_calculateBaseFee(
*(applyCtx.app.openLedger().current()), *stpTrans)
.drops();
}