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

package/scripts/inter-protocol/updatePriceFeeds.js

@@ -1,7 +1,13 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
+import { interProtocolBundleSpecs } from '@agoric/inter-protocol/source-spec-registry.js';
 import { getManifestForPriceFeeds } from '@agoric/inter-protocol/src/proposals/deploy-price-feeds.js';
+import { buildBundlePath } from '../lib/build-bundle.js';
 
-/** @import {PriceFeedConfig} from '@agoric/inter-protocol/src/proposals/deploy-price-feeds.js'; */
+/**
+ * @import {PriceFeedConfig} from '@agoric/inter-protocol/src/proposals/deploy-price-feeds.js';
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
 
 /** @type {Record<string, PriceFeedConfig>} */
 const configurations = {
@@ -56,7 +62,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) {
@@ -65,6 +71,16 @@ export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
     throw Error(error);
   }
   const { oracleAddresses, inBrandNames, contractTerms } = config;
+  const priceAggregator = interProtocolBundleSpecs.priceAggregator;
+  const priceAggregatorPath = await buildBundlePath(
+    import.meta.url,
+    priceAggregator,
+  );
+  const scaledPriceAuthorityPath = await buildBundlePath(
+    import.meta.url,
+    '@agoric/zoe/src/contracts/scaledPriceAuthority.js',
+    'scaledPriceAuthority',
+  );
   console.log(
     'Generating price feeds update proposal with config',
     JSON.stringify({ oracleAddresses, inBrandNames, contractTerms }),
@@ -78,15 +94,12 @@ export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
         inBrandNames,
         contractTerms,
         priceAggregatorRef: publishRef(
-          install(
-            '@agoric/inter-protocol/src/price/fluxAggregatorContract.js',
-            '../bundles/bundle-fluxAggregatorKit.js',
-          ),
+          install(priceAggregator.packagePath, priceAggregatorPath),
         ),
         scaledPARef: publishRef(
           install(
             '@agoric/zoe/src/contracts/scaledPriceAuthority.js',
-            '../bundles/bundle-scaledPriceAuthority.js',
+            scaledPriceAuthorityPath,
           ),
         ),
       },
@@ -96,7 +109,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
 
 const Usage = `agoric run updatePriceFeeds.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/withdraw-reserve.build.js

@@ -4,6 +4,11 @@ import { isNat } from '@endo/nat';
 import { makeHelpers } from '@agoric/deploy-script-support';
 import { getManifestForInviteWithdrawer } from '@agoric/inter-protocol/src/proposals/withdraw-reserve-proposal.js';
 
+/**
+ * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
 /**
  * @template {{ type: string }} T
  * @typedef { T['type'] extends 'string' ? string : T['type'] extends 'boolean' ? boolean : (string | boolean) } TypeFromParseArgsOptionDescriptor
@@ -29,7 +34,7 @@ const cliOptions = /** @type {const} */ ({
   count: { type: 'string', multiple: false },
 });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async (
   { publishRef: _publishRef, install: _install },
   namedArgs = {},
@@ -48,7 +53,7 @@ export const defaultProposalBuilder = async (
   });
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { scriptArgs: argv } = endowments;
   /** @type {{ values: Partial<CliOptions<typeof cliOptions>> }} */

package/scripts/inter-protocol/withdraw-vbank-reserve-permit.json

@@ -0,0 +1,6 @@
+{
+  "consume": {
+    "agoricNames": "lookupBrands",
+    "bankManager": "getBankForAddress"
+  }
+}

package/scripts/inter-protocol/withdraw-vbank-reserve.js

@@ -0,0 +1,72 @@
+/* global E */
+/// <reference types="@agoric/vats/src/core/core-eval-env.js" />
+// @ts-check
+
+/**
+ * @import {ChainBootstrapSpace} from '@agoric/vats/src/core/types.js';
+ * @import {BootstrapPowers} from '@agoric/vats/src/core/types.js';
+ */
+
+// FIXME: we need to hardcode these values because the vbank reserve purse
+// balance is not synced.
+const DEFAULT_BLD_VALUE = 1_998n;
+const DEFAULT_IST_VALUE = 202_020n;
+
+const vbankReserveAddress = 'agoric1ae0lmtzlgrcnla9xjkpaarq5d5dfez63h3nucl';
+const beneficiaryAddress = 'agoric18lfz3w97u72p4jq58gdn05ftdcv9rwz0ft5l2m';
+
+/** @param {ChainBootstrapSpace & BootstrapPowers} powers */
+const coreEval = async powers => {
+  console.warn('Core eval to transfer vbank/reserve to a beneficiary');
+  const {
+    consume: { agoricNames, bankManager },
+  } = powers;
+
+  console.warn('Looking up brands');
+  const BLD = await E(agoricNames).lookup('brand', 'BLD');
+  const IST = await E(agoricNames).lookup('brand', 'IST');
+
+  console.warn('Getting banks');
+  const reserveBank =
+    await E(bankManager).getBankForAddress(vbankReserveAddress);
+  const beneficiaryBank =
+    await E(bankManager).getBankForAddress(beneficiaryAddress);
+
+  console.warn('Getting reserve purses');
+  const reserveBLDPurse = await E(reserveBank).getPurse(BLD);
+  const reserveISTPurse = await E(reserveBank).getPurse(IST);
+
+  console.warn('Getting reserve balances');
+  const BLDAmount = await E(reserveBLDPurse).getCurrentAmount();
+  const reserveBLDBalance = harden({
+    ...BLDAmount,
+    value: BLDAmount.value || DEFAULT_BLD_VALUE,
+  });
+  const ISTAmount = await E(reserveISTPurse).getCurrentAmount();
+  const reserveISTBalance = harden({
+    ...ISTAmount,
+    value: ISTAmount.value || DEFAULT_IST_VALUE,
+  });
+  console.warn('reserve BLD balance', reserveBLDBalance);
+  console.warn('reserve IST balance', reserveISTBalance);
+
+  console.warn('Getting beneficiary purses');
+  const beneficiaryBLDPurse = await E(beneficiaryBank).getPurse(BLD);
+  const beneficiaryISTPurse = await E(beneficiaryBank).getPurse(IST);
+
+  console.warn('Withdrawing from reserve purses');
+  const BLDPayment = await E(reserveBLDPurse).withdraw(reserveBLDBalance);
+  const ISTPayment = await E(reserveISTPurse).withdraw(reserveISTBalance);
+
+  console.warn('Depositing into beneficiary purses');
+  const BLDTransferAmount = await E(beneficiaryBLDPurse).deposit(BLDPayment);
+  const ISTTransferAmount = await E(beneficiaryISTPurse).deposit(ISTPayment);
+
+  console.warn(
+    'Done withdrawing reserve!',
+    BLDTransferAmount,
+    ISTTransferAmount,
+  );
+};
+
+coreEval;

package/scripts/lib/build-bundle.js

@@ -0,0 +1,92 @@
+/* eslint-env node */
+import { dirname, resolve as pathResolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+import {
+  sharedBundleCachePath,
+  unsafeMakeBundleCache,
+} from '@agoric/swingset-vat/tools/bundleTool.js';
+
+/** @type {Map<string, Promise<Awaited<ReturnType<typeof unsafeMakeBundleCache>>>>} */
+const bundleCaches = new Map();
+/** @type {Map<string, Promise<string>>} */
+const bundlePathCache = new Map();
+
+/**
+ * @typedef {{
+ *   sourceSpec?: string;
+ *   packagePath?: string;
+ *   bundleName?: string;
+ * }} BundleRegistryEntry
+ */
+
+/**
+ * Build (or validate) a cached bundle and return the absolute pathname.
+ *
+ * @param {string} fromMetaUrl
+ * @param {string | BundleRegistryEntry} moduleSpecifierOrEntry
+ * @param {string} [bundleName]
+ * @param {{ bundleDirRel?: string }} [options]
+ */
+export const buildBundlePath = async (
+  fromMetaUrl,
+  moduleSpecifierOrEntry,
+  bundleName = undefined,
+  options = {},
+) => {
+  const { bundleDirRel } = options;
+  const fromDir = dirname(fileURLToPath(fromMetaUrl));
+  /** @type {string | undefined} */
+  let sourceSpec;
+  /** @type {string | undefined} */
+  let resolvedBundleName;
+
+  if (typeof moduleSpecifierOrEntry === 'string') {
+    sourceSpec = fileURLToPath(import.meta.resolve(moduleSpecifierOrEntry));
+    if (typeof bundleName !== 'string') {
+      throw TypeError('bundleName is required when using a module specifier');
+    }
+    resolvedBundleName = bundleName;
+  } else {
+    const {
+      sourceSpec: sourceSpec0,
+      packagePath,
+      bundleName: entryBundleName,
+    } = /** @type {BundleRegistryEntry} */ (moduleSpecifierOrEntry);
+    sourceSpec =
+      sourceSpec0 ||
+      (packagePath && fileURLToPath(import.meta.resolve(packagePath)));
+    resolvedBundleName = entryBundleName;
+  }
+  if (!sourceSpec || !resolvedBundleName) {
+    throw TypeError(
+      'registry entry must provide sourceSpec/packagePath and bundleName',
+    );
+  }
+
+  const bundleDir = bundleDirRel
+    ? pathResolve(fromDir, bundleDirRel)
+    : sharedBundleCachePath;
+  // Use '\0' to avoid ambiguity between key components.
+  const cacheKey = [bundleDir, sourceSpec, resolvedBundleName].join('\0');
+  const cached = bundlePathCache.get(cacheKey);
+  if (cached) {
+    return cached;
+  }
+
+  const bundlePathP = (async () => {
+    if (!bundleCaches.has(bundleDir)) {
+      bundleCaches.set(bundleDir, unsafeMakeBundleCache(bundleDir));
+    }
+    const bundleCacheP = bundleCaches.get(bundleDir);
+    assert(bundleCacheP, `missing bundle cache for ${bundleDir}`);
+    const bundleCache = await bundleCacheP;
+    const { bundleFileName } = await bundleCache.validateOrAdd(
+      sourceSpec,
+      resolvedBundleName,
+    );
+    return pathResolve(bundleDir, bundleFileName);
+  })();
+  bundlePathCache.set(cacheKey, bundlePathP);
+  return bundlePathP;
+};

package/scripts/orchestration/axelar-gmp.build.js

@@ -12,6 +12,8 @@ import { getChainConfig } from './get-chain-config.js';
 
 /**
  * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {ParseArgsConfig} from 'node:util';
  */
 
 /** @type {CoreEvalBuilder} */
@@ -32,11 +34,11 @@ export const defaultProposalBuilder = async (
     ],
   });
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { scriptArgs } = endowments;
 
-  /** @type {import('node:util').ParseArgsConfig['options']} */
+  /** @type {ParseArgsConfig['options']} */
   const options = {
     net: {
       type: 'string',

package/scripts/orchestration/hook-localchain-msg-send.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 }) => {
   const vatNameToEntrypoint = {
     localchain: '@agoric/vats/src/vat-localchain.js',
@@ -23,7 +28,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('hook-localchain', defaultProposalBuilder);

package/scripts/orchestration/init-basic-flows.js

@@ -2,7 +2,12 @@ import { makeHelpers } from '@agoric/deploy-script-support';
 import { startBasicFlows } from '@agoric/orchestration/src/proposals/start-basic-flows.js';
 import { parseChainHubOpts } from './helpers.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 },
   options,
@@ -25,7 +30,7 @@ export const defaultProposalBuilder = async (
   });
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { scriptArgs } = endowments;
   const opts = parseChainHubOpts(scriptArgs);

package/scripts/orchestration/init-stakeAtom.js

@@ -1,7 +1,12 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 import { parseChainHubOpts } from './helpers.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 },
   options,
@@ -22,7 +27,7 @@ export const defaultProposalBuilder = async (
   });
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { scriptArgs } = endowments;
   const opts = parseChainHubOpts(scriptArgs);

package/scripts/orchestration/init-stakeBld.js

@@ -1,7 +1,12 @@
 // @ts-check
 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/start-stakeBld.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('start-stakeBld', defaultProposalBuilder);

package/scripts/orchestration/init-stakeOsmo.js

@@ -1,7 +1,12 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 import { parseChainHubOpts } from './helpers.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 },
   options,
@@ -22,7 +27,7 @@ export const defaultProposalBuilder = async (
   });
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { scriptArgs } = endowments;
   const opts = parseChainHubOpts(scriptArgs);

package/scripts/orchestration/write-chain-info.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/orchestration/src/proposals/init-chain-info.js',
     getManifestCall: ['getManifestForChainInfo'],
   });
 
-/** @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/pegasus/init-core.js

@@ -1,23 +1,32 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
+import { buildBundlePath } from '../lib/build-bundle.js';
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
-export const defaultProposalBuilder = async ({ publishRef, install }) =>
-  harden({
+/**
+ * @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 }) => {
+  const pegasusPath = await buildBundlePath(
+    import.meta.url,
+    '@agoric/pegasus/src/contract.js',
+    'pegasus',
+  );
+  return harden({
     sourceSpec: '@agoric/pegasus/src/proposals/core-proposal.js',
     getManifestCall: [
       'getManifestForPegasus',
       {
         pegasusRef: publishRef(
-          install(
-            '@agoric/pegasus/src/contract.js',
-            '../bundles/bundle-pegasus.js',
-          ),
+          install('@agoric/pegasus/src/contract.js', pegasusPath),
         ),
       },
     ],
   });
+};
 
-/** @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-pegasus', defaultProposalBuilder);

package/scripts/smart-wallet/build-game1-start.js

@@ -6,20 +6,33 @@
  */
 
 import { makeHelpers } from '@agoric/deploy-script-support';
-import { getManifestForGame1 } from '@agoric/smart-wallet/test/start-game1-proposal.js';
+import { getManifestForGame1 } from '@agoric/smart-wallet/tools/fixtures/start-game1-proposal.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 {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
 const game1ProposalBuilder = async ({ publishRef, install }) => {
+  const game1Path = await buildBundlePath(
+    import.meta.url,
+    '@agoric/smart-wallet/tools/fixtures/gameAssetContract.js',
+    'game1',
+  );
   return harden({
-    sourceSpec: '@agoric/smart-wallet/test/start-game1-proposal.js',
+    sourceSpec: '@agoric/smart-wallet/tools/fixtures/start-game1-proposal.js',
     getManifestCall: [
       getManifestForGame1.name,
       {
         game1Ref: publishRef(
           install(
-            '@agoric/smart-wallet/test/gameAssetContract.js',
-            '../bundles/bundle-game1.js',
-            { persist: true },
+            '@agoric/smart-wallet/tools/fixtures/gameAssetContract.js',
+            game1Path,
+            {
+              persist: true,
+            },
           ),
         ),
       },
@@ -27,7 +40,7 @@ const game1ProposalBuilder = 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('start-game1', game1ProposalBuilder);

package/scripts/smart-wallet/build-wallet-factory2-upgrade.js

@@ -1,5 +1,10 @@
 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';
+ */
+
 /**
  * @file
  *   `agoric run scripts/smart-wallet/build-wallet-factory2-upgrade.js`
@@ -7,7 +12,7 @@ import { makeHelpers } from '@agoric/deploy-script-support';
  * also prints helpful instructions for copying the files and installing them.
  */
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').CoreEvalBuilder} */
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }) =>
   harden({
     sourceSpec:
@@ -22,7 +27,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-wallet-factory', defaultProposalBuilder);

package/scripts/smart-wallet/build-walletFactory-upgrade.js

@@ -6,10 +6,22 @@
  */
 
 import { makeHelpers } from '@agoric/deploy-script-support';
+import { smartWalletSourceSpecRegistry } from '@agoric/smart-wallet/source-spec-registry.js';
 import { getManifestForUpgrade } from '@agoric/smart-wallet/src/proposals/upgrade-walletFactory-proposal.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 {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ */
+
+/** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }) => {
+  const walletFactory = smartWalletSourceSpecRegistry.walletFactory;
+  const walletFactoryPath = await buildBundlePath(
+    import.meta.url,
+    walletFactory,
+  );
   return harden({
     sourceSpec:
       '@agoric/smart-wallet/src/proposals/upgrade-walletFactory-proposal.js',
@@ -17,18 +29,16 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
       getManifestForUpgrade.name,
       {
         walletFactoryRef: publishRef(
-          install(
-            '@agoric/smart-wallet/src/walletFactory.js',
-            '../bundles/bundle-walletFactory.js',
-            { persist: true },
-          ),
+          install(walletFactory.packagePath, walletFactoryPath, {
+            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('upgrade-walletFactory', defaultProposalBuilder);

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

@@ -1,7 +1,13 @@
 /// <reference types="ses" />
 import { makeHelpers } from '@agoric/deploy-script-support';
 
-/** @type {Record<string, import('@agoric/orchestration').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 = {
   hot: {
     bech32Prefix: 'cosmos',
@@ -31,7 +37,7 @@ const chainInfo = {
   },
 };
 
-/** @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',
@@ -43,7 +49,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/init-auto-stake-it.js

@@ -8,7 +8,12 @@ import { makeHelpers } from '@agoric/deploy-script-support';
 import { startAutoStakeIt } from '@agoric/orchestration/src/proposals/start-auto-stake-it.js';
 import { parseChainHubOpts } from '../orchestration/helpers.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 },
   options,
@@ -31,7 +36,7 @@ export const defaultProposalBuilder = async (
   });
 };
 
-/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').DeployScriptFunction} */
+/** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {
   const { scriptArgs } = endowments;
   const opts = parseChainHubOpts(scriptArgs);