@agoric/wallet-backend 0.13.5 → 0.13.6-dev-d32a66a.0

package/test/test-getPursesNotifier.js

@@ -2,30 +2,29 @@
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
 import { makeIssuerKit } from '@agoric/ertp';
-import { makeZoeKit } from '@agoric/zoe';
-import fakeVatAdmin from '@agoric/zoe/tools/fakeVatAdmin.js';
+import { makeZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { makeBoard } from '@agoric/vats/src/lib-board.js';
+import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { makeNameHubKit } from '@agoric/vats/src/nameHub.js';
-import { Far } from '@endo/marshal';
+import { heapZone } from '@agoric/zone';
+import {
+  makeNameHubKit,
+  prepareMixinMyAddress,
+} from '@agoric/vats/src/nameHub.js';
 import { makeWalletRoot } from '../src/lib-wallet.js';
 
 import '../src/types.js';
 
+const mixinMyAddress = prepareMixinMyAddress(heapZone);
+
 function makeFakeMyAddressNameAdmin() {
-  const { nameAdmin: rawMyAddressNameAdmin } = makeNameHubKit();
-  return Far('fakeMyAddressNameAdmin', {
-    ...rawMyAddressNameAdmin,
-    getMyAddress() {
-      return 'agoric1test1';
-    },
-  });
+  const { nameAdmin } = makeNameHubKit();
+  return mixinMyAddress(nameAdmin, 'agoric1test1');
 }
 
 const setup = async () => {
-  const { zoeService: zoe } = makeZoeKit(fakeVatAdmin);
-  const board = makeBoard();
+  const zoe = makeZoeForTest();
+  const board = makeFakeBoard();
 
   const pursesStateChangeHandler = _data => {};
   const inboxStateChangeHandler = _data => {};
@@ -66,7 +65,7 @@ test('getPursesNotifier', async t => {
     value: 0n,
   });
   t.deepEqual(moolaPurseInfo.currentAmountSlots, {
-    body: '{"brand":{"@qclass":"slot","iface":"Alleged: moola brand","index":0},"value":{"@qclass":"bigint","digits":"0"}}',
+    body: '#{"brand":"$0.Alleged: moola brand","value":"+0"}',
     slots: [
       {
         kind: 'brand',
@@ -100,7 +99,7 @@ test('getAttenuatedPursesNotifier', async t => {
     value: 0n,
   });
   t.deepEqual(moolaPurseInfo.currentAmountSlots, {
-    body: '{"brand":{"@qclass":"slot","iface":"Alleged: moola brand","index":0},"value":{"@qclass":"bigint","digits":"0"}}',
+    body: '#{"brand":"$0.Alleged: moola brand","value":"+0"}',
     slots: [
       {
         kind: 'brand',

package/test/test-lib-dehydrate.js

@@ -111,7 +111,7 @@ test('makeDehydrator', async t => {
   t.deepEqual(
     dehydrate(harden({ handle: handle1 })),
     {
-      body: '{"handle":{"@qclass":"slot","iface":"Alleged: handle1","index":0}}',
+      body: '#{"handle":"$0.Alleged: handle1"}',
       slots: [{ kind: 'instanceHandle', petname: 'simpleExchange' }],
     },
     `serialize val with petname`,
@@ -119,7 +119,7 @@ test('makeDehydrator', async t => {
   t.deepEqual(
     hydrate(
       harden({
-        body: '{"handle":{"@qclass":"slot","index":0}}',
+        body: '#{"handle":"$0"}',
         slots: [
           {
             kind: 'instanceHandle',
@@ -134,7 +134,7 @@ test('makeDehydrator', async t => {
   t.deepEqual(
     dehydrate(harden({ brand: brand1, value: 40 })),
     harden({
-      body: '{"brand":{"@qclass":"slot","iface":"Alleged: mock brand","index":0},"value":40}',
+      body: '#{"brand":"$0.Alleged: mock brand","value":40}',
       slots: [{ kind: 'brand', petname: 'moola' }],
     }),
     `serialize brand with petname`,
@@ -142,7 +142,7 @@ test('makeDehydrator', async t => {
   t.deepEqual(
     hydrate(
       harden({
-        body: '{"brand":{"@qclass":"slot","index":0},"value":40}',
+        body: '#{"brand":"$0","value":40}',
         slots: [{ kind: 'brand', petname: 'moola' }],
       }),
     ),
@@ -167,7 +167,7 @@ test('makeDehydrator', async t => {
   t.deepEqual(
     dehydrate(proposal),
     {
-      body: '{"exit":{"afterDeadline":{"deadline":55,"timer":{"@qclass":"slot","iface":"Alleged: timer","index":0}}},"give":{"Price":{"brand":{"@qclass":"slot","iface":"Alleged: mock brand","index":1},"value":3}},"want":{"Asset1":{"brand":{"@qclass":"slot","iface":"Alleged: mock brand","index":2},"value":60},"Asset2":{"brand":{"@qclass":"slot","iface":"Alleged: mock brand","index":3},"value":{"instanceHandle":{"@qclass":"slot","iface":"Alleged: handle3","index":4}}}}}',
+      body: '#{"exit":{"afterDeadline":{"deadline":55,"timer":"$0.Alleged: timer"}},"give":{"Price":{"brand":"$1.Alleged: mock brand","value":3}},"want":{"Asset1":{"brand":"$2.Alleged: mock brand","value":60},"Asset2":{"brand":"$3.Alleged: mock brand","value":{"instanceHandle":"$4.Alleged: handle3"}}}}',
       slots: [
         { kind: 'unnamed', petname: 'unnamed-1' },
         { kind: 'brand', petname: 'simolean' },
@@ -181,7 +181,7 @@ test('makeDehydrator', async t => {
   t.deepEqual(
     hydrate(
       harden({
-        body: '{"want":{"Asset1":{"brand":{"@qclass":"slot","index":0},"value":60},"Asset2":{"brand":{"@qclass":"slot","index":1},"value":{"instanceHandle":{"@qclass":"slot","index":2}}}},"give":{"Price":{"brand":{"@qclass":"slot","index":3},"value":3}},"exit":{"afterDeadline":{"timer":{"@qclass":"slot","index":4},"deadline":55}}}',
+        body: '#{"want":{"Asset1":{"brand":"$0","value":60},"Asset2":{"brand":"$1","value":{"instanceHandle":"$2"}}},"give":{"Price":{"brand":"$3","value":3}},"exit":{"afterDeadline":{"timer":"$4","deadline":55}}}',
         slots: [
           { kind: 'brand', petname: 'moola' },
           { kind: 'brand', petname: 'zoeInvite' },
@@ -198,7 +198,7 @@ test('makeDehydrator', async t => {
   t.deepEqual(
     dehydrate(harden({ handle: handle4 })),
     {
-      body: '{"handle":{"@qclass":"slot","iface":"Alleged: handle4","index":0}}',
+      body: '#{"handle":"$0.Alleged: handle4"}',
       slots: [{ kind: 'unnamed', petname: 'unnamed-2' }],
     },
     `serialize val with no petname`,
@@ -206,7 +206,7 @@ test('makeDehydrator', async t => {
   t.deepEqual(
     hydrate(
       harden({
-        body: '{"handle":{"@qclass":"slot","index":0}}',
+        body: '#{"handle":"$0"}',
         slots: [{ kind: 'unnamed', petname: 'unnamed-2' }],
       }),
     ),
@@ -218,7 +218,7 @@ test('makeDehydrator', async t => {
   t.deepEqual(
     dehydrate(harden({ handle: handle4 })),
     {
-      body: '{"handle":{"@qclass":"slot","iface":"Alleged: handle4","index":0}}',
+      body: '#{"handle":"$0.Alleged: handle4"}',
       slots: [{ kind: 'instanceHandle', petname: 'autoswap' }],
     },
     `serialize val with new petname`,
@@ -226,7 +226,7 @@ test('makeDehydrator', async t => {
   t.deepEqual(
     hydrate(
       harden({
-        body: '{"handle":{"@qclass":"slot","index":0}}',
+        body: '#{"handle":"$0"}',
         slots: [{ kind: 'instanceHandle', petname: 'autoswap' }],
       }),
     ),

package/test/test-lib-wallet.js

@@ -8,31 +8,31 @@ import { makeIssuerKit, AmountMath, AssetKind } from '@agoric/ertp';
 
 import { M } from '@agoric/store';
 
-import { makeZoeKit } from '@agoric/zoe';
-import fakeVatAdmin from '@agoric/zoe/tools/fakeVatAdmin.js';
+import { makeZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
 import { E } from '@endo/eventual-send';
 
 import { assert } from '@agoric/assert';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { makeBoard } from '@agoric/vats/src/lib-board.js';
+import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { makeNameHubKit } from '@agoric/vats/src/nameHub.js';
-import { Far } from '@endo/marshal';
+import {
+  makeNameHubKit,
+  prepareMixinMyAddress,
+} from '@agoric/vats/src/nameHub.js';
 import { resolve as importMetaResolve } from 'import-meta-resolve';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { heapZone } from '@agoric/zone';
 import { makeWalletRoot } from '../src/lib-wallet.js';
 
 import '../src/types.js';
 
 const ZOE_INVITE_PURSE_PETNAME = 'Default Zoe invite purse';
 
+const mixinMyAddress = prepareMixinMyAddress(heapZone);
+
 function makeFakeMyAddressNameAdmin() {
-  const { nameAdmin: rawMyAddressNameAdmin } = makeNameHubKit();
-  return Far('fakeMyAddressNameAdmin', {
-    ...rawMyAddressNameAdmin,
-    getMyAddress() {
-      return 'agoric1test1';
-    },
-  });
+  const { nameAdmin } = makeNameHubKit();
+  return mixinMyAddress(nameAdmin, 'agoric1test1');
 }
 
 /** @type {import('ava').TestFn<Awaited<LibWalletTestContext>>} */
@@ -43,13 +43,12 @@ const test = anyTest;
  *   zoe: ZoeService,
  *   automaticRefundInstallation: Installation,
  *   autoswapInstallation: Installation,
- *   attestationInstallation: Installation,
  * }} LibWalletTestContext
  */
 
 async function setupTest(
   /** @type {import('ava').ExecutionContext<LibWalletTestContext>} */ t,
-  { autoswap = false, automaticRefund = false, attestation = false } = {},
+  { autoswap = false, automaticRefund = false } = {},
 ) {
   const pursesStateChangeLog = [];
   const inboxStateChangeLog = [];
@@ -63,7 +62,7 @@ async function setupTest(
   const moolaBundle = makeIssuerKit('moola');
   const simoleanBundle = makeIssuerKit('simolean');
   const rpgBundle = makeIssuerKit('rpg', AssetKind.SET);
-  const board = makeBoard();
+  const board = makeFakeBoard();
 
   const automaticRefundP = (automaticRefund &&
     (async () => {
@@ -97,71 +96,24 @@ async function setupTest(
     instance: null,
   };
 
-  const attestationP = (attestation &&
-    (async () => {
-      const { publicFacet, instance } = await E(t.context.zoe).startInstance(
-        t.context.attestationInstallation,
-      );
-      const {
-        issuers: { Attestation: issuer },
-        brands: { Attestation: brand },
-      } = await E(t.context.zoe).getTerms(instance);
-
-      const names = {
-        lookup: (/** @type {string[]} */ ...namePath) => {
-          if (namePath[0] === 'issuer' && namePath[1] === 'Attestation') {
-            return issuer;
-          }
-          return null;
-        },
-      };
-      return { names, issuer, brand, publicFacet };
-    })()) || {
-    names: null,
-    issuer: null,
-    brand: null,
-    publicFacet: null,
-  };
-
   const [
     {
       creatorInvitation: automaticRefundInvitation,
       instance: automaticRefundInstance,
     },
     { invite: addLiquidityInvite, instance: autoswapInstanceHandle },
-    {
-      names: fakeAgoricNames,
-      issuer: attestationIssuer,
-      brand: attestationBrand,
-      publicFacet: attestationPublicFacet,
-    },
-  ] = await Promise.all([automaticRefundP, autoswapP, attestationP]);
+  ] = await Promise.all([automaticRefundP, autoswapP]);
 
   const { admin: wallet, initialized } = makeWalletRoot({
     zoe: t.context.zoe,
     board,
     myAddressNameAdmin: makeFakeMyAddressNameAdmin(),
-    // @ts-expect-error
-    agoricNames: fakeAgoricNames,
     pursesStateChangeHandler,
     inboxStateChangeHandler,
   });
   await initialized;
 
-  if (attestation) {
-    assert(attestationBrand);
-    wallet.resolveAttMaker({
-      makeReturnAttInvitation: attestationPublicFacet.makeReturnAttInvitation,
-      makeAttestation: (/** @type {any} */ value) =>
-        attestationPublicFacet.mintAttestation(value),
-      wrapLienedAmount: ({ value }) => AmountMath.make(attestationBrand, value),
-    });
-  }
-
   return {
-    attestationIssuer,
-    attestationPublicFacet,
-    attestationBrand,
     moolaBundle,
     simoleanBundle,
     rpgBundle,
@@ -179,7 +131,7 @@ async function setupTest(
 /**
  * Run a thunk and wait for the notifier to fire.
  *
- * @param {ERef<Notifier<any>>} notifier
+ * @param {ERef<LatestTopic<any>>} notifier
  * @param {() => Promise<any>} thunk
  */
 const waitForUpdate = async (notifier, thunk) => {
@@ -189,7 +141,7 @@ const waitForUpdate = async (notifier, thunk) => {
 };
 
 test.before(async t => {
-  const zoe = makeZoeKit(fakeVatAdmin).zoeService;
+  const zoe = makeZoeForTest();
 
   // Create AutomaticRefund instance
   const automaticRefundContractUrl = await importMetaResolve(
@@ -212,20 +164,10 @@ test.before(async t => {
   const autoswapBundle = await bundleSource(autoswapContractRoot);
   const autoswapInstallation = await E(zoe).install(autoswapBundle);
 
-  // Create attestationExample instance
-  const url = await importMetaResolve(
-    './attestationExample.js',
-    import.meta.url,
-  );
-  const path = new URL(url).pathname;
-  const attestationBundle = await bundleSource(path);
-  const attestationInstallation = await E(zoe).install(attestationBundle);
-
   t.context = {
     zoe,
     automaticRefundInstallation,
     autoswapInstallation,
-    attestationInstallation,
   };
 });
 
@@ -320,7 +262,7 @@ test('lib-wallet issuer and purse methods', async t => {
         pursePetname: 'Default Zoe invite purse',
         value: [],
         currentAmountSlots: {
-          body: '{"brand":{"@qclass":"slot","iface":"Alleged: Zoe Invitation brand","index":0},"value":[]}',
+          body: '#{"brand":"$0.Alleged: Zoe Invitation brand","value":[]}',
           slots: [{ kind: 'brand', petname: 'zoe invite' }],
         },
         currentAmount: {
@@ -342,7 +284,7 @@ test('lib-wallet issuer and purse methods', async t => {
         pursePetname: 'fun money',
         value: 100,
         currentAmountSlots: {
-          body: '{"brand":{"@qclass":"slot","iface":"Alleged: moola brand","index":0},"value":{"@qclass":"bigint","digits":"100"}}',
+          body: '#{"brand":"$0.Alleged: moola brand","value":"+100"}',
           slots: [{ kind: 'brand', petname: 'moola' }],
         },
         currentAmount: {
@@ -428,7 +370,7 @@ test('lib-wallet dapp suggests issuer, instance, installation petnames', async t
   assert(Array.isArray(invitationAmountValue2));
   const [{ handle: inviteHandle2 }] = invitationAmountValue2;
 
-  await waitForUpdate(E(zoeInvitePurse).getCurrentAmountNotifier(), () =>
+  await waitForUpdate(wallet.getPursesNotifier(), () =>
     wallet.deposit('Default Zoe invite purse', invite2),
   );
 
@@ -472,12 +414,12 @@ test('lib-wallet dapp suggests issuer, instance, installation petnames', async t
         },
       ],
       currentAmountSlots: {
-        body: '{"brand":{"@qclass":"slot","iface":"Alleged: Zoe Invitation brand","index":0},"value":[{"description":"getRefund","handle":{"@qclass":"slot","iface":"Alleged: InvitationHandle","index":1},"installation":{"@qclass":"slot","iface":"Alleged: BundleInstallation","index":2},"instance":{"@qclass":"slot","iface":"Alleged: InstanceHandle","index":3}}]}',
+        body: '#{"brand":"$0.Alleged: Zoe Invitation brand","value":[{"description":"getRefund","handle":"$1.Alleged: InvitationHandle","installation":"$2.Alleged: BundleInstallation","instance":"$3.Alleged: InstanceHandle"}]}',
         slots: [
           { kind: 'brand', petname: 'zoe invite' },
           { kind: 'unnamed', petname: 'unnamed-4' },
           { kind: 'unnamed', petname: 'unnamed-2' },
-          { kind: 'unnamed', petname: 'unnamed-3' },
+          { kind: 'unnamed', petname: 'unnamed-1' },
         ],
       },
       currentAmount: {
@@ -487,7 +429,7 @@ test('lib-wallet dapp suggests issuer, instance, installation petnames', async t
             description: 'getRefund',
             handle: { kind: 'unnamed', petname: 'unnamed-4' },
             installation: { kind: 'unnamed', petname: 'unnamed-2' },
-            instance: { kind: 'unnamed', petname: 'unnamed-3' },
+            instance: { kind: 'unnamed', petname: 'unnamed-1' },
           },
         ],
       },
@@ -559,7 +501,7 @@ test('lib-wallet dapp suggests issuer, instance, installation petnames', async t
         },
       ],
       currentAmountSlots: {
-        body: '{"brand":{"@qclass":"slot","iface":"Alleged: Zoe Invitation brand","index":0},"value":[{"description":"getRefund","handle":{"@qclass":"slot","iface":"Alleged: InvitationHandle","index":1},"installation":{"@qclass":"slot","iface":"Alleged: BundleInstallation","index":2},"instance":{"@qclass":"slot","iface":"Alleged: InstanceHandle","index":3}}]}',
+        body: '#{"brand":"$0.Alleged: Zoe Invitation brand","value":[{"description":"getRefund","handle":"$1.Alleged: InvitationHandle","installation":"$2.Alleged: BundleInstallation","instance":"$3.Alleged: InstanceHandle"}]}',
         slots: [
           { kind: 'brand', petname: 'zoe invite' },
           { kind: 'unnamed', petname: 'unnamed-4' },
@@ -597,7 +539,7 @@ test('lib-wallet dapp suggests issuer, instance, installation petnames', async t
         description: 'getRefund',
         handle: {
           kind: 'unnamed',
-          petname: 'unnamed-1',
+          petname: 'unnamed-3',
         },
         installation: {
           kind: 'installation',
@@ -698,7 +640,7 @@ test('lib-wallet dapp suggests issuer, instance, installation petnames', async t
         },
       ],
       currentAmountSlots: {
-        body: '{"brand":{"@qclass":"slot","iface":"Alleged: Zoe Invitation brand","index":0},"value":[{"description":"getRefund","handle":{"@qclass":"slot","iface":"Alleged: InvitationHandle","index":1},"installation":{"@qclass":"slot","iface":"Alleged: BundleInstallation","index":2},"instance":{"@qclass":"slot","iface":"Alleged: InstanceHandle","index":3}}]}',
+        body: '#{"brand":"$0.Alleged: Zoe Invitation brand","value":[{"description":"getRefund","handle":"$1.Alleged: InvitationHandle","installation":"$2.Alleged: BundleInstallation","instance":"$3.Alleged: InstanceHandle"}]}',
         slots: [
           { kind: 'brand', petname: 'zoe invite' },
           { kind: 'unnamed', petname: 'unnamed-4' },
@@ -735,7 +677,7 @@ test('lib-wallet dapp suggests issuer, instance, installation petnames', async t
         description: 'getRefund',
         handle: {
           kind: 'unnamed',
-          petname: 'unnamed-1',
+          petname: 'unnamed-3',
         },
         installation: {
           kind: 'installation',
@@ -905,7 +847,7 @@ test('lib-wallet offer methods', async t => {
       pursePetname: 'Default Zoe invite purse',
       value: [],
       currentAmountSlots: {
-        body: '{"brand":{"@qclass":"slot","iface":"Alleged: Zoe Invitation brand","index":0},"value":[]}',
+        body: '#{"brand":"$0.Alleged: Zoe Invitation brand","value":[]}',
         slots: [{ kind: 'brand', petname: 'zoe invite' }],
       },
       currentAmount: {
@@ -928,7 +870,7 @@ test('lib-wallet offer methods', async t => {
       depositBoardId: 'board0371',
       value: 100,
       currentAmountSlots: {
-        body: '{"brand":{"@qclass":"slot","iface":"Alleged: moola brand","index":0},"value":{"@qclass":"bigint","digits":"100"}}',
+        body: '#{"brand":"$0.Alleged: moola brand","value":"+100"}',
         slots: [{ kind: 'brand', petname: 'moola' }],
       },
       meta: {
@@ -970,7 +912,7 @@ test('lib-wallet offer methods', async t => {
           },
           instance: {
             kind: 'unnamed',
-            petname: 'unnamed-3',
+            petname: 'unnamed-1',
           },
         },
         inviteHandleBoardId: 'board0257',
@@ -984,7 +926,7 @@ test('lib-wallet offer methods', async t => {
         },
         requestContext: { dappOrigin: 'unknown' },
         status: 'decline',
-        instancePetname: 'unnamed-3',
+        instancePetname: 'unnamed-1',
         installationPetname: 'unnamed-2',
         proposalForDisplay: {
           give: {
@@ -1039,7 +981,7 @@ test('lib-wallet addOffer for autoswap swap', async t => {
     ),
   );
 
-  /** @type {{ getLiquidityIssuer: () => Issuer, makeSwapInvitation: () => Invitation }} */
+  /** @type {{ getLiquidityIssuer: () => Issuer<'nat'>, makeSwapInvitation: () => Invitation }} */
   const publicAPI = await E(t.context.zoe).getPublicFacet(
     autoswapInstanceHandle,
   );
@@ -1190,7 +1132,7 @@ test('lib-wallet performAction acceptOffer', async t => {
     ),
   );
 
-  /** @type {{ getLiquidityIssuer: () => Issuer, makeSwapInvitation: () => Invitation }} */
+  /** @type {{ getLiquidityIssuer: () => Issuer<'nat'>, makeSwapInvitation: () => Invitation }} */
   const publicAPI = await E(t.context.zoe).getPublicFacet(
     autoswapInstanceHandle,
   );
@@ -1303,157 +1245,6 @@ test('lib-wallet performAction acceptOffer', async t => {
   );
 });
 
-test('lib-wallet can give attestations in offers', async t => {
-  const {
-    wallet,
-    attestationPublicFacet,
-    attestationBrand,
-    attestationIssuer,
-  } = await setupTest(t, { attestation: true });
-
-  assert(attestationIssuer);
-  assert(attestationBrand);
-  const issuerManager = wallet.getIssuerManager();
-  await issuerManager.add('Attestation', attestationIssuer);
-  await wallet.makeEmptyPurse('Attestation', 'staking purse');
-
-  const invitation = await attestationPublicFacet.makeReturnAttInvitation();
-
-  const rawId = '123-arbitrary';
-  const id = `unknown#${rawId}`;
-  const offer = {
-    id: rawId,
-    invitation,
-    proposalTemplate: {
-      give: {
-        Attestation: {
-          pursePetname: 'staking purse',
-          value: 30n,
-          type: 'Attestation',
-        },
-      },
-      exit: {
-        onDemand: null,
-      },
-    },
-  };
-
-  await wallet.addOffer(offer);
-  const accepted = await wallet.acceptOffer(id);
-  assert(accepted);
-  const { depositedP } = accepted;
-  await depositedP;
-
-  // There should be two calls. The first is call to give the attestation
-  // as proposed. The second call is to return the unallocated attestation
-  // back to the attMaker (which in this test uses the same method).
-  const callHistory = await attestationPublicFacet.getCallHistory();
-  t.deepEqual(callHistory.returnProposals, [
-    {
-      exit: {
-        onDemand: null,
-      },
-      give: {
-        Attestation: AmountMath.make(attestationBrand, 30n),
-      },
-      want: {},
-    },
-    {
-      exit: {
-        onDemand: null,
-      },
-      give: {
-        Attestation: AmountMath.make(attestationBrand, 30n),
-      },
-      want: {},
-    },
-  ]);
-  t.deepEqual(callHistory.returnAllocations, [
-    {
-      Attestation: AmountMath.make(attestationBrand, 30n),
-    },
-    {
-      Attestation: AmountMath.make(attestationBrand, 30n),
-    },
-  ]);
-});
-
-test('lib-wallet can want attestations in offers', async t => {
-  const {
-    wallet,
-    attestationPublicFacet,
-    attestationBrand,
-    attestationIssuer,
-  } = await setupTest(t, { attestation: true });
-
-  assert(attestationIssuer);
-  assert(attestationBrand);
-  const issuerManager = wallet.getIssuerManager();
-  await issuerManager.add('Attestation', attestationIssuer);
-  await wallet.makeEmptyPurse('Attestation', 'staking purse');
-
-  const invitation = await attestationPublicFacet.makeWantAttInvitation();
-
-  const rawId = '123-arbitrary';
-  const id = `unknown#${rawId}`;
-  const offer = {
-    id: rawId,
-    invitation,
-    proposalTemplate: {
-      want: {
-        Attestation: {
-          pursePetname: 'staking purse',
-          value: 65n,
-          type: 'Attestation',
-        },
-      },
-      exit: {
-        onDemand: null,
-      },
-    },
-  };
-
-  await wallet.addOffer(offer);
-  const accepted = await wallet.acceptOffer(id);
-  assert(accepted);
-  const { depositedP } = accepted;
-  await depositedP;
-
-  const callHistory = await attestationPublicFacet.getCallHistory();
-  t.deepEqual(callHistory.wantProposals, [
-    {
-      exit: {
-        onDemand: null,
-      },
-      want: {
-        Attestation: AmountMath.make(attestationBrand, 65n),
-      },
-      give: {},
-    },
-  ]);
-  t.deepEqual(callHistory.wantAllocations, [
-    { Attestation: AmountMath.make(attestationBrand, 0n) },
-  ]);
-  // When an attestation payout is recieved, the wallet should return it to the
-  // attMaker:
-  t.deepEqual(callHistory.returnProposals, [
-    {
-      exit: {
-        onDemand: null,
-      },
-      give: {
-        Attestation: AmountMath.make(attestationBrand, 65n),
-      },
-      want: {},
-    },
-  ]);
-  t.deepEqual(callHistory.returnAllocations, [
-    {
-      Attestation: AmountMath.make(attestationBrand, 65n),
-    },
-  ]);
-});
-
 test('addOffer invitationQuery', async t => {
   const {
     moolaBundle,
@@ -1480,7 +1271,7 @@ test('addOffer invitationQuery', async t => {
     ),
   );
 
-  /** @type {{ getLiquidityIssuer: () => Issuer, makeSwapInvitation: () => Invitation }} */
+  /** @type {{ getLiquidityIssuer: () => Issuer<'nat'>, makeSwapInvitation: () => Invitation }} */
   const publicAPI = await E(t.context.zoe).getPublicFacet(
     autoswapInstanceHandle,
   );
@@ -1608,7 +1399,7 @@ test('addOffer offer.invitation', async t => {
     ),
   );
 
-  /** @type {{ getLiquidityIssuer: () => Issuer, makeSwapInvitation: () => Invitation }} */
+  /** @type {{ getLiquidityIssuer: () => Issuer<'nat'>, makeSwapInvitation: () => Invitation }} */
   const publicAPI = await E(t.context.zoe).getPublicFacet(
     autoswapInstanceHandle,
   );
@@ -1704,7 +1495,7 @@ test('addOffer offer.invitation', async t => {
 });
 
 test('addOffer makeContinuingInvitation', async t => {
-  const board = makeBoard();
+  const board = makeFakeBoard();
 
   // Create ContinuingInvitationExample instance
   const url = await importMetaResolve(
@@ -1794,7 +1585,7 @@ test('addOffer makeContinuingInvitation', async t => {
 });
 
 test('getZoe, getBoard', async t => {
-  const board = makeBoard();
+  const board = makeFakeBoard();
 
   const pursesStateChangeHandler = (/** @type {any} */ _data) => {};
   const inboxStateChangeHandler = (/** @type {any} */ _data) => {};
@@ -1813,7 +1604,7 @@ test('getZoe, getBoard', async t => {
 });
 
 test('stamps from dateNow', async t => {
-  const board = makeBoard();
+  const board = makeFakeBoard();
 
   const startDateMS = new Date(2020, 0, 1).valueOf();
   let currentDateMS = startDateMS;