chore: remove vmkeeper.maxcycles (#2993)

Let's remove the `vn.maxCycles` variable from the VM keeper so that it
relies solely on the built-in gas system.

`maxCycles` remains an option on `gno.Machine` for blockchainless and
gasless experiences.

---------

Signed-off-by: moul <[email protected]>
Co-authored-by: Morgan Bazalgette <[email protected]>

contribs/gnodev/pkg/dev/node.go

@@ -565,9 +565,8 @@ func newNodeConfig(tmc *tmcfg.Config, chainid string, appstate gnoland.GnoGenesi
 	}
 
 	return &gnoland.InMemoryNodeConfig{
-		PrivValidator:      pv,
-		TMConfig:           tmc,
-		Genesis:            genesis,
-		GenesisMaxVMCycles: 100_000_000,
+		PrivValidator: pv,
+		TMConfig:      tmc,
+		Genesis:       genesis,
 	}
 }

gno.land/pkg/gnoland/app.go

@@ -34,7 +34,6 @@ type AppOptions struct {
 	DB                dbm.DB             // required
 	Logger            *slog.Logger       // required
 	EventSwitch       events.EventSwitch // required
-	MaxCycles         int64              // hard limit for cycles in GnoVM
 	InitChainerConfig                    // options related to InitChainer
 }
 
@@ -88,7 +87,7 @@ func NewAppWithOptions(cfg *AppOptions) (abci.Application, error) {
 	// Construct keepers.
 	acctKpr := auth.NewAccountKeeper(mainKey, ProtoGnoAccount)
 	bankKpr := bank.NewBankKeeper(acctKpr)
-	vmk := vm.NewVMKeeper(baseKey, mainKey, acctKpr, bankKpr, cfg.MaxCycles)
+	vmk := vm.NewVMKeeper(baseKey, mainKey, acctKpr, bankKpr)
 
 	// Set InitChainer
 	icc := cfg.InitChainerConfig

gno.land/pkg/gnoland/node_inmemory.go

@@ -20,11 +20,10 @@ import (
 )
 
 type InMemoryNodeConfig struct {
-	PrivValidator      bft.PrivValidator // identity of the validator
-	Genesis            *bft.GenesisDoc
-	TMConfig           *tmcfg.Config
-	GenesisMaxVMCycles int64
-	DB                 *memdb.MemDB // will be initialized if nil
+	PrivValidator bft.PrivValidator // identity of the validator
+	Genesis       *bft.GenesisDoc
+	TMConfig      *tmcfg.Config
+	DB            *memdb.MemDB // will be initialized if nil
 
 	// If StdlibDir not set, then it's filepath.Join(TMConfig.RootDir, "gnovm", "stdlibs")
 	InitChainerConfig
@@ -106,7 +105,6 @@ func NewInMemoryNode(logger *slog.Logger, cfg *InMemoryNodeConfig) (*node.Node,
 	// Initialize the application with the provided options
 	gnoApp, err := NewAppWithOptions(&AppOptions{
 		Logger:            logger,
-		MaxCycles:         cfg.GenesisMaxVMCycles,
 		DB:                cfg.DB,
 		EventSwitch:       evsw,
 		InitChainerConfig: cfg.InitChainerConfig,

gno.land/pkg/sdk/vm/common_test.go

@@ -47,7 +47,7 @@ func _setupTestEnv(cacheStdlibs bool) testEnv {
 	ctx := sdk.NewContext(sdk.RunTxModeDeliver, ms, &bft.Header{ChainID: "test-chain-id"}, log.NewNoopLogger())
 	acck := authm.NewAccountKeeper(iavlCapKey, std.ProtoBaseAccount)
 	bank := bankm.NewBankKeeper(acck)
-	vmk := NewVMKeeper(baseCapKey, iavlCapKey, acck, bank, 100_000_000)
+	vmk := NewVMKeeper(baseCapKey, iavlCapKey, acck, bank)
 
 	mcw := ms.MultiCacheWrap()
 	vmk.Initialize(log.NewNoopLogger(), mcw)

gno.land/pkg/sdk/vm/keeper.go

@@ -62,8 +62,6 @@ type VMKeeper struct {
 
 	// cached, the DeliverTx persistent state.
 	gnoStore gno.Store
-
-	maxCycles int64 // max allowed cylces on VM executions
 }
 
 // NewVMKeeper returns a new VMKeeper.
@@ -72,15 +70,13 @@ func NewVMKeeper(
 	iavlKey store.StoreKey,
 	acck auth.AccountKeeper,
 	bank bank.BankKeeper,
-	maxCycles int64,
 ) *VMKeeper {
 	// TODO: create an Options struct to avoid too many constructor parameters
 	vmk := &VMKeeper{
-		baseKey:   baseKey,
-		iavlKey:   iavlKey,
-		acck:      acck,
-		bank:      bank,
-		maxCycles: maxCycles,
+		baseKey: baseKey,
+		iavlKey: iavlKey,
+		acck:    acck,
+		bank:    bank,
 	}
 	return vmk
 }
@@ -267,13 +263,12 @@ func (vm *VMKeeper) checkNamespacePermission(ctx sdk.Context, creator crypto.Add
 
 	m := gno.NewMachineWithOptions(
 		gno.MachineOptions{
-			PkgPath:   "",
-			Output:    os.Stdout, // XXX
-			Store:     store,
-			Context:   msgCtx,
-			Alloc:     store.GetAllocator(),
-			MaxCycles: vm.maxCycles,
-			GasMeter:  ctx.GasMeter(),
+			PkgPath:  "",
+			Output:   os.Stdout, // XXX
+			Store:    store,
+			Context:  msgCtx,
+			Alloc:    store.GetAllocator(),
+			GasMeter: ctx.GasMeter(),
 		})
 	defer m.Release()
 
@@ -368,13 +363,12 @@ func (vm *VMKeeper) AddPackage(ctx sdk.Context, msg MsgAddPackage) (err error) {
 	// Parse and run the files, construct *PV.
 	m2 := gno.NewMachineWithOptions(
 		gno.MachineOptions{
-			PkgPath:   "",
-			Output:    os.Stdout, // XXX
-			Store:     gnostore,
-			Alloc:     gnostore.GetAllocator(),
-			Context:   msgCtx,
-			MaxCycles: vm.maxCycles,
-			GasMeter:  ctx.GasMeter(),
+			PkgPath:  "",
+			Output:   os.Stdout, // XXX
+			Store:    gnostore,
+			Alloc:    gnostore.GetAllocator(),
+			Context:  msgCtx,
+			GasMeter: ctx.GasMeter(),
 		})
 	defer m2.Release()
 	defer func() {
@@ -469,13 +463,12 @@ func (vm *VMKeeper) Call(ctx sdk.Context, msg MsgCall) (res string, err error) {
 	// Construct machine and evaluate.
 	m := gno.NewMachineWithOptions(
 		gno.MachineOptions{
-			PkgPath:   "",
-			Output:    os.Stdout, // XXX
-			Store:     gnostore,
-			Context:   msgCtx,
-			Alloc:     gnostore.GetAllocator(),
-			MaxCycles: vm.maxCycles,
-			GasMeter:  ctx.GasMeter(),
+			PkgPath:  "",
+			Output:   os.Stdout, // XXX
+			Store:    gnostore,
+			Context:  msgCtx,
+			Alloc:    gnostore.GetAllocator(),
+			GasMeter: ctx.GasMeter(),
 		})
 	defer m.Release()
 	m.SetActivePackage(mpv)
@@ -569,13 +562,12 @@ func (vm *VMKeeper) Run(ctx sdk.Context, msg MsgRun) (res string, err error) {
 	buf := new(bytes.Buffer)
 	m := gno.NewMachineWithOptions(
 		gno.MachineOptions{
-			PkgPath:   "",
-			Output:    buf,
-			Store:     gnostore,
-			Alloc:     gnostore.GetAllocator(),
-			Context:   msgCtx,
-			MaxCycles: vm.maxCycles,
-			GasMeter:  ctx.GasMeter(),
+			PkgPath:  "",
+			Output:   buf,
+			Store:    gnostore,
+			Alloc:    gnostore.GetAllocator(),
+			Context:  msgCtx,
+			GasMeter: ctx.GasMeter(),
 		})
 	// XXX MsgRun does not have pkgPath. How do we find it on chain?
 	defer m.Release()
@@ -596,13 +588,12 @@ func (vm *VMKeeper) Run(ctx sdk.Context, msg MsgRun) (res string, err error) {
 
 	m2 := gno.NewMachineWithOptions(
 		gno.MachineOptions{
-			PkgPath:   "",
-			Output:    buf,
-			Store:     gnostore,
-			Alloc:     gnostore.GetAllocator(),
-			Context:   msgCtx,
-			MaxCycles: vm.maxCycles,
-			GasMeter:  ctx.GasMeter(),
+			PkgPath:  "",
+			Output:   buf,
+			Store:    gnostore,
+			Alloc:    gnostore.GetAllocator(),
+			Context:  msgCtx,
+			GasMeter: ctx.GasMeter(),
 		})
 	defer m2.Release()
 	m2.SetActivePackage(pv)
@@ -728,13 +719,12 @@ func (vm *VMKeeper) QueryEval(ctx sdk.Context, pkgPath string, expr string) (res
 	}
 	m := gno.NewMachineWithOptions(
 		gno.MachineOptions{
-			PkgPath:   pkgPath,
-			Output:    os.Stdout, // XXX
-			Store:     gnostore,
-			Context:   msgCtx,
-			Alloc:     alloc,
-			MaxCycles: vm.maxCycles,
-			GasMeter:  ctx.GasMeter(),
+			PkgPath:  pkgPath,
+			Output:   os.Stdout, // XXX
+			Store:    gnostore,
+			Context:  msgCtx,
+			Alloc:    alloc,
+			GasMeter: ctx.GasMeter(),
 		})
 	defer m.Release()
 	defer func() {
@@ -795,13 +785,12 @@ func (vm *VMKeeper) QueryEvalString(ctx sdk.Context, pkgPath string, expr string
 	}
 	m := gno.NewMachineWithOptions(
 		gno.MachineOptions{
-			PkgPath:   pkgPath,
-			Output:    os.Stdout, // XXX
-			Store:     gnostore,
-			Context:   msgCtx,
-			Alloc:     alloc,
-			MaxCycles: vm.maxCycles,
-			GasMeter:  ctx.GasMeter(),
+			PkgPath:  pkgPath,
+			Output:   os.Stdout, // XXX
+			Store:    gnostore,
+			Context:  msgCtx,
+			Alloc:    alloc,
+			GasMeter: ctx.GasMeter(),
 		})
 	defer m.Release()
 	defer func() {