Upgrade-14 fixups

a3p-integration/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "agoricSyntheticChain": {
-        "fromTag": "upgrade-13"
+        "fromTag": "use-upgrade-13"
     },
     "scripts": {
         "build": "./node_modules/.bin/synthetic-chain build",

a3p-integration/proposals/a:upgrade-14/README.md

@@ -0,0 +1,5 @@
+# Proposal to upgrade the chain software to upgrade-14
+
+This software upgrade executes core proposals during the upgrade block, as
+defined by the `agoric-upgrade-14` upgrade handler. See `upgrade14Handler` in
+`agoric-sdk/golang/cosmos/app/app.go`

a3p-integration/proposals/a:upgrade-14/package.json

@@ -3,11 +3,7 @@
     "releaseNotes": "https://github.com/Agoric/agoric-sdk/releases/tag/agoric-upgrade-14",
     "sdkImageTag": "unreleased",
     "planName": "agoric-upgrade-14",
-    "upgradeInfo": {
-      "coreProposals": [
-        "@agoric/vats/scripts/build-wallet-factory2-upgrade.js"
-      ]
-    },
+    "upgradeInfo": {},
     "type": "Software Upgrade Proposal"
   },
   "type": "module",

golang/cosmos/app/app.go

@@ -782,11 +782,11 @@ func NewAgoricApp(
 
 	app.UpgradeKeeper.SetUpgradeHandler(
 		upgradeName,
-		upgrade13Handler(app, upgradeName),
+		upgrade14Handler(app, upgradeName),
 	)
 	app.UpgradeKeeper.SetUpgradeHandler(
 		upgradeNameTest,
-		upgrade13Handler(app, upgradeNameTest),
+		upgrade14Handler(app, upgradeNameTest),
 	)
 
 	upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
@@ -824,15 +824,16 @@ func NewAgoricApp(
 	return app
 }
 
-// upgrade13Handler performs standard upgrade actions plus custom actions for upgrade-14.
-func upgrade13Handler(app *GaiaApp, targetUpgrade string) func(sdk.Context, upgradetypes.Plan, module.VersionMap) (module.VersionMap, error) {
+// upgrade14Handler performs standard upgrade actions plus custom actions for upgrade-14.
+func upgrade14Handler(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{
-			// vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/init-network.js"),
+			// First, upgrade wallet factory
+			vm.CoreProposalStepForModules("@agoric/vats/scripts/build-wallet-factory2-upgrade.js"),
 		}
 
 		app.upgradeDetails = &upgradeDetails{