@agoric/solo 0.10.3-dev-b8d6697.0 → 0.10.4-calypso-dev-84eb287.0

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [0.10.3](https://github.com/Agoric/agoric-sdk/compare/@agoric/solo@0.10.2...@agoric/solo@0.10.3) (2023-06-09)
+
+**Note:** Version bump only for package @agoric/solo
+
+
+
+
+
 ### [0.10.2](https://github.com/Agoric/agoric-sdk/compare/@agoric/solo@0.10.1...@agoric/solo@0.10.2) (2023-06-02)
 
 **Note:** Version bump only for package @agoric/solo

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/solo",
-  "version": "0.10.3-dev-b8d6697.0+b8d6697",
+  "version": "0.10.4-calypso-dev-84eb287.0+84eb287",
   "description": "Agoric's Solo vat runner",
   "type": "module",
   "bin": {
@@ -15,34 +15,33 @@
     "test:xs": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
     "lint": "run-s --continue-on-error lint:*",
-    "lint:types": "tsc -p jsconfig.json",
+    "lint:types": "tsc",
     "lint:eslint": "eslint ."
   },
   "keywords": [],
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-b8d6697.0+b8d6697",
-    "@agoric/assert": "0.6.1-dev-b8d6697.0+b8d6697",
-    "@agoric/cache": "0.3.3-dev-b8d6697.0+b8d6697",
-    "@agoric/cosmic-swingset": "0.41.3-dev-b8d6697.0+b8d6697",
-    "@agoric/internal": "0.3.3-dev-b8d6697.0+b8d6697",
-    "@agoric/notifier": "0.6.3-dev-b8d6697.0+b8d6697",
-    "@agoric/spawner": "0.6.9-dev-b8d6697.0+b8d6697",
-    "@agoric/store": "0.9.3-dev-b8d6697.0+b8d6697",
-    "@agoric/swing-store": "0.9.2-dev-b8d6697.0+b8d6697",
-    "@agoric/swingset-vat": "0.32.3-dev-b8d6697.0+b8d6697",
-    "@agoric/telemetry": "0.6.3-dev-b8d6697.0+b8d6697",
-    "@agoric/time": "0.3.3-dev-b8d6697.0+b8d6697",
-    "@agoric/vats": "0.15.1-dev-b8d6697.0+b8d6697",
-    "@agoric/wallet": "0.18.3-dev-b8d6697.0+b8d6697",
-    "@endo/captp": "^3.1.1",
-    "@endo/eventual-send": "^0.17.2",
-    "@endo/import-bundle": "^0.3.4",
-    "@endo/init": "^0.5.56",
-    "@endo/marshal": "^0.8.5",
-    "@endo/promise-kit": "^0.2.56",
-    "agoric": "0.21.1-dev-b8d6697.0+b8d6697",
+    "@agoric/access-token": "0.4.22-calypso-dev-84eb287.0+84eb287",
+    "@agoric/assert": "0.6.1-calypso-dev-84eb287.0+84eb287",
+    "@agoric/cache": "0.3.3-calypso-dev-84eb287.0+84eb287",
+    "@agoric/cosmic-swingset": "0.41.4-calypso-dev-84eb287.0+84eb287",
+    "@agoric/internal": "0.3.3-calypso-dev-84eb287.0+84eb287",
+    "@agoric/notifier": "0.6.3-calypso-dev-84eb287.0+84eb287",
+    "@agoric/spawner": "0.6.9-calypso-dev-84eb287.0+84eb287",
+    "@agoric/store": "0.9.3-calypso-dev-84eb287.0+84eb287",
+    "@agoric/swing-store": "0.9.2-calypso-dev-84eb287.0+84eb287",
+    "@agoric/swingset-vat": "0.32.3-calypso-dev-84eb287.0+84eb287",
+    "@agoric/telemetry": "0.6.3-calypso-dev-84eb287.0+84eb287",
+    "@agoric/time": "0.3.3-calypso-dev-84eb287.0+84eb287",
+    "@agoric/vats": "0.15.2-calypso-dev-84eb287.0+84eb287",
+    "@agoric/wallet": "0.18.4-calypso-dev-84eb287.0+84eb287",
+    "@endo/captp": "^4.2.0",
+    "@endo/eventual-send": "^1.2.2",
+    "@endo/import-bundle": "^1.1.2",
+    "@endo/init": "^1.1.2",
+    "@endo/marshal": "^1.5.0",
+    "@endo/promise-kit": "^1.1.2",
     "anylogger": "^0.21.0",
     "deterministic-json": "^1.0.5",
     "esm": "agoric-labs/esm#Agoric-built",
@@ -50,30 +49,36 @@
     "http-proxy-middleware": "^2.0.6",
     "import-meta-resolve": "^2.2.1",
     "minimist": "^1.2.0",
-    "morgan": "^1.9.1",
+    "morgan": "^1.10.0",
     "node-fetch": "^2.6.0",
     "temp": "^0.9.1",
     "tmp": "^0.2.1",
     "ws": "^7.2.0"
   },
   "devDependencies": {
-    "@agoric/ertp": "0.16.3-dev-b8d6697.0+b8d6697",
-    "@endo/bundle-source": "^2.5.1",
+    "@agoric/ertp": "0.16.3-calypso-dev-84eb287.0+84eb287",
+    "@endo/bundle-source": "^3.2.3",
     "ava": "^5.3.0",
-    "c8": "^7.13.0"
+    "c8": "^9.1.0"
   },
   "publishConfig": {
     "access": "public"
   },
   "engines": {
-    "node": ">=14.15.0"
+    "node": "^18.12 || ^20.9"
   },
   "ava": {
     "files": [
-      "test/**/test-*.js"
+      "test/**/*.test.*"
+    ],
+    "require": [
+      "@endo/init/debug.js"
     ],
     "timeout": "20m",
     "workerThreads": false
   },
-  "gitHead": "b8d6697074b899630909440f0ea3caa519cdad44"
+  "typeCoverage": {
+    "atLeast": 73.11
+  },
+  "gitHead": "84eb287915c8255d68e845a9b6e10c790f0d54cb"
 }

package/public/main.js

@@ -237,7 +237,6 @@ function run() {
     }
     call({ type: 'getHighestHistory' })
       .then(res => {
-        // eslint-disable-next-line no-use-before-define
         setNextHistNum(res.highestHistory + 1);
         // console.debug(`nextHistNum is now ${nextHistNum}`, res);
       })
@@ -265,7 +264,7 @@ function run() {
     commands[commands.length - 1] = inp.value;
     commands[commands.length] = '';
     inp.value = '';
-    call({ type: 'doEval', number, body: command });
+    void call({ type: 'doEval', number, body: command });
   }
 
   function inputKeyup(ev) {

package/src/add-chain.js

@@ -13,7 +13,7 @@ const DEFAULT_CHAIN_CONFIG = 'https://testnet.agoric.com/network-config';
 /**
  * @param {string} basedir
  * @param {string} [chainConfig]
- * @param {boolean} [force=false]
+ * @param {boolean} [force]
  */
 async function addChain(basedir, chainConfig, force = false) {
   let actualConfig = chainConfig;

package/src/captp.js

@@ -42,7 +42,9 @@ export const getCapTPHandler = (send, getLocalBootstrap, fallback) => {
         dispatch,
         abort,
       });
-      doFallback('onOpen', obj, meta);
+      doFallback('onOpen', obj, meta).catch(e => {
+        console.error(`Error in fallback onOpen`, e);
+      });
     },
     onClose(obj, meta) {
       console.debug(`Finishing CapTP`, meta);
@@ -52,7 +54,9 @@ export const getCapTPHandler = (send, getLocalBootstrap, fallback) => {
         abort();
       }
       chans.delete(meta.channelHandle);
-      doFallback('onClose', obj, meta);
+      doFallback('onClose', obj, meta).catch(e => {
+        console.error(`Error in fallback onClose`, e);
+      });
     },
     onError(obj, meta) {
       console.debug(`Error in CapTP`, meta, obj.error);
@@ -61,7 +65,9 @@ export const getCapTPHandler = (send, getLocalBootstrap, fallback) => {
         const { abort } = chan;
         abort(obj.error);
       }
-      doFallback('onError', obj, meta);
+      doFallback('onError', obj, meta).catch(e => {
+        console.error(`Error in fallback onError`, e);
+      });
     },
     async onMessage(obj, meta) {
       console.debug('processing inbound', obj);

package/src/chain-cosmos-sdk.js

@@ -160,7 +160,7 @@ export async function connectToChain(
   );
 
   // The helper address may not have a token balance, and instead uses a
-  // separate fee account, set up with something like:
+  // separate fee granter account, set up with something like:
   //
   // agd tx feegrant grant --period=5 --period-limit=200000uist \
   // $(cat cosmos-fee-account) $(cat ag-cosmos-helper-address)
@@ -172,7 +172,7 @@ export async function connectToChain(
   let lastGoodRpcHrefIndex = 0;
   async function retryRpcHref(tryOnce) {
     let rpcHrefIndex = lastGoodRpcHrefIndex;
-    // eslint-disable-next-line no-constant-condition
+
     for await (const _ of forever) {
       const thisRpcHref = rpcHrefs[rpcHrefIndex];
 
@@ -257,7 +257,7 @@ export async function connectToChain(
    */
   const getMailboxNotifier = () => {
     const { notifier, updater } = makeNotifierKit();
-    retryRpcHref(async rpcHref => {
+    void retryRpcHref(async rpcHref => {
       // Every time we enter this function, we are establishing a
       // new websocket to a potentially different RPC server.
       //
@@ -485,7 +485,7 @@ export async function connectToChain(
 
         waitForTxHash = subscribeAndWaitForTxHash;
         if (postponedTxHash) {
-          subscribeAndWaitForTxHash(postponedTxHash);
+          void subscribeAndWaitForTxHash(postponedTxHash);
         }
 
         subscribeToStorage(`mailbox.${clientAddr}`, (err, storageValue) => {
@@ -652,7 +652,7 @@ ${chainID} chain does not yet know of address ${clientAddr}${adviseEgress(
 
       // Use the feeAccount for any fees.
       if (feeAccountAddr) {
-        txArgs.push(`--fee-account=${feeAccountAddr}`);
+        txArgs.push(`--fee-granter=${feeAccountAddr}`);
       }
 
       // We just try a single delivery per block.
@@ -691,15 +691,20 @@ ${chainID} chain does not yet know of address ${clientAddr}${adviseEgress(
           // Wait for the transaction to be included in a block.
           const txHash = out.txhash;
 
-          waitForTxHash(txHash).then(txResult => {
-            // The result had an error code (not 0 or undefined for success).
-            if (txResult.code) {
+          waitForTxHash(txHash)
+            .then(txResult => {
+              // The result had an error code (not 0 or undefined for success).
+              if (txResult.code) {
+                // eslint-disable-next-line no-use-before-define
+                failedSend(
+                  assert.error(`Error in tx processing: ${txResult.log}`),
+                );
+              }
+            })
+            .catch(err =>
               // eslint-disable-next-line no-use-before-define
-              failedSend(
-                assert.error(`Error in tx processing: ${txResult.log}`),
-              );
-            }
-          });
+              failedSend(assert.error(`Error in tx processing: ${err}`)),
+            );
 
           // We submitted the transaction to the mempool successfully.
           // Preemptively increment our sequence number to avoid needing to
@@ -721,9 +726,8 @@ ${chainID} chain does not yet know of address ${clientAddr}${adviseEgress(
    * @param {bigint} [lastMailboxUpdate]
    */
   const recurseEachMailboxUpdate = async (lastMailboxUpdate = undefined) => {
-    const { updateCount, value: mailbox } = await mbNotifier.getUpdateSince(
-      lastMailboxUpdate,
-    );
+    const { updateCount, value: mailbox } =
+      await mbNotifier.getUpdateSince(lastMailboxUpdate);
     updateCount || Fail`${GCI} unexpectedly finished!`;
     if (mailbox) {
       const { outbox, ack } = mailbox;
@@ -777,11 +781,11 @@ ${chainID} chain does not yet know of address ${clientAddr}${adviseEgress(
     updateCount || Fail`Sending unexpectedly finished!`;
 
     await sendFromMessagePool().then(successfulSend, failedSend);
-    recurseEachSend(updateCount);
+    void recurseEachSend(updateCount);
   };
 
   // Begin the sender when we get the first (empty) mailbox update.
-  mbNotifier.getUpdateSince().then(() => recurseEachSend());
+  void mbNotifier.getUpdateSince().then(() => recurseEachSend());
 
   async function deliver(newMessages, acknum) {
     let doSend = false;

package/src/entrypoint.js

@@ -7,7 +7,7 @@ import 'esm';
 
 // we need to enable Math.random as a workaround for 'brace-expansion' module
 // (dep chain: temp->glob->minimatch->brace-expansion)
-import '@endo/init';
+import '@endo/init/legacy.js';
 
 import process from 'process';
 import path from 'path';

package/src/init-basedir.js

@@ -12,8 +12,7 @@ const console = anylogger('ag-solo:init');
 
 const DEFAULT_WALLET = '@agoric/wallet';
 
-const filename = new URL(import.meta.url).pathname;
-const dirname = path.dirname(filename);
+const dirname = path.dirname(new URL(import.meta.url).pathname);
 
 /**
  * @param {string} basedir
@@ -55,7 +54,7 @@ export default function initBasedir(
     `${JSON.stringify(connections)}\n`,
   );
   const dstHtmldir = path.join(basedir, 'html');
-  fs.mkdirSync(dstHtmldir);
+  fs.mkdirSync(dstHtmldir, { recursive: true });
 
   // Save the configuration options.
   fs.writeFileSync(path.join(basedir, 'options.json'), JSON.stringify(options));

package/src/pipe-entrypoint.js

@@ -1,7 +1,7 @@
 /* global process */
 // @ts-check
 import '@endo/init/pre-bundle-source.js';
-import '@endo/init';
+import '@endo/init/unsafe-fast.js';
 
 import { parse, stringify } from '@endo/marshal';
 import { makePromiseKit } from '@endo/promise-kit';
@@ -29,6 +29,7 @@ const main = async () => {
       mutex.resolve(undefined);
       return;
     }
+    /** @type {any} */
     const as = parse(`${msg}`);
     deliverator(...as).then(() => send('go'));
   });
@@ -59,7 +60,13 @@ const main = async () => {
   send('go');
 };
 
-main().catch(e => {
-  console.error(e);
-  process.exitCode = 1;
-});
+process.exitCode = 1;
+main().then(
+  () => {
+    process.exitCode = 0;
+  },
+  err => {
+    console.error('Failed with', err);
+    process.exit(process.exitCode || 1);
+  },
+);

package/src/pipe.js

@@ -7,8 +7,7 @@ import { parse, stringify } from '@endo/marshal';
 
 import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
 
-const filename = new URL(import.meta.url).pathname;
-const dirname = path.dirname(filename);
+const dirname = path.dirname(new URL(import.meta.url).pathname);
 
 export const connectToPipe = async ({ method, args, deliverInboundToMbx }) => {
   // console.log('connectToPipe', method, args);
@@ -31,6 +30,7 @@ export const connectToPipe = async ({ method, args, deliverInboundToMbx }) => {
       return;
     }
     // console.log('pipe.js', msg);
+    /** @type {any} */
     const as = parse(`${msg}`);
     deliverInboundToMbx(...as).then(() => cp.send('go'));
   });

package/src/start.js

@@ -371,10 +371,13 @@ const deployWallet = async ({ agWallet, deploys, hostport }) => {
 
   // Use the same verbosity as our caller did for us.
   let verbosity;
-  if (process.env.DEBUG === undefined) {
-    verbosity = [];
-  } else if (process.env.DEBUG.includes('agoric')) {
+  const DEBUG_LIST = (process.env.DEBUG || '').split(',');
+  if (
+    DEBUG_LIST.find(selector => ['agoric:debug', 'agoric'].includes(selector))
+  ) {
     verbosity = ['-vv'];
+  } else if (DEBUG_LIST.includes('agoric:info') || process.env.DEBUG === '') {
+    verbosity = [];
   } else {
     verbosity = ['-v'];
   }
@@ -471,7 +474,7 @@ const start = async (basedir, argv) => {
 
   // Start timer here!
   startTimer(800);
-  resetOutdatedState();
+  await resetOutdatedState();
 
   // Remove wallet traces.
   await unlink('html/wallet').catch(_ => {});
@@ -485,8 +488,14 @@ const start = async (basedir, argv) => {
   const { 'agoric-wallet': { htmlBasedir = 'ui/build', deploy = [] } = {} } =
     JSON.parse(fs.readFileSync(pjs, 'utf-8'));
 
+  const htmlBasePath = String(htmlBasedir).replace(
+    /^\.\.\/\.\.\/node_modules\//,
+    '',
+  );
+
   const agWallet = path.dirname(pjs);
-  const agWalletHtml = path.resolve(agWallet, htmlBasedir);
+  const agWalletHtmlUrl = await importMetaResolve(htmlBasePath, packageUrl);
+  const agWalletHtml = new URL(agWalletHtmlUrl).pathname;
 
   let hostport;
   await Promise.all(

package/src/vat-http.js

@@ -106,8 +106,8 @@ export function buildRootObject(vatPowers) {
     setCommandDevice(d) {
       commandDevice = d;
 
-      const replHandler = getReplHandler(replObjects, send, vatPowers);
-      registerURLHandler(replHandler, '/private/repl');
+      const replHandler = getReplHandler(replObjects, send);
+      void registerURLHandler(replHandler, '/private/repl');
 
       // Assign the captp handler.
       const captpHandler = Far('captpHandler', {
@@ -126,7 +126,7 @@ export function buildRootObject(vatPowers) {
           return harden(exported);
         },
       });
-      registerURLHandler(captpHandler, '/private/captp');
+      void registerURLHandler(captpHandler, '/private/captp');
     },
 
     registerURLHandler,

package/src/web.js

@@ -9,6 +9,7 @@ import { createProxyMiddleware } from 'http-proxy-middleware';
 import WebSocket from 'ws';
 import anylogger from 'anylogger';
 import morgan from 'morgan';
+import { format as urlFormat } from 'url';
 
 import { getAccessToken } from '@agoric/access-token';
 
@@ -148,21 +149,29 @@ export async function makeHTTPListener(
   const htmldir = path.join(basedir, 'html');
   log(`Serving static files from ${htmldir}`);
   app.use(express.static(htmldir));
-  app.use(express.static(new URL('../public', import.meta.url).pathname));
+  const soloHtmlDir = new URL('../public', import.meta.url).pathname;
+  app.use(express.static(soloHtmlDir));
 
   if (walletHtmlDir && !bridgeTarget) {
-    // Transition localStorage based bridge
+    // Guide all callers to /wallet/bridge.html
     if (existsSync(path.join(walletHtmlDir, 'bridge.html'))) {
-      console.log('redirecting wallet bridge');
+      console.log('redirecting /wallet-bridge.html to /wallet/bridge.html');
       app.get('/wallet-bridge.html', (req, res) =>
-        res.redirect('/wallet/bridge.html'),
+        res.redirect(
+          urlFormat({ pathname: '/wallet/bridge.html', query: req.query }),
+        ),
+      );
+    } else {
+      console.log('serving /wallet/bridge.html from solo wallet-bridge.html');
+      app.get('/wallet/bridge.html', (_, res) =>
+        res.sendFile(path.resolve(soloHtmlDir, 'wallet-bridge.html')),
       );
     }
 
     // Serve the wallet directory.
     app.use('/wallet', express.static(walletHtmlDir));
 
-    // Default GETs to /wallet/index.html for history routing.
+    // Default non-bridge GETs to /wallet/index.html for history routing.
     app.get('/wallet/*', (_, res) =>
       res.sendFile(path.resolve(walletHtmlDir, 'index.html')),
     );

package/test/captp-fixture.js

@@ -108,7 +108,7 @@ export async function makeFixture(PORT, noisy = false) {
         // We only reject if the child exits before CapTP is established.
         reject(Error(`CapTP fixture exited with ${code}`));
       });
-      tryConnect(resolve, reject);
+      void tryConnect(resolve, reject);
     });
   }
 

package/test/{test-home.js → home.test.js}

@@ -5,7 +5,6 @@ import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
 import bundleSourceAmbient from '@endo/bundle-source';
 import { AmountMath } from '@agoric/ertp';
 import { TimeMath } from '@agoric/time';
-import { Stable } from '@agoric/vats/src/tokens.js';
 import { Far } from '@endo/marshal';
 import { resolve as importMetaResolve } from 'import-meta-resolve';
 
@@ -13,6 +12,21 @@ import { makeFixture, E } from './captp-fixture.js';
 
 const SOLO_PORT = 7999;
 
+// XXX test depends on this exact value from the Inter Protocol economy,
+// by way of agoric-cli (which this test covertly depends upon)
+export const Stable = harden(
+  /** @type {const } */ ({
+    symbol: 'IST',
+    denom: 'uist',
+    proposedName: 'Agoric stable token',
+    assetKind: 'nat',
+    displayInfo: {
+      decimalPlaces: 6,
+      assetKind: 'nat',
+    },
+  }),
+);
+
 //#region setup (ambient authority is confined to this region)
 test.before('setup', async t => {
   const loadBundle = async specifier => {
@@ -81,9 +95,8 @@ test.serial('home.wallet - receive zoe invite', async t => {
     '@agoric/zoe/src/contracts/automaticRefund.js',
   );
   const installationHandle = await E(zoe).install(bundle);
-  const { creatorInvitation: invite } = await E(zoe).startInstance(
-    installationHandle,
-  );
+  const { creatorInvitation: invite } =
+    await E(zoe).startInstance(installationHandle);
 
   // Check that the wallet knows about the Zoe invite issuer and starts out
   // with a default Zoe invite issuer purse.
@@ -141,7 +154,7 @@ test.serial('home.localTimerService makeNotifier', async t => {
   const notifier = E(localTimerService).makeNotifier(1n, 1n);
   const update1 = await E(notifier).getUpdateSince();
   const firstUpdate = update1.updateCount;
-  t.truthy(firstUpdate > 0);
+  t.true(firstUpdate > 0);
   const update2 = await E(notifier).getUpdateSince(update1.updateCount);
   t.truthy(BigInt(update2.updateCount) > BigInt(firstUpdate));