diff --git a/a3p-integration/proposals/n:upgrade-next/.yarnrc.yml b/a3p-integration/proposals/a:upgrade-18/.yarnrc.yml similarity index 100% rename from a3p-integration/proposals/n:upgrade-next/.yarnrc.yml rename to a3p-integration/proposals/a:upgrade-18/.yarnrc.yml diff --git a/a3p-integration/proposals/a:upgrade-18/README.md b/a3p-integration/proposals/a:upgrade-18/README.md new file mode 100644 index 00000000000..00ef2157e02 --- /dev/null +++ b/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`. \ No newline at end of file diff --git a/a3p-integration/proposals/n:upgrade-next/acceptInvites.js b/a3p-integration/proposals/a:upgrade-18/acceptInvites.js similarity index 100% rename from a3p-integration/proposals/n:upgrade-next/acceptInvites.js rename to a3p-integration/proposals/a:upgrade-18/acceptInvites.js diff --git a/a3p-integration/proposals/n:upgrade-next/addGov4.js b/a3p-integration/proposals/a:upgrade-18/addGov4.js similarity index 100% rename from a3p-integration/proposals/n:upgrade-next/addGov4.js rename to a3p-integration/proposals/a:upgrade-18/addGov4.js diff --git a/a3p-integration/proposals/n:upgrade-next/agd-tools.js b/a3p-integration/proposals/a:upgrade-18/agd-tools.js similarity index 100% rename from a3p-integration/proposals/n:upgrade-next/agd-tools.js rename to a3p-integration/proposals/a:upgrade-18/agd-tools.js diff --git a/a3p-integration/proposals/n:upgrade-next/agoric-tools.js b/a3p-integration/proposals/a:upgrade-18/agoric-tools.js similarity index 100% rename from a3p-integration/proposals/n:upgrade-next/agoric-tools.js rename to a3p-integration/proposals/a:upgrade-18/agoric-tools.js diff --git a/a3p-integration/proposals/n:upgrade-next/initial.test.js b/a3p-integration/proposals/a:upgrade-18/initial.test.js similarity index 100% rename from a3p-integration/proposals/n:upgrade-next/initial.test.js rename to a3p-integration/proposals/a:upgrade-18/initial.test.js diff --git a/a3p-integration/proposals/n:upgrade-next/package.json b/a3p-integration/proposals/a:upgrade-18/package.json similarity index 86% rename from a3p-integration/proposals/n:upgrade-next/package.json rename to a3p-integration/proposals/a:upgrade-18/package.json index af2361a9a58..8332149f061 100644 --- a/a3p-integration/proposals/n:upgrade-next/package.json +++ b/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-a3p", "upgradeInfo": { - "coreProposals": [] + "coreProposals": [], + "releaseNotes": false }, "type": "Software Upgrade Proposal" }, diff --git a/a3p-integration/proposals/n:upgrade-next/prepare.sh b/a3p-integration/proposals/a:upgrade-18/prepare.sh similarity index 100% rename from a3p-integration/proposals/n:upgrade-next/prepare.sh rename to a3p-integration/proposals/a:upgrade-18/prepare.sh diff --git a/a3p-integration/proposals/n:upgrade-next/priceFeed-follower-auction.test.js b/a3p-integration/proposals/a:upgrade-18/priceFeed-follower-auction.test.js similarity index 100% rename from a3p-integration/proposals/n:upgrade-next/priceFeed-follower-auction.test.js rename to a3p-integration/proposals/a:upgrade-18/priceFeed-follower-auction.test.js diff --git a/a3p-integration/proposals/n:upgrade-next/priceFeedUpdate.test.js b/a3p-integration/proposals/a:upgrade-18/priceFeedUpdate.test.js similarity index 100% rename from a3p-integration/proposals/n:upgrade-next/priceFeedUpdate.test.js rename to a3p-integration/proposals/a:upgrade-18/priceFeedUpdate.test.js diff --git a/a3p-integration/proposals/n:upgrade-next/replaceElectorate.test.js b/a3p-integration/proposals/a:upgrade-18/replaceElectorate.test.js similarity index 100% rename from a3p-integration/proposals/n:upgrade-next/replaceElectorate.test.js rename to a3p-integration/proposals/a:upgrade-18/replaceElectorate.test.js diff --git a/a3p-integration/proposals/n:upgrade-next/synthetic-chain-excerpt.js b/a3p-integration/proposals/a:upgrade-18/synthetic-chain-excerpt.js similarity index 100% rename from a3p-integration/proposals/n:upgrade-next/synthetic-chain-excerpt.js rename to a3p-integration/proposals/a:upgrade-18/synthetic-chain-excerpt.js diff --git a/a3p-integration/proposals/n:upgrade-next/test-lib/price-feed.js b/a3p-integration/proposals/a:upgrade-18/test-lib/price-feed.js similarity index 100% rename from a3p-integration/proposals/n:upgrade-next/test-lib/price-feed.js rename to a3p-integration/proposals/a:upgrade-18/test-lib/price-feed.js diff --git a/a3p-integration/proposals/n:upgrade-next/test-lib/sync-tools.js b/a3p-integration/proposals/a:upgrade-18/test-lib/sync-tools.js similarity index 100% rename from a3p-integration/proposals/n:upgrade-next/test-lib/sync-tools.js rename to a3p-integration/proposals/a:upgrade-18/test-lib/sync-tools.js diff --git a/a3p-integration/proposals/n:upgrade-next/test.sh b/a3p-integration/proposals/a:upgrade-18/test.sh similarity index 100% rename from a3p-integration/proposals/n:upgrade-next/test.sh rename to a3p-integration/proposals/a:upgrade-18/test.sh diff --git a/a3p-integration/proposals/n:upgrade-next/tsconfig.json b/a3p-integration/proposals/a:upgrade-18/tsconfig.json similarity index 100% rename from a3p-integration/proposals/n:upgrade-next/tsconfig.json rename to a3p-integration/proposals/a:upgrade-18/tsconfig.json diff --git a/a3p-integration/proposals/n:upgrade-next/use.sh b/a3p-integration/proposals/a:upgrade-18/use.sh similarity index 100% rename from a3p-integration/proposals/n:upgrade-next/use.sh rename to a3p-integration/proposals/a:upgrade-18/use.sh diff --git a/a3p-integration/proposals/n:upgrade-next/vatDetails.js b/a3p-integration/proposals/a:upgrade-18/vatDetails.js similarity index 100% rename from a3p-integration/proposals/n:upgrade-next/vatDetails.js rename to a3p-integration/proposals/a:upgrade-18/vatDetails.js diff --git a/a3p-integration/proposals/n:upgrade-next/verifyPushedPrice.js b/a3p-integration/proposals/a:upgrade-18/verifyPushedPrice.js similarity index 100% rename from a3p-integration/proposals/n:upgrade-next/verifyPushedPrice.js rename to a3p-integration/proposals/a:upgrade-18/verifyPushedPrice.js diff --git a/a3p-integration/proposals/n:upgrade-next/yarn.lock b/a3p-integration/proposals/a:upgrade-18/yarn.lock similarity index 100% rename from a3p-integration/proposals/n:upgrade-next/yarn.lock rename to a3p-integration/proposals/a:upgrade-18/yarn.lock diff --git a/a3p-integration/proposals/n:upgrade-next/README.md b/a3p-integration/proposals/n:upgrade-next/README.md deleted file mode 100644 index e4f2a2e1f16..00000000000 --- a/a3p-integration/proposals/n:upgrade-next/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# Proposal to upgrade the chain software - -The `UNRELEASED_A3P_INTEGRATION` software upgrade may include core proposals -defined in its upgrade handler. See `CoreProposalSteps` in the -`unreleasedUpgradeHandler` in -[golang/cosmos/app/upgrade.go](../../../golang/cosmos/app/upgrade.go). - -This test proposal may also include `coreProposals` in its `upgradeInfo`, which -are executed after those defined in that upgrade handler. See `agoricProposal` -in [package.json](./package.json). - -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/golang/cosmos/app/app.go b/golang/cosmos/app/app.go index e5dc4a3c4fe..19196732588 100644 --- a/golang/cosmos/app/app.go +++ b/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), ) } diff --git a/golang/cosmos/app/upgrade.go b/golang/cosmos/app/upgrade.go index f661bf4bddc..a0f1af19c56 100644 --- a/golang/cosmos/app/upgrade.go +++ b/golang/cosmos/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)