Merge pull request #80 from oraichain/fix-gas-less-sims

dang/fix out of gas when execute gasless contract

Author: GNaD13

CHANGELOG_ORAI.md

@@ -1,5 +1,18 @@
 # CHANGELOG
 
+## v0.50.8
+
+<!--
+    Add a summary for the release here.
+
+    If you don't change this message, or if this file is empty, the release
+    will not be created. -->
+Upgrade Oraichain mainnet to v0.50.8 to fix gasless contract bug out of gas when execute gasless contract.
+
+### BUG FIXES
+
+- Fix gasless contract out of gas ([\#80](https://github.com/oraichain/wasmd/pull/80))
+
 ## v0.50.7
 
 <!--

app/upgrades.go

@@ -35,12 +35,13 @@ import (
 	v0505 "github.com/CosmWasm/wasmd/app/upgrades/v0505"
 	v0506 "github.com/CosmWasm/wasmd/app/upgrades/v0506"
 	v0507 "github.com/CosmWasm/wasmd/app/upgrades/v0507"
+	v0508 "github.com/CosmWasm/wasmd/app/upgrades/v0508"
 	v2 "github.com/CosmWasm/wasmd/x/wasm/migrations/v2"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 )
 
 // Upgrades list of chain upgrades
-var Upgrades = []upgrades.Upgrade{v050.Upgrade, v0501.Upgrade, v0502.Upgrade, v0503.Upgrade, v0504.Upgrade, v0505.Upgrade, v0506.Upgrade, v0507.Upgrade}
+var Upgrades = []upgrades.Upgrade{v050.Upgrade, v0501.Upgrade, v0502.Upgrade, v0503.Upgrade, v0504.Upgrade, v0505.Upgrade, v0506.Upgrade, v0507.Upgrade, v0508.Upgrade}
 
 // RegisterUpgradeHandlers registers the chain upgrade handlers
 func (app *WasmApp) RegisterUpgradeHandlers() {

app/upgrades/v0508/upgrades.go

@@ -0,0 +1,36 @@
+package v0508
+
+import (
+	"context"
+
+	storetypes "cosmossdk.io/store/types"
+	upgradetypes "cosmossdk.io/x/upgrade/types"
+
+	"github.com/CosmWasm/wasmd/app/upgrades"
+	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/cosmos-sdk/types/module"
+)
+
+// UpgradeName defines the on-chain upgrade name
+const UpgradeName = "v0.50.8"
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:          UpgradeName,
+	CreateUpgradeHandler: CreateUpgradeHandler,
+	StoreUpgrades: storetypes.StoreUpgrades{
+		Added:   []string{},
+		Deleted: []string{},
+	},
+}
+
+func CreateUpgradeHandler(
+	mm upgrades.ModuleManager,
+	configurator module.Configurator,
+	ak *upgrades.AppKeepers,
+	keys map[string]*storetypes.KVStoreKey,
+	cdc codec.BinaryCodec,
+) upgradetypes.UpgradeHandler {
+	return func(ctx context.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		return mm.RunMigrations(ctx, configurator, fromVM)
+	}
+}

tests/interchaintest/wasm_test.go

@@ -1,6 +1,7 @@
 package interchaintest
 
 import (
+	"fmt"
 	"testing"
 
 	"cosmossdk.io/math"
@@ -80,6 +81,7 @@ func TestWasmGasLessContract(t *testing.T) {
 	resAfter, err := orai.ExecuteContract(ctx, oraiUser.KeyName(), contractAddress, executeMsg, "--gas", "auto")
 	require.NoError(t, err)
 	require.Less(t, resAfter.GasUsed, resBefore.GasUsed) // after set gas less gas used should be less than before
+	fmt.Println("Gas after: ", resAfter.GasUsed)
 
 	// Test unset gas less contract successfully
 	proposalUnsetGasLessID, err := helpers.ProposalUnsetGasLessContracts(

x/wasm/keeper/keeper.go

@@ -394,7 +394,6 @@ func (k Keeper) execute(ctx context.Context, contractAddress, caller sdk.AccAddr
 	// refund gas if we execute gasless contract
 	if isGasLess {
 		sdkCtx.GasMeter().RefundGas(sdkCtx.GasMeter().GasConsumed(), "refund gasless contract")
-		k.Logger(sdkCtx).Info("execute gas less wasm contract")
 	}
 	contractInfo, codeInfo, prefixStore, err := k.contractInstance(ctx, contractAddress)
 	if err != nil {
@@ -415,13 +414,11 @@ func (k Keeper) execute(ctx context.Context, contractAddress, caller sdk.AccAddr
 	info := types.NewInfo(caller, coins)
 
 	// prepare querier
-	querier := k.newQueryHandler(sdkCtx, contractAddress)
-	var gasLeft uint64
 	if isGasLess {
-		gasLeft = math.MaxUint64
-	} else {
-		gasLeft = k.runtimeGasForContract(sdkCtx)
+		sdkCtx = sdkCtx.WithGasMeter(storetypes.NewInfiniteGasMeter())
 	}
+	querier := k.newQueryHandler(sdkCtx, contractAddress)
+	gasLeft := k.runtimeGasForContract(sdkCtx)
 	res, gasUsed, execErr := k.wasmVM.Execute(codeInfo.CodeHash, env, info, msg, prefixStore, cosmwasmAPI, querier, k.gasMeter(sdkCtx), gasLeft, costJSONDeserialization)
 	// consume gas wasmvm if it isn't gas less contract
 	if !isGasLess {