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

Upgrade wallet-factory and zoe in handler #8872

Merged
merged 3 commits into from
Feb 8, 2024
Merged
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
13 changes: 13 additions & 0 deletions a3p-integration/proposals/a:upgrade-next/post.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,16 @@ test(`Ensure Network Vat was installed`, async t => {
const incarnation = await getIncarnation('network');
t.is(incarnation, 0);
});

test(`Smart Wallet vat was upgraded`, async t => {
const incarnation = await getIncarnation('walletFactory');

t.is(incarnation, 2);
});

test(`Zoe vat was upgraded`, async t => {
const incarnation = await getIncarnation('zoe');

t.is(incarnation, 1);
});

26 changes: 0 additions & 26 deletions a3p-integration/proposals/a:upgrade-next/sanity.test.js

This file was deleted.

4 changes: 4 additions & 0 deletions golang/cosmos/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -845,6 +845,10 @@ func unreleasedUpgradeHandler(app *GaiaApp, targetUpgrade string) func(sdk.Conte
// Each CoreProposalStep runs sequentially, and can be constructed from
// one or more modules executing in parallel within the step.
CoreProposalSteps := []vm.CoreProposalStep{
// First, upgrade wallet factory
vm.CoreProposalStepForModules("@agoric/builders/scripts/smart-wallet/build-wallet-factory2-upgrade.js"),
// Then, upgrade Zoe and ZCF
vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/replace-zoe.js"),
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 only vaguely familiar with this CoreProposalSteps go stuff. I presume that the mechanism itself is sufficiently tested and the tests inpost.test.js suffice to show that this usage is wired up right.

Copy link
Member Author

Choose a reason for hiding this comment

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

This is the mechanism now used in the release branch, so this is just replicating that here on the master branch

// vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/init-network.js"),
}

Expand Down
Loading
Loading