@agoric/cosmos 0.34.2-upgrade-16-dev-91eb8f4.0 → 0.34.2-upgrade-17-dev-e67cd91.0

package/Makefile

@@ -61,10 +61,10 @@ node-compile-gyp:
 		npm run build:gyp; \
 	fi
 
-compile-agd: go-mod-cache
+compile-agd: go.sum
 	go build -v $(MOD_READONLY) $(BUILD_FLAGS) -buildmode=exe -o build/agd ./cmd/agd
 
-install-agd: go-mod-cache
+install-agd: go.sum
 	go install -v $(MOD_READONLY) $(BUILD_FLAGS) -buildmode=exe ./cmd/agd
 
 # Only run from the package.json build:gyp script.
@@ -73,17 +73,18 @@ compile-gyp:
 	node-gyp configure build $(GYP_DEBUG) || { status=$$?; rm -f binding.gyp; exit $$status; }
 	rm -f binding.gyp
 
-compile-libdaemon: go-mod-cache
+compile-libdaemon: go.sum
 	go build -v $(MOD_READONLY) $(SHARED_BUILD_FLAGS) -buildmode=c-shared \
 		-o build/libagcosmosdaemon.so ./cmd/libdaemon/main.go
 
-go-mod-cache: go.sum
-	@echo "--> Download go modules to local cache"
-	@go mod download
-
 go.sum: go.mod
-	@echo "--> Ensure dependencies have not been modified"
+	@echo "--> Ensure dependencies have not been modified unless suppressed by SKIP_MOD_VERIFY ..."
+ifndef SKIP_MOD_VERIFY
 	GO111MODULE=on go mod verify
+endif
+	GO111MODULE=on go mod tidy
+	@echo "--> Download go modules to local cache"
+	go mod download
 
 ###############################################################################
 ###                           Protobuf                                    ###

package/app/app.go

@@ -214,6 +214,7 @@ var (
 // capabilities aren't needed for testing.
 type GaiaApp struct { // nolint: golint
 	*baseapp.BaseApp
+	resolvedConfig    servertypes.AppOptions
 	legacyAmino       *codec.LegacyAmino
 	appCodec          codec.Codec
 	interfaceRegistry types.InterfaceRegistry
@@ -314,9 +315,18 @@ func NewGaiaApp(
 }
 
 func NewAgoricApp(
-	sendToController vm.Sender, agdServer *vm.AgdServer,
-	logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest bool, skipUpgradeHeights map[int64]bool,
-	homePath string, invCheckPeriod uint, encodingConfig gaiaappparams.EncodingConfig, appOpts servertypes.AppOptions, baseAppOptions ...func(*baseapp.BaseApp),
+	sendToController vm.Sender,
+	agdServer *vm.AgdServer,
+	logger log.Logger,
+	db dbm.DB,
+	traceStore io.Writer,
+	loadLatest bool,
+	skipUpgradeHeights map[int64]bool,
+	homePath string,
+	invCheckPeriod uint,
+	encodingConfig gaiaappparams.EncodingConfig,
+	appOpts servertypes.AppOptions,
+	baseAppOptions ...func(*baseapp.BaseApp),
 ) *GaiaApp {
 	appCodec := encodingConfig.Marshaler
 	legacyAmino := encodingConfig.Amino
@@ -342,6 +352,7 @@ func NewAgoricApp(
 	app := &GaiaApp{
 		BaseApp:           bApp,
 		AgdServer:         agdServer,
+		resolvedConfig:    appOpts,
 		legacyAmino:       legacyAmino,
 		appCodec:          appCodec,
 		interfaceRegistry: interfaceRegistry,
@@ -862,27 +873,26 @@ func NewAgoricApp(
 	app.SetBeginBlocker(app.BeginBlocker)
 	app.SetEndBlocker(app.EndBlocker)
 
-	for name := range upgradeNamesOfThisVersion {
+	for _, name := range upgradeNamesOfThisVersion {
 		app.UpgradeKeeper.SetUpgradeHandler(
 			name,
-			upgrade16Handler(app, name),
+			unreleasedUpgradeHandler(app, name),
 		)
 	}
 
+	// At this point we don't have a way to read from the store, so we have to
+	// rely on data saved by the x/upgrade module in the previous software.
 	upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
 	if err != nil {
 		panic(err)
 	}
-	if upgradeNamesOfThisVersion[upgradeInfo.Name] && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
+	// Store migrations can only run once, so we use a notion of "primary upgrade
+	// name" to trigger them. Testnets may end up upgrading from one rc to
+	// another, which shouldn't re-run store upgrades.
+	if isPrimaryUpgradeName(upgradeInfo.Name) && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
 		storeUpgrades := storetypes.StoreUpgrades{
-			Added: []string{
-				packetforwardtypes.ModuleName, // Added PFM
-				vlocalchain.ModuleName,        // Agoric added vlocalchain
-				vtransfer.ModuleName,          // Agoric added vtransfer
-			},
-			Deleted: []string{
-				"lien", // Agoric removed the lien module
-			},
+			Added:   []string{},
+			Deleted: []string{},
 		}
 
 		// configure store loader that checks if version == upgradeHeight and applies store upgrades
@@ -933,11 +943,12 @@ type upgradeDetails struct {
 
 type cosmosInitAction struct {
 	vm.ActionHeader `actionType:"AG_COSMOS_INIT"`
-	ChainID         string          `json:"chainID"`
-	IsBootstrap     bool            `json:"isBootstrap"`
-	UpgradeDetails  *upgradeDetails `json:"upgradeDetails,omitempty"`
-	Params          swingset.Params `json:"params"`
-	SupplyCoins     sdk.Coins       `json:"supplyCoins"`
+	ChainID         string                   `json:"chainID"`
+	IsBootstrap     bool                     `json:"isBootstrap"`
+	Params          swingset.Params          `json:"params"`
+	ResolvedConfig  *swingset.SwingsetConfig `json:"resolvedConfig"`
+	SupplyCoins     sdk.Coins                `json:"supplyCoins"`
+	UpgradeDetails  *upgradeDetails          `json:"upgradeDetails,omitempty"`
 	// CAVEAT: Every property ending in "Port" is saved in chain-main.js/portNums
 	// with a key consisting of this name with the "Port" stripped.
 	StoragePort     int `json:"storagePort"`
@@ -969,10 +980,15 @@ func (app *GaiaApp) initController(ctx sdk.Context, bootstrap bool) {
 	app.controllerInited = true
 
 	// Begin initializing the controller here.
+	swingsetConfig, err := swingset.SwingsetConfigFromViper(app.resolvedConfig)
+	if err != nil {
+		panic(err)
+	}
 	action := &cosmosInitAction{
 		ChainID:        ctx.ChainID(),
 		IsBootstrap:    bootstrap,
 		Params:         app.SwingSetKeeper.GetParams(ctx),
+		ResolvedConfig: swingsetConfig,
 		SupplyCoins:    sdk.NewCoins(app.BankKeeper.GetSupply(ctx, "uist")),
 		UpgradeDetails: app.upgradeDetails,
 		// See CAVEAT in cosmosInitAction.

package/app/upgrade.go

@@ -1,6 +1,8 @@
 package gaia
 
 import (
+	"fmt"
+
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	swingsetkeeper "github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/keeper"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -8,12 +10,61 @@ import (
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )
 
-var upgradeNamesOfThisVersion = map[string]bool{
-	"agoric-upgrade-16": true,
+var upgradeNamesOfThisVersion = []string{
+	"UNRELEASED_BASIC", // no-frills
+	"UNRELEASED_A3P_INTEGRATION",
+	"UNRELEASED_main",
+	"UNRELEASED_devnet",
+	"UNRELEASED_REAPPLY",
+}
+
+// isUpgradeNameOfThisVersion returns whether the provided plan name is a
+// known upgrade name of this software version
+func isUpgradeNameOfThisVersion(name string) bool {
+	for _, upgradeName := range upgradeNamesOfThisVersion {
+		if upgradeName == name {
+			return true
+		}
+	}
+	return false
+}
+
+// validUpgradeName is an identity function that asserts the provided name
+// is an upgrade name of this software version. It can be used as a sort of
+// dynamic enum check.
+func validUpgradeName(name string) string {
+	if !isUpgradeNameOfThisVersion(name) {
+		panic(fmt.Errorf("invalid upgrade name: %s", name))
+	}
+	return name
 }
 
+// isPrimaryUpgradeName returns wether the provided plan name is considered a
+// primary for the purpose of applying store migrations for the first upgrade
+// of this version.
+// It is expected that only primary plan names are used for non testing chains.
+func isPrimaryUpgradeName(name string) bool {
+	if name == "" {
+		// An empty upgrade name can happen if there are no upgrade in progress
+		return false
+	}
+	switch name {
+	case validUpgradeName("UNRELEASED_BASIC"),
+		validUpgradeName("UNRELEASED_A3P_INTEGRATION"),
+		validUpgradeName("UNRELEASED_main"),
+		validUpgradeName("UNRELEASED_devnet"):
+		return true
+	case validUpgradeName("UNRELEASED_REAPPLY"):
+		return false
+	default:
+		panic(fmt.Errorf("unexpected upgrade name %s", validUpgradeName(name)))
+	}
+}
+
+// isFirstTimeUpgradeOfThisVersion looks up in the upgrade store whether no
+// upgrade plan name of this version have previously been applied.
 func isFirstTimeUpgradeOfThisVersion(app *GaiaApp, ctx sdk.Context) bool {
-	for name := range upgradeNamesOfThisVersion {
+	for _, name := range upgradeNamesOfThisVersion {
 		if app.UpgradeKeeper.GetDoneHeight(ctx, name) != 0 {
 			return false
 		}
@@ -21,8 +72,8 @@ func isFirstTimeUpgradeOfThisVersion(app *GaiaApp, ctx sdk.Context) bool {
 	return true
 }
 
-// upgrade16Handler performs standard upgrade actions plus custom actions for upgrade-16.
-func upgrade16Handler(app *GaiaApp, targetUpgrade string) func(sdk.Context, upgradetypes.Plan, module.VersionMap) (module.VersionMap, error) {
+// unreleasedUpgradeHandler performs standard upgrade actions plus custom actions for the unreleased upgrade.
+func unreleasedUpgradeHandler(app *GaiaApp, targetUpgrade string) func(sdk.Context, upgradetypes.Plan, module.VersionMap) (module.VersionMap, error) {
 	return func(ctx sdk.Context, plan upgradetypes.Plan, fromVm module.VersionMap) (module.VersionMap, error) {
 		app.CheckControllerInited(false)
 
@@ -31,21 +82,27 @@ func upgrade16Handler(app *GaiaApp, targetUpgrade string) func(sdk.Context, upgr
 		// These CoreProposalSteps are not idempotent and should only be executed
 		// as part of the first upgrade using this handler on any given chain.
 		if isFirstTimeUpgradeOfThisVersion(app, ctx) {
+			// The storeUpgrades defined in app.go only execute for the primary upgrade name
+			// If we got here and this first upgrade of this version does not use the
+			// primary upgrade name, stores have not been initialized correctly.
+			if !isPrimaryUpgradeName(plan.Name) {
+				return module.VersionMap{}, fmt.Errorf("cannot run %s as first upgrade", plan.Name)
+			}
+
 			// Each CoreProposalStep runs sequentially, and can be constructed from
 			// one or more modules executing in parallel within the step.
 			CoreProposalSteps = []vm.CoreProposalStep{
-				// Upgrade Zoe + ZCF
-				vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/replace-zoe.js"),
-				// Revive KREAd characters
-				vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/revive-kread.js"),
-
-				// upgrade the provisioning vat
-				vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/replace-provisioning.js"),
-				// Enable low-level Orchestration.
 				vm.CoreProposalStepForModules(
-					"@agoric/builders/scripts/vats/init-network.js",
-					"@agoric/builders/scripts/vats/init-localchain.js",
-					"@agoric/builders/scripts/vats/init-transfer.js",
+					// Upgrade to new liveslots for repaired vow usage.
+					"@agoric/builders/scripts/vats/upgrade-orch-core.js",
+				),
+				vm.CoreProposalStepForModules(
+					// Upgrade to new liveslots and support vows.
+					"@agoric/builders/scripts/smart-wallet/build-wallet-factory2-upgrade.js",
+				),
+				vm.CoreProposalStepForModules(
+					// Create vat-orchestration.
+					"@agoric/builders/scripts/vats/init-orchestration.js",
 				),
 			}
 		}

package/daemon/cmd/root.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"strings"
 
 	serverconfig "github.com/cosmos/cosmos-sdk/server/config"
 
@@ -36,6 +37,7 @@ import (
 	gaia "github.com/Agoric/agoric-sdk/golang/cosmos/app"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/app/params"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
+	swingset "github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset"
 	swingsetkeeper "github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/keeper"
 )
 
@@ -43,6 +45,31 @@ var AppName = "agd"
 var OnStartHook func(*vm.AgdServer, log.Logger, servertypes.AppOptions) error
 var OnExportHook func(*vm.AgdServer, log.Logger, servertypes.AppOptions) error
 
+// CustomAppConfig extends the base config struct.
+type CustomAppConfig struct {
+	serverconfig.Config `mapstructure:",squash"`
+	// Swingset must be named as expected by swingset.DefaultConfigTemplate
+	// and must use a mapstructure key matching swingset.ConfigPrefix.
+	Swingset swingset.SwingsetConfig `mapstructure:"swingset"`
+}
+
+type cobraRunE func(cmd *cobra.Command, args []string) error
+
+func appendToPreRunE(cmd *cobra.Command, fn cobraRunE) {
+	preRunE := cmd.PreRunE
+	if preRunE == nil {
+		cmd.PreRunE = fn
+		return
+	}
+	composite := func(cmd *cobra.Command, args []string) error {
+		if err := preRunE(cmd, args); err != nil {
+			return err
+		}
+		return fn(cmd, args)
+	}
+	cmd.PreRunE = composite
+}
+
 // NewRootCmd creates a new root command for simd. It is called once in the
 // main function.
 func NewRootCmd(sender vm.Sender) (*cobra.Command, params.EncodingConfig) {
@@ -99,24 +126,25 @@ func initTendermintConfig() *tmcfg.Config {
 // initAppConfig helps to override default appConfig template and configs.
 // return "", nil if no custom configuration is required for the application.
 func initAppConfig() (string, interface{}) {
-	// Allow us to overwrite the SDK's default server config.
 	srvCfg := serverconfig.DefaultConfig()
-	// The SDK's default minimum gas price is set to "" (empty value) inside
-	// app.toml. If left empty by validators, the node will halt on startup.
-	// However, the chain developer can set a default app.toml value for their
-	// validators here.
-	//
-	// In summary:
-	// - if you leave srvCfg.MinGasPrices = "", all validators MUST tweak their
-	//   own app.toml config,
-	// - if you set srvCfg.MinGasPrices non-empty, validators CAN tweak their
-	//   own app.toml to override, or use this default value.
-	//
-	// FIXME: We may want to have Agoric set a min gas price in uist.
-	// For now, we set it to zero so that validators don't have to worry about it.
+
+	// FIXME: We may want a non-zero min gas price.
+	// For now, we set it to zero to reduce friction (the default "" fails
+	// startup, forcing each validator to set their own value).
 	srvCfg.MinGasPrices = "0uist"
 
-	return serverconfig.DefaultConfigTemplate, *srvCfg
+	customAppConfig := CustomAppConfig{
+		Config:   *srvCfg,
+		Swingset: swingset.DefaultSwingsetConfig,
+	}
+
+	// Config TOML.
+	customAppTemplate := strings.Join([]string{
+		serverconfig.DefaultConfigTemplate,
+		swingset.DefaultConfigTemplate,
+	}, "")
+
+	return customAppTemplate, customAppConfig
 }
 
 func initRootCmd(sender vm.Sender, rootCmd *cobra.Command, encodingConfig params.EncodingConfig) {
@@ -144,10 +172,27 @@ func initRootCmd(sender vm.Sender, rootCmd *cobra.Command, encodingConfig params
 		snapshot.Cmd(ac.newSnapshotsApp),
 	)
 
-	server.AddCommands(rootCmd, gaia.DefaultNodeHome, ac.newApp, ac.appExport, addModuleInitFlags)
+	server.AddCommands(rootCmd, gaia.DefaultNodeHome, ac.newApp, ac.appExport, addStartFlags)
 
 	for _, command := range rootCmd.Commands() {
 		switch command.Name() {
+		case "start":
+			var preRunE cobraRunE = func(cmd *cobra.Command, _ []string) error {
+				// Consume and validate config.
+				viper := server.GetServerContextFromCmd(cmd).Viper
+				baseConfig, err := serverconfig.GetConfig(viper)
+				if err != nil {
+					return err
+				}
+				if err = baseConfig.ValidateBasic(); err != nil {
+					return err
+				}
+				if _, err = swingset.SwingsetConfigFromViper(viper); err != nil {
+					return err
+				}
+				return nil
+			}
+			appendToPreRunE(command, preRunE)
 		case "export":
 			addAgoricVMFlags(command)
 			extendCosmosExportCommand(command)
@@ -197,7 +242,7 @@ func addAgoricVMFlags(cmd *cobra.Command) {
 	)
 }
 
-func addModuleInitFlags(startCmd *cobra.Command) {
+func addStartFlags(startCmd *cobra.Command) {
 	addAgoricVMFlags(startCmd)
 }
 
@@ -282,11 +327,12 @@ func (ac appCreator) newApp(
 
 	homePath := cast.ToString(appOpts.Get(flags.FlagHome))
 
-	// Set a default value for FlagSwingStoreExportDir based on the homePath
+	// Set a default value for FlagSwingStoreExportDir based on homePath
 	// in case we need to InitGenesis with swing-store data
 	viper, ok := appOpts.(*viper.Viper)
-	if ok && cast.ToString(appOpts.Get(gaia.FlagSwingStoreExportDir)) == "" {
-		viper.Set(gaia.FlagSwingStoreExportDir, filepath.Join(homePath, "config", ExportedSwingStoreDirectoryName))
+	if ok && viper.GetString(gaia.FlagSwingStoreExportDir) == "" {
+		exportDir := filepath.Join(homePath, "config", ExportedSwingStoreDirectoryName)
+		viper.Set(gaia.FlagSwingStoreExportDir, exportDir)
 	}
 
 	return gaia.NewAgoricApp(

package/git-revision.txt

@@ -1 +1 @@
-91eb8f4
+e67cd91

package/go.mod

@@ -17,6 +17,7 @@ require (
 	github.com/rakyll/statik v0.1.7
 	github.com/spf13/cast v1.5.0
 	github.com/spf13/cobra v1.7.0
+	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.14.0
 	github.com/stretchr/testify v1.8.4
 	github.com/tendermint/tendermint v0.34.29
@@ -133,7 +134,6 @@ require (
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect
 	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.4.1 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
 	github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmos",
-  "version": "0.34.2-upgrade-16-dev-91eb8f4.0+91eb8f4",
+  "version": "0.34.2-upgrade-17-dev-e67cd91.0+e67cd91",
   "description": "Connect JS to the Cosmos blockchain SDK",
   "parsers": {
     "js": "mjs"
@@ -9,7 +9,7 @@
   "engines": {
     "node": "^18.12 || ^20.9"
   },
-  "packageManager": "yarn@1.22.19",
+  "packageManager": "yarn@1.22.22",
   "scripts": {
     "test": "exit 0",
     "build:all": "make",
@@ -39,5 +39,5 @@
   "typeCoverage": {
     "atLeast": 0
   },
-  "gitHead": "91eb8f468c6ac5e9c4892633855eac3db365001d"
+  "gitHead": "e67cd918f33dafb1708bd4341f2a737b79fa574f"
 }

package/util/util.go

@@ -0,0 +1,21 @@
+package util
+
+import (
+	"github.com/spf13/viper"
+)
+
+func IndexOf[T comparable](a []T, x T) int {
+	for i, s := range a {
+		if s == x {
+			return i
+		}
+	}
+	return -1
+}
+
+func NewFileOnlyViper(v1 *viper.Viper) (*viper.Viper, error) {
+	v2 := viper.New()
+	v2.SetConfigFile(v1.ConfigFileUsed())
+	err := v2.ReadInConfig()
+	return v2, err
+}

package/x/swingset/config.go

@@ -0,0 +1,234 @@
+package swingset
+
+import (
+	"fmt"
+	"path/filepath"
+
+	"github.com/spf13/viper"
+
+	"github.com/cosmos/cosmos-sdk/client/flags"
+	pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types"
+	serverconfig "github.com/cosmos/cosmos-sdk/server/config"
+	servertypes "github.com/cosmos/cosmos-sdk/server/types"
+
+	"github.com/Agoric/agoric-sdk/golang/cosmos/util"
+)
+
+const (
+	ConfigPrefix                = "swingset"
+	FlagSlogfile                = ConfigPrefix + ".slogfile"
+	FlagVatSnapshotArchiveDir   = ConfigPrefix + ".vat-snapshot-archive-dir"
+	FlagVatTranscriptArchiveDir = ConfigPrefix + ".vat-transcript-archive-dir"
+
+	SnapshotRetentionOptionDebug       = "debug"
+	SnapshotRetentionOptionOperational = "operational"
+
+	TranscriptRetentionOptionArchival    = "archival"
+	TranscriptRetentionOptionOperational = "operational"
+)
+
+var snapshotRetentionValues []string = []string{
+	SnapshotRetentionOptionDebug,
+	SnapshotRetentionOptionOperational,
+}
+
+var transcriptRetentionValues []string = []string{
+	TranscriptRetentionOptionArchival,
+	TranscriptRetentionOptionOperational,
+}
+
+// DefaultConfigTemplate defines a default TOML configuration section for the SwingSet VM.
+// Values are pulled from a "Swingset" property, in accord with CustomAppConfig from
+// ../../daemon/cmd/root.go.
+// See https://github.com/cosmos/cosmos-sdk/issues/20097 for auto-synchronization ideas.
+const DefaultConfigTemplate = `
+###############################################################################
+###                         SwingSet Configuration                          ###
+###############################################################################
+
+[swingset]
+# The path at which a SwingSet log "slog" file should be written.
+# If relative, it is interpreted against the application home directory
+# (e.g., ~/.agoric).
+# May be overridden by a SLOGFILE environment variable, which if relative is
+# interpreted against the working directory.
+slogfile = "{{ .Swingset.SlogFile }}"
+
+# The maximum number of vats that the SwingSet kernel will bring online. A lower number
+# requires less memory but may have a negative performance impact if vats need to
+# be frequently paged out to remain under this limit.
+max-vats-online = {{ .Swingset.MaxVatsOnline }}
+
+# Retention of vat snapshots, with values analogous to those of export
+# 'artifactMode' (cf.
+# https://github.com/Agoric/agoric-sdk/blob/master/packages/swing-store/docs/data-export.md#optional--historical-data ).
+# * "debug": keep all snapshots
+# * "operational": keep only the last snapshot
+vat-snapshot-retention = "{{ .Swingset.VatSnapshotRetention }}"
+
+# Retention of vat transcript spans, with values analogous to those of export
+# 'artifactMode' (cf.
+# https://github.com/Agoric/agoric-sdk/blob/master/packages/swing-store/docs/data-export.md#optional--historical-data ).
+# * "archival": keep all transcript spans
+# * "operational": keep only necessary transcript spans (i.e., since the
+#   last snapshot of their vat)
+# * "default": determined by 'pruning' ("archival" if 'pruning' is "nothing",
+#   otherwise "operational")
+vat-transcript-retention = "{{ .Swingset.VatTranscriptRetention }}"
+
+# Archival of gzipped vat snapshots.
+vat-snapshot-archive-dir = "{{ .Swingset.VatSnapshotArchiveDir }}"
+
+# Archival of historical (i.e., closed) vat transcript spans to gzipped files.
+vat-transcript-archive-dir = "{{ .Swingset.VatTranscriptArchiveDir }}"
+`
+
+// SwingsetConfig defines configuration for the SwingSet VM.
+// "mapstructure" tag data is used to direct reads from app.toml;
+// "json" tag data is used to populate init messages for the VM.
+// This should be kept in sync with SwingsetConfigShape in
+// ../../../../packages/cosmic-swingset/src/chain-main.js.
+// TODO: Consider extensions from docs/env.md.
+type SwingsetConfig struct {
+	// SlogFile is the path at which a SwingSet log "slog" file should be written.
+	// If relative, it is interpreted against the application home directory
+	SlogFile string `mapstructure:"slogfile" json:"slogfile,omitempty"`
+
+	// MaxVatsOnline is the maximum number of vats that the SwingSet kernel will have online
+	// at any given time.
+	MaxVatsOnline int `mapstructure:"max-vats-online" json:"maxVatsOnline,omitempty"`
+
+	// VatSnapshotRetention controls retention of vat snapshots,
+	// and has values analogous to those of export `artifactMode` (cf.
+	// ../../../../packages/swing-store/docs/data-export.md#optional--historical-data ).
+	// * "debug": keep all snapshots
+	// * "operational": keep only the last snapshot
+	VatSnapshotRetention string `mapstructure:"vat-snapshot-retention" json:"vatSnapshotRetention,omitempty"`
+
+	// VatTranscriptRetention controls retention of vat transcript spans,
+	// and has values analogous to those of export `artifactMode` (cf.
+	// ../../../../packages/swing-store/docs/data-export.md#optional--historical-data ).
+	// * "archival": keep all transcript spans
+	// * "operational": keep only necessary transcript spans (i.e., since the
+	//   last snapshot of their vat)
+	// * "default": determined by `pruning` ("archival" if `pruning` is
+	//   "nothing", otherwise "operational")
+	VatTranscriptRetention string `mapstructure:"vat-transcript-retention" json:"vatTranscriptRetention,omitempty"`
+
+	// VatSnapshotArchiveDir controls archival of gzipped vat snapshots.
+	VatSnapshotArchiveDir string `mapstructure:"vat-snapshot-archive-dir" json:"vatSnapshotArchiveDir,omitempty"`
+
+	// VatTranscriptArchiveDir controls archival of historical (i.e., closed) vat
+	// transcript spans to gzipped files.
+	VatTranscriptArchiveDir string `mapstructure:"vat-transcript-archive-dir" json:"vatTranscriptArchiveDir,omitempty"`
+}
+
+var DefaultSwingsetConfig = SwingsetConfig{
+	SlogFile:               "",
+	MaxVatsOnline:          50,
+	VatSnapshotRetention:   "operational",
+	VatTranscriptRetention: "default",
+}
+
+func SwingsetConfigFromViper(resolvedConfig servertypes.AppOptions) (*SwingsetConfig, error) {
+	v, ok := resolvedConfig.(*viper.Viper)
+	if !ok {
+		// Tolerate an apparently empty configuration such as
+		// cosmos/cosmos-sdk/simapp EmptyAppOptions, but otherwise require viper.
+		if resolvedConfig.Get(flags.FlagHome) != nil {
+			return nil, fmt.Errorf("expected an instance of viper!")
+		}
+	}
+	if v == nil {
+		return nil, nil
+	}
+	v.MustBindEnv(FlagSlogfile, "SLOGFILE")
+	// See CustomAppConfig in ../../daemon/cmd/root.go.
+	type ExtendedConfig struct {
+		serverconfig.Config `mapstructure:",squash"`
+		Swingset            SwingsetConfig `mapstructure:"swingset"`
+	}
+	extendedConfig := ExtendedConfig{}
+	if err := v.Unmarshal(&extendedConfig); err != nil {
+		return nil, err
+	}
+	ssConfig := &extendedConfig.Swingset
+
+	// Validate vat snapshot retention only if non-empty (because otherwise it
+	// it will be omitted, leaving the VM to apply its own defaults).
+	if ssConfig.VatSnapshotRetention != "" {
+		if util.IndexOf(snapshotRetentionValues, ssConfig.VatSnapshotRetention) == -1 {
+			err := fmt.Errorf(
+				"value for vat-snapshot-retention must be in %q",
+				snapshotRetentionValues,
+			)
+			return nil, err
+		}
+	}
+
+	// Default/validate vat transcript retention.
+	if ssConfig.VatTranscriptRetention == "" || ssConfig.VatTranscriptRetention == "default" {
+		if extendedConfig.Pruning == pruningtypes.PruningOptionNothing {
+			ssConfig.VatTranscriptRetention = TranscriptRetentionOptionArchival
+		} else {
+			ssConfig.VatTranscriptRetention = TranscriptRetentionOptionOperational
+		}
+	}
+	if util.IndexOf(transcriptRetentionValues, ssConfig.VatTranscriptRetention) == -1 {
+		valuesCopy := append([]string{}, transcriptRetentionValues...)
+		err := fmt.Errorf(
+			"value for vat-transcript-retention must be in %q",
+			append(valuesCopy, "default"),
+		)
+		return nil, err
+	}
+
+	// Interpret relative paths from config files against the application home
+	// directory and from other sources (e.g. env vars) against the current
+	// working directory.
+	var fileOnlyViper *viper.Viper
+	resolvePath := func(path, configKey string) (string, error) {
+		if path == "" || filepath.IsAbs(path) {
+			return path, nil
+		}
+		if v.InConfig(configKey) {
+			if fileOnlyViper == nil {
+				var err error
+				fileOnlyViper, err = util.NewFileOnlyViper(v)
+				if err != nil {
+					return "", err
+				}
+			}
+			pathFromFile := fileOnlyViper.GetString(configKey)
+			if path == pathFromFile {
+				homePath := viper.GetString(flags.FlagHome)
+				if homePath == "" {
+					return "", fmt.Errorf("cannot resolve path against empty application home")
+				}
+				absHomePath, err := filepath.Abs(homePath)
+				return filepath.Join(absHomePath, path), err
+			}
+		}
+		return filepath.Abs(path)
+	}
+
+	resolvedSlogFile, err := resolvePath(ssConfig.SlogFile, FlagSlogfile)
+	if err != nil {
+		return nil, err
+	}
+	ssConfig.SlogFile = resolvedSlogFile
+
+	resolvedSnapshotDir, err := resolvePath(ssConfig.VatSnapshotArchiveDir, FlagVatSnapshotArchiveDir)
+	if err != nil {
+		return nil, err
+	}
+	ssConfig.VatSnapshotArchiveDir = resolvedSnapshotDir
+
+	resolvedTranscriptDir, err := resolvePath(ssConfig.VatTranscriptArchiveDir, FlagVatTranscriptArchiveDir)
+	if err != nil {
+		return nil, err
+	}
+	ssConfig.VatTranscriptArchiveDir = resolvedTranscriptDir
+
+	return ssConfig, nil
+}

package/x/vibc/types/ibc_module.go

@@ -1,6 +1,8 @@
 package types
 
 import (
+	fmt "fmt"
+
 	sdkioerrors "cosmossdk.io/errors"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	capability "github.com/cosmos/cosmos-sdk/x/capability/types"
@@ -221,7 +223,10 @@ func (im IBCModule) OnChanCloseInit(
 	}
 
 	err := im.impl.PushAction(ctx, event)
-	return err
+	if err != nil {
+		return err
+	}
+	return fmt.Errorf("OnChanCloseInit can only be sent by the VM")
 }
 
 type ChannelCloseConfirmEvent struct {

package/x/vtransfer/ibc_middleware.go

@@ -50,7 +50,7 @@ func NewIBCMiddleware(ibcModule porttypes.IBCModule, vtransferKeeper keeper.Keep
 // wrapped IBCModule.  They are not performed in the context of a packet, and so
 // do not need to be intercepted.
 
-// OnChanCloseInit implements the IBCModule interface.
+// OnChanOpenInit implements the IBCModule interface.
 func (im IBCMiddleware) OnChanOpenInit(
 	ctx sdk.Context,
 	order channeltypes.Order,