agoric 0.22.0-u18.5 → 0.22.0-u18.6

package/src/commands/psm.js

@@ -1,12 +1,19 @@
 // @ts-check
 /* eslint-disable func-names */
 /* eslint-env node */
-import { Command } from 'commander';
+import {
+  fetchEnvNetworkConfig,
+  makeAgoricNames,
+  makeVstorageKit,
+  storageHelper,
+} from '@agoric/client-utils';
 import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
+import { Command } from 'commander';
 import { asPercent } from '../lib/format.js';
-import { makeRpcUtils, storageHelper } from '../lib/rpc.js';
 import { outputExecuteOfferAction } from '../lib/wallet.js';
 
+const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
+
 // Adapted from https://gist.github.com/dckc/8b5b2f16395cb4d7f2ff340e0bc6b610#file-psm-tool
 
 /**
@@ -60,13 +67,14 @@ export const makePsmCommand = logger => {
   );
 
   const rpcTools = async () => {
-    const utils = await makeRpcUtils({ fetch });
+    const vsk = await makeVstorageKit({ fetch }, networkConfig);
+    const agoricNames = await makeAgoricNames(vsk.fromBoard, vsk.vstorage);
 
     const lookupPsmInstance = ([minted, anchor]) => {
       const name = `psm-${minted}-${anchor}`;
-      const instance = utils.agoricNames.instance[name];
+      const instance = agoricNames.instance[name];
       if (!instance) {
-        logger.debug('known instances:', utils.agoricNames.instance);
+        logger.debug('known instances:', agoricNames.instance);
         throw Error(`Unknown instance ${name}`);
       }
       return instance;
@@ -77,20 +85,19 @@ export const makePsmCommand = logger => {
      * @param {[Minted: string, Anchor: string]} pair
      */
     const getGovernanceState = async ([Minted, Anchor]) => {
-      const govContent = await utils.vstorage.readLatest(
+      const govContent = await vsk.vstorage.readLatest(
         `published.psm.${Minted}.${Anchor}.governance`,
       );
       assert(govContent, 'no gov content');
       const { current: governance } = last(
-        storageHelper.unserializeTxt(govContent, utils.fromBoard),
+        storageHelper.unserializeTxt(govContent, vsk.fromBoard),
       );
-      const { [`psm.${Minted}.${Anchor}`]: instance } =
-        utils.agoricNames.instance;
+      const { [`psm.${Minted}.${Anchor}`]: instance } = agoricNames.instance;
 
       return { instance, governance };
     };
 
-    return { ...utils, lookupPsmInstance, getGovernanceState };
+    return { ...vsk, agoricNames, lookupPsmInstance, getGovernanceState };
   };
 
   psm

package/src/commands/reserve.js

@@ -1,11 +1,17 @@
 // @ts-check
 /* eslint-disable func-names */
 /* eslint-env node */
+import {
+  fetchEnvNetworkConfig,
+  makeAgoricNames,
+  makeVstorageKit,
+} from '@agoric/client-utils';
 import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
 import { Command } from 'commander';
-import { makeRpcUtils } from '../lib/rpc.js';
 import { outputActionAndHint } from '../lib/wallet.js';
 
+const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
+
 /**
  * @param {import('anylogger').Logger} _logger
  * @param {*} io
@@ -29,7 +35,8 @@ export const makeReserveCommand = (_logger, io = {}) => {
        * }} opts
        */
       async ({ collateralBrand, ...opts }) => {
-        const { agoricNames } = await makeRpcUtils({ fetch });
+        const vsk = makeVstorageKit({ fetch }, networkConfig);
+        const agoricNames = await makeAgoricNames(vsk.fromBoard, vsk.vstorage);
 
         const offer = Offers.reserve.AddCollateral(agoricNames, {
           collateralBrandKey: collateralBrand,
@@ -63,7 +70,8 @@ export const makeReserveCommand = (_logger, io = {}) => {
       1,
     )
     .action(async function (opts) {
-      const { agoricNames } = await makeRpcUtils({ fetch });
+      const vsk = makeVstorageKit({ fetch }, networkConfig);
+      const agoricNames = await makeAgoricNames(vsk.fromBoard, vsk.vstorage);
 
       const reserveInstance = agoricNames.instance.reserve;
       assert(reserveInstance, 'missing reserve in names');

package/src/commands/test-upgrade.js

@@ -1,11 +1,11 @@
 // @ts-check
 /* eslint-env node */
+import { fetchEnvNetworkConfig, makeWalletUtils } from '@agoric/client-utils';
 import { Fail } from '@endo/errors';
 import { CommanderError } from 'commander';
 import { normalizeAddressWithOptions } from '../lib/chain.js';
 import { bigintReplacer } from '../lib/format.js';
-import { getNetworkConfig } from '../lib/rpc.js';
-import { makeWalletUtils, sendAction } from '../lib/wallet.js';
+import { sendAction } from '../lib/wallet.js';
 
 /**
  * Make commands for testing.
@@ -38,8 +38,8 @@ export const makeTestCommand = (
     try {
       // XXX pass fetch to getNetworkConfig() explicitly
       // await null above makes this await safe
-      const networkConfig = await getNetworkConfig(env);
-      return makeWalletUtils({ fetch, execFileSync, delay }, networkConfig);
+      const networkConfig = await fetchEnvNetworkConfig({ env, fetch });
+      return makeWalletUtils({ fetch, delay }, networkConfig);
     } catch (err) {
       // CommanderError is a class constructor, and so
       // must be invoked with `new`.

package/src/commands/vaults.js

@@ -1,15 +1,21 @@
 // @ts-check
 /* eslint-disable func-names */
 /* eslint-env node */
-import { Command } from 'commander';
+import {
+  fetchEnvNetworkConfig,
+  makeAgoricNames,
+  makeVstorageKit,
+} from '@agoric/client-utils';
 import {
   lookupOfferIdForVault,
   Offers,
 } from '@agoric/inter-protocol/src/clientSupport.js';
+import { Command } from 'commander';
 import { normalizeAddressWithOptions } from '../lib/chain.js';
-import { makeRpcUtils } from '../lib/rpc.js';
 import { getCurrent, outputExecuteOfferAction } from '../lib/wallet.js';
 
+const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
+
 /**
  * @param {import('anylogger').Logger} logger
  */
@@ -36,10 +42,10 @@ export const makeVaultsCommand = logger => {
       normalizeAddress,
     )
     .action(async function (opts) {
-      const { readLatestHead } = await makeRpcUtils({ fetch });
+      const { readPublished } = await makeVstorageKit({ fetch }, networkConfig);
 
       const current = await getCurrent(opts.from, {
-        readLatestHead,
+        readPublished,
       });
 
       const vaultStoragePaths = current.offerToPublicSubscriberPaths.map(
@@ -61,7 +67,8 @@ export const makeVaultsCommand = logger => {
     .option('--collateralBrand <string>', 'Collateral brand key', 'ATOM')
     .action(async function (opts) {
       logger.warn('running with options', opts);
-      const { agoricNames } = await makeRpcUtils({ fetch });
+      const vsk = makeVstorageKit({ fetch }, networkConfig);
+      const agoricNames = await makeAgoricNames(vsk.fromBoard, vsk.vstorage);
 
       const offer = Offers.vaults.OpenVault(agoricNames, {
         giveCollateral: opts.giveCollateral,
@@ -96,11 +103,15 @@ export const makeVaultsCommand = logger => {
     .requiredOption('--vaultId <string>', 'Key of vault (e.g. vault1)')
     .action(async function (opts) {
       logger.warn('running with options', opts);
-      const { agoricNames, readLatestHead } = await makeRpcUtils({ fetch });
+      const { readPublished, ...vsk } = makeVstorageKit(
+        { fetch },
+        networkConfig,
+      );
+      const agoricNames = await makeAgoricNames(vsk.fromBoard, vsk.vstorage);
 
       const previousOfferId = await lookupOfferIdForVault(
         opts.vaultId,
-        getCurrent(opts.from, { readLatestHead }),
+        getCurrent(opts.from, { readPublished }),
       );
 
       const offer = Offers.vaults.AdjustBalances(
@@ -137,11 +148,15 @@ export const makeVaultsCommand = logger => {
     )
     .action(async function (opts) {
       logger.warn('running with options', opts);
-      const { agoricNames, readLatestHead } = await makeRpcUtils({ fetch });
+      const { readPublished, ...vsk } = makeVstorageKit(
+        { fetch },
+        networkConfig,
+      );
+      const agoricNames = await makeAgoricNames(vsk.fromBoard, vsk.vstorage);
 
       const previousOfferId = await lookupOfferIdForVault(
         opts.vaultId,
-        getCurrent(opts.from, { readLatestHead }),
+        getCurrent(opts.from, { readPublished }),
       );
 
       const offer = Offers.vaults.CloseVault(

package/src/commands/wallet.js

@@ -8,11 +8,14 @@ import {
   makeLeader,
   makeLeaderFromRpcAddresses,
 } from '@agoric/casting';
+import {
+  makeVstorageKit,
+  fetchEnvNetworkConfig,
+  makeAgoricNames,
+} from '@agoric/client-utils';
+import { execFileSync } from 'child_process';
 import fs from 'fs';
 import util from 'util';
-import { execFileSync } from 'child_process';
-import { fmtRecordOfLines, summarize } from '../lib/format.js';
-import { makeRpcUtils, networkConfig } from '../lib/rpc.js';
 
 import { makeLeaderOptions } from '../lib/casting.js';
 import {
@@ -20,8 +23,15 @@ import {
   fetchSwingsetParams,
   normalizeAddressWithOptions,
 } from '../lib/chain.js';
+import {
+  fmtRecordOfLines,
+  parseFiniteNumber,
+  summarize,
+} from '../lib/format.js';
 import { coalesceWalletState, getCurrent } from '../lib/wallet.js';
 
+const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
+
 const SLEEP_SECONDS = 3;
 
 /**
@@ -102,7 +112,7 @@ export const makeWalletCommand = async command => {
     .action(async function (opts) {
       const offerStr = fs.readFileSync(opts.file).toString();
 
-      const { unserializer } = await makeRpcUtils({ fetch });
+      const { unserializer } = await makeVstorageKit({ fetch }, networkConfig);
 
       const offerObj = unserializer.fromCapData(JSON.parse(offerStr));
       console.log(offerObj);
@@ -117,7 +127,7 @@ export const makeWalletCommand = async command => {
     .action(async function (opts) {
       const offerStr = fs.readFileSync(opts.offer).toString();
 
-      const { unserializer } = await makeRpcUtils({ fetch });
+      const { unserializer } = await makeVstorageKit({ fetch }, networkConfig);
 
       const offerObj = unserializer.fromCapData(JSON.parse(offerStr));
       console.log(offerObj.offer.id);
@@ -132,30 +142,69 @@ export const makeWalletCommand = async command => {
     )
     .requiredOption('--offer [filename]', 'path to file with prepared offer')
     .option('--dry-run', 'spit out the command instead of running it')
+    .option('--gas', 'gas limit; "auto" [default] to calculate automatically')
+    .option(
+      '--gas-adjustment',
+      'factor by which to multiply the --gas=auto calculation result [default 1.2]',
+    )
+    .option('--verbose', 'print command output')
     .action(function (opts) {
-      /** @typedef {{ from: string, offer: string, dryRun: boolean }} Opts */
+      /**
+       * @typedef {{
+       *   from: string,
+       *   offer: string,
+       *   dryRun: boolean,
+       *   gas: string,
+       *   gasAdjustment: string,
+       *   verbose: boolean,
+       * }} Opts
+       */
       const {
         dryRun,
         from,
+        gas = 'auto',
+        gasAdjustment = '1.2',
         offer,
         home,
+        verbose,
         keyringBackend: backend,
       } = /** @type {SharedTxOptions & Opts} */ ({ ...wallet.opts(), ...opts });
 
       const offerBody = fs.readFileSync(offer).toString();
-      execSwingsetTransaction(['wallet-action', '--allow-spend', offerBody], {
-        from,
-        dryRun,
-        keyring: { home, backend },
-        ...networkConfig,
-      });
+      const out = execSwingsetTransaction(
+        ['wallet-action', '--allow-spend', offerBody, '-ojson', '-bblock'],
+        {
+          ...networkConfig,
+          keyring: { home, backend },
+          from,
+          gas:
+            gas === 'auto'
+              ? ['auto', parseFiniteNumber(gasAdjustment)]
+              : parseFiniteNumber(gas),
+          dryRun,
+          verbose,
+        },
+      );
+
+      // see sendAction in {@link ../lib/wallet.js}
+      if (dryRun || !verbose) return;
+      try {
+        const tx = JSON.parse(/** @type {string} */ (out));
+        if (tx.code !== 0) {
+          console.error('failed to send tx', tx);
+        }
+        console.log(tx);
+      } catch (err) {
+        console.error('unexpected output', JSON.stringify(out));
+        throw err;
+      }
     });
 
   wallet
     .command('list')
     .description('list all wallets in vstorage')
     .action(async function () {
-      const { vstorage } = await makeRpcUtils({ fetch });
+      const { vstorage } = await makeVstorageKit({ fetch }, networkConfig);
       const wallets = await vstorage.keys('published.wallet');
       process.stdout.write(wallets.join('\n'));
     });
@@ -169,23 +218,24 @@ export const makeWalletCommand = async command => {
       normalizeAddress,
     )
     .action(async function (opts) {
-      const { agoricNames, unserializer, readLatestHead } = await makeRpcUtils({
-        fetch,
-      });
+      const { readPublished, unserializer, ...vsk } = makeVstorageKit(
+        { fetch },
+        networkConfig,
+      );
+      const agoricNames = await makeAgoricNames(vsk.fromBoard, vsk.vstorage);
 
       const leader = makeLeader(networkConfig.rpcAddrs[0]);
       const follower = await makeFollower(
         `:published.wallet.${opts.from}`,
         leader,
         {
-          // @ts-expect-error xxx
           unserializer,
         },
       );
 
       const coalesced = await coalesceWalletState(follower);
 
-      const current = await getCurrent(opts.from, { readLatestHead });
+      const current = await getCurrent(opts.from, { readPublished });
 
       console.warn(
         'got coalesced',

package/src/cosmos.js

@@ -50,7 +50,7 @@ export default async function cosmosMain(progname, rawArgs, powers, opts) {
                 },
               );
               // Ensure the build doesn't mess up stdout.
-              ps.childProcess.stdout.pipe(process.stderr);
+              ps.childProcess.stdout?.pipe(process.stderr);
               return ps;
             }
             throw e;

package/src/helpers.js

@@ -3,6 +3,9 @@
 
 /** @import { ChildProcess } from 'child_process' */
 
+// Backwards compatibility
+export { fetchEnvNetworkConfig as getNetworkConfig } from '@agoric/client-utils';
+
 export const getSDKBinaries = ({
   jsPfx = '../..',
   goPfx = `${jsPfx}/../golang`,
@@ -40,12 +43,12 @@ export const makePspawn = ({
    *
    * @param {string} cmd command name to run
    * @param {Array<string>} cargs arguments to the command
-   * @param {object} param2
-   * @param {string} [param2.cwd]
-   * @param {string | [string, string, string]} [param2.stdio] standard IO
+   * @param {object} [opts]
+   * @param {string} [opts.cwd]
+   * @param {string | [string, string, string]} [opts.stdio] standard IO
    * specification
-   * @param {Record<string, string | undefined>} [param2.env] environment
-   * @param {boolean} [param2.detached] whether the child process should be detached
+   * @param {Record<string, string | undefined>} [opts.env] environment
+   * @param {boolean} [opts.detached] whether the child process should be detached
    * @returns {Promise<number> & { childProcess: ChildProcess }}} promise for
    * exit status. The return result has a `childProcess` property to obtain
    * control over the running process

package/src/install.js

@@ -37,7 +37,7 @@ export default async function installMain(progname, rawArgs, powers, opts) {
       stdio: ['inherit', 'pipe', 'inherit'],
     });
     const stdout = [];
-    p.childProcess.stdout.on('data', out => stdout.push(out));
+    p.childProcess.stdout?.on('data', out => stdout.push(out));
     await p;
     const d = JSON.parse(Buffer.concat(stdout).toString('utf-8'));
     for (const [name, { location }] of Object.entries(d)) {
@@ -49,7 +49,7 @@ export default async function installMain(progname, rawArgs, powers, opts) {
   let subdirs;
   const workTrees = ['.'];
   let sdkWorktree;
-  /** @type {Map<string, string>} */
+  /** @type {Map<string, string | null>} */
   const sdkPackageToPath = new Map();
   const linkFolder = path.resolve(`_agstate/yarn-links`);
   const linkFlags = [];
@@ -131,7 +131,6 @@ export default async function installMain(progname, rawArgs, powers, opts) {
         // Ensure we update the package.json before exiting.
         const updatePackageJson = async () => {
           // Don't update on exit anymore.
-          // eslint-disable-next-line no-use-before-define
           process.off('beforeExit', updatePackageJsonOnExit);
           log.info(`updating ${pjson}`);
           await fs.writeFile(
@@ -170,7 +169,7 @@ export default async function installMain(progname, rawArgs, powers, opts) {
         .then(results => {
           // After all have settled, throw any errors.
           const failures = results.filter(
-            ({ status }) => status !== 'fulfilled',
+            result => result.status !== 'fulfilled',
           );
           if (failures.length) {
             throw AggregateError(
@@ -284,6 +283,10 @@ export default async function installMain(progname, rawArgs, powers, opts) {
   // Create symlinks to the SDK packages.
   await Promise.all(
     [...sdkPackageToPath.entries()].map(async ([pjName, dir]) => {
+      if (typeof dir !== 'string') {
+        throw Error(`unexpected incomplete package mapping: ${pjName}`);
+      }
+
       const SUBOPTIMAL = false;
       await null;
       if (SUBOPTIMAL) {
@@ -301,7 +304,7 @@ export default async function installMain(progname, rawArgs, powers, opts) {
       log('linking', linkName);
       return fs
         .mkdir(linkDir, { recursive: true })
-        .then(_ => fs.symlink(path.relative(linkDir, dir), linkName));
+        .then(() => fs.symlink(path.relative(linkDir, dir), linkName));
     }),
   );
 

package/src/lib/chain.js

@@ -3,6 +3,10 @@
 import { normalizeBech32 } from '@cosmjs/encoding';
 import { execFileSync as execFileSyncAmbient } from 'child_process';
 
+/**
+ * @import {MinimalNetworkConfig} from '@agoric/client-utils';
+ */
+
 const agdBinary = 'agd';
 
 /**
@@ -34,11 +38,42 @@ export const normalizeAddressWithOptions = (
 };
 harden(normalizeAddressWithOptions);
 
+/** @typedef {number | 'auto' | ['auto', adjustment?: number | undefined]} GasLimit */
+
+/**
+ * @param {GasLimit} limit
+ * @returns {string[]}
+ */
+const makeGasOpts = limit => {
+  if (Number.isFinite(limit) || limit === 'auto') {
+    return [`--gas=${limit}`];
+  }
+  if (Array.isArray(limit) && limit.length >= 1 && limit[0] === 'auto') {
+    const gasOpts = ['--gas=auto'];
+    if (limit.length > 1) {
+      const [adjustment, ...rest] = limit.slice(1);
+      const adjustmentIsValid =
+        adjustment === undefined ||
+        (Number.isFinite(adjustment) && Number(adjustment) > 0);
+      if (rest.length !== 0 || !adjustmentIsValid) {
+        throw Error('invalid gas input');
+      }
+      if (adjustment !== undefined) {
+        gasOpts.push(`--gas-adjustment=${adjustment}`);
+      }
+    }
+    return gasOpts;
+  }
+
+  throw Error('invalid gas input');
+};
+
 /**
  * @param {ReadonlyArray<string>} swingsetArgs
- * @param {import('./rpc.js').MinimalNetworkConfig & {
+ * @param {MinimalNetworkConfig & {
  *   from: string,
  *   fees?: string,
+ *   gas?: GasLimit,
  *   dryRun?: boolean,
  *   verbose?: boolean,
  *   keyring?: {home?: string, backend: string}
@@ -50,6 +85,7 @@ export const execSwingsetTransaction = (swingsetArgs, opts) => {
   const {
     from,
     fees,
+    gas = ['auto', 1.2],
     dryRun = false,
     verbose = true,
     keyring = undefined,
@@ -67,6 +103,7 @@ export const execSwingsetTransaction = (swingsetArgs, opts) => {
     homeOpt,
     backendOpt,
     feeOpt,
+    makeGasOpts(gas),
     [`--from=${from}`, 'tx', 'swingset'],
     swingsetArgs,
   );
@@ -78,7 +115,7 @@ export const execSwingsetTransaction = (swingsetArgs, opts) => {
     stdout.write('\n');
   } else {
     const yesCmd = cmd.concat(['--yes']);
-    if (verbose) console.log('Executing ', yesCmd);
+    if (verbose) console.log('Executing ', agdBinary, yesCmd);
     const out = execFileSync(agdBinary, yesCmd, { encoding: 'utf-8' });
 
     // agd puts this diagnostic on stdout rather than stderr :-/
@@ -94,7 +131,7 @@ harden(execSwingsetTransaction);
 
 /**
  *
- * @param {import('./rpc.js').MinimalNetworkConfig} net
+ * @param {MinimalNetworkConfig} net
  */
 // TODO fetch by HTTP instead of shelling out https://github.com/Agoric/agoric-sdk/issues/9200
 export const fetchSwingsetParams = net => {
@@ -114,7 +151,7 @@ export const fetchSwingsetParams = net => {
 harden(fetchSwingsetParams);
 
 /**
- * @param {import('./rpc.js').MinimalNetworkConfig & {
+ * @param {MinimalNetworkConfig & {
  *   execFileSync: typeof import('child_process').execFileSync,
  *   delay: (ms: number) => Promise<void>,
  *   period?: number,
@@ -154,7 +191,7 @@ export const pollBlocks = opts => async lookup => {
 
 /**
  * @param {string} txhash
- * @param {import('./rpc.js').MinimalNetworkConfig & {
+ * @param {MinimalNetworkConfig & {
  *   execFileSync: typeof import('child_process').execFileSync,
  *   delay: (ms: number) => Promise<void>,
  *   period?: number,

package/src/lib/format.js

@@ -1,23 +1,21 @@
-// @ts-check
-
 import { Fail, q } from '@endo/errors';
 import { makeBoardRemote } from '@agoric/vats/tools/board-utils.js';
 
-/** @import {BoardRemote} from '@agoric/vats/tools/board-utils.js' */
-/** @import {VBankAssetDetail} from '@agoric/vats/tools/board-utils.js'; */
+/**
+ * @import {Amount, Brand} from '@agoric/ertp'
+ * @import {AgoricNamesRemotes, BoardRemote, VBankAssetDetail} from '@agoric/vats/tools/board-utils.js';
+ */
 
+// TODO Move to packages/internal.
 /**
- * Like @endo/nat but coerces
+ * Parses the input and returns either a finite number or NaN.
  *
- * @param {string} str
- * @returns {bigint}
+ * @param {string} input
+ * @returns {number}
  */
-export const Natural = str => {
-  const b = BigInt(str);
-  if (b < 0) {
-    throw RangeError(`${b} is negative`);
-  }
-  return b;
+export const parseFiniteNumber = input => {
+  const result = /[0-9]/.test(input || '') ? Number(input) : NaN;
+  return Number.isFinite(result) ? result : NaN;
 };
 
 /**
@@ -102,14 +100,15 @@ export const purseBalanceTuples = (purses, assets) => {
  */
 export const fmtRecordOfLines = record => {
   const { stringify } = JSON;
+  /** @type {Array<[string, string[]]>} */
   const groups = Object.entries(record).map(([key, items]) => [
     key,
     items.map(item => `    ${stringify(item)}`),
   ]);
-  const lineEntries = groups.map(
-    // @ts-expect-error ???
-    ([key, lines]) => `  ${stringify(key)}: [\n${lines.join(',\n')}\n  ]`,
-  );
+  const lineEntries = groups.map(([key, lines]) => {
+    const linesStr = lines.length === 0 ? `[]` : `[\n${lines.join(',\n')}\n  ]`;
+    return `  ${stringify(key)}: ${linesStr}`;
+  });
   return `{\n${lineEntries.join(',\n')}\n}`;
 };
 
@@ -117,7 +116,7 @@ export const fmtRecordOfLines = record => {
  * Summarize the offerStatuses of the state as user-facing informative tuples
  *
  * @param {import('@agoric/smart-wallet/src/utils.js').CoalescedWalletState} state
- * @param {import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes} agoricNames
+ * @param {AgoricNamesRemotes} agoricNames
  */
 export const offerStatusTuples = (state, agoricNames) => {
   const { offerStatuses } = state;
@@ -174,7 +173,7 @@ export const offerStatusTuples = (state, agoricNames) => {
 /**
  * @param {import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord} current
  * @param {ReturnType<import('@agoric/smart-wallet/src/utils.js').makeWalletStateCoalescer>['state']} coalesced
- * @param {import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes} agoricNames
+ * @param {AgoricNamesRemotes} agoricNames
  */
 export const summarize = (current, coalesced, agoricNames) => {
   return {

package/src/lib/index.js

@@ -0,0 +1,7 @@
+/** @file Utility library for use in other packages */
+
+export * from './bundles.js';
+export * from './casting.js';
+export * from './chain.js';
+export * from './format.js';
+export * from './wallet.js';