Markm make exo not far

contract/package.json

@@ -56,6 +56,7 @@
     "@agoric/vats": "0.15.2-u14.0",
     "@agoric/zoe": "^0.26.3-u14.0",
     "@endo/bundle-source": "^2.8.0",
+    "@endo/exo": "^0.2.2",
     "@endo/far": "^0.2.22",
     "@endo/init": "^0.5.60",
     "@endo/marshal": "^0.8.9",

contract/src/fixHub.js

@@ -1,5 +1,7 @@
 // @ts-check
-import { E, Far } from '@endo/far';
+import { E } from '@endo/far';
+import { M } from '@endo/patterns';
+import { makeExo } from '@endo/exo';
 
 const { Fail } = assert;
 
@@ -11,20 +13,28 @@ const { Fail } = assert;
 export const fixHub = async namesByAddressAdmin => {
   assert(namesByAddressAdmin, 'no namesByAddressAdmin???');
   /** @type {import('@agoric/vats').NameHub} */
-  const hub = Far('Hub work-around', {
-    lookup: async (addr, ...rest) => {
-      await E(namesByAddressAdmin).reserve(addr);
-      const addressAdmin = await E(namesByAddressAdmin).lookupAdmin(addr);
-      assert(addressAdmin, 'no admin???');
-      const addressHub = E(addressAdmin).readonly();
-      if (rest.length === 0) return addressHub;
-      await E(addressAdmin).reserve(rest[0]);
-      return E(addressHub).lookup(...rest);
+  const hub = makeExo(
+    'Hub work-around',
+    M.interface(
+      'Hub work-around',
+      {},
+      { defaultGuards: 'passable', sloppy: true },
+    ),
+    {
+      lookup: async (addr, ...rest) => {
+        await E(namesByAddressAdmin).reserve(addr);
+        const addressAdmin = await E(namesByAddressAdmin).lookupAdmin(addr);
+        assert(addressAdmin, 'no admin???');
+        const addressHub = E(addressAdmin).readonly();
+        if (rest.length === 0) return addressHub;
+        await E(addressAdmin).reserve(rest[0]);
+        return E(addressHub).lookup(...rest);
+      },
+      has: _key => Fail`key space not well defined`,
+      entries: () => Fail`enumeration not supported`,
+      values: () => Fail`enumeration not supported`,
+      keys: () => Fail`enumeration not supported`,
     },
-    has: _key => Fail`key space not well defined`,
-    entries: () => Fail`enumeration not supported`,
-    values: () => Fail`enumeration not supported`,
-    keys: () => Fail`enumeration not supported`,
-  });
+  );
   return hub;
 };

contract/src/platform-goals/board-aux.core.js

@@ -1,5 +1,7 @@
 // @ts-check
-import { E, Far } from '@endo/far';
+import { E } from '@endo/far';
+import { M } from '@endo/patterns';
+import { makeExo } from '@endo/exo';
 
 const { Fail } = assert;
 
@@ -59,9 +61,33 @@ export const makeBoardAuxManager = (zone, marshalData, powers) => {
     );
 
   return harden({
-    brandAuxPublisher: Far('BrandAuxPublisher', { publishBrandInfo }),
-    boardAuxTOFU: Far('BoardAuxTOFU', { publishBrandInfo, init }),
-    boardAuxAdmin: Far('BoardAuxAdmin', { publishBrandInfo, init, update }),
+    brandAuxPublisher: makeExo(
+      'BrandAuxPublisher',
+      M.interface(
+        'BrandAuxPublisher',
+        {},
+        { defaultGuards: 'passable', sloppy: true },
+      ),
+      { publishBrandInfo },
+    ),
+    boardAuxTOFU: makeExo(
+      'BoardAuxTOFU',
+      M.interface(
+        'BoardAuxTOFU',
+        {},
+        { defaultGuards: 'passable', sloppy: true },
+      ),
+      { publishBrandInfo, init },
+    ),
+    boardAuxAdmin: makeExo(
+      'BoardAuxAdmin',
+      M.interface(
+        'BoardAuxAdmin',
+        {},
+        { defaultGuards: 'passable', sloppy: true },
+      ),
+      { publishBrandInfo, init, update },
+    ),
   });
 };
 /** @typedef {ReturnType<typeof makeBoardAuxManager>} BoardAuxManager */

contract/src/postal-service.contract.js

@@ -1,6 +1,7 @@
 // @ts-check
-import { E, Far } from '@endo/far';
+import { E } from '@endo/far';
 import { M, mustMatch } from '@endo/patterns';
+import { makeExo } from '@endo/exo';
 import { withdrawFromSeat } from '@agoric/zoe/src/contractSupport/zoeHelpers.js';
 
 const { keys, values } = Object;
@@ -61,12 +62,16 @@ export const start = zcf => {
     return zcf.makeInvitation(handleSend, 'send');
   };
 
-  const publicFacet = Far('postalSvc', {
-    lookup: (...path) => E(namesByAddress).lookup(...path),
-    getDepositFacet,
-    sendTo,
-    makeSendInvitation,
-  });
+  const publicFacet = makeExo(
+    'postalSvc',
+    M.interface('postalSvc', {}, { defaultGuards: 'passable', sloppy: true }),
+    {
+      lookup: (...path) => E(namesByAddress).lookup(...path),
+      getDepositFacet,
+      sendTo,
+      makeSendInvitation,
+    },
+  );
   return { publicFacet };
 };
 /** @typedef { typeof start } PostalServiceFn */

contract/src/sell-concert-tickets.contract.js

@@ -19,8 +19,8 @@
  */
 // @ts-check
 
-import { Far } from '@endo/far';
 import { M, getCopyBagEntries, makeCopyBag } from '@endo/patterns';
+import { makeExo } from '@endo/exo';
 import { AssetKind } from '@agoric/ertp/src/amountMath.js';
 import { atomicRearrange } from '@agoric/zoe/src/contractSupport/atomicTransfer.js';
 import '@agoric/zoe/exported.js';
@@ -209,9 +209,17 @@ export const start = async zcf => {
     zcf.makeInvitation(tradeHandler, 'buy tickets', undefined, proposalShape);
 
   // Mark the publicFacet Far, i.e. reachable from outside the contract
-  const publicFacet = Far('Tickets Public Facet', {
-    makeTradeInvitation,
-  });
+  const publicFacet = makeExo(
+    'Tickets Public Facet',
+    M.interface(
+      'Tickets Public Facet',
+      {},
+      { defaultGuards: 'passable', sloppy: true },
+    ),
+    {
+      makeTradeInvitation,
+    },
+  );
   return harden({ publicFacet });
 };
 harden(start);

contract/src/swaparoo.contract.js

@@ -2,7 +2,8 @@
 // @ts-check
 
 import { M, matches, mustMatch } from '@endo/patterns';
-import { E, Far } from '@endo/far';
+import { E } from '@endo/far';
+import { makeExo } from '@endo/exo';
 import '@agoric/zoe/exported.js';
 import { atomicRearrange } from '@agoric/zoe/src/contractSupport/atomicTransfer.js';
 import '@agoric/zoe/src/contracts/exported.js';
@@ -198,15 +199,23 @@ export const start = async (zcf, privateArgs, baggage) => {
     return firstInvitation;
   };
 
-  const publicFacet = Far('Public', {
-    makeFirstInvitation,
-    ...publicMixin,
-  });
-  const limitedCreatorFacet = Far('Creator', {
-    makeCollectFeesInvitation() {
-      return makeCollectFeesInvitation(zcf, feeSeat, feeBrand, 'Fee');
+  const publicFacet = makeExo(
+    'Public',
+    M.interface('Public', {}, { defaultGuards: 'passable', sloppy: true }),
+    {
+      makeFirstInvitation,
+      ...publicMixin,
+    },
+  );
+  const limitedCreatorFacet = makeExo(
+    'Creator',
+    M.interface('Creator', {}, { defaultGuards: 'passable', sloppy: true }),
+    {
+      makeCollectFeesInvitation() {
+        return makeCollectFeesInvitation(zcf, feeSeat, feeBrand, 'Fee');
+      },
     },
-  });
+  );
   const { governorFacet } = makeDurableGovernorFacet(
     baggage,
     limitedCreatorFacet,

contract/test/boot-tools.js

@@ -1,5 +1,7 @@
 // @ts-check
-import { E, Far } from '@endo/far';
+import { E } from '@endo/far';
+import { M } from '@endo/patterns';
+import { makeExo } from '@endo/exo';
 import { makeNameHubKit, makePromiseSpace } from '@agoric/vats';
 import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
 import { makeWellKnownSpaces } from '@agoric/vats/src/core/utils.js';
@@ -95,7 +97,17 @@ export const mockBootstrapPowers = async (
   spaces.issuer.produce.BLD.resolve(bldIssuerKit.issuer);
   spaces.issuer.produce.IST.resolve(feeIssuer);
   spaces.issuer.produce.Invitation.resolve(invitationIssuer);
-  produce.priceAuthority.resolve(Far('NullPriceAuthority', {}));
+  produce.priceAuthority.resolve(
+    makeExo(
+      'NullPriceAuthority',
+      M.interface(
+        'NullPriceAuthority',
+        {},
+        { defaultGuards: 'passable', sloppy: true },
+      ),
+      {},
+    ),
+  );
 
   /**
    * @type {BootstrapPowers & import('../src/types').NonNullChainStorage}
@@ -212,20 +224,25 @@ export const makeMockTools = async (t, bundleCache) => {
 
   // XXX marshal context is not fresh. hm.
   const makeQueryTool = () => {
-    return Far('QT', {
-      toCapData: x => boardMarshaller.toCapData(x), // XXX remote???
-      fromCapData: d => boardMarshaller.fromCapData(d),
-      queryData: async path => {
-        const parts = path.split('.');
-        if (parts.shift() !== 'published') throw Error(`not found: ${path}`);
-        if (parts.shift() !== 'agoricNames') throw Error(`not found: ${path}`);
-        if (parts.length !== 1) throw Error(`not found: ${path}`);
-        const hub = E(agoricNames).lookup(parts[0]);
-        const kvs = await E(hub).entries();
-        boardMarshaller.toCapData(kvs); // remember object identities
-        return kvs;
+    return makeExo(
+      'QT',
+      M.interface('QT', {}, { defaultGuards: 'passable', sloppy: true }),
+      {
+        toCapData: x => boardMarshaller.toCapData(x), // XXX remote???
+        fromCapData: d => boardMarshaller.fromCapData(d),
+        queryData: async path => {
+          const parts = path.split('.');
+          if (parts.shift() !== 'published') throw Error(`not found: ${path}`);
+          if (parts.shift() !== 'agoricNames')
+            throw Error(`not found: ${path}`);
+          if (parts.length !== 1) throw Error(`not found: ${path}`);
+          const hub = E(agoricNames).lookup(parts[0]);
+          const kvs = await E(hub).entries();
+          boardMarshaller.toCapData(kvs); // remember object identities
+          return kvs;
+        },
       },
-    });
+    );
   };
 
   return {

contract/test/lib-gov-test/puppet-gov.js

@@ -1,6 +1,8 @@
 // @ts-check
 // borrowed from https://github.com/Agoric/agoric-sdk/blob/master/packages/inter-protocol/test/supports.js
-import { E, Far } from '@endo/far';
+import { E } from '@endo/far';
+import { M } from '@endo/patterns';
+import { makeExo } from '@endo/exo';
 import { createRequire } from 'node:module';
 
 const nodeRequire = createRequire(import.meta.url);
@@ -54,9 +56,18 @@ export const mockElectorate = async (zoe, bundleCache) => {
     await bundleCache.load(assets.invitationMakerContract),
   );
   const arbInstance = await E(zoe).startInstance(installation);
-  const committeeCreatorFacet = Far('Electorate CF', {
-    getPoserInvitation: async () => E(arbInstance.publicFacet).makeInvitation(),
-  });
+  const committeeCreatorFacet = makeExo(
+    'Electorate CF',
+    M.interface(
+      'Electorate CF',
+      {},
+      { defaultGuards: 'passable', sloppy: true },
+    ),
+    {
+      getPoserInvitation: async () =>
+        E(arbInstance.publicFacet).makeInvitation(),
+    },
+  );
   return { creatorFacet: committeeCreatorFacet };
 };
 

contract/test/test-bundle-source.js

@@ -12,7 +12,9 @@ import { E, passStyleOf } from '@endo/far';
 import { makeZoeKitForTest } from '@agoric/zoe/tools/setup-zoe.js';
 
 const myRequire = createRequire(import.meta.url);
-const contractPath = myRequire.resolve(`../src/sell-concert-tickets.contract.js`);
+const contractPath = myRequire.resolve(
+  `../src/sell-concert-tickets.contract.js`,
+);
 
 test('bundleSource() bundles the contract for use with zoe', async t => {
   const bundle = await bundleSource(contractPath);