refactor: dont depend on patch for marshal

package.json

@@ -8,7 +8,6 @@
   "type": "module",
   "packageManager": "yarn@1.22.19",
   "scripts": {
-    "postinstall": "patch-package",
     "format": "yarn prettier --write packages",
     "lint": "yarn workspaces run lint",
     "test": "yarn workspaces run test"
@@ -38,8 +37,6 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "lerna": "^7.0.1",
     "npm-run-all": "^4.1.5",
-    "patch-package": "^8.0.0",
-    "postinstall-postinstall": "^2.1.0",
     "prettier": "^2.8.8",
     "rollup": "^2.0.0"
   },

packages/rpc/package.json

@@ -20,7 +20,9 @@
     "vite-tsconfig-paths": "^4.2.0"
   },
   "devDependencies": {
-    "@agoric/smart-wallet": "0.5.3",
+    "ses":"0.18.7",
+    "@endo/eventual-send": "0.17.5",
+    "@endo/marshal": "0.8.8",
     "@typescript-eslint/eslint-plugin": "^5.35.1",
     "@typescript-eslint/parser": "^5.35.1",
     "@vitest/coverage-c8": "^0.25.3",
@@ -30,6 +32,6 @@
     "postinstall-postinstall": "^2.1.0",
     "prettier": "^2.7.1",
     "typescript": "^5.1.3",
-    "vitest": "^0.32.0"
+    "vitest": "0.34.1"
   }
 }

packages/rpc/src/chainStorageWatcher.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-use-before-define */
 /* eslint-disable import/extensions */
 /* eslint-disable import/no-extraneous-dependencies */
-import { makeImportContext } from '@agoric/smart-wallet/src/marshal-contexts';
+import { makeMarshal } from 'marshal';
 import { AgoricChainStoragePathKind } from './types';
 import { batchVstorageQuery, keyToPath, pathToKey } from './batchQuery';
 import type { UpdateHandler } from './types';
@@ -52,7 +52,7 @@ export const makeAgoricChainStorageWatcher = (
   rpcAddr: string,
   chainId: string,
   onError?: (e: Error) => void,
-  marshal = makeImportContext().fromBoard,
+  marshal = makeMarshal(),
   newPathQueryDelayMs = defaults.newPathQueryDelayMs,
   refreshLowerBoundMs = defaults.refreshLowerBoundMs,
   refreshUpperBoundMs = defaults.refreshUpperBoundMs,

packages/rpc/src/marshal.ts

@@ -0,0 +1,40 @@
+/* eslint-disable import/no-extraneous-dependencies */
+import { Far, makeMarshal as endoMakeMarshal } from '@endo/marshal';
+
+const makeTranslationTable = (
+  makeSlot: (val: unknown, size: number) => unknown,
+  makeVal: (slot: unknown, iface: string | undefined) => unknown,
+) => {
+  const valToSlot = new Map();
+  const slotToVal = new Map();
+
+  const convertValToSlot = (val: unknown) => {
+    if (valToSlot.has(val)) return valToSlot.get(val);
+    const slot = makeSlot(val, valToSlot.size);
+    valToSlot.set(val, slot);
+    slotToVal.set(slot, val);
+    return slot;
+  };
+
+  const convertSlotToVal = (slot: unknown, iface: string | undefined) => {
+    if (slotToVal.has(slot)) return slotToVal.get(slot);
+    const val = makeVal(slot, iface);
+    valToSlot.set(val, slot);
+    slotToVal.set(slot, val);
+    return val;
+  };
+
+  return harden({ convertValToSlot, convertSlotToVal });
+};
+
+const synthesizeRemotable = (_slot: unknown, iface: string | undefined) =>
+  Far((iface ?? '').replace(/^Alleged: /, ''), {});
+
+const { convertValToSlot, convertSlotToVal } = makeTranslationTable(slot => {
+  throw new Error(`unknown id: ${slot}`);
+}, synthesizeRemotable);
+
+export const makeMarshal = () =>
+  endoMakeMarshal(convertValToSlot, convertSlotToVal, {
+    serializeBodyFormat: 'smallcaps',
+  });

packages/rpc/test/chainStorageWatcher.test.ts

@@ -4,10 +4,6 @@ import { expect, it, describe, beforeEach, vi, afterEach } from 'vitest';
 import { makeAgoricChainStorageWatcher } from '../src/chainStorageWatcher';
 import { AgoricChainStoragePathKind } from '../src/types';
 
-vi.mock('@agoric/smart-wallet/src/marshal-contexts', () => ({
-  makeImportContext: () => {},
-}));
-
 const fetch = vi.fn();
 global.fetch = fetch;
 global.harden = val => val;
@@ -19,6 +15,8 @@ const unmarshal = (val: unknown) => val;
 
 let watcher: ReturnType<typeof makeAgoricChainStorageWatcher>;
 
+vi.mock('../src/marshal', () => ({ makeMarshal: () => {} }));
+
 describe('makeAgoricChainStorageWatcher', () => {
   beforeEach(() => {
     watcher = makeAgoricChainStorageWatcher(
@@ -27,10 +25,8 @@ describe('makeAgoricChainStorageWatcher', () => {
       undefined,
       {
         fromCapData: unmarshal,
-        // @ts-expect-error mock
         toCapData: marshal,
         unserialize: unmarshal,
-        // @ts-expect-error mock
         serialize: marshal,
       },
     );