Merge pull request #772 from Agoric/mfig/wait-for-payments

Wait for payments at opportune moments
Agoric · Mar 26, 2020 · 105fc16 · 105fc16
2 parents fb9c8a0 + 53f359d
commit 105fc16
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/packages/cosmic-swingset/lib/ag-solo/vats/bootstrap.js b/packages/cosmic-swingset/lib/ag-solo/vats/bootstrap.js
@@ -154,7 +154,7 @@ export default function setup(syscall, state, helpers) {
         );
 
         // deposit payments
-        const [moolaPayment, simoleanPayment] = payments;
+        const [moolaPayment, simoleanPayment] = await Promise.all(payments);
 
         await E(wallet).deposit(pursePetnames.moola, moolaPayment);
         await E(wallet).deposit(pursePetnames.simolean, simoleanPayment);

diff --git a/packages/cosmic-swingset/lib/ag-solo/vats/lib-wallet.js b/packages/cosmic-swingset/lib/ag-solo/vats/lib-wallet.js
@@ -145,10 +145,11 @@ export async function makeWallet(
         }),
       ).then(payoutArray =>
         Promise.all(
-          payoutArray.map((payout, payoutIndex) => {
+          payoutArray.map(async (payoutP, payoutIndex) => {
             const keyword = payoutIndexToKeyword[payoutIndex];
             const purse = purses[keyword];
-            if (purse && payout) {
+            if (purse && payoutP) {
+              const payout = await payoutP;
               return E(purse).deposit(payout);
             }
             return undefined;

diff --git a/packages/zoe/src/zoe.js b/packages/zoe/src/zoe.js
@@ -394,8 +394,10 @@ const makeZoe = (additionalEndowments = {}) => {
             if (giveKeywords.includes(keyword)) {
               // We cannot trust these amounts since they come directly
               // from the remote issuer and so we must coerce them.
-              return E(purse)
-                .deposit(paymentKeywordRecord[keyword], proposal.give[keyword])
+              return Promise.resolve(paymentKeywordRecord[keyword])
+                .then(payment =>
+                  E(purse).deposit(payment, proposal.give[keyword]),
+                )
                 .then(_ => amountMath.coerce(proposal.give[keyword]));
             }
             // If any other payments are included, they are ignored.