feat(cosmos): Next upgrade is agoric-upgrade-18

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

@@ -0,0 +1,9 @@
+# Proposal to upgrade the chain software
+
+This holds the draft proposal for agoric-upgrade-18, which will be added to
+[agoric-3-proposals](https://github.com/Agoric/agoric-3-proposals) after it
+passes.
+
+The "binaries" property of `upgradeInfo` is now required since Cosmos SDK 0.46,
+however it cannot be computed for an unreleased upgrade. To disable the check,
+`releaseNotes` is set to `false`.

a3p-integration/proposals/n:upgrade-next/package.json → a3p-integration/proposals/a:upgrade-18/package.json

@@ -2,9 +2,10 @@
   "agoricProposal": {
     "releaseNotes": false,
     "sdkImageTag": "unreleased",
-    "planName": "UNRELEASED_A3P_INTEGRATION",
+    "planName": "agoric-upgrade-18",
     "upgradeInfo": {
-      "coreProposals": []
+      "coreProposals": [],
+      "releaseNotes": false
     },
     "type": "Software Upgrade Proposal"
   },

golang/cosmos/app/app.go

@@ -877,7 +877,7 @@ func NewAgoricApp(
 	for _, name := range upgradeNamesOfThisVersion {
 		app.UpgradeKeeper.SetUpgradeHandler(
 			name,
-			unreleasedUpgradeHandler(app, name),
+			upgrade18Handler(app, name),
 		)
 	}
 

golang/cosmos/app/upgrade.go

@@ -14,11 +14,8 @@ import (
 )
 
 var upgradeNamesOfThisVersion = []string{
-	"UNRELEASED_BASIC", // no-frills
-	"UNRELEASED_A3P_INTEGRATION",
-	"UNRELEASED_main",
-	"UNRELEASED_devnet",
-	"UNRELEASED_REAPPLY",
+	"agoric-upgrade-18",
+	"agorictest-upgrade-18",
 }
 
 // isUpgradeNameOfThisVersion returns whether the provided plan name is a
@@ -52,13 +49,9 @@ func isPrimaryUpgradeName(name string) bool {
 		return false
 	}
 	switch name {
-	case validUpgradeName("UNRELEASED_BASIC"),
-		validUpgradeName("UNRELEASED_A3P_INTEGRATION"),
-		validUpgradeName("UNRELEASED_main"),
-		validUpgradeName("UNRELEASED_devnet"):
+	case validUpgradeName("agoric-upgrade-18"),
+		validUpgradeName("agorictest-upgrade-18"):
 		return true
-	case validUpgradeName("UNRELEASED_REAPPLY"):
-		return false
 	default:
 		panic(fmt.Errorf("unexpected upgrade name %s", validUpgradeName(name)))
 	}
@@ -106,19 +99,14 @@ func buildProposalStepWithArgs(moduleName string, entrypoint string, opts map[st
 }
 
 func getVariantFromUpgradeName(upgradeName string) string {
-	switch upgradeName {
-	case "UNRELEASED_A3P_INTEGRATION":
-		return "A3P_INTEGRATION"
-	case "UNRELEASED_main":
-		return "MAINNET"
-	case "UNRELEASED_devnet":
-		return "DEVNET"
-		// Noupgrade for this version.
-	case "UNRELEASED_BASIC":
-		return ""
-	default:
-		return ""
-	}
+    switch upgradeName {
+    case "agoric-upgrade-18":
+        return "MAINNET"
+    case "agorictest-upgrade-18":
+        return "DEVNET"
+    default:
+        return ""
+    }
 }
 
 func replaceElectorateCoreProposalStep(upgradeName string) (vm.CoreProposalStep, error) {
@@ -153,8 +141,8 @@ func replacePriceFeedsCoreProposal(upgradeName string) (vm.CoreProposalStep, err
 	)
 }
 
-// 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) {
+// upgrade18Handler performs standard upgrade actions plus custom actions for upgrade-18.
+func upgrade18Handler(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)