agoric 0.21.2-upgrade-16-dev-d492653.0 → 0.21.2-upgrade-16-dev-0549112.0

package/package.json

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

package/src/commands/wallet.js

@@ -29,19 +29,26 @@ const SLEEP_SECONDS = 3;
  * @returns {Promise<import('commander').Command>}
  */
 export const makeWalletCommand = async command => {
-  const wallet = command('wallet')
-    .description('wallet commands')
-    .option('--home <dir>', 'agd application home directory')
-    .option(
-      '--keyring-backend <os|file|test>',
-      'keyring\'s backend (os|file|test) (default "os")',
-    );
+  /**
+   * @param {import('commander').Command} baseCmd
+   */
+  const withSharedTxOptions = baseCmd =>
+    baseCmd
+      .option('--home <dir>', 'agd application home directory')
+      .option(
+        '--keyring-backend <os|file|test>',
+        'keyring\'s backend (os|file|test) (default "os")',
+      );
+  /** @typedef {{home?: string, keyringBackend: 'os' | 'file' | 'test'}} SharedTxOptions */
+
+  const wallet = withSharedTxOptions(command('wallet')).description(
+    'wallet commands',
+  );
 
   const normalizeAddress = literalOrName =>
     normalizeAddressWithOptions(literalOrName, wallet.opts());
 
-  wallet
-    .command('provision')
+  withSharedTxOptions(wallet.command('provision'))
     .description('provision a Smart Wallet')
     .requiredOption(
       '--account [address]',
@@ -51,8 +58,14 @@ export const makeWalletCommand = async command => {
     .option('--spend', 'confirm you want to spend')
     .option('--nickname <string>', 'nickname to use', 'my-wallet')
     .action(function (opts) {
-      const { account, nickname, spend } = opts;
-      const { home, keyringBackend: backend } = wallet.opts();
+      /** @typedef {{account: string, spend?: boolean, nickname: 'my-wallet' | string }} Opts */
+      const {
+        account,
+        nickname,
+        spend,
+        home,
+        keyringBackend: backend,
+      } = /** @type {SharedTxOptions & Opts} */ ({ ...wallet.opts(), ...opts });
       const tx = ['provision-one', nickname, account, 'SMART_WALLET'];
       if (spend) {
         execSwingsetTransaction(tx, {
@@ -110,8 +123,7 @@ export const makeWalletCommand = async command => {
       console.log(offerObj.offer.id);
     });
 
-  wallet
-    .command('send')
+  withSharedTxOptions(wallet.command('send'))
     .description('send a prepared offer')
     .requiredOption(
       '--from [address]',
@@ -121,8 +133,14 @@ export const makeWalletCommand = async command => {
     .requiredOption('--offer [filename]', 'path to file with prepared offer')
     .option('--dry-run', 'spit out the command instead of running it')
     .action(function (opts) {
-      const { dryRun, from, offer } = opts;
-      const { home, keyringBackend: backend } = wallet.opts();
+      /** @typedef {{ from: string, offer: string, dryRun: boolean }} Opts */
+      const {
+        dryRun,
+        from,
+        offer,
+        home,
+        keyringBackend: backend,
+      } = /** @type {SharedTxOptions & Opts} */ ({ ...wallet.opts(), ...opts });
 
       const offerBody = fs.readFileSync(offer).toString();
       execSwingsetTransaction(['wallet-action', '--allow-spend', offerBody], {

package/src/lib/bundles.js

@@ -0,0 +1,102 @@
+// @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);
+    }
+  }
+};

package/src/main.js

@@ -1,23 +1,24 @@
 /* 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/';
@@ -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.
@@ -280,29 +282,6 @@ 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',
@@ -310,23 +289,46 @@ const main = async (progname, rawArgs, powers) => {
     .passThroughOptions(true)
     .action(async (script, scriptArgs, _options, cmd) => {
       const opts = { ...program.opts(), ...cmd.opts(), ...cmdOpts, scriptArgs };
-      return subMain(runMain, ['run', script], opts);
+      await runMain(progname, ['run', script], powers, opts);
+
+      if (opts.verbose) {
+        await statPlans(process.cwd());
+      }
     });
 
-  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('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);
+    });
 
   baseCmd('publish [bundle...]')
     .option(

package/src/sdk-package-names.js

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