agoric 0.21.1 → 0.21.2-dev-8c14632.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.1",
+  "version": "0.21.2-dev-8c14632.0+8c14632",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -24,25 +24,25 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "^0.10.3",
-    "ava": "^5.2.0",
+    "@agoric/deploy-script-support": "0.10.4-dev-8c14632.0+8c14632",
+    "ava": "^5.3.0",
     "c8": "^7.13.0"
   },
   "dependencies": {
-    "@agoric/access-token": "^0.4.21",
-    "@agoric/assert": "^0.6.0",
-    "@agoric/cache": "^0.3.2",
-    "@agoric/casting": "^0.4.2",
-    "@agoric/cosmic-proto": "^0.3.0",
-    "@agoric/ertp": "^0.16.2",
-    "@agoric/inter-protocol": "^0.16.1",
-    "@agoric/internal": "^0.3.2",
-    "@agoric/smart-wallet": "^0.5.3",
-    "@agoric/store": "^0.9.2",
-    "@agoric/swingset-vat": "^0.32.2",
-    "@agoric/vats": "^0.15.1",
-    "@agoric/zoe": "^0.26.2",
-    "@agoric/zone": "^0.2.2",
+    "@agoric/access-token": "0.4.22-dev-8c14632.0+8c14632",
+    "@agoric/assert": "0.6.1-dev-8c14632.0+8c14632",
+    "@agoric/cache": "0.3.3-dev-8c14632.0+8c14632",
+    "@agoric/casting": "0.4.3-dev-8c14632.0+8c14632",
+    "@agoric/cosmic-proto": "0.3.1-dev-8c14632.0+8c14632",
+    "@agoric/ertp": "0.16.3-dev-8c14632.0+8c14632",
+    "@agoric/inter-protocol": "0.16.2-dev-8c14632.0+8c14632",
+    "@agoric/internal": "0.3.3-dev-8c14632.0+8c14632",
+    "@agoric/smart-wallet": "0.5.4-dev-8c14632.0+8c14632",
+    "@agoric/store": "0.9.3-dev-8c14632.0+8c14632",
+    "@agoric/swingset-vat": "0.32.3-dev-8c14632.0+8c14632",
+    "@agoric/vats": "0.15.2-dev-8c14632.0+8c14632",
+    "@agoric/zoe": "0.26.3-dev-8c14632.0+8c14632",
+    "@agoric/zone": "0.2.3-dev-8c14632.0+8c14632",
     "@confio/relayer": "^0.9.0",
     "@cosmjs/crypto": "^0.30.1",
     "@cosmjs/encoding": "^0.30.1",
@@ -88,5 +88,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "ba3b776444425bbcb275ce918794d9259f8e15da"
+  "gitHead": "8c14632298cfb982f91dc0ef271681703237a93f"
 }

package/src/bin-agops.js

@@ -2,12 +2,14 @@
 // @ts-check
 // @jessie-check
 
-/* eslint-disable @jessie.js/no-nested-await */
 /* global fetch, setTimeout */
 
+import '@endo/init/pre.js';
+
 import '@agoric/casting/node-fetch-shim.js';
 import '@endo/init';
-import '@endo/init/pre.js';
+
+import { E } from '@endo/far';
 
 import { execFileSync } from 'child_process';
 import path from 'path';
@@ -74,13 +76,11 @@ program.addCommand(makeAuctionCommand(logger, { ...procIO, fetch }));
 program.addCommand(makeInterCommand(procIO, { fetch }));
 program.addCommand(makeTestCommand(procIO, { fetch }));
 
-try {
-  await program.parseAsync(process.argv);
-} catch (err) {
+E.when(program.parseAsync(process.argv), undefined, err => {
   if (err instanceof CommanderError) {
     console.error(err.message);
   } else {
     console.error(err); // CRASH! show stack trace
   }
   process.exit(1);
-}
+});

package/src/commands/auction.js

@@ -1,4 +1,3 @@
-/* eslint-disable @jessie.js/no-nested-await */
 // @ts-check
 /* eslint-disable func-names */
 import { InvalidArgumentError } from 'commander';

package/src/commands/ec.js

@@ -1,4 +1,3 @@
-/* eslint-disable @jessie.js/no-nested-await */
 // @ts-check
 /* eslint-disable func-names */
 /* global globalThis, process, setTimeout */

package/src/commands/inter.js

@@ -238,7 +238,6 @@ export const makeInterCommand = (
     try {
       // XXX pass fetch to getNetworkConfig() explicitly
       // await null above makes this await safe
-      // eslint-disable-next-line @jessie.js/no-nested-await
       const networkConfig = await getNetworkConfig(env);
       return makeWalletUtils({ fetch, execFileSync, delay }, networkConfig);
     } catch (err) {

package/src/commands/oracle.js

@@ -1,5 +1,3 @@
-/* eslint-disable no-await-in-loop */
-/* eslint-disable @jessie.js/no-nested-await */
 // @ts-check
 /* eslint-disable func-names */
 /* global fetch, setTimeout, process */
@@ -9,6 +7,7 @@ import { Nat } from '@endo/nat';
 import { Command } from 'commander';
 import * as cp from 'child_process';
 import { inspect } from 'util';
+import { instanceNameFor } from '@agoric/inter-protocol/src/proposals/price-feed-proposal.js';
 import { normalizeAddressWithOptions } from '../lib/chain.js';
 import { getNetworkConfig, makeRpcUtils, storageHelper } from '../lib/rpc.js';
 import {
@@ -77,7 +76,7 @@ export const makeOracleCommand = (logger, io = {}) => {
     const utils = await makeRpcUtils({ fetch });
 
     const lookupPriceAggregatorInstance = ([brandIn, brandOut]) => {
-      const name = `${brandIn}-${brandOut} price feed`;
+      const name = instanceNameFor(brandIn, brandOut);
       const instance = utils.agoricNames.instance[name];
       if (!instance) {
         logger.debug('known instances:', utils.agoricNames.instance);

package/src/commands/perf.js

@@ -1,5 +1,3 @@
-/* eslint-disable no-await-in-loop */
-/* eslint-disable @jessie.js/no-nested-await */
 // @ts-check
 /* eslint-disable func-names */
 /* global process */

package/src/commands/psm.js

@@ -1,5 +1,3 @@
-/* eslint-disable no-await-in-loop */
-/* eslint-disable @jessie.js/no-nested-await */
 // @ts-check
 /* eslint-disable func-names */
 /* global fetch, process */

package/src/commands/reserve.js

@@ -1,4 +1,3 @@
-/* eslint-disable @jessie.js/no-nested-await */
 // @ts-check
 /* eslint-disable func-names */
 /* global fetch, process */

package/src/commands/test-upgrade.js

@@ -38,7 +38,6 @@ export const makeTestCommand = (
     try {
       // XXX pass fetch to getNetworkConfig() explicitly
       // await null above makes this await safe
-      // eslint-disable-next-line @jessie.js/no-nested-await
       const networkConfig = await getNetworkConfig(env);
       return makeWalletUtils({ fetch, execFileSync, delay }, networkConfig);
     } catch (err) {

package/src/commands/vaults.js

@@ -1,5 +1,3 @@
-/* eslint-disable no-await-in-loop */
-/* eslint-disable @jessie.js/no-nested-await */
 // @ts-check
 /* eslint-disable func-names */
 /* global fetch, process */

package/src/helpers.js

@@ -13,8 +13,7 @@ export const getSDKBinaries = ({
   return {
     agSolo: new URL(`${jsPfx}/solo/src/entrypoint.js`, myUrl).pathname,
     agSoloBuild: ['yarn', '--cwd', xsnap, `build:from-env`],
-    cosmosChain: new URL(`${jsPfx}/cosmic-swingset/bin/ag-chain-cosmos`, myUrl)
-      .pathname,
+    cosmosChain: new URL(`${goPfx}/cosmos/build/agd`, myUrl).pathname,
     cosmosChainBuild: cosmosBuild,
     cosmosClientBuild: cosmosBuild,
     cosmosHelper: new URL(`${goPfx}/cosmos/build/agd`, myUrl).pathname,

package/src/init.js

@@ -60,7 +60,6 @@ export default async function initMain(_progname, rawArgs, priv, opts) {
     const path = `${DIR}/${dir}package.json`;
     log('rewriting ', path);
 
-    // eslint-disable-next-line no-await-in-loop
     const contents = await fs.readFile(path, 'utf-8');
     const pkg = JSON.parse(contents.replace(/@DIR@/g, DIR));
     if (dir === '') {
@@ -74,7 +73,6 @@ export default async function initMain(_progname, rawArgs, priv, opts) {
     pkg.name = `${DIR}${pkg.name.substr(topLevelName.length)}`;
     const json = JSON.stringify(pkg, undefined, 2);
 
-    // eslint-disable-next-line no-await-in-loop
     await fs.writeFile(path, json);
   }
 

package/src/install.js

@@ -61,7 +61,6 @@ export default async function installMain(progname, rawArgs, powers, opts) {
   const yarnInstallEachWorktree = async (phase, ...flags) => {
     for await (const workTree of workTrees) {
       log.info(`yarn install ${phase} in ${workTree}`);
-      // eslint-disable-next-line no-await-in-loop
       const yarnInstall = await pspawn(
         'yarn',
         [...linkFlags, 'install', ...flags],
@@ -288,6 +287,7 @@ export default async function installMain(progname, rawArgs, powers, opts) {
   await Promise.all(
     [...sdkPackageToPath.entries()].map(async ([pjName, dir]) => {
       const SUBOPTIMAL = false;
+      await null;
       if (SUBOPTIMAL) {
         // This use of yarn is noisy and slow.
         await pspawn('yarn', [...linkFlags, 'unlink', pjName]);

package/src/lib/chain.js

@@ -122,7 +122,6 @@ export const pollBlocks = opts => async lookup => {
     } = status;
     try {
       // see await null above
-      // eslint-disable-next-line @jessie.js/no-nested-await, no-await-in-loop
       const result = await lookup({ time, height });
       return result;
     } catch (_err) {
@@ -132,7 +131,6 @@ export const pollBlocks = opts => async lookup => {
         height,
         'retrying...',
       );
-      // eslint-disable-next-line @jessie.js/no-nested-await, no-await-in-loop
       await delay(period);
     }
   }

package/src/lib/rpc.js

@@ -1,5 +1,4 @@
 // @ts-check
-/* eslint-disable @jessie.js/no-nested-await */
 /* global Buffer, fetch, process */
 
 import { NonNullish } from '@agoric/assert';
@@ -50,7 +49,8 @@ export const getNetworkConfig = async env => {
 };
 
 /** @type {MinimalNetworkConfig} */
-export const networkConfig = await getNetworkConfig(process.env);
+const networkConfig = await getNetworkConfig(process.env);
+export { networkConfig };
 // console.warn('networkConfig', networkConfig);
 
 /**
@@ -132,11 +132,11 @@ export const makeVStorage = (powers, config = networkConfig) => {
       const parts = [];
       // undefined the first iteration, to query at the highest
       let blockHeight;
+      await null;
       do {
         // console.debug('READING', { blockHeight });
         let values;
         try {
-          // eslint-disable-next-line no-await-in-loop
           ({ blockHeight, values } = await this.readAt(
             path,
             blockHeight && Number(blockHeight) - 1,
@@ -242,6 +242,7 @@ export const makeAgoricNames = async (ctx, vstorage) => {
  * @param {MinimalNetworkConfig} config
  */
 export const makeRpcUtils = async ({ fetch }, config = networkConfig) => {
+  await null;
   try {
     const vstorage = makeVStorage({ fetch }, config);
     const fromBoard = makeFromBoard();

package/src/lib/wallet.js

@@ -247,7 +247,6 @@ export const makeWalletUtils = async (
     untilNumWantsSatisfied = false,
   ) => {
     const lookup = async () => {
-      // eslint-disable-next-line @jessie.js/no-nested-await, no-await-in-loop
       const { offerStatuses } = await storedWalletState(from, minHeight);
       const offerStatus = [...offerStatuses.values()].find(s => s.id === id);
       if (!offerStatus) throw Error('retry');

package/src/main-publish.js

@@ -31,9 +31,9 @@ const publishMain = async (progname, rawArgs, powers, opts) => {
     chainID,
   };
 
+  await null;
   for (const bundlePath of rawArgs.slice(1)) {
     // AWAIT
-    // eslint-disable-next-line no-await-in-loop,@jessie.js/no-nested-await
     const bundleText = await fs.readFile(bundlePath, 'utf-8');
     const bundle = parseLocatedJson(bundleText, bundlePath);
 
@@ -53,7 +53,6 @@ const publishMain = async (progname, rawArgs, powers, opts) => {
     });
 
     // AWAIT
-    // eslint-disable-next-line no-await-in-loop,@jessie.js/no-nested-await
     const hashedBundle = await publishBundle(bundle, connectionSpec);
     process.stdout.write(`${JSON.stringify(hashedBundle)}\n`);
   }

package/src/main.js

@@ -1,4 +1,3 @@
-/* eslint-disable @jessie.js/no-nested-await */
 /* global process */
 import { Command } from 'commander';
 import path from 'path';
@@ -36,6 +35,7 @@ const main = async (progname, rawArgs, powers) => {
   const program = new Command();
 
   async function isNotBasedir() {
+    await null;
     try {
       await fs.stat(STAMP);
       return false;

package/src/publish.js

@@ -289,14 +289,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 +310,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 +423,7 @@ const publishBundle = async (
     )}, publishBundle supports only "endoZipBase64" with "endoZipBase64Sha512"`;
   }
 
+  await null;
   if (connectionSpec === undefined && getDefaultConnection !== undefined) {
     connectionSpec = await getDefaultConnection();
   }

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');

package/src/start.js

@@ -151,6 +151,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     ]);
 
   const exists = async file => {
+    await null;
     try {
       await fs.stat(file);
       return true;
@@ -173,6 +174,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
 
     const agServer = `_agstate/agoric-servers/${profileName}`;
 
+    await null;
     if (popts.reset) {
       log(chalk.green(`removing ${agServer}`));
       // rm is available on all the unix-likes, so use it for speed.
@@ -246,6 +248,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     }
 
     const { cosmosChain, cosmosChainBuild } = getSDKBinaries(sdkPrefixes);
+    await null;
     if (popts.pull || popts.rebuild) {
       if (popts.dockerTag) {
         const exitStatus = await pspawn('docker', ['pull', SDK_IMAGE]);
@@ -308,7 +311,6 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     // Get or create the essential addresses.
     const addrs = {};
     for (const keyName of ['provision', 'delegate0']) {
-      /* eslint-disable no-await-in-loop */
       let statusOut = showKey(keyName);
       const exitStatusOut = await statusOut[0];
       if (exitStatusOut) {
@@ -449,6 +451,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     const agServer = `_agstate/agoric-servers/${profileName}-${portNum}`;
 
     const { cosmosClientBuild } = getSDKBinaries(sdkPrefixes);
+    await null;
     if (popts.pull || popts.rebuild) {
       if (popts.dockerTag) {
         const exitStatus = await pspawn('docker', ['pull', SDK_IMAGE]);
@@ -555,7 +558,6 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     for await (const _ of untilTrue(() => hasGci)) {
       process.stdout.write('.');
 
-      // eslint-disable-next-line no-await-in-loop
       await new Promise((resolve, reject) => {
         fs.stat(gciFile).then(
           _2 => {
@@ -590,7 +592,6 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     let bestRpcAddr;
     for await (const _ of untilTrue(() => bestRpcAddr)) {
       for await (const rpcAddr of rpcAddrs) {
-        // eslint-disable-next-line no-await-in-loop
         exitStatus = await keysSpawn([
           'query',
           'swingset',
@@ -639,7 +640,6 @@ export default async function startMain(progname, rawArgs, powers, opts) {
           ];
           for (/* await */ const cmd of provCmds) {
             const statusOut = capture(keysSpawn, cmd, true);
-            // eslint-disable-next-line no-await-in-loop
             exitStatus = await statusOut[0];
             if (!exitStatus) {
               const json = statusOut[1].replace(/^gas estimate: \d+$/m, '');
@@ -664,7 +664,6 @@ export default async function startMain(progname, rawArgs, powers, opts) {
         }
       }
       if (!bestRpcAddr) {
-        // eslint-disable-next-line no-await-in-loop
         await delay(2000);
       }
     }
@@ -690,6 +689,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
   }
 
   async function startTestnetDocker(profileName, startArgs, popts) {
+    await null;
     if (popts.dockerTag && popts.pull) {
       const exitStatus = await pspawn('docker', ['pull', SOLO_IMAGE]);
       if (exitStatus) {
@@ -729,6 +729,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     const netconfig = startArgs[1] || DEFAULT_NETCONFIG;
     const agServer = `_agstate/agoric-servers/${profileName}-${port}`;
 
+    await null;
     if (popts.reset) {
       log(chalk.green(`removing ${agServer}`));
       // rm is available on all the unix-likes, so use it for speed.