agoric 0.21.2-dev-b2a7540.0 → 0.21.2-dev-be80150.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-dev-b2a7540.0+b2a7540",
+  "version": "0.21.2-dev-be80150.0+be80150",
   "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-dev-b2a7540.0+b2a7540",
-    "@agoric/deploy-script-support": "0.10.4-dev-b2a7540.0+b2a7540",
+    "@agoric/cosmic-swingset": "0.41.4-dev-be80150.0+be80150",
+    "@agoric/deploy-script-support": "0.10.4-dev-be80150.0+be80150",
     "ava": "^5.3.0",
     "c8": "^9.1.0",
     "dd-trace": "^4.11.1"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-b2a7540.0+b2a7540",
-    "@agoric/cache": "0.3.3-dev-b2a7540.0+b2a7540",
-    "@agoric/casting": "0.4.3-dev-b2a7540.0+b2a7540",
-    "@agoric/client-utils": "0.1.1-dev-b2a7540.0+b2a7540",
-    "@agoric/cosmic-proto": "0.4.1-dev-b2a7540.0+b2a7540",
-    "@agoric/ertp": "0.16.3-dev-b2a7540.0+b2a7540",
-    "@agoric/governance": "0.10.4-dev-b2a7540.0+b2a7540",
-    "@agoric/inter-protocol": "0.16.2-dev-b2a7540.0+b2a7540",
-    "@agoric/internal": "0.3.3-dev-b2a7540.0+b2a7540",
-    "@agoric/network": "0.1.1-dev-b2a7540.0+b2a7540",
-    "@agoric/smart-wallet": "0.5.4-dev-b2a7540.0+b2a7540",
-    "@agoric/store": "0.9.3-dev-b2a7540.0+b2a7540",
-    "@agoric/swingset-vat": "0.32.3-dev-b2a7540.0+b2a7540",
-    "@agoric/vats": "0.15.2-dev-b2a7540.0+b2a7540",
-    "@agoric/zoe": "0.26.3-dev-b2a7540.0+b2a7540",
-    "@agoric/zone": "0.2.3-dev-b2a7540.0+b2a7540",
+    "@agoric/access-token": "0.4.22-dev-be80150.0+be80150",
+    "@agoric/cache": "0.3.3-dev-be80150.0+be80150",
+    "@agoric/casting": "0.4.3-dev-be80150.0+be80150",
+    "@agoric/client-utils": "0.1.1-dev-be80150.0+be80150",
+    "@agoric/cosmic-proto": "0.4.1-dev-be80150.0+be80150",
+    "@agoric/ertp": "0.16.3-dev-be80150.0+be80150",
+    "@agoric/governance": "0.10.4-dev-be80150.0+be80150",
+    "@agoric/inter-protocol": "0.16.2-dev-be80150.0+be80150",
+    "@agoric/internal": "0.3.3-dev-be80150.0+be80150",
+    "@agoric/network": "0.1.1-dev-be80150.0+be80150",
+    "@agoric/smart-wallet": "0.5.4-dev-be80150.0+be80150",
+    "@agoric/store": "0.9.3-dev-be80150.0+be80150",
+    "@agoric/swingset-vat": "0.32.3-dev-be80150.0+be80150",
+    "@agoric/vats": "0.15.2-dev-be80150.0+be80150",
+    "@agoric/zoe": "0.26.3-dev-be80150.0+be80150",
+    "@agoric/zone": "0.2.3-dev-be80150.0+be80150",
     "@confio/relayer": "^0.11.3",
     "@cosmjs/crypto": "^0.32.3",
     "@cosmjs/encoding": "^0.32.3",
@@ -102,5 +102,5 @@
   "typeCoverage": {
     "atLeast": 77.54
   },
-  "gitHead": "b2a754093f7e01728e43ba8842c3e44f8fdd20bd"
+  "gitHead": "be80150703656129f98a892d4704270b60c78ad2"
 }

package/src/anylogger-agoric.js

@@ -28,8 +28,8 @@ const selectedCode = anylogger.levels[selectedLevel];
 const globalCode = selectedCode === undefined ? -Infinity : selectedCode;
 
 const oldExt = anylogger.ext;
-anylogger.ext = (l, o) => {
-  l = oldExt(l, o);
+anylogger.ext = (l, ...rest) => {
+  l = oldExt(l, ...rest);
   l.enabledFor = lvl => globalCode >= anylogger.levels[lvl];
 
   const prefix = l.name.replace(/:/g, ': ');

package/src/chain-config.js

@@ -81,7 +81,12 @@ export const DEFAULT_RPC_PORT = 26657;
 export const DEFAULT_PROM_PORT = 26660;
 export const DEFAULT_API_PORT = 1317;
 
-// Rewrite the app.toml.
+/**
+ * Rewrite the app.toml.
+ *
+ * @param {{ appToml: string, enableCors?: boolean, exportMetrics?: boolean, portNum?: string, chainId?: string, enableRosetta?: boolean, rosettaPort?: string }} input
+ * @returns {string} toml
+ */
 export function finishCosmosApp({
   appToml,
   enableCors,
@@ -92,6 +97,8 @@ export function finishCosmosApp({
   rosettaPort = `${DEFAULT_ROSETTA_PORT}`,
 }) {
   const rpcPort = Number(portNum);
+  // TODO: Use an accurate narrow type.
+  /** @type {Record<string, any>} */
   const app = TOML.parse(appToml);
 
   if (enableCors) {
@@ -138,7 +145,12 @@ export function finishCosmosApp({
   return TOML.stringify(app);
 }
 
-// Rewrite the config.toml.
+/**
+ * Rewrite the config.toml.
+ *
+ * @param {{ configToml: string, enableCors?: boolean, exportMetrics?: boolean, portNum?: string, persistentPeers?: string, seeds?: string, unconditionalPeerIds?: string }} input
+ * @returns {string} toml
+ */
 export function finishTendermintConfig({
   configToml,
   enableCors,
@@ -151,6 +163,8 @@ export function finishTendermintConfig({
   const rpcPort = Number(portNum);
 
   // Adjust the config.toml.
+  // TODO: Use an accurate narrow type.
+  /** @type {Record<string, any>} */
   const config = TOML.parse(configToml);
 
   config.proxy_app = 'kvstore';
@@ -189,7 +203,12 @@ export function finishTendermintConfig({
   return TOML.stringify(config);
 }
 
-// Rewrite/import the genesis.json.
+/**
+ * Rewrite/import the genesis.json.
+ *
+ * @param {{ genesisJson: string, exportedGenesisJson?: string }} input
+ * @returns {string} json
+ */
 export function finishCosmosGenesis({ genesisJson, exportedGenesisJson }) {
   const genesis = JSON.parse(genesisJson);
   const exported = exportedGenesisJson ? JSON.parse(exportedGenesisJson) : {};

package/src/commands/wallet.js

@@ -175,7 +175,9 @@ export const makeWalletCommand = async command => {
           keyring: { home, backend },
           from,
           gas:
-            gas === 'auto' ? ['auto', parseFiniteNumber(gasAdjustment)] : gas,
+            gas === 'auto'
+              ? ['auto', parseFiniteNumber(gasAdjustment)]
+              : parseFiniteNumber(gas),
           dryRun,
           verbose,
         },

package/src/cosmos.js

@@ -50,7 +50,7 @@ export default async function cosmosMain(progname, rawArgs, powers, opts) {
                 },
               );
               // Ensure the build doesn't mess up stdout.
-              ps.childProcess.stdout.pipe(process.stderr);
+              ps.childProcess.stdout?.pipe(process.stderr);
               return ps;
             }
             throw e;

package/src/helpers.js

@@ -42,12 +42,12 @@ export const makePspawn = ({
    *
    * @param {string} cmd command name to run
    * @param {Array<string>} cargs arguments to the command
-   * @param {object} param2
-   * @param {string} [param2.cwd]
-   * @param {string | [string, string, string]} [param2.stdio] standard IO
+   * @param {object} [opts]
+   * @param {string} [opts.cwd]
+   * @param {string | [string, string, string]} [opts.stdio] standard IO
    * specification
-   * @param {Record<string, string | undefined>} [param2.env] environment
-   * @param {boolean} [param2.detached] whether the child process should be detached
+   * @param {Record<string, string | undefined>} [opts.env] environment
+   * @param {boolean} [opts.detached] whether the child process should be detached
    * @returns {Promise<number> & { childProcess: ChildProcess }}} promise for
    * exit status. The return result has a `childProcess` property to obtain
    * control over the running process

package/src/install.js

@@ -37,7 +37,7 @@ export default async function installMain(progname, rawArgs, powers, opts) {
       stdio: ['inherit', 'pipe', 'inherit'],
     });
     const stdout = [];
-    p.childProcess.stdout.on('data', out => stdout.push(out));
+    p.childProcess.stdout?.on('data', out => stdout.push(out));
     await p;
     const d = JSON.parse(Buffer.concat(stdout).toString('utf-8'));
     for (const [name, { location }] of Object.entries(d)) {
@@ -49,7 +49,7 @@ export default async function installMain(progname, rawArgs, powers, opts) {
   let subdirs;
   const workTrees = ['.'];
   let sdkWorktree;
-  /** @type {Map<string, string>} */
+  /** @type {Map<string, string | null>} */
   const sdkPackageToPath = new Map();
   const linkFolder = path.resolve(`_agstate/yarn-links`);
   const linkFlags = [];
@@ -170,7 +170,7 @@ export default async function installMain(progname, rawArgs, powers, opts) {
         .then(results => {
           // After all have settled, throw any errors.
           const failures = results.filter(
-            ({ status }) => status !== 'fulfilled',
+            result => result.status !== 'fulfilled',
           );
           if (failures.length) {
             throw AggregateError(
@@ -284,6 +284,10 @@ export default async function installMain(progname, rawArgs, powers, opts) {
   // Create symlinks to the SDK packages.
   await Promise.all(
     [...sdkPackageToPath.entries()].map(async ([pjName, dir]) => {
+      if (typeof dir !== 'string') {
+        throw Error(`unexpected incomplete package mapping: ${pjName}`);
+      }
+
       const SUBOPTIMAL = false;
       await null;
       if (SUBOPTIMAL) {
@@ -301,7 +305,7 @@ export default async function installMain(progname, rawArgs, powers, opts) {
       log('linking', linkName);
       return fs
         .mkdir(linkDir, { recursive: true })
-        .then(_ => fs.symlink(path.relative(linkDir, dir), linkName));
+        .then(() => fs.symlink(path.relative(linkDir, dir), linkName));
     }),
   );
 

package/src/lib/network-config.js

@@ -1,5 +1,9 @@
 import { NonNullish } from '@agoric/internal';
 
+/**
+ * @import {MinimalNetworkConfig} from '@agoric/client-utils';
+ */
+
 export const networkConfigUrl = agoricNetSubdomain =>
   `https://${agoricNetSubdomain}.agoric.net/network-config`;
 export const rpcUrl = agoricNetSubdomain =>

package/src/main.js

@@ -66,7 +66,9 @@ const main = async (progname, rawArgs, powers) => {
       'verbosity that can be increased',
       (_value, _previous) => (cmdOpts.verbose += 1),
     );
-  const baseCmd = (...args) => addCmdOpts(program.command(...args));
+  /** @type {typeof program.command} */
+  const baseCmd = (nameAndParams, ...rest) =>
+    addCmdOpts(program.command(nameAndParams, ...rest));
 
   addCmdOpts(
     program

package/src/scripts.js

@@ -56,7 +56,7 @@ export const makeLookup =
 
 /**
  * @param {string[]} scripts
- * @param {{ allowUnsafePlugins: boolean, progname: string, rawArgs: string[], endowments?: Record<string, any> }} opts
+ * @param {{ allowUnsafePlugins?: boolean, progname: string, rawArgs: string[], endowments?: Record<string, any> }} opts
  * @param {{ fs: import('fs/promises'), console: Console }} powers
  */
 export const makeScriptLoader =

package/src/start.js

@@ -276,13 +276,13 @@ export default async function startMain(progname, rawArgs, powers, opts) {
       await rmVerbose(serverDir);
     }
 
+    /** @type {(args: string[], spawnOpts?: Parameters<typeof pspawn>[2], dockerArgs?: string[]) => ReturnType<pspawn>} */
     let chainSpawn;
     if (!popts.dockerTag) {
-      chainSpawn = (args, spawnOpts = undefined) => {
-        return pspawn(cosmosChain, [...args, `--home=${serverDir}`], spawnOpts);
-      };
+      chainSpawn = (args, spawnOpts) =>
+        pspawn(cosmosChain, [...args, `--home=${serverDir}`], spawnOpts);
     } else {
-      chainSpawn = (args, spawnOpts = undefined, dockerArgs = []) =>
+      chainSpawn = (args, spawnOpts, dockerArgs = []) =>
         pspawn(
           'docker',
           [
@@ -482,12 +482,12 @@ export default async function startMain(progname, rawArgs, powers, opts) {
       await rmVerbose(serverDir);
     }
 
+    /** @type {(args: string[], spawnOpts?: Parameters<typeof pspawn>[2], dockerArgs?: string[]) => ReturnType<pspawn>} */
     let soloSpawn;
     if (!popts.dockerTag) {
-      soloSpawn = (args, spawnOpts = undefined) =>
-        pspawn(agSolo, args, spawnOpts);
+      soloSpawn = (args, spawnOpts) => pspawn(agSolo, args, spawnOpts);
     } else {
-      soloSpawn = (args, spawnOpts = undefined, dockerArgs = []) =>
+      soloSpawn = (args, spawnOpts, dockerArgs = []) =>
         pspawn(
           'docker',
           [