agoric 0.22.0-upgrade-18a-dev-61134db.0 → 0.22.0-upgrade-19-dev-0754752.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.22.0-upgrade-18a-dev-61134db.0+61134db",
+  "version": "0.22.0-upgrade-19-dev-0754752.0+0754752",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -30,46 +30,45 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.42.0-upgrade-18a-dev-61134db.0+61134db",
-    "@agoric/deploy-script-support": "0.10.4-upgrade-18a-dev-61134db.0+61134db",
+    "@agoric/cosmic-swingset": "0.42.0-upgrade-19-dev-0754752.0+0754752",
+    "@agoric/deploy-script-support": "0.10.4-upgrade-19-dev-0754752.0+0754752",
     "ava": "^5.3.0",
-    "c8": "^10.1.2",
-    "dd-trace": "^4.11.1"
+    "c8": "^10.1.2"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-upgrade-18a-dev-61134db.0+61134db",
-    "@agoric/cache": "0.3.3-upgrade-18a-dev-61134db.0+61134db",
-    "@agoric/casting": "0.4.3-upgrade-18a-dev-61134db.0+61134db",
-    "@agoric/client-utils": "0.2.0-upgrade-18a-dev-61134db.0+61134db",
-    "@agoric/cosmic-proto": "0.5.0-upgrade-18a-dev-61134db.0+61134db",
-    "@agoric/ertp": "0.16.3-upgrade-18a-dev-61134db.0+61134db",
-    "@agoric/governance": "0.10.4-upgrade-18a-dev-61134db.0+61134db",
-    "@agoric/inter-protocol": "0.17.0-upgrade-18a-dev-61134db.0+61134db",
-    "@agoric/internal": "0.4.0-upgrade-18a-dev-61134db.0+61134db",
-    "@agoric/network": "0.2.0-upgrade-18a-dev-61134db.0+61134db",
-    "@agoric/smart-wallet": "0.5.4-upgrade-18a-dev-61134db.0+61134db",
-    "@agoric/store": "0.9.3-upgrade-18a-dev-61134db.0+61134db",
-    "@agoric/swingset-vat": "0.33.0-upgrade-18a-dev-61134db.0+61134db",
-    "@agoric/vats": "0.16.0-upgrade-18a-dev-61134db.0+61134db",
-    "@agoric/zoe": "0.26.3-upgrade-18a-dev-61134db.0+61134db",
-    "@agoric/zone": "0.3.0-upgrade-18a-dev-61134db.0+61134db",
+    "@agoric/access-token": "0.4.22-upgrade-19-dev-0754752.0+0754752",
+    "@agoric/cache": "0.3.3-upgrade-19-dev-0754752.0+0754752",
+    "@agoric/casting": "0.4.3-upgrade-19-dev-0754752.0+0754752",
+    "@agoric/client-utils": "0.2.0-upgrade-19-dev-0754752.0+0754752",
+    "@agoric/cosmic-proto": "0.5.0-upgrade-19-dev-0754752.0+0754752",
+    "@agoric/ertp": "0.16.3-upgrade-19-dev-0754752.0+0754752",
+    "@agoric/governance": "0.10.4-upgrade-19-dev-0754752.0+0754752",
+    "@agoric/inter-protocol": "0.17.0-upgrade-19-dev-0754752.0+0754752",
+    "@agoric/internal": "0.4.0-upgrade-19-dev-0754752.0+0754752",
+    "@agoric/network": "0.2.0-upgrade-19-dev-0754752.0+0754752",
+    "@agoric/smart-wallet": "0.5.4-upgrade-19-dev-0754752.0+0754752",
+    "@agoric/store": "0.9.3-upgrade-19-dev-0754752.0+0754752",
+    "@agoric/swingset-vat": "0.33.0-upgrade-19-dev-0754752.0+0754752",
+    "@agoric/vats": "0.16.0-upgrade-19-dev-0754752.0+0754752",
+    "@agoric/zoe": "0.27.0-upgrade-19-dev-0754752.0+0754752",
+    "@agoric/zone": "0.3.0-upgrade-19-dev-0754752.0+0754752",
     "@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.5.0",
-    "@endo/captp": "^4.4.3",
-    "@endo/compartment-mapper": "^1.4.0",
+    "@endo/bundle-source": "^3.5.1",
+    "@endo/captp": "^4.4.4",
+    "@endo/compartment-mapper": "^1.5.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/errors": "^1.2.9",
+    "@endo/far": "^1.1.10",
+    "@endo/init": "^1.1.8",
+    "@endo/marshal": "^1.6.3",
+    "@endo/nat": "^5.0.14",
+    "@endo/patterns": "^1.4.8",
+    "@endo/promise-kit": "^1.1.9",
     "@endo/zip": "^1.0.9",
     "@iarna/toml": "^2.2.3",
     "anylogger": "^0.21.0",
@@ -101,7 +100,7 @@
     "workerThreads": false
   },
   "typeCoverage": {
-    "atLeast": 78.19
+    "atLeast": 78.73
   },
-  "gitHead": "61134dbe832b81ad609b1218fb0859f2222fa1ef"
+  "gitHead": "07547522e9d8a06692fa5ff12c35230ddb4b252b"
 }

package/src/bin-agops.js

@@ -30,7 +30,6 @@ const progname = path.basename(process.argv[1]);
 const program = new Command();
 program.name(progname).version('unversioned');
 
-program.addCommand(makeOracleCommand(logger));
 program.addCommand(makeGovCommand(logger));
 program.addCommand(makePerfCommand(logger));
 program.addCommand(makePsmCommand(logger));
@@ -69,6 +68,7 @@ const procIO = {
   setTimeout,
 };
 
+program.addCommand(makeOracleCommand(procIO, logger));
 program.addCommand(makeReserveCommand(logger, procIO));
 program.addCommand(makeAuctionCommand(logger, { ...procIO, fetch }));
 program.addCommand(makeInterCommand(procIO, { fetch }));

package/src/commands/oracle.js

@@ -12,7 +12,6 @@ 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 * as cp from 'child_process';
 import { Command } from 'commander';
 import { inspect } from 'util';
 import { normalizeAddressWithOptions } from '../lib/chain.js';
@@ -28,26 +27,33 @@ import {
 
 // XXX support other decimal places
 const COSMOS_UNIT = 1_000_000n;
-const scaleDecimals = num => BigInt(num * Number(COSMOS_UNIT));
+/** @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 {import('anylogger').Logger} logger
  * @param {{
- *   delay?: (ms: number) => Promise<void>,
- *   execFileSync?: typeof import('child_process').execFileSync,
- *   env?: Record<string, string | undefined>,
- *   stdout?: Pick<import('stream').Writable,'write'>,
- * }} [io]
+ *   createCommand: typeof import('commander').createCommand,
+ *   env: Partial<Record<string, string>>,
+ *   execFileSync: typeof import('child_process').execFileSync,
+ *   now: () => number,
+ *   setTimeout: typeof setTimeout,
+ *   stderr: Pick<import('stream').Writable,'write'>,
+ *   stdout: Pick<import('stream').Writable,'write'>,
+ * }} process
+ * @param {import('anylogger').Logger} [logger]
  */
-export const makeOracleCommand = (logger, io = {}) => {
-  const {
-    delay = ms => new Promise(resolve => setTimeout(resolve, ms)),
-    execFileSync = cp.execFileSync,
-    env = process.env,
-    stdout = process.stdout,
-  } = io;
+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(
@@ -98,7 +104,7 @@ export const makeOracleCommand = (logger, io = {}) => {
       const name = oracleBrandFeedName(brandIn, brandOut);
       const instance = agoricNames.instance[name];
       if (!instance) {
-        logger.debug('known instances:', agoricNames.instance);
+        logger && logger.debug('known instances:', agoricNames.instance);
         throw Error(`Unknown instance ${name}`);
       }
       return instance;
@@ -137,12 +143,15 @@ export const makeOracleCommand = (logger, io = {}) => {
         proposal: {},
       };
 
-      outputAction({
-        method: 'executeOffer',
-        offer,
-      });
+      outputAction(
+        {
+          method: 'executeOffer',
+          offer,
+        },
+        stdout,
+      );
 
-      console.warn(sendHint);
+      stderr.write(sendHint);
     });
 
   oracle
@@ -172,12 +181,15 @@ export const makeOracleCommand = (logger, io = {}) => {
         opts.oracleAdminAcceptOfferId,
       );
 
-      outputAction({
-        method: 'executeOffer',
-        offer,
-      });
+      outputAction(
+        {
+          method: 'executeOffer',
+          offer,
+        },
+        stdout,
+      );
 
-      console.warn(sendHint);
+      stderr.write(sendHint);
     });
 
   const findOracleCap = async (instance, from, readPublished) => {
@@ -288,7 +300,7 @@ export const makeOracleCommand = (logger, io = {}) => {
           /** @type {Promise<PriceDescription>} */ (
             readLatestHead(feedPath).catch(() => {
               const viewer = `https://vstorage.agoric.net/#${networkConfig.rpcAddrs[0]}|published,published.priceFeed|${feedPath}`;
-              console.warn(`no existing price data; see ${viewer}`);
+              stderr.write(`no existing price data; see ${viewer}`);
               return undefined;
             })
           );
@@ -333,7 +345,7 @@ export const makeOracleCommand = (logger, io = {}) => {
               }
             }),
           ]).catch(err => {
-            console.warn(err);
+            stderr.write(err);
           });
         }
 

package/src/commands/wallet.js

@@ -55,6 +55,7 @@ export const makeWalletCommand = async command => {
     'wallet commands',
   );
 
+  /** @param {string} literalOrName */
   const normalizeAddress = literalOrName =>
     normalizeAddressWithOptions(literalOrName, wallet.opts());
 
@@ -112,9 +113,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);
     });
 
@@ -127,9 +128,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);
     });
 
@@ -204,7 +205,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'));
     });
@@ -218,10 +219,11 @@ export const makeWalletCommand = async command => {
       normalizeAddress,
     )
     .action(async function (opts) {
-      const { readPublished, unserializer, ...vsk } = 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]);
@@ -229,6 +231,7 @@ export const makeWalletCommand = async command => {
         `:published.wallet.${opts.from}`,
         leader,
         {
+          // @ts-expect-error xxx follower/marshaller types
           unserializer,
         },
       );

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 })) {
       map.set(name, path.resolve(cwd, location));
     }
     return map;

package/src/lib/chain.js

@@ -5,6 +5,7 @@ import { execFileSync as execFileSyncAmbient } from 'child_process';
 
 /**
  * @import {MinimalNetworkConfig} from '@agoric/client-utils';
+ * @import {ParamsSDKType} from '@agoric/cosmic-proto/agoric/swingset/swingset.js';
  */
 
 const agdBinary = 'agd';
@@ -132,6 +133,7 @@ harden(execSwingsetTransaction);
 /**
  *
  * @param {MinimalNetworkConfig} net
+ * @returns {ParamsSDKType}
  */
 // TODO fetch by HTTP instead of shelling out https://github.com/Agoric/agoric-sdk/issues/9200
 export const fetchSwingsetParams = net => {

package/src/lib/packageManager.js

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