fix: endow with original unstructured assert

packages/cli/src/commands/run.js

@@ -1,4 +1,4 @@
-/* global process */
+/* global globalThis, process */
 import url from 'url';
 import os from 'os';
 import { E, Far } from '@endo/far';
@@ -10,7 +10,8 @@ import { withEndoAgent } from '../context.js';
 import { parsePetNamePath } from '../pet-name.js';
 
 const endowments = harden({
-  assert,
+  // See https://github.com/Agoric/agoric-sdk/issues/9515
+  assert: globalThis.assert,
   E,
   Far,
   makeExo,

packages/compartment-mapper/test/main.test.js

@@ -1,3 +1,5 @@
+/* global globalThis */
+
 import 'ses';
 import test from 'ava';
 import { loadLocation, importArchive, makeBundle } from '../index.js';
@@ -96,7 +98,8 @@ test('makeBundle / importArchive', async t => {
     TextEncoder,
     TextDecoder,
     URL,
-    assert,
+    // See https://github.com/Agoric/agoric-sdk/issues/9515
+    assert: globalThis.assert,
   });
   const evasiveArchiverBundle = archiverBundle
     .replace(/(?<!\.)\bimport\b(?![:"'])/g, 'IMPORT')

packages/daemon/src/web-page.js

@@ -1,5 +1,5 @@
 // @ts-check
-/* global window, document */
+/* global globalThis, window, document */
 
 import '@endo/init/debug.js';
 import { makeCapTP } from '@endo/captp';
@@ -56,7 +56,8 @@ const collectPropsAndBind = target => {
 };
 
 const hardenedEndowments = harden({
-  assert,
+  // See https://github.com/Agoric/agoric-sdk/issues/9515
+  assert: globalThis.assert,
   E,
   Far,
   makeExo,

packages/daemon/src/worker.js

@@ -1,3 +1,4 @@
+/* global globalThis */
 // @ts-check
 /// <reference types="ses"/>
 
@@ -12,7 +13,8 @@ import { WorkerFacetForDaemonInterface } from './interfaces.js';
 /** @import { EndoReadable, MignonicPowers } from './types.js' */
 
 const endowments = harden({
-  assert,
+  // See https://github.com/Agoric/agoric-sdk/issues/9515
+  assert: globalThis.assert,
   console,
   E,
   Far,

packages/eventual-send/src/track-turns.js

@@ -5,7 +5,10 @@ import {
 } from '@endo/env-options';
 
 // NOTE: We can't import these because they're not in scope before lockdown.
-// import { assert, details as X, Fail } from '@agoric/assert';
+// We also cannot currently import them because it would create a cyclic
+// dependency, though this is more easily fixed.
+// import { assert, X, Fail } from '@endo/errors';
+// See also https://github.com/Agoric/agoric-sdk/issues/9515
 
 // WARNING: Global Mutable State!
 // This state is communicated to `assert` that makes it available to the
@@ -33,7 +36,7 @@ const ENABLED =
 
 const addRejectionNote = detailsNote => reason => {
   if (reason instanceof Error) {
-    assert.note(reason, detailsNote);
+    globalThis.assert.note(reason, detailsNote);
   }
   if (VERBOSE) {
     console.log('REJECTED at top of event loop', reason);
@@ -52,7 +55,7 @@ const wrapFunction =
         result = func(...args);
       } catch (err) {
         if (err instanceof Error) {
-          assert.note(
+          globalThis.assert.note(
             err,
             X`Thrown from: ${hiddenPriorError}:${hiddenCurrentTurn}.${hiddenCurrentEvent}`,
           );
@@ -90,14 +93,14 @@ export const trackTurns = funcs => {
   if (!ENABLED || typeof globalThis === 'undefined' || !globalThis.assert) {
     return funcs;
   }
-  const { details: X } = assert;
+  const { details: X, note: annotateError } = globalThis.assert;
 
   hiddenCurrentEvent += 1;
   const sendingError = Error(
     `Event: ${hiddenCurrentTurn}.${hiddenCurrentEvent}`,
   );
   if (hiddenPriorError !== undefined) {
-    assert.note(sendingError, X`Caused by: ${hiddenPriorError}`);
+    annotateError(sendingError, X`Caused by: ${hiddenPriorError}`);
   }
 
   return /** @type {T} */ (

packages/ses/demos/challenge/main.js

@@ -1,4 +1,4 @@
-/* global window, document */
+/* global globalThis, window, document */
 /* eslint-disable no-plusplus */
 
 // two approaches:
@@ -152,7 +152,8 @@ lockdown();
   harden(guess);
   const compartment = new Compartment({
     console,
-    assert,
+    // See https://github.com/Agoric/agoric-sdk/issues/9515
+    assert: globalThis.assert,
     guess,
     ...dateEndowment,
   });

packages/ses/demos/console/main.js

@@ -1,4 +1,4 @@
-/* globals document */
+/* globals globalThis, document */
 
 lockdown();
 {
@@ -13,7 +13,11 @@ lockdown();
 
   // Under the default `lockdown` settings, it is safe enough
   // to endow with the safe `console`.
-  const compartment = new Compartment({ console, assert });
+  const compartment = new Compartment({
+    console,
+    // See https://github.com/Agoric/agoric-sdk/issues/9515
+    assert: globalThis.assert,
+  });
 
   execute.addEventListener('click', () => {
     const sourceText = input.value;