updates

baseapp/baseapp.go

@@ -689,9 +689,16 @@ func (app *BaseApp) runTx(mode runTxMode, txBytes []byte) (gInfo sdk.GasInfo, re
 	}
 
 	// Replace logger with filter for a specific message type
-	logerCopy := app.logger
+	appLogerCopy := app.logger
+	ctxLoggerCopy := ctx.Logger()
 	if hasSwap {
+		ctx = ctx.WithLogger(ctx.Logger().With("sim", "info"))
 		app.logger = app.logger.With("sim", "info")
+
+		gasMeter := ctx.GasMeter()
+		gasMeter.SetLogger(ctx.Logger())
+		ctx = ctx.WithGasMeter(gasMeter)
+
 		app.logger.Info("Swap sim logger is enabled")
 	}
 
@@ -791,7 +798,13 @@ func (app *BaseApp) runTx(mode runTxMode, txBytes []byte) (gInfo sdk.GasInfo, re
 
 	// Revert logger
 	if hasSwap {
-		app.logger = logerCopy
+		app.logger = appLogerCopy
+		ctx = ctx.WithLogger(ctxLoggerCopy)
+		gasMeter := ctx.GasMeter()
+		gasMeter.SetLogger(ctx.Logger())
+		ctx = ctx.WithGasMeter(gasMeter)
+
+		app.logger.Info("Swap sim logger is disabled")
 	}
 
 	return gInfo, result, anteEvents, priority, err

store/types/gas.go

@@ -50,6 +50,7 @@ type GasMeter interface {
 	IsPastLimit() bool
 	IsOutOfGas() bool
 	String() string
+	SetLogger(log.Logger)
 }
 
 type basicGasMeter struct {
@@ -58,6 +59,11 @@ type basicGasMeter struct {
 	logger   log.Logger
 }
 
+// SetLogger implements GasMeter.
+func (g *basicGasMeter) SetLogger(logger log.Logger) {
+	g.logger = logger
+}
+
 // NewGasMeter returns a reference to a new basicGasMeter.
 func NewGasMeter(limit Gas, logger log.Logger) GasMeter {
 	return &basicGasMeter{
@@ -157,6 +163,11 @@ type infiniteGasMeter struct {
 	logger   log.Logger
 }
 
+// SetLogger implements GasMeter.
+func (g *infiniteGasMeter) SetLogger(logger log.Logger) {
+	g.logger = logger
+}
+
 // NewInfiniteGasMeter returns a new gas meter without a limit.
 func NewInfiniteGasMeter(logger log.Logger) GasMeter {
 	return &infiniteGasMeter{