@agoric/client-utils 0.1.1-dev-511b789.0 → 0.1.1-dev-493b453.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/client-utils",
-  "version": "0.1.1-dev-511b789.0+511b789",
+  "version": "0.1.1-dev-493b453.0+493b453",
   "description": "Utilities for building Agoric clients",
   "license": "Apache-2.0",
   "publishConfig": {
@@ -27,11 +27,11 @@
     "ts-blank-space": "^0.4.1"
   },
   "dependencies": {
-    "@agoric/casting": "0.4.3-dev-511b789.0+511b789",
-    "@agoric/ertp": "0.16.3-dev-511b789.0+511b789",
-    "@agoric/internal": "0.3.3-dev-511b789.0+511b789",
-    "@agoric/smart-wallet": "0.5.4-dev-511b789.0+511b789",
-    "@agoric/vats": "0.15.2-dev-511b789.0+511b789",
+    "@agoric/casting": "0.4.3-dev-493b453.0+493b453",
+    "@agoric/ertp": "0.16.3-dev-493b453.0+493b453",
+    "@agoric/internal": "0.3.3-dev-493b453.0+493b453",
+    "@agoric/smart-wallet": "0.5.4-dev-493b453.0+493b453",
+    "@agoric/vats": "0.15.2-dev-493b453.0+493b453",
     "@cosmjs/stargate": "^0.32.3",
     "@cosmjs/tendermint-rpc": "^0.32.3",
     "@endo/common": "^1.2.7",
@@ -58,5 +58,5 @@
     ],
     "timeout": "20m"
   },
-  "gitHead": "511b789b1613447994e934eaedf9944fa944cba8"
+  "gitHead": "493b4533c2e2e9f602d98f89babc59a71f2f7ca6"
 }

package/src/sync-tools.js

@@ -9,6 +9,7 @@
  *  - operation: query dest account's balance
  *  - condition: dest account has a balance >= sent token
  * - Making sure an offer resulted successfully
+ * - Making sure an offer was exited successfully
  *
  */
 
@@ -287,3 +288,40 @@ export const waitUntilInvitationReceived = (addr, io, options) => {
     { reusePromise: true, setTimeout, ...resolvedOptions },
   );
 };
+
+/// ////////// Making sure an offer was exited successfully /////////////
+
+const makeQueryWalletCurrent = follow => (/** @type {string} */ addr) =>
+  follow('-lF', `:published.wallet.${addr}.current`);
+
+/**
+ * @param {object} update
+ * @param {string} offerId
+ * @returns {boolean}
+ */
+const checkLiveOffers = (update, offerId) => {
+  const liveOffers = update.liveOffers;
+  if (!liveOffers) {
+    return false;
+  }
+  return !liveOffers.some(element => element.includes(offerId));
+};
+
+/**
+ * @param {string} addr
+ * @param {string} offerId
+ * @param {{ follow: () => object, log: typeof console.log, setTimeout: typeof global.setTimeout}} io
+ * @param {WaitUntilOptions} options
+ */
+export const waitUntilOfferExited = async (addr, offerId, io, options) => {
+  const { follow, setTimeout } = io;
+  const queryWalletCurrent = makeQueryWalletCurrent(follow);
+  const { errorMessage, ...resolvedOptions } = overrideDefaultOptions(options);
+
+  return retryUntilCondition(
+    async () => queryWalletCurrent(addr),
+    update => checkLiveOffers(update, offerId),
+    errorMessage,
+    { setTimeout, ...resolvedOptions },
+  );
+};