fix: pass through the entire marshal stack to the vat

packages/SwingSet/src/kernel/liveSlots.js

@@ -590,7 +590,7 @@ export function makeLiveSlots(
     state,
     buildRootObject,
     forVatID,
-    { ...vatPowers, getInterfaceOf, Remotable },
+    { ...vatPowers, getInterfaceOf, Remotable, makeMarshal },
     vatParameters,
   );
   return harden({

packages/SwingSet/src/kernel/vatManager/localVatManager.js

@@ -20,6 +20,7 @@ export function makeLocalVatManagerFactory(tools) {
   const baseVP = {
     Remotable: allVatPowers.Remotable,
     getInterfaceOf: allVatPowers.getInterfaceOf,
+    makeMarshal: allVatPowers.makeMarshal,
     transformTildot: allVatPowers.transformTildot,
   };
   const internalMeteringVP = {

packages/SwingSet/src/kernel/vatManager/nodeWorkerSupervisor.js

@@ -7,7 +7,7 @@ import anylogger from 'anylogger';
 
 import { assert } from '@agoric/assert';
 import { importBundle } from '@agoric/import-bundle';
-import { Remotable, getInterfaceOf } from '@agoric/marshal';
+import { Remotable, getInterfaceOf, makeMarshal } from '@agoric/marshal';
 import { waitUntilQuiescent } from '../../waitUntilQuiescent';
 import { makeLiveSlots } from '../liveSlots';
 
@@ -103,7 +103,7 @@ parentPort.on('message', ([type, ...margs]) => {
       // vatPowers, but only if options tell us they're wanted. Maybe
       // transformTildot should be async and outsourced to the kernel
       // process/thread.
-      const vatPowers = { Remotable, getInterfaceOf };
+      const vatPowers = { Remotable, getInterfaceOf, makeMarshal };
       dispatch = makeLiveSlots(
         syscall,
         state,

packages/SwingSet/src/kernel/vatManager/subprocessSupervisor.js

@@ -8,7 +8,7 @@ import Netstring from 'netstring-stream';
 
 import { assert } from '@agoric/assert';
 import { importBundle } from '@agoric/import-bundle';
-import { Remotable, getInterfaceOf } from '@agoric/marshal';
+import { Remotable, getInterfaceOf, makeMarshal } from '@agoric/marshal';
 import { waitUntilQuiescent } from '../../waitUntilQuiescent';
 import { makeLiveSlots } from '../liveSlots';
 
@@ -118,7 +118,7 @@ fromParent.on('data', data => {
       // vatPowers, but only if options tell us they're wanted. Maybe
       // transformTildot should be async and outsourced to the kernel
       // process/thread.
-      const vatPowers = { Remotable, getInterfaceOf };
+      const vatPowers = { Remotable, getInterfaceOf, makeMarshal };
       dispatch = makeLiveSlots(
         syscall,
         state,

packages/captp/lib/captp.js

@@ -4,7 +4,11 @@
 
 // This logic was mostly lifted from @agoric/swingset-vat liveSlots.js
 // Defects in it are mfig's fault.
-import { Remotable, makeMarshal, QCLASS } from '@agoric/marshal';
+import {
+  Remotable as defaultRemotable,
+  makeMarshal as defaultMakeMarshal,
+  QCLASS,
+} from '@agoric/marshal';
 import { E, HandledPromise } from '@agoric/eventual-send';
 import { isPromise } from '@agoric/promise-kit';
 
@@ -13,6 +17,8 @@ export { E };
 /**
  * @typedef {Object} CapTPOptions the options to makeCapTP
  * @property {(err: any) => void} onReject
+ * @property {typeof defaultRemotable} Remotable
+ * @property {typeof defaultMakeMarshal} makeMarshal
  */
 /**
  * Create a CapTP connection.
@@ -25,6 +31,8 @@ export { E };
 export function makeCapTP(ourId, rawSend, bootstrapObj = undefined, opts = {}) {
   const {
     onReject = err => console.error('CapTP', ourId, 'exception:', err),
+    Remotable = defaultRemotable,
+    makeMarshal = defaultMakeMarshal,
   } = opts;
 
   let unplug = false;

packages/cosmic-swingset/lib/ag-solo/vats/bootstrap.js

@@ -216,7 +216,7 @@ export function buildRootObject(vatPowers, vatParameters) {
     // Needed for DApps, maybe for user clients.
     const uploads = E(vats.uploads).getUploads();
 
-    const plugin = makePluginManager(E, D, devices.plugin);
+    const plugin = makePluginManager(E, devices.plugin, vatPowers);
 
     // This will allow dApp developers to register in their api/deploy.js
     const httpRegCallback = {

packages/cosmic-swingset/lib/ag-solo/vats/plugin.js

@@ -29,12 +29,11 @@ import { makeCapTP } from '@agoric/captp';
 /**
  * Create a handler that manages a promise interface to external modules.
  *
- * @param {import('@agoric/eventual-send').EProxy} E The eventual sender
- * @param {<T>(target: Device<T>) => T} D The device sender
  * @param {Device<PluginDevice>} pluginDevice The bridge to manage
+ * @param {{ D<T>(target: Device<T>): T }} param1
  * @returns {PluginManager} admin facet for this handler
  */
-export function makePluginManager(E, D, pluginDevice) {
+export function makePluginManager(pluginDevice, { D, ...vatPowers }) {
   /**
    * @type {import('@agoric/store').Store<number, (obj: Record<string,any>) => void>}
    */
@@ -44,7 +43,6 @@ export function makePluginManager(E, D, pluginDevice) {
   D(pluginDevice).registerReceiver(
     harden({
       receive(index, obj) {
-        console.info('receive', index, obj);
         modReceivers.get(index)(obj);
       },
     }),
@@ -58,8 +56,11 @@ export function makePluginManager(E, D, pluginDevice) {
         throw Error(index);
       }
       // Create a CapTP channel.
-      const { getBootstrap, dispatch } = makeCapTP(mod, obj =>
-        D(pluginDevice).send(index, obj),
+      const { getBootstrap, dispatch } = makeCapTP(
+        mod,
+        obj => D(pluginDevice).send(index, obj),
+        undefined,
+        vatPowers,
       );
       // Register our dispatcher for this connect index.
       modReceivers.init(index, dispatch);