feat(smart-wallet): accept Vow for offerResult

* Make smart wallet use `when` to accept a Vow for the result of an offer NOTE: this enables upgrade of the contract, NOT upgrade of the smart-wallet refs: #9308 Co-authored-by: Dean Tribble <[email protected]>
Agoric · Jun 28, 2024 · cc8c08e · cc8c08e
1 parent 59c3d2b
commit cc8c08e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/packages/boot/test/bootstrapTests/lca.test.ts b/packages/boot/test/bootstrapTests/lca.test.ts
@@ -109,6 +109,8 @@ test.serial('stakeBld', async t => {
         },
       },
     }),
-    // TODO should receive "simulated packet timeout" error
+    // TODO propagate error message through bridge
+    // FIXME should receive "simulated packet timeout" error
+    // { message: 'simulated packet timeout' },
   );
 });
diff --git a/packages/orchestration/test/examples/stake-bld.contract.test.ts b/packages/orchestration/test/examples/stake-bld.contract.test.ts
@@ -122,7 +122,7 @@ test('makeStakeBldInvitation', async t => {
     );
     const delegateOffer = await E(zoe).offer(delegateInv);
     await t.throwsAsync(E(delegateOffer).getOfferResult(), {
-      message: 'simualted packet timeout',
+      message: 'simulated packet timeout',
     });
   }
 

diff --git a/packages/smart-wallet/package.json b/packages/smart-wallet/package.json
@@ -34,6 +34,7 @@
     "@agoric/store": "^0.9.2",
     "@agoric/vat-data": "^0.5.2",
     "@agoric/vats": "^0.15.1",
+    "@agoric/vow": "^0.1.0",
     "@agoric/zoe": "^0.26.2",
     "@endo/eventual-send": "^1.2.2",
     "@endo/far": "^1.1.2",

diff --git a/packages/smart-wallet/src/offerWatcher.js b/packages/smart-wallet/src/offerWatcher.js
@@ -9,9 +9,12 @@ import {
 } from '@agoric/zoe/src/typeGuards.js';
 import { AmountShape } from '@agoric/ertp/src/typeGuards.js';
 import { deeplyFulfilledObject, objectMap } from '@agoric/internal';
+import { heapVowTools } from '@agoric/vow/vat.js';
 
 import { UNPUBLISHED_RESULT } from './offers.js';
 
+const { when, allVows } = heapVowTools;
+
 /**
  * @import {OfferSpec} from "./offers.js";
  * @import {ContinuingOfferResult} from "./types.js";
@@ -37,7 +40,8 @@ import { UNPUBLISHED_RESULT } from './offers.js';
  * @param {UserSeat} seat
  */
 const watchForOfferResult = ({ resultWatcher }, seat) => {
-  const p = E(seat).getOfferResult();
+  // NOTE: this enables upgrade of the contract, NOT upgrade of the smart-wallet. See #9308
+  const p = when(E(seat).getOfferResult());
   watchPromise(p, resultWatcher, seat);
   return p;
 };
@@ -67,11 +71,14 @@ const watchForPayout = ({ paymentWatcher }, seat) => {
  * @param {UserSeat} seat
  */
 export const watchOfferOutcomes = (watchers, seat) => {
-  return Promise.all([
-    watchForOfferResult(watchers, seat),
-    watchForNumWants(watchers, seat),
-    watchForPayout(watchers, seat),
-  ]);
+  // NOTE: this enables upgrade of the contract, NOT upgrade of the smart-wallet. See #9308
+  return when(
+    allVows([
+      watchForOfferResult(watchers, seat),
+      watchForNumWants(watchers, seat),
+      watchForPayout(watchers, seat),
+    ]),
+  );
 };
 
 const offerWatcherGuard = harden({

diff --git a/packages/vats/tools/fake-bridge.js b/packages/vats/tools/fake-bridge.js
@@ -194,7 +194,7 @@ export const makeFakeLocalchainBridge = (zone, onToBridge = () => {}) => {
               }
               case '/cosmos.staking.v1beta1.MsgDelegate': {
                 if (message.amount.amount === '504') {
-                  throw Error('simualted packet timeout');
+                  throw Error('simulated packet timeout');
                 }
                 return /** @type {JsonSafe<MsgDelegateResponse>} */ ({});
               }