@agoric/cosmos 0.34.2-upgrade-18-dev-a0f4883.0 → 0.34.2-upgrade-18-dev-6ddbef0.0

package/app/app.go

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

package/app/upgrade.go

@@ -14,12 +14,11 @@ import (
 )
 
 var upgradeNamesOfThisVersion = []string{
-	"UNRELEASED_BASIC", // no-frills
-	"UNRELEASED_A3P_INTEGRATION",
-	"UNRELEASED_main",
-	"UNRELEASED_devnet",
-	"UNRELEASED_emerynet",
-	"UNRELEASED_REAPPLY",
+	"agoric-upgrade-18-mainnet",
+	"agoric-upgrade-18-devnet",
+	"agoric-upgrade-18-emerynet",
+	"agoric-upgrade-18-basic",
+	"agoric-upgrade-18-a3p",
 }
 
 // isUpgradeNameOfThisVersion returns whether the provided plan name is a
@@ -53,14 +52,12 @@ func isPrimaryUpgradeName(name string) bool {
 		return false
 	}
 	switch name {
-	case validUpgradeName("UNRELEASED_BASIC"),
-		validUpgradeName("UNRELEASED_A3P_INTEGRATION"),
-		validUpgradeName("UNRELEASED_main"),
-		validUpgradeName("UNRELEASED_devnet"),
-		validUpgradeName("UNRELEASED_emerynet"):
+	case validUpgradeName("agoric-upgrade-18-mainnet"),
+		validUpgradeName("agoric-upgrade-18-devnet"),
+		validUpgradeName("agoric-upgrade-18-emerynet"),
+		validUpgradeName("agoric-upgrade-18-basic"),
+		validUpgradeName("agoric-upgrade-18-a3p"):
 		return true
-	case validUpgradeName("UNRELEASED_REAPPLY"):
-		return false
 	default:
 		panic(fmt.Errorf("unexpected upgrade name %s", validUpgradeName(name)))
 	}
@@ -109,17 +106,16 @@ 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":
+	case "agoric-upgrade-18-mainnet":
 		return "MAINNET"
-	case "UNRELEASED_devnet":
+	case "agoric-upgrade-18-devnet":
 		return "DEVNET"
-	case "UNRELEASED_emerynet":
+	case "agoric-upgrade-18-emerynet":
 		return "EMERYNET"
-		// Noupgrade for this version.
-	case "UNRELEASED_BASIC":
+	case "agoric-upgrade-18-basic":
 		return ""
+	case "agoric-upgrade-18-a3p":
+		return "A3P_INTEGRATION"
 	default:
 		return ""
 	}
@@ -157,8 +153,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)
 

package/git-revision.txt

@@ -1 +1 @@
-a0f4883
+6ddbef0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmos",
-  "version": "0.34.2-upgrade-18-dev-a0f4883.0+a0f4883",
+  "version": "0.34.2-upgrade-18-dev-6ddbef0.0+6ddbef0",
   "description": "Connect JS to the Cosmos blockchain SDK",
   "parsers": {
     "js": "mjs"
@@ -39,5 +39,5 @@
   "typeCoverage": {
     "atLeast": 0
   },
-  "gitHead": "a0f4883edbdc9809543c6f63a6a49d5390b40902"
+  "gitHead": "6ddbef09f18c18f205e8d166c363ff4884115ce9"
 }