@agoric/swingset-vat 0.32.3-dev-fb76d70.0 → 0.32.3-dev-eb1d655.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-fb76d70.0+fb76d70",
+  "version": "0.32.3-dev-eb1d655.0+eb1d655",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -27,15 +27,15 @@
     "@types/yargs-parser": "^21.0.0"
   },
   "dependencies": {
-    "@agoric/internal": "0.3.3-dev-fb76d70.0+fb76d70",
-    "@agoric/kmarshal": "0.1.1-dev-fb76d70.0+fb76d70",
-    "@agoric/store": "0.9.3-dev-fb76d70.0+fb76d70",
-    "@agoric/swing-store": "0.9.2-dev-fb76d70.0+fb76d70",
-    "@agoric/swingset-liveslots": "0.10.3-dev-fb76d70.0+fb76d70",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-fb76d70.0+fb76d70",
-    "@agoric/time": "0.3.3-dev-fb76d70.0+fb76d70",
-    "@agoric/vat-data": "0.5.3-dev-fb76d70.0+fb76d70",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-fb76d70.0+fb76d70",
+    "@agoric/internal": "0.3.3-dev-eb1d655.0+eb1d655",
+    "@agoric/kmarshal": "0.1.1-dev-eb1d655.0+eb1d655",
+    "@agoric/store": "0.9.3-dev-eb1d655.0+eb1d655",
+    "@agoric/swing-store": "0.9.2-dev-eb1d655.0+eb1d655",
+    "@agoric/swingset-liveslots": "0.10.3-dev-eb1d655.0+eb1d655",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-eb1d655.0+eb1d655",
+    "@agoric/time": "0.3.3-dev-eb1d655.0+eb1d655",
+    "@agoric/vat-data": "0.5.3-dev-eb1d655.0+eb1d655",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-eb1d655.0+eb1d655",
     "@endo/base64": "^1.0.8",
     "@endo/bundle-source": "^3.4.2",
     "@endo/captp": "^4.4.2",
@@ -103,5 +103,5 @@
   "typeCoverage": {
     "atLeast": 76.24
   },
-  "gitHead": "fb76d7061a2ba71db7c7bb746ea8f34dbe5dbed0"
+  "gitHead": "eb1d655e6b33c0044138e95867ae8ad527115de3"
 }

package/src/controller/controller.js

@@ -15,6 +15,7 @@ import { initSwingStore } from '@agoric/swing-store';
 
 import { mustMatch, M } from '@endo/patterns';
 import { checkBundle } from '@endo/check-bundle/lite.js';
+import { deepCopyJsonable } from '@agoric/internal/src/js-utils.js';
 import engineGC from '@agoric/internal/src/lib-nodejs/engine-gc.js';
 import { startSubprocessWorker } from '@agoric/internal/src/lib-nodejs/spawnSubprocessWorker.js';
 import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
@@ -263,13 +264,6 @@ export async function makeSwingsetController(
 
   await kernel.start();
 
-  /**
-   * @param {T} x
-   * @returns {T}
-   * @template T
-   */
-  const defensiveCopy = x => JSON.parse(JSON.stringify(x));
-
   /**
    * Validate and install a code bundle.
    *
@@ -304,7 +298,7 @@ export async function makeSwingsetController(
     writeSlogObject,
 
     dump() {
-      return defensiveCopy(kernel.dump());
+      return deepCopyJsonable(kernel.dump());
     },
 
     verboseDebugMode(flag) {
@@ -340,11 +334,11 @@ export async function makeSwingsetController(
     },
 
     getStats() {
-      return defensiveCopy(kernel.getStats());
+      return deepCopyJsonable(kernel.getStats());
     },
 
     getStatus() {
-      return defensiveCopy(kernel.getStatus());
+      return deepCopyJsonable(kernel.getStatus());
     },
 
     getActivityhash() {

package/src/controller/initializeSwingset.js

@@ -3,7 +3,7 @@ import fs from 'fs';
 import path from 'path';
 
 import { assert, b, Fail } from '@endo/errors';
-import { makeTracer } from '@agoric/internal';
+import { deepCopyJsonable, makeTracer } from '@agoric/internal';
 import { mustMatch } from '@agoric/store';
 import bundleSource from '@endo/bundle-source';
 import { resolve as resolveModuleSpecifier } from 'import-meta-resolve';
@@ -323,7 +323,7 @@ export async function initializeSwingset(
   } = runtimeOptions;
 
   // copy config so we can safely mess with it even if it's shared or hardened
-  config = JSON.parse(JSON.stringify(config));
+  config = deepCopyJsonable(config);
   if (!config.bundles) {
     config.bundles = {};
   }

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

@@ -1,5 +1,6 @@
 import { Fail } from '@endo/errors';
 import { Far } from '@endo/far';
+import { deepCopyJsonable } from '@agoric/internal/src/js-utils.js';
 
 function sanitize(data) {
   if (data === undefined) {
@@ -8,7 +9,7 @@ function sanitize(data) {
   if (data instanceof Error) {
     data = data.stack;
   }
-  return JSON.parse(JSON.stringify(data));
+  return deepCopyJsonable(data);
 }
 
 /**
@@ -32,7 +33,7 @@ export function buildRootDeviceNode(tools) {
 
   function inboundCallback(...args) {
     inboundHandler || Fail`inboundHandler not yet registered`;
-    const safeArgs = JSON.parse(JSON.stringify(args));
+    const safeArgs = deepCopyJsonable(args);
     try {
       SO(inboundHandler).inbound(...harden(safeArgs));
     } catch (e) {