Wait for all dependencies before attempting to deploy environment. Add debug logging for paymaster.

Author: jeffsmale90

packages/delegator-e2e/src/await-dependencies.ts

@@ -16,7 +16,11 @@ const POLL_INTERVAL_MS = 1_000;
 const TIMEOUT_MS = 5 * 60_000;
 let hasTimedOut = false;
 
-const waitFor = async (name: string, url: string) => {
+const waitFor = async (
+  name: string,
+  url: string,
+  debugLoggingEnabled: boolean = false,
+) => {
   let isAvailable: boolean | undefined = undefined;
 
   console.log(`Waiting for ${name}, at ${url}`);
@@ -27,7 +31,13 @@ const waitFor = async (name: string, url: string) => {
   });
 
   do {
+    if (debugLoggingEnabled) {
+      console.log(`Checking ${name}...`);
+    }
     if (isAvailable !== undefined) {
+      if (debugLoggingEnabled) {
+        console.log(`Waiting for ${name}...`);
+      }
       // Only add a delay if it's not the first time
       await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
     }
@@ -36,7 +46,14 @@ const waitFor = async (name: string, url: string) => {
       .request({ method: 'web3_clientVersion' })
       .then(() => (isAvailable = true))
       // as soon as the node is responding (even if it's MethodNotFoundRpcError)
-      .catch((e) => (isAvailable = (e as Error).name !== 'HttpRequestError'));
+      .catch((e) => {
+        isAvailable = (e as Error).name !== 'HttpRequestError';
+        if (debugLoggingEnabled) {
+          console.log(
+            `${name} is ${isAvailable ? 'available' : 'unavailable'}: ${e.name}`,
+          );
+        }
+      });
   } while (!isAvailable && !hasTimedOut);
 
   if (isAvailable) {
@@ -69,11 +86,10 @@ const deployEnvironment = async () => {
 
   const timeoutRef = setTimeout(() => (hasTimedOut = true), TIMEOUT_MS);
 
-  await waitFor('Blockchain node', nodeUrl);
-
   const waitingForDependencies = Promise.all([
+    waitFor('Blockchain node', nodeUrl),
     waitFor('Bundler', bundlerUrl),
-    waitFor('Mock paymaster', paymasterUrl),
+    waitFor('Mock paymaster', paymasterUrl, true),
   ]);
 
   const environment = await deployEnvironment();