@agoric/cosmos 0.34.2-orchestration-dev-096c4e8.0 → 0.34.2-upgrade-16-dev-8879538.0

package/MAINTAINERS.md

@@ -0,0 +1,3 @@
+When updating the protos here, be mindful that `@agoric/cosmic-proto` will need refreshing to get them.
+
+https://github.com/Agoric/agoric-sdk/issues/8131 will help automate updating protos, but not the publishing to NPM of the codegen-ed JS utilities for working with the APIs they define.

package/Makefile

@@ -98,11 +98,11 @@ proto-lint: proto-tools
 proto-check-breaking: proto-tools
 	${BIN}/buf breaking --against $(PR_TARGET_REPO)#branch=$(PR_TARGET_BRANCH),subdir=golang/cosmos
 
-GOGO_PROTO_URL := file://$(shell go list -m -f '{{ .Dir }}' github.com/gogo/protobuf)
-# GOOGLE_API_URL := file://$(shell go list -m -f '{{ .Dir }}' github.com/googleapis/googleapis)/google/api
-IBC_PROTO_URL := file://$(shell go list -m -f '{{ .Dir }}' github.com/cosmos/ibc-go/v6)/proto/ibc/core
-COSMOS_PROTO_PROTO_URL := file://$(shell go list -m -f '{{ .Dir }}' github.com/cosmos/cosmos-proto)/proto/cosmos_proto
-COSMOS_SDK_PROTO_URL := file://$(shell go list -m -f '{{ .Dir }}' github.com/cosmos/cosmos-sdk)/proto/cosmos
+GOGO_PROTO_URL = file://$(shell go list -m -f '{{ .Dir }}' github.com/gogo/protobuf)
+# GOOGLE_API_URL = file://$(shell go list -m -f '{{ .Dir }}' github.com/googleapis/googleapis)/google/api
+IBC_PROTO_URL = file://$(shell go list -m -f '{{ .Dir }}' github.com/cosmos/ibc-go/v6)/proto/ibc/core
+COSMOS_PROTO_PROTO_URL = file://$(shell go list -m -f '{{ .Dir }}' github.com/cosmos/cosmos-proto)/proto/cosmos_proto
+COSMOS_SDK_PROTO_URL = file://$(shell go list -m -f '{{ .Dir }}' github.com/cosmos/cosmos-sdk)/proto/cosmos
 
 COSMOS_PROTO_TYPES = third_party/proto/cosmos_proto
 GOGO_PROTO_TYPES  = third_party/proto/gogoproto
@@ -116,34 +116,37 @@ SDK_UPGRADE_TYPES = third_party/proto/cosmos/upgrade/v1beta1
 
 proto-update-deps:
 	mkdir -p $(COSMOS_PROTO_TYPES)
-	curl -sSL $(COSMOS_PROTO_PROTO_URL)/cosmos.proto > $(COSMOS_PROTO_TYPES)/cosmos.proto
+	url="$(COSMOS_PROTO_PROTO_URL)"; \
+	curl -sSL $$url/cosmos.proto > $(COSMOS_PROTO_TYPES)/cosmos.proto
 
 	mkdir -p $(GOGO_PROTO_TYPES)
-	curl -sSL $(GOGO_PROTO_URL)/gogoproto/gogo.proto > $(GOGO_PROTO_TYPES)/gogo.proto
+	url="$(GOGO_PROTO_URL)"; \
+	curl -sSL $$url/gogoproto/gogo.proto > $(GOGO_PROTO_TYPES)/gogo.proto
 
 	# Downloading from a not-a-go-module is problematic. These files are artifacts for now.
 	# mkdir -p $(GOOGLE_API_TYPES)
-	# curl -sSL $(GOOGLE_API_URL)/annotations.proto > $(GOOGLE_API_TYPES)/annotations.proto
-	# curl -sSL $(GOOGLE_API_URL)/http.proto > $(GOOGLE_API_TYPES)/http.proto
-	# curl -sSL $(GOOGLE_API_URL)/httpbody.proto > $(GOOGLE_API_TYPES)/httpbody.proto
+	# url="$(GOOGLE_API_URL)"; \
+	# curl -sSL $$url/annotations.proto > $(GOOGLE_API_TYPES)/annotations.proto && \
+	# curl -sSL $$url/http.proto > $(GOOGLE_API_TYPES)/http.proto && \
+	# curl -sSL $$url/httpbody.proto > $(GOOGLE_API_TYPES)/httpbody.proto &&
 
 	mkdir -p $(GOOGLE_PROTO_TYPES)
-	curl -sSL $(GOGO_PROTO_URL)/protobuf/google/protobuf/any.proto > $(GOOGLE_PROTO_TYPES)/any.proto
-
-	mkdir -p $(IBC_CHANNEL_TYPES)
-	curl -sSL $(IBC_PROTO_URL)/channel/v1/channel.proto > $(IBC_CHANNEL_TYPES)/channel.proto
-
-	mkdir -p $(IBC_CLIENT_TYPES)
-	curl -sSL $(IBC_PROTO_URL)/client/v1/client.proto > $(IBC_CLIENT_TYPES)/client.proto
-
-	mkdir -p $(SDK_BASE_TYPES)
-	curl -sSL $(COSMOS_SDK_PROTO_URL)/base/v1beta1/coin.proto > $(SDK_BASE_TYPES)/coin.proto
-
-	mkdir -p $(SDK_QUERY_TYPES)
-	curl -sSL $(COSMOS_SDK_PROTO_URL)/base/query/v1beta1/pagination.proto > $(SDK_QUERY_TYPES)/pagination.proto
-
-	mkdir -p $(SDK_UPGRADE_TYPES)
-	curl -sSL $(COSMOS_SDK_PROTO_URL)/upgrade/v1beta1/upgrade.proto > $(SDK_UPGRADE_TYPES)/upgrade.proto
+	url="$(GOGO_PROTO_URL)"; \
+	curl -sSL $$url/protobuf/google/protobuf/any.proto > $(GOOGLE_PROTO_TYPES)/any.proto
+
+	url="$(IBC_PROTO_URL)"; \
+	mkdir -p $(IBC_CHANNEL_TYPES) && \
+	curl -sSL $$url/channel/v1/channel.proto > $(IBC_CHANNEL_TYPES)/channel.proto && \
+	mkdir -p $(IBC_CLIENT_TYPES) && \
+	curl -sSL $$url/client/v1/client.proto > $(IBC_CLIENT_TYPES)/client.proto
+
+	url="$(COSMOS_SDK_PROTO_URL)"; \
+	mkdir -p $(SDK_BASE_TYPES) && \
+	curl -sSL $$url/base/v1beta1/coin.proto > $(SDK_BASE_TYPES)/coin.proto && \
+	mkdir -p $(SDK_QUERY_TYPES) && \
+	curl -sSL $$url/base/query/v1beta1/pagination.proto > $(SDK_QUERY_TYPES)/pagination.proto && \
+	mkdir -p $(SDK_UPGRADE_TYPES) && \
+	curl -sSL $$url/upgrade/v1beta1/upgrade.proto > $(SDK_UPGRADE_TYPES)/upgrade.proto
 
 UNAME_S ?= $(shell uname -s)
 UNAME_M ?= $(shell uname -m)

package/ante/ante.go

@@ -45,15 +45,12 @@ func NewAnteHandler(opts HandlerOptions) (sdk.AnteHandler, error) {
 	anteDecorators := []sdk.AnteDecorator{
 		ante.NewSetUpContextDecorator(),
 		ante.NewExtensionOptionsDecorator(nil), // reject all extensions
-		// former ante.NewMempoolFeeDecorator()
-		// replaced as in https://github.com/provenance-io/provenance/pull/1016
-		ante.NewDeductFeeDecorator(opts.AccountKeeper, opts.BankKeeper, opts.FeegrantKeeper, nil),
 		ante.NewValidateBasicDecorator(),
 		ante.NewTxTimeoutHeightDecorator(),
 		ante.NewValidateMemoDecorator(opts.AccountKeeper),
 		ante.NewConsumeGasForTxSizeDecorator(opts.AccountKeeper),
 		NewInboundDecorator(opts.SwingsetKeeper),
-		NewDeductFeeDecorator(opts.AccountKeeper, opts.BankKeeper, opts.FeegrantKeeper, opts.FeeCollectorName),
+		ante.NewDeductFeeDecoratorWithName(opts.AccountKeeper, opts.BankKeeper, opts.FeegrantKeeper, nil, opts.FeeCollectorName),
 		// SetPubKeyDecorator must be called before all signature verification decorators
 		ante.NewSetPubKeyDecorator(opts.AccountKeeper),
 		ante.NewValidateSigCountDecorator(opts.AccountKeeper),

package/app/app.go

@@ -123,9 +123,9 @@ import (
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vstorage"
 
 	// Import the packet forward middleware
-	packetforward "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v6/router"
-	packetforwardkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v6/router/keeper"
-	packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v6/router/types"
+	packetforward "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v6/packetforward"
+	packetforwardkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v6/packetforward/keeper"
+	packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v6/packetforward/types"
 
 	// unnamed import of statik for swagger UI support
 	_ "github.com/cosmos/cosmos-sdk/client/docs/statik"
@@ -230,6 +230,9 @@ type GaiaApp struct { // nolint: golint
 	tkeys   map[string]*storetypes.TransientStoreKey
 	memKeys map[string]*storetypes.MemoryStoreKey
 
+	// manage communication from the VM to the ABCI app
+	AgdServer *vm.AgdServer
+
 	// keepers
 	AccountKeeper    authkeeper.AccountKeeper
 	BankKeeper       bankkeeper.Keeper
@@ -298,14 +301,14 @@ func NewGaiaApp(
 		return "", nil
 	}
 	return NewAgoricApp(
-		defaultController,
+		defaultController, vm.NewAgdServer(),
 		logger, db, traceStore, loadLatest, skipUpgradeHeights,
 		homePath, invCheckPeriod, encodingConfig, appOpts, baseAppOptions...,
 	)
 }
 
 func NewAgoricApp(
-	sendToController func(context.Context, bool, string) (string, error),
+	sendToController func(context.Context, bool, string) (string, error), 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 {
@@ -331,6 +334,7 @@ func NewAgoricApp(
 
 	app := &GaiaApp{
 		BaseApp:           bApp,
+		AgdServer:         agdServer,
 		legacyAmino:       legacyAmino,
 		appCodec:          appCodec,
 		interfaceRegistry: interfaceRegistry,
@@ -449,7 +453,7 @@ func NewAgoricApp(
 	callToController := func(ctx sdk.Context, str string) (string, error) {
 		app.CheckControllerInited(true)
 		// We use SwingSet-level metering to charge the user for the call.
-		defer vm.SetControllerContext(ctx)()
+		defer app.AgdServer.SetControllerContext(ctx)()
 		return sendToController(sdk.WrapSDKContext(ctx), true, str)
 	}
 
@@ -460,7 +464,7 @@ func NewAgoricApp(
 	app.VstorageKeeper = vstorage.NewKeeper(
 		keys[vstorage.StoreKey],
 	)
-	app.vstoragePort = vm.RegisterPortHandler("vstorage", vstorage.NewStorageHandler(app.VstorageKeeper))
+	app.vstoragePort = app.AgdServer.MustRegisterPortHandler("vstorage", vstorage.NewStorageHandler(app.VstorageKeeper))
 
 	// The SwingSetKeeper is the Keeper from the SwingSet module
 	app.SwingSetKeeper = swingset.NewKeeper(
@@ -469,7 +473,7 @@ func NewAgoricApp(
 		app.VstorageKeeper, vbanktypes.ReservePoolName,
 		callToController,
 	)
-	app.swingsetPort = vm.RegisterPortHandler("swingset", swingset.NewPortHandler(app.SwingSetKeeper))
+	app.swingsetPort = app.AgdServer.MustRegisterPortHandler("swingset", swingset.NewPortHandler(app.SwingSetKeeper))
 
 	app.SwingStoreExportsHandler = *swingsetkeeper.NewSwingStoreExportsHandler(
 		app.Logger(),
@@ -508,7 +512,7 @@ func NewAgoricApp(
 
 	vibcModule := vibc.NewAppModule(app.VibcKeeper, app.BankKeeper)
 	vibcIBCModule := vibc.NewIBCModule(app.VibcKeeper)
-	app.vibcPort = vm.RegisterPortHandler("vibc", vibc.NewReceiver(app.VibcKeeper))
+	app.vibcPort = app.AgdServer.MustRegisterPortHandler("vibc", vibc.NewReceiver(app.VibcKeeper))
 
 	app.VbankKeeper = vbank.NewKeeper(
 		appCodec, keys[vbank.StoreKey], app.GetSubspace(vbank.ModuleName),
@@ -516,7 +520,7 @@ func NewAgoricApp(
 		app.SwingSetKeeper.PushAction,
 	)
 	vbankModule := vbank.NewAppModule(app.VbankKeeper)
-	app.vbankPort = vm.RegisterPortHandler("bank", vbank.NewPortHandler(vbankModule, app.VbankKeeper))
+	app.vbankPort = app.AgdServer.MustRegisterPortHandler("bank", vbank.NewPortHandler(vbankModule, app.VbankKeeper))
 
 	// register the proposal types
 	govRouter := govv1beta1.NewRouter()
@@ -613,7 +617,7 @@ func NewAgoricApp(
 		app.BaseApp.MsgServiceRouter(),
 		app.BaseApp.GRPCQueryRouter(),
 	)
-	app.vlocalchainPort = vm.RegisterPortHandler(
+	app.vlocalchainPort = app.AgdServer.MustRegisterPortHandler(
 		"vlocalchain",
 		vlocalchain.NewReceiver(app.VlocalchainKeeper),
 	)
@@ -817,25 +821,18 @@ func NewAgoricApp(
 	app.SetBeginBlocker(app.BeginBlocker)
 	app.SetEndBlocker(app.EndBlocker)
 
-	const (
-		upgradeName     = "UNRELEASED_UPGRADE"
-		upgradeNameTest = "UNRELEASED_TEST_UPGRADE"
-	)
-
-	app.UpgradeKeeper.SetUpgradeHandler(
-		upgradeName,
-		unreleasedUpgradeHandler(app, upgradeName),
-	)
-	app.UpgradeKeeper.SetUpgradeHandler(
-		upgradeNameTest,
-		unreleasedUpgradeHandler(app, upgradeNameTest),
-	)
+	for name := range upgradeNamesOfThisVersion {
+		app.UpgradeKeeper.SetUpgradeHandler(
+			name,
+			unreleasedUpgradeHandler(app, name),
+		)
+	}
 
 	upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
 	if err != nil {
 		panic(err)
 	}
-	if (upgradeInfo.Name == upgradeName || upgradeInfo.Name == upgradeNameTest) && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
+	if upgradeNamesOfThisVersion[upgradeInfo.Name] && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
 		storeUpgrades := storetypes.StoreUpgrades{
 			Added: []string{
 				packetforwardtypes.ModuleName, // Added PFM
@@ -871,25 +868,58 @@ func NewAgoricApp(
 	return app
 }
 
+var upgradeNamesOfThisVersion = map[string]bool{
+	"UNRELEASED_UPGRADE":      true,
+	"UNRELEASED_TEST_UPGRADE": true,
+}
+
+func isFirstTimeUpgradeOfThisVersion(app *GaiaApp, ctx sdk.Context) bool {
+	for name := range upgradeNamesOfThisVersion {
+		if app.UpgradeKeeper.GetDoneHeight(ctx, name) != 0 {
+			return false
+		}
+	}
+	return true
+}
+
 // 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)
 
-		// Each CoreProposalStep runs sequentially, and can be constructed from
-		// one or more modules executing in parallel within the step.
-		CoreProposalSteps := []vm.CoreProposalStep{
-			// First, upgrade wallet factory
-			vm.CoreProposalStepForModules("@agoric/builders/scripts/smart-wallet/build-wallet-factory2-upgrade.js"),
-			// Then, upgrade Zoe and ZCF
-			vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/replace-zoe.js"),
-			// Then, 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",
-			),
+		CoreProposalSteps := []vm.CoreProposalStep{}
+
+		// 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) {
+			// Each CoreProposalStep runs sequentially, and can be constructed from
+			// one or more modules executing in parallel within the step.
+			CoreProposalSteps = []vm.CoreProposalStep{
+				// Upgrade ZCF only
+				vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/upgrade-zcf.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",
+				),
+				// Add new vats for price feeds. The existing ones will be retired shortly.
+				vm.CoreProposalStepForModules(
+					"@agoric/builders/scripts/vats/updateAtomPriceFeed.js",
+					"@agoric/builders/scripts/vats/updateStAtomPriceFeed.js",
+					"@agoric/builders/scripts/vats/updateStOsmoPriceFeed.js",
+					"@agoric/builders/scripts/vats/updateStTiaPriceFeed.js",
+					"@agoric/builders/scripts/vats/updateStkAtomPriceFeed.js",
+				),
+				// Add new auction contract. The old one will be retired shortly.
+				vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/add-auction.js"),
+				// upgrade vaultFactory.
+				vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/upgradeVaults.js"),
+				// upgrade scaledPriceAuthorities.
+				vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/upgradeScaledPriceAuthorities.js"),
+			}
 		}
 
 		app.upgradeDetails = &upgradeDetails{

package/cmd/agd/main.go

@@ -49,7 +49,6 @@ func makeShutdown(cmd *exec.Cmd, writer *os.File) func() error {
 	}
 }
 
-
 // main is the entry point of the agd daemon.  It determines whether to
 // initialize JSON-RPC communications with the separate `--split-vm` VM process,
 // or just to give up control entirely to another binary.
@@ -72,9 +71,9 @@ func main() {
 		}
 
 		msg := vm.Message{
-			Port: nodePort,
+			Port:       nodePort,
 			NeedsReply: needReply,
-			Data: str,
+			Data:       str,
 		}
 		var reply string
 		err := vmClient.Call(vm.ReceiveMessageMethod, msg, &reply)
@@ -82,7 +81,7 @@ func main() {
 	}
 
 	exitCode := 0
-	launchVM := func(logger log.Logger, appOpts servertypes.AppOptions) error {
+	launchVM := func(agdServer *vm.AgdServer, logger log.Logger, appOpts servertypes.AppOptions) error {
 		args := []string{"ag-chain-cosmos", "--home", gaia.DefaultNodeHome}
 		args = append(args, os.Args[1:]...)
 
@@ -129,7 +128,7 @@ func main() {
 
 		// Set up the VM server.
 		vmServer := rpc.NewServer()
-		if err := vmServer.RegisterName("agd", vm.NewAgdServer()); err != nil {
+		if err := vmServer.RegisterName("agd", agdServer); err != nil {
 			return err
 		}
 		go vmServer.ServeCodec(jsonrpc.NewServerCodec(serverConn))
@@ -147,11 +146,11 @@ func main() {
 	}
 
 	daemoncmd.OnExportHook = launchVM
-	daemoncmd.OnStartHook = func (logger log.Logger, appOpts servertypes.AppOptions) error {
+	daemoncmd.OnStartHook = func(agdServer *vm.AgdServer, logger log.Logger, appOpts servertypes.AppOptions) error {
 		// We tried running start, which should never exit, so exit with non-zero
 		// code if we do.
 		exitCode = 99
-		return launchVM(logger, appOpts)
+		return launchVM(agdServer, logger, appOpts)
 	}
 
 	daemon.RunWithController(sendToNode)

package/cmd/libdaemon/main.go

@@ -38,7 +38,7 @@ var agdServer *vm.AgdServer
 // ConnectVMClientCodec creates an RPC client codec and a sender to the
 // in-process implementation of the VM.
 func ConnectVMClientCodec(ctx context.Context, nodePort int, sendFunc func(int, int, string)) (*vm.ClientCodec, daemoncmd.Sender) {
-	vmClientCodec = vm.NewClientCodec(context.Background(), sendFunc)
+	vmClientCodec = vm.NewClientCodec(ctx, sendFunc)
 	vmClient := rpc.NewClientWithCodec(vmClientCodec)
 
 	sendToNode := func(ctx context.Context, needReply bool, str string) (string, error) {
@@ -47,9 +47,9 @@ func ConnectVMClientCodec(ctx context.Context, nodePort int, sendFunc func(int,
 		}
 
 		msg := vm.Message{
-			Port: nodePort,
+			Port:       nodePort,
 			NeedsReply: needReply,
-			Data: str,
+			Data:       str,
 		}
 		var reply string
 		err := vmClient.Call(vm.ReceiveMessageMethod, msg, &reply)
@@ -83,7 +83,6 @@ func RunAgCosmosDaemon(nodePort C.int, toNode C.sendFunc, cosmosArgs []*C.char)
 		int(nodePort),
 		sendFunc,
 	)
-	agdServer = vm.NewAgdServer()
 
 	args := make([]string, len(cosmosArgs))
 	for i, s := range cosmosArgs {
@@ -96,7 +95,8 @@ func RunAgCosmosDaemon(nodePort C.int, toNode C.sendFunc, cosmosArgs []*C.char)
 		// We run in the background, but exit when the job is over.
 		// swingset.SendToNode("hello from Initial Go!")
 		exitCode := 0
-		daemoncmd.OnStartHook = func(logger log.Logger, appOpts servertypes.AppOptions) error {
+		daemoncmd.OnStartHook = func(srv *vm.AgdServer, logger log.Logger, appOpts servertypes.AppOptions) error {
+			agdServer = srv
 			// We tried running start, which should never exit, so exit with non-zero
 			// code if we ever stop.
 			exitCode = 99
@@ -130,11 +130,11 @@ func SendToGo(port C.int, msg C.Body) C.Body {
 	// fmt.Fprintln(os.Stderr, "Send to Go", msgStr)
 	var respStr string
 	message := &vm.Message{
-		Port: int(port),
+		Port:       int(port),
 		NeedsReply: true,
-		Data: msgStr,
+		Data:       msgStr,
 	}
-	
+
 	err := agdServer.ReceiveMessage(message, &respStr)
 	if err == nil {
 		return C.CString(respStr)

package/daemon/cmd/root.go

@@ -39,14 +39,15 @@ 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"
 )
 
 // Sender is a function that sends a request to the controller.
 type Sender func(ctx context.Context, needReply bool, str string) (string, error)
 
 var AppName = "agd"
-var OnStartHook func(log.Logger, servertypes.AppOptions) error
-var OnExportHook func(log.Logger, servertypes.AppOptions) error
+var OnStartHook func(*vm.AgdServer, log.Logger, servertypes.AppOptions) error
+var OnExportHook func(*vm.AgdServer, log.Logger, servertypes.AppOptions) error
 
 // NewRootCmd creates a new root command for simd. It is called once in the
 // main function.
@@ -129,8 +130,9 @@ func initRootCmd(sender Sender, rootCmd *cobra.Command, encodingConfig params.En
 	cfg.Seal()
 
 	ac := appCreator{
-		encCfg: encodingConfig,
-		sender: sender,
+		encCfg:    encodingConfig,
+		sender:    sender,
+		agdServer: vm.NewAgdServer(),
 	}
 
 	rootCmd.AddCommand(
@@ -249,8 +251,9 @@ func txCommand() *cobra.Command {
 }
 
 type appCreator struct {
-	encCfg params.EncodingConfig
-	sender Sender
+	encCfg    params.EncodingConfig
+	sender    Sender
+	agdServer *vm.AgdServer
 }
 
 func (ac appCreator) newApp(
@@ -260,7 +263,7 @@ func (ac appCreator) newApp(
 	appOpts servertypes.AppOptions,
 ) servertypes.Application {
 	if OnStartHook != nil {
-		if err := OnStartHook(logger, appOpts); err != nil {
+		if err := OnStartHook(ac.agdServer, logger, appOpts); err != nil {
 			panic(err)
 		}
 	}
@@ -305,7 +308,7 @@ func (ac appCreator) newApp(
 	)
 
 	return gaia.NewAgoricApp(
-		ac.sender,
+		ac.sender, ac.agdServer,
 		logger, db, traceStore, true, skipUpgradeHeights,
 		homePath,
 		cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)),
@@ -320,6 +323,9 @@ func (ac appCreator) newApp(
 		baseapp.SetTrace(cast.ToBool(appOpts.Get(server.FlagTrace))),
 		baseapp.SetIndexEvents(cast.ToStringSlice(appOpts.Get(server.FlagIndexEvents))),
 		baseapp.SetSnapshot(snapshotStore, snapshotOptions),
+		baseapp.SetIAVLCacheSize(cast.ToInt(appOpts.Get(server.FlagIAVLCacheSize))),
+		baseapp.SetIAVLDisableFastNode(cast.ToBool(appOpts.Get(server.FlagDisableIAVLFastNode))),
+		baseapp.SetIAVLLazyLoading(cast.ToBool(appOpts.Get(server.FlagIAVLLazyLoading))),
 	)
 }
 
@@ -405,7 +411,7 @@ func (ac appCreator) appExport(
 	appOpts servertypes.AppOptions,
 ) (servertypes.ExportedApp, error) {
 	if OnExportHook != nil {
-		if err := OnExportHook(logger, appOpts); err != nil {
+		if err := OnExportHook(ac.agdServer, logger, appOpts); err != nil {
 			return servertypes.ExportedApp{}, err
 		}
 	}
@@ -421,7 +427,7 @@ func (ac appCreator) appExport(
 	}
 
 	gaiaApp := gaia.NewAgoricApp(
-		ac.sender,
+		ac.sender, ac.agdServer,
 		logger,
 		db,
 		traceStore,