agoric 0.21.2-other-dev-3eb1a1d.0 → 0.21.2-other-dev-d15096d.0.d15096d

package/src/commands/wallet.js

@@ -8,7 +8,11 @@ import {
   makeLeader,
   makeLeaderFromRpcAddresses,
 } from '@agoric/casting';
-import { makeVstorageKit } from '@agoric/client-utils';
+import {
+  makeVstorageKit,
+  fetchEnvNetworkConfig,
+  makeAgoricNames,
+} from '@agoric/client-utils';
 import { execFileSync } from 'child_process';
 import fs from 'fs';
 import util from 'util';
@@ -19,25 +23,28 @@ import {
   fetchSwingsetParams,
   normalizeAddressWithOptions,
 } from '../lib/chain.js';
-import { getNetworkConfig } from '../lib/network-config.js';
-import { coalesceWalletState, getCurrent } from '../lib/wallet.js';
 import {
-  summarize,
   fmtRecordOfLines,
   parseFiniteNumber,
+  summarize,
 } from '../lib/format.js';
+import { coalesceWalletState, getCurrent } from '../lib/wallet.js';
 
-const networkConfig = await getNetworkConfig({ env: process.env, fetch });
+/**
+ * @import {Command} from 'commander';
+ */
+
+const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
 
 const SLEEP_SECONDS = 3;
 
 /**
- * @param {import('commander').Command['command']} command
- * @returns {Promise<import('commander').Command>}
+ * @param {Command['command']} command
+ * @returns {Promise<Command>}
  */
 export const makeWalletCommand = async command => {
   /**
-   * @param {import('commander').Command} baseCmd
+   * @param {Command} baseCmd
    */
   const withSharedTxOptions = baseCmd =>
     baseCmd
@@ -52,6 +59,7 @@ export const makeWalletCommand = async command => {
     'wallet commands',
   );
 
+  /** @param {string} literalOrName */
   const normalizeAddress = literalOrName =>
     normalizeAddressWithOptions(literalOrName, wallet.opts());
 
@@ -64,7 +72,8 @@ export const makeWalletCommand = async command => {
     )
     .option('--spend', 'confirm you want to spend')
     .option('--nickname <string>', 'nickname to use', 'my-wallet')
-    .action(function (opts) {
+    .action(async function (opts) {
+      await null;
       /** @typedef {{account: string, spend?: boolean, nickname: 'my-wallet' | string }} Opts */
       const {
         account,
@@ -81,12 +90,12 @@ export const makeWalletCommand = async command => {
           ...networkConfig,
         });
       } else {
-        const params = fetchSwingsetParams(networkConfig);
+        const params = await fetchSwingsetParams(networkConfig);
         assert(
-          params.power_flag_fees.length === 1,
+          params.powerFlagFees.length === 1,
           'multiple power_flag_fees not supported',
         );
-        const { fee: fees } = params.power_flag_fees[0];
+        const { fee: fees } = params.powerFlagFees[0];
         const nf = new Intl.NumberFormat('en-US');
         const costs = fees
           .map(f => `${nf.format(Number(f.amount))} ${f.denom}`)
@@ -109,9 +118,9 @@ export const makeWalletCommand = async command => {
     .action(async function (opts) {
       const offerStr = fs.readFileSync(opts.file).toString();
 
-      const { unserializer } = await makeVstorageKit({ fetch }, networkConfig);
+      const { marshaller } = makeVstorageKit({ fetch }, networkConfig);
 
-      const offerObj = unserializer.fromCapData(JSON.parse(offerStr));
+      const offerObj = marshaller.fromCapData(JSON.parse(offerStr));
       console.log(offerObj);
     });
 
@@ -124,9 +133,9 @@ export const makeWalletCommand = async command => {
     .action(async function (opts) {
       const offerStr = fs.readFileSync(opts.offer).toString();
 
-      const { unserializer } = await makeVstorageKit({ fetch }, networkConfig);
+      const { marshaller } = makeVstorageKit({ fetch }, networkConfig);
 
-      const offerObj = unserializer.fromCapData(JSON.parse(offerStr));
+      const offerObj = marshaller.fromCapData(JSON.parse(offerStr));
       console.log(offerObj.offer.id);
     });
 
@@ -201,7 +210,7 @@ export const makeWalletCommand = async command => {
     .command('list')
     .description('list all wallets in vstorage')
     .action(async function () {
-      const { vstorage } = await makeVstorageKit({ fetch }, networkConfig);
+      const { vstorage } = makeVstorageKit({ fetch }, networkConfig);
       const wallets = await vstorage.keys('published.wallet');
       process.stdout.write(wallets.join('\n'));
     });
@@ -215,19 +224,19 @@ export const makeWalletCommand = async command => {
       normalizeAddress,
     )
     .action(async function (opts) {
-      const { agoricNames, unserializer, readPublished } =
-        await makeVstorageKit(
-          {
-            fetch,
-          },
-          networkConfig,
-        );
+      const {
+        readPublished,
+        marshaller: 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 follower/marshaller types
           unserializer,
         },
       );
@@ -274,15 +283,13 @@ export const makeWalletCommand = async command => {
     .action(async function ({ from }) {
       const spec = `:published.wallet.${from}`;
 
-      const leaderOptions = makeLeaderOptions({
-        sleep: SLEEP_SECONDS,
-        jitter: 0,
-        log: () => undefined,
-      });
-
       const leader = makeLeaderFromRpcAddresses(
         networkConfig.rpcAddrs,
-        leaderOptions,
+        makeLeaderOptions({
+          sleep: SLEEP_SECONDS,
+          jitter: 0,
+          log: console.warn,
+        }),
       );
 
       console.warn('Following', spec);

package/src/deploy.js

@@ -190,6 +190,12 @@ const connectAndRun = async (
   return retryWebsocket().then(() => exit.promise);
 };
 
+/**
+ * @param {string} progname
+ * @param {string[]} rawArgs
+ * @param {{ makeWebSocket?: (...args: ConstructorParameters<typeof WebSocket>) => WebSocket; anylogger: (name: string) => Console; now?: () => number; fs?: any; }} powers
+ * @param {{ allowUnsafePlugins: any; provide: string; sdk: any; need: string; hostport: string; target: string | number | undefined; scriptArgs: any; }} opts
+ */
 export default async function deployMain(progname, rawArgs, powers, opts) {
   const { anylogger, now, fs } = powers;
   const console = anylogger('agoric:deploy');
@@ -238,7 +244,7 @@ export default async function deployMain(progname, rawArgs, powers, opts) {
 
   const match = opts.hostport.match(/^(.*):(\d+)$/);
   const host = match ? match[1] : 'localhost';
-  const port = match ? match[2] : '8000';
+  const port = match ? +match[2] : 8000;
 
   const wsurl = opts.hostport.includes('//')
     ? new URL(opts.hostport, 'ws://localhost:8000')

package/src/entrypoint.js

@@ -2,8 +2,6 @@
 /* eslint-env node */
 // @jessie-check
 
-import '@endo/init/pre.js';
-import 'esm';
 import '@endo/init/legacy.js';
 
 import path from 'path';
@@ -23,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

@@ -16,6 +16,10 @@ import {
 } from '@agoric/casting';
 import { makeLeaderOptions } from './lib/casting.js';
 
+/**
+ * @import {FollowerOptions} from '@agoric/casting';
+ */
+
 const makeCapDataToQclass = () => {
   const valToSlot = new WeakMap();
   const slotToVal = new Map();
@@ -57,7 +61,7 @@ export default async function followerMain(progname, rawArgs, powers, opts) {
     jitter,
   } = opts;
 
-  /** @type {import('@agoric/casting').FollowerOptions} */
+  /** @type {FollowerOptions} */
   const followerOptions = {
     proof,
   };
@@ -126,16 +130,17 @@ 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 => {

package/src/helpers.js

@@ -3,7 +3,8 @@
 
 /** @import { ChildProcess } from 'child_process' */
 
-export { getNetworkConfig } from './lib/network-config.js';
+// Backwards compatibility
+export { fetchEnvNetworkConfig as getNetworkConfig } from '@agoric/client-utils';
 
 export const getSDKBinaries = ({
   jsPfx = '../..',

package/src/install.js

@@ -1,8 +1,10 @@
 /* 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',
@@ -30,17 +32,7 @@ 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'));
-    for (const [name, { location }] of Object.entries(d)) {
+    for (const { name, location } of listWorkspaces({ execFileSync }, cwd)) {
       map.set(name, path.resolve(cwd, location));
     }
     return map;

package/src/lib/casting.js

@@ -2,10 +2,14 @@
 
 import { delay, exponentialBackoff, randomBackoff } from '@agoric/casting';
 
+/**
+ * @import {LeaderOptions} from '@agoric/casting';
+ */
+
 // TODO: https://aws.amazon.com/blogs/architecture/exponential-backoff-and-jitter/
 /**
  * @param {{log: (...args: any) => void, sleep: number, jitter: number }} config
- * @returns {import('@agoric/casting').LeaderOptions}
+ * @returns {LeaderOptions}
  */
 export const makeLeaderOptions = ({ log, sleep, jitter }) => {
   return {

package/src/lib/chain.js

@@ -2,9 +2,12 @@
 /* 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';
+ * @import {Writable} from 'stream';
  */
 
 const agdBinary = 'agd';
@@ -77,8 +80,8 @@ const makeGasOpts = limit => {
  *   dryRun?: boolean,
  *   verbose?: boolean,
  *   keyring?: {home?: string, backend: string}
- *   stdout?: Pick<import('stream').Writable, 'write'>
- *   execFileSync?: typeof import('child_process').execFileSync
+ *   stdout?: Pick<Writable, 'write'>
+ *   execFileSync?: typeof execFileSyncAmbient
  * }} opts
  */
 export const execSwingsetTransaction = (swingsetArgs, opts) => {
@@ -132,27 +135,18 @@ harden(execSwingsetTransaction);
 /**
  *
  * @param {MinimalNetworkConfig} net
+ * @returns {Promise<Params>}
  */
-// TODO fetch by HTTP instead of shelling out https://github.com/Agoric/agoric-sdk/issues/9200
-export const fetchSwingsetParams = net => {
-  const { chainName, rpcAddrs } = net;
-  const cmd = [
-    `--node=${rpcAddrs[0]}`,
-    `--chain-id=${chainName}`,
-    'query',
-    'swingset',
-    'params',
-    '--output',
-    'json',
-  ];
-  const buffer = execFileSyncAmbient(agdBinary, cmd);
-  return JSON.parse(buffer.toString());
+export const fetchSwingsetParams = async net => {
+  const client = await makeAgoricQueryClient(net);
+  const { params } = await client.agoric.swingset.params();
+  return params;
 };
 harden(fetchSwingsetParams);
 
 /**
  * @param {MinimalNetworkConfig & {
- *   execFileSync: typeof import('child_process').execFileSync,
+ *   execFileSync: typeof execFileSyncAmbient,
  *   delay: (ms: number) => Promise<void>,
  *   period?: number,
  *   retryMessage?: string,
@@ -170,9 +164,8 @@ 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
       const result = await lookup({ time, height });
@@ -192,13 +185,13 @@ export const pollBlocks = opts => async lookup => {
 /**
  * @param {string} txhash
  * @param {MinimalNetworkConfig & {
- *   execFileSync: typeof import('child_process').execFileSync,
+ *   execFileSync: typeof execFileSyncAmbient,
  *   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'];
@@ -206,15 +199,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

@@ -4,6 +4,9 @@ import { makeBoardRemote } from '@agoric/vats/tools/board-utils.js';
 /**
  * @import {Amount, Brand} from '@agoric/ertp'
  * @import {AgoricNamesRemotes, BoardRemote, VBankAssetDetail} from '@agoric/vats/tools/board-utils.js';
+ * @import {CurrentWalletRecord} from '@agoric/smart-wallet/src/smartWallet.js';
+ * @import {CoalescedWalletState} from '@agoric/smart-wallet/src/utils.js';
+ * @import {makeWalletStateCoalescer} from '@agoric/smart-wallet/src/utils.js';
  */
 
 // TODO Move to packages/internal.
@@ -87,7 +90,7 @@ export const asBoardRemote = x => {
 /**
  * Summarize the balances array as user-facing informative tuples
  *
- * @param {import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord['purses']} purses
+ * @param {CurrentWalletRecord['purses']} purses
  * @param {VBankAssetDetail[]} assets
  */
 export const purseBalanceTuples = (purses, assets) => {
@@ -115,7 +118,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 {CoalescedWalletState} state
  * @param {AgoricNamesRemotes} agoricNames
  */
 export const offerStatusTuples = (state, agoricNames) => {
@@ -171,8 +174,8 @@ 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 {CurrentWalletRecord} current
+ * @param {ReturnType<typeof makeWalletStateCoalescer>['state']} coalesced
  * @param {AgoricNamesRemotes} agoricNames
  */
 export const summarize = (current, coalesced, agoricNames) => {

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';

package/src/lib/packageManager.js

@@ -0,0 +1,24 @@
+// @ts-check
+
+/**
+ * @import { execFileSync } from 'child_process';
+ */
+
+/**
+ * Omits the root
+ *
+ * @param {{ execFileSync: execFileSync }} io
+ * @param {string} [root]
+ * @returns {Array<{ location: string, name: string }>}
+ */
+export const listWorkspaces = ({ execFileSync }, root) => {
+  const out = execFileSync('npm', ['query', '.workspace'], {
+    stdio: ['ignore', 'pipe', 'inherit'],
+    shell: true,
+    encoding: 'utf-8',
+    cwd: root,
+  });
+  /** @type {Array<{ location: string, name: string, description: string }>} */
+  const result = JSON.parse(out);
+  return result.filter(({ location }) => location !== '.');
+};

package/src/lib/wallet.js

@@ -11,6 +11,13 @@ import { execSwingsetTransaction, pollTx } from './chain.js';
  * @import {CurrentWalletRecord} from '@agoric/smart-wallet/src/smartWallet.js';
  * @import {AgoricNamesRemotes} from '@agoric/vats/tools/board-utils.js';
  * @import {MinimalNetworkConfig, VstorageKit} from '@agoric/client-utils';
+ * @import {UpdateRecord} from '@agoric/smart-wallet/src/smartWallet.js';
+ * @import {BridgeAction} from '@agoric/smart-wallet/src/smartWallet.js';
+ * @import {Writable} from 'stream';
+ * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js';
+ * @import {Follower} from '@agoric/casting';
+ * @import {ValueFollowerElement} from '@agoric/casting';
+ * @import {execFileSync} from 'child_process';
  */
 
 const marshaller = boardSlottingMarshaller();
@@ -26,15 +33,14 @@ const emptyCurrentRecord = {
 /**
  * @param {string} addr
  * @param {Pick<VstorageKit, 'readPublished'>} io
- * @returns {Promise<import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord>}
+ * @returns {Promise<CurrentWalletRecord>}
  */
 export const getCurrent = async (addr, { readPublished }) => {
   // Partial because older writes may not have had all properties
   // NB: assumes changes are only additions
-  let current =
-    /** @type {Partial<import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord> | undefined} */ (
-      await readPublished(`wallet.${addr}.current`)
-    );
+  let current = /** @type {Partial<CurrentWalletRecord> | undefined} */ (
+    await readPublished(`wallet.${addr}.current`)
+  );
   if (current === undefined) {
     throw Error(`undefined current node for ${addr}`);
   }
@@ -61,15 +67,15 @@ export const getCurrent = async (addr, { readPublished }) => {
 /**
  * @param {string} addr
  * @param {Pick<VstorageKit, 'readPublished'>} io
- * @returns {Promise<import('@agoric/smart-wallet/src/smartWallet.js').UpdateRecord>}
+ * @returns {Promise<UpdateRecord>}
  */
 export const getLastUpdate = (addr, { readPublished }) => {
   return readPublished(`wallet.${addr}`);
 };
 
 /**
- * @param {import('@agoric/smart-wallet/src/smartWallet.js').BridgeAction} bridgeAction
- * @param {Pick<import('stream').Writable,'write'>} [stdout]
+ * @param {BridgeAction} bridgeAction
+ * @param {Pick<Writable,'write'>} [stdout]
  */
 export const outputAction = (bridgeAction, stdout = process.stdout) => {
   const capData = marshaller.toCapData(harden(bridgeAction));
@@ -81,10 +87,10 @@ export const sendHint =
   'Now use `agoric wallet send ...` to sign and broadcast the offer.\n';
 
 /**
- * @param {import('@agoric/smart-wallet/src/smartWallet.js').BridgeAction} bridgeAction
+ * @param {BridgeAction} bridgeAction
  * @param {{
- *   stdout: Pick<import('stream').Writable,'write'>,
- *   stderr: Pick<import('stream').Writable,'write'>,
+ *   stdout: Pick<Writable,'write'>,
+ *   stderr: Pick<Writable,'write'>,
  * }} io
  */
 export const outputActionAndHint = (bridgeAction, { stdout, stderr }) => {
@@ -93,16 +99,16 @@ export const outputActionAndHint = (bridgeAction, { stdout, stderr }) => {
 };
 
 /**
- * @param {import('@agoric/smart-wallet/src/offers.js').OfferSpec} offer
- * @param {Pick<import('stream').Writable,'write'>} [stdout]
- * @param {Pick<import('stream').Writable,'write'>} [stderr]
+ * @param {OfferSpec} offer
+ * @param {Pick<Writable,'write'>} [stdout]
+ * @param {Pick<Writable,'write'>} [stderr]
  */
 export const outputExecuteOfferAction = (
   offer,
   stdout = process.stdout,
   stderr = process.stderr,
 ) => {
-  /** @type {import('@agoric/smart-wallet/src/smartWallet.js').BridgeAction} */
+  /** @type {BridgeAction} */
   const spendAction = {
     method: 'executeOffer',
     offer,
@@ -113,7 +119,7 @@ export const outputExecuteOfferAction = (
 
 /**
  * @deprecated use `.current` node for current state
- * @param {import('@agoric/casting').Follower<import('@agoric/casting').ValueFollowerElement<import('@agoric/smart-wallet/src/smartWallet.js').UpdateRecord>>} follower
+ * @param {Follower<ValueFollowerElement<UpdateRecord>>} follower
  * @param {Brand<'set'>} [invitationBrand]
  */
 export const coalesceWalletState = async (follower, invitationBrand) => {
@@ -143,14 +149,14 @@ export const coalesceWalletState = async (follower, invitationBrand) => {
  * Sign and broadcast a wallet-action.
  *
  * @throws { Error & { code: number } } if transaction fails
- * @param {import('@agoric/smart-wallet/src/smartWallet.js').BridgeAction} bridgeAction
+ * @param {BridgeAction} bridgeAction
  * @param {MinimalNetworkConfig & {
  *   from: string,
  *   fees?: string,
  *   verbose?: boolean,
  *   keyring?: {home?: string, backend: string},
- *   stdout: Pick<import('stream').Writable, 'write'>,
- *   execFileSync: typeof import('child_process').execFileSync,
+ *   stdout?: Pick<Writable, 'write'>,
+ *   execFileSync: typeof execFileSync,
  *   delay: (ms: number) => Promise<void>,
  *   dryRun?: boolean,
  * }} opts

package/src/main-publish.js

@@ -9,6 +9,10 @@ import { parseLocatedJson } from './json.js';
 
 import { makeBundlePublisher, makeCosmosBundlePublisher } from './publish.js';
 
+/**
+ * @import {CosmosConnectionSpec} from './publish.js';
+ */
+
 const publishMain = async (progname, rawArgs, powers, opts) => {
   const { fs } = powers;
 
@@ -23,7 +27,7 @@ const publishMain = async (progname, rawArgs, powers, opts) => {
     );
   }
 
-  /** @type {import('./publish.js').CosmosConnectionSpec} */
+  /** @type {CosmosConnectionSpec} */
   const connectionSpec = {
     type: 'chain-cosmos-sdk',
     rpcAddresses: [rpcAddress],