agoric 0.22.0-upgrade-16-dev-12b78e3.0 → 0.22.0-upgrade-17-dev-a61cdab.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.22.0-upgrade-16-dev-12b78e3.0+12b78e3",
+  "version": "0.22.0-upgrade-17-dev-a61cdab.0+a61cdab",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -29,46 +29,46 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.42.0-upgrade-16-dev-12b78e3.0+12b78e3",
-    "@agoric/deploy-script-support": "0.10.4-upgrade-16-dev-12b78e3.0+12b78e3",
+    "@agoric/cosmic-swingset": "0.42.0-upgrade-17-dev-a61cdab.0+a61cdab",
+    "@agoric/deploy-script-support": "0.10.4-upgrade-17-dev-a61cdab.0+a61cdab",
     "ava": "^5.3.0",
     "c8": "^9.1.0",
     "dd-trace": "^4.11.1"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-upgrade-16-dev-12b78e3.0+12b78e3",
-    "@agoric/assert": "0.6.1-upgrade-16-dev-12b78e3.0+12b78e3",
-    "@agoric/cache": "0.3.3-upgrade-16-dev-12b78e3.0+12b78e3",
-    "@agoric/casting": "0.4.3-upgrade-16-dev-12b78e3.0+12b78e3",
-    "@agoric/cosmic-proto": "0.4.1-upgrade-16-dev-12b78e3.0+12b78e3",
-    "@agoric/ertp": "0.16.3-upgrade-16-dev-12b78e3.0+12b78e3",
-    "@agoric/governance": "0.10.4-upgrade-16-dev-12b78e3.0+12b78e3",
-    "@agoric/inter-protocol": "0.17.0-upgrade-16-dev-12b78e3.0+12b78e3",
-    "@agoric/internal": "0.4.0-upgrade-16-dev-12b78e3.0+12b78e3",
-    "@agoric/network": "0.2.0-upgrade-16-dev-12b78e3.0+12b78e3",
-    "@agoric/smart-wallet": "0.5.4-upgrade-16-dev-12b78e3.0+12b78e3",
-    "@agoric/store": "0.9.3-upgrade-16-dev-12b78e3.0+12b78e3",
-    "@agoric/swingset-vat": "0.33.0-upgrade-16-dev-12b78e3.0+12b78e3",
-    "@agoric/vats": "0.16.0-upgrade-16-dev-12b78e3.0+12b78e3",
-    "@agoric/zoe": "0.26.3-upgrade-16-dev-12b78e3.0+12b78e3",
-    "@agoric/zone": "0.3.0-upgrade-16-dev-12b78e3.0+12b78e3",
+    "@agoric/access-token": "0.4.22-upgrade-17-dev-a61cdab.0+a61cdab",
+    "@agoric/cache": "0.3.3-upgrade-17-dev-a61cdab.0+a61cdab",
+    "@agoric/casting": "0.4.3-upgrade-17-dev-a61cdab.0+a61cdab",
+    "@agoric/cosmic-proto": "0.5.0-upgrade-17-dev-a61cdab.0+a61cdab",
+    "@agoric/ertp": "0.16.3-upgrade-17-dev-a61cdab.0+a61cdab",
+    "@agoric/governance": "0.10.4-upgrade-17-dev-a61cdab.0+a61cdab",
+    "@agoric/inter-protocol": "0.17.0-upgrade-17-dev-a61cdab.0+a61cdab",
+    "@agoric/internal": "0.4.0-upgrade-17-dev-a61cdab.0+a61cdab",
+    "@agoric/network": "0.2.0-upgrade-17-dev-a61cdab.0+a61cdab",
+    "@agoric/smart-wallet": "0.5.4-upgrade-17-dev-a61cdab.0+a61cdab",
+    "@agoric/store": "0.9.3-upgrade-17-dev-a61cdab.0+a61cdab",
+    "@agoric/swingset-vat": "0.33.0-upgrade-17-dev-a61cdab.0+a61cdab",
+    "@agoric/vats": "0.16.0-upgrade-17-dev-a61cdab.0+a61cdab",
+    "@agoric/zoe": "0.26.3-upgrade-17-dev-a61cdab.0+a61cdab",
+    "@agoric/zone": "0.3.0-upgrade-17-dev-a61cdab.0+a61cdab",
     "@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.2.3",
-    "@endo/captp": "^4.2.0",
-    "@endo/compartment-mapper": "^1.1.5",
-    "@endo/env-options": "^1.1.4",
-    "@endo/far": "^1.1.2",
-    "@endo/init": "^1.1.2",
-    "@endo/marshal": "^1.5.0",
-    "@endo/nat": "^5.0.7",
-    "@endo/patterns": "^1.4.0",
-    "@endo/promise-kit": "^1.1.2",
-    "@endo/zip": "^1.0.5",
+    "@endo/bundle-source": "^3.4.0",
+    "@endo/captp": "^4.3.0",
+    "@endo/compartment-mapper": "^1.2.2",
+    "@endo/env-options": "^1.1.6",
+    "@endo/errors": "^1.2.5",
+    "@endo/far": "^1.1.5",
+    "@endo/init": "^1.1.4",
+    "@endo/marshal": "^1.5.3",
+    "@endo/nat": "^5.0.10",
+    "@endo/patterns": "^1.4.3",
+    "@endo/promise-kit": "^1.1.5",
+    "@endo/zip": "^1.0.7",
     "@iarna/toml": "^2.2.3",
     "anylogger": "^0.21.0",
     "chalk": "^5.2.0",
@@ -99,7 +99,7 @@
     "workerThreads": false
   },
   "typeCoverage": {
-    "atLeast": 76.99
+    "atLeast": 77.44
   },
-  "gitHead": "12b78e307e22d0dc0c95f40099300e16655781c4"
+  "gitHead": "a61cdabb23bd2c846e003dee7326018a7462a929"
 }

package/src/commands/auction.js

@@ -1,11 +1,10 @@
 // @ts-check
 
 import { InvalidArgumentError } from 'commander';
+import { Fail } from '@endo/errors';
 import { makeRpcUtils } from '../lib/rpc.js';
 import { outputActionAndHint } from '../lib/wallet.js';
 
-const { Fail } = assert;
-
 /**
  * @import {ParamTypesMap, ParamTypesMapFromRecord} from '@agoric/governance/src/contractGovernance/typedParamManager.js'
  * @import {ParamValueForType} from '@agoric/governance/src/types.js'
@@ -131,6 +130,8 @@ export const makeAuctionCommand = (
         };
 
         if (Object.keys(params).length === 0) {
+          // InvalidArgumentError is a class constructor, and so
+          // must be invoked with `new`.
           throw new InvalidArgumentError(`no parameters given`);
         }
 

package/src/commands/gov.js

@@ -73,6 +73,8 @@ export const makeGovCommand = (_logger, io = {}) => {
     const done = found.filter(it => it.instanceName === instanceName);
     if (done.length > 0) {
       console.warn(`invitation to ${instanceName} already accepted`, done);
+      // CommanderError is a class constructor, and so
+      // must be invoked with `new`.
       throw new CommanderError(1, 'EALREADY', `already accepted`);
     }
   };
@@ -330,6 +332,8 @@ export const makeGovCommand = (_logger, io = {}) => {
       const info = await readLatestHead(
         `published.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);
       });
 
@@ -346,6 +350,8 @@ export const makeGovCommand = (_logger, io = {}) => {
         const votingRight = cont.find(it => it.instanceName === opts.instance);
         if (!votingRight) {
           console.debug('continuing ids', cont, 'for', current);
+          // CommanderError is a class constructor, and so
+          // must be invoked with `new`.
           throw new CommanderError(
             1,
             'NO_INVITATION',

package/src/commands/inter.js

@@ -218,6 +218,8 @@ export const makeInterCommand = (
     try {
       return rawExec(file, args, ...opts);
     } catch (err) {
+      // InvalidArgumentError is a class constructor, and so
+      // must be invoked with `new`.
       throw new InvalidArgumentError(
         `${err.message}: is ${file} in your $PATH?`,
       );
@@ -239,6 +241,8 @@ export const makeInterCommand = (
       const networkConfig = await getNetworkConfig(env);
       return makeWalletUtils({ fetch, execFileSync, delay }, networkConfig);
     } catch (err) {
+      // CommanderError is a class constructor, and so
+      // must be invoked with `new`.
       throw new CommanderError(1, 'RPC_FAIL', err.message);
     }
   };
@@ -431,6 +435,8 @@ inter auction status
   const parsePercent = v => {
     const p = Number(v);
     if (!(p >= -100 && p <= 100)) {
+      // InvalidArgumentError is a class constructor, and so
+      // must be invoked with `new`.
       throw new InvalidArgumentError('must be between -100 and 100');
     }
     return p / 100;
@@ -498,6 +504,8 @@ inter auction status
         const current = await getCurrent(from, { readLatestHead });
         const liveIds = current.liveOffers.map(([i, _s]) => i);
         if (!liveIds.includes(id)) {
+          // InvalidArgumentError is a class constructor, and so
+          // must be invoked with `new`.
           throw new InvalidArgumentError(
             `${id} not in live offer ids: ${liveIds}`,
           );

package/src/commands/oracle.js

@@ -1,9 +1,9 @@
 // @ts-check
 /* eslint-disable func-names */
 /* global fetch, setTimeout, process */
-import { Fail } from '@agoric/assert';
-import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
+import { Fail } from '@endo/errors';
 import { Nat } from '@endo/nat';
+import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
 import { Command } from 'commander';
 import * as cp from 'child_process';
 import { inspect } from 'util';
@@ -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(

package/src/commands/test-upgrade.js

@@ -1,6 +1,6 @@
 // @ts-check
 /* global process */
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 import { CommanderError } from 'commander';
 import { normalizeAddressWithOptions } from '../lib/chain.js';
 import { bigintReplacer } from '../lib/format.js';
@@ -41,6 +41,8 @@ export const makeTestCommand = (
       const networkConfig = await getNetworkConfig(env);
       return makeWalletUtils({ fetch, execFileSync, delay }, networkConfig);
     } catch (err) {
+      // CommanderError is a class constructor, and so
+      // must be invoked with `new`.
       throw new CommanderError(1, 'RPC_FAIL', err.message);
     }
   };

package/src/deploy.js

@@ -1,8 +1,9 @@
 // @ts-check
 /* global process setTimeout setInterval clearInterval */
 
-import { E, makeCapTP } from '@endo/captp';
+import { X } from '@endo/errors';
 import { makePromiseKit } from '@endo/promise-kit';
+import { E, makeCapTP } from '@endo/captp';
 import { makeLeaderFromRpcAddresses } from '@agoric/casting';
 import path from 'path';
 import http from 'http';
@@ -20,8 +21,6 @@ import {
 import { makeJsonHttpClient } from './json-http-client-node.js';
 import { makeScriptLoader } from './scripts.js';
 
-const { details: X } = assert;
-
 // note: CapTP has its own HandledPromise instantiation, and the contract
 // must use the same one that CapTP uses. We achieve this by not bundling
 // captp, and doing a (non-isolated) dynamic import of the deploy script

package/src/helpers.js

@@ -45,6 +45,7 @@ export const makePspawn = ({
    * @param {string | [string, string, string]} [param2.stdio] standard IO
    * specification
    * @param {Record<string, string | undefined>} [param2.env] environment
+   * @param {boolean} [param2.detached] whether the child process should be detached
    * @returns {Promise<number> & { childProcess: ChildProcess }}} promise for
    * exit status. The return result has a `childProcess` property to obtain
    * control over the running process

package/src/init.js

@@ -1,8 +1,6 @@
 import chalk from 'chalk';
 import { makePspawn } from './helpers.js';
 
-/// <reference types="@endo/captp/src/types.js" />
-
 // Use either an absolute template URL, or find it relative to DAPP_URL_BASE.
 const gitURL = (relativeOrAbsoluteURL, base) => {
   const url = new URL(relativeOrAbsoluteURL, base);

package/src/lib/bundles.js

@@ -11,7 +11,8 @@ import { ZipReader } from '@endo/zip';
 /** @import {Bundle} from '@agoric/swingset-vat'; */
 /** @import {CoreEvalPlan} from '@agoric/deploy-script-support/src/writeCoreEvalParts.js' */
 
-const PACKAGE_NAME_RE = /(?<packageName>.*-v[\d.]+)\//;
+// exported for testing
+export const PACKAGE_NAME_RE = /^(?:@[^/]+\/)?[^/]+/;
 
 /**
  * @typedef {{ name: string, label: string, location: string, modules: Record<string, {compartment: string, module: string}>}} Compartment
@@ -27,7 +28,7 @@ const PACKAGE_NAME_RE = /(?<packageName>.*-v[\d.]+)\//;
 /** @param {Bundle} bundleObj*/
 export const extractBundleInfo = async bundleObj => {
   if (bundleObj.moduleFormat !== 'endoZipBase64') {
-    throw new Error('only endoZipBase64 is supported');
+    throw Error('only endoZipBase64 is supported');
   }
 
   const contents = Buffer.from(bundleObj.endoZipBase64, 'base64');
@@ -70,7 +71,7 @@ export const statBundle = async bundleFilename => {
     if (filename === 'compartment-map.json') {
       continue;
     }
-    const { packageName } = filename.match(PACKAGE_NAME_RE)?.groups ?? {};
+    const packageName = filename.match(PACKAGE_NAME_RE)?.[0];
     assert(packageName, `invalid filename ${filename}`);
     byPackage[packageName] ||= 0;
     byPackage[packageName] += size;

package/src/lib/format.js

@@ -1,5 +1,6 @@
 // @ts-check
 
+import { Fail, q } from '@endo/errors';
 import { makeBoardRemote } from '@agoric/vats/tools/board-utils.js';
 
 /** @import {BoardRemote} from '@agoric/vats/tools/board-utils.js' */
@@ -71,8 +72,6 @@ export const asPercent = ratio => {
   return (100 * Number(numerator.value)) / Number(denominator.value);
 };
 
-const { Fail, quote: q } = assert;
-
 const isObject = x => typeof x === 'object' && x !== null;
 
 /**

package/src/lib/rpc.js

@@ -1,7 +1,7 @@
 // @ts-check
 /* global Buffer, fetch, process */
 
-import { NonNullish } from '@agoric/assert';
+import { NonNullish } from '@agoric/internal';
 import {
   boardSlottingMarshaller,
   makeBoardRemote,

package/src/lib/wallet.js

@@ -1,6 +1,7 @@
 // @ts-check
 /* global process */
 
+import { Fail } from '@endo/errors';
 import { iterateReverse } from '@agoric/casting';
 import { makeWalletStateCoalescer } from '@agoric/smart-wallet/src/utils.js';
 import { execSwingsetTransaction, pollBlocks, pollTx } from './chain.js';
@@ -9,7 +10,6 @@ import { boardSlottingMarshaller, makeRpcUtils } from './rpc.js';
 /** @import {CurrentWalletRecord} from '@agoric/smart-wallet/src/smartWallet.js' */
 /** @import {AgoricNamesRemotes} from '@agoric/vats/tools/board-utils.js' */
 
-const { Fail } = assert;
 const marshaller = boardSlottingMarshaller();
 
 /** @type {CurrentWalletRecord} */
@@ -33,7 +33,7 @@ export const getCurrent = async (addr, { readLatestHead }) => {
       await readLatestHead(`published.wallet.${addr}.current`)
     );
   if (current === undefined) {
-    throw new Error(`undefined current node for ${addr}`);
+    throw Error(`undefined current node for ${addr}`);
   }
 
   // Repair a type misunderstanding seen in the wild.

package/src/main.js

@@ -1,12 +1,12 @@
 /* global process */
-import { assert, details as X } from '@agoric/assert';
-import {
-  DEFAULT_JITTER_SECONDS,
-  DEFAULT_KEEP_POLLING_SECONDS,
-} from '@agoric/casting';
 import { Command } from 'commander';
 import path from 'path';
 import url from 'url';
+import { assert, X } from '@endo/errors';
+import {
+  DEFAULT_KEEP_POLLING_SECONDS,
+  DEFAULT_JITTER_SECONDS,
+} from '@agoric/casting';
 import { makeWalletCommand } from './commands/wallet.js';
 import cosmosMain from './cosmos.js';
 import deployMain from './deploy.js';

package/src/open.js

@@ -1,10 +1,8 @@
 /* global process setInterval clearInterval */
 import opener from 'opener';
-
+import { assert, X } from '@endo/errors';
 import { getAccessToken } from '@agoric/access-token';
 
-import { assert, details as X } from '@agoric/assert';
-
 export default async function walletMain(_progname, _rawArgs, powers, opts) {
   const { anylogger } = powers;
   const console = anylogger('agoric:wallet');

package/src/publish.js

@@ -1,6 +1,7 @@
 // @ts-check
 /// <reference types="ses" />
 
+import { X, q, Fail } from '@endo/errors';
 import { E } from '@endo/far';
 
 import {
@@ -14,7 +15,6 @@ import { defaultRegistryTypes } from '@cosmjs/stargate';
 import { stringToPath } from '@cosmjs/crypto';
 import { Decimal } from '@cosmjs/math';
 import { fromBech32 } from '@cosmjs/encoding';
-
 import { MsgInstallBundle } from '@agoric/cosmic-proto/swingset/msgs.js';
 
 // https://github.com/Agoric/agoric-sdk/blob/master/golang/cosmos/daemon/main.go
@@ -83,8 +83,6 @@ const registry = new Registry([
  * @typedef {SourceBundle | HashBundle} Bundle
  */
 
-const { details: X, quote: q, Fail } = assert;
-
 /**
  * @template T
  * @param {Array<T>} array

package/src/scripts.js

@@ -161,8 +161,17 @@ export { bootPlugin } from ${JSON.stringify(absPath)};
 
       const allEndowments = harden({
         home: bootP,
-        bundleSource: (file, options = undefined) =>
-          bundleSource(pathResolve(file), options),
+        /**
+         * @template {import('@endo/bundle-source').ModuleFormat} ModuleFormat
+         * @param {string} file
+         * @param {import('@endo/bundle-source').BundleOptions<ModuleFormat>} options
+         * @returns {Promise<import('@endo/bundle-source').BundleSourceResult<ModuleFormat>>}
+         */
+        bundleSource: (file, options = {}) =>
+          bundleSource(pathResolve(file), {
+            elideComments: true,
+            ...options,
+          }),
         ...endowments,
         pathResolve,
         installUnsafePlugin,

package/src/sdk-package-names.js

@@ -2,7 +2,7 @@
 // prettier-ignore
 export default [
   "@agoric/access-token",
-  "@agoric/assert",
+  "@agoric/async-flow",
   "@agoric/base-zone",
   "@agoric/benchmark",
   "@agoric/boot",
@@ -24,6 +24,7 @@ export default [
   "@agoric/kmarshal",
   "@agoric/network",
   "@agoric/notifier",
+  "@agoric/orchestration",
   "@agoric/pegasus",
   "@agoric/smart-wallet",
   "@agoric/solo",

package/src/set-defaults.js

@@ -1,5 +1,5 @@
 import { basename } from 'path';
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 import {
   finishCosmosApp,
   finishTendermintConfig,

package/tools/getting-started.js

@@ -1,4 +1,5 @@
-/* global process setTimeout setInterval clearInterval */
+// @ts-check
+/* global process setTimeout setInterval clearInterval Buffer */
 
 import fs from 'fs';
 import path from 'path';
@@ -10,7 +11,13 @@ import { spawn } from 'child_process';
 
 import { makePspawn } from '../src/helpers.js';
 
-const TIMEOUT_SECONDS = 3 * 60;
+const RETRY_BLOCKHEIGHT_SECONDS = 3;
+const SOCKET_TIMEOUT_SECONDS = 2;
+
+// TODO: Set this to `true` when `agoric install $DISTTAG` properly updates the
+// getting-started workflow's dependencies to current `@endo/*` and Agoric SDK
+// from the local registry.
+const AGORIC_INSTALL_DISTTAG = false;
 
 const dirname = new URL('./', import.meta.url).pathname;
 
@@ -18,23 +25,59 @@ const dirname = new URL('./', import.meta.url).pathname;
 
 // Note that we currently only test:
 // agoric init dapp-foo
-// yarn install
+// yarn install (or agoric install $DISTTAG)
 // yarn start:docker
 // yarn start:contract
 // yarn start:ui
 
+/**
+ * @param {string} url
+ * @returns {Promise<bigint>}
+ */
+const getLatestBlockHeight = url =>
+  new Promise((resolve, reject) => {
+    const req = request(url, res => {
+      if (!res) {
+        reject(Error('no result'));
+        return;
+      }
+      const bodyChunks = [];
+      res
+        .on('data', chunk => bodyChunks.push(chunk))
+        .on('end', () => {
+          const body = Buffer.concat(bodyChunks).toString('utf8');
+          const { statusCode = 0 } = res;
+          if (statusCode >= 200 && statusCode < 300) {
+            const { result: { sync_info: sync = {} } = {} } = JSON.parse(body);
+            if (sync.catching_up === false) {
+              resolve(BigInt(sync.latest_block_height));
+              return;
+            }
+          }
+          reject(Error(`Cannot get block height: ${statusCode} ${body}`));
+        });
+    });
+    req.setTimeout(SOCKET_TIMEOUT_SECONDS * 1_000);
+    req.on('error', reject);
+    req.end();
+  });
+
 export const gettingStartedWorkflowTest = async (t, options = {}) => {
-  const { init: initOptions = [] } = options;
+  const { init: initOptions = [], install: installOptions = [] } = options;
   const pspawn = makePspawn({ spawn });
 
   // Kill an entire process group.
   const pkill = (cp, signal = 'SIGINT') => process.kill(-cp.pid, signal);
 
+  /** @param {Parameters<typeof pspawn>} args */
   function pspawnStdout(...args) {
     const ps = pspawn(...args);
-    ps.childProcess.stdout.on('data', chunk => {
-      process.stdout.write(chunk);
-    });
+    const { stdout } = ps.childProcess;
+    if (stdout) {
+      stdout.on('data', chunk => {
+        process.stdout.write(chunk);
+      });
+    }
     // ps.childProcess.unref();
     return ps;
   }
@@ -107,17 +150,51 @@ export const gettingStartedWorkflowTest = async (t, options = {}) => {
     );
     process.chdir('dapp-foo');
 
-    // ==============
-    // yarn install
-    t.is(await yarn(['install']), 0, 'yarn install works');
+    if (AGORIC_INSTALL_DISTTAG && process.env.AGORIC_INSTALL_OPTIONS) {
+      // ==============
+      // agoric install $DISTTAG
+      const opts = JSON.parse(process.env.AGORIC_INSTALL_OPTIONS);
+      installOptions.push(...opts);
+      t.is(
+        await myMain(['install', ...installOptions]),
+        0,
+        'agoric install works',
+      );
+    } else {
+      // ==============
+      // yarn install
+      t.is(await yarn(['install', ...installOptions]), 0, 'yarn install works');
+    }
 
     // ==============
     // yarn start:docker
     t.is(await yarn(['start:docker']), 0, 'yarn start:docker works');
 
-    // XXX: use abci_info endpoint to get block height
-    // sleep to let contract start
-    await new Promise(resolve => setTimeout(resolve, TIMEOUT_SECONDS));
+    // ==============
+    // wait for the chain to start
+    let lastKnownBlockHeight = 0n;
+    for (;;) {
+      try {
+        const currentHeight = await getLatestBlockHeight(
+          'http://localhost:26657/status',
+        );
+        if (currentHeight > lastKnownBlockHeight) {
+          const earlierHeight = lastKnownBlockHeight;
+          lastKnownBlockHeight = currentHeight;
+          if (earlierHeight > 0n && currentHeight > earlierHeight) {
+            // We've had at least one block produced.
+            break;
+          }
+        }
+      } catch (e) {
+        console.error((e && e.message) || e);
+      }
+
+      // Wait a bit and try again.
+      await new Promise(resolve =>
+        setTimeout(resolve, RETRY_BLOCKHEIGHT_SECONDS * 1_000),
+      );
+    }
 
     // ==============
     // yarn start:contract
@@ -145,9 +222,9 @@ export const gettingStartedWorkflowTest = async (t, options = {}) => {
         const req = request('http://localhost:5173/', _res => {
           resolve('listening');
         });
-        req.setTimeout(2000);
+        req.setTimeout(SOCKET_TIMEOUT_SECONDS * 1_000);
         req.on('error', err => {
-          if (err.code !== 'ECONNREFUSED') {
+          if (!('code' in err) || err.code !== 'ECONNREFUSED') {
             resolve(`Cannot connect to UI server: ${err}`);
           }
         });