From d628279d32f373bf8b5ff488b6c0e4598eb03435 Mon Sep 17 00:00:00 2001 From: Chris Hibbert Date: Fri, 7 Feb 2025 15:08:20 -0800 Subject: [PATCH] refactor: clean-ups in proposals --- packages/builders/scripts/vats/upgrade-bank.js | 4 ++-- packages/builders/scripts/vats/upgrade-psm.js | 4 ++-- packages/vats/src/proposals/upgrade-psm-proposal.js | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/builders/scripts/vats/upgrade-bank.js b/packages/builders/scripts/vats/upgrade-bank.js index af6a8ea2522..dabd24d208c 100644 --- a/packages/builders/scripts/vats/upgrade-bank.js +++ b/packages/builders/scripts/vats/upgrade-bank.js @@ -14,6 +14,6 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */ export default async (homeP, endowments) => { - const { writeCoreProposal } = await makeHelpers(homeP, endowments); - await writeCoreProposal('upgrade-bank', defaultProposalBuilder); + const { writeCoreEval } = await makeHelpers(homeP, endowments); + await writeCoreEval('upgrade-bank', defaultProposalBuilder); }; diff --git a/packages/builders/scripts/vats/upgrade-psm.js b/packages/builders/scripts/vats/upgrade-psm.js index 678f4a5449b..25f5130d04b 100644 --- a/packages/builders/scripts/vats/upgrade-psm.js +++ b/packages/builders/scripts/vats/upgrade-psm.js @@ -14,6 +14,6 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */ export default async (homeP, endowments) => { - const { writeCoreProposal } = await makeHelpers(homeP, endowments); - await writeCoreProposal('upgrade-psm', defaultProposalBuilder); + const { writeCoreEval } = await makeHelpers(homeP, endowments); + await writeCoreEval('upgrade-psm', defaultProposalBuilder); }; diff --git a/packages/vats/src/proposals/upgrade-psm-proposal.js b/packages/vats/src/proposals/upgrade-psm-proposal.js index 1151077c61a..420223a7f3f 100644 --- a/packages/vats/src/proposals/upgrade-psm-proposal.js +++ b/packages/vats/src/proposals/upgrade-psm-proposal.js @@ -59,7 +59,7 @@ export const upgradePSMProposal = async ( trace('Done.'); }; -export const getManifestForUpgradingPSM = (_powers, { psmRef }) => ({ +export const getManifestForUpgradingPSM = ({ restoreRef }, { psmRef }) => ({ manifest: { [upgradePSMProposal.name]: { consume: { @@ -71,4 +71,5 @@ export const getManifestForUpgradingPSM = (_powers, { psmRef }) => ({ }, }, options: { psmRef }, + installations: { psm: restoreRef(psmRef) }, });