Merge pull request #7296 from Agoric/ta/durable-invitationMakers

fix(vaults): durable invitationMakers
Agoric · Mar 31, 2023 · 397b0d0 · 397b0d0
2 parents 90e1601 + aec82e8
commit 397b0d0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/packages/inter-protocol/src/vaultFactory/vaultHolder.js b/packages/inter-protocol/src/vaultFactory/vaultHolder.js
@@ -52,6 +52,11 @@ export const prepareVaultHolder = (baggage, marshaller) => {
     {
       helper: UnguardedHelperI,
       holder: HolderI,
+      invitationMakers: M.interface('invitationMakers', {
+        AdjustBalances: M.call().returns(M.promise()),
+        CloseVault: M.call().returns(M.promise()),
+        TransferVault: M.call().returns(M.promise()),
+      }),
     },
     /**
      *
@@ -83,6 +88,17 @@ export const prepareVaultHolder = (baggage, marshaller) => {
           return this.state.publisher;
         },
       },
+      invitationMakers: {
+        AdjustBalances() {
+          return this.facets.holder.makeAdjustBalancesInvitation();
+        },
+        CloseVault() {
+          return this.facets.holder.makeCloseInvitation();
+        },
+        TransferVault() {
+          return this.facets.holder.makeTransferInvitation();
+        },
+      },
       holder: {
         /** @deprecated use getPublicTopics */
         getSubscriber() {

diff --git a/packages/inter-protocol/src/vaultFactory/vaultKit.js b/packages/inter-protocol/src/vaultFactory/vaultKit.js
@@ -1,11 +1,12 @@
-import { makeTracer } from '@agoric/internal';
 import '@agoric/zoe/exported.js';
-import { Far } from '@endo/marshal';
+
+import { makeTracer } from '@agoric/internal';
 import { prepareVaultHolder } from './vaultHolder.js';
 
 const trace = makeTracer('VK', false);
 
 /**
+ * Wrap the VaultHolder duration object in a record suitable for the result of an invitation.
  *
  * @param {import('@agoric/ertp').Baggage} baggage
  * @param {ERef<Marshaller>} marshaller
@@ -22,17 +23,16 @@ export const prepareVaultKit = (baggage, marshaller) => {
    */
   const makeVaultKit = (vault, storageNode) => {
     trace('prepareVaultKit makeVaultKit');
-    const { holder, helper } = makeVaultHolder(vault, storageNode);
+    const { holder, helper, invitationMakers } = makeVaultHolder(
+      vault,
+      storageNode,
+    );
     const holderTopics = holder.getPublicTopics();
     const vaultKit = harden({
       publicSubscribers: {
         vault: holderTopics.vault,
       },
-      invitationMakers: Far('invitation makers', {
-        AdjustBalances: () => holder.makeAdjustBalancesInvitation(),
-        CloseVault: () => holder.makeCloseInvitation(),
-        TransferVault: () => holder.makeTransferInvitation(),
-      }),
+      invitationMakers,
       vault: holder,
       vaultUpdater: helper.getUpdater(),
     });