Skip to content

Commit

Permalink
Remove wasm times from our antehandler checkTx + recheckTx stack (#8308
Browse files Browse the repository at this point in the history
…) (#8309)

* Remove wasm times from our antehandler checkTx + recheckTx stack

* add changelog

(cherry picked from commit dd8d9c9)

Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>
  • Loading branch information
mergify[bot] and ValarDragon authored May 24, 2024
1 parent 0a4b4d9 commit 44f7045
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 0 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### State Compatible

## v25.0.2

### Osmosis

* [#8308](https://github.com/osmosis-labs/osmosis/pull/8308) Remove IBC rate limit and wasm hook times from mempool checkTx's

## v25.0.1

### Osmosis
Expand All @@ -65,6 +71,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* [#69](https://github.com/osmosis-labs/cometbft/pull/69) perf: Make mempool update async from block.Commit (#3008)
* [#67](https://github.com/osmosis-labs/cometbft/pull/67) fix: TimeoutTicker returns wrong value/timeout pair when timeouts are…

### IBC-go

* Upgrade to v7.4.1 which fixes the significant mempool overhead caused by RedundantRelayDecorator

## v25.0.0

### State Breaking
Expand Down
3 changes: 3 additions & 0 deletions x/ibc-hooks/wasm_hook.go
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,9 @@ func (h WasmHooks) OnAcknowledgementPacketOverride(im IBCMiddleware, ctx sdk.Con
if err != nil {
return err
}
if ctx.IsCheckTx() || ctx.IsReCheckTx() {
return nil
}

if !h.ProperlyConfigured() {
// Not configured. Return from the underlying implementation
Expand Down
3 changes: 3 additions & 0 deletions x/ibc-rate-limit/ibc_module.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,9 @@ func (im *IBCModule) OnAcknowledgementPacket(
acknowledgement []byte,
relayer sdk.AccAddress,
) error {
if ctx.IsCheckTx() || ctx.IsReCheckTx() {
return im.app.OnAcknowledgementPacket(ctx, packet, acknowledgement, relayer)
}
var ack channeltypes.Acknowledgement
if err := json.Unmarshal(acknowledgement, &ack); err != nil {
return errorsmod.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-20 transfer packet acknowledgement: %v", err)
Expand Down

0 comments on commit 44f7045

Please sign in to comment.