txtar for test4 cacheTypes issue

gno.land/pkg/gnoland/node_inmemory.go

@@ -24,6 +24,7 @@ type InMemoryNodeConfig struct {
 	TMConfig           *tmcfg.Config
 	GenesisTxHandler   GenesisTxHandler
 	GenesisMaxVMCycles int64
+	DB                 *memdb.MemDB // will be initialized if nil
 }
 
 // NewMockedPrivValidator generate a new key
@@ -86,14 +87,19 @@ func NewInMemoryNode(logger *slog.Logger, cfg *InMemoryNodeConfig) (*node.Node,
 	}
 
 	evsw := events.NewEventSwitch()
+	// initialize db if nil
+	mdb := cfg.DB
+	if mdb == nil {
+		mdb = memdb.NewMemDB()
+	}
 
 	// Initialize the application with the provided options
 	gnoApp, err := NewAppWithOptions(&AppOptions{
 		Logger:           logger,
 		GnoRootDir:       cfg.TMConfig.RootDir,
 		GenesisTxHandler: cfg.GenesisTxHandler,
 		MaxCycles:        cfg.GenesisMaxVMCycles,
-		DB:               memdb.NewMemDB(),
+		DB:               mdb,
 		EventSwitch:      evsw,
 		CacheStdlibLoad:  true,
 	})

gno.land/pkg/integration/testing_integration.go

@@ -25,6 +25,7 @@ import (
 	"github.com/gnolang/gno/tm2/pkg/crypto/bip39"
 	"github.com/gnolang/gno/tm2/pkg/crypto/keys"
 	"github.com/gnolang/gno/tm2/pkg/crypto/keys/client"
+	"github.com/gnolang/gno/tm2/pkg/db/memdb"
 	tm2Log "github.com/gnolang/gno/tm2/pkg/log"
 	"github.com/gnolang/gno/tm2/pkg/std"
 	"github.com/rogpeppe/go-internal/testscript"
@@ -71,6 +72,7 @@ func RunGnolandTestscripts(t *testing.T, txtarDir string) {
 
 type testNode struct {
 	*node.Node
+	cfg         *gnoland.InMemoryNodeConfig
 	nGnoKeyExec uint // Counter for execution of gnokey.
 }
 
@@ -188,16 +190,38 @@ func setupGnolandTestScript(t *testing.T, txtarDir string) testscript.Params {
 
 					// setup genesis state
 					cfg.Genesis.AppState = *genesis
+					cfg.DB = memdb.NewMemDB() // so it can be reused when restarting.
 
 					n, remoteAddr := TestingInMemoryNode(t, logger, cfg)
 
 					// Register cleanup
-					nodes[sid] = &testNode{Node: n}
+					nodes[sid] = &testNode{Node: n, cfg: cfg}
 
 					// Add default environments
 					ts.Setenv("RPC_ADDR", remoteAddr)
 
 					fmt.Fprintln(ts.Stdout(), "node started successfully")
+				case "restart":
+					// XXX: unstable, should try to use it in a working scenario
+					n, ok := nodes[sid]
+					if !ok {
+						err = fmt.Errorf("node must be started before being restarted")
+						break
+					}
+
+					if stopErr := n.Stop(); stopErr != nil {
+						err = fmt.Errorf("error stopping node: %w", stopErr)
+						break
+					}
+
+					// Create new node with same config.
+					newNode, newRemoteAddr := TestingInMemoryNode(t, logger, n.cfg)
+
+					// Update testNode and environment variables.
+					n.Node = newNode
+					ts.Setenv("RPC_ADDR", newRemoteAddr)
+
+					fmt.Fprintln(ts.Stdout(), "node restarted successfully")
 				case "stop":
 					n, ok := nodes[sid]
 					if !ok {

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

@@ -92,31 +92,21 @@ func (vm *VMKeeper) Initialize(
 	if vm.gnoStore != nil {
 		panic("should not happen")
 	}
-	baseSDKStore := ms.GetStore(vm.baseKey)
-	iavlSDKStore := ms.GetStore(vm.iavlKey)
+	baseStore := ms.GetStore(vm.baseKey)
+	iavlStore := ms.GetStore(vm.iavlKey)
 
-	if cacheStdlibLoad {
-		// Testing case (using the cache speeds up starting many nodes)
-		vm.gnoStore = cachedStdlibLoad(vm.stdlibsDir, baseSDKStore, iavlSDKStore)
-	} else {
-		// On-chain case
-		vm.gnoStore = uncachedPackageLoad(logger, vm.stdlibsDir, baseSDKStore, iavlSDKStore)
-	}
-}
-
-func uncachedPackageLoad(
-	logger *slog.Logger,
-	stdlibsDir string,
-	baseStore, iavlStore store.Store,
-) gno.Store {
 	alloc := gno.NewAllocator(maxAllocTx)
-	gnoStore := gno.NewStore(alloc, baseStore, iavlStore)
-	gnoStore.SetNativeStore(stdlibs.NativeStore)
-	if gnoStore.NumMemPackages() == 0 {
+	vm.gnoStore = gno.NewStore(alloc, baseStore, iavlStore)
+	vm.gnoStore.SetNativeStore(stdlibs.NativeStore)
+	if vm.gnoStore.NumMemPackages() == 0 {
 		// No packages in the store; set up the stdlibs.
 		start := time.Now()
 
-		loadStdlib(stdlibsDir, gnoStore)
+		if cacheStdlibLoad {
+			cachedLoadStdlib(vm.stdlibsDir, vm.gnoStore, baseStore, iavlStore)
+		} else {
+			loadStdlib(vm.stdlibsDir, vm.gnoStore)
+		}
 
 		// XXX Quick and dirty to make this function work on non-validator nodes
 		iter := iavlStore.Iterator(nil, nil)
@@ -149,7 +139,7 @@ func uncachedPackageLoad(
 			gno.MachineOptions{
 				PkgPath: "",
 				Output:  os.Stdout, // XXX
-				Store:   gnoStore,
+				Store:   vm.gnoStore,
 			})
 		defer m2.Release()
 		gno.DisableDebug()
@@ -159,7 +149,6 @@ func uncachedPackageLoad(
 		logger.Debug("GnoVM packages preprocessed",
 			"elapsed", time.Since(start))
 	}
-	return gnoStore
 }
 
 var iavlBackupPrefix = []byte("init_iavl_backup:")
@@ -173,7 +162,7 @@ func isStoreEmpty(st store.Store) bool {
 	return true
 }
 
-func cachedStdlibLoad(stdlibsDir string, baseStore, iavlStore store.Store) gno.Store {
+func cachedLoadStdlib(stdlibsDir string, gnoStore gno.Store, baseStore, iavlStore store.Store) {
 	cachedStdlibOnce.Do(func() {
 		cachedStdlibBase = memdb.NewMemDB()
 		cachedStdlibIavl = memdb.NewMemDB()
@@ -195,11 +184,7 @@ func cachedStdlibLoad(stdlibsDir string, baseStore, iavlStore store.Store) gno.S
 		iavlStore.Set(itr.Key(), itr.Value())
 	}
 
-	alloc := gno.NewAllocator(maxAllocTx)
-	gs := gno.NewStore(alloc, baseStore, iavlStore)
-	gs.SetNativeStore(stdlibs.NativeStore)
-	gno.CopyCachesFromStore(gs, cachedGnoStore)
-	return gs
+	gno.CopyCachesFromStore(gnoStore, cachedGnoStore)
 }
 
 var (