fix(logic): handle and return out of gas error at GRPC level

bdeneux · bdeneux · commit ff3de76a2018 · 2024-07-18T16:23:33.000+02:00
diff --git a/x/logic/keeper/interpreter.go b/x/logic/keeper/interpreter.go
@@ -3,6 +3,7 @@ package keeper
 import (
 	"context"
 	"fmt"
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"io"
 	"math"
 	"strings"
@@ -107,12 +108,12 @@ func (k Keeper) newInterpreter(ctx context.Context) (*prolog.Interpreter, fmt.St
 
 			defer func() {
 				if r := recover(); r != nil {
-					if gasError, ok := r.(storetypes.ErrorOutOfGas); ok {
-						err = engine.ResourceError(prolog2.ResourceGas(gasError.Descriptor, gasMeter.GasConsumed(), gasMeter.Limit()), env)
-						return
+					switch rType := r.(type) {
+					case storetypes.ErrorOutOfGas:
+						err = errorsmod.Wrapf(sdkerrors.ErrOutOfGas, "out of gas in location: %v", rType.Descriptor)
+					default:
+						panic(r)
 					}
-
-					panic(r)
 				}
 			}()
 
diff --git a/x/logic/util/prolog.go b/x/logic/util/prolog.go
@@ -2,6 +2,10 @@ package util
 
 import (
 	"context"
+	errorsmod "cosmossdk.io/errors"
+	"errors"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"strings"
 
 	"github.com/ichiban/prolog"
@@ -48,6 +52,12 @@ func QueryInterpreter(
 	if callErr != nil {
 		if sdkmath.NewUint(uint64(len(results))).LT(solutionsLimit) {
 			// error is not part of the look-ahead and should be included in the solutions
+			if errors.Is(callErr, sdkerrors.ErrOutOfGas) {
+				return nil, callErr
+			} else if sdk.UnwrapSDKContext(ctx).GasMeter().IsOutOfGas() {
+				return nil, errorsmod.Wrapf(sdkerrors.ErrOutOfGas, "out of gas in location: %v", callErr.Error())
+			}
+
 			results = append(results, types.Result{Error: callErr.Error()})
 		} else {
 			// error is part of the look-ahead, so let's consider that there's one more solution
