agoric 0.21.2-dev-fe64626.0 → 0.21.2-dev-c39bfd3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-dev-fe64626.0+fe64626",
+  "version": "0.21.2-dev-c39bfd3.0+c39bfd3",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -30,28 +30,28 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.41.4-dev-fe64626.0+fe64626",
-    "@agoric/deploy-script-support": "0.10.4-dev-fe64626.0+fe64626",
+    "@agoric/cosmic-swingset": "0.41.4-dev-c39bfd3.0+c39bfd3",
+    "@agoric/deploy-script-support": "0.10.4-dev-c39bfd3.0+c39bfd3",
     "ava": "^5.3.0",
     "c8": "^10.1.2"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-fe64626.0+fe64626",
-    "@agoric/cache": "0.3.3-dev-fe64626.0+fe64626",
-    "@agoric/casting": "0.4.3-dev-fe64626.0+fe64626",
-    "@agoric/client-utils": "0.1.1-dev-fe64626.0+fe64626",
-    "@agoric/cosmic-proto": "0.4.1-dev-fe64626.0+fe64626",
-    "@agoric/ertp": "0.16.3-dev-fe64626.0+fe64626",
-    "@agoric/governance": "0.10.4-dev-fe64626.0+fe64626",
-    "@agoric/inter-protocol": "0.16.2-dev-fe64626.0+fe64626",
-    "@agoric/internal": "0.3.3-dev-fe64626.0+fe64626",
-    "@agoric/network": "0.1.1-dev-fe64626.0+fe64626",
-    "@agoric/smart-wallet": "0.5.4-dev-fe64626.0+fe64626",
-    "@agoric/store": "0.9.3-dev-fe64626.0+fe64626",
-    "@agoric/swingset-vat": "0.32.3-dev-fe64626.0+fe64626",
-    "@agoric/vats": "0.15.2-dev-fe64626.0+fe64626",
-    "@agoric/zoe": "0.26.3-dev-fe64626.0+fe64626",
-    "@agoric/zone": "0.2.3-dev-fe64626.0+fe64626",
+    "@agoric/access-token": "0.4.22-dev-c39bfd3.0+c39bfd3",
+    "@agoric/cache": "0.3.3-dev-c39bfd3.0+c39bfd3",
+    "@agoric/casting": "0.4.3-dev-c39bfd3.0+c39bfd3",
+    "@agoric/client-utils": "0.1.1-dev-c39bfd3.0+c39bfd3",
+    "@agoric/cosmic-proto": "0.4.1-dev-c39bfd3.0+c39bfd3",
+    "@agoric/ertp": "0.16.3-dev-c39bfd3.0+c39bfd3",
+    "@agoric/governance": "0.10.4-dev-c39bfd3.0+c39bfd3",
+    "@agoric/inter-protocol": "0.16.2-dev-c39bfd3.0+c39bfd3",
+    "@agoric/internal": "0.3.3-dev-c39bfd3.0+c39bfd3",
+    "@agoric/network": "0.1.1-dev-c39bfd3.0+c39bfd3",
+    "@agoric/smart-wallet": "0.5.4-dev-c39bfd3.0+c39bfd3",
+    "@agoric/store": "0.9.3-dev-c39bfd3.0+c39bfd3",
+    "@agoric/swingset-vat": "0.32.3-dev-c39bfd3.0+c39bfd3",
+    "@agoric/vats": "0.15.2-dev-c39bfd3.0+c39bfd3",
+    "@agoric/zoe": "0.26.3-dev-c39bfd3.0+c39bfd3",
+    "@agoric/zone": "0.2.3-dev-c39bfd3.0+c39bfd3",
     "@confio/relayer": "^0.11.3",
     "@cosmjs/crypto": "^0.32.3",
     "@cosmjs/encoding": "^0.32.3",
@@ -102,5 +102,5 @@
   "typeCoverage": {
     "atLeast": 78.73
   },
-  "gitHead": "fe64626676ae80ae48d4beee23d2d75f71cf1031"
+  "gitHead": "c39bfd3c248e3b2b3f5854fdfaee25999d1702d0"
 }

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);
           });
         }