diff --git a/a3p-integration/package.json b/a3p-integration/package.json index ad8954bd0da..37d3501a5e4 100644 --- a/a3p-integration/package.json +++ b/a3p-integration/package.json @@ -1,7 +1,7 @@ { "private": true, "agoricSyntheticChain": { - "fromTag": "latest" + "fromTag": "use-upgrade-15" }, "scripts": { "build": "yarn run build:sdk && yarn run build:submissions && yarn run build:synthetic-chain", diff --git a/a3p-integration/proposals/a:upgrade-next/.yarnrc.yml b/a3p-integration/proposals/a:upgrade-16/.yarnrc.yml similarity index 100% rename from a3p-integration/proposals/a:upgrade-next/.yarnrc.yml rename to a3p-integration/proposals/a:upgrade-16/.yarnrc.yml diff --git a/a3p-integration/proposals/a:upgrade-16/README.md b/a3p-integration/proposals/a:upgrade-16/README.md new file mode 100644 index 00000000000..1e5c63ab6ea --- /dev/null +++ b/a3p-integration/proposals/a:upgrade-16/README.md @@ -0,0 +1,5 @@ +# Proposal to upgrade the chain software to agoric-upgrade-16 + +The `agoric-upgrade-16` software upgrade executes core proposals defined in +its upgrade handler. See `CoreProposalSteps` in the `upgrade16Handler` in +[golang/cosmos/app/app.go](../../../golang/cosmos/app/app.go). diff --git a/a3p-integration/proposals/a:upgrade-next/agd-tools.js b/a3p-integration/proposals/a:upgrade-16/agd-tools.js similarity index 100% rename from a3p-integration/proposals/a:upgrade-next/agd-tools.js rename to a3p-integration/proposals/a:upgrade-16/agd-tools.js diff --git a/a3p-integration/proposals/a:upgrade-next/initial.test.js b/a3p-integration/proposals/a:upgrade-16/initial.test.js similarity index 100% rename from a3p-integration/proposals/a:upgrade-next/initial.test.js rename to a3p-integration/proposals/a:upgrade-16/initial.test.js diff --git a/a3p-integration/proposals/a:upgrade-next/localchain.test.js b/a3p-integration/proposals/a:upgrade-16/localchain.test.js similarity index 100% rename from a3p-integration/proposals/a:upgrade-next/localchain.test.js rename to a3p-integration/proposals/a:upgrade-16/localchain.test.js diff --git a/a3p-integration/proposals/a:upgrade-next/package.json b/a3p-integration/proposals/a:upgrade-16/package.json similarity index 94% rename from a3p-integration/proposals/a:upgrade-next/package.json rename to a3p-integration/proposals/a:upgrade-16/package.json index 441024424bd..c8b0d937fe3 100644 --- a/a3p-integration/proposals/a:upgrade-next/package.json +++ b/a3p-integration/proposals/a:upgrade-16/package.json @@ -2,7 +2,7 @@ "agoricProposal": { "releaseNotes": false, "sdkImageTag": "unreleased", - "planName": "UNRELEASED_UPGRADE", + "planName": "agoric-upgrade-16", "upgradeInfo": { "coreProposals": [] }, diff --git a/a3p-integration/proposals/a:upgrade-next/prepare.sh b/a3p-integration/proposals/a:upgrade-16/prepare.sh similarity index 100% rename from a3p-integration/proposals/a:upgrade-next/prepare.sh rename to a3p-integration/proposals/a:upgrade-16/prepare.sh diff --git a/a3p-integration/proposals/a:upgrade-next/priceFeed-follower-auction.test.js b/a3p-integration/proposals/a:upgrade-16/priceFeed-follower-auction.test.js similarity index 100% rename from a3p-integration/proposals/a:upgrade-next/priceFeed-follower-auction.test.js rename to a3p-integration/proposals/a:upgrade-16/priceFeed-follower-auction.test.js diff --git a/a3p-integration/proposals/a:upgrade-next/probeZcfBundleCap.test.js b/a3p-integration/proposals/a:upgrade-16/probeZcfBundleCap.test.js similarity index 100% rename from a3p-integration/proposals/a:upgrade-next/probeZcfBundleCap.test.js rename to a3p-integration/proposals/a:upgrade-16/probeZcfBundleCap.test.js diff --git a/a3p-integration/proposals/a:upgrade-next/provisioning-test-submission/send-script-permit.json b/a3p-integration/proposals/a:upgrade-16/provisioning-test-submission/send-script-permit.json similarity index 100% rename from a3p-integration/proposals/a:upgrade-next/provisioning-test-submission/send-script-permit.json rename to a3p-integration/proposals/a:upgrade-16/provisioning-test-submission/send-script-permit.json diff --git a/a3p-integration/proposals/a:upgrade-next/provisioning-test-submission/send-script.tjs b/a3p-integration/proposals/a:upgrade-16/provisioning-test-submission/send-script.tjs similarity index 100% rename from a3p-integration/proposals/a:upgrade-next/provisioning-test-submission/send-script.tjs rename to a3p-integration/proposals/a:upgrade-16/provisioning-test-submission/send-script.tjs diff --git a/a3p-integration/proposals/a:upgrade-next/provisioning.test.js b/a3p-integration/proposals/a:upgrade-16/provisioning.test.js similarity index 100% rename from a3p-integration/proposals/a:upgrade-next/provisioning.test.js rename to a3p-integration/proposals/a:upgrade-16/provisioning.test.js diff --git a/a3p-integration/proposals/a:upgrade-next/synthetic-chain-excerpt.js b/a3p-integration/proposals/a:upgrade-16/synthetic-chain-excerpt.js similarity index 100% rename from a3p-integration/proposals/a:upgrade-next/synthetic-chain-excerpt.js rename to a3p-integration/proposals/a:upgrade-16/synthetic-chain-excerpt.js diff --git a/a3p-integration/proposals/a:upgrade-next/test.sh b/a3p-integration/proposals/a:upgrade-16/test.sh similarity index 100% rename from a3p-integration/proposals/a:upgrade-next/test.sh rename to a3p-integration/proposals/a:upgrade-16/test.sh diff --git a/a3p-integration/proposals/a:upgrade-next/tsconfig.json b/a3p-integration/proposals/a:upgrade-16/tsconfig.json similarity index 100% rename from a3p-integration/proposals/a:upgrade-next/tsconfig.json rename to a3p-integration/proposals/a:upgrade-16/tsconfig.json diff --git a/a3p-integration/proposals/a:upgrade-next/upgradeVaults.test.js b/a3p-integration/proposals/a:upgrade-16/upgradeVaults.test.js similarity index 100% rename from a3p-integration/proposals/a:upgrade-next/upgradeVaults.test.js rename to a3p-integration/proposals/a:upgrade-16/upgradeVaults.test.js diff --git a/a3p-integration/proposals/a:upgrade-next/use.sh b/a3p-integration/proposals/a:upgrade-16/use.sh similarity index 100% rename from a3p-integration/proposals/a:upgrade-next/use.sh rename to a3p-integration/proposals/a:upgrade-16/use.sh diff --git a/a3p-integration/proposals/a:upgrade-next/vatDetails.js b/a3p-integration/proposals/a:upgrade-16/vatDetails.js similarity index 100% rename from a3p-integration/proposals/a:upgrade-next/vatDetails.js rename to a3p-integration/proposals/a:upgrade-16/vatDetails.js diff --git a/a3p-integration/proposals/a:upgrade-next/yarn.lock b/a3p-integration/proposals/a:upgrade-16/yarn.lock similarity index 100% rename from a3p-integration/proposals/a:upgrade-next/yarn.lock rename to a3p-integration/proposals/a:upgrade-16/yarn.lock diff --git a/a3p-integration/proposals/a:upgrade-next/README.md b/a3p-integration/proposals/a:upgrade-next/README.md deleted file mode 100644 index 478b94307fc..00000000000 --- a/a3p-integration/proposals/a:upgrade-next/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# Proposal to upgrade the chain software - -The `UNRELEASED_UPGRADE` software upgrade may include core proposals defined in -its upgrade handler. See `CoreProposalSteps` in the `unreleasedUpgradeHandler` -in [golang/cosmos/app/app.go](../../../golang/cosmos/app/app.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 83b1fb0bdff..4d817bcd68f 100644 --- a/golang/cosmos/app/app.go +++ b/golang/cosmos/app/app.go @@ -863,7 +863,7 @@ func NewAgoricApp( for name := range upgradeNamesOfThisVersion { app.UpgradeKeeper.SetUpgradeHandler( name, - unreleasedUpgradeHandler(app, name), + upgrade16Handler(app, name), ) } @@ -908,8 +908,8 @@ func NewAgoricApp( } var upgradeNamesOfThisVersion = map[string]bool{ - "UNRELEASED_UPGRADE": true, - "UNRELEASED_TEST_UPGRADE": true, + "agoric-upgrade-16": true, + "agorictest-upgrade-16": true, } func isFirstTimeUpgradeOfThisVersion(app *GaiaApp, ctx sdk.Context) bool { @@ -921,8 +921,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) { +// upgrade16Handler performs standard upgrade actions plus custom actions for upgrade-16. +func upgrade16Handler(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)