Stop returning error logs + stack trace when out of gas in ApplyFuncIfNoErr (backport #2914)

.gitignore

@@ -197,5 +197,36 @@ $RECYCLE.BIN/
 /.idea/
 /artifacts/
 /.vscode/
+/.VSCodeCounter/
 /scripts/local/
-/x/incentives/keeper/osmosis_testing/
+/x/incentives/keeper/osmosis_testing/
+tools-stamp
+/tests/localosmosis/.osmosisd/*
+*.save
+*.save.*
+
+mutation_test_result.txt
+go_mutation_test_result.txt
+
+# Rust ignores. Generated by Cargo
+# will have compiled files and executables
+debug/
+target/
+
+# Generated by rust-optimizer
+artifacts/
+
+# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
+# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
+Cargo.lock
+
+# These are backup files generated by rustfmt
+**/*.rs.bk
+
+# MSVC Windows builds of rustc generate these, which store debugging information
+*.pdb
+
+# Ignores beaker state
+.beaker
+blocks.db
+**/blocks.db*

CHANGELOG.md

@@ -42,6 +42,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 
 * [2261](https://github.com/osmosis-labs/osmosis/pull/2261) feat: speedup epoch distribution, superfluid component (backport #2214)
+* [#2914](https://github.com/osmosis-labs/osmosis/pull/2914) Remove out of gas panics from node logs
 
 ## [v7.3.0](https://github.com/osmosis-labs/osmosis/releases/tag/v7.3.0)
 

osmoutils/cache_ctx.go

@@ -3,7 +3,10 @@ package osmoutils
 import (
 	"errors"
 	"fmt"
+	"runtime"
+	"runtime/debug"
 
+	"github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -14,9 +17,9 @@ import (
 func ApplyFuncIfNoError(ctx sdk.Context, f func(ctx sdk.Context) error) (err error) {
 	// Add a panic safeguard
 	defer func() {
-		if recovErr := recover(); recovErr != nil {
-			fmt.Println(recovErr)
-			err = errors.New("panic occured during execution")
+		if recoveryError := recover(); recoveryError != nil {
+			PrintPanicRecoveryError(ctx, recoveryError)
+			err = errors.New("panic occurred during execution")
 		}
 	}()
 	// makes a new cache context, which all state changes get wrapped inside of.
@@ -30,3 +33,26 @@ func ApplyFuncIfNoError(ctx sdk.Context, f func(ctx sdk.Context) error) (err err
 	}
 	return err
 }
+
+// PrintPanicRecoveryError error logs the recoveryError, along with the stacktrace, if it can be parsed.
+// If not emits them to stdout.
+func PrintPanicRecoveryError(ctx sdk.Context, recoveryError interface{}) {
+	errStackTrace := string(debug.Stack())
+	switch e := recoveryError.(type) {
+	case types.ErrorOutOfGas:
+		ctx.Logger().Debug("out of gas error inside panic recovery block: " + e.Descriptor)
+		return
+	case string:
+		ctx.Logger().Error("Recovering from (string) panic: " + e)
+	case runtime.Error:
+		ctx.Logger().Error("recovered (runtime.Error) panic: " + e.Error())
+	case error:
+		ctx.Logger().Error("recovered (error) panic: " + e.Error())
+	default:
+		ctx.Logger().Error("recovered (default) panic. Could not capture logs in ctx, see stdout")
+		fmt.Println("Recovering from panic ", recoveryError)
+		debug.PrintStack()
+		return
+	}
+	ctx.Logger().Error("stack trace: " + errStackTrace)
+}