Handle ritual initialization timing out

Fixes nucypher#249
theref · Jul 17, 2023 · 1d53cae · 1d53cae
1 parent 49fa8ab
commit 1d53cae
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/agents/coordinator.ts b/src/agents/coordinator.ts
@@ -80,6 +80,15 @@ export class DkgCoordinatorAgent {
     return Coordinator.rituals(ritualId);
   }
 
+  public static async getTimeout(
+    provider: ethers.providers.Web3Provider
+): Promise<number> {
+    const Coordinator = await this.connectReadOnly(provider);
+    const timeout = await Coordinator.timeout();
+    return timeout;
+}
+
+
   public static async getRitualState(
     provider: ethers.providers.Web3Provider,
     ritualId: number

diff --git a/src/dkg.ts b/src/dkg.ts
@@ -122,10 +122,13 @@ export class DkgClient {
     );
 
     if (waitUntilEnd) {
-      const isSuccessful = await DkgClient.waitUntilRitualEnd(
-        web3Provider,
-        ritualId
-      );
+      const timeout = await DkgCoordinatorAgent.getTimeout(web3Provider);
+      const isSuccessful = await Promise.race([
+        DkgClient.waitUntilRitualEnd(web3Provider, ritualId),
+        new Promise((_, reject) =>
+          setTimeout(() => reject(new Error('`Ritual initialization timed out`')), timeout)
+        ),
+      ]);
       if (!isSuccessful) {
         const ritualState = await DkgCoordinatorAgent.getRitualState(
           web3Provider,