agoric 0.22.0-u13.0 → 0.22.0-upgrade-14-dev-0a0580c.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.22.0-u13.0",
+  "version": "0.22.0-upgrade-14-dev-0a0580c.0+0a0580c",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -14,6 +14,7 @@
   },
   "files": [
     "src",
+    "tools",
     "exported.js"
   ],
   "scripts": {
@@ -28,26 +29,26 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "^0.10.4-u13.0",
+    "@agoric/deploy-script-support": "0.10.4-upgrade-14-dev-0a0580c.0+0a0580c",
     "ava": "^5.2.0",
     "c8": "^7.13.0",
     "dd-trace": "^3.3.0"
   },
   "dependencies": {
-    "@agoric/access-token": "^0.4.22-u11wf.0",
-    "@agoric/assert": "^0.6.1-u11wf.0",
-    "@agoric/cache": "^0.3.3-u13.0",
-    "@agoric/casting": "^0.4.3-u13.0",
-    "@agoric/cosmic-proto": "^0.3.0",
-    "@agoric/ertp": "^0.16.3-u13.0",
-    "@agoric/inter-protocol": "^0.16.2-u13.0",
-    "@agoric/internal": "^0.4.0-u13.0",
-    "@agoric/smart-wallet": "^0.5.4-u13.0",
-    "@agoric/store": "^0.9.3-u13.0",
-    "@agoric/swingset-vat": "^0.32.3-u13.0",
-    "@agoric/vats": "^0.15.2-u13.0",
-    "@agoric/zoe": "^0.26.3-u13.0",
-    "@agoric/zone": "^0.2.3-u13.0",
+    "@agoric/access-token": "0.4.22-upgrade-14-dev-0a0580c.0+0a0580c",
+    "@agoric/assert": "0.6.1-upgrade-14-dev-0a0580c.0+0a0580c",
+    "@agoric/cache": "0.3.3-upgrade-14-dev-0a0580c.0+0a0580c",
+    "@agoric/casting": "0.4.3-upgrade-14-dev-0a0580c.0+0a0580c",
+    "@agoric/cosmic-proto": "0.3.1-upgrade-14-dev-0a0580c.0+0a0580c",
+    "@agoric/ertp": "0.16.3-upgrade-14-dev-0a0580c.0+0a0580c",
+    "@agoric/inter-protocol": "0.16.2-upgrade-14-dev-0a0580c.0+0a0580c",
+    "@agoric/internal": "0.4.0-upgrade-14-dev-0a0580c.0+0a0580c",
+    "@agoric/smart-wallet": "0.5.4-upgrade-14-dev-0a0580c.0+0a0580c",
+    "@agoric/store": "0.9.3-upgrade-14-dev-0a0580c.0+0a0580c",
+    "@agoric/swingset-vat": "0.32.3-upgrade-14-dev-0a0580c.0+0a0580c",
+    "@agoric/vats": "0.15.2-upgrade-14-dev-0a0580c.0+0a0580c",
+    "@agoric/zoe": "0.26.3-upgrade-14-dev-0a0580c.0+0a0580c",
+    "@agoric/zone": "0.2.3-upgrade-14-dev-0a0580c.0+0a0580c",
     "@confio/relayer": "^0.9.0",
     "@cosmjs/crypto": "^0.30.1",
     "@cosmjs/encoding": "^0.30.1",
@@ -65,7 +66,7 @@
     "@iarna/toml": "^2.2.3",
     "anylogger": "^0.21.0",
     "chalk": "^5.2.0",
-    "commander": "^10.0.0",
+    "commander": "^11.1.0",
     "deterministic-json": "^1.0.5",
     "esm": "agoric-labs/esm#Agoric-built",
     "inquirer": "^8.2.2",
@@ -91,5 +92,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "5a6cdeb0c18ae9700d706445acf402f8d1e873c3"
+  "gitHead": "0a0580cba9f4b41a1dc748cdd267dbcf0feed362"
 }

package/src/init.js

@@ -40,9 +40,10 @@ export default async function initMain(_progname, rawArgs, priv, opts) {
     dappBranch = ['-b', opts.dappBranch];
   }
 
+  const shallow = ['--depth', '1', '--shallow-submodules'];
   const exitStatus = await pspawn(
     'git',
-    ['clone', '--origin=upstream', dappURL, DIR, ...dappBranch],
+    ['clone', '--origin=upstream', ...shallow, dappURL, DIR, ...dappBranch],
     {
       stdio: 'inherit',
     },

package/src/main.js

@@ -20,7 +20,7 @@ import followMain from './follow.js';
 import walletMain from './open.js';
 import { makeWalletCommand } from './commands/wallet.js';
 
-const DEFAULT_DAPP_TEMPLATE = 'dapp-fungible-faucet';
+const DEFAULT_DAPP_TEMPLATE = 'dapp-offer-up';
 const DEFAULT_DAPP_URL_BASE = 'https://github.com/Agoric/';
 const DEFAULT_DAPP_BRANCH = undefined;
 
@@ -96,7 +96,7 @@ const main = async (progname, rawArgs, powers) => {
     .option(
       '--hostport <host:port>',
       'host and port to connect to VM',
-      '127.0.0.1:8000',
+      'localhost:8000',
     )
     .option('--no-browser', `just display the URL, don't open a browser`)
     .option(

package/src/sdk-package-names.js

@@ -9,6 +9,7 @@ export default [
   "@agoric/cosmic-proto",
   "@agoric/cosmic-swingset",
   "@agoric/cosmos",
+  "@agoric/create-dapp",
   "@agoric/deploy-script-support",
   "@agoric/deployment",
   "@agoric/ertp",

package/tools/getting-started.js

@@ -0,0 +1,269 @@
+/* global process setTimeout clearTimeout setInterval clearInterval */
+
+import fs from 'fs';
+import path from 'path';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import tmp from 'tmp';
+import { makePromiseKit } from '@endo/promise-kit';
+import { request } from 'http';
+
+import { spawn } from 'child_process';
+
+import { makePspawn } from '../src/helpers.js';
+
+const TIMEOUT_SECONDS = 20 * 60;
+
+const dirname = new URL('./', import.meta.url).pathname;
+
+// To keep in sync with https://agoric.com/documentation/getting-started/
+
+// Note that we currently only test:
+// agoric init dapp-foo
+// agoric install
+// agoric start --reset
+// agoric deploy ./contract/deploy.js ./api/deploy.js
+// (For simple-exchange and autoswap, the above also makes and accepts offers)
+// cd ui && yarn install
+// cd ui && yarn start
+
+export const gettingStartedWorkflowTest = async (t, options = {}) => {
+  const {
+    init: initOptions = [],
+    install: installOptions = [],
+    start: startOptions = [],
+    testUnsafePlugins = false,
+  } = options;
+  // FIXME: Do a search for an unused port or allow specification.
+  const PORT = '7999';
+  process.env.PORT = PORT;
+
+  const pspawn = makePspawn({ spawn });
+
+  // Kill an entire process group.
+  const pkill = (cp, signal = 'SIGINT') => process.kill(-cp.pid, signal);
+
+  function pspawnStdout(...args) {
+    const ps = pspawn(...args);
+    ps.childProcess.stdout.on('data', chunk => {
+      process.stdout.write(chunk);
+    });
+    // ps.childProcess.unref();
+    return ps;
+  }
+
+  const defaultAgoricCmd = () => {
+    // Run all main programs with the '--sdk' flag if we are in agoric-sdk.
+    const extraArgs = fs.existsSync(`${dirname}/../../cosmic-swingset`)
+      ? ['--sdk']
+      : [];
+    const localCli = path.join(dirname, '..', 'bin', 'agoric');
+    return [localCli, ...extraArgs];
+  };
+  const { AGORIC_CMD = JSON.stringify(defaultAgoricCmd()) } = process.env;
+  const agoricCmd = JSON.parse(AGORIC_CMD);
+  function myMain(args, opts = {}) {
+    // console.error('running agoric-cli', ...extraArgs, ...args);
+    return pspawnStdout(agoricCmd[0], [...agoricCmd.slice(1), ...args], {
+      stdio: ['ignore', 'pipe', 'inherit'],
+      env: { ...process.env, DEBUG: 'agoric' },
+      detached: true,
+      ...opts,
+    });
+  }
+
+  const olddir = process.cwd();
+  const { name } = tmp.dirSync({
+    unsafeCleanup: true,
+    prefix: 'agoric-cli-test-',
+  });
+
+  const finalizers = [];
+  const runFinalizers = sig => {
+    while (finalizers.length) {
+      const f = finalizers.shift();
+      try {
+        f();
+      } catch (e) {
+        // console.log(e);
+      }
+    }
+    if (sig) {
+      // We're dying due to signal.
+      process.exit(1);
+    }
+  };
+
+  try {
+    process.on('SIGINT', runFinalizers);
+    process.on('exit', runFinalizers);
+    process.chdir(name);
+
+    // ==============
+    // agoric init dapp-foo
+    if (process.env.AGORIC_INIT_OPTIONS) {
+      const opts = JSON.parse(process.env.AGORIC_INIT_OPTIONS);
+      initOptions.push(...opts);
+    }
+    t.is(
+      await myMain([
+        'init',
+        '--dapp-template',
+        'dapp-fungible-faucet',
+        ...initOptions,
+        'dapp-foo',
+      ]),
+      0,
+      'init dapp-foo works',
+    );
+    process.chdir('dapp-foo');
+
+    // ==============
+    // agoric install
+    if (process.env.AGORIC_INSTALL_OPTIONS) {
+      const opts = JSON.parse(process.env.AGORIC_INSTALL_OPTIONS);
+      installOptions.push(...opts);
+    }
+    t.is(await myMain(['install', ...installOptions]), 0, 'install works');
+
+    // ==============
+    // agoric start --reset
+    const startResult = makePromiseKit();
+
+    if (process.env.AGORIC_START_OPTIONS) {
+      const opts = JSON.parse(process.env.AGORIC_START_OPTIONS);
+      startOptions.push(...opts);
+    }
+
+    // TODO: Allow this to work even if the port is already used.
+    const startP = myMain(['start', '--reset', ...startOptions]);
+    finalizers.push(() => pkill(startP.childProcess, 'SIGINT'));
+
+    let stdoutStr = '';
+    if (startP.childProcess.stdout) {
+      startP.childProcess.stdout.on('data', chunk => {
+        // console.log('stdout:', chunk.toString());
+        stdoutStr += chunk.toString();
+        if (stdoutStr.match(/(^|:\s+)swingset running$/m)) {
+          startResult.resolve(true);
+        }
+      });
+    }
+    startP.childProcess.on('close', code =>
+      startResult.reject(Error(`early termination: ${code}`)),
+    );
+
+    const timeout = setTimeout(
+      startResult.reject,
+      TIMEOUT_SECONDS * 1000,
+      'timeout',
+    );
+    t.is(await startResult.promise, true, `swingset running before timeout`);
+    clearTimeout(timeout);
+
+    const testDeploy = async (deployCmd, opts = {}) => {
+      const deployResult = makePromiseKit();
+      const deployP = myMain(
+        ['deploy', `--hostport=127.0.0.1:${PORT}`, ...deployCmd],
+        {
+          stdio: [opts.stdin ? 'pipe' : 'ignore', 'pipe', 'inherit'],
+        },
+      );
+
+      if (opts.stdin) {
+        // Write the input to stdin.
+        deployP.childProcess.stdin.write(opts.stdin);
+        deployP.childProcess.stdin.end();
+      }
+
+      finalizers.push(() => pkill(deployP.childProcess, 'SIGINT'));
+      const to = setTimeout(
+        deployResult.resolve,
+        TIMEOUT_SECONDS * 1000,
+        'timeout',
+      );
+      const done = await Promise.race([deployResult.promise, deployP]);
+      t.is(done, 0, `deploy ${deployCmd.join(' ')} successful before timeout`);
+      clearTimeout(to);
+    };
+
+    // ==============
+    // agoric deploy ./contract/deploy.js ./api/deploy.js
+    await testDeploy(['./contract/deploy.js', './api/deploy.js']);
+
+    for (const [suffix, code] of [
+      ['/notthere', 404],
+      ['', 200],
+    ]) {
+      let urlResolve;
+      const url = `http://127.0.0.1:${PORT}${suffix}`;
+      const urlP = new Promise(resolve => (urlResolve = resolve));
+      const urlReq = request(url, res => urlResolve(res.statusCode));
+      urlReq.setTimeout(2000);
+      urlReq.on('error', err => urlResolve(`Cannot connect to ${url}: ${err}`));
+      urlReq.end();
+      const urlTimeout = setTimeout(urlResolve, 3000, 'timeout');
+      // eslint-disable-next-line no-await-in-loop
+      const urlDone = await urlP;
+      clearTimeout(urlTimeout);
+      t.is(urlDone, code, `${url} gave status ${code}`);
+    }
+
+    // ==============
+    // cd ui && yarn start
+    const uiStartP = pspawn(`yarn`, ['start'], {
+      stdio: ['ignore', 'inherit', 'inherit'],
+      cwd: 'ui',
+      env: { ...process.env, PORT: '3000' },
+      detached: true,
+    });
+    finalizers.push(() => pkill(uiStartP.childProcess, 'SIGINT'));
+    const uiListening = makePromiseKit();
+    let retries = 0;
+    const ival = setInterval(() => {
+      try {
+        const resolve = status => {
+          clearInterval(ival);
+          uiListening.resolve(status);
+        };
+
+        retries += 1;
+        if (retries > 8) {
+          resolve('too many retries');
+          return;
+        }
+
+        const req = request('http://localhost:3000/', _res => {
+          resolve('listening');
+        });
+        req.setTimeout(2000);
+        req.on('error', err => {
+          if (err.code !== 'ECONNREFUSED') {
+            resolve(`Cannot connect to UI server: ${err}`);
+          }
+        });
+        req.end();
+      } catch (e) {
+        console.error('cannot make request', e);
+      }
+    }, 3000);
+    t.is(
+      await Promise.race([uiStartP, uiListening.promise]),
+      'listening',
+      `cd ui && yarn start succeeded`,
+    );
+    clearInterval(ival);
+
+    // Test that the Node.js `-r esm`-dependent plugin works.
+    await (testUnsafePlugins &&
+      testDeploy(
+        ['--allow-unsafe-plugins', `${dirname}/resm-plugin/deploy.js`],
+        { stdin: 'yes\n' },
+      ));
+
+    // TODO: When it exists, Test that the Node.js native ESM plugin works.
+  } finally {
+    runFinalizers();
+    process.off('SIGINT', runFinalizers);
+    process.chdir(olddir);
+  }
+};

package/tools/resm-plugin/deploy.js

@@ -0,0 +1,19 @@
+/* globals setTimeout */
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { E } from '@endo/eventual-send';
+
+const PONG_TIMEOUT = 10_000;
+
+export default async function deployPlugin(
+  homePromise,
+  { installUnsafePlugin },
+) {
+  const plugin = await installUnsafePlugin('./src/plugin.js', {});
+  const result = await Promise.race([
+    E(plugin).ping(),
+    new Promise(resolve => setTimeout(resolve, PONG_TIMEOUT, 'timeout')),
+  ]);
+  if (result !== 'pong') {
+    throw Error(`ping failed ${result}`);
+  }
+}

package/tools/resm-plugin/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@agoric/test-resm-plugin",
+  "version": "1.0.0",
+  "type": "commonjs"
+}

package/tools/resm-plugin/src/output.js

@@ -0,0 +1 @@
+export const start = 'Started plugin';

package/tools/resm-plugin/src/plugin.js

@@ -0,0 +1,18 @@
+// @jessie-check
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { Far } from '@endo/marshal';
+import { start } from './output.js';
+
+export const bootPlugin = () => {
+  return Far('plugin', {
+    start(_opts) {
+      console.log(start);
+      return Far('plugin start', {
+        async ping() {
+          return 'pong';
+        },
+      });
+    },
+  });
+};