@agoric/builders 0.2.0 → 0.2.1-upgrade-23-dev-bd79330.0.bd79330

package/scripts/vats/init-orchestration.js

@@ -1,6 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }) =>
   harden({
     sourceSpec: '@agoric/orchestration/src/proposals/orchestration-proposal.js',
@@ -14,7 +19,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('gov-orchestration', defaultProposalBuilder);

package/scripts/vats/init-transfer.js

@@ -1,6 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }) =>
   harden({
     sourceSpec: '@agoric/vats/src/proposals/transfer-proposal.js',
@@ -12,7 +17,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreProposal } = await makeHelpers(homeP, endowments);
   await writeCoreProposal('gov-transfer', defaultProposalBuilder);

package/scripts/vats/priceFeedSupport.js

@@ -1,13 +1,19 @@
 /* global process */
 
+import { interProtocolBundleSpecs } from '@agoric/inter-protocol/source-spec-registry.js';
 import { DEFAULT_CONTRACT_TERMS } from '../inter-protocol/price-feed-core.js';
+import { buildBundlePath } from '../lib/build-bundle.js';
+
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
 
 const { Fail } = assert;
 
 /**
  * modified copy of ../inter-protocol/price-feed-core.js
  *
- * @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder}
+ * @type {CoreEvalBuilder}
  */
 export const strictPriceFeedProposalBuilder = async (
   { publishRef, install },
@@ -30,6 +36,12 @@ export const strictPriceFeedProposalBuilder = async (
   Array.isArray(IN_BRAND_LOOKUP) ||
     Fail`IN_BRAND_NAME array is required; got ${IN_BRAND_LOOKUP}`;
 
+  const priceAggregator = interProtocolBundleSpecs.priceAggregator;
+  const priceAggregatorPath = await buildBundlePath(
+    import.meta.url,
+    priceAggregator,
+  );
+
   return harden({
     sourceSpec: '@agoric/inter-protocol/src/proposals/price-feed-proposal.js',
     getManifestCall: [
@@ -43,10 +55,7 @@ export const strictPriceFeedProposalBuilder = async (
         OUT_BRAND_DECIMALS: 4,
         OUT_BRAND_NAME: 'USD',
         priceAggregatorRef: publishRef(
-          install(
-            '@agoric/inter-protocol/src/price/fluxAggregatorContract.js',
-            '../bundles/bundle-fluxAggregatorKit.js',
-          ),
+          install(priceAggregator.packagePath, priceAggregatorPath),
         ),
       },
     ],
@@ -55,7 +64,7 @@ export const strictPriceFeedProposalBuilder = async (
 
 /**
  * @deprecated use `strictPriceFeedProposalBuilder` and specify arguments instead
- * @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder}
+ * @type {CoreEvalBuilder}
  */
 export const deprecatedPriceFeedProposalBuilder = async (powers, options) => {
   console.warn(
@@ -85,6 +94,6 @@ export const deprecatedPriceFeedProposalBuilder = async (powers, options) => {
 
 /**
  * @deprecated use `strictPriceFeedProposalBuilder` and specify arguments instead
- * @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder}
+ * @type {CoreEvalBuilder}
  */
 export const priceFeedProposalBuilder = deprecatedPriceFeedProposalBuilder;

package/scripts/vats/probe-zcf-bundle.js

@@ -1,6 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }) =>
   harden({
     sourceSpec: '@agoric/vats/src/proposals/probeZcfBundle.js',
@@ -16,7 +21,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('probeZcfBundle', defaultProposalBuilder);

package/scripts/vats/replace-provisioning.js

@@ -3,7 +3,12 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 import { getManifestForProvisioning } from '@agoric/vats/src/proposals/namesByAddress-fix-proposal.js';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }) =>
   harden({
     sourceSpec: '@agoric/vats/src/proposals/namesByAddress-fix-proposal.js',
@@ -17,7 +22,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('gov-provisioning', defaultProposalBuilder);

package/scripts/vats/replace-zoe.js

@@ -1,6 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }) =>
   harden({
     sourceSpec: '@agoric/vats/src/proposals/zcf-proposal.js',
@@ -13,7 +18,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('replace-zcf', defaultProposalBuilder);

package/scripts/vats/restart-vats.js

@@ -1,6 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async () => {
   // An includelist isn't necessary because the collections are known to be complete (tested in test-vaults-upgrade.js)
   const skip = [
@@ -19,7 +24,7 @@ export const defaultProposalBuilder = async () => {
   });
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('restart-vats', defaultProposalBuilder);

package/scripts/vats/revive-kread.js

@@ -1,13 +1,18 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async () =>
   harden({
     sourceSpec: '@agoric/vats/src/proposals/kread-proposal.js',
     getManifestCall: ['getManifestForKread'],
   });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreProposal } = await makeHelpers(homeP, endowments);
   await writeCoreProposal('revive-kread', defaultProposalBuilder);

package/scripts/vats/set-core-proposal-env.js

@@ -1,7 +1,7 @@
 #! /usr/bin/env node
-import fs from 'fs';
-import process from 'process';
-import { createRequire } from 'module';
+import fs from 'node:fs';
+import process from 'node:process';
+import { createRequire } from 'node:module';
 
 const require = createRequire(import.meta.url);
 const spec = process.argv[2];

package/scripts/vats/test-localchain.js

@@ -1,6 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async _powers =>
   harden({
     sourceSpec: '@agoric/vats/src/proposals/localchain-test.js',
@@ -12,7 +17,7 @@ export const defaultProposalBuilder = async _powers =>
     ],
   });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('test-localchain', defaultProposalBuilder);

package/scripts/vats/test-vtransfer.js

@@ -1,6 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async _powers =>
   harden({
     sourceSpec: '@agoric/vats/src/proposals/vtransfer-echoer.js',
@@ -12,7 +17,7 @@ export const defaultProposalBuilder = async _powers =>
     ],
   });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreProposal } = await makeHelpers(homeP, endowments);
   await writeCoreProposal('test-vtransfer', defaultProposalBuilder);

package/scripts/vats/updateAtomPriceFeed.js

@@ -1,6 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 import { priceFeedProposalBuilder } from './priceFeedSupport.js';
 
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
 const OPTIONS = {
   AGORIC_INSTANCE_NAME: 'ATOM-USD price feed',
   IN_BRAND_LOOKUP: ['agoricNames', 'oracleBrand', 'ATOM'],
@@ -8,13 +13,13 @@ const OPTIONS = {
 };
 
 /**
- * @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder}
+ * @type {CoreEvalBuilder}
  */
 export const defaultProposalBuilder = async ({ publishRef, install }) => {
   return priceFeedProposalBuilder({ publishRef, install }, OPTIONS);
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
 

package/scripts/vats/updateStAtomPriceFeed.js

@@ -1,6 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 import { priceFeedProposalBuilder } from './priceFeedSupport.js';
 
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
 const OPTIONS = {
   AGORIC_INSTANCE_NAME: 'stATOM-USD price feed',
   IN_BRAND_LOOKUP: ['agoricNames', 'oracleBrand', 'stATOM'],
@@ -8,13 +13,13 @@ const OPTIONS = {
 };
 
 /**
- * @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder}
+ * @type {CoreEvalBuilder}
  */
 export const defaultProposalBuilder = async ({ publishRef, install }) => {
   return priceFeedProposalBuilder({ publishRef, install }, OPTIONS);
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
 

package/scripts/vats/updateStOsmoPriceFeed.js

@@ -1,6 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 import { priceFeedProposalBuilder } from './priceFeedSupport.js';
 
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
 const OPTIONS = {
   AGORIC_INSTANCE_NAME: 'stOSMO-USD price feed',
   IN_BRAND_LOOKUP: ['agoricNames', 'oracleBrand', 'stOSMO'],
@@ -8,13 +13,13 @@ const OPTIONS = {
 };
 
 /**
- * @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder}
+ * @type {CoreEvalBuilder}
  */
 export const defaultProposalBuilder = async ({ publishRef, install }) => {
   return priceFeedProposalBuilder({ publishRef, install }, OPTIONS);
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
 

package/scripts/vats/updateStTiaPriceFeed.js

@@ -1,6 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 import { priceFeedProposalBuilder } from './priceFeedSupport.js';
 
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
 const OPTIONS = {
   AGORIC_INSTANCE_NAME: 'stTIA-USD price feed',
   IN_BRAND_LOOKUP: ['agoricNames', 'oracleBrand', 'stTIA'],
@@ -8,13 +13,13 @@ const OPTIONS = {
 };
 
 /**
- * @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder}
+ * @type {CoreEvalBuilder}
  */
 export const defaultProposalBuilder = async ({ publishRef, install }) => {
   return priceFeedProposalBuilder({ publishRef, install }, OPTIONS);
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
 

package/scripts/vats/updateStkAtomPriceFeed.js

@@ -1,6 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 import { priceFeedProposalBuilder } from './priceFeedSupport.js';
 
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
 const OPTIONS = {
   AGORIC_INSTANCE_NAME: 'stkATOM-USD price feed',
   IN_BRAND_LOOKUP: ['agoricNames', 'oracleBrand', 'stkATOM'],
@@ -8,13 +13,13 @@ const OPTIONS = {
 };
 
 /**
- * @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder}
+ * @type {CoreEvalBuilder}
  */
 export const defaultProposalBuilder = async ({ publishRef, install }) => {
   return priceFeedProposalBuilder({ publishRef, install }, OPTIONS);
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
 

package/scripts/vats/upgrade-agoricNames.js

@@ -1,6 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }) =>
   harden({
     sourceSpec: '@agoric/vats/src/proposals/upgrade-agoricNames-proposal.js',
@@ -14,7 +19,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreProposal } = await makeHelpers(homeP, endowments);
   await writeCoreProposal('upgrade-agoricNames', defaultProposalBuilder);

package/scripts/vats/upgrade-asset-reserve.js

@@ -1,6 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }) =>
   harden({
     sourceSpec: '@agoric/vats/src/proposals/upgrade-asset-reserve-proposal.js',
@@ -14,7 +19,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreProposal } = await makeHelpers(homeP, endowments);
   await writeCoreProposal('upgrade-asset-reserve', defaultProposalBuilder);

package/scripts/vats/upgrade-bank.js

@@ -1,6 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }) =>
   harden({
     sourceSpec: '@agoric/vats/src/proposals/upgrade-bank-proposal.js',
@@ -12,7 +17,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('upgrade-bank', defaultProposalBuilder);

package/scripts/vats/upgrade-board.js

@@ -1,7 +1,12 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 import { getManifestForUpgradingBoard } from '@agoric/vats/src/proposals/upgrade-board-proposal.js';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }) =>
   harden({
     sourceSpec: '@agoric/vats/src/proposals/upgrade-board-proposal.js',
@@ -13,7 +18,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('upgrade-board', defaultProposalBuilder);

package/scripts/vats/upgrade-mintHolder.js

@@ -1,6 +1,11 @@
 import { makeHelpers, parseScriptArgs } from '@agoric/deploy-script-support';
 import { getManifestForUpgradingMintHolder } from '@agoric/vats/src/proposals/upgrade-mintHolder-proposal.js';
 
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
 const configurations = {
   A3P_INTEGRATION: {
     labelList: [
@@ -72,7 +77,7 @@ const configurations = {
 const { keys } = Object;
 const knownVariants = keys(configurations);
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
   const config = opts.config || configurations[opts.variant];
   if (!config) {
@@ -94,7 +99,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
   });
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const opts = parseScriptArgs(endowments, 'upgrade-mintHolder', knownVariants);
 

package/scripts/vats/upgrade-orchestration.js

@@ -1,7 +1,12 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 import { upgradeVatsProposalBuilder } from './upgrade-vats.js';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async powers => {
   const bundleRecord = {
     ibc: '@agoric/vats/src/vat-ibc.js',
@@ -14,7 +19,7 @@ export const defaultProposalBuilder = async powers => {
   return upgradeVatsProposalBuilder(powers, bundleRecord);
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreProposal } = await makeHelpers(homeP, endowments);
   await writeCoreProposal('upgrade-orchestration', defaultProposalBuilder);

package/scripts/vats/upgrade-paRegistry.js

@@ -1,6 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }) =>
   harden({
     sourceSpec: '@agoric/vats/src/proposals/upgrade-paRegistry-proposal.js',
@@ -14,7 +19,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
   await writeCoreEval('upgrade-paRegistry', defaultProposalBuilder);

package/scripts/vats/upgrade-provisionPool-to-BLD.js

@@ -1,6 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }) =>
   harden({
     sourceSpec:
@@ -15,7 +20,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreProposal } = await makeHelpers(homeP, endowments);
   await writeCoreProposal(

package/scripts/vats/upgrade-provisionPool.js

@@ -1,6 +1,11 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }) =>
   harden({
     sourceSpec: '@agoric/vats/src/proposals/upgrade-provisionPool-proposal.js',
@@ -14,7 +19,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { writeCoreProposal } = await makeHelpers(homeP, endowments);
   await writeCoreProposal('upgrade-provision-pool', defaultProposalBuilder);