@agoric/client-utils 0.1.1-dev-fb2d05c.0 → 0.1.1-dev-0fa2d27.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/client-utils",
-  "version": "0.1.1-dev-fb2d05c.0+fb2d05c",
+  "version": "0.1.1-dev-0fa2d27.0+0fa2d27",
   "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-fb2d05c.0+fb2d05c",
-    "@agoric/ertp": "0.16.3-dev-fb2d05c.0+fb2d05c",
-    "@agoric/internal": "0.3.3-dev-fb2d05c.0+fb2d05c",
-    "@agoric/smart-wallet": "0.5.4-dev-fb2d05c.0+fb2d05c",
-    "@agoric/vats": "0.15.2-dev-fb2d05c.0+fb2d05c",
+    "@agoric/casting": "0.4.3-dev-0fa2d27.0+0fa2d27",
+    "@agoric/ertp": "0.16.3-dev-0fa2d27.0+0fa2d27",
+    "@agoric/internal": "0.3.3-dev-0fa2d27.0+0fa2d27",
+    "@agoric/smart-wallet": "0.5.4-dev-0fa2d27.0+0fa2d27",
+    "@agoric/vats": "0.15.2-dev-0fa2d27.0+0fa2d27",
     "@cosmjs/stargate": "^0.32.3",
     "@cosmjs/tendermint-rpc": "^0.32.3",
     "@endo/common": "^1.2.7",
@@ -58,5 +58,5 @@
     ],
     "timeout": "20m"
   },
-  "gitHead": "fb2d05c0d755e1ad68aed1ae1112ea4973aad92e"
+  "gitHead": "0fa2d279335cd43d4d3d1a1f53fd080075d6e1be"
 }

package/src/sync-tools.js

@@ -10,7 +10,7 @@
  *  - condition: dest account has a balance >= sent token
  * - Making sure an offer resulted successfully
  * - Making sure an offer was exited successfully
- *
+ * - Make sure an election held by a given committee (see @agoric/governance) turned out as expected
  */
 
 /**
@@ -98,7 +98,7 @@ export const retryUntilCondition = async (
       }
     } catch (error) {
       if (error instanceof Error) {
-        log(`Error: ${error.message}`);
+        log(`Error: ${error.message}: ${error.stack}`);
       } else {
         log(`Unknown error: ${String(error)}`);
       }
@@ -325,3 +325,100 @@ export const waitUntilOfferExited = async (addr, offerId, io, options) => {
     { setTimeout, ...resolvedOptions },
   );
 };
+
+/// ////////// Make sure an election held by a given committee //////////
+/// ////////// (see @agoric/governance) turned out as expected //////////
+
+/**
+ * @typedef {{
+ *   latestOutcome: {
+ *     outcome: string;
+ *     question: import('@endo/marshal').RemotableObject
+ *   },
+ *   latestQuestion: {
+ *     closingRule: { deadline: bigint },
+ *     questionHandle: import('@endo/marshal').RemotableObject
+ *   }
+ * }} ElectionResult
+ */
+
+/**
+ * @param {string} basePath
+ * @param {import('./vstorage-kit').VstorageKit} vstorage
+ * @returns {Promise<ElectionResult>}
+ */
+const fetchLatestEcQuestion = async (basePath, vstorage) => {
+  const pathOutcome = `${basePath}.latestOutcome`;
+  const pathQuestion = `${basePath}.latestQuestion`;
+
+  const [latestOutcome, latestQuestion] = await Promise.all([
+    /** @type {Promise<ElectionResult["latestOutcome"]>} */ (
+      vstorage.readLatestHead(pathOutcome)
+    ),
+    /** @type {Promise<ElectionResult["latestQuestion"]>} */ (
+      vstorage.readLatestHead(pathQuestion)
+    ),
+  ]);
+
+  return { latestOutcome, latestQuestion };
+};
+
+/**
+ *
+ * @param {ElectionResult} electionResult
+ * @param {{ outcome: string; deadline: bigint }} expectedResult
+ * @returns {boolean}
+ */
+const checkCommitteeElectionResult = (electionResult, expectedResult) => {
+  const {
+    latestOutcome: { outcome, question },
+    latestQuestion: {
+      closingRule: { deadline },
+      questionHandle,
+    },
+  } = electionResult;
+  const { outcome: expectedOutcome, deadline: expectedDeadline } =
+    expectedResult;
+
+  return (
+    expectedOutcome === outcome &&
+    deadline === expectedDeadline &&
+    question === questionHandle
+  );
+};
+
+/**
+ * Depends on "@agoric/governance" package's committee implementation where for a given committee
+ * there's two child nodes in vstorage named "latestOutcome" and "latestQuestion" respectively.
+ *
+ * @param {string} committeePathBase
+ * @param {{
+ *   outcome: string;
+ *   deadline: bigint;
+ * }} expectedResult
+ * @param {{
+ *   vstorage: import('./vstorage-kit').VstorageKit;
+ *   log: typeof console.log,
+ *   setTimeout: typeof global.setTimeout
+ * }} io
+ * @param {WaitUntilOptions} options
+ */
+export const waitUntilElectionResult = (
+  committeePathBase,
+  expectedResult,
+  io,
+  options,
+) => {
+  const { vstorage, log, setTimeout } = io;
+
+  const { maxRetries, retryIntervalMs, errorMessage } =
+    overrideDefaultOptions(options);
+
+  return retryUntilCondition(
+    () => fetchLatestEcQuestion(committeePathBase, vstorage),
+    electionResult =>
+      checkCommitteeElectionResult(electionResult, expectedResult),
+    errorMessage,
+    { maxRetries, retryIntervalMs, log, setTimeout },
+  );
+};