feat: allow Offer to accept a PaymentPKeywordRecord

Agoric · Sep 5, 2020 · f5f9c41 · f5f9c41
1 parent 5a618b7
commit f5f9c41
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/zoe/src/zoeService/types.js b/packages/zoe/src/zoeService/types.js
@@ -92,7 +92,7 @@
  *
  * @param {ERef<Invitation>} invitation
  * @param {Proposal=} proposal
- * @param {PaymentKeywordRecord=} paymentKeywordRecord
+ * @param {PaymentPKeywordRecord=} paymentKeywordRecord
  * @returns {Promise<UserSeat>} seat
  */
 
@@ -181,7 +181,7 @@
  */
 
 /**
- * @typedef {Record<Keyword,Promise<Payment>>} PaymentPKeywordRecord
+ * @typedef {Record<Keyword,ERef<Payment>>} PaymentPKeywordRecord
  * @typedef {Record<Keyword,Payment>} PaymentKeywordRecord
  */
 

diff --git a/packages/zoe/src/zoeService/zoe.js b/packages/zoe/src/zoeService/zoe.js
@@ -380,7 +380,9 @@ function makeZoe(vatAdminSvc, zcfBundleName = undefined) {
             // cleaned proposal's amount that should be the same.
             const giveAmount = proposal.give[keyword];
             const purse = brandToPurse.get(giveAmount.brand);
-            return E(purse).deposit(paymentKeywordRecord[keyword], giveAmount);
+            return E.when(paymentKeywordRecord[keyword], payment =>
+              E(purse).deposit(payment, giveAmount),
+            );
             // eslint-disable-next-line no-else-return
           } else {
             // payments outside the give: clause are ignored.