agoric 0.21.2-upgrade-16-dev-f908f89.0 → 0.21.2-upgrade-16-dev-d45b478.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-upgrade-16-dev-f908f89.0+f908f89",
+  "version": "0.21.2-upgrade-16-dev-d45b478.0+d45b478",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -29,29 +29,29 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.41.4-upgrade-16-dev-f908f89.0+f908f89",
-    "@agoric/deploy-script-support": "0.10.4-upgrade-16-dev-f908f89.0+f908f89",
+    "@agoric/cosmic-swingset": "0.41.4-upgrade-16-dev-d45b478.0+d45b478",
+    "@agoric/deploy-script-support": "0.10.4-upgrade-16-dev-d45b478.0+d45b478",
     "ava": "^5.3.0",
     "c8": "^9.1.0",
     "dd-trace": "^4.11.1"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-upgrade-16-dev-f908f89.0+f908f89",
-    "@agoric/assert": "0.6.1-upgrade-16-dev-f908f89.0+f908f89",
-    "@agoric/cache": "0.3.3-upgrade-16-dev-f908f89.0+f908f89",
-    "@agoric/casting": "0.4.3-upgrade-16-dev-f908f89.0+f908f89",
-    "@agoric/cosmic-proto": "0.4.1-upgrade-16-dev-f908f89.0+f908f89",
-    "@agoric/ertp": "0.16.3-upgrade-16-dev-f908f89.0+f908f89",
-    "@agoric/governance": "0.10.4-upgrade-16-dev-f908f89.0+f908f89",
-    "@agoric/inter-protocol": "0.16.2-upgrade-16-dev-f908f89.0+f908f89",
-    "@agoric/internal": "0.3.3-upgrade-16-dev-f908f89.0+f908f89",
-    "@agoric/network": "0.1.1-upgrade-16-dev-f908f89.0+f908f89",
-    "@agoric/smart-wallet": "0.5.4-upgrade-16-dev-f908f89.0+f908f89",
-    "@agoric/store": "0.9.3-upgrade-16-dev-f908f89.0+f908f89",
-    "@agoric/swingset-vat": "0.32.3-upgrade-16-dev-f908f89.0+f908f89",
-    "@agoric/vats": "0.15.2-upgrade-16-dev-f908f89.0+f908f89",
-    "@agoric/zoe": "0.26.3-upgrade-16-dev-f908f89.0+f908f89",
-    "@agoric/zone": "0.2.3-upgrade-16-dev-f908f89.0+f908f89",
+    "@agoric/access-token": "0.4.22-upgrade-16-dev-d45b478.0+d45b478",
+    "@agoric/assert": "0.6.1-upgrade-16-dev-d45b478.0+d45b478",
+    "@agoric/cache": "0.3.3-upgrade-16-dev-d45b478.0+d45b478",
+    "@agoric/casting": "0.4.3-upgrade-16-dev-d45b478.0+d45b478",
+    "@agoric/cosmic-proto": "0.4.1-upgrade-16-dev-d45b478.0+d45b478",
+    "@agoric/ertp": "0.16.3-upgrade-16-dev-d45b478.0+d45b478",
+    "@agoric/governance": "0.10.4-upgrade-16-dev-d45b478.0+d45b478",
+    "@agoric/inter-protocol": "0.16.2-upgrade-16-dev-d45b478.0+d45b478",
+    "@agoric/internal": "0.3.3-upgrade-16-dev-d45b478.0+d45b478",
+    "@agoric/network": "0.1.1-upgrade-16-dev-d45b478.0+d45b478",
+    "@agoric/smart-wallet": "0.5.4-upgrade-16-dev-d45b478.0+d45b478",
+    "@agoric/store": "0.9.3-upgrade-16-dev-d45b478.0+d45b478",
+    "@agoric/swingset-vat": "0.32.3-upgrade-16-dev-d45b478.0+d45b478",
+    "@agoric/vats": "0.15.2-upgrade-16-dev-d45b478.0+d45b478",
+    "@agoric/zoe": "0.26.3-upgrade-16-dev-d45b478.0+d45b478",
+    "@agoric/zone": "0.2.3-upgrade-16-dev-d45b478.0+d45b478",
     "@confio/relayer": "^0.11.3",
     "@cosmjs/crypto": "^0.32.3",
     "@cosmjs/encoding": "^0.32.3",
@@ -68,7 +68,6 @@
     "@endo/nat": "^5.0.7",
     "@endo/patterns": "^1.4.0",
     "@endo/promise-kit": "^1.1.2",
-    "@endo/zip": "^1.0.5",
     "@iarna/toml": "^2.2.3",
     "anylogger": "^0.21.0",
     "chalk": "^5.2.0",
@@ -101,5 +100,5 @@
   "typeCoverage": {
     "atLeast": 76.99
   },
-  "gitHead": "f908f89186162df83b540f6aeb1f4c665c3a56b4"
+  "gitHead": "d45b478fe2dd21ff463660522e1998ab3e8bbe65"
 }

package/src/main.js

@@ -1,24 +1,23 @@
 /* global process */
+import { Command } from 'commander';
+import path from 'path';
+import url from 'url';
 import { assert, details as X } from '@agoric/assert';
 import {
-  DEFAULT_JITTER_SECONDS,
   DEFAULT_KEEP_POLLING_SECONDS,
+  DEFAULT_JITTER_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 followMain from './follow.js';
+import runMain from './run.js';
+import publishMain from './main-publish.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/';
@@ -47,7 +46,6 @@ 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.
@@ -282,6 +280,29 @@ const main = async (progname, rawArgs, powers) => {
       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',
+        '',
+      );
+
   baseCmd('run <script> [script-args...]')
     .description(
       'run a script with all your user privileges and some Agoric endowments',
@@ -289,46 +310,23 @@ const main = async (progname, rawArgs, powers) => {
     .passThroughOptions(true)
     .action(async (script, scriptArgs, _options, cmd) => {
       const opts = { ...program.opts(), ...cmd.opts(), ...cmdOpts, scriptArgs };
-      await runMain(progname, ['run', script], powers, opts);
-
-      if (opts.verbose) {
-        await statPlans(process.cwd());
-      }
+      return subMain(runMain, ['run', script], 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);
-    });
+  addRunOptions(
+    baseCmd('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('publish [bundle...]')
     .option(

package/src/lib/bundles.js

@@ -1,102 +0,0 @@
-// @ts-check
-
-/* global Buffer */
-
-import assert from 'node:assert/strict';
-import fs from 'node:fs';
-import { join } from 'node:path';
-
-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.]+)\//;
-
-/**
- * @typedef {{ name: string, label: string, location: string, modules: Record<string, {compartment: string, module: string}>}} Compartment
- */
-
-/**
- * @typedef CompartmentMap
- * @property {string[]} tags
- * @property {{compartment: string, module: string}} entry
- * @property {Record<string, Compartment>} compartments
- */
-
-/** @param {Bundle} bundleObj*/
-export const extractBundleInfo = async bundleObj => {
-  if (bundleObj.moduleFormat !== 'endoZipBase64') {
-    throw new Error('only endoZipBase64 is supported');
-  }
-
-  const contents = Buffer.from(bundleObj.endoZipBase64, 'base64');
-
-  const zipReader = new ZipReader(contents);
-  const { files } = zipReader;
-
-  const cmapEntry = files.get('compartment-map.json');
-  /** @type {CompartmentMap} */
-  const compartmentMap = JSON.parse(Buffer.from(cmapEntry.content).toString());
-
-  // XXX mapIter better but requires SES
-  const fileSizes = Object.fromEntries(
-    Array.from(files.values()).map(f => [
-      f.name,
-      // bundle contents are not compressed
-      f.content.length,
-    ]),
-  );
-
-  return { compartmentMap, fileSizes };
-};
-
-// UNTIL https://github.com/endojs/endo/issues/1656
-/** @param {string} bundleFilename */
-export const statBundle = async bundleFilename => {
-  const bundle = fs.readFileSync(bundleFilename, 'utf8');
-  /** @type {Bundle} */
-  const bundleObj = JSON.parse(bundle);
-  console.log('\nBUNDLE', bundleObj.moduleFormat, bundleFilename);
-
-  const info = await extractBundleInfo(bundleObj);
-  assert(info, 'no bundle info');
-
-  /** @type {Record<string, number>} */
-  const byPackage = {};
-  let totalSize = 0;
-  for (const [filename, size] of Object.entries(info.fileSizes)) {
-    totalSize += size;
-    if (filename === 'compartment-map.json') {
-      continue;
-    }
-    const { packageName } = filename.match(PACKAGE_NAME_RE)?.groups ?? {};
-    assert(packageName, `invalid filename ${filename}`);
-    byPackage[packageName] ||= 0;
-    byPackage[packageName] += size;
-  }
-
-  console.log('Sum of file sizes in each package:');
-  console.table(byPackage);
-
-  console.log('total size:', totalSize);
-  console.log('\nTo explore the contents:\n');
-  console.log(
-    `  DIR=$(mktemp -d); cat ${bundleFilename} | jq -r .endoZipBase64 | base64 -d | tar xC $DIR; open $DIR`,
-  );
-};
-
-/** @param {string} path */
-export const statPlans = async path => {
-  const files = await fs.promises.readdir(path);
-  const planfiles = files.filter(f => f.endsWith('plan.json'));
-
-  for (const planfile of planfiles) {
-    /** @type {CoreEvalPlan} */
-    const plan = JSON.parse(fs.readFileSync(join(path, planfile), 'utf8'));
-    console.log('\n**\nPLAN', plan.name);
-    for (const bundle of plan.bundles) {
-      await statBundle(bundle.fileName);
-    }
-  }
-};