chore: Initialize dev-upgrade-17 (#10088)

Agoric · Sep 16, 2024 · a890aea · a890aea
2 parents e67cd91 + ea47c4c
commit a890aea
Show file tree

Hide file tree

Showing 18 changed files with 17 additions and 30 deletions.
diff --git a/...ation/proposals/n:upgrade-next/.gitignore → ...gration/proposals/a:upgrade-17/.gitignore b/...ation/proposals/n:upgrade-next/.gitignore → ...gration/proposals/a:upgrade-17/.gitignore
diff --git a/...tion/proposals/n:upgrade-next/.yarnrc.yml → ...ration/proposals/a:upgrade-17/.yarnrc.yml b/...tion/proposals/n:upgrade-next/.yarnrc.yml → ...ration/proposals/a:upgrade-17/.yarnrc.yml
diff --git a/a3p-integration/proposals/a:upgrade-17/README.md b/a3p-integration/proposals/a:upgrade-17/README.md
@@ -0,0 +1,9 @@
+# Proposal to upgrade the chain software
+
+This holds the draft proposal for agoric-upgrade-17, 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`.
diff --git a/...ion/proposals/n:upgrade-next/agd-tools.js → ...ation/proposals/a:upgrade-17/agd-tools.js b/...ion/proposals/n:upgrade-next/agd-tools.js → ...ation/proposals/a:upgrade-17/agd-tools.js
diff --git a/.../proposals/n:upgrade-next/initial.test.js → ...on/proposals/a:upgrade-17/initial.test.js b/.../proposals/n:upgrade-next/initial.test.js → ...on/proposals/a:upgrade-17/initial.test.js
diff --git a/...oposals/n:upgrade-next/localchain.test.js → ...proposals/a:upgrade-17/localchain.test.js b/...oposals/n:upgrade-next/localchain.test.js → ...proposals/a:upgrade-17/localchain.test.js
diff --git a/...ion/proposals/n:upgrade-next/package.json → ...ation/proposals/a:upgrade-17/package.json b/...ion/proposals/n:upgrade-next/package.json → ...ation/proposals/a:upgrade-17/package.json
@@ -2,9 +2,10 @@
   "agoricProposal": {
     "releaseNotes": false,
     "sdkImageTag": "unreleased",
-    "planName": "UNRELEASED_A3P_INTEGRATION",
+    "planName": "agoric-upgrade-17",
     "upgradeInfo": {
-      "coreProposals": []
+      "coreProposals": [],
+      "releaseNotes": false
     },
     "sdk-generate": [
       "vats/test-localchain.js localchaintest-submission",

diff --git a/...ation/proposals/n:upgrade-next/prepare.sh → ...gration/proposals/a:upgrade-17/prepare.sh b/...ation/proposals/n:upgrade-next/prepare.sh → ...gration/proposals/a:upgrade-17/prepare.sh
diff --git a/...e-next/priceFeed-follower-auction.test.js → ...ade-17/priceFeed-follower-auction.test.js b/...e-next/priceFeed-follower-auction.test.js → ...ade-17/priceFeed-follower-auction.test.js
diff --git a/...sals/n:upgrade-next/provisionPool.test.js → ...posals/a:upgrade-17/provisionPool.test.js b/...sals/n:upgrade-next/provisionPool.test.js → ...posals/a:upgrade-17/provisionPool.test.js
diff --git a/...n:upgrade-next/synthetic-chain-excerpt.js → ...s/a:upgrade-17/synthetic-chain-excerpt.js b/...n:upgrade-next/synthetic-chain-excerpt.js → ...s/a:upgrade-17/synthetic-chain-excerpt.js
diff --git a/...egration/proposals/n:upgrade-next/test.sh → ...ntegration/proposals/a:upgrade-17/test.sh b/...egration/proposals/n:upgrade-next/test.sh → ...ntegration/proposals/a:upgrade-17/test.sh
diff --git a/...on/proposals/n:upgrade-next/tsconfig.json → ...tion/proposals/a:upgrade-17/tsconfig.json b/...on/proposals/n:upgrade-next/tsconfig.json → ...tion/proposals/a:upgrade-17/tsconfig.json
diff --git a/...on/proposals/n:upgrade-next/vatDetails.js → ...tion/proposals/a:upgrade-17/vatDetails.js b/...on/proposals/n:upgrade-next/vatDetails.js → ...tion/proposals/a:upgrade-17/vatDetails.js
diff --git a/...ration/proposals/n:upgrade-next/yarn.lock → ...egration/proposals/a:upgrade-17/yarn.lock b/...ration/proposals/n:upgrade-next/yarn.lock → ...egration/proposals/a:upgrade-17/yarn.lock
diff --git a/a3p-integration/proposals/n:upgrade-next/README.md b/a3p-integration/proposals/n:upgrade-next/README.md
diff --git a/golang/cosmos/app/app.go b/golang/cosmos/app/app.go
@@ -876,7 +876,7 @@ func NewAgoricApp(
 	for _, name := range upgradeNamesOfThisVersion {
 		app.UpgradeKeeper.SetUpgradeHandler(
 			name,
-			unreleasedUpgradeHandler(app, name),
+			upgrade17Handler(app, name),
 		)
 	}
 

diff --git a/golang/cosmos/app/upgrade.go b/golang/cosmos/app/upgrade.go
@@ -11,11 +11,7 @@ import (
 )
 
 var upgradeNamesOfThisVersion = []string{
-	"UNRELEASED_BASIC", // no-frills
-	"UNRELEASED_A3P_INTEGRATION",
-	"UNRELEASED_main",
-	"UNRELEASED_devnet",
-	"UNRELEASED_REAPPLY",
+	"agoric-upgrade-17",
 }
 
 // isUpgradeNameOfThisVersion returns whether the provided plan name is a
@@ -49,13 +45,8 @@ 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-17"):
 		return true
-	case validUpgradeName("UNRELEASED_REAPPLY"):
-		return false
 	default:
 		panic(fmt.Errorf("unexpected upgrade name %s", validUpgradeName(name)))
 	}
@@ -72,8 +63,8 @@ func isFirstTimeUpgradeOfThisVersion(app *GaiaApp, ctx sdk.Context) bool {
 	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) {
+// upgrade17Handler performs standard upgrade actions plus custom actions for upgrade-17.
+func upgrade17Handler(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)