diff --git a/a3p-integration/package.json b/a3p-integration/package.json index af3abcede1e..87083977db0 100644 --- a/a3p-integration/package.json +++ b/a3p-integration/package.json @@ -1,7 +1,7 @@ { "private": true, "agoricSyntheticChain": { - "fromTag": "upgrade-13" + "fromTag": "use-upgrade-13" }, "scripts": { "build": "./node_modules/.bin/synthetic-chain build", diff --git a/a3p-integration/proposals/a:upgrade-14/README.md b/a3p-integration/proposals/a:upgrade-14/README.md new file mode 100644 index 00000000000..22ae9313c6e --- /dev/null +++ b/a3p-integration/proposals/a:upgrade-14/README.md @@ -0,0 +1,5 @@ +# Proposal to upgrade the chain software to upgrade-14 + +This software upgrade executes core proposals during the upgrade block, as +defined by the `agoric-upgrade-14` upgrade handler. See `upgrade14Handler` in +`agoric-sdk/golang/cosmos/app/app.go` \ No newline at end of file diff --git a/a3p-integration/proposals/a:upgrade-14/package.json b/a3p-integration/proposals/a:upgrade-14/package.json index 4a0962e888b..47eb1669e84 100644 --- a/a3p-integration/proposals/a:upgrade-14/package.json +++ b/a3p-integration/proposals/a:upgrade-14/package.json @@ -3,11 +3,7 @@ "releaseNotes": "https://github.com/Agoric/agoric-sdk/releases/tag/agoric-upgrade-14", "sdkImageTag": "unreleased", "planName": "agoric-upgrade-14", - "upgradeInfo": { - "coreProposals": [ - "@agoric/vats/scripts/build-wallet-factory2-upgrade.js" - ] - }, + "upgradeInfo": {}, "type": "Software Upgrade Proposal" }, "type": "module", diff --git a/golang/cosmos/app/app.go b/golang/cosmos/app/app.go index cd2f1ba1fea..2c391de5f61 100644 --- a/golang/cosmos/app/app.go +++ b/golang/cosmos/app/app.go @@ -782,11 +782,11 @@ func NewAgoricApp( app.UpgradeKeeper.SetUpgradeHandler( upgradeName, - upgrade13Handler(app, upgradeName), + upgrade14Handler(app, upgradeName), ) app.UpgradeKeeper.SetUpgradeHandler( upgradeNameTest, - upgrade13Handler(app, upgradeNameTest), + upgrade14Handler(app, upgradeNameTest), ) upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk() @@ -824,15 +824,16 @@ func NewAgoricApp( return app } -// upgrade13Handler performs standard upgrade actions plus custom actions for upgrade-14. -func upgrade13Handler(app *GaiaApp, targetUpgrade string) func(sdk.Context, upgradetypes.Plan, module.VersionMap) (module.VersionMap, error) { +// upgrade14Handler performs standard upgrade actions plus custom actions for upgrade-14. +func upgrade14Handler(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) // Each CoreProposalStep runs sequentially, and can be constructed from // one or more modules executing in parallel within the step. CoreProposalSteps := []vm.CoreProposalStep{ - // vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/init-network.js"), + // First, upgrade wallet factory + vm.CoreProposalStepForModules("@agoric/vats/scripts/build-wallet-factory2-upgrade.js"), } app.upgradeDetails = &upgradeDetails{ diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-13/.gitignore b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-13/.gitignore deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-13/actions.test.js b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-13/actions.test.js deleted file mode 100644 index 3ebc09f7f10..00000000000 --- a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-13/actions.test.js +++ /dev/null @@ -1,45 +0,0 @@ -import test from 'ava'; - -import { agd } from '../cliHelper.js'; -import { ATOM_DENOM, CHAINID, GOV1ADDR } from '../constants.js'; -import { addUser, getISTBalance } from './actions.js'; -import { mintIST, openVault } from '../econHelpers.js'; -import { waitForBlock } from '../commonUpgradeHelpers.js'; - -test.before(async t => { - await mintIST(GOV1ADDR, 12340000000, 10000, 2000); - - await waitForBlock(2); - const userAddress = await addUser('user-auto'); - await agd.tx( - 'bank', - 'send', - 'gov1', - userAddress, - `1000000uist,2100000000${ATOM_DENOM}`, - '--from', - GOV1ADDR, - '--chain-id', - CHAINID, - '--keyring-backend', - 'test', - '--yes', - ); - t.context = { userAddress }; - await waitForBlock(2); -}); - -test('Open Vaults with auto-provisioned wallet', async t => { - const { userAddress } = /** @type {{userAddress: string}} */ (t.context); - t.is(await getISTBalance(userAddress), 1); - - const ATOMGiven = 2000; - const ISTWanted = 400; - await openVault(userAddress, ISTWanted, ATOMGiven); - - await waitForBlock(2); - - const newISTBalance = await getISTBalance(userAddress); - console.log('New IST Balance in u13 account:', newISTBalance); - t.true(newISTBalance >= ISTWanted, 'Got the wanted IST'); -}); diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-13/post.test.js b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-13/post.test.js deleted file mode 100644 index 8c8d4b3bbde..00000000000 --- a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-13/post.test.js +++ /dev/null @@ -1 +0,0 @@ -import test from 'ava'; diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-13/pre.test.js b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-13/pre.test.js deleted file mode 100644 index 567fb1ec863..00000000000 --- a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-13/pre.test.js +++ /dev/null @@ -1,9 +0,0 @@ -import test from 'ava'; - -import { waitForBlock } from '../commonUpgradeHelpers.js'; - -test.before(async () => { - console.log('Wait for upgrade to settle'); - - await waitForBlock(5); -});