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

package/package.json

@@ -1,36 +1,33 @@
 {
   "name": "@agoric/builders",
-  "version": "0.2.0",
+  "version": "0.2.1-upgrade-23-dev-bd79330.0.bd79330",
   "description": "Build scripts for proposals to an Agoric chain",
   "type": "module",
   "main": "./index.js",
   "repository": "https://github.com/Agoric/agoric-sdk",
   "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 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",
-    "prepack": "yarn run -T tsc --build tsconfig.build.json",
-    "postpack": "git clean -f '*.d.*ts*' '*.tsbuildinfo'",
     "test": "ava",
     "test:xs": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
     "lint": "yarn run -T run-s --continue-on-error 'lint:*'",
     "lint:types": "yarn run -T tsc",
-    "lint:eslint": "yarn run -T eslint ."
+    "lint:eslint": "node ../../scripts/eslint-repo.mjs ."
   },
   "keywords": [],
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/client-utils": "0.2.0",
-    "@agoric/ertp": "0.17.0",
-    "@agoric/internal": "0.4.0",
-    "@agoric/notifier": "0.7.0",
-    "@agoric/smart-wallet": "0.6.0",
-    "@agoric/vat-data": "0.6.0",
-    "@agoric/vats": "0.16.0",
-    "@agoric/zoe": "0.27.0",
+    "@agoric/client-utils": "0.2.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/ertp": "0.17.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/internal": "0.4.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/notifier": "0.7.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/smart-wallet": "0.6.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/vat-data": "0.6.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/vats": "0.16.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/zoe": "0.27.1-upgrade-23-dev-bd79330.0.bd79330",
     "@endo/bundle-source": "^4.1.2",
     "@endo/captp": "^4.4.8",
     "@endo/eventual-send": "^1.3.4",
@@ -44,16 +41,17 @@
     "import-meta-resolve": "^4.1.0"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.11.0",
-    "@agoric/governance": "0.11.0",
-    "@agoric/inter-protocol": "0.17.0",
-    "@agoric/orchestration": "0.2.0",
-    "@agoric/store": "0.10.0",
-    "@agoric/swing-store": "0.10.0",
-    "@agoric/swingset-liveslots": "0.11.0",
-    "@agoric/time": "0.4.0",
+    "@agoric/deploy-script-support": "0.11.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/governance": "0.11.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/inter-protocol": "0.17.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/orchestration": "0.2.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/store": "0.10.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/swing-store": "0.10.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/swingset-liveslots": "0.11.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/swingset-vat": "0.33.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/time": "0.4.1-upgrade-23-dev-bd79330.0.bd79330",
     "@endo/errors": "^1.2.13",
-    "ava": "^5.3.0",
+    "ava": "^6.4.1",
     "c8": "^10.1.3"
   },
   "files": [
@@ -61,9 +59,7 @@
     "src/",
     "scripts/",
     "tools/",
-    "*.json",
-    "globals.d.ts",
-    "exported.js"
+    "*.json"
   ],
   "publishConfig": {
     "access": "public"
@@ -78,11 +74,10 @@
     "require": [
       "@endo/init/debug.js"
     ],
-    "timeout": "20m",
-    "workerThreads": false
+    "timeout": "20m"
   },
   "typeCoverage": {
-    "atLeast": 89.94
+    "atLeast": 89.7
   },
-  "gitHead": "0922d0447ab8fae9d2d87415964403330b5ca313"
+  "gitHead": "bd79330f78dae2faf9cc3d8b10063567700da07b"
 }

package/scripts/inter-protocol/add-collateral-core.js

@@ -1,11 +1,20 @@
 /* eslint-env node */
 import { makeHelpers } from '@agoric/deploy-script-support';
 
+import { interProtocolBundleSpecs } from '@agoric/inter-protocol/source-spec-registry.js';
 import { getManifestForAddAssetToVault } from '@agoric/inter-protocol/src/proposals/addAssetToVault.js';
 import { getManifestForPsm } from '@agoric/inter-protocol/src/proposals/startPSM.js';
 import { makeInstallCache } from '@agoric/inter-protocol/src/proposals/utils.js';
+import { vatsSourceSpecRegistry } from '@agoric/vats/source-spec-registry.js';
+import { buildBundlePath } from '../lib/build-bundle.js';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {InterchainAssetOptions} from '@agoric/inter-protocol/src/proposals/addAssetToVault.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async (
   { publishRef, install: install0, wrapInstall },
   {
@@ -15,7 +24,7 @@ export const defaultProposalBuilder = async (
   } = {},
   { env = process.env } = {},
 ) => {
-  /** @type {import('@agoric/inter-protocol/src/proposals/addAssetToVault.js').InterchainAssetOptions} */
+  /** @type {InterchainAssetOptions} */
   const {
     issuerBoardId = env.INTERCHAIN_ISSUER_BOARD_ID,
     denom = env.INTERCHAIN_DENOM,
@@ -32,6 +41,11 @@ export const defaultProposalBuilder = async (
   }
 
   const install = wrapInstall ? wrapInstall(install0) : install0;
+  const scaledPriceAuthorityPath = await buildBundlePath(
+    import.meta.url,
+    '@agoric/zoe/src/contracts/scaledPriceAuthority.js',
+    'scaledPriceAuthority',
+  );
 
   return harden({
     sourceSpec: '@agoric/inter-protocol/src/proposals/addAssetToVault.js',
@@ -53,7 +67,7 @@ export const defaultProposalBuilder = async (
         scaledPriceAuthorityRef: publishRef(
           install(
             '@agoric/zoe/src/contracts/scaledPriceAuthority.js',
-            '../bundles/bundle-scaledPriceAuthority.js',
+            scaledPriceAuthorityPath,
             { persist: true },
           ),
         ),
@@ -62,7 +76,7 @@ export const defaultProposalBuilder = async (
   });
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/** @type {CoreEvalBuilder} */
 export const psmProposalBuilder = async (
   { publishRef, install: install0, wrapInstall },
   { anchorOptions = /** @type {object} */ ({}) } = {},
@@ -73,6 +87,10 @@ export const psmProposalBuilder = async (
   assert(denom, 'ANCHOR_DENOM is required');
 
   const install = wrapInstall ? wrapInstall(install0) : install0;
+  const psm = interProtocolBundleSpecs.psm;
+  const mintHolder = vatsSourceSpecRegistry.mintHolder;
+  const psmPath = await buildBundlePath(import.meta.url, psm);
+  const mintHolderPath = await buildBundlePath(import.meta.url, mintHolder);
 
   return harden({
     sourceSpec: '@agoric/inter-protocol/src/proposals/startPSM.js',
@@ -85,17 +103,9 @@ export const psmProposalBuilder = async (
           decimalPlaces,
         },
         installKeys: {
-          psm: publishRef(
-            install(
-              '@agoric/inter-protocol/src/psm/psm.js',
-              '../bundles/bundle-psm.js',
-            ),
-          ),
+          psm: publishRef(install(psm.packagePath, psmPath)),
           mintHolder: publishRef(
-            install(
-              '@agoric/vats/src/mintHolder.js',
-              '../../vats/bundles/bundle-mintHolder.js',
-            ),
+            install(mintHolder.packagePath, mintHolderPath),
           ),
         },
       },
@@ -103,7 +113,7 @@ export const psmProposalBuilder = async (
   });
 };
 
-/** @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/inter-protocol/init-core.js

@@ -5,7 +5,8 @@
  *   governance votes (n/a on sim-chain).
  */
 import { makeHelpers } from '@agoric/deploy-script-support';
-import { objectMap } from '@agoric/internal';
+import { governanceSourceSpecRegistry } from '@agoric/governance/source-spec-registry.js';
+import { interProtocolBundleSpecs } from '@agoric/inter-protocol/source-spec-registry.js';
 
 import {
   getManifestForInterProtocol,
@@ -13,45 +14,67 @@ import {
   getManifestForMain,
 } from '@agoric/inter-protocol/src/proposals/core-proposal.js';
 import { makeInstallCache } from '@agoric/inter-protocol/src/proposals/utils.js';
+import { buildBundlePath } from '../lib/build-bundle.js';
+
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
 
 // TODO end inter-package filesystem references https://github.com/Agoric/agoric-sdk/issues/8178
 
-/** @type {Record<string, Record<string, [string, string]>>} */
+/**
+ * @typedef {{
+ *   sourceSpec?: string;
+ *   packagePath?: string;
+ *   bundleName?: string;
+ * }} BundleRegistryEntry
+ */
+
+/** @type {Record<string, Record<string, BundleRegistryEntry>>} */
 const installKeyGroups = {
   econCommittee: {
-    contractGovernor: [
-      '@agoric/governance/src/contractGovernor.js',
-      '../../governance/bundles/bundle-contractGovernor.js',
-    ],
-    committee: [
-      '@agoric/governance/src/committee.js',
-      '../../governance/bundles/bundle-committee.js',
-    ],
-    binaryVoteCounter: [
-      '@agoric/governance/src/binaryVoteCounter.js',
-      '../../governance/bundles/bundle-binaryVoteCounter.js',
-    ],
+    contractGovernor: governanceSourceSpecRegistry.contractGovernor,
+    committee: governanceSourceSpecRegistry.committee,
+    binaryVoteCounter: governanceSourceSpecRegistry.binaryVoteCounter,
   },
   main: {
-    auctioneer: [
-      '@agoric/inter-protocol/src/auction/auctioneer.js',
-      '../../inter-protocol/bundles/bundle-auctioneer.js',
-    ],
-    vaultFactory: [
-      '@agoric/inter-protocol/src/vaultFactory/vaultFactory.js',
-      '../../inter-protocol/bundles/bundle-vaultFactory.js',
-    ],
-    feeDistributor: [
-      '@agoric/inter-protocol/src/feeDistributor.js',
-      '../../inter-protocol/bundles/bundle-feeDistributor.js',
-    ],
-    reserve: [
-      '@agoric/inter-protocol/src/reserve/assetReserve.js',
-      '../../inter-protocol/bundles/bundle-reserve.js',
-    ],
+    vaultFactory: interProtocolBundleSpecs.vaultFactory,
+    feeDistributor: interProtocolBundleSpecs.feeDistributor,
+    reserve: interProtocolBundleSpecs.reserve,
   },
 };
 
+/**
+ * @template I
+ * @template R
+ * @param {object} opts
+ * @param {(i: I) => R} opts.publishRef
+ * @param {(m: string, b: string, opts?: any) => I} opts.install
+ * @param {Record<string, BundleRegistryEntry>} opts.group
+ * @param {boolean} [opts.persist]
+ */
+const publishInstallGroup = async ({ publishRef, install, group, persist }) =>
+  Object.fromEntries(
+    // eslint-disable-next-line @jessie.js/safe-await-separator
+    await Promise.all(
+      Object.entries(group).map(async ([key, entry]) => {
+        const bundlePath = await buildBundlePath(import.meta.url, entry);
+        assert(entry.packagePath, `${key} missing packagePath`);
+        return [
+          key,
+          publishRef(
+            install(
+              entry.packagePath,
+              bundlePath,
+              persist === undefined ? undefined : { persist },
+            ),
+          ),
+        ];
+      }),
+    ),
+  );
+
 /**
  * @template I
  * @template R
@@ -67,12 +90,12 @@ export const committeeProposalBuilder = async (
   { econCommitteeOptions } = {},
 ) => {
   const install = wrapInstall ? wrapInstall(install0) : install0;
-
-  /** @param {Record<string, [string, string]>} group */
-  const publishGroup = group =>
-    objectMap(group, ([mod, bundle]) =>
-      publishRef(install(mod, bundle, { persist: true })),
-    );
+  const econCommitteeInstallKeys = await publishInstallGroup({
+    publishRef,
+    install,
+    group: installKeyGroups.econCommittee,
+    persist: true,
+  });
   return harden({
     sourceSpec: '@agoric/inter-protocol/src/proposals/core-proposal.js',
     getManifestCall: [
@@ -80,7 +103,7 @@ export const committeeProposalBuilder = async (
       {
         econCommitteeOptions,
         installKeys: {
-          ...publishGroup(installKeyGroups.econCommittee),
+          ...econCommitteeInstallKeys,
         },
       },
     ],
@@ -103,13 +126,12 @@ export const mainProposalBuilder = async ({
   const { VAULT_FACTORY_CONTROLLER_ADDR } = process.env;
 
   const install = wrapInstall ? wrapInstall(install0) : install0;
-
-  const persist = true;
-  /** @param {Record<string, [string, string]>} group */
-  const publishGroup = group =>
-    objectMap(group, ([mod, bundle]) =>
-      publishRef(install(mod, bundle, { persist })),
-    );
+  const mainInstallKeys = await publishInstallGroup({
+    publishRef,
+    install,
+    group: installKeyGroups.main,
+    persist: true,
+  });
   return harden({
     sourceSpec: '@agoric/inter-protocol/src/proposals/core-proposal.js',
     getManifestCall: [
@@ -117,7 +139,7 @@ export const mainProposalBuilder = async ({
       {
         vaultFactoryControllerAddress: VAULT_FACTORY_CONTROLLER_ADDR,
         installKeys: {
-          ...publishGroup(installKeyGroups.main),
+          ...mainInstallKeys,
         },
       },
     ],
@@ -125,7 +147,7 @@ export const mainProposalBuilder = async ({
 };
 
 // Build proposal for sim-chain etc.
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async (
   { publishRef, install },
   options = {},
@@ -149,10 +171,6 @@ export const defaultProposalBuilder = async (
     } = {},
   } = options;
 
-  /** @param {Record<string, [string, string]>} group */
-  const publishGroup = group =>
-    objectMap(group, ([mod, bundle]) => publishRef(install(mod, bundle)));
-
   const anchorOptions = anchorDenom && {
     denom: anchorDenom,
     decimalPlaces: parseInt(anchorDecimalPlaces, 10),
@@ -164,6 +182,16 @@ export const defaultProposalBuilder = async (
   const econCommitteeOptions = {
     committeeSize: parseInt(econCommitteeSize, 10),
   };
+  const econCommitteeInstallKeys = await publishInstallGroup({
+    publishRef,
+    install,
+    group: installKeyGroups.econCommittee,
+  });
+  const mainInstallKeys = await publishInstallGroup({
+    publishRef,
+    install,
+    group: installKeyGroups.main,
+  });
 
   return harden({
     sourceSpec: '@agoric/inter-protocol/src/proposals/core-proposal.js',
@@ -176,15 +204,15 @@ export const defaultProposalBuilder = async (
         anchorOptions,
         econCommitteeOptions,
         installKeys: {
-          ...publishGroup(installKeyGroups.econCommittee),
-          ...publishGroup(installKeyGroups.main),
+          ...econCommitteeInstallKeys,
+          ...mainInstallKeys,
         },
       },
     ],
   });
 };
 
-/** @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/inter-protocol/invite-committee-core.js

@@ -2,9 +2,16 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 
 import { getManifestForInviteCommittee } from '@agoric/inter-protocol/src/proposals/committee-proposal.js';
+import { interProtocolBundleSpecs } from '@agoric/inter-protocol/source-spec-registry.js';
+import { buildBundlePath } from '../lib/build-bundle.js';
+
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
 
 // Build proposal for sim-chain etc.
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async (
   { publishRef, install },
   options = {},
@@ -16,6 +23,12 @@ export const defaultProposalBuilder = async (
 
   assert(voterAddresses, 'ECON_COMMITTEE_ADDRESSES is required');
 
+  const econCommitteeCharter = interProtocolBundleSpecs.econCommitteeCharter;
+  const econCommitteeCharterPath = await buildBundlePath(
+    import.meta.url,
+    econCommitteeCharter,
+  );
+
   return harden({
     sourceSpec: '@agoric/inter-protocol/src/proposals/committee-proposal.js',
     getManifestCall: [
@@ -23,20 +36,16 @@ export const defaultProposalBuilder = async (
       {
         voterAddresses,
         econCommitteeCharterRef: publishRef(
-          install(
-            '@agoric/inter-protocol/src/econCommitteeCharter.js',
-            '../bundles/bundle-econCommitteeCharter.js',
-            {
-              persist: true,
-            },
-          ),
+          install(econCommitteeCharter.packagePath, econCommitteeCharterPath, {
+            persist: true,
+          }),
         ),
       },
     ],
   });
 };
 
-/** @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-invite-committee', defaultProposalBuilder);

package/scripts/inter-protocol/manual-price-feed.js

@@ -2,7 +2,11 @@ import { E } from '@endo/far';
 import { deeplyFulfilled } from '@endo/marshal';
 import { makeNotifierFromAsyncIterable } from '@agoric/notifier';
 
-import process from 'process';
+import process from 'node:process';
+
+/**
+ * @import {Board} from '@agoric/vats';
+ */
 
 /**
  * After extracting the oracleAdmins to entries in home.scratch, you can use one
@@ -22,7 +26,7 @@ import process from 'process';
  *     E(qn).getUpdateSince()
  *
  * @typedef {{
- *   board: import('@agoric/vats').Board;
+ *   board: Board;
  *   chainTimerService;
  *   scratch;
  *   zoe;

package/scripts/inter-protocol/price-feed-core.js

@@ -1,5 +1,11 @@
 /* eslint-env node */
 import { makeHelpers } from '@agoric/deploy-script-support';
+import { interProtocolBundleSpecs } from '@agoric/inter-protocol/source-spec-registry.js';
+import { buildBundlePath } from '../lib/build-bundle.js';
+
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
 
 export const DEFAULT_CONTRACT_TERMS = {
   POLL_INTERVAL: 30n,
@@ -11,7 +17,7 @@ export const DEFAULT_CONTRACT_TERMS = {
   maxSubmissionValue: 2n ** 256n,
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async (
   { publishRef, install },
   options = {},
@@ -41,6 +47,12 @@ export const defaultProposalBuilder = async (
     assert(OUT_BRAND_NAME);
   }
 
+  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: [
@@ -57,10 +69,7 @@ export const defaultProposalBuilder = async (
         brandInRef: brandIn && publishRef(brandIn),
         brandOutRef: brandOut && publishRef(brandOut),
         priceAggregatorRef: publishRef(
-          install(
-            '@agoric/inter-protocol/src/price/fluxAggregatorContract.js',
-            '../bundles/bundle-fluxAggregatorKit.js',
-          ),
+          install(priceAggregator.packagePath, priceAggregatorPath),
         ),
       },
     ],

package/scripts/inter-protocol/replace-electorate-core.js

@@ -14,9 +14,17 @@
  *     agoric run replace-electorate-core.js MAINNET
  */
 import { makeHelpers } from '@agoric/deploy-script-support';
+import { governanceSourceSpecRegistry } from '@agoric/governance/source-spec-registry.js';
 import { getManifestForReplaceAllElectorates } from '@agoric/inter-protocol/src/proposals/replaceElectorate.js';
+import { buildBundlePath } from '../lib/build-bundle.js';
 
-/** @typedef {Parameters<typeof import('@agoric/inter-protocol/src/proposals/replaceElectorate.js').replaceAllElectorates>[1]['options']} ReplaceElectorateOptions */
+/**
+ * @import {replaceAllElectorates} from '@agoric/inter-protocol/src/proposals/replaceElectorate.js';
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @typedef {Parameters<typeof replaceAllElectorates>[1]['options']} ReplaceElectorateOptions */
 
 /** @type {Record<string, ReplaceElectorateOptions>} */
 const configurations = {
@@ -93,7 +101,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) {
@@ -102,6 +110,11 @@ export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
     throw Error(error);
   }
   const { committeeName, voterAddresses, highPrioritySendersConfig } = config;
+  const committee = governanceSourceSpecRegistry.committee;
+  const economicCommitteePath = await buildBundlePath(
+    import.meta.url,
+    committee,
+  );
   console.log(
     'Generating replace committee proposal with config',
     JSON.stringify({
@@ -119,10 +132,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
         voterAddresses,
         highPrioritySendersConfig,
         economicCommitteeRef: publishRef(
-          install(
-            '@agoric/governance/src/committee.js',
-            '../bundles/bundle-committee.js',
-          ),
+          install(committee.packagePath, economicCommitteePath),
         ),
       },
     ],
@@ -131,7 +141,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
 
 const Usage = `agoric run replace-electorate-core.js ${[...knownVariants, '<json-config>'].join(' | ')}`;
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { scriptArgs } = endowments;
   const variantOrConfig = scriptArgs?.[0];

package/scripts/inter-protocol/replace-feeDistributor-combo.js

@@ -2,6 +2,11 @@ import { parseScriptArgs, makeHelpers } from '@agoric/deploy-script-support';
 import { getManifestForReplaceFeeDistributor } from '@agoric/inter-protocol/src/proposals/replace-fee-distributor.js';
 import { SECONDS_PER_HOUR } from '@agoric/inter-protocol/src/proposals/econ-behaviors.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: {
     params: {
@@ -44,7 +49,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];
   console.log('feeDist OPTS', opts, config);
@@ -70,7 +75,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 name = 'replace-feeDistributor-combo';
   const opts = parseScriptArgs(endowments, name, knownVariants);

package/scripts/inter-protocol/replace-feeDistributor.js

@@ -2,7 +2,12 @@ import { makeHelpers } from '@agoric/deploy-script-support';
 import { getManifestForReplaceFeeDistributor } from '@agoric/inter-protocol/src/proposals/replace-fee-distributor.js';
 import { SECONDS_PER_HOUR } from '@agoric/inter-protocol/src/proposals/econ-behaviors.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 }, opts) => {
   console.log('feeDist OPTS', opts);
   return harden({
@@ -20,7 +25,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 { writeCoreEval } = await makeHelpers(homeP, endowments);