Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(cosmos): Next Upgrade is agoric-upgrade-19 #11033

Open
wants to merge 2 commits into
base: dev-upgrade-19
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions a3p-integration/proposals/a:upgrade-19/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Proposal to upgrade the chain software

This holds the draft proposal for agoric-upgrade-19, 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`.
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
"agoricProposal": {
"releaseNotes": false,
"sdkImageTag": "unreleased",
"planName": "UNRELEASED_A3P_INTEGRATION",
"planName": "agoric-upgrade-19-a3p",
"upgradeInfo": {
"coreProposals": []
"coreProposals": [],
"releaseNotes": false
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm surprised this one wasn't there before, nothing to do here tho.

},
"type": "Software Upgrade Proposal",
"sdk-generate": [
Expand Down
File renamed without changes.
14 changes: 0 additions & 14 deletions a3p-integration/proposals/n:upgrade-next/README.md

This file was deleted.

2 changes: 1 addition & 1 deletion golang/cosmos/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@ func NewAgoricApp(
for _, name := range upgradeNamesOfThisVersion {
app.UpgradeKeeper.SetUpgradeHandler(
name,
unreleasedUpgradeHandler(app, name),
upgrade19Handler(app, name),
)
}

Expand Down
37 changes: 17 additions & 20 deletions golang/cosmos/app/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@ import (
)

var upgradeNamesOfThisVersion = []string{
"UNRELEASED_BASIC", // no-frills
"UNRELEASED_A3P_INTEGRATION",
"UNRELEASED_main",
"UNRELEASED_devnet",
"UNRELEASED_emerynet",
"UNRELEASED_REAPPLY",
"agoric-upgrade-19-mainnet",
"agoric-upgrade-19-devnet",
"agoric-upgrade-19-emerynet",
"agoric-upgrade-19-a3p",
"agoric-upgrade-19-basic",
}

// isUpgradeNameOfThisVersion returns whether the provided plan name is a
Expand Down Expand Up @@ -54,14 +53,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-19-mainnet"),
validUpgradeName("agoric-upgrade-19-devnet"),
validUpgradeName("agoric-upgrade-19-emerynet"),
validUpgradeName("agoric-upgrade-19-a3p"),
validUpgradeName("agoric-upgrade-19-basic"):
return true
case validUpgradeName("UNRELEASED_REAPPLY"):
return false
default:
panic(fmt.Errorf("unexpected upgrade name %s", validUpgradeName(name)))
}
Expand Down Expand Up @@ -123,15 +120,15 @@ func buildProposalStepWithArgs(moduleName string, entrypoint string, extra any)

func getVariantFromUpgradeName(upgradeName string) string {
switch upgradeName {
case "UNRELEASED_A3P_INTEGRATION":
case "agoric-upgrade-19-a3p":
return "A3P_INTEGRATION"
case "UNRELEASED_main":
case "agoric-upgrade-19-mainnet":
return "MAINNET"
case "UNRELEASED_devnet":
case "agoric-upgrade-19-devnet":
return "DEVNET"
case "UNRELEASED_emerynet":
case "agoric-upgrade-19-emerynet":
return "EMERYNET"
case "UNRELEASED_BASIC":
case "agoric-upgrade-19-basic":
// Noupgrade for this version.
return ""
default:
Expand Down Expand Up @@ -163,8 +160,8 @@ func buildProposalStepFromScript(targetUpgrade string, builderScript string) (vm
)
}

// 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) {
// upgrade19Handler performs standard upgrade actions plus custom actions for upgrade-19.
func upgrade19Handler(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)

Expand Down
Loading