agoric 0.21.2-dev-ddf71d7.0 → 0.21.2-dev-af5e7ab.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-dev-ddf71d7.0+ddf71d7",
+  "version": "0.21.2-dev-af5e7ab.0+af5e7ab",
   "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-ddf71d7.0+ddf71d7",
-    "@agoric/deploy-script-support": "0.10.4-dev-ddf71d7.0+ddf71d7",
+    "@agoric/cosmic-swingset": "0.41.4-dev-af5e7ab.0+af5e7ab",
+    "@agoric/deploy-script-support": "0.10.4-dev-af5e7ab.0+af5e7ab",
     "ava": "^5.3.0",
     "c8": "^9.1.0",
     "dd-trace": "^4.11.1"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-ddf71d7.0+ddf71d7",
-    "@agoric/cache": "0.3.3-dev-ddf71d7.0+ddf71d7",
-    "@agoric/casting": "0.4.3-dev-ddf71d7.0+ddf71d7",
-    "@agoric/cosmic-proto": "0.4.1-dev-ddf71d7.0+ddf71d7",
-    "@agoric/ertp": "0.16.3-dev-ddf71d7.0+ddf71d7",
-    "@agoric/governance": "0.10.4-dev-ddf71d7.0+ddf71d7",
-    "@agoric/inter-protocol": "0.16.2-dev-ddf71d7.0+ddf71d7",
-    "@agoric/internal": "0.3.3-dev-ddf71d7.0+ddf71d7",
-    "@agoric/network": "0.1.1-dev-ddf71d7.0+ddf71d7",
-    "@agoric/smart-wallet": "0.5.4-dev-ddf71d7.0+ddf71d7",
-    "@agoric/store": "0.9.3-dev-ddf71d7.0+ddf71d7",
-    "@agoric/swingset-vat": "0.32.3-dev-ddf71d7.0+ddf71d7",
-    "@agoric/vats": "0.15.2-dev-ddf71d7.0+ddf71d7",
-    "@agoric/zoe": "0.26.3-dev-ddf71d7.0+ddf71d7",
-    "@agoric/zone": "0.2.3-dev-ddf71d7.0+ddf71d7",
+    "@agoric/access-token": "0.4.22-dev-af5e7ab.0+af5e7ab",
+    "@agoric/cache": "0.3.3-dev-af5e7ab.0+af5e7ab",
+    "@agoric/casting": "0.4.3-dev-af5e7ab.0+af5e7ab",
+    "@agoric/cosmic-proto": "0.4.1-dev-af5e7ab.0+af5e7ab",
+    "@agoric/ertp": "0.16.3-dev-af5e7ab.0+af5e7ab",
+    "@agoric/governance": "0.10.4-dev-af5e7ab.0+af5e7ab",
+    "@agoric/inter-protocol": "0.16.2-dev-af5e7ab.0+af5e7ab",
+    "@agoric/internal": "0.3.3-dev-af5e7ab.0+af5e7ab",
+    "@agoric/network": "0.1.1-dev-af5e7ab.0+af5e7ab",
+    "@agoric/smart-wallet": "0.5.4-dev-af5e7ab.0+af5e7ab",
+    "@agoric/store": "0.9.3-dev-af5e7ab.0+af5e7ab",
+    "@agoric/swingset-vat": "0.32.3-dev-af5e7ab.0+af5e7ab",
+    "@agoric/vats": "0.15.2-dev-af5e7ab.0+af5e7ab",
+    "@agoric/zoe": "0.26.3-dev-af5e7ab.0+af5e7ab",
+    "@agoric/zone": "0.2.3-dev-af5e7ab.0+af5e7ab",
     "@confio/relayer": "^0.11.3",
     "@cosmjs/crypto": "^0.32.3",
     "@cosmjs/encoding": "^0.32.3",
@@ -101,5 +101,5 @@
   "typeCoverage": {
     "atLeast": 77.36
   },
-  "gitHead": "ddf71d7221ba2991cae7b52cceabb0262803f16b"
+  "gitHead": "af5e7ab6b8ddc32de3923995ad2647077abba5b2"
 }

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