fix: endow with original unstructured assert

Agoric · Jun 17, 2024 · 89f599b · 89f599b
1 parent 5375019
commit 89f599b
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 16 deletions.
diff --git a/packages/SwingSet/src/controller/controller.js b/packages/SwingSet/src/controller/controller.js
@@ -211,7 +211,8 @@ export async function makeSwingsetController(
     filePrefix: 'kernel/...',
     endowments: {
       console: makeConsole(`${debugPrefix}SwingSet:kernel`),
-      assert,
+      // See https://github.com/Agoric/agoric-sdk/issues/9515
+      assert: globalThis.assert,
       require: kernelRequire,
       URL: globalThis.Base64, // Unavailable only on XSnap
       Base64: globalThis.Base64, // Available only on XSnap

diff --git a/packages/SwingSet/src/kernel/kernel.js b/packages/SwingSet/src/kernel/kernel.js
@@ -1,3 +1,5 @@
+/* global globalThis */
+
 import { assert, Fail } from '@agoric/assert';
 import { isNat } from '@endo/nat';
 import { importBundle } from '@endo/import-bundle';
@@ -1644,7 +1646,12 @@ export default function buildKernel(
       assert(bundle);
       const NS = await importBundle(bundle, {
         filePrefix: `dev-${name}/...`,
-        endowments: harden({ ...vatEndowments, console: devConsole, assert }),
+        endowments: harden({
+          ...vatEndowments,
+          console: devConsole,
+          // See https://github.com/Agoric/agoric-sdk/issues/9515
+          assert: globalThis.assert,
+        }),
       });
 
       if (deviceEndowments[name] || unendowed) {

diff --git a/packages/SwingSet/src/kernel/vat-loader/manager-local.js b/packages/SwingSet/src/kernel/vat-loader/manager-local.js
@@ -74,7 +74,8 @@ export function makeLocalVatManagerFactory({
     const workerEndowments = harden({
       ...vatEndowments,
       console: makeVatConsole(makeLogMaker('vat')),
-      assert,
+      // See https://github.com/Agoric/agoric-sdk/issues/9515
+      assert: globalThis.assert,
       TextEncoder,
       TextDecoder,
       Base64: globalThis.Base64, // Available only on XSnap

diff --git a/packages/SwingSet/src/supervisors/subprocess-node/supervisor-subprocess-node.js b/packages/SwingSet/src/supervisors/subprocess-node/supervisor-subprocess-node.js
@@ -1,4 +1,4 @@
-/* global WeakRef, FinalizationRegistry */
+/* global globalThis, WeakRef, FinalizationRegistry */
 
 // this file is loaded at the start of a new subprocess
 import '@endo/init';
@@ -139,7 +139,8 @@ function handleSetBundle(margs) {
   // Enable or disable the console accordingly.
   const workerEndowments = {
     console: makeVatConsole(makeLogMaker(`SwingSet:vat:${vatID}`)),
-    assert,
+    // See https://github.com/Agoric/agoric-sdk/issues/9515
+    assert: globalThis.assert,
   };
 
   async function buildVatNamespace(lsEndowments, inescapableGlobalProperties) {

diff --git a/packages/SwingSet/test/zcf-ish-upgrade/pseudo-zcf.js b/packages/SwingSet/test/zcf-ish-upgrade/pseudo-zcf.js
@@ -1,11 +1,10 @@
 // @ts-nocheck
-/* global VatData */
+/* global globalThis, VatData */
 /* eslint-disable no-unused-vars */
 
 import { Far } from '@endo/far';
 import { importBundle } from '@endo/import-bundle';
 import { defineDurableKind } from '@agoric/vat-data';
-import { assert } from '@agoric/assert';
 import {
   provideHandle,
   provideBaggageSubset as provideBaggageSubTree,
@@ -24,7 +23,12 @@ export const buildRootObject = async (vatPowers, vatParameters, baggage) => {
   const { D } = vatPowers;
   const { contractBundleCap } = vatParameters;
   const contractBundle = D(contractBundleCap).getBundle();
-  const endowments = { console, assert, VatData };
+  const endowments = {
+    console,
+    // See https://github.com/Agoric/agoric-sdk/issues/9515
+    assert: globalThis.assert,
+    VatData,
+  };
   const contractNS = await importBundle(contractBundle, { endowments });
   const { setupInstallation, setup: _ } = contractNS;
   if (!setupInstallation) {

diff --git a/packages/cosmic-swingset/scripts/clean-core-eval.js b/packages/cosmic-swingset/scripts/clean-core-eval.js
@@ -1,4 +1,6 @@
 #! /usr/bin/env node
+/* global globalThis */
+
 import '@endo/init/debug.js';
 import * as farExports from '@endo/far';
 import { isEntrypoint } from '../src/helpers/is-entrypoint.js';
@@ -12,7 +14,8 @@ export const compartmentEvaluate = code => {
   const globals = harden({
     ...modules,
     ...farExports,
-    assert,
+    // See https://github.com/Agoric/agoric-sdk/issues/9515
+    assert: globalThis.assert,
     console: {
       // Ensure we don't pollute stdout.
       debug: console.warn,

diff --git a/packages/spawner/src/vat-spawned.js b/packages/spawner/src/vat-spawned.js
@@ -6,7 +6,8 @@ import { Far } from '@endo/marshal';
 const endowments = {
   VatData,
   console,
-  assert,
+  // See https://github.com/Agoric/agoric-sdk/issues/9515
+  assert: globalThis.assert,
   Base64: globalThis.Base64, // Present only on XSnap
   URL: globalThis.URL, // Absent only on XSnap
 };

diff --git a/packages/swingset-xsnap-supervisor/lib/supervisor-subprocess-xsnap.js b/packages/swingset-xsnap-supervisor/lib/supervisor-subprocess-xsnap.js
@@ -255,7 +255,8 @@ function makeWorker(port) {
 
     const workerEndowments = {
       console: makeVatConsole(makeLogMaker('vat')),
-      assert,
+      // See https://github.com/Agoric/agoric-sdk/issues/9515
+      assert: globalThis.assert,
       // bootstrap provides HandledPromise
       HandledPromise: globalThis.HandledPromise,
       TextEncoder,

diff --git a/packages/vats/src/core/chain-behaviors.js b/packages/vats/src/core/chain-behaviors.js
@@ -39,7 +39,8 @@ export const bridgeCoreEval = async allPowers => {
   const endowments = {
     VatData: globalThis.VatData,
     console,
-    assert,
+    // See https://github.com/Agoric/agoric-sdk/issues/9515
+    assert: globalThis.assert,
     Base64: globalThis.Base64, // Present only on XSnap
     URL: globalThis.URL, // Absent only on XSnap
   };

diff --git a/packages/vats/src/core/core-eval-env.d.ts b/packages/vats/src/core/core-eval-env.d.ts
@@ -29,6 +29,8 @@ declare global {
 
   // endowments
   var VatData: VatData;
+  // This is correctly the `Assert` type from `'ses'`, not from @endo/errors
+  // See https://github.com/Agoric/agoric-sdk/issues/9515
   var assert: Assert;
 
   // console is a VirtualConsole but this directive fails to override the extant global `console`

diff --git a/packages/vats/src/repl.js b/packages/vats/src/repl.js
@@ -1,3 +1,5 @@
+/* global globalThis */
+
 import { isPromise } from '@endo/promise-kit';
 import { Far } from '@endo/far';
 import { V as E } from '@agoric/vow/vat.js';
@@ -194,7 +196,8 @@ export function getReplHandler(replObjects, send) {
     ...farExports,
     ...vowExports,
     E,
-    assert,
+    // See https://github.com/Agoric/agoric-sdk/issues/9515
+    assert: globalThis.assert,
     console: replConsole,
     commands,
     history,

diff --git a/packages/xsnap/src/avaAssertXS.js b/packages/xsnap/src/avaAssertXS.js
@@ -228,6 +228,8 @@ function makeTester(htest, out) {
     fail(message) {
       assert(false, message);
     },
+    // Not the SES or @endo/errors `assert`
+    // See https://github.com/Agoric/agoric-sdk/issues/9515
     assert,
     truthy,
     /**

diff --git a/packages/xsnap/test/boot-lockdown.test.js b/packages/xsnap/test/boot-lockdown.test.js
@@ -1,3 +1,5 @@
+/* global globalThis */
+
 import test from 'ava';
 
 import * as proc from 'child_process';
@@ -173,7 +175,9 @@ test('console - objects should include detail', async t => {
       Error('oops!'),
     ];
 
-    const { Fail } = assert;
+    // Using `globalThis.assert` because of delayed SES lockdown
+    // See https://github.com/Agoric/agoric-sdk/issues/9515
+    const { Fail } = globalThis.assert;
 
     try {
       Fail`assertion text ${richStructure}`;

diff --git a/packages/zoe/src/contractFacet/evalContractCode.js b/packages/zoe/src/contractFacet/evalContractCode.js
@@ -4,7 +4,6 @@
 /* global globalThis */
 
 import { importBundle } from '@endo/import-bundle';
-import { assert } from '@agoric/assert';
 import { handlePWarning } from '../handleWarning.js';
 
 const evalContractBundle = (bundle, additionalEndowments = {}) => {
@@ -16,7 +15,8 @@ const evalContractBundle = (bundle, additionalEndowments = {}) => {
 
   const defaultEndowments = {
     console: louderConsole,
-    assert,
+    // See https://github.com/Agoric/agoric-sdk/issues/9515
+    assert: globalThis.assert,
     VatData: globalThis.VatData,
   };