refactor: StoredSubscribers on state

Agoric · Jan 28, 2023 · 42c9f2d · 42c9f2d
1 parent bee26f9
commit 42c9f2d
Showing 1 changed file with 17 additions and 27 deletions.
diff --git a/packages/smart-wallet/src/smartWallet.js b/packages/smart-wallet/src/smartWallet.js
@@ -18,7 +18,6 @@ import {
   makeKindHandle,
   makeScalarBigMapStore,
 } from '@agoric/vat-data';
-import { makeEphemeraProvider } from '@agoric/zoe/src/contractSupport/index.js';
 import { E } from '@endo/far';
 import { makeInvitationsHelper } from './invitations.js';
 import { makeOfferExecutor } from './offers.js';
@@ -129,22 +128,14 @@ const mapToRecord = map => Object.fromEntries(map.entries());
  *   purseBalances: MapStore<RemotePurse, Amount>,
  *   updatePublishKit: PublishKit<UpdateRecord>,
  *   currentPublishKit: PublishKit<CurrentWalletRecord>,
+ *   storedUpdateSubscriber: StoredSubscriber<UpdateRecord>,
+ *   storedCurrentSubscriber: StoredSubscriber<CurrentWalletRecord>,
  * }>} ImmutableState
  *
  * @typedef {{
  * }} MutableState
  */
 
-/**
- * Ephemera are the elements of state that cannot (or need not) be durable.
- *
- * @type {(storageNode: StorageNode) => {
- *   storedUpdateSubscriber: StoredSubscriber<UpdateRecord>,
- *   storedCurrentSubscriber: StoredSubscriber<CurrentWalletRecord>,
- * }} */
-// @ts-expect-error properties not defined until finish()
-const provideEphemera = makeEphemeraProvider(() => ({}));
-
 /**
  *
  * @param {import('@agoric/vat-data').Baggage} baggage
@@ -225,6 +216,17 @@ export const prepareSmartWallet = (baggage, shared) => {
     /** @type {PublishKit<CurrentWalletRecord>} */
     const currentPublishKit = makeWalletPublishKit();
 
+    const storedUpdateSubscriber = makeStoredSubscriber(
+      updatePublishKit.subscriber,
+      unique.walletStorageNode,
+      shared.publicMarshaller,
+    );
+    const storedCurrentSubscriber = makeStoredSubscriber(
+      currentPublishKit.subscriber,
+      E(unique.walletStorageNode).makeChildNode('current'),
+      shared.publicMarshaller,
+    );
+
     const { walletStorageNode } = unique;
     const nonpreciousState = {
       // What purses have reported on construction and by getCurrentAmountNotifier updates.
@@ -234,6 +236,8 @@ export const prepareSmartWallet = (baggage, shared) => {
       /** @type {PublishKit<CurrentWalletRecord>} */
       currentPublishKit,
       walletStorageNode,
+      storedUpdateSubscriber,
+      storedCurrentSubscriber,
     };
 
     return {
@@ -530,13 +534,11 @@ export const prepareSmartWallet = (baggage, shared) => {
         },
         /** @returns {StoredSubscriber<CurrentWalletRecord>} */
         getCurrentSubscriber() {
-          const ephemera = provideEphemera(this.state.walletStorageNode);
-          return ephemera.storedCurrentSubscriber;
+          return this.state.storedCurrentSubscriber;
         },
         /** @returns {StoredSubscriber<UpdateRecord>} */
         getUpdatesSubscriber() {
-          const ephemera = provideEphemera(this.state.walletStorageNode);
-          return ephemera.storedUpdateSubscriber;
+          return this.state.storedUpdateSubscriber;
         },
       },
     },
@@ -545,18 +547,6 @@ export const prepareSmartWallet = (baggage, shared) => {
         const { invitationBrand, invitationDisplayInfo, invitationIssuer } =
           shared;
 
-        const ephemera = provideEphemera(state.walletStorageNode);
-        ephemera.storedUpdateSubscriber = makeStoredSubscriber(
-          state.updatePublishKit.subscriber,
-          state.walletStorageNode,
-          shared.publicMarshaller,
-        );
-        ephemera.storedCurrentSubscriber = makeStoredSubscriber(
-          state.currentPublishKit.subscriber,
-          E(state.walletStorageNode).makeChildNode('current'),
-          shared.publicMarshaller,
-        );
-
         const { helper } = facets;
 
         // Ensure a purse for each issuer