diff --git a/a3p-integration/proposals/a:upgrade-next/exit-reclaim.test.js b/a3p-integration/proposals/a:upgrade-next/exit-reclaim.test.js index c2bf31a5241..8bc90eca42c 100644 --- a/a3p-integration/proposals/a:upgrade-next/exit-reclaim.test.js +++ b/a3p-integration/proposals/a:upgrade-next/exit-reclaim.test.js @@ -3,7 +3,7 @@ import { $ } from 'execa'; import { execFileSync } from 'node:child_process'; import { makeAgd, waitForBlock } from './synthetic-chain-excerpt.js'; -const offerId = 'bad-invitation-15'; // cf. prepare.sh +const offerId = 'bad-invitation-16'; // cf. prepare.sh const from = 'gov1'; test('exitOffer tool reclaims stuck payment', async t => { diff --git a/a3p-integration/proposals/a:upgrade-next/initial.test.js b/a3p-integration/proposals/a:upgrade-next/initial.test.js index 15b12c33697..6649d1c001e 100644 --- a/a3p-integration/proposals/a:upgrade-next/initial.test.js +++ b/a3p-integration/proposals/a:upgrade-next/initial.test.js @@ -6,8 +6,6 @@ const vats = { network: { incarnation: 0 }, ibc: { incarnation: 0 }, localchain: { incarnation: 0 }, - walletFactory: { incarnation: 3 }, - zoe: { incarnation: 1 }, }; test(`vat details`, async t => { diff --git a/a3p-integration/proposals/a:upgrade-next/package.json b/a3p-integration/proposals/a:upgrade-next/package.json index 8f70d58186e..128a1e2d216 100644 --- a/a3p-integration/proposals/a:upgrade-next/package.json +++ b/a3p-integration/proposals/a:upgrade-next/package.json @@ -6,9 +6,7 @@ "upgradeInfo": { "coreProposals": [] }, - "sdk-generate": [ - "vats/probe-zcf-bundle.js probe-submission" - ], + "sdk-generate": [], "type": "Software Upgrade Proposal" }, "type": "module", diff --git a/a3p-integration/proposals/a:upgrade-next/prepare.sh b/a3p-integration/proposals/a:upgrade-next/prepare.sh index febb39d835f..63f333ad514 100755 --- a/a3p-integration/proposals/a:upgrade-next/prepare.sh +++ b/a3p-integration/proposals/a:upgrade-next/prepare.sh @@ -20,7 +20,7 @@ printISTBalance gov1 badInvitationOffer=$(mktemp) cat > "$badInvitationOffer" << 'EOF' -{"body":"#{\"method\":\"executeOffer\",\"offer\":{\"id\":\"bad-invitation-15\",\"invitationSpec\":{\"callPipe\":[[\"badMethodName\"]],\"instancePath\":[\"reserve\"],\"source\":\"agoricContract\"},\"proposal\":{\"give\":{\"Collateral\":{\"brand\":\"$0.Alleged: IST brand\",\"value\":\"+15000\"}}}}}","slots":["board0257"]} +{"body":"#{\"method\":\"executeOffer\",\"offer\":{\"id\":\"bad-invitation-16\",\"invitationSpec\":{\"callPipe\":[[\"badMethodName\"]],\"instancePath\":[\"reserve\"],\"source\":\"agoricContract\"},\"proposal\":{\"give\":{\"Collateral\":{\"brand\":\"$0.Alleged: IST brand\",\"value\":\"+15000\"}}}}}","slots":["board0257"]} EOF PATH=/usr/src/agoric-sdk/node_modules/.bin:$PATH diff --git a/a3p-integration/proposals/a:upgrade-next/probeZcfBundleCap.test.js b/a3p-integration/proposals/a:upgrade-next/probeZcfBundleCap.test.js deleted file mode 100644 index ef27a73f649..00000000000 --- a/a3p-integration/proposals/a:upgrade-next/probeZcfBundleCap.test.js +++ /dev/null @@ -1,27 +0,0 @@ -import test from 'ava'; - -import { - evalBundles, - getIncarnation, - getVatDetails, -} from '@agoric/synthetic-chain'; - -const SUBMISSION_DIR = 'probe-submission'; - -test('upgrade Zoe to verify ZcfBundleCap endures', async t => { - await null; - t.assert((await getIncarnation('zoe')) === 1, 'zoe incarnation must be one'); - - // Before the test, the Wallet Factory should be using the legacy ZCF - const detailsBefore = await getVatDetails('walletFactory'); - t.true(detailsBefore.incarnation >= 2, 'wf incarnation must be >= 2'); - - await evalBundles(SUBMISSION_DIR); - - const detailsAfter = await getVatDetails('walletFactory'); - t.is( - detailsAfter.incarnation, - detailsBefore.incarnation + 2, - 'wf incarnation must increase by 2', - ); -}); diff --git a/golang/cosmos/app/app.go b/golang/cosmos/app/app.go index 0af37abdb20..6944cc56c63 100644 --- a/golang/cosmos/app/app.go +++ b/golang/cosmos/app/app.go @@ -895,11 +895,7 @@ 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{ - /* upgrade-15 evals */ - // Upgrade ZCF only - vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/upgrade-zcf.js"), - // Upgrade walletFactory - vm.CoreProposalStepForModules("@agoric/builders/scripts/smart-wallet/build-wallet-factory2-upgrade.js"), + /* upgrade-16 evals */ // upgrade the provisioning vat vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/replace-provisioning.js"), // Enable low-level Orchestration. @@ -915,11 +911,11 @@ func unreleasedUpgradeHandler(app *GaiaApp, targetUpgrade string) func(sdk.Conte "@agoric/builders/scripts/vats/updateStTiaPriceFeed.js", ), // Add new auction contract. The old one will be retired shortly. - vm.CoreProposalStepForModules( "@agoric/builders/scripts/vats/add-auction.js"), + vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/add-auction.js"), // upgrade vaultFactory. - vm.CoreProposalStepForModules( "@agoric/builders/scripts/vats/upgradeVaults.js"), + vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/upgradeVaults.js"), // upgrade scaledPriceAuthorities. - vm.CoreProposalStepForModules( "@agoric/builders/scripts/vats/upgradeScaledPriceAuthorities.js"), + vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/upgradeScaledPriceAuthorities.js"), } }