diff --git a/packages/boot/test/bootstrapTests/test-walletSurvivesZoeRestart.ts b/packages/boot/test/bootstrapTests/test-walletSurvivesZoeRestart.ts index c1fef632c27..ea327accb03 100644 --- a/packages/boot/test/bootstrapTests/test-walletSurvivesZoeRestart.ts +++ b/packages/boot/test/bootstrapTests/test-walletSurvivesZoeRestart.ts @@ -288,7 +288,7 @@ const checkFlow1 = async ( // restart Zoe // /////// Upgrading //////////////////////////////// await buildAndExecuteProposal( - '@agoric/builders/scripts/vats/null-upgrade-zoe-proposal.js', + '@agoric/builders/scripts/vats/upgrade-zoe-proposal.js', ); await buyer.tryExitOffer(`${collateralBrandKey}-bid3`); diff --git a/packages/builders/package.json b/packages/builders/package.json index c4960efe864..16428c20391 100644 --- a/packages/builders/package.json +++ b/packages/builders/package.json @@ -8,9 +8,8 @@ "scripts": { "build": "exit 0", "build:add-STARS-proposal": "echo This command has been deprecated. Please run this instead: agoric run scripts/inter-protocol/add-STARS.js", - "build:restart-vats-proposal": "echo echo This command has been deprecated. Please run this instead: agoric run scripts/vats/restart-vats.js", + "build:restart-vats-proposal": "echo This command has been deprecated. Please run this instead: agoric run scripts/vats/restart-vats.js", "build:zcf-proposal": "echo This command has been deprecated. Please run this instead: agoric run scripts/vats/replace-zoe.js", - "build:null-upgrade-zoe-proposal": "echo This command has been deprecated. Please run this instead: agoric run scripts/vats/replace-zoe.js", "prepack": "tsc --build tsconfig.build.json", "postpack": "git clean -f '*.d.ts*'", "test": "ava", diff --git a/packages/builders/scripts/vats/upgrade-zoe.js b/packages/builders/scripts/vats/upgrade-zoe.js index a9ea1fdec9e..e7503efbb13 100644 --- a/packages/builders/scripts/vats/upgrade-zoe.js +++ b/packages/builders/scripts/vats/upgrade-zoe.js @@ -3,7 +3,7 @@ import { makeHelpers } from '@agoric/deploy-script-support'; /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */ export const defaultProposalBuilder = async ({ publishRef, install }) => harden({ - sourceSpec: '@agoric/vats/src/proposals/null-upgrade-zoe-proposal.js', + sourceSpec: '@agoric/vats/src/proposals/upgrade-zoe-proposal.js', getManifestCall: [ 'getManifestForUpgradingZoe', { @@ -14,5 +14,5 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => export default async (homeP, endowments) => { const { writeCoreProposal } = await makeHelpers(homeP, endowments); - await writeCoreProposal('null-upgrade-zoe', defaultProposalBuilder); + await writeCoreProposal('upgrade-zoe', defaultProposalBuilder); }; diff --git a/packages/vats/src/proposals/null-upgrade-zoe-proposal.js b/packages/vats/src/proposals/upgrade-zoe-proposal.js similarity index 92% rename from packages/vats/src/proposals/null-upgrade-zoe-proposal.js rename to packages/vats/src/proposals/upgrade-zoe-proposal.js index bf907d345d4..946b05b2856 100644 --- a/packages/vats/src/proposals/null-upgrade-zoe-proposal.js +++ b/packages/vats/src/proposals/upgrade-zoe-proposal.js @@ -10,7 +10,7 @@ import { E } from '@endo/far'; * @param {object} options * @param {{ zoeRef: VatSourceRef; zcfRef: VatSourceRef }} options.options */ -export const nullUpgradeZoe = async ( +export const upgradeZoe = async ( { consume: { vatAdminSvc, vatStore } }, options, ) => { @@ -26,7 +26,7 @@ export const nullUpgradeZoe = async ( export const getManifestForUpgradingZoe = (_powers, { zoeRef }) => ({ manifest: { - [nullUpgradeZoe.name]: { + [upgradeZoe.name]: { consume: { vatAdminSvc: 'vatAdminSvc', vatStore: 'vatStore',