agoric 0.21.2-dev-7ffae88.0 → 0.21.2-dev-c5284e4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-dev-7ffae88.0+7ffae88",
+  "version": "0.21.2-dev-c5284e4.0+c5284e4",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -29,45 +29,45 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.41.4-dev-7ffae88.0+7ffae88",
-    "@agoric/deploy-script-support": "0.10.4-dev-7ffae88.0+7ffae88",
+    "@agoric/cosmic-swingset": "0.41.4-dev-c5284e4.0+c5284e4",
+    "@agoric/deploy-script-support": "0.10.4-dev-c5284e4.0+c5284e4",
     "ava": "^5.3.0",
     "c8": "^7.13.0",
     "dd-trace": "^4.11.1"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-7ffae88.0+7ffae88",
-    "@agoric/assert": "0.6.1-dev-7ffae88.0+7ffae88",
-    "@agoric/cache": "0.3.3-dev-7ffae88.0+7ffae88",
-    "@agoric/casting": "0.4.3-dev-7ffae88.0+7ffae88",
-    "@agoric/cosmic-proto": "0.3.1-dev-7ffae88.0+7ffae88",
-    "@agoric/ertp": "0.16.3-dev-7ffae88.0+7ffae88",
-    "@agoric/governance": "0.10.4-dev-7ffae88.0+7ffae88",
-    "@agoric/inter-protocol": "0.16.2-dev-7ffae88.0+7ffae88",
-    "@agoric/internal": "0.3.3-dev-7ffae88.0+7ffae88",
-    "@agoric/network": "0.1.1-dev-7ffae88.0+7ffae88",
-    "@agoric/smart-wallet": "0.5.4-dev-7ffae88.0+7ffae88",
-    "@agoric/store": "0.9.3-dev-7ffae88.0+7ffae88",
-    "@agoric/swingset-vat": "0.32.3-dev-7ffae88.0+7ffae88",
-    "@agoric/vats": "0.15.2-dev-7ffae88.0+7ffae88",
-    "@agoric/zoe": "0.26.3-dev-7ffae88.0+7ffae88",
-    "@agoric/zone": "0.2.3-dev-7ffae88.0+7ffae88",
-    "@confio/relayer": "^0.9.0",
-    "@cosmjs/crypto": "^0.30.1",
-    "@cosmjs/encoding": "^0.30.1",
-    "@cosmjs/math": "^0.30.1",
-    "@cosmjs/proto-signing": "^0.30.1",
-    "@cosmjs/stargate": "^0.30.1",
-    "@endo/bundle-source": "^3.0.2",
-    "@endo/captp": "^4.0.2",
-    "@endo/compartment-mapper": "^1.1.0",
-    "@endo/env-options": "^1.1.0",
-    "@endo/far": "^1.0.2",
-    "@endo/init": "^1.0.2",
-    "@endo/marshal": "^1.1.0",
-    "@endo/nat": "^5.0.2",
-    "@endo/patterns": "^1.1.0",
-    "@endo/promise-kit": "^1.0.2",
+    "@agoric/access-token": "0.4.22-dev-c5284e4.0+c5284e4",
+    "@agoric/assert": "0.6.1-dev-c5284e4.0+c5284e4",
+    "@agoric/cache": "0.3.3-dev-c5284e4.0+c5284e4",
+    "@agoric/casting": "0.4.3-dev-c5284e4.0+c5284e4",
+    "@agoric/cosmic-proto": "0.4.1-dev-c5284e4.0+c5284e4",
+    "@agoric/ertp": "0.16.3-dev-c5284e4.0+c5284e4",
+    "@agoric/governance": "0.10.4-dev-c5284e4.0+c5284e4",
+    "@agoric/inter-protocol": "0.16.2-dev-c5284e4.0+c5284e4",
+    "@agoric/internal": "0.3.3-dev-c5284e4.0+c5284e4",
+    "@agoric/network": "0.1.1-dev-c5284e4.0+c5284e4",
+    "@agoric/smart-wallet": "0.5.4-dev-c5284e4.0+c5284e4",
+    "@agoric/store": "0.9.3-dev-c5284e4.0+c5284e4",
+    "@agoric/swingset-vat": "0.32.3-dev-c5284e4.0+c5284e4",
+    "@agoric/vats": "0.15.2-dev-c5284e4.0+c5284e4",
+    "@agoric/zoe": "0.26.3-dev-c5284e4.0+c5284e4",
+    "@agoric/zone": "0.2.3-dev-c5284e4.0+c5284e4",
+    "@confio/relayer": "^0.11.3",
+    "@cosmjs/crypto": "^0.32.2",
+    "@cosmjs/encoding": "^0.32.2",
+    "@cosmjs/math": "^0.32.2",
+    "@cosmjs/proto-signing": "^0.32.2",
+    "@cosmjs/stargate": "^0.32.2",
+    "@endo/bundle-source": "^3.1.0",
+    "@endo/captp": "^4.0.4",
+    "@endo/compartment-mapper": "^1.1.2",
+    "@endo/env-options": "^1.1.1",
+    "@endo/far": "^1.0.4",
+    "@endo/init": "^1.0.4",
+    "@endo/marshal": "^1.3.0",
+    "@endo/nat": "^5.0.4",
+    "@endo/patterns": "^1.2.0",
+    "@endo/promise-kit": "^1.0.4",
     "@iarna/toml": "^2.2.3",
     "anylogger": "^0.21.0",
     "chalk": "^5.2.0",
@@ -98,7 +98,7 @@
     "workerThreads": false
   },
   "typeCoverage": {
-    "atLeast": 77.5
+    "atLeast": 76.93
   },
-  "gitHead": "7ffae88ae37df782d5ffe3cf92261a498b0f636c"
+  "gitHead": "c5284e4721ad2702c4551f216bb8eed7abe4d7cf"
 }

package/src/bin-agops.js

@@ -77,7 +77,7 @@ program.addCommand(makeAuctionCommand(logger, { ...procIO, fetch }));
 program.addCommand(makeInterCommand(procIO, { fetch }));
 program.addCommand(makeTestCommand(procIO, { fetch }));
 
-E.when(program.parseAsync(process.argv), undefined, err => {
+void E.when(program.parseAsync(process.argv), undefined, err => {
   if (err instanceof CommanderError) {
     console.error(err.message);
   } else {

package/src/commands/wallet.js

@@ -8,7 +8,6 @@ import {
   makeLeader,
   makeLeaderFromRpcAddresses,
 } from '@agoric/casting';
-import { Command } from 'commander';
 import fs from 'fs';
 import util from 'util';
 import { execFileSync } from 'child_process';
@@ -25,8 +24,12 @@ import { coalesceWalletState, getCurrent } from '../lib/wallet.js';
 
 const SLEEP_SECONDS = 3;
 
-export const makeWalletCommand = async () => {
-  const wallet = new Command('wallet')
+/**
+ * @param {import('commander').Command['command']} command
+ * @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(
@@ -47,10 +50,11 @@ export const makeWalletCommand = async () => {
     )
     .option('--spend', 'confirm you want to spend')
     .option('--nickname <string>', 'nickname to use', 'my-wallet')
-    .action(function (opts) {
+    .action(async function (opts) {
       const { account, nickname, spend } = opts;
       const { home, keyringBackend: backend } = wallet.opts();
       const tx = ['provision-one', nickname, account, 'SMART_WALLET'];
+      await null;
       if (spend) {
         execSwingsetTransaction(tx, {
           from: account,
@@ -58,12 +62,12 @@ export const makeWalletCommand = async () => {
           ...networkConfig,
         });
       } else {
-        const params = fetchSwingsetParams(networkConfig);
+        const params = await fetchSwingsetParams(networkConfig);
         assert(
-          params.power_flag_fees.length === 1,
-          'multiple power_flag_fees not supported',
+          params.powerFlagFees.length === 1,
+          'multiple powerFlagFees not supported',
         );
-        const { fee: fees } = params.power_flag_fees[0];
+        const { fee: fees } = params.powerFlagFees[0];
         const nf = new Intl.NumberFormat('en-US');
         const costs = fees
           .map(f => `${nf.format(Number(f.amount))} ${f.denom}`)

package/src/install.js

@@ -1,4 +1,4 @@
-/* global process AggregateError Buffer */
+/* global process Buffer */
 import path from 'path';
 import chalk from 'chalk';
 import { makePspawn } from './helpers.js';
@@ -41,9 +41,9 @@ export default async function installMain(progname, rawArgs, powers, opts) {
     p.childProcess.stdout.on('data', out => stdout.push(out));
     await p;
     const d = JSON.parse(Buffer.concat(stdout).toString('utf-8'));
-    Object.entries(d).forEach(([name, { location }]) =>
-      map.set(name, path.resolve(cwd, location)),
-    );
+    for (const [name, { location }] of Object.entries(d)) {
+      map.set(name, path.resolve(cwd, location));
+    }
     return map;
   }
 
@@ -268,7 +268,9 @@ export default async function installMain(progname, rawArgs, powers, opts) {
     };
     await Promise.all(subdirs.map(removeNodeModulesSymlinks));
   } else {
-    DEFAULT_SDK_PACKAGE_NAMES.forEach(name => sdkPackageToPath.set(name, null));
+    for (const name of DEFAULT_SDK_PACKAGE_NAMES) {
+      sdkPackageToPath.set(name, null);
+    }
   }
 
   if (forceSdkVersion !== undefined) {

package/src/lib/chain.js

@@ -1,5 +1,6 @@
 // @ts-check
 /* global process */
+import { agoric } from '@agoric/cosmic-proto';
 import { normalizeBech32 } from '@cosmjs/encoding';
 import { execFileSync as execFileSyncAmbient } from 'child_process';
 
@@ -92,20 +93,19 @@ export const execSwingsetTransaction = (swingsetArgs, opts) => {
 };
 harden(execSwingsetTransaction);
 
-// xxx rpc should be able to query this by HTTP without shelling out
-export const fetchSwingsetParams = net => {
-  const { chainName, rpcAddrs, execFileSync = execFileSyncAmbient } = net;
-  const cmd = [
-    `--node=${rpcAddrs[0]}`,
-    `--chain-id=${chainName}`,
-    'query',
-    'swingset',
-    'params',
-    '--output',
-    '--json',
-  ];
-  const buffer = execFileSync(agdBinary, cmd);
-  return JSON.parse(buffer.toString());
+/**
+ *
+ * @param {import('./rpc.js').MinimalNetworkConfig} net
+ * @returns {Promise<import('@agoric/cosmic-proto/dist/codegen/agoric/swingset/swingset').Params>}
+ */
+export const fetchSwingsetParams = async net => {
+  const { rpcAddrs } = net;
+  const rpcEndpoint = rpcAddrs[0];
+  const client = await agoric.ClientFactory.createRPCQueryClient({
+    rpcEndpoint,
+  });
+  const { params } = await client.agoric.swingset.params();
+  return params;
 };
 harden(fetchSwingsetParams);
 

package/src/lib/format.js

@@ -39,7 +39,7 @@ const exampleAsset = {
 
 /**
  * @param {AssetDescriptor[]} assets
- * @returns {(a: Amount & { brand: BoardRemote }) => [string, number | any[]]}
+ * @returns {(a: Amount & { brand: BoardRemote }) => [string | null, number | any[]]}
  */
 export const makeAmountFormatter = assets => amt => {
   const { brand, value } = amt;

package/src/main.js

@@ -57,23 +57,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 +96,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 +117,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 +138,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 +176,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 +195,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,7 +276,7 @@ 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);
     });
 
@@ -297,19 +303,18 @@ const main = async (progname, rawArgs, powers) => {
         '',
       );
 
-  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 };
+      const opts = { ...program.opts(), ...cmd.opts(), ...cmdOpts, scriptArgs };
       return subMain(runMain, ['run', script], opts);
     });
 
   addRunOptions(
-    program
-      .command('deploy [script...]')
+    baseCmd('deploy [script...]')
       .option(
         '--target <target>',
         'One of agoric, local, cosmos, or sim',
@@ -323,8 +328,7 @@ const main = async (progname, rawArgs, powers) => {
     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 +349,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 +363,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 +387,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/publish.js

@@ -9,14 +9,12 @@ import {
   makeLeaderFromRpcAddresses,
   makeCastingSpec,
 } from '@agoric/casting';
-import { DirectSecp256k1HdWallet, Registry } from '@cosmjs/proto-signing';
-import { defaultRegistryTypes } from '@cosmjs/stargate';
+import { getSigningAgoricClientOptions } from '@agoric/cosmic-proto';
+import { DirectSecp256k1HdWallet } from '@cosmjs/proto-signing';
 import { stringToPath } from '@cosmjs/crypto';
 import { Decimal } from '@cosmjs/math';
 import { fromBech32 } from '@cosmjs/encoding';
 
-import { MsgInstallBundle } from '@agoric/cosmic-proto/swingset/msgs.js';
-
 // https://github.com/Agoric/agoric-sdk/blob/master/golang/cosmos/daemon/main.go
 const Agoric = {
   Bech32MainPrefix: 'agoric',
@@ -38,11 +36,6 @@ const Agoric = {
 const hdPath = (coinType = 118, account = 0) =>
   stringToPath(`m/44'/${coinType}'/${account}'/0/0`);
 
-const registry = new Registry([
-  ...defaultRegistryTypes,
-  [Agoric.proto.swingset.InstallBundle.typeUrl, MsgInstallBundle],
-]);
-
 /**
  * @typedef {object} JsonHttpRequest
  * @property {string} hostname
@@ -290,8 +283,8 @@ export const makeCosmosBundlePublisher = ({
 
       // AWAIT
       const stargateClient = await connectWithSigner(endpoint, wallet, {
+        ...getSigningAgoricClientOptions(),
         gasPrice: Agoric.gasPrice,
-        registry,
       });
 
       // AWAIT

package/src/sdk-package-names.js

@@ -42,6 +42,7 @@ export default [
   "@agoric/vat-data",
   "@agoric/vats",
   "@agoric/vm-config",
+  "@agoric/vow",
   "@agoric/wallet",
   "@agoric/wallet-backend",
   "@agoric/xsnap",