agoric 0.21.2-dev-2c51185.0 → 0.21.2-dev-7ab749c.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-dev-2c51185.0+2c51185",
+  "version": "0.21.2-dev-7ab749c.0+7ab749c",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -29,28 +29,28 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.41.4-dev-2c51185.0+2c51185",
-    "@agoric/deploy-script-support": "0.10.4-dev-2c51185.0+2c51185",
+    "@agoric/cosmic-swingset": "0.41.4-dev-7ab749c.0+7ab749c",
+    "@agoric/deploy-script-support": "0.10.4-dev-7ab749c.0+7ab749c",
     "ava": "^5.3.0",
     "c8": "^9.1.0",
     "dd-trace": "^4.11.1"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-2c51185.0+2c51185",
-    "@agoric/cache": "0.3.3-dev-2c51185.0+2c51185",
-    "@agoric/casting": "0.4.3-dev-2c51185.0+2c51185",
-    "@agoric/cosmic-proto": "0.4.1-dev-2c51185.0+2c51185",
-    "@agoric/ertp": "0.16.3-dev-2c51185.0+2c51185",
-    "@agoric/governance": "0.10.4-dev-2c51185.0+2c51185",
-    "@agoric/inter-protocol": "0.16.2-dev-2c51185.0+2c51185",
-    "@agoric/internal": "0.3.3-dev-2c51185.0+2c51185",
-    "@agoric/network": "0.1.1-dev-2c51185.0+2c51185",
-    "@agoric/smart-wallet": "0.5.4-dev-2c51185.0+2c51185",
-    "@agoric/store": "0.9.3-dev-2c51185.0+2c51185",
-    "@agoric/swingset-vat": "0.32.3-dev-2c51185.0+2c51185",
-    "@agoric/vats": "0.15.2-dev-2c51185.0+2c51185",
-    "@agoric/zoe": "0.26.3-dev-2c51185.0+2c51185",
-    "@agoric/zone": "0.2.3-dev-2c51185.0+2c51185",
+    "@agoric/access-token": "0.4.22-dev-7ab749c.0+7ab749c",
+    "@agoric/cache": "0.3.3-dev-7ab749c.0+7ab749c",
+    "@agoric/casting": "0.4.3-dev-7ab749c.0+7ab749c",
+    "@agoric/cosmic-proto": "0.4.1-dev-7ab749c.0+7ab749c",
+    "@agoric/ertp": "0.16.3-dev-7ab749c.0+7ab749c",
+    "@agoric/governance": "0.10.4-dev-7ab749c.0+7ab749c",
+    "@agoric/inter-protocol": "0.16.2-dev-7ab749c.0+7ab749c",
+    "@agoric/internal": "0.3.3-dev-7ab749c.0+7ab749c",
+    "@agoric/network": "0.1.1-dev-7ab749c.0+7ab749c",
+    "@agoric/smart-wallet": "0.5.4-dev-7ab749c.0+7ab749c",
+    "@agoric/store": "0.9.3-dev-7ab749c.0+7ab749c",
+    "@agoric/swingset-vat": "0.32.3-dev-7ab749c.0+7ab749c",
+    "@agoric/vats": "0.15.2-dev-7ab749c.0+7ab749c",
+    "@agoric/zoe": "0.26.3-dev-7ab749c.0+7ab749c",
+    "@agoric/zone": "0.2.3-dev-7ab749c.0+7ab749c",
     "@confio/relayer": "^0.11.3",
     "@cosmjs/crypto": "^0.32.3",
     "@cosmjs/encoding": "^0.32.3",
@@ -101,5 +101,5 @@
   "typeCoverage": {
     "atLeast": 77.36
   },
-  "gitHead": "2c5118522c4cde94897aaeac98f6e61beac3a1be"
+  "gitHead": "7ab749c3a91540b44a16bca75aa7d283d6e1521c"
 }

package/src/commands/oracle.js

@@ -26,6 +26,8 @@ const COSMOS_UNIT = 1_000_000n;
 const scaleDecimals = num => BigInt(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>,
@@ -271,14 +273,13 @@ export const makeOracleCommand = (logger, io = {}) => {
         );
         const unitPrice = scaleDecimals(price);
 
-        console.error(`${pair[0]}-${pair[1]}_price_feed: before setPrice`);
+        const feedPath = `published.priceFeed.${pair[0]}-${pair[1]}_price_feed`;
 
         const readPrice = () =>
           /** @type {Promise<PriceDescription>} */ (
-            readLatestHead(
-              `published.priceFeed.${pair[0]}-${pair[1]}_price_feed`,
-            ).catch(err => {
-              console.warn(`cannot get ${pair[0]}-${pair[1]}_price_feed`, err);
+            readLatestHead(feedPath).catch(() => {
+              const viewer = `https://vstorage.agoric.net/#${networkConfig.rpcAddrs[0]}|published,published.priceFeed|${feedPath}`;
+              console.warn(`no existing price data; see ${viewer}`);
               return undefined;
             })
           );
@@ -297,43 +298,61 @@ export const makeOracleCommand = (logger, io = {}) => {
           show(fmtFeed(before));
         }
 
-        console.error(
-          'Choose lead oracle operator order based on latestRound...',
-        );
         const keyOrder = keys.map(normalizeAddress);
-        const latestRoundP = readLatestHead(
-          `published.priceFeed.${pair[0]}-${pair[1]}_price_feed.latestRound`,
-        );
-        await Promise.race([
-          delay(5000),
-          latestRoundP.then(round => {
-            // @ts-expect-error XXX get type from contract
-            const { roundId, startedAt, startedBy } = round;
-            show({
-              startedAt: fmtSecs(startedAt.absValue),
-              roundId,
-              startedBy,
-            });
-            if (startedBy === keyOrder[0]) {
-              keyOrder.reverse();
-            }
-          }),
-        ]).catch(err => {
-          console.warn(err);
-        });
+        if (before) {
+          console.error(
+            'Choose lead oracle operator order based on latestRound...',
+          );
 
-        const instance = lookupPriceAggregatorInstance(pair);
+          const latestRoundP =
+            /** @type {Promise<{roundId: number, startedAt: import('@agoric/time').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 => {
+            console.warn(err);
+          });
+        }
 
-        console.error('pushPrice from each:', keyOrder);
+        const instance = lookupPriceAggregatorInstance(pair);
+        const adminOfferIds = {};
         for await (const from of keyOrder) {
-          const oracleAdminAcceptOfferId = await findOracleCap(
+          adminOfferIds[from] = await findOracleCap(
             instance,
             from,
             readLatestHead,
           );
-          if (!oracleAdminAcceptOfferId) {
-            throw Error(`no oracle invitation found: ${from}`);
+          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(