@agoric/builders 0.1.1-other-dev-3eb1a1d.0 → 0.1.1-other-dev-d15096d.0.d15096d

package/scripts/testing/restart-axelar-gmp.js

@@ -0,0 +1,96 @@
+/**
+ * @file This is for use in tests in a3p-integration
+ * Unlike most builder scripts, this one includes the proposal exports as well.
+ */
+import {
+  deeplyFulfilledObject,
+  makeTracer,
+  NonNullish,
+} from '@agoric/internal';
+import { E } from '@endo/far';
+
+/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
+
+const trace = makeTracer('StartAxelarGmp', true);
+
+/**
+ * @import {start as StartFn} from '@agoric/orchestration/src/examples/axelar-gmp.contract.js';
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/**
+ * @param {BootstrapPowers} powers
+ */
+export const restartAxelarGmp = async ({
+  consume: {
+    agoricNames,
+    board,
+    chainStorage,
+    chainTimerService,
+    cosmosInterchainService,
+    localchain,
+    contractKits,
+  },
+  instance: instances,
+}) => {
+  trace(restartAxelarGmp.name);
+
+  const marshaller = await E(board).getReadonlyMarshaller();
+  const privateArgs = await deeplyFulfilledObject(
+    harden({
+      agoricNames,
+      localchain,
+      marshaller,
+      orchestrationService: cosmosInterchainService,
+      storageNode: E(NonNullish(await chainStorage)).makeChildNode('axelarGmp'),
+      timerService: chainTimerService,
+    }),
+  );
+
+  // @ts-expect-error unknown instance
+  const instance = await instances.consume.axelarGmp;
+  trace('instance', instance);
+  /** @type {StartedInstanceKit<StartFn>} */
+  const kit = /** @type {any} */ (await E(contractKits).get(instance));
+
+  await E(kit.adminFacet).restartContract(privateArgs);
+  trace('done');
+};
+harden(restartAxelarGmp);
+
+export const getManifest = () => {
+  return {
+    manifest: {
+      [restartAxelarGmp.name]: {
+        consume: {
+          agoricNames: true,
+          board: true,
+          chainTimerService: true,
+          chainStorage: true,
+          cosmosInterchainService: true,
+          localchain: true,
+          contractKits: true,
+        },
+        instance: {
+          consume: { axelarGmp: true },
+        },
+      },
+    },
+  };
+};
+
+/** @type {CoreEvalBuilder} */
+export const defaultProposalBuilder = async () =>
+  harden({
+    sourceSpec: '@agoric/builders/scripts/testing/restart-axelar-gmp.js',
+    getManifestCall: [getManifest.name],
+  });
+
+/** @type {DeployScriptFunction} */
+export default async (homeP, endowments) => {
+  const dspModule = await import('@agoric/deploy-script-support');
+  const { makeHelpers } = dspModule;
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval(restartAxelarGmp.name, defaultProposalBuilder);
+};

package/scripts/testing/restart-basic-flows.js

@@ -9,12 +9,14 @@ import {
 } from '@agoric/internal';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient"/>
+/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
 
 const trace = makeTracer('RestartBasicFlows', true);
 
 /**
  * @import {start as StartFn} from '@agoric/orchestration/src/examples/basic-flows.contract.js';
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
  */
 
 /**
@@ -83,7 +85,7 @@ export const getManifest = () => {
   };
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async () =>
   harden({
     // Somewhat unorthodox, source the exports from this builder module
@@ -91,7 +93,7 @@ export const defaultProposalBuilder = async () =>
     getManifestCall: [getManifest.name],
   });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   // import dynamically so the module can work in CoreEval environment
   const dspModule = await import('@agoric/deploy-script-support');

package/scripts/testing/restart-send-anywhere.js

@@ -9,12 +9,14 @@ import {
 } from '@agoric/internal';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient"/>
+/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
 
 const trace = makeTracer('StartSA', true);
 
 /**
  * @import {start as StartFn} from '@agoric/orchestration/src/examples/send-anywhere.contract.js';
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
  */
 
 /**
@@ -83,7 +85,7 @@ export const getManifest = () => {
   };
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async () =>
   harden({
     // Somewhat unorthodox, source the exports from this builder module
@@ -91,7 +93,7 @@ export const defaultProposalBuilder = async () =>
     getManifestCall: [getManifest.name],
   });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   // import dynamically so the module can work in CoreEval environment
   const dspModule = await import('@agoric/deploy-script-support');

package/scripts/testing/restart-stakeAtom.js

@@ -6,12 +6,14 @@ import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
 import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient"/>
+/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
 
 const trace = makeTracer('RestartSA', true);
 
 /**
  * @import {start as StartFn} from '@agoric/orchestration/src/examples/stake-ica.contract.js';
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
  */
 
 /**
@@ -73,7 +75,7 @@ export const getManifest = () => {
   };
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async () =>
   harden({
     // Somewhat unorthodox, source the exports from this builder module
@@ -81,7 +83,7 @@ export const defaultProposalBuilder = async () =>
     getManifestCall: [getManifest.name],
   });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   // import dynamically so the module can work in CoreEval environment
   const dspModule = await import('@agoric/deploy-script-support');

package/scripts/testing/restart-valueVow.js

@@ -5,9 +5,12 @@
 import { makeTracer } from '@agoric/internal';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient"/>
+/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
 /**
  * @import {Instance} from '@agoric/zoe/src/zoeService/utils.js';
+ * @import {start} from '@agoric/zoe/src/contracts/valueVow.contract.js';
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
  */
 
 const trace = makeTracer('RestartValueVow', true);
@@ -17,7 +20,7 @@ const trace = makeTracer('RestartValueVow', true);
  *   instance: {
  *     consume: {
  *       valueVow: Instance<
- *         import('@agoric/zoe/src/contracts/valueVow.contract.js').start
+ *         start
  *       >;
  *     };
  *   };
@@ -57,7 +60,7 @@ export const getManifestForValueVow = ({ restoreRef }, { valueVowRef }) => {
   };
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }) =>
   harden({
     // Somewhat unorthodox, source the exports from this builder module
@@ -72,7 +75,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   // import dynamically so the module can work in CoreEval environment
   const dspModule = await import('@agoric/deploy-script-support');

package/scripts/testing/start-query-flows.js

@@ -7,9 +7,13 @@
 import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
 import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
 import { E } from '@endo/far';
+import { parseChainHubOpts } from '../orchestration/helpers.js';
 
 /**
+ * @import {CosmosChainInfo, Denom, DenomDetail} from '@agoric/orchestration';
  * @import {QueryFlowsSF as StartFn} from '@agoric/orchestration/src/fixtures/query-flows.contract.js';
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
  */
 
 const contractName = 'queryFlows';
@@ -28,25 +32,34 @@ const trace = makeTracer(contractName, true);
  *     };
  *   };
  * }} powers
+ * @param {{
+ *   options: {
+ *     chainInfo: Record<string, CosmosChainInfo>;
+ *     assetInfo: [Denom, DenomDetail & { brandKey?: string }][];
+ *   };
+ * }} config
  */
-export const startQueryFlows = async ({
-  consume: {
-    agoricNames,
-    board,
-    chainStorage,
-    chainTimerService,
-    cosmosInterchainService,
-    localchain,
-    startUpgradable,
-  },
-  installation: {
-    consume: { [contractName]: installation },
-  },
-  instance: {
-    // @ts-expect-error unknown instance
-    produce: { [contractName]: produceInstance },
+export const startQueryFlows = async (
+  {
+    consume: {
+      agoricNames,
+      board,
+      chainStorage,
+      chainTimerService,
+      cosmosInterchainService,
+      localchain,
+      startUpgradable,
+    },
+    installation: {
+      consume: { [contractName]: installation },
+    },
+    instance: {
+      // @ts-expect-error unknown instance
+      produce: { [contractName]: produceInstance },
+    },
   },
-}) => {
+  { options: { chainInfo, assetInfo } },
+) => {
   trace(`start ${contractName}`);
 
   const storageNode = await makeStorageNodeChild(chainStorage, contractName);
@@ -60,6 +73,8 @@ export const startQueryFlows = async ({
     privateArgs: await deeplyFulfilledObject(
       harden({
         agoricNames,
+        assetInfo,
+        chainInfo,
         orchestrationService: cosmosInterchainService,
         localchain,
         storageNode,
@@ -76,7 +91,7 @@ harden(startQueryFlows);
 
 export const getManifestForContract = (
   { restoreRef },
-  { installKeys, ...options },
+  { installKeys, options },
 ) => {
   return {
     manifest: {
@@ -105,8 +120,11 @@ export const getManifestForContract = (
   };
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
-export const defaultProposalBuilder = async ({ publishRef, install }) => {
+/** @type {CoreEvalBuilder} */
+export const defaultProposalBuilder = async (
+  { publishRef, install },
+  options,
+) => {
   return harden({
     // Somewhat unorthodox, source the exports from this builder module
     sourceSpec: '@agoric/builders/scripts/testing/start-query-flows.js',
@@ -120,16 +138,20 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
             ),
           ),
         },
+        options,
       },
     ],
   });
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
-  // import dynamically so the module can work in CoreEval environment
-  const dspModule = await import('@agoric/deploy-script-support');
-  const { makeHelpers } = dspModule;
+  // import dynamically so the modules can work in CoreEval environment
+  const { makeHelpers } = await import('@agoric/deploy-script-support');
+  const { scriptArgs } = endowments;
+  const opts = parseChainHubOpts(scriptArgs);
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
-  await writeCoreEval(startQueryFlows.name, defaultProposalBuilder);
+  await writeCoreEval(startQueryFlows.name, utils =>
+    defaultProposalBuilder(utils, opts),
+  );
 };

package/scripts/testing/start-valueVow.js

@@ -5,9 +5,12 @@
 import { makeTracer } from '@agoric/internal';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient"/>
+/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
 /**
  * @import {Installation} from '@agoric/zoe/src/zoeService/utils.js';
+ * @import {start} from '@agoric/zoe/src/contracts/valueVow.contract.js';
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
  */
 
 const trace = makeTracer('StartValueVow', true);
@@ -17,7 +20,7 @@ const trace = makeTracer('StartValueVow', true);
  *   installation: {
  *     consume: {
  *       valueVow: Installation<
- *         import('@agoric/zoe/src/contracts/valueVow.contract.js').start
+ *         start
  *       >;
  *     };
  *   };
@@ -68,7 +71,7 @@ export const getManifestForValueVow = ({ restoreRef }, { valueVowRef }) => {
   };
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }) =>
   harden({
     // Somewhat unorthodox, source the exports from this builder module
@@ -83,7 +86,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   // import dynamically so the module can work in CoreEval environment
   const dspModule = await import('@agoric/deploy-script-support');

package/scripts/testing/test-upgraded-board.js

@@ -0,0 +1,20 @@
+import { makeHelpers } from '@agoric/deploy-script-support';
+import { getManifestForTestUpgradedBoard } from '@agoric/vats/src/proposals/testUpgradedBoard.js';
+
+/**
+ * @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/testUpgradedBoard.js',
+    getManifestCall: [getManifestForTestUpgradedBoard.name],
+  });
+
+/** @type {DeployScriptFunction} */
+export default async (homeP, endowments) => {
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval('testUpgradedBoard', defaultProposalBuilder);
+};

package/scripts/testing/tweak-chain-info.js

@@ -1,13 +1,22 @@
 /// <reference types="ses" />
 import { makeHelpers } from '@agoric/deploy-script-support';
 
-/** @type {Record<string, import('@agoric/orchestration/src/chain-info.js').ChainInfo>} */
+/**
+ * @import {ChainInfo} from '@agoric/orchestration';
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {Record<string, ChainInfo>} */
 const chainInfo = {
   agoric: {
+    bech32Prefix: 'agoric',
     chainId: 'agoric-4',
+    namespace: 'cosmos',
+    reference: 'agoric-4',
   },
   hot: {
-    allegedName: 'Hot New Chain',
+    bech32Prefix: 'hot',
     chainId: 'hot-1',
     connections: {
       'cosmoshub-4': {
@@ -29,10 +38,12 @@ const chainInfo = {
         },
       },
     },
+    namespace: 'cosmos',
+    reference: 'hot-1',
   },
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async () =>
   harden({
     sourceSpec: '@agoric/orchestration/src/proposals/revise-chain-info.js',
@@ -44,7 +55,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('revise-chain-info', defaultProposalBuilder);

package/scripts/testing/{fix-buggy-sendAnywhere.js → upgrade-send-anywhere.js}

@@ -7,14 +7,16 @@ import {
   makeTracer,
   NonNullish,
 } from '@agoric/internal';
-import { E, Far } from '@endo/far';
+import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient"/>
+/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
 /**
  * @import {Installation, Instance} from '@agoric/zoe/src/zoeService/utils.js';
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
  */
 
-const trace = makeTracer('FixBuggySA', true);
+const trace = makeTracer('UpgradeSA', true);
 
 /**
  * @import {start as StartFn} from '@agoric/orchestration/src/examples/send-anywhere.contract.js';
@@ -30,7 +32,7 @@ const trace = makeTracer('FixBuggySA', true);
  * }} powers
  * @param {...any} rest
  */
-export const fixSendAnywhere = async (
+export const upgradeSendAnywhere = async (
   {
     consume: {
       agoricNames,
@@ -45,7 +47,7 @@ export const fixSendAnywhere = async (
   },
   { options: { sendAnywhereRef } },
 ) => {
-  trace(fixSendAnywhere.name);
+  trace(upgradeSendAnywhere.name);
 
   const saInstance = await instances.consume.sendAnywhere;
   trace('saInstance', saInstance);
@@ -53,28 +55,24 @@ export const fixSendAnywhere = async (
 
   const marshaller = await E(board).getReadonlyMarshaller();
 
-  // This apparently pointless wrapper is to maintain structural parity
-  // with the buggy core-eval's wrapper to make lookup() hang.
-  const agoricNamesResolves = Far('agoricNames that resolves', {
-    lookup: async (...args) => {
-      return E(agoricNames).lookup(...args);
-    },
-  });
-
   const privateArgs = await deeplyFulfilledObject(
     harden({
-      agoricNames: agoricNamesResolves,
+      agoricNames,
       localchain,
       marshaller,
       orchestrationService: cosmosInterchainService,
       storageNode: E(NonNullish(await chainStorage)).makeChildNode(
-        'sendAnywhere',
+        'send-anywhere',
       ),
       timerService: chainTimerService,
+      // undefined so `registerKnownChainsAndAssets` does not run again
+      chainInfo: undefined,
+      assetInfo: undefined,
     }),
   );
 
   trace('upgrading...');
+  trace('ref', sendAnywhereRef);
   await E(saKit.adminFacet).upgradeContract(
     sendAnywhereRef.bundleID,
     privateArgs,
@@ -82,13 +80,13 @@ export const fixSendAnywhere = async (
 
   trace('done');
 };
-harden(fixSendAnywhere);
+harden(upgradeSendAnywhere);
 
 export const getManifestForValueVow = ({ restoreRef }, { sendAnywhereRef }) => {
   console.log('sendAnywhereRef', sendAnywhereRef);
   return {
     manifest: {
-      [fixSendAnywhere.name]: {
+      [upgradeSendAnywhere.name]: {
         consume: {
           agoricNames: true,
           board: true,
@@ -116,11 +114,11 @@ export const getManifestForValueVow = ({ restoreRef }, { sendAnywhereRef }) => {
   };
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }) =>
   harden({
     // Somewhat unorthodox, source the exports from this builder module
-    sourceSpec: '@agoric/builders/scripts/testing/fix-buggy-sendAnywhere.js',
+    sourceSpec: '@agoric/builders/scripts/testing/upgrade-send-anywhere.js',
     getManifestCall: [
       'getManifestForValueVow',
       {
@@ -133,11 +131,11 @@ export const defaultProposalBuilder = async ({ publishRef, install }) =>
     ],
   });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   // import dynamically so the module can work in CoreEval environment
   const dspModule = await import('@agoric/deploy-script-support');
   const { makeHelpers } = dspModule;
   const { writeCoreEval } = await makeHelpers(homeP, endowments);
-  await writeCoreEval(fixSendAnywhere.name, defaultProposalBuilder);
+  await writeCoreEval(upgradeSendAnywhere.name, defaultProposalBuilder);
 };

package/scripts/testing/upgrade-vaultFactory.js

@@ -0,0 +1,26 @@
+import { makeHelpers } from '@agoric/deploy-script-support';
+
+/**
+ * @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-vaultFactory-proposal.js',
+    getManifestCall: [
+      'getManifestForVaultFactoryUpgrade',
+      {
+        contractRef: publishRef(
+          install('@agoric/inter-protocol/src/vaultFactory/vaultFactory.js'),
+        ),
+      },
+    ],
+  });
+
+/** @type {DeployScriptFunction} */
+export default async (homeP, endowments) => {
+  const { writeCoreEval } = await makeHelpers(homeP, endowments);
+  await writeCoreEval('upgrade-vaults', defaultProposalBuilder);
+};

package/scripts/vats/add-auction.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 }) => {
   return harden({
     sourceSpec: '@agoric/inter-protocol/src/proposals/add-auction.js',
@@ -24,7 +29,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('add-auction', defaultProposalBuilder);

package/scripts/vats/init-core.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/core/startWalletFactory.js',
@@ -25,7 +30,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-vats', defaultProposalBuilder);