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

package/src/lib-wallet.js

@@ -11,34 +11,39 @@
  * and dapps.
  */
 
-import { assert, details as X, q } from '@agoric/assert';
+import { assert, q, Fail } from '@agoric/assert';
 import { makeScalarStoreCoordinator } from '@agoric/cache';
-import { objectMap } from '@agoric/internal';
-import { makeLegacyMap, makeScalarMap, makeScalarWeakMap } from '@agoric/store';
+import { objectMap, WalletName } from '@agoric/internal';
+import { slotStringUnserialize } from '@agoric/internal/src/storage-test-utils.js';
+import {
+  makeLegacyMap,
+  makeScalarMapStore,
+  makeScalarWeakMapStore,
+} from '@agoric/store';
 import { makeScalarBigMapStore } from '@agoric/vat-data';
 import { AmountMath } from '@agoric/ertp';
 import { E } from '@endo/eventual-send';
 
-import { makeMarshal, passStyleOf, Far, mapIterable } from '@endo/marshal';
-import { Nat } from '@agoric/nat';
+import { passStyleOf, Far, mapIterable } from '@endo/marshal';
+import { Nat } from '@endo/nat';
 import {
   makeNotifierFromSubscriber,
   makeNotifierKit,
   observeIteration,
   observeNotifier,
+  subscribeEach,
 } from '@agoric/notifier';
 import { makePromiseKit } from '@endo/promise-kit';
 
+import { makeExportContext } from '@agoric/smart-wallet/src/marshal-contexts.js';
 import { makeIssuerTable } from './issuerTable.js';
 import { makeDehydrator } from './lib-dehydrate.js';
 import { makeId, findOrMakeInvitation } from './findOrMakeInvitation.js';
 import { bigintStringify } from './bigintStringify.js';
 import { makePaymentActions } from './actions.js';
-import { makeExportContext } from './marshal-contexts.js';
 
 import '@agoric/store/exported.js';
 import '@agoric/zoe/exported.js';
-import '@agoric/inter-protocol/exported.js';
 
 import './internal-types.js';
 import './types.js';
@@ -59,16 +64,16 @@ const cmp = (a, b) => {
 /**
  * @param {{
  * agoricNames?: ERef<NameHub>
- * board: ERef<Board>
+ * board: ERef<import('@agoric/vats').Board>
  * dateNow?: () => number,
  * inboxStateChangeHandler?: (state: any) => void,
- * myAddressNameAdmin: ERef<MyAddressNameAdmin>
+ * myAddressNameAdmin: ERef<import('@agoric/vats').MyAddressNameAdmin>
  * namesByAddress?: ERef<NameHub>
  * pursesStateChangeHandler?: (state: any) => void,
  * zoe: ERef<ZoeService>,
  * }} opt
  *
- * @typedef {import('@agoric/vats/src/nameHub').NameHub} NameHub
+ * @typedef {import('@agoric/vats').NameHub} NameHub
  */
 export function makeWalletRoot({
   zoe,
@@ -136,8 +141,8 @@ export function makeWalletRoot({
   const installationMapping = makeMapping('installation');
 
   const brandTable = makeIssuerTable();
-  /** @type {WeakStore<Issuer, string>} */
-  const issuerToBoardId = makeScalarWeakMap('issuer');
+  /** @type {WeakMapStore<Issuer, string>} */
+  const issuerToBoardId = makeScalarWeakMapStore('issuer');
 
   // Idempotently initialize the issuer's synchronous boardId mapping.
   const initIssuerToBoardId = async (issuer, brand) => {
@@ -166,22 +171,23 @@ export function makeWalletRoot({
     return issuerBoardId;
   };
 
-  /** @type {WeakStore<Purse, Brand>} */
-  const purseToBrand = makeScalarWeakMap('purse');
-  /** @type {Store<Brand, string>} */
-  const brandToDepositFacetId = makeScalarMap('brand');
-  /** @type {Store<Brand, Purse>} */
-  const brandToAutoDepositPurse = makeScalarMap('brand');
+  /** @type {WeakMapStore<Purse, Brand>} */
+  const purseToBrand = makeScalarWeakMapStore('purse');
+  /** @type {MapStore<Brand, string>} */
+  const brandToDepositFacetId = makeScalarMapStore('brand');
+  /** @type {MapStore<Brand, Purse>} */
+  const brandToAutoDepositPurse = makeScalarMapStore('brand');
 
   // Offers that the wallet knows about (the inbox).
-  const idToOffer = makeScalarMap('offerId');
-  const idToNotifierP = makeScalarMap('offerId');
+  /** @type {MapStore<string, any>} */
+  const idToOffer = makeScalarMapStore('offerId');
   /** @type {LegacyMap<string, PromiseRecord<any>>} */
   // Legacy because promise kits are not passables
   const idToOfferResultPromiseKit = makeLegacyMap('id');
 
-  /** @type {WeakStore<Handle<'invitation'>, any>} */
-  const invitationHandleToOfferResult = makeScalarWeakMap('invitationHandle');
+  /** @type {WeakMapStore<Handle<'invitation'>, any>} */
+  const invitationHandleToOfferResult =
+    makeScalarWeakMapStore('invitationHandle');
 
   // Compiled offers (all ready to execute).
   const idToCompiledOfferP = new Map();
@@ -223,18 +229,10 @@ export function makeWalletRoot({
     return getSortedValues(inboxState);
   }
 
-  const noOp = () => {};
-  const identitySlotToValFn = (slot, _) => slot;
-
   // Instead of { body, slots }, fill the slots. This is useful for
   // display but not for data processing, since the special identifier
   // @qclass is lost.
-  const { unserialize: fillInSlots } = makeMarshal(noOp, identitySlotToValFn, {
-    marshalName: 'wallet',
-    // TODO Temporary hack.
-    // See https://github.com/Agoric/agoric-sdk/issues/2780
-    errorIdNum: 40000,
-  });
+  const fillInSlots = slotStringUnserialize;
 
   /** @type {NotifierRecord<OfferState[]>} */
   const { notifier: offersNotifier, updater: offersUpdater } = makeNotifierKit(
@@ -474,7 +472,7 @@ export function makeWalletRoot({
         return;
       case 'accept':
         assert(idToOfferResultPromiseKit.has(id));
-        void idToOfferResultPromiseKit.get(id).promise.then(result => {
+        void E.when(idToOfferResultPromiseKit.get(id).promise, result => {
           const style = passStyleOf(result);
           const active =
             style === 'remotable' ||
@@ -572,27 +570,20 @@ export function makeWalletRoot({
     await updateAllInboxState();
   }
 
-  // handle the update, which has already resolved to a record. If the offer is
-  // 'done', mark the offer 'complete', otherwise resubscribe to the notifier.
+  // handle the update, which has already resolved to a record. The update means
+  // the offer is 'done'.
   function updateOrResubscribe(id, seat, update) {
     const { updateCount } = update;
-    if (updateCount === undefined) {
-      // TODO do we still need these?
-      idToSeat.delete(id);
+    assert(updateCount === undefined);
+    idToSeat.delete(id);
 
-      const offer = idToOffer.get(id);
-      const completedOffer = addMeta({
-        ...offer,
-        status: 'complete',
-      });
-      idToOffer.set(id, completedOffer);
-      updateInboxState(id, completedOffer);
-      idToNotifierP.delete(id);
-    } else {
-      E(idToNotifierP.get(id))
-        .getUpdateSince(updateCount)
-        .then(nextUpdate => updateOrResubscribe(id, seat, nextUpdate));
-    }
+    const offer = idToOffer.get(id);
+    const completedOffer = addMeta({
+      ...offer,
+      status: 'complete',
+    });
+    idToOffer.set(id, completedOffer);
+    updateInboxState(id, completedOffer);
   }
 
   /**
@@ -601,51 +592,12 @@ export function makeWalletRoot({
    * @param {string} id
    * @param {ERef<UserSeat>} seat
    */
-  async function subscribeToNotifier(id, seat) {
-    E(seat)
-      // TODO This uses getAllocationNotifierJig for production, and so
-      // is likely wrong
-      // See https://github.com/Agoric/agoric-sdk/issues/5834
-      .getAllocationNotifierJig()
-      .then(offerNotifierP => {
-        if (!idToNotifierP.has(id)) {
-          idToNotifierP.init(id, offerNotifierP);
-        }
-        E(offerNotifierP)
-          .getUpdateSince()
-          .then(update => updateOrResubscribe(id, seat, update));
-      });
+  async function subscribeToUpdates(id, seat) {
+    E(E(seat).getExitSubscriber())
+      .subscribeAfter()
+      .then(update => updateOrResubscribe(id, seat, update));
   }
 
-  /**
-   * @param {() => ( Promise | undefined )} get - The function whose return value
-   * to memoize.
-   */
-  const makeMemoizedGetter = get => {
-    let pk;
-    const doGet = () => pk.resolve(get());
-
-    return () => {
-      if (pk === undefined) {
-        pk = makePromiseKit();
-        doGet();
-      }
-      return pk.promise;
-    };
-  };
-
-  const getAttIssuer = makeMemoizedGetter(() =>
-    E(agoricNames)?.lookup('issuer', 'Attestation'),
-  );
-
-  /** @type import('@endo/promise-kit').PromiseKit<AttestationTool> */
-  const attMakerPK = makePromiseKit();
-
-  const { getAccountState } = E(attMakerPK.promise);
-
-  const makeAttestationAmount = async bldAmount =>
-    E(attMakerPK.promise).wrapLienedAmount(bldAmount);
-
   async function executeOffer(compiledOfferP) {
     // =====================
     // === AWAITING TURN ===
@@ -661,29 +613,13 @@ export function makeWalletRoot({
     /** @type {Map<Payment, Purse>} */
     const paymentToPurse = new Map();
 
-    // Track which gives/wants are attestations.
-    const keywordToAttestation = new Map();
-
     // We now have everything we need to provide Zoe, so do the actual withdrawals.
     // Payments are made for the keywords in proposal.give.
     const keywordPaymentPs = Object.entries(proposal.give || harden({})).map(
-      async ([keyword, { type, ...amount }]) => {
+      async ([keyword, amount]) => {
         const purse = purseKeywordRecord[keyword];
         purse !== undefined ||
-          assert.fail(X`purse was not found for keyword ${q(keyword)}`);
-
-        if (type === 'Attestation') {
-          const payment = await E(attMakerPK.promise).makeAttestation(amount);
-
-          const attestationIssuer = await getAttIssuer();
-
-          keywordToAttestation.set(
-            keyword,
-            await E(attestationIssuer).getAmountOf(payment),
-          );
-
-          return [keyword, payment];
-        }
+          Fail`purse was not found for keyword ${q(keyword)}`;
 
         const payment = await E(purse).withdraw(amount);
         paymentToPurse.set(payment, purse);
@@ -691,30 +627,6 @@ export function makeWalletRoot({
       },
     );
 
-    // Get Attestation-branded amounts for Attestastation "wants".
-    await Promise.all(
-      Object.entries(proposal.want || harden({})).map(
-        async ([keyword, { type, ...amount }]) => {
-          if (type === 'Attestation') {
-            const attestationAmount = await makeAttestationAmount(amount);
-            keywordToAttestation.set(keyword, attestationAmount);
-          }
-        },
-      ),
-    );
-
-    const depositAttestation = async payoutP => {
-      const [issuer, payout] = await Promise.all([getAttIssuer(), payoutP]);
-
-      const amount = await E(issuer).getAmountOf(payout);
-      const invitation = await E(attMakerPK.promise).makeReturnAttInvitation();
-      const depositProposal = harden({ give: { Attestation: amount } });
-      const payments = harden({ Attestation: payout });
-
-      const userSeat = E(zoe).offer(invitation, depositProposal, payments);
-      await E(userSeat).getOfferResult();
-    };
-
     // Try reclaiming any of our payments that we successfully withdrew, but
     // were left unclaimed.
     const tryReclaimingWithdrawnPayments = () =>
@@ -724,11 +636,7 @@ export function makeWalletRoot({
         keywordPaymentPs.map(async keywordPaymentP => {
           // Wait for the withdrawal to complete.  This protects against a race
           // when updating paymentToPurse.
-          const [keyword, payment] = await keywordPaymentP;
-
-          if (keywordToAttestation.has(keyword)) {
-            return depositAttestation(payment);
-          }
+          const [_keyword, payment] = await keywordPaymentP;
 
           // Find out where it came from.
           const purse = paymentToPurse.get(payment);
@@ -764,27 +672,6 @@ export function makeWalletRoot({
 
     const paymentKeywordRecord = harden(Object.fromEntries(paymentKeywords));
 
-    // Convert gives'/wants' BLD amounts to Attestation amounts for
-    // Attestations.
-    const convertToAttestationAmounts = ([keyword, { type, ...amount }]) => {
-      if (type === 'Attestation') {
-        amount = keywordToAttestation.get(keyword);
-      }
-      return [keyword, amount];
-    };
-
-    if (proposal.give) {
-      proposal.give = Object.fromEntries(
-        Object.entries(proposal.give).map(convertToAttestationAmounts),
-      );
-    }
-
-    if (proposal.want) {
-      proposal.want = Object.fromEntries(
-        Object.entries(proposal.want).map(convertToAttestationAmounts),
-      );
-    }
-
     const seat = E(zoe).offer(
       inviteP,
       harden(proposal),
@@ -802,10 +689,6 @@ export function makeWalletRoot({
       .then(payoutObj => {
         return Promise.all(
           Object.entries(payoutObj).map(([keyword, payoutP]) => {
-            if (keywordToAttestation.has(keyword)) {
-              return depositAttestation(payoutP);
-            }
-
             // We try to find a purse for this keyword, but even if we don't,
             // we still make it a normal incoming payment.
             const purseOrUndefined = purseKeywordRecord[keyword];
@@ -845,7 +728,7 @@ export function makeWalletRoot({
       } else {
         p = Promise.resolve();
       }
-      return p.then(_ => petnameForBrand);
+      return E.when(p, _ => petnameForBrand);
     };
     return addBrandPetname().then(async brandName => {
       await updateAllIssuersState();
@@ -876,7 +759,7 @@ export function makeWalletRoot({
     if (already) {
       depositFacet = actions;
     } else {
-      depositFacet = Far('depositFacet', {
+      depositFacet = Far(WalletName.depositFacet, {
         receive(paymentP) {
           return E(actions).receive(paymentP);
         },
@@ -886,13 +769,10 @@ export function makeWalletRoot({
     const found = [...contactMapping.petnameToVal.entries()].find(
       ([_pn, { depositBoardId: dbid }]) => depositBoardId === dbid,
     );
-
-    assert(
-      !found,
-      X`${q(found && found[0])} is already the petname for board ID ${q(
+    !found ||
+      Fail`${q(found && found[0])} is already the petname for board ID ${q(
         depositBoardId,
-      )}`,
-    );
+      )}`;
 
     const contact = harden(
       addMeta({
@@ -1035,7 +915,7 @@ export function makeWalletRoot({
     const compile = amountKeywordRecord => {
       return Object.fromEntries(
         Object.entries(amountKeywordRecord).map(
-          ([keyword, { pursePetname, value, type }]) => {
+          ([keyword, { pursePetname, value }]) => {
             // Automatically convert numbers to Nats.
             if (typeof value === 'number') {
               value = Nat(value);
@@ -1044,7 +924,7 @@ export function makeWalletRoot({
             purseKeywordRecord[keyword] = purse;
             const brand = purseToBrand.get(purse);
 
-            return [keyword, { brand, value, type }];
+            return [keyword, { brand, value }];
           },
         ),
       );
@@ -1093,8 +973,8 @@ export function makeWalletRoot({
     return compiled;
   };
 
-  /** @type {Store<string, DappRecord>} */
-  const dappOrigins = makeScalarMap('dappOrigin');
+  /** @type {MapStore<string, DappRecord>} */
+  const dappOrigins = makeScalarMapStore('dappOrigin');
   const { notifier: dappsNotifier, updater: dappsUpdater } =
     /** @type {NotifierRecord<DappRecord[]>} */ (makeNotifierKit([]));
 
@@ -1351,7 +1231,7 @@ export function makeWalletRoot({
         .hasExited()
         .then(exited => {
           if (!exited) {
-            subscribeToNotifier(id, seat);
+            subscribeToUpdates(id, seat);
           }
         });
 
@@ -1388,8 +1268,8 @@ export function makeWalletRoot({
     return ret;
   }
 
-  /** @type {Store<number, PaymentRecord>} */
-  const idToPaymentRecord = makeScalarMap('paymentId');
+  /** @type {MapStore<number, PaymentRecord>} */
+  const idToPaymentRecord = makeScalarMapStore('paymentId');
   const { updater: paymentsUpdater, notifier: paymentsNotifier } =
     /** @type {NotifierRecord<PaymentRecord[]>} */ (makeNotifierKit([]));
   /**
@@ -1430,7 +1310,7 @@ export function makeWalletRoot({
 
   /**
    * @param {ERef<Payment>} paymentP
-   * @param {Purse | Petname=} depositTo
+   * @param {Purse | Petname} [depositTo]
    */
   const addPayment = async (paymentP, depositTo = undefined) => {
     // We don't even create the record until we resolve the payment.
@@ -1482,7 +1362,7 @@ export function makeWalletRoot({
     await updateAllPurseState();
   }
 
-  const pendingEnableAutoDeposits = makeScalarMap('brand');
+  const pendingEnableAutoDeposits = makeScalarMapStore('brand');
   async function doEnableAutoDeposit(pursePetname, updateState) {
     const purse = purseMapping.petnameToVal.get(pursePetname);
     const brand = purseToBrand.get(purse);
@@ -1537,7 +1417,6 @@ export function makeWalletRoot({
     return E(board)
       .getValue(boardId)
       .then(value => {
-        // @ts-expect-error type is too specific
         context.ensureBoardId(boardId, value);
         return acceptFn(petname, value);
       });
@@ -1650,10 +1529,8 @@ export function makeWalletRoot({
   /** @type {IssuerManager} */
   const issuerManager = Far('IssuerManager', {
     rename: async (petname, issuer) => {
-      assert(
-        brandTable.hasByIssuer(issuer),
-        `issuer has not been previously added`,
-      );
+      brandTable.hasByIssuer(issuer) ||
+        Fail`issuer has not been previously added`;
       const brandRecord = brandTable.getByIssuer(issuer);
       brandMapping.renamePetname(petname, brandRecord.brand);
       await updateAllState();
@@ -1712,7 +1589,7 @@ export function makeWalletRoot({
       passStyleOf(offerResult) === 'copyRecord',
       `offerResult must be a record to have a uiNotifier`,
     );
-    assert(offerResult.uiNotifier, X`offerResult does not have a uiNotifier`);
+    offerResult.uiNotifier || Fail`offerResult does not have a uiNotifier`;
     return offerResult.uiNotifier;
   }
 
@@ -1735,11 +1612,9 @@ export function makeWalletRoot({
 
     const { publicSubscribers } = offerResult;
     publicSubscribers ||
-      assert.fail(
-        X`offerResult ${offerResult} does not have publicSubscribers`,
-      );
+      Fail`offerResult ${offerResult} does not have publicSubscribers`;
     passStyleOf(publicSubscribers) === 'copyRecord' ||
-      assert.fail(X`publicSubscribers ${publicSubscribers} must be a record`);
+      Fail`publicSubscribers ${publicSubscribers} must be a record`;
 
     return publicSubscribers;
   }
@@ -1805,13 +1680,10 @@ export function makeWalletRoot({
     const idOnly =
       (kind, lookup) =>
       (...path) => {
-        assert.equal(
-          path.length,
-          1,
-          X`${assert.quote(
+        path.length === 1 ||
+          Fail`${assert.quote(
             kind,
-          )} lookup must be called with a single offer ID, not ${path}`,
-        );
+          )} lookup must be called with a single offer ID, not ${path}`;
         return lookup(path[0]);
       };
     makeLookup('offer', idOnly('offer', idToOffer.get));
@@ -1825,10 +1697,12 @@ export function makeWalletRoot({
 
   const firstPathToLookup = createRootLookups();
 
-  /** @type {ReturnType<typeof makeMarshal>} */
+  /** @type {ReturnType<typeof import('@endo/marshal').makeMarshal>} */
   const marshaller = harden({
-    unserialize: context.unserialize,
-    serialize: context.serialize,
+    fromCapData: context.fromCapData,
+    toCapData: context.toCapData,
+    unserialize: context.fromCapData,
+    serialize: context.toCapData,
   });
 
   const handleAcceptOfferAction = async offer => {
@@ -1855,7 +1729,7 @@ export function makeWalletRoot({
       case 'suggestIssuer':
         return handleSuggestIssuerAction(data);
       default:
-        throw new Error(`Unknown wallet action ${type}`);
+        throw Error(`Unknown wallet action ${type}`);
     }
   };
 
@@ -1873,15 +1747,11 @@ export function makeWalletRoot({
       return E(firstValue).lookup(...remaining);
     },
     getMarshaller: () => marshaller,
-    resolveAttMaker: attMaker => attMakerPK.resolve(attMaker),
-    getAttMaker: () => attMakerPK.promise,
     getDappCacheCoordinator: dappOrigin =>
       dappOrigins.get(dappOrigin).cacheCoordinator,
     getCacheCoordinator: () => sharedCacheCoordinator,
     saveOfferResult,
     getOfferResult,
-    getAccountState,
-    makeAttestationAmount,
     waitForDappApproval,
     getDappsNotifier() {
       return dappsNotifier;
@@ -1969,14 +1839,16 @@ export function makeWalletRoot({
       return board;
     },
     getAgoricNames(...path) {
-      assert(agoricNames, X`agoricNames was not supplied to the wallet maker`);
+      if (!agoricNames) {
+        throw Fail`agoricNames was not supplied to the wallet maker`;
+      }
       return E(agoricNames).lookup(...path);
     },
     getNamesByAddress(...path) {
       if (namesByAddress === undefined) {
         // TypeScript confused about `||` control flow so use `if` instead
         // https://github.com/microsoft/TypeScript/issues/50739
-        assert.fail(X`namesByAddress was not supplied to the wallet maker`);
+        throw Fail`namesByAddress was not supplied to the wallet maker`;
       }
       return E(namesByAddress).lookup(...path);
     },
@@ -2009,7 +1881,10 @@ export function makeWalletRoot({
       .then(addInviteDepositFacet);
     zoeInvitePurse = wallet.getPurse(ZOE_INVITE_PURSE_PETNAME);
 
-    await E(myAddressNameAdmin).update('depositFacet', selfDepositFacet);
+    await E(myAddressNameAdmin).update(
+      WalletName.depositFacet,
+      selfDepositFacet,
+    );
   };
 
   // Importing assets as virtual purses from the bank is a highly-trusted path.
@@ -2018,7 +1893,7 @@ export function makeWalletRoot({
   // don't really trust.
   // The param is{import('@agoric/vats/src/vat-bank.js').Bank} but that here triggers https://github.com/Agoric/agoric-sdk/issues/4620
   const importBankAssets = async bank => {
-    observeIteration(E(bank).getAssetSubscription(), {
+    observeIteration(subscribeEach(E(bank).getAssetSubscription()), {
       async updateState({ proposedName, issuerName, issuer, brand }) {
         try {
           issuerName = await addIssuer(issuerName, issuer);

package/src/types.js

@@ -85,7 +85,7 @@
  * is safe to pass to the dapp UI.
  * @property {() => Promise<ZoeService>} getZoe
  * Get the Zoe Service
- * @property {() => Promise<Board>} getBoard
+ * @property {() => Promise<import('@agoric/vats').Board>} getBoard
  * Get the Board
  * @property {(...path: Array<unknown>) => Promise<unknown>} getAgoricNames
  * Get the curated Agoric public naming hub
@@ -117,7 +117,7 @@
  * @property {Brand} brand
  * @property {string} brandBoardId
  * The board ID for this purse's brand
- * @property {string=} depositBoardId
+ * @property {string} [depositBoardId]
  * The board ID for the deposit-only facet of this purse
  * @property {Petname} brandPetname
  * The petname for this purse's brand

package/src/wallet.js

@@ -22,18 +22,18 @@ import './internal-types.js';
 /**
  * @typedef {{
  * agoricNames: ERef<NameHub>,
- * board: ERef<Board>,
+ * board: ERef<import('@agoric/vats').Board>,
  * cacheStorageNode: ERef<StorageNode>,
  * localTimerPollInterval?: bigint,
- * localTimerService?: TimerService,
- * myAddressNameAdmin: ERef<MyAddressNameAdmin>,
+ * localTimerService?: import('@agoric/time/src/types').TimerService,
+ * myAddressNameAdmin: ERef<import('@agoric/vats').MyAddressNameAdmin>,
  * namesByAddress: ERef<NameHub>,
  * timerDevice?: unknown,
  * timerDeviceScale?: number,
  * zoe: ERef<ZoeService>,
  * }} StartupTerms
  *
- * @typedef {import('@agoric/vats/src/nameHub').NameHub} NameHub
+ * @typedef {import('@agoric/vats').NameHub} NameHub
  */
 
 export function buildRootObject(vatPowers) {
@@ -186,10 +186,6 @@ export function buildRootObject(vatPowers) {
         await approve();
         return walletAdmin.addOffer(offer, { ...meta, dappOrigin });
       },
-      async getAccountState() {
-        await approve();
-        return walletAdmin.getAccountState();
-      },
       async getOffersNotifier(status = null) {
         await approve();
         const { notifier, updater } = makeNotifierKit(inboxState);