agoric 0.21.2-dev-cbcea8c.0.cbcea8c → 0.21.2-dev-5ff5e7a.0.5ff5e7a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-dev-cbcea8c.0.cbcea8c",
+  "version": "0.21.2-dev-5ff5e7a.0.5ff5e7a",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -30,28 +30,27 @@
     "lint:eslint": "node ../../scripts/eslint-repo.mjs ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.41.4-dev-cbcea8c.0.cbcea8c",
-    "@agoric/deploy-script-support": "0.10.4-dev-cbcea8c.0.cbcea8c",
+    "@agoric/cosmic-swingset": "0.41.4-dev-5ff5e7a.0.5ff5e7a",
+    "@agoric/deploy-script-support": "0.10.4-dev-5ff5e7a.0.5ff5e7a",
     "ava": "^7.0.0",
     "c8": "^10.1.2"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-cbcea8c.0.cbcea8c",
-    "@agoric/cache": "0.3.3-dev-cbcea8c.0.cbcea8c",
-    "@agoric/casting": "0.4.3-dev-cbcea8c.0.cbcea8c",
-    "@agoric/client-utils": "0.1.1-dev-cbcea8c.0.cbcea8c",
-    "@agoric/cosmic-proto": "0.4.1-dev-cbcea8c.0.cbcea8c",
-    "@agoric/ertp": "0.16.3-dev-cbcea8c.0.cbcea8c",
-    "@agoric/governance": "0.10.4-dev-cbcea8c.0.cbcea8c",
-    "@agoric/inter-protocol": "0.16.2-dev-cbcea8c.0.cbcea8c",
-    "@agoric/internal": "0.3.3-dev-cbcea8c.0.cbcea8c",
-    "@agoric/network": "0.1.1-dev-cbcea8c.0.cbcea8c",
-    "@agoric/smart-wallet": "0.5.4-dev-cbcea8c.0.cbcea8c",
-    "@agoric/store": "0.9.3-dev-cbcea8c.0.cbcea8c",
-    "@agoric/swingset-vat": "0.32.3-dev-cbcea8c.0.cbcea8c",
-    "@agoric/vats": "0.15.2-dev-cbcea8c.0.cbcea8c",
-    "@agoric/zoe": "0.26.3-dev-cbcea8c.0.cbcea8c",
-    "@agoric/zone": "0.2.3-dev-cbcea8c.0.cbcea8c",
+    "@agoric/access-token": "0.4.22-dev-5ff5e7a.0.5ff5e7a",
+    "@agoric/cache": "0.3.3-dev-5ff5e7a.0.5ff5e7a",
+    "@agoric/casting": "0.4.3-dev-5ff5e7a.0.5ff5e7a",
+    "@agoric/client-utils": "0.1.1-dev-5ff5e7a.0.5ff5e7a",
+    "@agoric/cosmic-proto": "0.4.1-dev-5ff5e7a.0.5ff5e7a",
+    "@agoric/ertp": "0.16.3-dev-5ff5e7a.0.5ff5e7a",
+    "@agoric/governance": "0.10.4-dev-5ff5e7a.0.5ff5e7a",
+    "@agoric/internal": "0.3.3-dev-5ff5e7a.0.5ff5e7a",
+    "@agoric/network": "0.1.1-dev-5ff5e7a.0.5ff5e7a",
+    "@agoric/smart-wallet": "0.5.4-dev-5ff5e7a.0.5ff5e7a",
+    "@agoric/store": "0.9.3-dev-5ff5e7a.0.5ff5e7a",
+    "@agoric/swingset-vat": "0.32.3-dev-5ff5e7a.0.5ff5e7a",
+    "@agoric/vats": "0.15.2-dev-5ff5e7a.0.5ff5e7a",
+    "@agoric/zoe": "0.26.3-dev-5ff5e7a.0.5ff5e7a",
+    "@agoric/zone": "0.2.3-dev-5ff5e7a.0.5ff5e7a",
     "@cosmjs/crypto": "^0.36.0",
     "@cosmjs/encoding": "^0.36.0",
     "@cosmjs/math": "^0.36.0",
@@ -102,5 +101,5 @@
   "engines": {
     "node": "^22.11"
   },
-  "gitHead": "cbcea8c2415f2c9c4bc1ea9ff90730f2773bafaa"
+  "gitHead": "5ff5e7aa9e8c42795c47aabc7222eb56a2915011"
 }

package/src/bin-agops.js

@@ -11,11 +11,7 @@ import path from 'node:path';
 import process from 'node:process';
 import anylogger from '@agoric/internal/vendor/anylogger.js';
 import { Command, CommanderError, createCommand } from 'commander';
-import { makeOracleCommand } from './commands/oracle.js';
 import { makeGovCommand } from './commands/gov.js';
-import { makePsmCommand } from './commands/psm.js';
-import { makeReserveCommand } from './commands/reserve.js';
-import { makeVaultsCommand } from './commands/vaults.js';
 import { makePerfCommand } from './commands/perf.js';
 import { makeTestCommand } from './commands/test-upgrade.js';
 
@@ -27,8 +23,6 @@ program.name(progname).version('unversioned');
 
 program.addCommand(makeGovCommand(logger));
 program.addCommand(makePerfCommand(logger));
-program.addCommand(makePsmCommand(logger));
-program.addCommand(makeVaultsCommand(logger));
 
 /**
  * XXX Threading I/O powers has gotten a bit jumbled.
@@ -63,8 +57,6 @@ const procIO = {
   setTimeout,
 };
 
-program.addCommand(makeOracleCommand(procIO, logger));
-program.addCommand(makeReserveCommand(logger, procIO));
 program.addCommand(makeTestCommand(procIO, { fetch }));
 
 void E.when(program.parseAsync(process.argv), undefined, err => {

package/src/sdk-package-names.js

@@ -1,7 +1,6 @@
 // DO NOT EDIT - automatically generated by get-sdk-package-names.js
 // prettier-ignore
 export default [
-  "@aglocal/benchmark",
   "@aglocal/boot",
   "@aglocal/deployment",
   "@aglocal/fast-usdc-contract",
@@ -28,7 +27,6 @@ export default [
   "@agoric/fast-usdc",
   "@agoric/governance",
   "@agoric/import-manager",
-  "@agoric/inter-protocol",
   "@agoric/internal",
   "@agoric/kmarshal",
   "@agoric/network",

package/src/commands/oracle.js

@@ -1,414 +0,0 @@
-// @ts-check
-/* eslint-disable func-names */
-/* eslint-env node */
-import {
-  fetchEnvNetworkConfig,
-  makeAgoricNames,
-  makeVstorageKit,
-  makeWalletUtils,
-  storageHelper,
-} from '@agoric/client-utils';
-import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
-import { oracleBrandFeedName } from '@agoric/inter-protocol/src/proposals/utils.js';
-import { Fail } from '@endo/errors';
-import { Nat } from '@endo/nat';
-import { Command } from 'commander';
-import { inspect } from 'node:util';
-import { normalizeAddressWithOptions } from '../lib/chain.js';
-import { bigintReplacer } from '../lib/format.js';
-import {
-  getCurrent,
-  outputAction,
-  sendAction,
-  sendHint,
-} from '../lib/wallet.js';
-
-/**
- * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
- * @import {Writable} from 'stream';
- * @import {Logger} from '@agoric/internal/vendor/anylogger.js';
- * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js';
- * @import {TimestampRecord} from '@agoric/time';
- */
-
-// XXX support other decimal places
-const COSMOS_UNIT = 1_000_000n;
-/** @param {number} num */
-const scaleDecimals = num => BigInt(Math.round(num * Number(COSMOS_UNIT)));
-
-/**
- * Prints JSON output to stdout and diagnostic info (like logs) to stderr
- *
- * @param {{
- *   createCommand: typeof import('commander').createCommand,
- *   env: Partial<Record<string, string>>,
- *   execFileSync: typeof import('child_process').execFileSync,
- *   now: () => number,
- *   setTimeout: typeof globalThis.setTimeout,
- *   stderr: Pick<Writable,'write'>,
- *   stdout: Pick<Writable,'write'>,
- * }} process
- * @param {Logger} [logger]
- */
-export const makeOracleCommand = (
-  { env, execFileSync, setTimeout, stderr, stdout },
-  logger,
-) => {
-  /**
-   * @param {number} ms
-   * @returns {Promise<void>}
-   */
-  const delay = ms => new Promise(resolve => setTimeout(resolve, ms));
-
-  const oracle = new Command('oracle')
-    .description('Oracle commands')
-    .usage(
-      `
-  WALLET=my-wallet
-  export AGORIC_NET=ollinet
-
-  # provision wallet if necessary
-  agd keys add $WALLET
-  # provision with faucet, e.g.
-  open https://ollinet.faucet.agoric.net/ # and paste the key and choose client: smart-wallet
-
-  # confirm funds
-  agoric wallet list
-  agoric wallet show —from $WALLET
-
-  # prepare an offer to send
-  # (offerId is optional but best to specify as each must be higher than the last and the default value is a huge number)
-  agops oracle accept --offerId 12 > offer-12.json
-
-  # sign and send
-  agoric wallet send --from $WALLET --offer offer-12.json
-  `,
-    )
-    .option(
-      '--keyring-backend <os|file|test>',
-      `keyring's backend (os|file|test) (default "${
-        env.AGORIC_KEYRING_BACKEND || 'os'
-      }")`,
-      env.AGORIC_KEYRING_BACKEND,
-    );
-
-  const normalizeAddress = literalOrName =>
-    normalizeAddressWithOptions(literalOrName, oracle.opts(), {
-      execFileSync,
-    });
-
-  const rpcTools = async () => {
-    // XXX pass fetch to getNetworkConfig() explicitly
-    const networkConfig = await fetchEnvNetworkConfig({
-      env: process.env,
-      fetch,
-    });
-    const vsk = makeVstorageKit({ fetch }, networkConfig);
-    const agoricNames = await makeAgoricNames(vsk.fromBoard, vsk.vstorage);
-
-    const lookupPriceAggregatorInstance = ([brandIn, brandOut]) => {
-      const name = oracleBrandFeedName(brandIn, brandOut);
-      const instance = agoricNames.instance[name];
-      if (!instance) {
-        logger && logger.debug('known instances:', agoricNames.instance);
-        throw Error(`Unknown instance ${name}`);
-      }
-      return instance;
-    };
-
-    return { ...vsk, networkConfig, lookupPriceAggregatorInstance };
-  };
-
-  oracle
-    .command('accept')
-    .description('accept invitation to operate an oracle')
-    .requiredOption(
-      '--pair [brandIn.brandOut]',
-      'token pair (brandIn.brandOut)',
-      s => s.split('.'),
-      ['ATOM', 'USD'],
-    )
-    .option(
-      '--offerId <string>',
-      'Offer id',
-      String,
-      `oracleAccept-${Date.now()}`,
-    )
-    .action(async function (opts) {
-      const { lookupPriceAggregatorInstance } = await rpcTools();
-      const instance = lookupPriceAggregatorInstance(opts.pair);
-
-      /** @type {OfferSpec} */
-      const offer = {
-        id: opts.offerId,
-        invitationSpec: {
-          source: 'purse',
-          instance,
-          description: 'oracle invitation',
-        },
-        proposal: {},
-      };
-
-      outputAction(
-        {
-          method: 'executeOffer',
-          offer,
-        },
-        stdout,
-      );
-
-      stderr.write(sendHint);
-    });
-
-  oracle
-    .command('pushPriceRound')
-    .description('add a price for a round to a fluxAggregator')
-    .option(
-      '--offerId <string>',
-      'Offer id',
-      String,
-      `pushPriceRound-${Date.now()}`,
-    )
-    .requiredOption(
-      '--oracleAdminAcceptOfferId <string>',
-      'offer that had continuing invitation result',
-      String,
-    )
-    .requiredOption('--price <number>', 'price', Number)
-    .option('--roundId <number>', 'round', Number)
-    .action(async function (opts) {
-      const { offerId } = opts;
-      const unitPrice = scaleDecimals(opts.price);
-      const roundId = 'roundId' in opts ? Nat(opts.roundId) : undefined;
-
-      const offer = Offers.fluxAggregator.PushPrice(
-        {},
-        { offerId, unitPrice, roundId },
-        opts.oracleAdminAcceptOfferId,
-      );
-
-      outputAction(
-        {
-          method: 'executeOffer',
-          offer,
-        },
-        stdout,
-      );
-
-      stderr.write(sendHint);
-    });
-
-  const findOracleCap = async (instance, from, readPublished) => {
-    const current = await getCurrent(from, { readPublished });
-
-    const { offerToUsedInvitation: entries } = /** @type {any} */ (current);
-    Array.isArray(entries) || Fail`entries must be an array: ${entries}`;
-
-    for (const [offerId, { value }] of entries) {
-      /** @type {{ description: string, instance: unknown }[]} */
-      const [{ description, instance: candidate }] = value;
-      if (description === 'oracle invitation' && candidate === instance) {
-        return offerId;
-      }
-    }
-  };
-
-  oracle
-    .command('find-continuing-id')
-    .description('print id of specified oracle continuing invitation')
-    .requiredOption(
-      '--from <address>',
-      'wallet address literal or name',
-      normalizeAddress,
-    )
-    .requiredOption(
-      '--pair [brandIn.brandOut]',
-      'token pair (brandIn.brandOut)',
-      s => s.split('.'),
-    )
-    .action(async opts => {
-      const { readPublished, lookupPriceAggregatorInstance } = await rpcTools();
-      const instance = lookupPriceAggregatorInstance(opts.pair);
-
-      const offerId = await findOracleCap(instance, opts.from, readPublished);
-      if (!offerId) {
-        console.error('No continuing ids found');
-      }
-      console.log(offerId);
-    });
-
-  oracle
-    .command('query')
-    .description('return current aggregated (median) price')
-    .requiredOption(
-      '--pair [brandIn.brandOut]',
-      'token pair (brandIn.brandOut)',
-      s => s.split('.'),
-      ['ATOM', 'USD'],
-    )
-    .action(async function (opts) {
-      const { pair } = opts;
-      const { vstorage, fromBoard } = await rpcTools();
-
-      const capDataStr = await vstorage.readLatest(
-        `published.priceFeed.${pair[0]}-${pair[1]}_price_feed`,
-      );
-      const capDatas = storageHelper.unserializeTxt(capDataStr, fromBoard);
-
-      console.log(inspect(capDatas[0], { depth: 10, colors: true }));
-    });
-
-  const show = (info, indent = false) =>
-    stdout.write(
-      `${JSON.stringify(info, bigintReplacer, indent ? 2 : undefined)}\n`,
-    );
-  /** @param {bigint} secs */
-  const fmtSecs = secs => new Date(Number(secs) * 1000).toISOString();
-
-  oracle
-    .command('setPrice')
-    .description('set price by pushing from multiple operators')
-    .requiredOption(
-      '--pair [brandIn.brandOut]',
-      'token pair (brandIn.brandOut)',
-      s => s.split('.'),
-      ['ATOM', 'USD'],
-    )
-    .requiredOption(
-      '--keys [key1,key2,...]',
-      'key names of operators (comma separated)',
-      s => s.split(','),
-      ['gov1', 'gov2'],
-    )
-    .requiredOption('--price <number>', 'price', Number)
-    .action(
-      async (
-        /**
-         * @type {{
-         *  pair: [brandIn: string, brandOut: string],
-         *  keys: string[],
-         *  price: number,
-         * }}
-         */ { pair, keys, price },
-      ) => {
-        const {
-          readLatestHead,
-          readPublished,
-          networkConfig,
-          lookupPriceAggregatorInstance,
-        } = await rpcTools();
-        const wutil = await makeWalletUtils({ fetch, delay }, networkConfig);
-        const unitPrice = scaleDecimals(price);
-
-        const feedPath = `published.priceFeed.${pair[0]}-${pair[1]}_price_feed`;
-
-        const readPrice = () =>
-          /** @type {Promise<PriceDescription>} */ (
-            readLatestHead(feedPath).catch(() => {
-              const viewer = `https://vstorage.agoric.net/#${networkConfig.rpcAddrs[0]}|published,published.priceFeed|${feedPath}`;
-              stderr.write(`no existing price data; see ${viewer}`);
-              return undefined;
-            })
-          );
-
-        const r4 = x => Math.round(x * 10000) / 10000; // XXX 4 decimals arbitrary
-        const fmtFeed = ({
-          amountIn: { value: valueIn },
-          amountOut: { value: valueOut },
-          timestamp: { absValue: ts },
-        }) => ({
-          timestamp: fmtSecs(ts),
-          price: r4(Number(valueOut) / Number(valueIn)),
-        });
-        const before = await readPrice();
-        if (before) {
-          show(fmtFeed(before));
-        }
-
-        const keyOrder = keys.map(normalizeAddress);
-        if (before) {
-          console.error(
-            'Choose lead oracle operator order based on latestRound...',
-          );
-
-          const latestRoundP =
-            /** @type {Promise<{roundId: number, startedAt: TimestampRecord, startedBy: string}>} */ (
-              readLatestHead(
-                `published.priceFeed.${pair[0]}-${pair[1]}_price_feed.latestRound`,
-              )
-            );
-          await Promise.race([
-            delay(5000),
-            latestRoundP.then(round => {
-              const { roundId, startedAt, startedBy } = round;
-              show({
-                startedAt: fmtSecs(startedAt.absValue),
-                roundId,
-                startedBy,
-              });
-              if (startedBy === keyOrder[0]) {
-                keyOrder.reverse();
-              }
-            }),
-          ]).catch(err => {
-            stderr.write(err);
-          });
-        }
-
-        const instance = lookupPriceAggregatorInstance(pair);
-        const adminOfferIds = {};
-        for await (const from of keyOrder) {
-          adminOfferIds[from] = await findOracleCap(
-            instance,
-            from,
-            readPublished,
-          );
-          if (!adminOfferIds[from]) {
-            console.error(
-              `Failed to find an offer accepting oracle invitation for ${from}. Accept and try again:`,
-            );
-            console.error(
-              `    agops oracle accept > accept.json; agoric wallet send --from ${from} --offer accept.json`,
-            );
-          }
-        }
-        assert(
-          Object.values(adminOfferIds).every(x => x),
-          'Missing oracle admin offer ids',
-        );
-
-        console.error('pushPrice from each:', keyOrder);
-        for await (const from of keyOrder) {
-          const oracleAdminAcceptOfferId = adminOfferIds[from];
-          show({ from, oracleAdminAcceptOfferId });
-          const offerId = `pushPrice-${Date.now()}`;
-          const offer = Offers.fluxAggregator.PushPrice(
-            {},
-            { offerId, unitPrice },
-            oracleAdminAcceptOfferId,
-          );
-
-          const { home, keyringBackend: backend } = oracle.opts();
-          const tools = { ...networkConfig, execFileSync, delay, stdout };
-          const result = await sendAction(
-            { method: 'executeOffer', offer },
-            { keyring: { home, backend }, from, verbose: false, ...tools },
-          );
-          assert(result); // Not dry-run
-          const { timestamp, txhash, height } = result;
-          console.error('pushPrice', price, 'offer broadcast');
-          show({ timestamp, height, offerId: offer.id, txhash });
-          const found = await wutil.pollOffer(from, offer.id, result.height);
-          console.error('pushPrice', price, 'offer satisfied');
-          show(found);
-        }
-
-        const after = await readPrice();
-        if (after) {
-          console.error('price set:');
-          show(fmtFeed(after));
-        }
-      },
-    );
-  return oracle;
-};

package/src/commands/psm.js

@@ -1,288 +0,0 @@
-// @ts-check
-/* eslint-disable func-names */
-/* eslint-env node */
-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 { outputExecuteOfferAction } from '../lib/wallet.js';
-
-/**
- * @import {Logger} from '@agoric/internal/vendor/anylogger.js';
- * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js';
- */
-
-const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
-
-// Adapted from https://gist.github.com/dckc/8b5b2f16395cb4d7f2ff340e0bc6b610#file-psm-tool
-
-/**
- * Integration testing.
- * These are against a live network so don't run in CI.
- *
- * AGORIC_NET=ollinet bin/agops psm swap --wantMinted 6 --feePct 0.01 --offerId 123  | jq '.body |fromjson | .offer.id' # should be 123
- */
-
-/**
- * @template K, V
- * @typedef {[key: K, val: V]} Entry<K,V>
- */
-
-const last = xs => xs[xs.length - 1];
-
-function collectValues(val, memo) {
-  memo.push(val);
-  return memo;
-}
-
-/**
- * @param {Logger} logger
- */
-export const makePsmCommand = logger => {
-  const psm = new Command('psm').description('PSM commands').usage(
-    `
-  WALLET=my-wallet
-  export AGORIC_NET=ollinet
-
-  # provision wallet if necessary
-  agd keys add $WALLET
-  # provision with faucet, e.g.
-  open https://ollinet.faucet.agoric.net/ # and paste the key and choose client: smart-wallet
-
-  # confirm funds
-  agoric wallet list
-  agoric wallet show —from $WALLET
-
-  # prepare an offer to send
-  # (offerId is optional but best to specify as each must be higher than the last and the default value is a huge number)
-  agops psm swap --wantMinted 6 --feePct 0.01 --offerId 12 > offer-12.json
-
-  # watch for results in one terminal
-  agoric wallet watch --from $WALLET
-
-  # sign and send in another
-  agoric wallet send --from $WALLET --offer offer-12.json
-  # that spits out a CLI command to run
-  `,
-  );
-
-  const rpcTools = async () => {
-    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 = agoricNames.instance[name];
-      if (!instance) {
-        logger.debug('known instances:', agoricNames.instance);
-        throw Error(`Unknown instance ${name}`);
-      }
-      return instance;
-    };
-
-    /**
-     *
-     * @param {[Minted: string, Anchor: string]} pair
-     */
-    const getGovernanceState = async ([Minted, Anchor]) => {
-      const govContent = await vsk.vstorage.readLatest(
-        `published.psm.${Minted}.${Anchor}.governance`,
-      );
-      assert(govContent, 'no gov content');
-      const { current: governance } = last(
-        storageHelper.unserializeTxt(govContent, vsk.fromBoard),
-      );
-      const { [`psm.${Minted}.${Anchor}`]: instance } = agoricNames.instance;
-
-      return { instance, governance };
-    };
-
-    return { ...vsk, agoricNames, lookupPsmInstance, getGovernanceState };
-  };
-
-  psm
-    .command('list')
-    .description('list all PSMs in network')
-    .action(async function () {
-      const { vstorage } = await rpcTools();
-      const mints = await vstorage.keys('published.psm');
-      for (const minted of mints) {
-        const anchors = await vstorage.keys(`published.psm.${minted}`);
-        for (const anchor of anchors) {
-          process.stdout.write(`${minted}.${anchor}\n`);
-        }
-      }
-    });
-
-  psm
-    .command('info')
-    .description('show governance parameters of the PSM')
-    // TODO DRY with https://github.com/Agoric/agoric-sdk/issues/6181
-    .requiredOption(
-      '--pair [Minted.Anchor]',
-      'token pair (Minted.Anchor)',
-      s => s.split('.'),
-      ['IST', 'AUSD'],
-    )
-    .action(async function (opts) {
-      const { pair } = opts;
-      const { getGovernanceState } = await rpcTools();
-      const { governance } = await getGovernanceState(pair);
-      console.log('psm governance params', Object.keys(governance));
-      console.log('MintLimit', governance.MintLimit.value);
-      console.log(
-        'WantMintedFee',
-        asPercent(governance.WantMintedFee.value),
-        '%',
-      );
-      console.log(
-        'GiveMintedFee',
-        asPercent(governance.GiveMintedFee.value),
-        '%',
-      );
-    });
-
-  psm
-    .command('swap')
-    .description('prepare an offer to swap')
-    // TODO DRY
-    .option(
-      '--pair [Minted.Anchor]',
-      'token pair (Minted.Anchor)',
-      s => s.split('.'),
-      ['IST', 'AUSD'],
-    )
-    // wantMinted and giveMinted options conflict.
-    // TODO use .conflicts() after https://github.com/Agoric/agoric-sdk/issues/6181
-    .option('--wantMinted <DOLLARS>', 'amount of anchor tokens to give', Number)
-    .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(agoricNames, instance, opts);
-        outputExecuteOfferAction(offer);
-      },
-    );
-
-  psm
-    .command('proposePauseOffers')
-    .description('propose a vote')
-    .option(
-      '--offerId <string>',
-      'Offer id',
-      String,
-      `proposePauseOffers-${Date.now()}`,
-    )
-    .requiredOption(
-      '--pair [Minted.Anchor]',
-      'token pair (Minted.Anchor)',
-      s => s.split('.'),
-      ['IST', 'AUSD'],
-    )
-    .requiredOption(
-      '--charterAcceptOfferId <string>',
-      'offer that had continuing invitation result',
-    )
-    .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) {
-      const { lookupPsmInstance } = await rpcTools();
-      const psmInstance = lookupPsmInstance(opts.pair);
-
-      /** @type {OfferSpec} */
-      const offer = {
-        id: opts.offerId,
-        invitationSpec: {
-          source: 'continuing',
-          previousOffer: opts.charterAcceptOfferId,
-          invitationMakerName: 'VoteOnPauseOffers',
-          // ( instance, strings list, timer deadline seconds )
-          invitationArgs: harden([
-            psmInstance,
-            opts.substring,
-            BigInt(opts.deadline * 60 + Math.round(Date.now() / 1000)),
-          ]),
-        },
-        proposal: {},
-      };
-
-      outputExecuteOfferAction(offer);
-    });
-
-  psm
-    .command('proposeChangeMintLimit')
-    .description('propose to change the MintLimit parameter')
-    .option(
-      '--offerId <string>',
-      'id of this offer (optional)',
-      String,
-      `proposeChangeMintLimit-${Date.now()}`,
-    )
-    .requiredOption(
-      '--pair [Minted.Anchor]',
-      'token pair (Minted.Anchor)',
-      s => s.split('.'),
-      ['IST', 'AUSD'],
-    )
-    .requiredOption(
-      '--previousOfferId <string>',
-      'offer using psm charter invitation',
-    )
-    .requiredOption('--limit <number>', 'new mint limit (in IST)', Number)
-    .option(
-      '--deadline <minutes>',
-      'minutes from now to close the vote',
-      Number,
-      1,
-    )
-    .action(async function (opts) {
-      const { agoricNames, lookupPsmInstance } = await rpcTools();
-      const psmInstance = lookupPsmInstance(opts.pair);
-
-      const istBrand = agoricNames.brand.IST;
-      const scaledAmount = harden({
-        brand: istBrand,
-        value: BigInt(opts.limit * 1_000_000),
-      });
-      /** @type {OfferSpec} */
-      const offer = {
-        id: opts.offerId,
-        invitationSpec: {
-          source: 'continuing',
-          previousOffer: opts.previousOfferId,
-          invitationMakerName: 'VoteOnParamChange',
-        },
-        proposal: {},
-        offerArgs: {
-          instance: psmInstance,
-          params: { MintLimit: scaledAmount },
-          deadline: BigInt(opts.deadline * 60 + Math.round(Date.now() / 1000)),
-        },
-      };
-
-      outputExecuteOfferAction(offer);
-    });
-
-  return psm;
-};

package/src/commands/reserve.js

@@ -1,110 +0,0 @@
-// @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 { outputActionAndHint } from '../lib/wallet.js';
-
-/**
- * @import {Logger} from '@agoric/internal/vendor/anylogger.js';
- * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js';
- */
-
-const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
-
-/**
- * @param {Logger} _logger
- * @param {*} io
- */
-export const makeReserveCommand = (_logger, io = {}) => {
-  const { stdout = process.stdout, stderr = process.stderr, now } = io;
-  const reserve = new Command('reserve').description('Asset Reserve commands');
-
-  reserve
-    .command('add')
-    .description('add collateral to the reserve')
-    .requiredOption('--give <number>', 'Collateral to give', Number)
-    .option('--collateral-brand <string>', 'Collateral brand key', 'ATOM')
-    .option('--offer-id <string>', 'Offer id', String, `addCollateral-${now()}`)
-    .action(
-      /**
-       * @param {{
-       *   give: number,
-       *   collateralBrand: string,
-       *   offerId: string,
-       * }} opts
-       */
-      async ({ collateralBrand, ...opts }) => {
-        const vsk = makeVstorageKit({ fetch }, networkConfig);
-        const agoricNames = await makeAgoricNames(vsk.fromBoard, vsk.vstorage);
-
-        const offer = Offers.reserve.AddCollateral(agoricNames, {
-          collateralBrandKey: collateralBrand,
-          ...opts,
-        });
-        outputActionAndHint(
-          { method: 'executeOffer', offer },
-          { stdout, stderr },
-        );
-      },
-    );
-
-  reserve
-    .command('proposeBurn')
-    .description('propose a call to burnFeesToReduceShortfall')
-    .option(
-      '--offerId <string>',
-      'Offer id',
-      String,
-      `proposePauseOffers-${Date.now()}`,
-    )
-    .requiredOption(
-      '--charterAcceptOfferId <string>',
-      'offer that had continuing invitation result',
-    )
-    .requiredOption('--value [integer]', 'value of µIST to burn', BigInt)
-    .option(
-      '--deadline <minutes>',
-      'minutes from now to close the vote',
-      Number,
-      1,
-    )
-    .action(async function (opts) {
-      const vsk = makeVstorageKit({ fetch }, networkConfig);
-      const agoricNames = await makeAgoricNames(vsk.fromBoard, vsk.vstorage);
-
-      const reserveInstance = agoricNames.instance.reserve;
-      assert(reserveInstance, 'missing reserve in names');
-
-      const feesToBurn = { brand: agoricNames.brand.IST, value: opts.value };
-
-      /** @type {OfferSpec} */
-      const offer = {
-        id: opts.offerId,
-        invitationSpec: {
-          source: 'continuing',
-          previousOffer: opts.charterAcceptOfferId,
-          invitationMakerName: 'VoteOnApiCall',
-          invitationArgs: harden([
-            reserveInstance,
-            'burnFeesToReduceShortfall',
-            [feesToBurn],
-            BigInt(opts.deadline * 60 + Math.round(Date.now() / 1000)),
-          ]),
-        },
-        proposal: {},
-      };
-
-      outputActionAndHint(
-        { method: 'executeOffer', offer },
-        { stdout, stderr },
-      );
-    });
-
-  return reserve;
-};

package/src/commands/vaults.js

@@ -1,178 +0,0 @@
-// @ts-check
-/* eslint-disable func-names */
-/* eslint-env node */
-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 { getCurrent, outputExecuteOfferAction } from '../lib/wallet.js';
-
-/**
- * @import {Logger} from '@agoric/internal/vendor/anylogger.js';
- */
-
-const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
-
-/**
- * @param {Logger} logger
- */
-export const makeVaultsCommand = logger => {
-  const vaults = new Command('vaults')
-    .description('Vault Factory commands')
-    .option('--home [dir]', 'agd application home directory')
-    .option(
-      '--keyring-backend <os|file|test>',
-      'keyring\'s backend (os|file|test) (default "os")',
-    );
-
-  const normalizeAddress = literalOrName =>
-    normalizeAddressWithOptions(literalOrName, vaults.opts());
-
-  vaults
-    .command('list')
-    .description(
-      'list vaults ever owned by the address (as path that can be followed)',
-    )
-    .requiredOption(
-      '--from <address>',
-      'wallet address literal or name',
-      normalizeAddress,
-    )
-    .action(async function (opts) {
-      const { readPublished } = await makeVstorageKit({ fetch }, networkConfig);
-
-      const current = await getCurrent(opts.from, {
-        readPublished,
-      });
-
-      const vaultStoragePaths = current.offerToPublicSubscriberPaths.map(
-        ([_offerId, pathmap]) => pathmap.vault,
-      );
-
-      for (const path of vaultStoragePaths) {
-        process.stdout.write(path);
-        process.stdout.write('\n');
-      }
-    });
-
-  vaults
-    .command('open')
-    .description('Prepare an offer to open a new vault')
-    .requiredOption('--giveCollateral <number>', 'Collateral to give', Number)
-    .requiredOption('--wantMinted <number>', 'Minted wants', Number)
-    .option('--offerId <string>', 'Offer id', String, `openVault-${Date.now()}`)
-    .option('--collateralBrand <string>', 'Collateral brand key', 'ATOM')
-    .action(async function (opts) {
-      logger.warn('running with options', opts);
-      const vsk = makeVstorageKit({ fetch }, networkConfig);
-      const agoricNames = await makeAgoricNames(vsk.fromBoard, vsk.vstorage);
-
-      const offer = Offers.vaults.OpenVault(agoricNames, {
-        giveCollateral: opts.giveCollateral,
-        wantMinted: opts.wantMinted,
-        offerId: opts.offerId,
-        // rename to allow CLI to be more concise
-        collateralBrandKey: opts.collateralBrand,
-      });
-
-      outputExecuteOfferAction(offer);
-    });
-
-  vaults
-    .command('adjust')
-    .description('Prepare an offer to adjust an existing vault')
-    .requiredOption(
-      '--from <address>',
-      'wallet address literal or name',
-      normalizeAddress,
-    )
-    .option('--giveCollateral <number>', 'More collateral to lend', Number)
-    .option('--wantCollateral <number>', 'Collateral to get back', Number)
-    .option('--giveMinted <number>', 'Minted to give back', Number)
-    .option('--wantMinted <number>', 'More minted to borrow', Number)
-    .option(
-      '--offerId <string>',
-      'Offer id',
-      String,
-      `adjustVault-${Date.now()}`,
-    )
-    .option('--collateralBrand <string>', 'Collateral brand key', 'ATOM')
-    .requiredOption('--vaultId <string>', 'Key of vault (e.g. vault1)')
-    .action(async function (opts) {
-      logger.warn('running with options', opts);
-      const { readPublished, ...vsk } = makeVstorageKit(
-        { fetch },
-        networkConfig,
-      );
-      const agoricNames = await makeAgoricNames(vsk.fromBoard, vsk.vstorage);
-
-      const previousOfferId = await lookupOfferIdForVault(
-        opts.vaultId,
-        getCurrent(opts.from, { readPublished }),
-      );
-
-      const offer = Offers.vaults.AdjustBalances(
-        agoricNames,
-        {
-          giveCollateral: opts.giveCollateral,
-          wantCollateral: opts.wantCollateral,
-          giveMinted: opts.giveMinted,
-          wantMinted: opts.wantMinted,
-          offerId: opts.offerId,
-          // rename to allow CLI to be more concise
-          collateralBrandKey: opts.collateralBrand,
-        },
-        previousOfferId,
-      );
-      outputExecuteOfferAction(offer);
-    });
-
-  vaults
-    .command('close')
-    .description('Prepare an offer to close an existing vault')
-    .requiredOption(
-      '--from <address>',
-      'wallet address literal or name',
-      normalizeAddress,
-    )
-    .requiredOption('--giveMinted <number>', 'Minted to give back', Number)
-    .requiredOption('--vaultId <string>', 'Key of vault (e.g. vault1)')
-    .option(
-      '--offerId <string>',
-      'Offer id',
-      String,
-      `closeVault-${Date.now()}`,
-    )
-    .action(async function (opts) {
-      logger.warn('running with options', opts);
-      const { readPublished, ...vsk } = makeVstorageKit(
-        { fetch },
-        networkConfig,
-      );
-      const agoricNames = await makeAgoricNames(vsk.fromBoard, vsk.vstorage);
-
-      const previousOfferId = await lookupOfferIdForVault(
-        opts.vaultId,
-        getCurrent(opts.from, { readPublished }),
-      );
-
-      const offer = Offers.vaults.CloseVault(
-        agoricNames,
-        {
-          giveMinted: opts.giveMinted,
-          offerId: opts.offerId,
-        },
-        previousOfferId,
-      );
-      outputExecuteOfferAction(offer);
-    });
-
-  return vaults;
-};