agoric 0.21.2-mainnet1B-dev-cfa7cb2.0 → 0.21.2-orchestration-dev-096c4e8.0

package/src/commands/{ec.js → gov.js}

@@ -1,4 +1,3 @@
-/* eslint-disable @jessie.js/no-nested-await */
 // @ts-check
 /* eslint-disable func-names */
 /* global globalThis, process, setTimeout */
@@ -16,6 +15,13 @@ import {
 
 /** @typedef {import('@agoric/smart-wallet/src/offers.js').OfferSpec} OfferSpec */
 
+const collectValues = (val, memo) => {
+  memo.push(val);
+  return memo;
+};
+
+const defaultKeyring = process.env.AGORIC_KEYRING_BACKEND || 'test';
+
 /**
  * @param {import('anylogger').Logger} _logger
  * @param {{
@@ -27,7 +33,7 @@ import {
  *   delay?: (ms: number) => Promise<void>,
  * }} [io]
  */
-export const makeEconomicCommiteeCommand = (_logger, io = {}) => {
+export const makeGovCommand = (_logger, io = {}) => {
   const {
     // Allow caller to provide access explicitly, but
     // default to conventional ambient IO facilities.
@@ -39,11 +45,22 @@ export const makeEconomicCommiteeCommand = (_logger, io = {}) => {
     delay = ms => new Promise(resolve => setTimeout(resolve, ms)),
   } = io;
 
-  const ec = new Command('ec').description('Economic Committee commands');
+  const cmd = new Command('gov').description('Electoral governance commands');
+  // backwards compatibility with less general "ec" command. To make this work
+  // the new CLI options default to the values used for Economic Committee
+  cmd.alias('ec');
+  cmd.option(
+    '--keyring-backend <os|file|test>',
+    `keyring's backend (os|file|test) (default "${defaultKeyring}")`,
+    defaultKeyring,
+  );
 
   /** @param {string} literalOrName */
   const normalizeAddress = literalOrName =>
-    normalizeAddressWithOptions(literalOrName, { keyringBackend: 'test' });
+    normalizeAddressWithOptions(literalOrName, {
+      // FIXME does not observe keyring-backend option, which isn't available during arg parsing
+      keyringBackend: defaultKeyring,
+    });
 
   /** @type {(info: unknown, indent?: unknown) => boolean } */
   const show = (info, indent) =>
@@ -62,17 +79,23 @@ export const makeEconomicCommiteeCommand = (_logger, io = {}) => {
    * given a sendFrom address; else print it.
    *
    * @param {{
-   *   toOffer: (agoricNames: *, current: import('@agoric/smart-wallet/src/smartWallet').CurrentWalletRecord | undefined) => OfferSpec,
+   *   toOffer: (agoricNames: *, current: import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord | undefined) => OfferSpec,
    *   sendFrom?: string | undefined,
+   *   keyringBackend: string,
    *   instanceName?: string,
    * }} detail
    * @param {Awaited<ReturnType<makeRpcUtils>>} [optUtils]
    */
-  const processOffer = async function ({ toOffer, sendFrom }, optUtils) {
+  const processOffer = async function (
+    { toOffer, sendFrom, keyringBackend },
+    optUtils,
+  ) {
     const networkConfig = await getNetworkConfig(env);
     const utils = await (optUtils || makeRpcUtils({ fetch }));
     const { agoricNames, readLatestHead } = utils;
 
+    assert(keyringBackend, 'missing keyring-backend option');
+
     let current;
     if (sendFrom) {
       current = await getCurrent(sendFrom, { readLatestHead });
@@ -90,7 +113,7 @@ export const makeEconomicCommiteeCommand = (_logger, io = {}) => {
     const result = await sendAction(
       { method: 'executeOffer', offer },
       {
-        keyring: { backend: 'test' }, // XXX
+        keyring: { backend: keyringBackend },
         from: sendFrom,
         verbose: false,
         ...networkConfig,
@@ -127,29 +150,38 @@ export const makeEconomicCommiteeCommand = (_logger, io = {}) => {
     show(blockInfo);
   };
 
-  ec.command('committee')
-    .description('accept invitation to join the economic committee')
+  cmd
+    .command('committee')
+    .description('accept invitation to join a committee')
+    .requiredOption(
+      '--name <string>',
+      'Committee instance name',
+      String,
+      'economicCommittee',
+    )
     .option('--voter <number>', 'Voter number', Number, 0)
     .option(
       '--offerId <string>',
       'Offer id',
       String,
-      `ecCommittee-${Date.now()}`,
+      `gov-committee-${Date.now()}`,
     )
     .option(
       '--send-from <name-or-address>',
       'Send from address',
       normalizeAddress,
     )
-    .action(async function (opts) {
+    .action(async function (opts, options) {
+      const { name: instanceName } = opts;
+
       /** @type {Parameters<typeof processOffer>[0]['toOffer']} */
       const toOffer = (agoricNames, current) => {
-        const instance = agoricNames.instance.economicCommittee;
-        assert(instance, `missing economicCommittee`);
+        const instance = agoricNames.instance[instanceName];
+        assert(instance, `missing ${instanceName}`);
 
         if (current) {
           const found = findContinuingIds(current, agoricNames);
-          abortIfSeen('economicCommittee', found);
+          abortIfSeen(instanceName, found);
         }
 
         return {
@@ -165,28 +197,37 @@ export const makeEconomicCommiteeCommand = (_logger, io = {}) => {
 
       await processOffer({
         toOffer,
-        instanceName: 'economicCommittee',
-        ...opts,
+        instanceName,
+        sendFrom: opts.sendFrom,
+        keyringBackend: options.optsWithGlobals().keyringBackend,
       });
     });
 
-  ec.command('charter')
+  cmd
+    .command('charter')
     .description('accept the charter invitation')
-    .option('--offerId <string>', 'Offer id', String, `ecCharter-${Date.now()}`)
+    .requiredOption(
+      '--name <string>',
+      'Charter instance name',
+      'economicCommitteeCharter',
+    )
+    .option('--offerId <string>', 'Offer id', String, `charter-${Date.now()}`)
     .option(
       '--send-from <name-or-address>',
       'Send from address',
       normalizeAddress,
     )
-    .action(async function (opts) {
+    .action(async function (opts, options) {
+      const { name: instanceName } = opts;
+
       /** @type {Parameters<typeof processOffer>[0]['toOffer']} */
       const toOffer = (agoricNames, current) => {
-        const instance = agoricNames.instance.econCommitteeCharter;
-        assert(instance, `missing econCommitteeCharter`);
+        const instance = agoricNames.instance[instanceName];
+        assert(instance, `missing ${instanceName}`);
 
         if (current) {
           const found = findContinuingIds(current, agoricNames);
-          abortIfSeen('econCommitteeCharter', found);
+          abortIfSeen(instanceName, found);
         }
 
         return {
@@ -202,12 +243,14 @@ export const makeEconomicCommiteeCommand = (_logger, io = {}) => {
 
       await processOffer({
         toOffer,
-        instanceName: 'econCommitteeCharter',
-        ...opts,
+        instanceName,
+        sendFrom: opts.sendFrom,
+        keyringBackend: options.optsWithGlobals().keyringBackend,
       });
     });
 
-  ec.command('find-continuing-id')
+  cmd
+    .command('find-continuing-id')
     .description('print id of specified voting continuing invitation')
     .requiredOption(
       '--from <name-or-address>',
@@ -233,7 +276,8 @@ export const makeEconomicCommiteeCommand = (_logger, io = {}) => {
       console.log(match.offerId);
     });
 
-  ec.command('find-continuing-ids')
+  cmd
+    .command('find-continuing-ids')
     .description('print records of voting continuing invitations')
     .requiredOption(
       '--from <name-or-address>',
@@ -245,12 +289,27 @@ export const makeEconomicCommiteeCommand = (_logger, io = {}) => {
       const current = await getCurrent(opts.from, { readLatestHead });
 
       const found = findContinuingIds(current, agoricNames);
-      found.forEach(it => show({ ...it, address: opts.from }));
+      for (const it of found) {
+        show({ ...it, address: opts.from });
+      }
     });
 
-  ec.command('vote')
-    .description('vote on a question (hard-coded for now))')
-    .option('--offerId <number>', 'Offer id', String, `ecVote-${Date.now()}`)
+  cmd
+    .command('vote')
+    .description('vote on latest question')
+    .requiredOption(
+      '--instance <string>',
+      'Committee name under agoricNames.instances',
+      String,
+      'economicCommittee',
+    )
+    .requiredOption(
+      '--pathname <string>',
+      'Committee name under published.committees',
+      String,
+      'Economic_Committee',
+    )
+    .option('--offerId <number>', 'Offer id', String, `gov-vote-${Date.now()}`)
     .requiredOption(
       '--forPosition <number>',
       'index of one position to vote for (within the question description.positions); ',
@@ -261,17 +320,18 @@ export const makeEconomicCommiteeCommand = (_logger, io = {}) => {
       'Send from address',
       normalizeAddress,
     )
-    .action(async function (opts) {
+    .action(async function (opts, options) {
       const utils = await makeRpcUtils({ fetch });
       const { readLatestHead } = utils;
 
       const info = await readLatestHead(
-        'published.committees.Economic_Committee.latestQuestion',
+        `published.committees.${opts.pathname}.latestQuestion`,
       ).catch(err => {
         throw new CommanderError(1, 'VSTORAGE_FAILURE', err.message);
       });
+
       // XXX runtime shape-check
-      const questionDesc = /** @type {any} */ (info);
+      const questionDesc = /** @type {QuestionDetails} */ (info);
 
       // TODO support multiple position arguments
       const chosenPositions = [questionDesc.positions[opts.forPosition]];
@@ -280,9 +340,7 @@ export const makeEconomicCommiteeCommand = (_logger, io = {}) => {
       /** @type {Parameters<typeof processOffer>[0]['toOffer']} */
       const toOffer = (agoricNames, current) => {
         const cont = current ? findContinuingIds(current, agoricNames) : [];
-        const votingRight = cont.find(
-          it => it.instance === agoricNames.instance.economicCommittee,
-        );
+        const votingRight = cont.find(it => it.instanceName === opts.instance);
         if (!votingRight) {
           console.debug('continuing ids', cont, 'for', current);
           throw new CommanderError(
@@ -307,8 +365,89 @@ export const makeEconomicCommiteeCommand = (_logger, io = {}) => {
         };
       };
 
-      await processOffer({ toOffer, sendFrom: opts.sendFrom }, utils);
+      await processOffer(
+        {
+          toOffer,
+          sendFrom: opts.sendFrom,
+          keyringBackend: options.optsWithGlobals().keyringBackend,
+        },
+        utils,
+      );
+    });
+
+  cmd
+    .command('proposePauseOffers')
+    .description('propose a vote to pause offers')
+    .option(
+      '--send-from <name-or-address>',
+      'Send from address',
+      normalizeAddress,
+    )
+    .option(
+      '--offerId <string>',
+      'Offer id',
+      String,
+      `proposePauseOffers-${Date.now()}`,
+    )
+    .requiredOption(
+      '--instance <string>',
+      'name of governed instance in agoricNames',
+    )
+    .requiredOption(
+      '--substring <string>',
+      'an offer string to pause (can be repeated)',
+      collectValues,
+      [],
+    )
+    .option(
+      '--deadline <minutes>',
+      'minutes from now to close the vote',
+      Number,
+      1,
+    )
+    .action(async function (opts, options) {
+      const { instance: instanceName } = opts;
+
+      /** @type {Parameters<typeof processOffer>[0]['toOffer']} */
+      const toOffer = (agoricNames, current) => {
+        const instance = agoricNames.instance[instanceName];
+        assert(instance, `missing ${instanceName}`);
+        assert(current, 'missing current wallet');
+
+        const known = findContinuingIds(current, agoricNames);
+
+        assert(known, 'could not find committee acceptance offer id');
+
+        // TODO magic string
+        const match = known.find(
+          r => r.description === 'charter member invitation',
+        );
+        assert(match, 'no offer found for charter member invitation');
+
+        return {
+          id: opts.offerId,
+          invitationSpec: {
+            source: 'continuing',
+            previousOffer: match.offerId,
+            invitationMakerName: 'VoteOnPauseOffers',
+            // ( instance, strings list, timer deadline seconds )
+            invitationArgs: harden([
+              instance,
+              opts.substring,
+              BigInt(opts.deadline * 60 + Math.round(Date.now() / 1000)),
+            ]),
+          },
+          proposal: {},
+        };
+      };
+
+      await processOffer({
+        toOffer,
+        instanceName,
+        sendFrom: opts.sendFrom,
+        keyringBackend: options.optsWithGlobals().keyringBackend,
+      });
     });
 
-  return ec;
+  return cmd;
 };

package/src/commands/inter.js

@@ -11,11 +11,6 @@ import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
 import { objectMap } from '@agoric/internal';
 import { M, matches } from '@agoric/store';
 
-// XXX scare away ambient type zombies to fix ScheduleNotification.activeStartTime etc.
-// https://github.com/Agoric/agoric-sdk/issues/6512
-// https://github.com/Agoric/agoric-sdk/issues/6343
-import '@agoric/inter-protocol/src/vaultFactory/types.js';
-
 import { normalizeAddressWithOptions, pollBlocks } from '../lib/chain.js';
 import {
   asBoardRemote,
@@ -25,7 +20,6 @@ import {
 import { getNetworkConfig } from '../lib/rpc.js';
 import {
   getCurrent,
-  makeParseAmount,
   makeWalletUtils,
   outputActionAndHint,
   sendAction,
@@ -40,7 +34,7 @@ const bidInvitationShape = harden({
 });
 
 /** @typedef {import('@agoric/vats/tools/board-utils.js').VBankAssetDetail } AssetDescriptor */
-/** @typedef {import('@agoric/smart-wallet/src/smartWallet').TryExitOfferAction } TryExitOfferAction */
+/** @typedef {import('@agoric/smart-wallet/src/smartWallet.js').TryExitOfferAction } TryExitOfferAction */
 /** @typedef {import('@agoric/inter-protocol/src/auction/auctionBook.js').OfferSpec}  BidSpec */
 /** @typedef {import('@agoric/inter-protocol/src/auction/scheduler.js').ScheduleNotification} ScheduleNotification */
 /** @typedef {import('@agoric/inter-protocol/src/auction/auctionBook.js').BookDataNotification} BookDataNotification */
@@ -71,12 +65,12 @@ const makeFormatters = assets => {
     r4(100 - (Number(r.numerator.value) / Number(r.denominator.value)) * 100);
 
   // XXX real TimeMath.absValue requires real Remotable timerBrand
-  /** @param {import('@agoric/time/src/types.js').Timestamp} ts */
+  /** @param {import('@agoric/time').Timestamp} ts */
   const absValue = ts => (typeof ts === 'bigint' ? ts : ts.absValue);
 
-  /** @param {import('@agoric/time/src/types.js').Timestamp} tr */
+  /** @param {import('@agoric/time').Timestamp} tr */
   const absTime = tr => new Date(Number(absValue(tr)) * 1000).toISOString();
-  /** @param {import('@agoric/time/src/types.js').RelativeTimeRecord} tr */
+  /** @param {import('@agoric/time').RelativeTimeRecord} tr */
   const relTime = tr =>
     new Date(Number(tr.relValue) * 1000).toISOString().slice(11, 19);
 
@@ -88,7 +82,7 @@ const makeFormatters = assets => {
    * @param {(_: T) => string} f
    * @returns { (x: T | null | undefined ) => string | undefined }
    */
-  const maybe = f => x => x ? f(x) : undefined;
+  const maybe = f => x => (x ? f(x) : undefined);
 
   return {
     amount,
@@ -108,7 +102,7 @@ const makeFormatters = assets => {
  * Dynamic check that an OfferStatus is also a BidSpec.
  *
  * @param {import('@agoric/smart-wallet/src/offers.js').OfferStatus} offerStatus
- * @param {Awaited<ReturnType<import('../lib/rpc').makeAgoricNames>>} agoricNames
+ * @param {import('../lib/wallet.js').AgoricNamesRemotes} agoricNames
  * @param {typeof console.warn} warn
  * returns null if offerStatus is not a BidSpec
  */
@@ -206,6 +200,10 @@ export const makeInterCommand = (
   const interCmd = createCommand('inter')
     .description('Inter Protocol commands for liquidation bidding etc.')
     .option('--home <dir>', 'agd CosmosSDK application home directory')
+    .option(
+      '--fees <amount>',
+      'set fees for transaction broadcast (e.g. 5000ubld)',
+    )
     .option(
       '--keyring-backend <os|file|test>',
       `keyring's backend (os|file|test) (default "${
@@ -238,7 +236,6 @@ export const makeInterCommand = (
     try {
       // XXX pass fetch to getNetworkConfig() explicitly
       // await null above makes this await safe
-      // eslint-disable-next-line @jessie.js/no-nested-await
       const networkConfig = await getNetworkConfig(env);
       return makeWalletUtils({ fetch, execFileSync, delay }, networkConfig);
     } catch (err) {
@@ -339,10 +336,10 @@ inter auction status
     const { networkConfig, agoricNames, pollOffer } = tools;
     const io = { ...networkConfig, execFileSync, delay, stdout };
 
-    const { home, keyringBackend: backend } = interCmd.opts();
+    const { home, keyringBackend: backend, fees } = interCmd.opts();
     const result = await sendAction(
       { method: 'executeOffer', offer },
-      { keyring: { home, backend }, from, verbose: false, dryRun, ...io },
+      { keyring: { home, backend }, from, fees, verbose: false, dryRun, ...io },
     );
     if (dryRun) {
       return;
@@ -416,14 +413,7 @@ inter auction status
       async ({ generateOnly, dryRun, ...opts }) => {
         const tools = await tryMakeUtils();
 
-        const parseAmount = makeParseAmount(
-          tools.agoricNames,
-          msg => new InvalidArgumentError(msg),
-        );
-        const offer = Offers.auction.Bid(tools.agoricNames.brand, {
-          ...opts,
-          parseAmount,
-        });
+        const offer = Offers.auction.Bid(tools.agoricNames, opts);
 
         if (generateOnly) {
           outputActionAndHint(
@@ -464,14 +454,7 @@ inter auction status
       async ({ generateOnly, ...opts }) => {
         const tools = await tryMakeUtils();
 
-        const parseAmount = makeParseAmount(
-          tools.agoricNames,
-          msg => new InvalidArgumentError(msg),
-        );
-        const offer = Offers.auction.Bid(tools.agoricNames.brand, {
-          ...opts,
-          parseAmount,
-        });
+        const offer = Offers.auction.Bid(tools.agoricNames, opts);
         if (generateOnly) {
           outputActionAndHint(
             { method: 'executeOffer', offer },

package/src/commands/oracle.js

@@ -1,5 +1,3 @@
-/* eslint-disable no-await-in-loop */
-/* eslint-disable @jessie.js/no-nested-await */
 // @ts-check
 /* eslint-disable func-names */
 /* global fetch, setTimeout, process */
@@ -9,6 +7,7 @@ import { Nat } from '@endo/nat';
 import { Command } from 'commander';
 import * as cp from 'child_process';
 import { inspect } from 'util';
+import { oracleBrandFeedName } from '@agoric/inter-protocol/src/proposals/utils.js';
 import { normalizeAddressWithOptions } from '../lib/chain.js';
 import { getNetworkConfig, makeRpcUtils, storageHelper } from '../lib/rpc.js';
 import {
@@ -16,6 +15,7 @@ import {
   makeWalletUtils,
   outputAction,
   sendAction,
+  sendHint,
 } from '../lib/wallet.js';
 import { bigintReplacer } from '../lib/format.js';
 
@@ -71,13 +71,18 @@ export const makeOracleCommand = (logger, io = {}) => {
       env.AGORIC_KEYRING_BACKEND,
     );
 
+  const normalizeAddress = literalOrName =>
+    normalizeAddressWithOptions(literalOrName, oracle.opts(), {
+      execFileSync,
+    });
+
   const rpcTools = async () => {
     // XXX pass fetch to getNetworkConfig() explicitly
     const networkConfig = await getNetworkConfig(env);
     const utils = await makeRpcUtils({ fetch });
 
     const lookupPriceAggregatorInstance = ([brandIn, brandOut]) => {
-      const name = `${brandIn}-${brandOut} price feed`;
+      const name = oracleBrandFeedName(brandIn, brandOut);
       const instance = utils.agoricNames.instance[name];
       if (!instance) {
         logger.debug('known instances:', utils.agoricNames.instance);
@@ -124,7 +129,7 @@ export const makeOracleCommand = (logger, io = {}) => {
         offer,
       });
 
-      console.warn('Now execute the prepared offer');
+      console.warn(sendHint);
     });
 
   oracle
@@ -159,10 +164,10 @@ export const makeOracleCommand = (logger, io = {}) => {
         offer,
       });
 
-      console.warn('Now execute the prepared offer');
+      console.warn(sendHint);
     });
 
-  const findOracleCap = async (from, readLatestHead) => {
+  const findOracleCap = async (instance, from, readLatestHead) => {
     const current = await getCurrent(from, { readLatestHead });
 
     const { offerToUsedInvitation: entries } = /** @type {any} */ (current);
@@ -170,8 +175,8 @@ export const makeOracleCommand = (logger, io = {}) => {
 
     for (const [offerId, { value }] of entries) {
       /** @type {{ description: string, instance: unknown }[]} */
-      const [{ description }] = value;
-      if (description === 'oracle invitation') {
+      const [{ description, instance: candidate }] = value;
+      if (description === 'oracle invitation' && candidate === instance) {
         return offerId;
       }
     }
@@ -180,11 +185,22 @@ export const makeOracleCommand = (logger, io = {}) => {
   oracle
     .command('find-continuing-id')
     .description('print id of specified oracle continuing invitation')
-    .requiredOption('--from <address>', 'from address', String)
+    .requiredOption(
+      '--from <address>',
+      'wallet address literal or name',
+      normalizeAddress,
+    )
+    .requiredOption(
+      '--pair [brandIn.brandOut]',
+      'token pair (brandIn.brandOut)',
+      s => s.split('.'),
+    )
     .action(async opts => {
-      const { readLatestHead } = await makeRpcUtils({ fetch });
+      const { readLatestHead, lookupPriceAggregatorInstance } =
+        await rpcTools();
+      const instance = lookupPriceAggregatorInstance(opts.pair);
 
-      const offerId = await findOracleCap(opts.from, readLatestHead);
+      const offerId = await findOracleCap(instance, opts.from, readLatestHead);
       if (!offerId) {
         console.error('No continuing ids found');
       }
@@ -212,11 +228,6 @@ export const makeOracleCommand = (logger, io = {}) => {
       console.log(inspect(capDatas[0], { depth: 10, colors: true }));
     });
 
-  /** @param {string} literalOrName */
-  const normalizeAddress = literalOrName =>
-    normalizeAddressWithOptions(literalOrName, oracle.opts(), {
-      execFileSync,
-    });
   const show = (info, indent = false) =>
     stdout.write(
       `${JSON.stringify(info, bigintReplacer, indent ? 2 : undefined)}\n`,
@@ -250,7 +261,8 @@ export const makeOracleCommand = (logger, io = {}) => {
          * }}
          */ { pair, keys, price },
       ) => {
-        const { readLatestHead, networkConfig } = await rpcTools();
+        const { readLatestHead, networkConfig, lookupPriceAggregatorInstance } =
+          await rpcTools();
         const wutil = await makeWalletUtils(
           { fetch, execFileSync, delay },
           networkConfig,
@@ -308,9 +320,12 @@ export const makeOracleCommand = (logger, io = {}) => {
           console.warn(err);
         });
 
+        const instance = lookupPriceAggregatorInstance(pair);
+
         console.error('pushPrice from each:', keyOrder);
         for await (const from of keyOrder) {
           const oracleAdminAcceptOfferId = await findOracleCap(
+            instance,
             from,
             readLatestHead,
           );

package/src/commands/perf.js

@@ -1,5 +1,3 @@
-/* eslint-disable no-await-in-loop */
-/* eslint-disable @jessie.js/no-nested-await */
 // @ts-check
 /* eslint-disable func-names */
 /* global process */

package/src/commands/psm.js

@@ -1,5 +1,3 @@
-/* eslint-disable no-await-in-loop */
-/* eslint-disable @jessie.js/no-nested-await */
 // @ts-check
 /* eslint-disable func-names */
 /* global fetch, process */
@@ -153,15 +151,17 @@ export const makePsmCommand = logger => {
     .option('--giveMinted <DOLLARS>', 'amount of minted tokens to give', Number)
     .option('--feePct [%]', 'Gas fee percentage', Number)
     .option('--offerId <string>', 'Offer id', String, `swap-${Date.now()}`)
-    .action(async function (
-      /** @type {Parameters<typeof Offers.psm.swap>[2]} */ opts,
-    ) {
-      console.warn('running with options', opts);
-      const { agoricNames, lookupPsmInstance } = await rpcTools();
-      const instance = await lookupPsmInstance(opts.pair);
-      const offer = Offers.psm.swap(instance, agoricNames.brand, opts);
-      outputExecuteOfferAction(offer);
-    });
+    .action(
+      async function (
+        /** @type {Parameters<typeof Offers.psm.swap>[2]} */ opts,
+      ) {
+        console.warn('running with options', opts);
+        const { agoricNames, lookupPsmInstance } = await rpcTools();
+        const instance = await lookupPsmInstance(opts.pair);
+        const offer = Offers.psm.swap(agoricNames, instance, opts);
+        outputExecuteOfferAction(offer);
+      },
+    );
 
   psm
     .command('proposePauseOffers')
@@ -216,8 +216,6 @@ export const makePsmCommand = logger => {
       };
 
       outputExecuteOfferAction(offer);
-
-      console.warn('Now execute the prepared offer');
     });
 
   psm
@@ -272,8 +270,6 @@ export const makePsmCommand = logger => {
       };
 
       outputExecuteOfferAction(offer);
-
-      console.warn('Now execute the prepared offer');
     });
 
   return psm;