agoric 0.21.2-other-dev-8f8782b.0 → 0.21.2-other-dev-fbe72e7.0.fbe72e7

package/src/entrypoint.js

@@ -1,11 +1,7 @@
 #!/usr/bin/env node
+/* eslint-env node */
 // @jessie-check
 
-/* global process */
-
-import '@endo/init/pre.js';
-import 'esm';
-import '@agoric/casting/node-fetch-shim.js';
 import '@endo/init/legacy.js';
 
 import path from 'path';
@@ -25,6 +21,7 @@ const log = anylogger('agoric');
 const progname = path.basename(process.argv[1]);
 
 const stdout = str => process.stdout.write(str);
+/** @type {(...args: ConstructorParameters<typeof WebSocket>) => WebSocket} */
 const makeWebSocket = (...args) => new WebSocket(...args);
 
 const rawArgs = process.argv.slice(2);

package/src/follow.js

@@ -126,25 +126,29 @@ export default async function followerMain(progname, rawArgs, powers, opts) {
     });
   }
 
-  const leaderOptions = makeLeaderOptions({
-    sleep,
-    jitter,
-    log: verbose ? console.warn : () => undefined,
-  });
-
   const [_cmd, ...specs] = rawArgs;
 
   verbose && console.warn('Creating leader for', bootstrap);
-  const leader = makeLeader(bootstrap, leaderOptions);
+  const leader = makeLeader(
+    bootstrap,
+    makeLeaderOptions({
+      sleep,
+      jitter,
+      log: verbose ? console.warn : () => undefined,
+    }),
+  );
   const iterate = opts.lossy ? iterateLatest : iterateEach;
   await Promise.all(
     specs.map(async spec => {
       verbose && console.warn('Following', spec);
       const castingSpec = makeCastingSpec(spec);
       const follower = makeFollower(castingSpec, leader, followerOptions);
-      for await (const { value, blockHeight, currentBlockHeight } of iterate(
-        follower,
-      )) {
+      for await (const obj of iterate(follower)) {
+        if ('error' in obj) {
+          console.error('Error following:', obj.error);
+          continue;
+        }
+        const { value, blockHeight, currentBlockHeight } = obj;
         const blockHeightPrefix = opts.blockHeight ? `${blockHeight}:` : '';
         const currentBlockHeightPrefix = opts.currentBlockHeight
           ? `${currentBlockHeight}:`

package/src/helpers.js

@@ -1,7 +1,10 @@
-/* global process */
+/* eslint-env node */
 // @ts-check
 
-/** @typedef {import('child_process').ChildProcess} ChildProcess */
+/** @import { ChildProcess } from 'child_process' */
+
+// Backwards compatibility
+export { fetchEnvNetworkConfig as getNetworkConfig } from '@agoric/client-utils';
 
 export const getSDKBinaries = ({
   jsPfx = '../..',
@@ -40,10 +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 | [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 {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/init.js

@@ -1,12 +1,6 @@
 import chalk from 'chalk';
 import { makePspawn } from './helpers.js';
 
-// Ambient types. Needed only for dev but this does a runtime import.
-// https://github.com/Agoric/agoric-sdk/issues/6512
-import '@endo/captp/src/types.js';
-import '@agoric/swingset-vat/exported.js';
-import '@agoric/swingset-vat/src/vats/network/types.js';
-
 // Use either an absolute template URL, or find it relative to DAPP_URL_BASE.
 const gitURL = (relativeOrAbsoluteURL, base) => {
   const url = new URL(relativeOrAbsoluteURL, base);
@@ -40,9 +34,10 @@ export default async function initMain(_progname, rawArgs, priv, opts) {
     dappBranch = ['-b', opts.dappBranch];
   }
 
+  const shallow = ['--depth', '1', '--shallow-submodules'];
   const exitStatus = await pspawn(
     'git',
-    ['clone', '--origin=upstream', dappURL, DIR, ...dappBranch],
+    ['clone', '--origin=upstream', ...shallow, dappURL, DIR, ...dappBranch],
     {
       stdio: 'inherit',
     },
@@ -60,7 +55,6 @@ export default async function initMain(_progname, rawArgs, priv, opts) {
     const path = `${DIR}/${dir}package.json`;
     log('rewriting ', path);
 
-    // eslint-disable-next-line no-await-in-loop
     const contents = await fs.readFile(path, 'utf-8');
     const pkg = JSON.parse(contents.replace(/@DIR@/g, DIR));
     if (dir === '') {
@@ -74,7 +68,6 @@ export default async function initMain(_progname, rawArgs, priv, opts) {
     pkg.name = `${DIR}${pkg.name.substr(topLevelName.length)}`;
     const json = JSON.stringify(pkg, undefined, 2);
 
-    // eslint-disable-next-line no-await-in-loop
     await fs.writeFile(path, json);
   }
 

package/src/install.js

@@ -1,16 +1,17 @@
-/* global process AggregateError Buffer */
+/* eslint-env node */
 import path from 'path';
 import chalk from 'chalk';
+import { execFileSync } from 'child_process';
 import { makePspawn } from './helpers.js';
 import DEFAULT_SDK_PACKAGE_NAMES from './sdk-package-names.js';
+import { listWorkspaces } from './lib/packageManager.js';
 
 const REQUIRED_AGORIC_START_PACKAGES = [
   '@agoric/solo',
   '@agoric/cosmic-swingset',
 ];
 
-const filename = new URL(import.meta.url).pathname;
-const dirname = path.dirname(filename);
+const dirname = path.dirname(new URL(import.meta.url).pathname);
 
 export default async function installMain(progname, rawArgs, powers, opts) {
   const { anylogger, fs, spawn } = powers;
@@ -31,26 +32,16 @@ export default async function installMain(progname, rawArgs, powers, opts) {
   const rimraf = file => pspawn('rm', ['-rf', file]);
 
   async function getWorktreePackagePaths(cwd = '.', map = new Map()) {
-    // run `yarn workspaces info` to get the list of directories to
-    // use, instead of a hard-coded list
-    const p = pspawn('yarn', ['workspaces', '--silent', 'info'], {
-      cwd,
-      stdio: ['inherit', 'pipe', 'inherit'],
-    });
-    const stdout = [];
-    p.childProcess.stdout.on('data', out => stdout.push(out));
-    await p;
-    const d = JSON.parse(Buffer.concat(stdout).toString('utf-8'));
-    Object.entries(d).forEach(([name, { location }]) =>
-      map.set(name, path.resolve(cwd, location)),
-    );
+    for (const { name, location } of listWorkspaces({ execFileSync }, cwd)) {
+      map.set(name, path.resolve(cwd, location));
+    }
     return map;
   }
 
   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 = [];
@@ -61,7 +52,6 @@ export default async function installMain(progname, rawArgs, powers, opts) {
   const yarnInstallEachWorktree = async (phase, ...flags) => {
     for await (const workTree of workTrees) {
       log.info(`yarn install ${phase} in ${workTree}`);
-      // eslint-disable-next-line no-await-in-loop
       const yarnInstall = await pspawn(
         'yarn',
         [...linkFlags, 'install', ...flags],
@@ -133,7 +123,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(
@@ -172,12 +161,9 @@ 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) {
-            if (typeof AggregateError !== 'function') {
-              throw failures[0].reason;
-            }
             throw AggregateError(
               failures.map(({ reason }) => reason),
               'Failed to prune',
@@ -269,7 +255,9 @@ export default async function installMain(progname, rawArgs, powers, opts) {
     };
     await Promise.all(subdirs.map(removeNodeModulesSymlinks));
   } else {
-    DEFAULT_SDK_PACKAGE_NAMES.forEach(name => sdkPackageToPath.set(name, null));
+    for (const name of DEFAULT_SDK_PACKAGE_NAMES) {
+      sdkPackageToPath.set(name, null);
+    }
   }
 
   if (forceSdkVersion !== undefined) {
@@ -287,7 +275,12 @@ 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) {
         // This use of yarn is noisy and slow.
         await pspawn('yarn', [...linkFlags, 'unlink', pjName]);
@@ -303,7 +296,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/bundles.js

@@ -0,0 +1,102 @@
+// @ts-check
+/* eslint-env node */
+
+import assert from 'node:assert/strict';
+import fs from 'node:fs';
+import { join } from 'node:path';
+
+import { ZipReader } from '@endo/zip';
+
+/** @import {Bundle} from '@agoric/swingset-vat'; */
+/** @import {CoreEvalPlan} from '@agoric/deploy-script-support/src/writeCoreEvalParts.js' */
+
+// exported for testing
+export const PACKAGE_NAME_RE = /^(?:@[^/]+\/)?[^/]+/;
+
+/**
+ * @typedef {{ name: string, label: string, location: string, modules: Record<string, {compartment: string, module: string}>}} Compartment
+ */
+
+/**
+ * @typedef CompartmentMap
+ * @property {string[]} tags
+ * @property {{compartment: string, module: string}} entry
+ * @property {Record<string, Compartment>} compartments
+ */
+
+/** @param {Bundle} bundleObj*/
+export const extractBundleInfo = async bundleObj => {
+  if (bundleObj.moduleFormat !== 'endoZipBase64') {
+    throw Error('only endoZipBase64 is supported');
+  }
+
+  const contents = Buffer.from(bundleObj.endoZipBase64, 'base64');
+
+  const zipReader = new ZipReader(contents);
+  const { files } = zipReader;
+
+  const cmapEntry = files.get('compartment-map.json');
+  /** @type {CompartmentMap} */
+  const compartmentMap = JSON.parse(Buffer.from(cmapEntry.content).toString());
+
+  // XXX mapIter better but requires SES
+  const fileSizes = Object.fromEntries(
+    Array.from(files.values()).map(f => [
+      f.name,
+      // bundle contents are not compressed
+      f.content.length,
+    ]),
+  );
+
+  return { compartmentMap, fileSizes };
+};
+
+// UNTIL https://github.com/endojs/endo/issues/1656
+/** @param {string} bundleFilename */
+export const statBundle = async bundleFilename => {
+  const bundle = fs.readFileSync(bundleFilename, 'utf8');
+  /** @type {Bundle} */
+  const bundleObj = JSON.parse(bundle);
+  console.log('\nBUNDLE', bundleObj.moduleFormat, bundleFilename);
+
+  const info = await extractBundleInfo(bundleObj);
+  assert(info, 'no bundle info');
+
+  /** @type {Record<string, number>} */
+  const byPackage = {};
+  let totalSize = 0;
+  for (const [filename, size] of Object.entries(info.fileSizes)) {
+    totalSize += size;
+    if (filename === 'compartment-map.json') {
+      continue;
+    }
+    const packageName = filename.match(PACKAGE_NAME_RE)?.[0];
+    assert(packageName, `invalid filename ${filename}`);
+    byPackage[packageName] ||= 0;
+    byPackage[packageName] += size;
+  }
+
+  console.log('Sum of file sizes in each package:');
+  console.table(byPackage);
+
+  console.log('total size:', totalSize);
+  console.log('\nTo explore the contents:\n');
+  console.log(
+    `  DIR=$(mktemp -d); cat ${bundleFilename} | jq -r .endoZipBase64 | base64 -d | tar xC $DIR; open $DIR`,
+  );
+};
+
+/** @param {string} path */
+export const statPlans = async path => {
+  const files = await fs.promises.readdir(path);
+  const planfiles = files.filter(f => f.endsWith('plan.json'));
+
+  for (const planfile of planfiles) {
+    /** @type {CoreEvalPlan} */
+    const plan = JSON.parse(fs.readFileSync(join(path, planfile), 'utf8'));
+    console.log('\n**\nPLAN', plan.name);
+    for (const bundle of plan.bundles) {
+      await statBundle(bundle.fileName);
+    }
+  }
+};

package/src/lib/chain.js

@@ -1,7 +1,13 @@
 // @ts-check
-/* global process */
+/* eslint-env node */
 import { normalizeBech32 } from '@cosmjs/encoding';
 import { execFileSync as execFileSyncAmbient } from 'child_process';
+import { makeAgoricQueryClient } from '@agoric/client-utils';
+
+/**
+ * @import {MinimalNetworkConfig} from '@agoric/client-utils';
+ * @import {Params, ParamsSDKType} from '@agoric/cosmic-proto/agoric/swingset/swingset.js';
+ */
 
 const agdBinary = 'agd';
 
@@ -34,10 +40,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').MinimalNetworkConfig & {
+ * @param {MinimalNetworkConfig & {
  *   from: string,
+ *   fees?: string,
+ *   gas?: GasLimit,
  *   dryRun?: boolean,
  *   verbose?: boolean,
  *   keyring?: {home?: string, backend: string}
@@ -48,6 +86,8 @@ harden(normalizeAddressWithOptions);
 export const execSwingsetTransaction = (swingsetArgs, opts) => {
   const {
     from,
+    fees,
+    gas = ['auto', 1.2],
     dryRun = false,
     verbose = true,
     keyring = undefined,
@@ -60,9 +100,12 @@ export const execSwingsetTransaction = (swingsetArgs, opts) => {
   const backendOpt = keyring?.backend
     ? [`--keyring-backend=${keyring.backend}`]
     : [];
+  const feeOpt = fees ? ['--fees', fees] : [];
   const cmd = [`--node=${rpcAddrs[0]}`, `--chain-id=${chainName}`].concat(
     homeOpt,
     backendOpt,
+    feeOpt,
+    makeGasOpts(gas),
     [`--from=${from}`, 'tx', 'swingset'],
     swingsetArgs,
   );
@@ -74,31 +117,34 @@ export const execSwingsetTransaction = (swingsetArgs, opts) => {
     stdout.write('\n');
   } else {
     const yesCmd = cmd.concat(['--yes']);
-    if (verbose) console.log('Executing ', yesCmd);
-    return execFileSync(agdBinary, yesCmd, { encoding: 'utf-8' });
+    if (verbose) console.log('Executing ', agdBinary, yesCmd);
+    const out = execFileSync(agdBinary, yesCmd, { encoding: 'utf-8' });
+
+    // agd puts this diagnostic on stdout rather than stderr :-/
+    // "Default sign-mode 'direct' not supported by Ledger, using sign-mode 'amino-json'.
+    if (out.startsWith('Default sign-mode')) {
+      const stripDiagnostic = out.replace(/^Default[^\n]+\n/, '');
+      return stripDiagnostic;
+    }
+    return out;
   }
 };
 harden(execSwingsetTransaction);
 
-// xxx rpc should be able to query this by HTTP without shelling out
-export const fetchSwingsetParams = net => {
-  const { chainName, rpcAddrs, execFileSync = execFileSyncAmbient } = net;
-  const cmd = [
-    `--node=${rpcAddrs[0]}`,
-    `--chain-id=${chainName}`,
-    'query',
-    'swingset',
-    'params',
-    '--output',
-    '--json',
-  ];
-  const buffer = execFileSync(agdBinary, cmd);
-  return JSON.parse(buffer.toString());
+/**
+ *
+ * @param {MinimalNetworkConfig} net
+ * @returns {Promise<Params>}
+ */
+export const fetchSwingsetParams = async net => {
+  const client = await makeAgoricQueryClient(net);
+  const { params } = await client.agoric.swingset.params();
+  return params;
 };
 harden(fetchSwingsetParams);
 
 /**
- * @param {import('./rpc').MinimalNetworkConfig & {
+ * @param {MinimalNetworkConfig & {
  *   execFileSync: typeof import('child_process').execFileSync,
  *   delay: (ms: number) => Promise<void>,
  *   period?: number,
@@ -117,12 +163,10 @@ export const pollBlocks = opts => async lookup => {
   for (;;) {
     const sTxt = execFileSync(agdBinary, ['status', ...nodeArgs]);
     const status = JSON.parse(sTxt.toString());
-    const {
-      SyncInfo: { latest_block_time: time, latest_block_height: height },
-    } = status;
+    const { latest_block_time: time, latest_block_height: height } =
+      status.sync_info || status.SyncInfo;
     try {
       // see await null above
-      // eslint-disable-next-line @jessie.js/no-nested-await, no-await-in-loop
       const result = await lookup({ time, height });
       return result;
     } catch (_err) {
@@ -132,7 +176,6 @@ export const pollBlocks = opts => async lookup => {
         height,
         'retrying...',
       );
-      // eslint-disable-next-line @jessie.js/no-nested-await, no-await-in-loop
       await delay(period);
     }
   }
@@ -140,14 +183,14 @@ export const pollBlocks = opts => async lookup => {
 
 /**
  * @param {string} txhash
- * @param {import('./rpc').MinimalNetworkConfig & {
+ * @param {MinimalNetworkConfig & {
  *   execFileSync: typeof import('child_process').execFileSync,
  *   delay: (ms: number) => Promise<void>,
  *   period?: number,
  * }} opts
  */
 export const pollTx = async (txhash, opts) => {
-  const { execFileSync, rpcAddrs, chainName } = opts;
+  const { execFileSync, rpcAddrs } = opts;
 
   const nodeArgs = [`--node=${rpcAddrs[0]}`];
   const outJson = ['--output', 'json'];
@@ -155,15 +198,8 @@ export const pollTx = async (txhash, opts) => {
   const lookup = async () => {
     const out = execFileSync(
       agdBinary,
-      [
-        'query',
-        'tx',
-        txhash,
-        `--chain-id=${chainName}`,
-        ...nodeArgs,
-        ...outJson,
-      ],
-      { stdio: ['ignore', 'pipe', 'ignore'] },
+      ['query', 'tx', txhash, ...nodeArgs, ...outJson],
+      { stdio: ['ignore', 'pipe', 'pipe'] },
     );
     // XXX this type is defined in a .proto file somewhere
     /** @type {{ height: string, txhash: string, code: number, timestamp: string }} */

package/src/lib/format.js

@@ -1,25 +1,21 @@
-// @ts-check
+import { Fail, q } from '@endo/errors';
 import { makeBoardRemote } from '@agoric/vats/tools/board-utils.js';
-// eslint-disable-next-line no-unused-vars -- typeof below
-import { makeAgoricNames } from './rpc.js';
 
-// ambient types
-import '@agoric/ertp/src/types-ambient.js';
-
-/** @typedef {import('@agoric/vats/tools/board-utils.js').BoardRemote} BoardRemote */
+/**
+ * @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;
 };
 
 /**
@@ -30,21 +26,18 @@ export const Natural = str => {
  */
 export const bigintReplacer = (k, v) => (typeof v === 'bigint' ? `${v}` : v);
 
-/** @type {import('@agoric/vats/tools/board-utils.js').VBankAssetDetail} */
+/** @type {Partial<VBankAssetDetail>} */
 // eslint-disable-next-line no-unused-vars
 const exampleAsset = {
-  // @ts-expect-error cast
   brand: makeBoardRemote({ boardId: 'board0425', iface: 'Alleged: BLD brand' }),
   displayInfo: { assetKind: 'nat', decimalPlaces: 6 },
-  // @ts-expect-error cast
   issuer: makeBoardRemote({ boardId: null, iface: undefined }),
-  petname: 'Agoric staking token',
+  proposedName: 'Agoric staking token',
 };
-/** @typedef {import('@agoric/vats/tools/board-utils.js').VBankAssetDetail } AssetDescriptor */
 
 /**
- * @param {AssetDescriptor[]} assets
- * @returns {(a: Amount & { brand: BoardRemote }) => [string, number | any[]]}
+ * @param {VBankAssetDetail[]} assets
+ * @returns {(a: Amount & { brand: BoardRemote }) => [string | null, number | any[]]}
  */
 export const makeAmountFormatter = assets => amt => {
   const { brand, value } = amt;
@@ -60,7 +53,9 @@ export const makeAmountFormatter = assets => amt => {
       return [issuerName, Number(value) / 10 ** decimalPlaces];
     case 'set':
       assert(Array.isArray(value));
+      // @ts-expect-error narrowed
       if (value[0]?.handle?.iface?.includes('InvitationHandle')) {
+        // @ts-expect-error narrowed
         return [issuerName, value.map(v => v.description)];
       }
       return [issuerName, value];
@@ -75,8 +70,6 @@ export const asPercent = ratio => {
   return (100 * Number(numerator.value)) / Number(denominator.value);
 };
 
-const { Fail, quote: q } = assert;
-
 const isObject = x => typeof x === 'object' && x !== null;
 
 /**
@@ -94,8 +87,8 @@ export const asBoardRemote = x => {
 /**
  * Summarize the balances array as user-facing informative tuples
  *
- * @param {import('@agoric/smart-wallet/src/smartWallet').CurrentWalletRecord['purses']} purses
- * @param {AssetDescriptor[]} assets
+ * @param {import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord['purses']} purses
+ * @param {VBankAssetDetail[]} assets
  */
 export const purseBalanceTuples = (purses, assets) => {
   const fmt = makeAmountFormatter(assets);
@@ -107,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}`;
 };
 
@@ -122,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 {Awaited<ReturnType<typeof makeAgoricNames>>} agoricNames
+ * @param {AgoricNamesRemotes} agoricNames
  */
 export const offerStatusTuples = (state, agoricNames) => {
   const { offerStatuses } = state;
@@ -177,9 +171,9 @@ export const offerStatusTuples = (state, agoricNames) => {
 };
 
 /**
- * @param {import('@agoric/smart-wallet/src/smartWallet').CurrentWalletRecord} current
+ * @param {import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord} current
  * @param {ReturnType<import('@agoric/smart-wallet/src/utils.js').makeWalletStateCoalescer>['state']} coalesced
- * @param {Awaited<ReturnType<typeof makeAgoricNames>>} 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';