@agoric/swingset-vat 0.32.3-dev-0752cec.0 → 0.32.3-dev-940d3f0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-0752cec.0+0752cec",
+  "version": "0.32.3-dev-940d3f0.0+940d3f0",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -27,22 +27,22 @@
     "@types/yargs-parser": "^21.0.0"
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-0752cec.0+0752cec",
-    "@agoric/internal": "0.3.3-dev-0752cec.0+0752cec",
-    "@agoric/kmarshal": "0.1.1-dev-0752cec.0+0752cec",
-    "@agoric/store": "0.9.3-dev-0752cec.0+0752cec",
-    "@agoric/swing-store": "0.9.2-dev-0752cec.0+0752cec",
-    "@agoric/swingset-liveslots": "0.10.3-dev-0752cec.0+0752cec",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-0752cec.0+0752cec",
-    "@agoric/time": "0.3.3-dev-0752cec.0+0752cec",
-    "@agoric/vat-data": "0.5.3-dev-0752cec.0+0752cec",
-    "@agoric/xsnap": "0.14.3-dev-0752cec.0+0752cec",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-0752cec.0+0752cec",
+    "@agoric/internal": "0.3.3-dev-940d3f0.0+940d3f0",
+    "@agoric/kmarshal": "0.1.1-dev-940d3f0.0+940d3f0",
+    "@agoric/store": "0.9.3-dev-940d3f0.0+940d3f0",
+    "@agoric/swing-store": "0.9.2-dev-940d3f0.0+940d3f0",
+    "@agoric/swingset-liveslots": "0.10.3-dev-940d3f0.0+940d3f0",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-940d3f0.0+940d3f0",
+    "@agoric/time": "0.3.3-dev-940d3f0.0+940d3f0",
+    "@agoric/vat-data": "0.5.3-dev-940d3f0.0+940d3f0",
+    "@agoric/xsnap": "0.14.3-dev-940d3f0.0+940d3f0",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-940d3f0.0+940d3f0",
     "@endo/base64": "^1.0.5",
     "@endo/bundle-source": "^3.2.3",
     "@endo/captp": "^4.2.0",
     "@endo/check-bundle": "^1.0.7",
     "@endo/compartment-mapper": "^1.1.5",
+    "@endo/errors": "^1.2.2",
     "@endo/eventual-send": "^1.2.2",
     "@endo/far": "^1.1.2",
     "@endo/import-bundle": "^1.1.2",
@@ -102,5 +102,5 @@
   "typeCoverage": {
     "atLeast": 75.02
   },
-  "gitHead": "0752cecf484c94c1f596dcf7cb8ffd8429a8381c"
+  "gitHead": "940d3f0a993ca45a6bb0893bd59e6df1f22d9143"
 }

package/src/controller/controller.js

@@ -9,7 +9,7 @@ import { tmpName } from 'tmp';
 import anylogger from 'anylogger';
 import microtime from 'microtime';
 
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { importBundle } from '@endo/import-bundle';
 import { initSwingStore } from '@agoric/swing-store';
 

package/src/controller/initializeKernel.js

@@ -1,8 +1,8 @@
 /* eslint-disable no-use-before-define */
 
+import { assert, Fail } from '@endo/errors';
 import { makeMarshal } from '@endo/marshal';
 import { Far } from '@endo/far';
-import { assert, Fail } from '@agoric/assert';
 import { kser, kunser } from '@agoric/kmarshal';
 import { assertKnownOptions } from '../lib/assertOptions.js';
 import { insistVatID } from '../lib/id.js';

package/src/controller/initializeSwingset.js

@@ -2,7 +2,7 @@
 import fs from 'fs';
 import path from 'path';
 
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { makeTracer } from '@agoric/internal';
 import { mustMatch } from '@agoric/store';
 import bundleSource from '@endo/bundle-source';

package/src/controller/startXSnap.js

@@ -1,5 +1,5 @@
 import path from 'path';
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 import { type as osType } from 'os';
 import { xsnap, recordXSnap } from '@agoric/xsnap';
 

package/src/devices/bridge/device-bridge.js

@@ -1,4 +1,4 @@
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 import { Far } from '@endo/far';
 
 function sanitize(data) {

package/src/devices/bundle/device-bundle.js

@@ -1,4 +1,4 @@
-import { assert } from '@agoric/assert';
+import { assert } from '@endo/errors';
 import { buildSerializationTools } from '../lib/deviceTools.js';
 
 /*

package/src/devices/command/command.js

@@ -1,8 +1,7 @@
+import { Fail } from '@endo/errors';
 import { makePromiseKit } from '@endo/promise-kit';
 import { Nat } from '@endo/nat';
 
-import { Fail } from '@agoric/assert';
-
 export default function buildCommand(broadcastCallback) {
   broadcastCallback || Fail`broadcastCallback must be provided.`;
   let inboundCallback;

package/src/devices/command/device-command.js

@@ -1,8 +1,7 @@
+import { Fail } from '@endo/errors';
 import { Nat } from '@endo/nat';
 import { Far } from '@endo/far';
 
-import { Fail } from '@agoric/assert';
-
 export function buildRootDeviceNode(tools) {
   const { SO, getDeviceState, setDeviceState, endowments } = tools;
   const { registerInboundCallback, deliverResponse, sendBroadcast } =

package/src/devices/lib/deviceTools.js

@@ -1,4 +1,4 @@
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { makeMarshal } from '@endo/marshal';
 import { Far } from '@endo/far';
 import { parseVatSlot } from '../../lib/parseVatSlots.js';

package/src/devices/loopbox/device-loopbox.js

@@ -1,4 +1,4 @@
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 import { Far } from '@endo/far';
 
 export function buildRootDeviceNode(tools) {

package/src/devices/loopbox/loopbox.js

@@ -1,4 +1,4 @@
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 
 /*
  * The "loopbox" is a special device used for unit tests, which glues one

package/src/devices/mailbox/device-mailbox.js

@@ -1,8 +1,7 @@
+import { assert, Fail } from '@endo/errors';
 import { Nat } from '@endo/nat';
 import { Far } from '@endo/far';
 
-import { assert, Fail } from '@agoric/assert';
-
 export function buildRootDeviceNode(tools) {
   const { SO, getDeviceState, setDeviceState, endowments } = tools;
 

package/src/devices/mailbox/mailbox.js

@@ -64,10 +64,9 @@
 
 */
 
+import { Fail } from '@endo/errors';
 import { Nat } from '@endo/nat';
 
-import { Fail } from '@agoric/assert';
-
 // This Map-based mailboxState object is a good starting point, but we may
 // replace it with one that tracks which parts of the state have been
 // modified, to build more efficient Merkle proofs.

package/src/devices/plugin/device-plugin.js

@@ -1,6 +1,6 @@
+import { Fail } from '@endo/errors';
 import { makeCapTP } from '@endo/captp';
 import { Far } from '@endo/far';
-import { Fail } from '@agoric/assert';
 
 export function buildRootDeviceNode(tools) {
   const { SO, getDeviceState, setDeviceState, endowments } = tools;

package/src/devices/timer/device-timer.js

@@ -23,7 +23,7 @@
  */
 
 import { Nat } from '@endo/nat';
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { Far } from '@endo/far';
 
 // Since we use harden when saving the state, we need to copy the arrays so they

package/src/devices/timer/timer.js

@@ -1,6 +1,6 @@
 import { Nat } from '@endo/nat';
 
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 
 /**
  * Endowments for a Timer device that can be made available to SwingSet vats.

package/src/devices/vat-admin/device-vat-admin.js

@@ -1,5 +1,5 @@
 import { Nat } from '@endo/nat';
-import { assert } from '@agoric/assert';
+import { assert } from '@endo/errors';
 import { kunser } from '@agoric/kmarshal';
 import { buildSerializationTools } from '../lib/deviceTools.js';
 import { insistVatID } from '../../lib/id.js';

package/src/kernel/deviceManager.js

@@ -1,4 +1,4 @@
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { makeDeviceSlots } from './deviceSlots.js';
 import { insistCapData } from '../lib/capdata.js';
 

package/src/kernel/deviceSlots.js

@@ -1,6 +1,6 @@
 import { Remotable, makeMarshal } from '@endo/marshal';
 import { passStyleOf } from '@endo/far';
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import {
   insistVatType,
   makeVatSlot,

package/src/kernel/deviceTranslator.js

@@ -1,5 +1,5 @@
 // @ts-nocheck
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { insistMessage } from '../lib/message.js';
 import { insistKernelType } from './parseKernelSlots.js';
 import { insistVatType, parseVatSlot } from '../lib/parseVatSlots.js';

package/src/kernel/dummyMeterControl.js

@@ -1,4 +1,4 @@
-import { assert } from '@agoric/assert';
+import { assert } from '@endo/errors';
 
 export function makeDummyMeterControl() {
   let meteringDisabled = 0;

package/src/kernel/gc-actions.js

@@ -1,4 +1,4 @@
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 import { insistKernelType } from './parseKernelSlots.js';
 import { insistVatID } from '../lib/id.js';
 

package/src/kernel/kernel.js

@@ -1,6 +1,6 @@
 /* global globalThis */
 
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { isNat } from '@endo/nat';
 import { importBundle } from '@endo/import-bundle';
 import { makeUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';

package/src/kernel/kernelSyscall.js

@@ -1,4 +1,4 @@
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { insistKernelType } from './parseKernelSlots.js';
 import { insistCapData } from '../lib/capdata.js';
 import { insistDeviceID, insistVatID } from '../lib/id.js';

package/src/kernel/parseKernelSlots.js

@@ -1,5 +1,5 @@
 import { Nat } from '@endo/nat';
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 
 // Object/promise references (in the kernel) contain a two-tuple of (type,
 // index). All object references point to entries in the kernel Object

package/src/kernel/slogger.js

@@ -1,4 +1,4 @@
-import { quote } from '@agoric/assert';
+import { q } from '@endo/errors';
 
 const IDLE = 'idle';
 const STARTUP = 'startup';
@@ -66,7 +66,7 @@ function makeCallbackRegistry(callbacks) {
       if (!cbNames.length) {
         return;
       }
-      console.warn(errorUnusedMsg, cbNames.map(quote).sort().join(', '));
+      console.warn(errorUnusedMsg, cbNames.map(q).sort().join(', '));
     },
   });
 }

package/src/kernel/state/deviceKeeper.js

@@ -3,7 +3,7 @@
  */
 
 import { Nat } from '@endo/nat';
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { parseKernelSlot } from '../parseKernelSlots.js';
 import { makeVatSlot, parseVatSlot } from '../../lib/parseVatSlots.js';
 import { insistDeviceID } from '../../lib/id.js';

package/src/kernel/state/kernelKeeper.js

@@ -1,5 +1,5 @@
 import { Nat, isNat } from '@endo/nat';
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { initializeVatState, makeVatKeeper } from './vatKeeper.js';
 import { initializeDeviceState, makeDeviceKeeper } from './deviceKeeper.js';
 import { parseReachableAndVatSlot } from './reachable.js';

package/src/kernel/state/reachable.js

@@ -1,4 +1,4 @@
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 
 export function parseReachableAndVatSlot(value) {
   typeof value === 'string' || Fail`non-string value: ${value}`;

package/src/kernel/state/stats.js

@@ -1,4 +1,4 @@
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 
 /** @typedef {'counter' | 'gauge'} KernelStatsMetricType */
 /**

package/src/kernel/state/storageHelper.js

@@ -1,6 +1,6 @@
 // @ts-check
 
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 
 /**
  * Iterate over keys with a given prefix, in lexicographic order,

package/src/kernel/state/vatKeeper.js

@@ -2,7 +2,7 @@
  * Kernel's keeper of persistent state for a vat.
  */
 import { Nat, isNat } from '@endo/nat';
-import { assert, q, Fail } from '@agoric/assert';
+import { assert, q, Fail } from '@endo/errors';
 import { parseKernelSlot } from '../parseKernelSlots.js';
 import { makeVatSlot, parseVatSlot } from '../../lib/parseVatSlots.js';
 import { insistVatID } from '../../lib/id.js';

package/src/kernel/vat-admin-hooks.js

@@ -1,4 +1,4 @@
-import { assert } from '@agoric/assert';
+import { assert } from '@endo/errors';
 import { kser, kunser } from '@agoric/kmarshal';
 import { insistVatID } from '../lib/id.js';
 

package/src/kernel/vat-loader/manager-factory.js

@@ -1,4 +1,4 @@
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { assertKnownOptions } from '../../lib/assertOptions.js';
 import { makeLocalVatManagerFactory } from './manager-local.js';
 import { makeNodeSubprocessFactory } from './manager-subprocess-node.js';

package/src/kernel/vat-loader/manager-helper.js

@@ -1,4 +1,4 @@
-import { assert } from '@agoric/assert';
+import { assert } from '@endo/errors';
 import '../../types-ambient.js';
 import {
   insistVatDeliveryResult,

package/src/kernel/vat-loader/manager-local.js

@@ -1,6 +1,6 @@
 /* global globalThis */
 
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { importBundle } from '@endo/import-bundle';
 import { makeLiveSlots } from '@agoric/swingset-liveslots';
 import { makeManagerKit } from './manager-helper.js';

package/src/kernel/vat-loader/manager-subprocess-node.js

@@ -1,6 +1,6 @@
 // import { spawn } from 'child_process'; // not from Compartment
 
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { E } from '@endo/eventual-send';
 import { makePromiseKit } from '@endo/promise-kit';
 import { makeManagerKit } from './manager-helper.js';

package/src/kernel/vat-loader/manager-subprocess-xsnap.js

@@ -1,5 +1,5 @@
 import { synchronizedTee } from '@agoric/internal';
-import { assert, Fail, q } from '@agoric/assert';
+import { assert, Fail, q } from '@endo/errors';
 import { ExitCode } from '@agoric/xsnap/api.js';
 import { makeManagerKit } from './manager-helper.js';
 

package/src/kernel/vat-loader/vat-loader.js

@@ -1,4 +1,4 @@
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { assertKnownOptions } from '../../lib/assertOptions.js';
 import { makeVatSlot } from '../../lib/parseVatSlots.js';
 

package/src/kernel/vat-warehouse.js

@@ -1,4 +1,4 @@
-import { assert, Fail, quote as q } from '@agoric/assert';
+import { assert, Fail, q } from '@endo/errors';
 import { isNat } from '@endo/nat';
 import { makeVatTranslators } from './vatTranslator.js';
 import { insistVatDeliveryResult } from '../lib/message.js';

package/src/kernel/vatTranslator.js

@@ -1,4 +1,4 @@
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { insistMessage } from '../lib/message.js';
 import { insistKernelType, parseKernelSlot } from './parseKernelSlots.js';
 import { insistVatType, parseVatSlot } from '../lib/parseVatSlots.js';

package/src/lib/assertOptions.js

@@ -1,4 +1,4 @@
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 
 export function assertKnownOptions(options, knownNames) {
   assert(knownNames instanceof Array);

package/src/lib/capdata.js

@@ -1,4 +1,4 @@
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 import { passStyleOf } from '@endo/far';
 import { kunser, krefOf } from '@agoric/kmarshal';
 

package/src/lib/id.js

@@ -1,6 +1,6 @@
 import { Nat } from '@endo/nat';
 
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 
 // Vats are identified by an integer index, which (for typechecking purposes)
 // is encoded as `vNN`. Devices are similarly identified as `dNN`. Both have

package/src/lib/message.js

@@ -1,4 +1,4 @@
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { insistCapData } from './capdata.js';
 
 /**

package/src/lib/parseVatSlots.js

@@ -1,5 +1,5 @@
 import { Nat } from '@endo/nat';
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 
 // NOTE: confusing terminology: "slot" vs. "reference".  All these things
 // called "slots" are references, but the word "slot" suggests something into

package/src/lib/recordVatOptions.js

@@ -1,4 +1,4 @@
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 import { makeWorkerOptions } from './workerOptions.js';
 
 export const makeVatOptionRecorder = (kernelKeeper, bundleHandler) => {

package/src/lib/runPolicies.js

@@ -1,4 +1,4 @@
-import { assert } from '@agoric/assert';
+import { assert } from '@endo/errors';
 
 export function foreverPolicy() {
   /** @type { RunPolicy } */

package/src/lib/storageAPI.js

@@ -1,4 +1,4 @@
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 
 /**
  * Assert function to ensure that an object implements the StorageAPI

package/src/lib/workerOptions.js

@@ -1,4 +1,4 @@
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 
 /**
  * @param {string} managerType

package/src/supervisors/subprocess-node/supervisor-subprocess-node.js

@@ -8,7 +8,7 @@ import fs from 'fs';
 import { Buffer } from 'buffer';
 import process from 'node:process';
 
-import { assert, details as X, Fail } from '@agoric/assert';
+import { assert, X, Fail } from '@endo/errors';
 import { importBundle } from '@endo/import-bundle';
 import { makeMarshal } from '@endo/marshal';
 import {

package/src/vats/comms/clist-inbound.js

@@ -1,4 +1,4 @@
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 import {
   flipRemoteSlot,
   insistRemoteType,

package/src/vats/comms/clist-kernel.js

@@ -1,4 +1,4 @@
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 import { parseVatSlot, insistVatType } from '../../lib/parseVatSlots.js';
 import { parseLocalSlot } from './parseLocalSlots.js';
 import { cdebug } from './cdebug.js';

package/src/vats/comms/clist-outbound.js

@@ -1,4 +1,4 @@
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 import { parseLocalSlot, insistLocalType } from './parseLocalSlots.js';
 import {
   flipRemoteSlot,

package/src/vats/comms/controller.js

@@ -1,5 +1,5 @@
 import { Nat } from '@endo/nat';
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { kser, kunser, kslot, krefOf } from '@agoric/kmarshal';
 
 // deliverToController() is used for local vats which want to talk to us as a

package/src/vats/comms/delivery.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-use-before-define */
 
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { kser } from '@agoric/kmarshal';
 import { parseLocalSlot, insistLocalType } from './parseLocalSlots.js';
 import { makeUndeliverableError } from '../../lib/makeUndeliverableError.js';

package/src/vats/comms/dispatch.js

@@ -1,4 +1,4 @@
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { kser, kunser } from '@agoric/kmarshal';
 import { makeVatSlot } from '../../lib/parseVatSlots.js';
 import { insistMessage } from '../../lib/message.js';

package/src/vats/comms/gc-comms.js

@@ -1,4 +1,4 @@
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { parseVatSlot } from '../../lib/parseVatSlots.js';
 import { parseRemoteSlot } from './parseRemoteSlot.js';
 

package/src/vats/comms/parseLocalSlots.js

@@ -1,5 +1,5 @@
 import { Nat } from '@endo/nat';
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 
 // Local object/promise references (in the comms vat) contain a two-tuple of
 // (type, index).  All object references point to entries in the Local Object

package/src/vats/comms/parseRemoteSlot.js

@@ -1,5 +1,5 @@
 import { Nat } from '@endo/nat';
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 
 // Object/promise references (in remote messages) contain a three-tuple of
 // (type, allocator flag, index). The allocator flag inside an inbound

package/src/vats/comms/remote.js

@@ -1,5 +1,5 @@
 import { Nat } from '@endo/nat';
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { parseLocalSlot, insistLocalType } from './parseLocalSlots.js';
 import {
   makeRemoteSlot,

package/src/vats/comms/state.js

@@ -1,5 +1,5 @@
 import { Nat } from '@endo/nat';
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { insistCapData } from '../../lib/capdata.js';
 import {
   makeVatSlot,

package/src/vats/timer/vat-timer.js

@@ -1,9 +1,9 @@
 /* eslint-disable no-use-before-define */
 
+import { assert } from '@endo/errors';
 import { Far, E, passStyleOf } from '@endo/far';
 import { makePromiseKit } from '@endo/promise-kit';
 import { Nat } from '@endo/nat';
-import { assert } from '@agoric/assert';
 import {
   provideKindHandle,
   provideDurableMapStore,

package/src/vats/vat-admin/vat-vat-admin.js

@@ -5,10 +5,11 @@
  * must ensure that only data goes in and out. It's also responsible for turning
  * device affordances into objects that can be used by code in other vats.
  */
+import { Nat, isNat } from '@endo/nat';
+import { q, Fail } from '@endo/errors';
 import { makePromiseKit } from '@endo/promise-kit';
 // import { makeNotifierKit } from '@agoric/notifier'; // XXX RESTORE
 import { Far, E, passStyleOf } from '@endo/far';
-import { Nat, isNat } from '@endo/nat';
 import {
   provide,
   makeScalarBigMapStore,
@@ -17,8 +18,6 @@ import {
   prepareSingleton,
 } from '@agoric/vat-data';
 
-const { quote: q, Fail } = assert;
-
 const managerTypes = ['local', 'node-subprocess', 'xsnap', 'xs-worker']; // xs-worker is alias
 
 function producePRR() {

package/src/vats/vattp/vat-vattp.js

@@ -1,4 +1,4 @@
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 import {
   provide,
   defineDurableKindMulti,

package/tools/bootstrap-relay.js

@@ -1,11 +1,9 @@
-import { assert } from '@agoric/assert';
+import { Fail, q } from '@endo/errors';
 import { objectMap } from '@agoric/internal';
 import { Far, E } from '@endo/far';
 import { makePromiseKit } from '@endo/promise-kit';
 import { buildManualTimer } from './manual-timer.js';
 
-const { Fail, quote: q } = assert;
-
 export const buildRootObject = () => {
   const timer = buildManualTimer();
   let vatAdmin;

package/tools/dvo-test-harness.js

@@ -1,7 +1,7 @@
 // eslint-disable-next-line import/order
 import { test } from './prepare-test-env-ava.js';
 
-import { assert } from '@agoric/assert';
+import { assert } from '@endo/errors';
 import { makeMarshal } from '@endo/marshal';
 import { initSwingStore } from '@agoric/swing-store';
 import { initializeSwingset, makeSwingsetController } from '../src/index.js';

package/tools/manual-timer.js

@@ -1,5 +1,5 @@
+import { Fail } from '@endo/errors';
 import { Far } from '@endo/far';
-import { Fail } from '@agoric/assert';
 import { makeScalarMapStore } from '@agoric/store';
 import { bindAllMethods } from '@agoric/internal';
 import { TimeMath } from '@agoric/time';

package/tools/run-utils.js

@@ -1,4 +1,4 @@
-import { Fail, q } from '@agoric/assert';
+import { Fail, q } from '@endo/errors';
 import { kunser } from '@agoric/kmarshal';
 import { makeQueue } from '@endo/stream';