agoric 0.22.0-u18.4 → 0.22.0-u18.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.22.0-u18.4",
+  "version": "0.22.0-u18.6",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -10,7 +10,8 @@
   },
   "exports": {
     "./src/entrypoint.js": "./src/entrypoint.js",
-    "./src/helpers.js": "./src/helpers.js"
+    "./src/helpers.js": "./src/helpers.js",
+    "./src/lib/index.js": "./src/lib/index.js"
   },
   "files": [
     "src",
@@ -20,7 +21,7 @@
   "scripts": {
     "build": "node ./scripts/get-sdk-package-names.js > src/sdk-package-names.js",
     "test": "ava",
-    "test:c8": "c8 $C8_OPTIONS ava --config=ava-nesm.config.js",
+    "test:c8": "c8 --all $C8_OPTIONS ava",
     "test:xs": "exit 0",
     "integration-test": "ava --config .ava-integration-test.config.js",
     "lint-fix": "yarn lint:eslint --fix",
@@ -29,50 +30,51 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "^0.42.0-u18.4",
-    "@agoric/deploy-script-support": "^0.10.4-u18.3",
+    "@agoric/cosmic-swingset": "^0.42.0-u18.6",
+    "@agoric/deploy-script-support": "^0.10.4-u18.5",
     "ava": "^5.3.0",
-    "c8": "^9.1.0",
+    "c8": "^10.1.2",
     "dd-trace": "^4.11.1"
   },
   "dependencies": {
-    "@agoric/access-token": "^0.4.22-u18.0",
-    "@agoric/cache": "^0.3.3-u18.0",
-    "@agoric/casting": "^0.4.3-u18.3",
-    "@agoric/cosmic-proto": "^0.5.0-u18.3",
-    "@agoric/ertp": "^0.16.3-u18.0",
-    "@agoric/governance": "^0.10.4-u18.0",
-    "@agoric/inter-protocol": "^0.17.0-u18.4",
-    "@agoric/internal": "^0.4.0-u18.0",
-    "@agoric/network": "^0.2.0-u18.0",
-    "@agoric/smart-wallet": "^0.5.4-u18.3",
-    "@agoric/store": "^0.9.3-u18.0",
-    "@agoric/swingset-vat": "^0.33.0-u18.0",
-    "@agoric/vats": "^0.16.0-u18.3",
-    "@agoric/zoe": "^0.26.3-u18.0",
-    "@agoric/zone": "^0.3.0-u18.0",
+    "@agoric/access-token": "^0.4.22-u18.1",
+    "@agoric/cache": "^0.3.3-u18.1",
+    "@agoric/casting": "^0.4.3-u18.5",
+    "@agoric/client-utils": "^0.2.0-u18.0",
+    "@agoric/cosmic-proto": "^0.5.0-u18.5",
+    "@agoric/ertp": "^0.16.3-u18.1",
+    "@agoric/governance": "^0.10.4-u18.1",
+    "@agoric/inter-protocol": "^0.17.0-u18.6",
+    "@agoric/internal": "^0.4.0-u18.1",
+    "@agoric/network": "^0.2.0-u18.1",
+    "@agoric/smart-wallet": "^0.5.4-u18.5",
+    "@agoric/store": "^0.9.3-u18.1",
+    "@agoric/swingset-vat": "^0.33.0-u18.1",
+    "@agoric/vats": "^0.16.0-u18.5",
+    "@agoric/zoe": "^0.26.3-u18.1",
+    "@agoric/zone": "^0.3.0-u18.1",
     "@confio/relayer": "^0.11.3",
     "@cosmjs/crypto": "^0.32.3",
     "@cosmjs/encoding": "^0.32.3",
     "@cosmjs/math": "^0.32.3",
     "@cosmjs/proto-signing": "^0.32.3",
     "@cosmjs/stargate": "^0.32.3",
-    "@endo/bundle-source": "^3.4.2",
-    "@endo/captp": "^4.4.2",
-    "@endo/compartment-mapper": "^1.3.1",
-    "@endo/env-options": "^1.1.7",
-    "@endo/errors": "^1.2.7",
-    "@endo/far": "^1.1.8",
-    "@endo/init": "^1.1.6",
-    "@endo/marshal": "^1.6.1",
-    "@endo/nat": "^5.0.12",
-    "@endo/patterns": "^1.4.6",
-    "@endo/promise-kit": "^1.1.7",
-    "@endo/zip": "^1.0.8",
+    "@endo/bundle-source": "^3.5.0",
+    "@endo/captp": "^4.4.3",
+    "@endo/compartment-mapper": "^1.4.0",
+    "@endo/env-options": "^1.1.8",
+    "@endo/errors": "^1.2.8",
+    "@endo/far": "^1.1.9",
+    "@endo/init": "^1.1.7",
+    "@endo/marshal": "^1.6.2",
+    "@endo/nat": "^5.0.13",
+    "@endo/patterns": "^1.4.7",
+    "@endo/promise-kit": "^1.1.8",
+    "@endo/zip": "^1.0.9",
     "@iarna/toml": "^2.2.3",
     "anylogger": "^0.21.0",
     "chalk": "^5.2.0",
-    "commander": "^11.1.0",
+    "commander": "^12.1.0",
     "deterministic-json": "^1.0.5",
     "esm": "agoric-labs/esm#Agoric-built",
     "inquirer": "^8.2.2",
@@ -99,7 +101,7 @@
     "workerThreads": false
   },
   "typeCoverage": {
-    "atLeast": 77.44
+    "atLeast": 78.19
   },
-  "gitHead": "9770dee3ff8774388dfb600da987e1d511c47b5d"
+  "gitHead": "f8c45b8a2e29a51522a81a6692af25b2d7f6b50f"
 }

package/src/anylogger-agoric.js

@@ -28,8 +28,8 @@ const selectedCode = anylogger.levels[selectedLevel];
 const globalCode = selectedCode === undefined ? -Infinity : selectedCode;
 
 const oldExt = anylogger.ext;
-anylogger.ext = (l, o) => {
-  l = oldExt(l, o);
+anylogger.ext = (l, ...rest) => {
+  l = oldExt(l, ...rest);
   l.enabledFor = lvl => globalCode >= anylogger.levels[lvl];
 
   const prefix = l.name.replace(/:/g, ': ');

package/src/chain-config.js

@@ -81,7 +81,12 @@ export const DEFAULT_RPC_PORT = 26657;
 export const DEFAULT_PROM_PORT = 26660;
 export const DEFAULT_API_PORT = 1317;
 
-// Rewrite the app.toml.
+/**
+ * Rewrite the app.toml.
+ *
+ * @param {{ appToml: string, enableCors?: boolean, exportMetrics?: boolean, portNum?: string, chainId?: string, enableRosetta?: boolean, rosettaPort?: string }} input
+ * @returns {string} toml
+ */
 export function finishCosmosApp({
   appToml,
   enableCors,
@@ -92,6 +97,8 @@ export function finishCosmosApp({
   rosettaPort = `${DEFAULT_ROSETTA_PORT}`,
 }) {
   const rpcPort = Number(portNum);
+  // TODO: Use an accurate narrow type.
+  /** @type {Record<string, any>} */
   const app = TOML.parse(appToml);
 
   if (enableCors) {
@@ -138,7 +145,12 @@ export function finishCosmosApp({
   return TOML.stringify(app);
 }
 
-// Rewrite the config.toml.
+/**
+ * Rewrite the config.toml.
+ *
+ * @param {{ configToml: string, enableCors?: boolean, exportMetrics?: boolean, portNum?: string, persistentPeers?: string, seeds?: string, unconditionalPeerIds?: string }} input
+ * @returns {string} toml
+ */
 export function finishTendermintConfig({
   configToml,
   enableCors,
@@ -151,6 +163,8 @@ export function finishTendermintConfig({
   const rpcPort = Number(portNum);
 
   // Adjust the config.toml.
+  // TODO: Use an accurate narrow type.
+  /** @type {Record<string, any>} */
   const config = TOML.parse(configToml);
 
   config.proxy_app = 'kvstore';
@@ -189,7 +203,12 @@ export function finishTendermintConfig({
   return TOML.stringify(config);
 }
 
-// Rewrite/import the genesis.json.
+/**
+ * Rewrite/import the genesis.json.
+ *
+ * @param {{ genesisJson: string, exportedGenesisJson?: string }} input
+ * @returns {string} json
+ */
 export function finishCosmosGenesis({ genesisJson, exportedGenesisJson }) {
   const genesis = JSON.parse(genesisJson);
   const exported = exportedGenesisJson ? JSON.parse(exportedGenesisJson) : {};

package/src/commands/auction.js

@@ -1,8 +1,12 @@
 // @ts-check
-
-import { InvalidArgumentError } from 'commander';
+/* eslint-env node */
+import {
+  fetchEnvNetworkConfig,
+  makeAgoricNames,
+  makeVstorageKit,
+} from '@agoric/client-utils';
 import { Fail } from '@endo/errors';
-import { makeRpcUtils } from '../lib/rpc.js';
+import { InvalidArgumentError } from 'commander';
 import { outputActionAndHint } from '../lib/wallet.js';
 
 /**
@@ -10,6 +14,8 @@ import { outputActionAndHint } from '../lib/wallet.js';
  * @import {ParamValueForType} from '@agoric/governance/src/types.js'
  */
 
+const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
+
 /**
  * @template {ParamTypesMap} M
  * @typedef {{
@@ -59,11 +65,6 @@ export const makeAuctionCommand = (
       'descending clock step size',
       BigInt,
     )
-    .option(
-      '--discount-step <integer>',
-      'proposed value (basis points)',
-      BigInt,
-    )
     .requiredOption(
       '--charterAcceptOfferId <string>',
       'offer that had continuing invitation result',
@@ -91,13 +92,13 @@ export const makeAuctionCommand = (
        * }} opts
        */
       async opts => {
-        const { agoricNames, readLatestHead } = await makeRpcUtils({ fetch });
-
-        /** @type {{ current: AuctionParamRecord }} */
-        // @ts-expect-error XXX should runtime check?
-        const { current } = await readLatestHead(
-          `published.auction.governance`,
+        const { readPublished, ...vsk } = makeVstorageKit(
+          { fetch },
+          networkConfig,
         );
+        const agoricNames = await makeAgoricNames(vsk.fromBoard, vsk.vstorage);
+
+        const { current } = await readPublished(`auction.governance`);
 
         const {
           AuctionStartDelay: {

package/src/commands/gov.js

@@ -1,10 +1,14 @@
 // @ts-check
 /* eslint-disable func-names */
-/* global globalThis, process, setTimeout */
+/* eslint-env node */
+import {
+  fetchEnvNetworkConfig,
+  makeAgoricNames,
+  makeVstorageKit,
+} from '@agoric/client-utils';
 import { execFileSync as execFileSyncAmbient } from 'child_process';
 import { Command, CommanderError } from 'commander';
 import { normalizeAddressWithOptions, pollBlocks } from '../lib/chain.js';
-import { getNetworkConfig, makeRpcUtils } from '../lib/rpc.js';
 import {
   findContinuingIds,
   getCurrent,
@@ -14,8 +18,10 @@ import {
 } from '../lib/wallet.js';
 
 /**
- * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js'
- * @import {QuestionDetails} from '@agoric/governance/src/types.js'
+ * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js';
+ * @import {AgoricNamesRemotes} from '@agoric/vats/tools/board-utils.js';
+ * @import {CurrentWalletRecord} from '@agoric/smart-wallet/src/smartWallet.js';
+ * @import {VstorageKit} from '@agoric/client-utils';
  */
 
 const collectValues = (val, memo) => {
@@ -25,6 +31,8 @@ const collectValues = (val, memo) => {
 
 const defaultKeyring = process.env.AGORIC_KEYRING_BACKEND || 'test';
 
+const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
+
 /**
  * @param {import('anylogger').Logger} _logger
  * @param {{
@@ -40,10 +48,9 @@ export const makeGovCommand = (_logger, io = {}) => {
   const {
     // Allow caller to provide access explicitly, but
     // default to conventional ambient IO facilities.
-    env = process.env,
     stdout = process.stdout,
     stderr = process.stderr,
-    fetch = globalThis.fetch,
+    fetch = global.fetch,
     execFileSync = execFileSyncAmbient,
     delay = ms => new Promise(resolve => setTimeout(resolve, ms)),
   } = io;
@@ -84,26 +91,27 @@ export const makeGovCommand = (_logger, io = {}) => {
    * given a sendFrom address; else print it.
    *
    * @param {{
-   *   toOffer: (agoricNames: *, current: import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord | undefined) => OfferSpec,
+   *   toOffer: (agoricNames: AgoricNamesRemotes, current: CurrentWalletRecord | undefined) => OfferSpec,
    *   sendFrom?: string | undefined,
    *   keyringBackend: string,
    *   instanceName?: string,
    * }} detail
-   * @param {Awaited<ReturnType<makeRpcUtils>>} [optUtils]
+   * @param {VstorageKit} [vsk]
    */
   const processOffer = async function (
     { toOffer, sendFrom, keyringBackend },
-    optUtils,
+    vsk,
   ) {
-    const networkConfig = await getNetworkConfig(env);
-    const utils = await (optUtils || makeRpcUtils({ fetch }));
-    const { agoricNames, readLatestHead } = utils;
+    await null;
+    vsk ||= makeVstorageKit({ fetch }, networkConfig);
+    const { readPublished } = vsk;
+    const agoricNames = await makeAgoricNames(vsk.fromBoard, vsk.vstorage);
 
     assert(keyringBackend, 'missing keyring-backend option');
 
     let current;
     if (sendFrom) {
-      current = await getCurrent(sendFrom, { readLatestHead });
+      current = await getCurrent(sendFrom, { readPublished });
     }
 
     const offer = toOffer(agoricNames, current);
@@ -133,9 +141,9 @@ export const makeGovCommand = (_logger, io = {}) => {
     show({ timestamp, height, offerId: offer.id, txhash });
     const checkInWallet = async blockInfo => {
       const [state, update] = await Promise.all([
-        getCurrent(sendFrom, { readLatestHead }),
-        getLastUpdate(sendFrom, { readLatestHead }),
-        readLatestHead(`published.wallet.${sendFrom}`),
+        getCurrent(sendFrom, { readPublished }),
+        getLastUpdate(sendFrom, { readPublished }),
+        readPublished(`wallet.${sendFrom}`),
       ]);
       if (update.updated === 'offerStatus' && update.status.id === offer.id) {
         return blockInfo;
@@ -264,8 +272,12 @@ export const makeGovCommand = (_logger, io = {}) => {
     )
     .requiredOption('--for <string>', 'description of the invitation')
     .action(async opts => {
-      const { agoricNames, readLatestHead } = await makeRpcUtils({ fetch });
-      const current = await getCurrent(opts.from, { readLatestHead });
+      const { readPublished, ...vsk } = makeVstorageKit(
+        { fetch },
+        networkConfig,
+      );
+      const agoricNames = await makeAgoricNames(vsk.fromBoard, vsk.vstorage);
+      const current = await getCurrent(opts.from, { readPublished });
 
       const known = findContinuingIds(current, agoricNames);
       if (!known) {
@@ -290,8 +302,12 @@ export const makeGovCommand = (_logger, io = {}) => {
       normalizeAddress,
     )
     .action(async opts => {
-      const { agoricNames, readLatestHead } = await makeRpcUtils({ fetch });
-      const current = await getCurrent(opts.from, { readLatestHead });
+      const { readPublished, ...vsk } = makeVstorageKit(
+        { fetch },
+        networkConfig,
+      );
+      const agoricNames = await makeAgoricNames(vsk.fromBoard, vsk.vstorage);
+      const current = await getCurrent(opts.from, { readPublished });
 
       const found = findContinuingIds(current, agoricNames);
       for (const it of found) {
@@ -326,20 +342,17 @@ export const makeGovCommand = (_logger, io = {}) => {
       normalizeAddress,
     )
     .action(async function (opts, options) {
-      const utils = await makeRpcUtils({ fetch });
-      const { readLatestHead } = utils;
+      const vsk = makeVstorageKit({ fetch }, networkConfig);
+      const { readPublished } = vsk;
 
-      const info = await readLatestHead(
-        `published.committees.${opts.pathname}.latestQuestion`,
+      const questionDesc = await readPublished(
+        `committees.${opts.pathname}.latestQuestion`,
       ).catch(err => {
         // CommanderError is a class constructor, and so
         // must be invoked with `new`.
         throw new CommanderError(1, 'VSTORAGE_FAILURE', err.message);
       });
 
-      // XXX runtime shape-check
-      const questionDesc = /** @type {QuestionDetails} */ (info);
-
       // TODO support multiple position arguments
       const chosenPositions = [questionDesc.positions[opts.forPosition]];
       assert(chosenPositions, `undefined position index ${opts.forPosition}`);
@@ -380,7 +393,7 @@ export const makeGovCommand = (_logger, io = {}) => {
           sendFrom: opts.sendFrom,
           keyringBackend: options.optsWithGlobals().keyringBackend,
         },
-        utils,
+        vsk,
       );
     });
 

package/src/commands/inter.js

@@ -4,26 +4,19 @@
  */
 
 // @ts-check
-import { CommanderError, InvalidArgumentError } from 'commander';
-// TODO: should get M from endo https://github.com/Agoric/agoric-sdk/issues/7090
+import { fetchEnvNetworkConfig, makeWalletUtils } from '@agoric/client-utils';
 import { makeOfferSpecShape } from '@agoric/inter-protocol/src/auction/auctionBook.js';
 import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
 import { objectMap } from '@agoric/internal';
-import { M, matches } from '@agoric/store';
-
+import { M, matches } from '@endo/patterns';
+import { CommanderError, InvalidArgumentError } from 'commander';
 import { normalizeAddressWithOptions, pollBlocks } from '../lib/chain.js';
 import {
   asBoardRemote,
   bigintReplacer,
   makeAmountFormatter,
 } from '../lib/format.js';
-import { getNetworkConfig } from '../lib/rpc.js';
-import {
-  getCurrent,
-  makeWalletUtils,
-  outputActionAndHint,
-  sendAction,
-} from '../lib/wallet.js';
+import { getCurrent, outputActionAndHint, sendAction } from '../lib/wallet.js';
 
 const { values } = Object;
 
@@ -238,8 +231,8 @@ export const makeInterCommand = (
     try {
       // XXX pass fetch to getNetworkConfig() explicitly
       // await null above makes this await safe
-      const networkConfig = await getNetworkConfig(env);
-      return makeWalletUtils({ fetch, execFileSync, delay }, networkConfig);
+      const networkConfig = await fetchEnvNetworkConfig({ env, fetch });
+      return makeWalletUtils({ fetch, delay }, networkConfig);
     } catch (err) {
       // CommanderError is a class constructor, and so
       // must be invoked with `new`.
@@ -287,14 +280,12 @@ inter auction status
          * }}
          */ opts,
       ) => {
-        const { agoricNames, readLatestHead } = await tryMakeUtils();
+        const { agoricNames, readPublished } = await tryMakeUtils();
 
-        /** @type { [ScheduleNotification, BookDataNotification, *] } */
-        // @ts-expect-error dynamic cast
         const [schedule, book, { current: params }] = await Promise.all([
-          readLatestHead(`published.auction.schedule`),
-          readLatestHead(`published.auction.book${opts.book}`),
-          readLatestHead(`published.auction.governance`),
+          readPublished('auction.schedule'),
+          readPublished(`auction.book${opts.book}`),
+          readPublished('auction.governance'),
         ]);
 
         const fmt = makeFormatters(Object.values(agoricNames.vbankAsset));
@@ -334,7 +325,7 @@ inter auction status
    * @param {string} from
    * @param {import('@agoric/smart-wallet/src/offers.js').OfferSpec} offer
    * @param {Awaited<ReturnType<tryMakeUtils>>} tools
-   * @param {boolean?} dryRun
+   * @param {boolean | undefined} dryRun
    */
   const placeBid = async (from, offer, tools, dryRun = false) => {
     const { networkConfig, agoricNames, pollOffer } = tools;
@@ -499,9 +490,9 @@ inter auction status
           return;
         }
 
-        const { networkConfig, readLatestHead } = await tryMakeUtils();
+        const { networkConfig, readPublished } = await tryMakeUtils();
 
-        const current = await getCurrent(from, { readLatestHead });
+        const current = await getCurrent(from, { readPublished });
         const liveIds = current.liveOffers.map(([i, _s]) => i);
         if (!liveIds.includes(id)) {
           // InvalidArgumentError is a class constructor, and so
@@ -526,7 +517,7 @@ inter auction status
         show({ timestamp, height, offerId: id, txhash });
 
         const checkGone = async blockInfo => {
-          const pollResult = await getCurrent(from, { readLatestHead });
+          const pollResult = await getCurrent(from, { readPublished });
           const found = pollResult.liveOffers.find(([i, _]) => i === id);
           if (found) throw Error('retry');
           return blockInfo;
@@ -568,11 +559,11 @@ $ inter bid list --from my-acct
        * }} opts
        */
       async opts => {
-        const { agoricNames, readLatestHead, storedWalletState } =
+        const { agoricNames, readPublished, storedWalletState } =
           await tryMakeUtils();
 
         const [current, state] = await Promise.all([
-          getCurrent(opts.from, { readLatestHead }),
+          getCurrent(opts.from, { readPublished }),
           storedWalletState(opts.from),
         ]);
         const entries = opts.all

package/src/commands/oracle.js

@@ -1,6 +1,13 @@
 // @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';
@@ -10,10 +17,8 @@ import { Command } from 'commander';
 import { inspect } from 'util';
 import { normalizeAddressWithOptions } from '../lib/chain.js';
 import { bigintReplacer } from '../lib/format.js';
-import { getNetworkConfig, makeRpcUtils, storageHelper } from '../lib/rpc.js';
 import {
   getCurrent,
-  makeWalletUtils,
   outputAction,
   sendAction,
   sendHint,
@@ -82,20 +87,24 @@ export const makeOracleCommand = (logger, io = {}) => {
 
   const rpcTools = async () => {
     // XXX pass fetch to getNetworkConfig() explicitly
-    const networkConfig = await getNetworkConfig(env);
-    const utils = await makeRpcUtils({ fetch });
+    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 = utils.agoricNames.instance[name];
+      const instance = agoricNames.instance[name];
       if (!instance) {
-        logger.debug('known instances:', utils.agoricNames.instance);
+        logger.debug('known instances:', agoricNames.instance);
         throw Error(`Unknown instance ${name}`);
       }
       return instance;
     };
 
-    return { ...utils, networkConfig, lookupPriceAggregatorInstance };
+    return { ...vsk, networkConfig, lookupPriceAggregatorInstance };
   };
 
   oracle
@@ -171,8 +180,8 @@ export const makeOracleCommand = (logger, io = {}) => {
       console.warn(sendHint);
     });
 
-  const findOracleCap = async (instance, from, readLatestHead) => {
-    const current = await getCurrent(from, { readLatestHead });
+  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}`;
@@ -200,11 +209,10 @@ export const makeOracleCommand = (logger, io = {}) => {
       s => s.split('.'),
     )
     .action(async opts => {
-      const { readLatestHead, lookupPriceAggregatorInstance } =
-        await rpcTools();
+      const { readPublished, lookupPriceAggregatorInstance } = await rpcTools();
       const instance = lookupPriceAggregatorInstance(opts.pair);
 
-      const offerId = await findOracleCap(instance, opts.from, readLatestHead);
+      const offerId = await findOracleCap(instance, opts.from, readPublished);
       if (!offerId) {
         console.error('No continuing ids found');
       }
@@ -265,12 +273,13 @@ export const makeOracleCommand = (logger, io = {}) => {
          * }}
          */ { pair, keys, price },
       ) => {
-        const { readLatestHead, networkConfig, lookupPriceAggregatorInstance } =
-          await rpcTools();
-        const wutil = await makeWalletUtils(
-          { fetch, execFileSync, delay },
+        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`;
@@ -334,7 +343,7 @@ export const makeOracleCommand = (logger, io = {}) => {
           adminOfferIds[from] = await findOracleCap(
             instance,
             from,
-            readLatestHead,
+            readPublished,
           );
           if (!adminOfferIds[from]) {
             console.error(

package/src/commands/perf.js

@@ -7,21 +7,23 @@ import {
   makeFollower,
   makeLeaderFromRpcAddresses,
 } from '@agoric/casting';
+import { fetchEnvNetworkConfig } from '@agoric/client-utils';
+import { slotToRemotable } from '@agoric/internal/src/storage-test-utils.js';
+import { boardSlottingMarshaller } from '@agoric/vats/tools/board-utils.js';
 import { Command } from 'commander';
 import fs from 'fs';
 import { exit } from 'process';
-import { slotToRemotable } from '@agoric/internal/src/storage-test-utils.js';
-import { boardSlottingMarshaller } from '@agoric/vats/tools/board-utils.js';
 import { makeLeaderOptions } from '../lib/casting.js';
 import {
   execSwingsetTransaction,
   normalizeAddressWithOptions,
 } from '../lib/chain.js';
-import { networkConfig } from '../lib/rpc.js';
 
 // tight for perf testing but less than this tends to hang.
 const SLEEP_SECONDS = 0.1;
 
+const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
+
 /**
  * @param {import('anylogger').Logger} logger
  */