Merge pull request #2103 from CosmWasm/co/limit-gas

Adjust `SmartContractState` query gas limit

Author: chipshort

x/wasm/keeper/querier.go

@@ -200,7 +200,11 @@ func (q GrpcQuerier) SmartContractState(c context.Context, req *types.QuerySmart
 	if err != nil {
 		return nil, err
 	}
-	ctx := sdk.UnwrapSDKContext(c).WithGasMeter(storetypes.NewGasMeter(q.queryGasLimit))
+
+	// limit the gas to the queryGasLimit or the remaining gas, whichever is smaller
+	ctx := sdk.UnwrapSDKContext(c)
+	gasLimit := min(ctx.GasMeter().GasRemaining(), q.queryGasLimit)
+	ctx = ctx.WithGasMeter(storetypes.NewGasMeter(gasLimit))
 	// recover from out-of-gas panic
 	defer func() {
 		if r := recover(); r != nil {

x/wasm/keeper/querier_test.go

@@ -178,15 +178,15 @@ func TestQuerySmartContractPanics(t *testing.T) {
 		CodeID:  1,
 		Created: types.NewAbsoluteTxPosition(ctx),
 	})
-	ctx = ctx.WithGasMeter(storetypes.NewGasMeter(types.DefaultInstanceCost)).WithLogger(log.NewTestLogger(t))
+	gasLimit := types.DefaultInstanceCost + 5000
 
 	specs := map[string]struct {
 		doInContract func()
 		expErr       *errorsmod.Error
 	}{
 		"out of gas": {
 			doInContract: func() {
-				ctx.GasMeter().ConsumeGas(ctx.GasMeter().Limit()+1, "test - consume more than limit")
+				ctx.GasMeter().ConsumeGas(gasLimit+1, "test - consume more than limit")
 			},
 			expErr: sdkErrors.ErrOutOfGas,
 		},
@@ -199,6 +199,9 @@ func TestQuerySmartContractPanics(t *testing.T) {
 	}
 	for msg, spec := range specs {
 		t.Run(msg, func(t *testing.T) {
+			// reset gas meter
+			ctx = ctx.WithGasMeter(storetypes.NewGasMeter(gasLimit)).WithLogger(log.NewTestLogger(t))
+
 			keepers.WasmKeeper.wasmVM = &wasmtesting.MockWasmEngine{QueryFn: func(checksum wasmvm.Checksum, env wasmvmtypes.Env, queryMsg []byte, store wasmvm.KVStore, goapi wasmvm.GoAPI, querier wasmvm.Querier, gasMeter wasmvm.GasMeter, gasLimit uint64, deserCost wasmvmtypes.UFraction) (*wasmvmtypes.QueryResult, uint64, error) {
 				spec.doInContract()
 				return &wasmvmtypes.QueryResult{}, 0, nil