From ceffbcdd85bd4dfa3a7646b590133f9fd55755c8 Mon Sep 17 00:00:00 2001
From: Mathieu Hofman <mathieu@agoric.com>
Date: Tue, 30 Jan 2024 23:02:02 +0000
Subject: [PATCH] feat(cosmos): upgrade wallet factory

---
 a3p-integration/proposals/a:upgrade-14/README.md    | 5 +++++
 a3p-integration/proposals/a:upgrade-14/package.json | 6 +-----
 golang/cosmos/app/app.go                            | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 a3p-integration/proposals/a:upgrade-14/README.md

diff --git a/a3p-integration/proposals/a:upgrade-14/README.md b/a3p-integration/proposals/a:upgrade-14/README.md
new file mode 100644
index 00000000000..22ae9313c6e
--- /dev/null
+++ b/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`
\ No newline at end of file
diff --git a/a3p-integration/proposals/a:upgrade-14/package.json b/a3p-integration/proposals/a:upgrade-14/package.json
index 4a0962e888b..47eb1669e84 100644
--- a/a3p-integration/proposals/a:upgrade-14/package.json
+++ b/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",
diff --git a/golang/cosmos/app/app.go b/golang/cosmos/app/app.go
index 6fe0d8f6065..2c391de5f61 100644
--- a/golang/cosmos/app/app.go
+++ b/golang/cosmos/app/app.go
@@ -832,7 +832,8 @@ func upgrade14Handler(app *GaiaApp, targetUpgrade string) func(sdk.Context, upgr
 		// 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{