From d118f7990d772da962544346a66767468974754c Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 12:25:06 -0500 Subject: [PATCH] Don't run ValidateBasic on recheck (backport #601) (#602) * Don't run ValidateBasic on recheck (#601) (cherry picked from commit de3aaa1afcf4666d61023bbcd11ef86c9cb2cbdf) * update changelog --------- Co-authored-by: Dev Ojha Co-authored-by: Adam Tucker --- CHANGELOG.md | 18 ++++++++++++++++-- baseapp/baseapp.go | 6 ++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1334ce918f1..13b9901a3892 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,10 +37,22 @@ Ref: https://keepachangelog.com/en/1.0.0/ ## [Unreleased] -## [State Compatible] +### [State Breaking] + +### [State Compatible] + +* (perf) [#601](https://github.com/osmosis-labs/cosmos-sdk/pull/601) Don't run ValidateBasic on recheck ## v24 +## [v0.47.5-v24-osmo-5](https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v24-osmo-5) + +* (iavl) [#593](https://github.com/osmosis-labs/cosmos-sdk/pull/593) IAVL async pruning + +## [v0.47.5-v24-osmo-4](https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v24-osmo-4) + +* (iavl) [#594](https://github.com/osmosis-labs/cosmos-sdk/pull/594) IAVL bump to fix legacy node key bug + ## [v0.47.5-v24-osmo-3](https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v24-osmo-3) * (store) [#525](https://github.com/osmosis-labs/cosmos-sdk/pull/525) CacheKV speedups @@ -52,7 +64,9 @@ Ref: https://keepachangelog.com/en/1.0.0/ ## IAVL v23 v1 Releases -## [Unreleased IAVL v1] +## [v0.47.5-v23-osmo-9-iavl-v1](https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-9-iavl-v1) + +* (iavl) [#593](https://github.com/osmosis-labs/cosmos-sdk/pull/593) IAVL async pruning ## [v0.47.5-v23-osmo-8-iavl-v1](https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-8-iavl-v1) diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go index 704732714746..dc1376f8613d 100644 --- a/baseapp/baseapp.go +++ b/baseapp/baseapp.go @@ -675,8 +675,10 @@ func (app *BaseApp) runTx(mode runTxMode, txBytes []byte) (gInfo sdk.GasInfo, re } msgs := tx.GetMsgs() - if err := validateBasicTxMsgs(msgs); err != nil { - return sdk.GasInfo{}, nil, nil, 0, err + if mode != runTxModeReCheck { + if err := validateBasicTxMsgs(msgs); err != nil { + return sdk.GasInfo{}, nil, nil, 0, err + } } if app.anteHandler != nil {