fix(logic): fix out of gas on goroutine

axone-protocol · Mar 17, 2023 · b38ab90 · b38ab90
1 parent 3df9cb2
commit b38ab90
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/x/logic/keeper/grpc_query_ask.go b/x/logic/keeper/grpc_query_ask.go
@@ -33,6 +33,13 @@ func (k Keeper) Ask(ctx goctx.Context, req *types.QueryServiceAskRequest) (respo
 
 			panic(r)
 		}
+		if sdkCtx.GasMeter().IsOutOfGas() {
+			response, err = nil, sdkerrors.Wrapf(
+				types.LimitExceeded, "out of gas: %s (%d/%d)",
+				types.ModuleName, sdkCtx.GasMeter().GasConsumed(), sdkCtx.GasMeter().Limit())
+
+			return
+		}
 	}()
 	sdkCtx.GasMeter().ConsumeGas(sdkCtx.GasMeter().GasConsumed(), types.ModuleName)
 

diff --git a/x/logic/types/gas.go b/x/logic/types/gas.go
@@ -1,6 +1,7 @@
 package types
 
 import (
+	"runtime"
 	"sync"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -18,6 +19,14 @@ type safeGasMeter struct {
 
 func (m *safeGasMeter) ConsumeGas(amount uint64, descriptor string) {
 	m.mutex.Lock()
+	defer func() {
+		if r := recover(); r != nil {
+			if _, ok := r.(sdk.ErrorOutOfGas); ok {
+				runtime.Goexit()
+			}
+			panic(r)
+		}
+	}()
 	defer m.mutex.Unlock()
 
 	m.gasMeter.ConsumeGas(amount, descriptor)