@agoric/solo 0.9.5 → 0.9.6-dev-800c2bb.0

package/Dockerfile

@@ -1,5 +1,6 @@
 ARG TAG=latest
-FROM agoric/agoric-sdk:$TAG
+ARG REGISTRY=ghcr.io
+FROM $REGISTRY/agoric/agoric-sdk:$TAG
 
 WORKDIR /data/solo
 

package/jsconfig.json

@@ -1,22 +1,10 @@
 // This file can contain .js-specific Typescript compiler config.
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "target": "esnext",
-    "module": "esnext",
-
-    "noEmit": true,
-/*
-    // The following flags are for creating .d.ts files:
-    "noEmit": false,
-    "declaration": true,
-    "emitDeclarationOnly": true,
-*/
-    "downlevelIteration": true,
-    "strictNullChecks": true,
-    "moduleResolution": "node",
+    "checkJs": false,
   },
   "include": [
-    "exported.js",
     "public/**/*.js",
     "src/**/*.js",
     "test/**/*.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/solo",
-  "version": "0.9.5",
+  "version": "0.9.6-dev-800c2bb.0+800c2bb",
   "description": "Agoric's Solo vat runner",
   "type": "module",
   "bin": {
@@ -15,39 +15,40 @@
     "test:xs": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
     "lint": "run-s --continue-on-error lint:*",
-    "lint:types": "tsc --maxNodeModuleJsDepth 4 -p jsconfig.json",
+    "lint:types": "tsc -p jsconfig.json",
     "lint:eslint": "eslint ."
   },
   "keywords": [],
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/access-token": "^0.4.20",
-    "@agoric/assert": "^0.5.1",
-    "@agoric/cache": "^0.2.4",
-    "@agoric/cosmic-swingset": "^0.40.0",
-    "@agoric/notifier": "^0.5.1",
-    "@agoric/spawner": "^0.6.5",
-    "@agoric/store": "^0.8.5",
-    "@agoric/swing-store": "^0.8.1",
-    "@agoric/swingset-vat": "^0.31.0",
-    "@agoric/telemetry": "^0.5.0",
-    "@agoric/vats": "^0.13.2",
-    "@agoric/wallet": "^0.17.2",
-    "@endo/captp": "^2.0.15",
-    "@endo/eventual-send": "^0.16.5",
-    "@endo/import-bundle": "^0.2.53",
-    "@endo/init": "^0.5.49",
-    "@endo/marshal": "^0.7.5",
-    "@endo/promise-kit": "^0.2.49",
-    "agoric": "^0.18.4",
+    "@agoric/access-token": "0.4.21-dev-800c2bb.0+800c2bb",
+    "@agoric/assert": "0.5.2-dev-800c2bb.0+800c2bb",
+    "@agoric/cache": "0.2.5-dev-800c2bb.0+800c2bb",
+    "@agoric/cosmic-swingset": "0.40.1-dev-800c2bb.0+800c2bb",
+    "@agoric/internal": "0.2.2-dev-800c2bb.0+800c2bb",
+    "@agoric/notifier": "0.5.2-dev-800c2bb.0+800c2bb",
+    "@agoric/spawner": "0.6.6-dev-800c2bb.0+800c2bb",
+    "@agoric/store": "0.8.6-dev-800c2bb.0+800c2bb",
+    "@agoric/swing-store": "0.8.2-dev-800c2bb.0+800c2bb",
+    "@agoric/swingset-vat": "0.31.1-dev-800c2bb.0+800c2bb",
+    "@agoric/telemetry": "0.5.1-dev-800c2bb.0+800c2bb",
+    "@agoric/time": "0.2.2-dev-800c2bb.0+800c2bb",
+    "@agoric/vats": "0.13.3-dev-800c2bb.0+800c2bb",
+    "@agoric/wallet": "0.17.3-dev-800c2bb.0+800c2bb",
+    "@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.18.5-dev-800c2bb.0+800c2bb",
     "anylogger": "^0.21.0",
     "deterministic-json": "^1.0.5",
     "esm": "agoric-labs/esm#Agoric-built",
     "express": "^4.17.1",
     "http-proxy-middleware": "^2.0.6",
-    "import-meta-resolve": "^1.1.1",
-    "lmdb": "^2.4.5",
+    "import-meta-resolve": "^2.2.1",
     "minimist": "^1.2.0",
     "morgan": "^1.9.1",
     "node-fetch": "^2.6.0",
@@ -56,10 +57,10 @@
     "ws": "^7.2.0"
   },
   "devDependencies": {
-    "@agoric/ertp": "^0.15.5",
-    "@endo/bundle-source": "^2.3.1",
-    "ava": "^4.3.1",
-    "c8": "^7.7.2"
+    "@agoric/ertp": "0.15.6-dev-800c2bb.0+800c2bb",
+    "@endo/bundle-source": "^2.5.1",
+    "ava": "^5.2.0",
+    "c8": "^7.13.0"
   },
   "publishConfig": {
     "access": "public"
@@ -74,5 +75,5 @@
     "timeout": "20m",
     "workerThreads": false
   },
-  "gitHead": "636c850161d29c0368b4dec03c90e2674e8d6479"
+  "gitHead": "800c2bbed8ccb1e0fc24481c9f95027f95efc1fb"
 }

package/public/main.js

@@ -85,7 +85,7 @@ function run() {
     if (j.ok) {
       return j.res;
     }
-    throw new Error(`server error: ${JSON.stringify(j.rej)}`);
+    throw Error(`server error: ${JSON.stringify(j.rej)}`);
   }
 
   const protocol = window.location.protocol.replace(/^http/, 'ws');

package/solo-config.json

@@ -2,6 +2,11 @@
   "bootstrap": "bootstrap",
   "defaultManagerType": "xs-worker",
   "defaultReapInterval": 1000,
+  "bundles":{
+    "agoricNames": {
+      "sourceSpec": "@agoric/vats/src/vat-agoricNames.js"
+    }
+  },
   "vats": {
     "spawner": {
       "sourceSpec": "./src/vat-spawner.js"
@@ -16,7 +21,7 @@
       "sourceSpec": "./src/vat-uploads.js"
     },
     "bootstrap": {
-      "sourceSpec": "@agoric/vats/src/core/boot.js"
+      "sourceSpec": "@agoric/vats/src/core/boot-solo.js"
     }
   }
 }

package/src/add-chain.js

@@ -5,14 +5,14 @@ import djson from 'deterministic-json';
 import path from 'path';
 import fs from 'fs';
 
-import { assert, details as X } from '@agoric/assert';
+import { Fail } from '@agoric/assert';
 import setGCIIngress from './set-gci-ingress.js';
 
 const DEFAULT_CHAIN_CONFIG = 'https://testnet.agoric.com/network-config';
 
 /**
  * @param {string} basedir
- * @param {string=} chainConfig
+ * @param {string} [chainConfig]
  * @param {boolean} [force=false]
  */
 async function addChain(basedir, chainConfig, force = false) {
@@ -60,8 +60,7 @@ async function addChain(basedir, chainConfig, force = false) {
 
     netconf.gci = gci;
   }
-
-  assert(netconf.gci, X`${url.href} does not contain a "gci" entry`);
+  netconf.gci || Fail`${url.href} does not contain a "gci" entry`;
 
   const connFile = path.join(basedir, 'connections.json');
   const conns = JSON.parse(fs.readFileSync(connFile));

package/src/captp.js

@@ -1,16 +1,13 @@
+// @ts-check
 import { E, makeCapTP } from '@endo/captp';
 import { Far } from '@endo/marshal';
 
-export const getCapTPHandler = (
-  send,
-  getLocalBootstrap,
-  fallback = undefined,
-) => {
-  let lastEpoch;
+export const getCapTPHandler = (send, getLocalBootstrap, fallback) => {
+  let lastEpoch = 0;
   const chans = new Map();
   const doFallback = async (method, ...args) => {
     if (!fallback) {
-      return harden({});
+      return false;
     }
     return E(fallback)[method](...args);
   };
@@ -77,7 +74,7 @@ export const getCapTPHandler = (
       }
       const done = await doFallback('onMessage', obj, meta);
       if (!done) {
-        console.error(`Could not find handler ${obj.type}`, meta);
+        console.error(`Could not find handler ${obj.type}`, obj, meta);
       }
       return done;
     },

package/src/chain-cosmos-sdk.js

@@ -1,4 +1,4 @@
-/* global setTimeout Buffer */
+/* global clearTimeout setTimeout Buffer */
 import path from 'path';
 import fs from 'fs';
 import url from 'url';
@@ -11,36 +11,33 @@ import anylogger from 'anylogger';
 import { makeNotifierKit } from '@agoric/notifier';
 import { makePromiseKit } from '@endo/promise-kit';
 
-import { assert, details as X } from '@agoric/assert';
+import { assert, Fail } from '@agoric/assert';
 import {
   DEFAULT_BATCH_TIMEOUT_MS,
   makeBatchedDeliver,
-} from '@agoric/vats/src/batched-deliver.js';
+} from '@agoric/internal/src/batched-deliver.js';
+import { forever, whileTrue } from '@agoric/internal';
 
 const console = anylogger('chain-cosmos-sdk');
 
-// the `agd` tool in our repo is built by 'cd golang/cosmos &&
-// make'. It lives in the build tree along with `bin/ag-solo`, in case there are
-// multiple checkouts of `agoric-sdk`.
+// the `agd` tool in our repo is built on demand.  It lives in the build tree
+// along with `bin/ag-solo`, in case there are multiple checkouts of
+// `agoric-sdk`.
 export const HELPER = url.fileURLToPath(
-  new URL('../../../golang/cosmos/build/agd', import.meta.url),
+  new URL('../../../bin/agd', import.meta.url),
 );
 
-const FAUCET_ADDRESS =
-  'the appropriate faucet channel on Discord (https://agoric.com/discord)';
-
 // Transaction simulation should be an accurate measure of gas.
 const GAS_ADJUSTMENT = '1.2';
 
 const adviseEgress = egressAddr =>
   `\
 
-
-Send:
-
-  !faucet client ${egressAddr}
-
-to ${FAUCET_ADDRESS}`;
+Visit https://devnet.faucet.agoric.net/
+enter address: ${egressAddr}
+choose client, ag-solo
+and then Submit.
+`;
 
 // Retry if our latest message failed.
 const INITIAL_SEND_RETRY_DELAY_MS = 1_000;
@@ -176,7 +173,7 @@ export async function connectToChain(
   async function retryRpcHref(tryOnce) {
     let rpcHrefIndex = lastGoodRpcHrefIndex;
     // eslint-disable-next-line no-constant-condition
-    while (true) {
+    for await (const _ of forever) {
       const thisRpcHref = rpcHrefs[rpcHrefIndex];
 
       // tryOnce will either throw if cancelled (which rejects this promise),
@@ -193,6 +190,7 @@ export async function connectToChain(
       await new Promise(resolve => setTimeout(resolve, 5000));
       rpcHrefIndex = (rpcHrefIndex + 1) % rpcHrefs.length;
     }
+    throw Error(`Unreachable, but the tools don't know that`);
   }
 
   let goodRpcHref = rpcHrefs[0];
@@ -612,7 +610,7 @@ ${chainID} chain does not yet know of address ${clientAddr}${adviseEgress(
 
     const messages = messagePool;
 
-    try {
+    const tryBody = async () => {
       totalDeliveries += 1;
       console.log(
         `delivering to chain (trips=${totalDeliveries})`,
@@ -661,7 +659,7 @@ ${chainID} chain does not yet know of address ${clientAddr}${adviseEgress(
 
       // We just try a single delivery per block.
       let retry = true;
-      while (retry) {
+      for await (const _ of whileTrue(() => retry)) {
         retry = false;
         // eslint-disable-next-line no-await-in-loop
         const { stderr, stdout } = await runHelper([
@@ -690,11 +688,8 @@ ${chainID} chain does not yet know of address ${clientAddr}${adviseEgress(
           console.debug(`helper said: ${stdout}`);
           const out = JSON.parse(stdout);
 
-          assert.equal(
-            out.code,
-            0,
-            X`Unexpected output: ${out.raw_log || stdout.trimRight()}`,
-          );
+          out.code === 0 ||
+            Fail`Unexpected output: ${out.raw_log || stdout.trimRight()}`;
 
           // Wait for the transaction to be included in a block.
           const txHash = out.txhash;
@@ -704,7 +699,7 @@ ${chainID} chain does not yet know of address ${clientAddr}${adviseEgress(
             if (txResult.code) {
               // eslint-disable-next-line no-use-before-define
               failedSend(
-                assert.error(X`Error in tx processing: ${txResult.log}`),
+                assert.error(`Error in tx processing: ${txResult.log}`),
               );
             }
           });
@@ -715,11 +710,9 @@ ${chainID} chain does not yet know of address ${clientAddr}${adviseEgress(
           sequenceNumber += 1n;
         }
       }
-    } finally {
-      if (tmpInfo) {
-        await fs.promises.unlink(tmpInfo.path);
-      }
-    }
+    };
+
+    await tryBody().finally(() => tmpInfo && fs.promises.unlink(tmpInfo.path));
   };
 
   /**
@@ -728,13 +721,13 @@ ${chainID} chain does not yet know of address ${clientAddr}${adviseEgress(
    *
    * It then delivers the mailbox to inbound.  There are no optimisations.
    *
-   * @param {UpdateCount} [lastMailboxUpdate]
+   * @param {bigint} [lastMailboxUpdate]
    */
   const recurseEachMailboxUpdate = async (lastMailboxUpdate = undefined) => {
     const { updateCount, value: mailbox } = await mbNotifier.getUpdateSince(
       lastMailboxUpdate,
     );
-    assert(updateCount, X`${GCI} unexpectedly finished!`);
+    updateCount || Fail`${GCI} unexpectedly finished!`;
     if (mailbox) {
       const { outbox, ack } = mailbox;
       // console.info('have mailbox', mailbox);
@@ -780,11 +773,11 @@ ${chainID} chain does not yet know of address ${clientAddr}${adviseEgress(
   };
 
   // This function ensures we only have one outgoing send operation at a time.
-  /** @type {(lastSendUpdate?: UpdateCount) => Promise<void>} */
+  /** @type {(lastSendUpdate?: bigint) => Promise<void>} */
   const recurseEachSend = async (lastSendUpdate = undefined) => {
     // See when there is another requested send since our last time.
     const { updateCount } = await sendNotifier.getUpdateSince(lastSendUpdate);
-    assert(updateCount, X`Sending unexpectedly finished!`);
+    updateCount || Fail`Sending unexpectedly finished!`;
 
     await sendFromMessagePool().then(successfulSend, failedSend);
     recurseEachSend(updateCount);
@@ -813,5 +806,9 @@ ${chainID} chain does not yet know of address ${clientAddr}${adviseEgress(
 
   // Now that we've started consuming blocks, tell our caller how to deliver
   // messages.
-  return makeBatchedDeliver(deliver, Math.min(DEFAULT_BATCH_TIMEOUT_MS, 2000));
+  return makeBatchedDeliver(
+    deliver,
+    { clearTimeout, setTimeout },
+    Math.min(DEFAULT_BATCH_TIMEOUT_MS, 2000),
+  );
 }

package/src/entrypoint.js

@@ -2,9 +2,6 @@
 
 import '@endo/init/pre-bundle-source.js';
 
-// import lmdb early to work around SES incompatibility
-import 'lmdb';
-
 // Needed for legacy plugin support (dapp-oracle, for one).
 import 'esm';
 

package/src/outbound.js

@@ -1,7 +1,7 @@
 /* global process */
 import anylogger from 'anylogger';
 
-import { assert, details as X } from '@agoric/assert';
+import { Fail } from '@agoric/assert';
 
 // Limit the debug log length.
 const SOLO_MAX_DEBUG_LENGTH =
@@ -28,7 +28,7 @@ export function deliver(mbs) {
   for (const target of Object.getOwnPropertyNames(data)) {
     if (!knownTargets.has(target)) {
       log.error(`eek, no delivery method for target`, target);
-      // eslint-disable-next-line no-continue
+
       continue;
     }
     const t = knownTargets.get(target);
@@ -62,7 +62,7 @@ export function deliver(mbs) {
 }
 
 export function addDeliveryTarget(target, deliverator) {
-  assert(!knownTargets.has(target), X`target ${target} already added`);
+  !knownTargets.has(target) || Fail`target ${target} already added`;
   /** @type {TargetRecord} */
   const targetRecord = { deliverator, highestSent: 0, highestAck: 0 };
   knownTargets.set(target, targetRecord);

package/src/pipe-entrypoint.js

@@ -1,7 +1,6 @@
 /* global process */
 // @ts-check
 import '@endo/init/pre-bundle-source.js';
-import 'lmdb';
 import '@endo/init';
 
 import { parse, stringify } from '@endo/marshal';
@@ -9,7 +8,7 @@ import { makePromiseKit } from '@endo/promise-kit';
 
 import '@agoric/cosmic-swingset/src/anylogger-agoric.js';
 import { connectToFakeChain } from '@agoric/cosmic-swingset/src/sim-chain.js';
-import { makeShutdown } from '@agoric/telemetry/src/shutdown.js';
+import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
 
 const { registerShutdown } = makeShutdown(false);
 registerShutdown(() => process.exit());

package/src/pipe.js

@@ -5,7 +5,7 @@ import path from 'path';
 import { makePromiseKit } from '@endo/promise-kit';
 import { parse, stringify } from '@endo/marshal';
 
-import { makeShutdown } from '@agoric/telemetry/src/shutdown.js';
+import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
 
 const filename = new URL(import.meta.url).pathname;
 const dirname = path.dirname(filename);

package/src/reset-state.js

@@ -10,7 +10,7 @@ export default async function resetState(basedir) {
   );
   fs.writeFileSync(mailboxStateFile, `{}\n`);
   const kernelStateDBDir = path.join(basedir, 'swingset-kernel-state');
-  const { commit, close } = initSwingStore(kernelStateDBDir);
+  const { commit, close } = initSwingStore(kernelStateDBDir).hostStorage;
   await commit();
   await close();
 }

package/src/start.js

@@ -16,8 +16,8 @@ import anylogger from 'anylogger';
 // import connect from 'lotion-connect';
 // import djson from 'deterministic-json';
 
-import { assert, details as X } from '@agoric/assert';
-import { makeSlogSender } from '@agoric/telemetry';
+import { assert, Fail } from '@agoric/assert';
+import { makeSlogSender, tryFlushSlogSender } from '@agoric/telemetry';
 import {
   loadSwingsetConfigFile,
   buildCommand,
@@ -30,8 +30,8 @@ import {
   buildTimer,
 } from '@agoric/swingset-vat';
 import { openSwingStore } from '@agoric/swing-store';
-import { makeWithQueue } from '@agoric/vats/src/queue.js';
-import { makeShutdown } from '@agoric/telemetry/src/shutdown.js';
+import { makeWithQueue } from '@agoric/internal/src/queue.js';
+import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
 import {
   makeDefaultMeterProvider,
   getTelemetryProviders,
@@ -129,7 +129,7 @@ const buildSwingset = async (
     // Ensure they can't traverse out of the plugins prefix.
     const pluginFile = path.resolve(pluginsPrefix, mod);
     pluginFile.startsWith(pluginsPrefix) ||
-      assert.fail(X`Cannot load ${pluginFile} plugin; outside of ${pluginDir}`);
+      Fail`Cannot load ${pluginFile} plugin; outside of ${pluginDir}`;
 
     // TODO: Detect the module type and use the appropriate loader, just like
     // `agoric deploy`.
@@ -165,7 +165,7 @@ const buildSwingset = async (
 
   const soloEnv = Object.fromEntries(
     Object.entries(process.env)
-      .filter(([k]) => k.match(/^SOLO_/)) // narrow to SOLO_ prefixes.
+      .filter(([k]) => k.match(/^SOLO_/)) // narrow to SOLO_ prefixes. e.g. SOLO_SLOGFILE
       .map(([k, v]) => [k.replace(/^SOLO_/, ''), v]), // Replace SOLO_ controls with chain version.
   );
   const env = {
@@ -179,8 +179,7 @@ const buildSwingset = async (
       serviceName: TELEMETRY_SERVICE_NAME,
     });
 
-  const { LMDB_MAP_SIZE, SWING_STORE_TRACE, XSNAP_KEEP_SNAPSHOTS } = env;
-  const mapSize = (LMDB_MAP_SIZE && parseInt(LMDB_MAP_SIZE, 10)) || undefined;
+  const { SWING_STORE_TRACE, XSNAP_KEEP_SNAPSHOTS } = env;
 
   const defaultTraceFile = path.resolve(kernelStateDBDir, 'store-trace.log');
   let swingStoreTraceFile;
@@ -201,15 +200,10 @@ const buildSwingset = async (
   const keepSnapshots =
     XSNAP_KEEP_SNAPSHOTS === '1' || XSNAP_KEEP_SNAPSHOTS === 'true';
 
-  const { kvStore, streamStore, snapStore, commit } = openSwingStore(
-    kernelStateDBDir,
-    { mapSize, traceFile: swingStoreTraceFile, keepSnapshots },
-  );
-  const hostStorage = {
-    kvStore,
-    streamStore,
-    snapStore,
-  };
+  const { kernelStorage, hostStorage } = openSwingStore(kernelStateDBDir, {
+    traceFile: swingStoreTraceFile,
+    keepSnapshots,
+  });
 
   // Not to be confused with the gas model, this meter is for OpenTelemetry.
   const metricMeter = metricsProvider.getMeter('ag-solo');
@@ -217,11 +211,11 @@ const buildSwingset = async (
     metricMeter,
   });
 
-  if (!swingsetIsInitialized(hostStorage)) {
+  if (!swingsetIsInitialized(kernelStorage)) {
     if (defaultManagerType && !config.defaultManagerType) {
       config.defaultManagerType = defaultManagerType;
     }
-    await initializeSwingset(config, argv, hostStorage);
+    await initializeSwingset(config, argv, kernelStorage);
   }
   const slogSender = await makeSlogSender({
     stateDir: kernelStateDBDir,
@@ -229,7 +223,7 @@ const buildSwingset = async (
     env,
   });
   const controller = await makeSwingsetController(
-    hostStorage,
+    kernelStorage,
     deviceEndowments,
     { env, slogCallbacks, slogSender },
   );
@@ -243,7 +237,7 @@ const buildSwingset = async (
   async function saveState() {
     const ms = JSON.stringify(mbs.exportToData());
     await atomicReplaceFile(mailboxStateFile, ms);
-    await commit();
+    await hostStorage.commit();
   }
 
   function deliverOutbound() {
@@ -254,17 +248,19 @@ const buildSwingset = async (
 
   async function processKernel() {
     await crankScheduler(policy);
-    if (swingSetRunning) {
-      await saveState();
-      deliverOutbound();
+    if (!swingSetRunning) {
+      return;
     }
+    await saveState();
+    deliverOutbound();
+    await tryFlushSlogSender(slogSender, { env, log: console.warn });
   }
 
   // Use the input queue to make sure it doesn't overlap with
   // other inbound messages.
   const queuedDeliverInboundToMbx = withInputQueue(
     async function deliverInboundToMbx(sender, messages, ack) {
-      assert(Array.isArray(messages), X`inbound given non-Array: ${messages}`);
+      Array.isArray(messages) || Fail`inbound given non-Array: ${messages}`;
       // console.debug(`deliverInboundToMbx`, messages, ack);
       if (mb.deliverInbound(sender, messages, ack)) {
         await processKernel();
@@ -365,9 +361,11 @@ const deployWallet = async ({ agWallet, deploys, hostport }) => {
   // This part only runs if there were wallet deploys to do.
   const resolvedDeploys = deploys.map(dep => path.resolve(agWallet, dep));
 
-  const agoricCli = new URL(
-    await importMetaResolve('agoric/src/entrypoint.js', import.meta.url),
-  ).pathname;
+  const resolvedUrl = await importMetaResolve(
+    'agoric/src/entrypoint.js',
+    import.meta.url,
+  );
+  const agoricCli = new URL(resolvedUrl).pathname;
 
   // Use the same verbosity as our caller did for us.
   let verbosity;
@@ -414,10 +412,8 @@ const start = async (basedir, argv) => {
   const rawConnections = JSON.parse(
     fs.readFileSync(rawConnectionsPath, 'utf8'),
   );
-  assert(
-    Array.isArray(rawConnections),
-    `Invalid connections.json: must be a JSON array, at ${rawConnectionsPath}`,
-  );
+  Array.isArray(rawConnections) ||
+    Fail`Invalid connections.json: must be a JSON array, at ${rawConnectionsPath}`;
   const homeDirectory = process.cwd();
   const connections = rawConnections.map(connection => {
     if (['chain-cosmos-sdk', 'fake-chain'].includes(connection.type)) {
@@ -478,10 +474,12 @@ const start = async (basedir, argv) => {
   // Remove wallet traces.
   await unlink('html/wallet').catch(_ => {});
 
+  const packageUrl = await importMetaResolve(
+    `${wallet}/package.json`,
+    import.meta.url,
+  );
   // Find the wallet.
-  const pjs = new URL(
-    await importMetaResolve(`${wallet}/package.json`, import.meta.url),
-  ).pathname;
+  const pjs = new URL(packageUrl).pathname;
   const { 'agoric-wallet': { htmlBasedir = 'ui/build', deploy = [] } = {} } =
     JSON.parse(fs.readFileSync(pjs, 'utf-8'));
 
@@ -520,7 +518,7 @@ const start = async (basedir, argv) => {
         }
         case 'http': {
           log(`adding HTTP/WS listener on ${c.host}:${c.port}`);
-          assert(!broadcastJSON, X`duplicate type=http in connections.json`);
+          !broadcastJSON || Fail`duplicate type=http in connections.json`;
           hostport = `${c.host}:${c.port}`;
           broadcastJSON = await makeHTTPListener(
             basedir,
@@ -534,7 +532,7 @@ const start = async (basedir, argv) => {
           break;
         }
         default: {
-          assert.fail(X`unknown connection type in ${c}`);
+          Fail`unknown connection type in ${c}`;
         }
       }
     }),

package/src/vat-http.js

@@ -2,7 +2,7 @@ import { makeNotifierKit } from '@agoric/notifier';
 import { makeCache } from '@agoric/cache';
 import { E } from '@endo/eventual-send';
 import { Far } from '@endo/marshal';
-import { assert, details as X } from '@agoric/assert';
+import { Fail } from '@agoric/assert';
 import { getReplHandler } from '@agoric/vats/src/repl.js';
 import { makePromiseKit } from '@endo/promise-kit';
 import { getCapTPHandler } from './captp.js';
@@ -41,7 +41,7 @@ export function buildRootObject(vatPowers) {
     if (remaining.length === 0) {
       return firstValue;
     }
-    assert(firstValue, X`${first} not found in home`);
+    firstValue || Fail`${first} not found in home`;
     return E(firstValue).lookup(...remaining);
   };
   harden(lookup);
@@ -102,14 +102,6 @@ export function buildRootObject(vatPowers) {
     urlToHandler.set(url, commandHandler);
   }
 
-  const { promise: walletP, resolve: resolveWallet } = makePromiseKit();
-  const { promise: attMakerP, resolve: resolveAttMaker } = makePromiseKit();
-  Promise.all([walletP, attMakerP]).then(async ([wallet, attMaker]) => {
-    const walletAdmin = await E(wallet).getAdminFacet();
-    // console.debug('introduce', { wallet, walletAdmin, attMaker });
-    E(walletAdmin).resolveAttMaker(attMaker);
-  });
-
   return Far('root', {
     setCommandDevice(d) {
       commandDevice = d;
@@ -146,8 +138,6 @@ export function buildRootObject(vatPowers) {
       replObjects.local.wallet = wallet;
       replObjects.home.wallet = wallet;
       resolveCacheCooordinator(E(E(wallet).getBridge()).getCacheCoordinator());
-
-      resolveWallet(wallet);
     },
 
     /**
@@ -178,10 +168,6 @@ export function buildRootObject(vatPowers) {
           ...rest
         } = decentralObjects;
         decentralObjects = rest;
-
-        if (decentralObjects.attMaker) {
-          resolveAttMaker(decentralObjects.attMaker);
-        }
       }
 
       // TODO: Maybe remove sometime; home object is deprecated.
@@ -242,7 +228,7 @@ export function buildRootObject(vatPowers) {
 
         if (dispatcher === 'onMessage') {
           sendResponse(count, false, { type: 'doesNotUnderstand', obj });
-          assert.fail(X`No handler for ${url} ${type}`);
+          Fail`No handler for ${url} ${type}`;
         }
         sendResponse(count, false, true);
       } catch (rej) {

package/src/vat-uploads.js

@@ -1,9 +1,9 @@
 import { Far } from '@endo/marshal';
-import makeScratchPad from './scratch.js';
+import makeScratchPad from '@agoric/internal/src/scratch.js';
 
 // This vat contains the private upload scratch pad.
 
-export function buildRootObject(_vatPowers) {
+export function buildRootObject() {
   const uploads = makeScratchPad();
 
   function getUploads() {

package/src/web.js

@@ -210,7 +210,8 @@ export async function makeHTTPListener(
 
   // accept POST messages as commands.
   app.post('*', async (req, res) => {
-    if (!(await validateAccessToken(req))) {
+    const valid = await validateAccessToken(req);
+    if (!valid) {
       res.json({ ok: false, rej: 'Unauthorized' });
       return;
     }
@@ -225,7 +226,8 @@ export async function makeHTTPListener(
   });
 
   app.get('/connections', async (req, res) => {
-    if (!(await validateAccessToken(req))) {
+    const valid = await validateAccessToken(req);
+    if (!valid) {
       res.json({ ok: false, rej: 'Unauthorized' });
       return;
     }
@@ -237,7 +239,8 @@ export async function makeHTTPListener(
   });
 
   app.post('/publish-bundle', async (req, res) => {
-    if (!(await validateAccessToken(req))) {
+    const valid = await validateAccessToken(req);
+    if (!valid) {
       res.json({ ok: false, rej: 'Unauthorized' });
       return;
     }
@@ -256,7 +259,8 @@ export async function makeHTTPListener(
   // GETs (which should return index.html) and WebSocket requests.
   const wss = new WebSocket.Server({ noServer: true });
   server.on('upgrade', async (req, socket, head) => {
-    if (!(await validateAccessToken(req))) {
+    const valid = await validateAccessToken(req);
+    if (!valid) {
       socket.destroy();
       return;
     }
@@ -352,6 +356,9 @@ export async function makeHTTPListener(
       try {
         obj = JSON.parse(message);
         const res = await inboundCommand(obj, meta, id);
+        if (typeof res === 'boolean') {
+          return;
+        }
 
         // eslint-disable-next-line no-use-before-define
         sendJSON({ ...res, meta });
@@ -367,9 +374,7 @@ export async function makeHTTPListener(
   wss.on('connection', newChannel);
 
   function sendJSON(rawObj) {
-    const { meta: { channelID } = {} } = rawObj;
-    const obj = { ...rawObj };
-    delete obj.meta;
+    const { meta: { channelID } = {}, ...obj } = rawObj;
 
     // Point-to-point.
     const c = channels.get(channelID);

package/test/captp-fixture.js

@@ -44,7 +44,7 @@ export async function makeFixture(PORT, noisy = false) {
       /** @type {() => void} */
       let abortCapTP;
       ws = new WebSocket(
-        `ws://localhost:${PORT}/private/captp?accessToken=${accessToken}`,
+        `ws://127.0.0.1:${PORT}/private/captp?accessToken=${accessToken}`,
         {
           origin: `http://localhost:${PORT}`,
         },
@@ -107,7 +107,7 @@ export async function makeFixture(PORT, noisy = false) {
           console.log(buf);
         }
         // We only reject if the child exits before CapTP is established.
-        reject(new Error(`CapTP fixture exited with ${code}`));
+        reject(Error(`CapTP fixture exited with ${code}`));
       });
       tryConnect(resolve, reject);
     });

package/test/test-home.js

@@ -2,8 +2,9 @@
 
 import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
 
-import bundleSource from '@endo/bundle-source';
+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';
@@ -12,20 +13,29 @@ import { makeFixture, E } from './captp-fixture.js';
 
 const SOLO_PORT = 7999;
 
-// This runs before all the tests.
-let home;
-let teardown;
+//#region setup (ambient authority is confined to this region)
 test.before('setup', async t => {
+  const loadBundle = async specifier => {
+    const contractUrl = await importMetaResolve(specifier, import.meta.url);
+    const contractRoot = new URL(contractUrl).pathname;
+    t.log({ contractRoot });
+    const bundle = await bundleSourceAmbient(contractRoot);
+    return bundle;
+  };
   const { homeP, kill } = await makeFixture(SOLO_PORT, process.env.NOISY);
-  teardown = kill;
-  home = await homeP;
+  const home = await homeP;
+
+  t.context = { home, teardown: kill, loadBundle };
+
   t.truthy('ready');
 });
+//#endregion
 
 // Now come the tests that use `home`...
 // =========================================
 
 test.serial('home.board', async t => {
+  const { home } = t.context;
   const { board } = E.get(home);
   await t.throwsAsync(
     () => E(board).getValue('board0120'),
@@ -50,6 +60,7 @@ test.serial('home.board', async t => {
 });
 
 test.serial('home.wallet - transfer funds to the feePurse', async t => {
+  const { home } = t.context;
   const { wallet, faucet } = E.get(home);
   const feePurse = E(faucet).getFeePurse();
   const feeBrand = await E(feePurse).getAllegedBrand();
@@ -62,16 +73,13 @@ test.serial('home.wallet - transfer funds to the feePurse', async t => {
 });
 
 test.serial('home.wallet - receive zoe invite', async t => {
+  const { home, loadBundle } = t.context;
   const { wallet, zoe, board } = E.get(home);
 
   // Setup contract in order to get an invite to use in tests
-  const contractUrl = await importMetaResolve(
+  const bundle = await loadBundle(
     '@agoric/zoe/src/contracts/automaticRefund.js',
-    import.meta.url,
   );
-  const contractRoot = new URL(contractUrl).pathname;
-  t.log({ contractRoot });
-  const bundle = await bundleSource(contractRoot);
   const installationHandle = await E(zoe).install(bundle);
   const { creatorInvitation: invite } = await E(zoe).startInstance(
     installationHandle,
@@ -113,6 +121,7 @@ test.serial('home.wallet - receive zoe invite', async t => {
 });
 
 test.serial('home.wallet - central issuer setup', async t => {
+  const { home } = t.context;
   const { wallet } = E.get(home);
 
   // Check that the wallet knows about the central issuer.
@@ -127,6 +136,7 @@ test.serial('home.wallet - central issuer setup', async t => {
 });
 
 test.serial('home.localTimerService makeNotifier', async t => {
+  const { home } = t.context;
   const { localTimerService } = E.get(home);
   const notifier = E(localTimerService).makeNotifier(1n, 1n);
   const update1 = await E(notifier).getUpdateSince();
@@ -137,7 +147,7 @@ test.serial('home.localTimerService makeNotifier', async t => {
 
   // Tests gets an actual localTimerService, which returns actual times. We
   // can't verify the actual time, so we compare to make sure it's increasing.
-  t.truthy(update2.value > update1.value);
+  t.truthy(TimeMath.compareAbs(update2.value, update1.value) > 0);
 });
 
 function makeHandler() {
@@ -158,6 +168,7 @@ function makeHandler() {
 }
 
 test.serial('home.localTimerService makeRepeater', async t => {
+  const { home } = t.context;
   const { localTimerService } = E.get(home);
   const timestamp = await E(localTimerService).getCurrentTimestamp();
   const repeater = E(localTimerService).makeRepeater(1n, 1n);
@@ -167,12 +178,13 @@ test.serial('home.localTimerService makeRepeater', async t => {
   await E(notifier).getUpdateSince();
 
   t.truthy(handler.getCalls() >= 1);
-  t.truthy(handler.getArgs()[0] > timestamp);
+  t.truthy(TimeMath.compareAbs(handler.getArgs()[0], timestamp) > 0);
 });
 
 // =========================================
 // This runs after all the tests.
 test.after.always('teardown', async t => {
+  const { teardown } = t.context;
   await teardown();
   t.truthy('shutdown');
 });

package/src/scratch.js

@@ -1,53 +0,0 @@
-import { E } from '@endo/eventual-send';
-import { Far } from '@endo/marshal';
-
-export default function makeScratchPad() {
-  const map = new Map();
-
-  const keys = async () => {
-    const keyList = [...map.keys()];
-    return harden(keyList.sort());
-  };
-
-  const scratch = Far('scratchPad', {
-    delete: async keyP => {
-      const key = await keyP;
-      map.delete(key);
-    },
-    get: async keyP => {
-      const key = await keyP;
-      return map.get(key);
-    },
-    lookup: (...path) => {
-      if (path.length === 0) {
-        return scratch;
-      }
-      const [first, ...rest] = path;
-      const firstValue = E(scratch).get(first);
-      if (rest.length === 0) {
-        return firstValue;
-      }
-      return E(firstValue).lookup(...rest);
-    },
-    // Initialize a key only if it doesn't already exist.  Needed for atomicity
-    // between multiple invocations.
-    init: async (keyP, objP) => {
-      const [key, obj] = await Promise.all([keyP, objP]);
-      if (map.has(key)) {
-        throw Error(`Scratchpad already has key ${key}`);
-      }
-      map.set(key, obj);
-      return key;
-    },
-    keys,
-    // Legacy alias for `keys`.
-    list: keys,
-    set: async (keyP, objP) => {
-      const [key, obj] = await Promise.all([keyP, objP]);
-      map.set(key, obj);
-      return key;
-    },
-  });
-  return scratch;
-}
-/** @typedef {ReturnType<typeof makeScratchPad>} ScratchPad */