agoric 0.21.2-dev-4f0e6fd.0 → 0.21.2-dev-59858c6.0

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "agoric",
-  "version": "0.21.2-dev-4f0e6fd.0+4f0e6fd",
+  "version": "0.21.2-dev-59858c6.0+59858c6",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
   "bin": {
-    "agoric": "src/entrypoint.js",
-    "agops": "src/bin-agops.js"
+    "agops": "src/bin-agops.js",
+    "agoric": "src/entrypoint.js"
   },
   "exports": {
     "./src/entrypoint.js": "./src/entrypoint.js",
@@ -25,33 +25,33 @@
     "test:xs": "exit 0",
     "integration-test": "ava --config .ava-integration-test.config.js",
     "lint-fix": "yarn lint:eslint --fix",
-    "lint": "run-s --continue-on-error lint:*",
-    "lint:types": "tsc",
-    "lint:eslint": "eslint ."
+    "lint": "yarn run -T run-s --continue-on-error 'lint:*'",
+    "lint:types": "yarn run -T tsc",
+    "lint:eslint": "yarn run -T eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.41.4-dev-4f0e6fd.0+4f0e6fd",
-    "@agoric/deploy-script-support": "0.10.4-dev-4f0e6fd.0+4f0e6fd",
+    "@agoric/cosmic-swingset": "0.41.4-dev-59858c6.0+59858c6",
+    "@agoric/deploy-script-support": "0.10.4-dev-59858c6.0+59858c6",
     "ava": "^5.3.0",
     "c8": "^10.1.2"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-4f0e6fd.0+4f0e6fd",
-    "@agoric/cache": "0.3.3-dev-4f0e6fd.0+4f0e6fd",
-    "@agoric/casting": "0.4.3-dev-4f0e6fd.0+4f0e6fd",
-    "@agoric/client-utils": "0.1.1-dev-4f0e6fd.0+4f0e6fd",
-    "@agoric/cosmic-proto": "0.4.1-dev-4f0e6fd.0+4f0e6fd",
-    "@agoric/ertp": "0.16.3-dev-4f0e6fd.0+4f0e6fd",
-    "@agoric/governance": "0.10.4-dev-4f0e6fd.0+4f0e6fd",
-    "@agoric/inter-protocol": "0.16.2-dev-4f0e6fd.0+4f0e6fd",
-    "@agoric/internal": "0.3.3-dev-4f0e6fd.0+4f0e6fd",
-    "@agoric/network": "0.1.1-dev-4f0e6fd.0+4f0e6fd",
-    "@agoric/smart-wallet": "0.5.4-dev-4f0e6fd.0+4f0e6fd",
-    "@agoric/store": "0.9.3-dev-4f0e6fd.0+4f0e6fd",
-    "@agoric/swingset-vat": "0.32.3-dev-4f0e6fd.0+4f0e6fd",
-    "@agoric/vats": "0.15.2-dev-4f0e6fd.0+4f0e6fd",
-    "@agoric/zoe": "0.26.3-dev-4f0e6fd.0+4f0e6fd",
-    "@agoric/zone": "0.2.3-dev-4f0e6fd.0+4f0e6fd",
+    "@agoric/access-token": "0.4.22-dev-59858c6.0+59858c6",
+    "@agoric/cache": "0.3.3-dev-59858c6.0+59858c6",
+    "@agoric/casting": "0.4.3-dev-59858c6.0+59858c6",
+    "@agoric/client-utils": "0.1.1-dev-59858c6.0+59858c6",
+    "@agoric/cosmic-proto": "0.4.1-dev-59858c6.0+59858c6",
+    "@agoric/ertp": "0.16.3-dev-59858c6.0+59858c6",
+    "@agoric/governance": "0.10.4-dev-59858c6.0+59858c6",
+    "@agoric/inter-protocol": "0.16.2-dev-59858c6.0+59858c6",
+    "@agoric/internal": "0.3.3-dev-59858c6.0+59858c6",
+    "@agoric/network": "0.1.1-dev-59858c6.0+59858c6",
+    "@agoric/smart-wallet": "0.5.4-dev-59858c6.0+59858c6",
+    "@agoric/store": "0.9.3-dev-59858c6.0+59858c6",
+    "@agoric/swingset-vat": "0.32.3-dev-59858c6.0+59858c6",
+    "@agoric/vats": "0.15.2-dev-59858c6.0+59858c6",
+    "@agoric/zoe": "0.26.3-dev-59858c6.0+59858c6",
+    "@agoric/zone": "0.2.3-dev-59858c6.0+59858c6",
     "@cosmjs/crypto": "^0.33.0",
     "@cosmjs/encoding": "^0.33.0",
     "@cosmjs/math": "^0.33.0",
@@ -101,5 +101,5 @@
   "typeCoverage": {
     "atLeast": 79.15
   },
-  "gitHead": "4f0e6fda6f14b7303de96529b7396d0a350a4498"
+  "gitHead": "59858c604ef933b32b9f899dfac62519e4d2d619"
 }

package/src/commands/perf.js

@@ -64,15 +64,13 @@ export const makePerfCommand = logger => {
 
       const spec = `:published.wallet.${opts.from}`;
 
-      const leaderOptions = makeLeaderOptions({
-        sleep: SLEEP_SECONDS,
-        jitter: 0,
-        log: () => undefined,
-      });
-
       const leader = makeLeaderFromRpcAddresses(
         networkConfig.rpcAddrs,
-        leaderOptions,
+        makeLeaderOptions({
+          sleep: SLEEP_SECONDS,
+          jitter: 0,
+          log: console.warn,
+        }),
       );
 
       logger.warn('Following', spec);
@@ -87,9 +85,10 @@ export const makePerfCommand = logger => {
             if (status.error) {
               console.error(status.error);
               exit(1);
-            } else if (status.numWantsSatisfied)
+            } else if (status.numWantsSatisfied) {
               process.stdout.write(`satisfied: ${status.numWantsSatisfied}\n`);
-            exit(0);
+              exit(0);
+            }
           }
         }
       };

package/src/commands/wallet.js

@@ -278,15 +278,13 @@ export const makeWalletCommand = async command => {
     .action(async function ({ from }) {
       const spec = `:published.wallet.${from}`;
 
-      const leaderOptions = makeLeaderOptions({
-        sleep: SLEEP_SECONDS,
-        jitter: 0,
-        log: () => undefined,
-      });
-
       const leader = makeLeaderFromRpcAddresses(
         networkConfig.rpcAddrs,
-        leaderOptions,
+        makeLeaderOptions({
+          sleep: SLEEP_SECONDS,
+          jitter: 0,
+          log: console.warn,
+        }),
       );
 
       console.warn('Following', spec);

package/src/follow.js

@@ -126,16 +126,17 @@ export default async function followerMain(progname, rawArgs, powers, opts) {
     });
   }
 
-  const leaderOptions = makeLeaderOptions({
-    sleep,
-    jitter,
-    log: verbose ? console.warn : () => undefined,
-  });
-
   const [_cmd, ...specs] = rawArgs;
 
   verbose && console.warn('Creating leader for', bootstrap);
-  const leader = makeLeader(bootstrap, leaderOptions);
+  const leader = makeLeader(
+    bootstrap,
+    makeLeaderOptions({
+      sleep,
+      jitter,
+      log: verbose ? console.warn : () => undefined,
+    }),
+  );
   const iterate = opts.lossy ? iterateLatest : iterateEach;
   await Promise.all(
     specs.map(async spec => {

package/tools/getting-started.js

@@ -108,12 +108,30 @@ export const gettingStartedWorkflowTest = async (t, options = {}) => {
     });
   }
 
-  function yarn(args) {
-    return pspawnStdout('yarn', args, {
+  /**
+   * @param {string[]} args
+   * @returns {{childProcess?: import('child_process').ChildProcess} & Promise<void>}
+   */
+  function yarn(...args) {
+    const ps = pspawnStdout('yarn', args, {
       stdio: ['ignore', 'pipe', 'inherit'],
       env: { ...process.env },
       detached: true,
     });
+    /** @type {{childProcess?: import('child_process').ChildProcess} & Promise<void>} */
+    const p = new Promise((resolve, reject) => {
+      ps.then(code => {
+        if (code !== 0) {
+          reject(
+            new Error(`yarn ${args.join(' ')} failed with exit code ${code}`),
+          );
+        } else {
+          resolve();
+        }
+      }).catch(reject);
+    });
+    p.childProcess = ps.childProcess;
+    return p;
   }
 
   const olddir = process.cwd();
@@ -170,12 +188,12 @@ export const gettingStartedWorkflowTest = async (t, options = {}) => {
     } else {
       // ==============
       // yarn install
-      t.is(await yarn(['install', ...installOptions]), 0, 'yarn install works');
+      await yarn('install', ...installOptions);
     }
 
     // ==============
     // yarn start:docker
-    t.is(await yarn(['start:docker']), 0, 'yarn start:docker works');
+    await yarn('start:docker');
 
     // ==============
     // wait for the chain to start
@@ -205,11 +223,11 @@ export const gettingStartedWorkflowTest = async (t, options = {}) => {
 
     // ==============
     // yarn start:contract
-    t.is(await yarn(['start:contract']), 0, 'yarn start:contract works');
+    await yarn('start:contract');
 
     // ==============
     // yarn start:ui
-    const startUiP = yarn(['start:ui']);
+    const startUiP = yarn('start:ui');
     finalizers.push(() => pkill(startUiP.childProcess, 'SIGINT'));
     const uiListening = makePromiseKit();
     let retries = 0;