agoric 0.22.0-upgrade-14-dev-c8f9e7b.0 → 0.22.0-upgrade-16-dev-07b0130.0

package/src/main.js

@@ -1,24 +1,24 @@
-/* eslint-disable @jessie.js/no-nested-await */
 /* global process */
-import { Command } from 'commander';
-import path from 'path';
-import url from 'url';
 import { assert, details as X } from '@agoric/assert';
 import {
-  DEFAULT_KEEP_POLLING_SECONDS,
   DEFAULT_JITTER_SECONDS,
+  DEFAULT_KEEP_POLLING_SECONDS,
 } from '@agoric/casting';
+import { Command } from 'commander';
+import path from 'path';
+import url from 'url';
+import { makeWalletCommand } from './commands/wallet.js';
 import cosmosMain from './cosmos.js';
 import deployMain from './deploy.js';
-import runMain from './run.js';
-import publishMain from './main-publish.js';
+import followMain from './follow.js';
 import initMain from './init.js';
 import installMain from './install.js';
+import { statPlans } from './lib/bundles.js';
+import publishMain from './main-publish.js';
+import walletMain from './open.js';
+import runMain from './run.js';
 import setDefaultsMain from './set-defaults.js';
 import startMain from './start.js';
-import followMain from './follow.js';
-import walletMain from './open.js';
-import { makeWalletCommand } from './commands/wallet.js';
 
 const DEFAULT_DAPP_TEMPLATE = 'dapp-offer-up';
 const DEFAULT_DAPP_URL_BASE = 'https://github.com/Agoric/';
@@ -36,6 +36,7 @@ const main = async (progname, rawArgs, powers) => {
   const program = new Command();
 
   async function isNotBasedir() {
+    await null;
     try {
       await fs.stat(STAMP);
       return false;
@@ -46,6 +47,7 @@ const main = async (progname, rawArgs, powers) => {
     return true;
   }
 
+  // XXX exits process when fn resolves
   function subMain(fn, args, options) {
     return fn(progname, args, powers, options).then(
       // This seems to be the only way to propagate the exit code.
@@ -57,23 +59,29 @@ const main = async (progname, rawArgs, powers) => {
   const pkg = JSON.parse(pj);
   program.name(pkg.name).version(pkg.version);
 
-  program
-    .option('--sdk', 'use the Agoric SDK containing this program')
-    .option('--no-sdk', 'do not use the Agoric SDK containing this program')
-    .option('--docker-tag <tag>', 'image tag to use for Docker containers')
-    .option(
+  const cmdOpts = { verbose: 0 };
+  const addCmdOpts = baseCmd =>
+    baseCmd.option(
       '-v, --verbose',
       'verbosity that can be increased',
-      (_value, previous) => previous + 1,
-      0,
+      (_value, _previous) => (cmdOpts.verbose += 1),
     );
+  const baseCmd = (...args) => addCmdOpts(program.command(...args));
+
+  addCmdOpts(
+    program
+      .enablePositionalOptions()
+      .option('--sdk', 'use the Agoric SDK containing this program')
+      .option('--no-sdk', 'do not use the Agoric SDK containing this program'),
+  );
 
   // Add each of the commands.
-  program
-    .command('cosmos <command...>')
+  baseCmd('cosmos <command...>')
+    .passThroughOptions(true)
+    .option('--docker-tag <tag>', 'image tag to use for Docker containers')
     .description('client for an Agoric Cosmos chain')
     .action(async (command, _options, cmd) => {
-      const opts = { ...program.opts(), ...cmd.opts() };
+      const opts = { ...program.opts(), ...cmd.opts(), ...cmdOpts };
       return subMain(cosmosMain, ['cosmos', ...command], opts);
     });
 
@@ -90,8 +98,7 @@ const main = async (progname, rawArgs, powers) => {
     { executableFile: ibcSetup },
   );
 
-  program
-    .command('open')
+  baseCmd('open')
     .description('launch the Agoric UI')
     .option(
       '--hostport <host:port>',
@@ -112,12 +119,11 @@ const main = async (progname, rawArgs, powers) => {
       },
     )
     .action(async (_options, cmd) => {
-      const opts = { ...program.opts(), ...cmd.opts() };
+      const opts = { ...program.opts(), ...cmd.opts(), ...cmdOpts };
       return subMain(walletMain, ['wallet'], opts);
     });
 
-  program
-    .command('init <project>')
+  baseCmd('init <project>')
     .description('create a new Dapp directory named <project>')
     .option(
       '--dapp-template <name>',
@@ -134,13 +140,17 @@ const main = async (progname, rawArgs, powers) => {
       'use this branch instead of the repository HEAD',
       DEFAULT_DAPP_BRANCH,
     )
+    // Tolerate @agoric/create-dapp's `agoric init --version` invocation.
+    .option('-V, --version', 'output the version number', () => {
+      console.log(pkg.version);
+      process.exit(0);
+    })
     .action(async (project, _options, cmd) => {
-      const opts = { ...program.opts(), ...cmd.opts() };
+      const opts = { ...program.opts(), ...cmd.opts(), ...cmdOpts };
       return subMain(initMain, ['init', project], opts);
     });
 
-  program
-    .command('set-defaults <program> <config-dir>')
+  baseCmd('set-defaults <program> <config-dir>')
     .description('update the configuration files for <program> in <config-dir>')
     .option(
       '--enable-cors',
@@ -168,7 +178,7 @@ const main = async (progname, rawArgs, powers) => {
       '',
     )
     .action(async (prog, configDir, _options, cmd) => {
-      const opts = { ...program.opts(), ...cmd.opts() };
+      const opts = { ...program.opts(), ...cmd.opts(), ...cmdOpts };
       return subMain(setDefaultsMain, ['set-defaults', prog, configDir], opts);
     });
 
@@ -187,17 +197,15 @@ const main = async (progname, rawArgs, powers) => {
     },
   );
 
-  program
-    .command('install [force-sdk-version]')
+  baseCmd('install [force-sdk-version]')
     .description('install Dapp dependencies')
     .action(async (forceSdkVersion, _options, cmd) => {
       await isNotBasedir();
-      const opts = { ...program.opts(), ...cmd.opts() };
+      const opts = { ...program.opts(), ...cmd.opts(), ...cmdOpts };
       return subMain(installMain, ['install', forceSdkVersion], opts);
     });
 
-  program
-    .command('follow <path-spec...>')
+  baseCmd('follow <path-spec...>')
     .description('follow an Agoric Casting leader')
     .option(
       '--proof <strict | optimistic | none>',
@@ -270,61 +278,59 @@ const main = async (progname, rawArgs, powers) => {
     )
     .option('-B, --bootstrap <config>', 'network bootstrap configuration')
     .action(async (pathSpecs, _options, cmd) => {
-      const opts = { ...program.opts(), ...cmd.opts() };
+      const opts = { ...program.opts(), ...cmd.opts(), ...cmdOpts };
       return subMain(followMain, ['follow', ...pathSpecs], opts);
     });
 
-  const addRunOptions = cmd =>
-    cmd
-      .option(
-        '--allow-unsafe-plugins',
-        `CAREFUL: installed Agoric VM plugins will also have all your user's privileges`,
-        false,
-      )
-      .option(
-        '--hostport <host:port>',
-        'host and port to connect to VM',
-        '127.0.0.1:8000',
-      )
-      .option(
-        '--need <subsystems>',
-        'comma-separated names of subsystems to wait for',
-        'local,agoric,wallet',
-      )
-      .option(
-        '--provide <subsystems>',
-        'comma-separated names of subsystems this script initializes',
-        '',
-      );
-
-  program
-    .command('run <script> [script-args...]')
+  baseCmd('run <script> [script-args...]')
     .description(
       'run a script with all your user privileges and some Agoric endowments',
     )
+    .passThroughOptions(true)
     .action(async (script, scriptArgs, _options, cmd) => {
-      const opts = { ...program.opts(), ...cmd.opts(), scriptArgs };
-      return subMain(runMain, ['run', script], opts);
+      const opts = { ...program.opts(), ...cmd.opts(), ...cmdOpts, scriptArgs };
+      await runMain(progname, ['run', script], powers, opts);
+
+      if (opts.verbose) {
+        await statPlans(process.cwd());
+      }
     });
 
-  addRunOptions(
-    program
-      .command('deploy [script...]')
-      .option(
-        '--target <target>',
-        'One of agoric, local, cosmos, or sim',
-        'agoric',
-      )
-      .description(
-        'run multiple scripts with all your user privileges against the local Agoric VM',
-      ),
-  ).action(async (scripts, _options, cmd) => {
-    const opts = { ...program.opts(), ...cmd.opts() };
-    return subMain(deployMain, ['deploy', ...scripts], opts);
-  });
+  baseCmd('deploy [script...]')
+    .option(
+      '--target <target>',
+      'One of agoric, local, cosmos, or sim',
+      'agoric',
+    )
+    .option(
+      '--allow-unsafe-plugins',
+      `CAREFUL: installed Agoric VM plugins will also have all your user's privileges`,
+      false,
+    )
+    .option(
+      '--hostport <host:port>',
+      'host and port to connect to VM',
+      '127.0.0.1:8000',
+    )
+    .option(
+      '--need <subsystems>',
+      'comma-separated names of subsystems to wait for',
+      'local,agoric,wallet',
+    )
+    .option(
+      '--provide <subsystems>',
+      'comma-separated names of subsystems this script initializes',
+      '',
+    )
+    .description(
+      'run multiple scripts with all your user privileges against the local Agoric VM',
+    )
+    .action(async (scripts, _options, cmd) => {
+      const opts = { ...program.opts(), ...cmd.opts() };
+      return subMain(deployMain, ['deploy', ...scripts], opts);
+    });
 
-  program
-    .command('publish [bundle...]')
+  baseCmd('publish [bundle...]')
     .option(
       '-c, --chain-id <chainID>',
       'The ID of the destination chain',
@@ -345,10 +351,9 @@ const main = async (progname, rawArgs, powers) => {
       return subMain(publishMain, ['publish', ...bundles], opts);
     });
 
-  program.addCommand(await makeWalletCommand());
+  await makeWalletCommand(baseCmd);
 
-  program
-    .command('start [profile] [args...]')
+  baseCmd('start [profile] [args...]')
     .description(
       `\
 start an Agoric VM
@@ -360,6 +365,7 @@ agoric start local-solo [portNum] [provisionPowers] - local solo VM
 `,
     )
     .option('-d, --debug', 'run in JS debugger mode')
+    .option('--docker-tag <tag>', 'image tag to use for Docker containers')
     .option('--reset', 'clear all VM state before starting')
     .option('--no-restart', 'do not actually start the VM')
     .option('--pull', 'for Docker-based VM, pull the image before running')
@@ -383,19 +389,13 @@ agoric start local-solo [portNum] [provisionPowers] - local solo VM
     )
     .action(async (profile, args, _options, cmd) => {
       await isNotBasedir();
-      const opts = { ...program.opts(), ...cmd.opts() };
+      const opts = { ...program.opts(), ...cmd.opts(), ...cmdOpts };
       return subMain(startMain, ['start', profile, ...args], opts);
     });
 
   // Throw an error instead of exiting directly.
   program.exitOverride();
 
-  // Hack: cosmos arguments are always unparsed.
-  const cosmosIndex = rawArgs.indexOf('cosmos');
-  if (cosmosIndex >= 0) {
-    rawArgs.splice(cosmosIndex + 1, 0, '--');
-  }
-
   try {
     await program.parseAsync(rawArgs, { from: 'user' });
   } catch (e) {

package/src/open.js

@@ -5,8 +5,8 @@ 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, fs } = powers;
+export default async function walletMain(_progname, _rawArgs, powers, opts) {
+  const { anylogger } = powers;
   const console = anylogger('agoric:wallet');
 
   let suffix;
@@ -39,10 +39,10 @@ export default async function walletMain(progname, rawArgs, powers, opts) {
     1000,
   );
 
-  const walletAccessToken = await getAccessToken(opts.hostport, {
-    console,
-    fs,
-  }).catch(e => console.error(`Trying to fetch access token:`, e));
+  const walletAccessToken = await getAccessToken(opts.hostport).catch(e => {
+    console.error(`Trying to fetch access token:`, e);
+    throw e;
+  });
 
   clearInterval(progressTimer);
   process.stderr.write('\n');

package/src/publish.js

@@ -1,5 +1,5 @@
 // @ts-check
-/// <reference types="ses"/>
+/// <reference types="ses" />
 
 import { E } from '@endo/far';
 
@@ -38,6 +38,7 @@ const Agoric = {
 const hdPath = (coinType = 118, account = 0) =>
   stringToPath(`m/44'/${coinType}'/${account}'/0/0`);
 
+// @ts-expect-error difference in private property _push
 const registry = new Registry([
   ...defaultRegistryTypes,
   [Agoric.proto.swingset.InstallBundle.typeUrl, MsgInstallBundle],
@@ -96,7 +97,6 @@ const choose = (array, randomNumber) => {
   return array[index];
 };
 
-// eslint-disable-next-line jsdoc/require-returns-check
 /**
  * @param {unknown} connectionSpec
  * @returns {asserts connectionSpec is HttpConnectionSpec}
@@ -124,7 +124,6 @@ const assertHttpConnectionSpec = connectionSpec => {
     Fail`Expected integer "port" on "http" type connectionSpec, ${connectionSpec}`;
 };
 
-// eslint-disable-next-line jsdoc/require-returns-check
 /**
  * @param {unknown} connectionSpec
  * @returns {asserts connectionSpec is CosmosConnectionSpec}
@@ -289,14 +288,12 @@ export const makeCosmosBundlePublisher = ({
       const endpoint = urlForRpcAddress(rpcAddress);
 
       // AWAIT
-      // eslint-disable-next-line no-await-in-loop,@jessie.js/no-nested-await
       const stargateClient = await connectWithSigner(endpoint, wallet, {
         gasPrice: Agoric.gasPrice,
         registry,
       });
 
       // AWAIT
-      // eslint-disable-next-line no-await-in-loop,@jessie.js/no-nested-await
       const result = await stargateClient
         .signAndBroadcast(from.address, encodeObjects, Agoric.fee)
         .catch(error => {
@@ -312,7 +309,6 @@ export const makeCosmosBundlePublisher = ({
       }
 
       // AWAIT
-      // eslint-disable-next-line no-await-in-loop,@jessie.js/no-nested-await
       await E(leader).jitter('agoric CLI deploy');
     }
 
@@ -426,6 +422,7 @@ const publishBundle = async (
     )}, publishBundle supports only "endoZipBase64" with "endoZipBase64Sha512"`;
   }
 
+  await null;
   if (connectionSpec === undefined && getDefaultConnection !== undefined) {
     connectionSpec = await getDefaultConnection();
   }

package/src/sdk-package-names.js

@@ -1,9 +1,12 @@
 // DO NOT EDIT - automatically generated by get-sdk-package-names.js
-/* eslint-disable comma-dangle,quotes */
 // prettier-ignore
 export default [
   "@agoric/access-token",
   "@agoric/assert",
+  "@agoric/base-zone",
+  "@agoric/benchmark",
+  "@agoric/boot",
+  "@agoric/builders",
   "@agoric/cache",
   "@agoric/casting",
   "@agoric/cosmic-proto",
@@ -18,10 +21,10 @@ export default [
   "@agoric/import-manager",
   "@agoric/inter-protocol",
   "@agoric/internal",
+  "@agoric/kmarshal",
+  "@agoric/network",
   "@agoric/notifier",
   "@agoric/pegasus",
-  "@agoric/same-structure",
-  "@agoric/sharing-service",
   "@agoric/smart-wallet",
   "@agoric/solo",
   "@agoric/sparse-ints",
@@ -35,13 +38,12 @@ export default [
   "@agoric/swingset-xsnap-supervisor",
   "@agoric/telemetry",
   "@agoric/time",
-  "@agoric/ui-components",
   "@agoric/vat-data",
   "@agoric/vats",
+  "@agoric/vm-config",
+  "@agoric/vow",
   "@agoric/wallet",
   "@agoric/wallet-backend",
-  "@agoric/wallet-connection",
-  "@agoric/web-components",
   "@agoric/xsnap",
   "@agoric/xsnap-lockdown",
   "@agoric/zoe",

package/src/set-defaults.js

@@ -42,6 +42,7 @@ export default async function setDefaultsMain(progname, rawArgs, powers, opts) {
     return fs.writeFile(fileName, contents);
   };
 
+  await null;
   if (appFile) {
     log(`read ${appFile}`);
     const appToml = await fs.readFile(appFile, 'utf-8');