feat: change fn that checks blockchain client is connected, add more logs

Author: shamsartem

packages/cli/package/src/lib/dealClient.ts

@@ -140,23 +140,36 @@ export async function resolveDeployment() {
 
 async function createContracts(signerOrProvider: Provider | Signer) {
   const { Contracts } = await import("@fluencelabs/deal-ts-clients");
-  const contracts = new Contracts(signerOrProvider, await resolveDeployment());
+
+  const newContracts = new Contracts(
+    signerOrProvider,
+    await resolveDeployment(),
+  );
+
+  if (contracts !== undefined || readonlyContracts !== undefined) {
+    return newContracts;
+  }
 
   await setTryTimeout(
     "check if blockchain client is connected",
     async () => {
+      dbg(
+        "Going to run contracts.diamond.bytesPerRam() to check if blockchain client is connected",
+      );
+
       // By calling this method we ensure that the blockchain client is connected
-      await contracts.diamond.minDealDepositedEpochs();
+      await newContracts.diamond.bytesPerRam();
+      dbg("Blockchain client is connected");
     },
     (err) => {
       commandObj.error(
-        `Check if blockchain client is connected by running contracts.diamond.minDealDepositedEpochs() failed: ${stringifyUnknown(err)}`,
+        `Check if blockchain client is connected by running contracts.diamond.bytesPerRam() failed: ${stringifyUnknown(err)}`,
       );
     },
     1000 * 5, // 5 seconds
   );
 
-  return contracts;
+  return newContracts;
 }
 
 export async function ensureJsonRpcProvider(): Promise<Provider> {

packages/cli/package/src/lib/helpers/setTryTimeout.ts

@@ -48,15 +48,17 @@ export async function setTryTimeout<T, U>(
     try {
       dbg(`Trying to ${yellowMessage}`);
       const res = await callbackToTry();
-      clearTimeout(timeout);
-      isTrying = false;
 
       if (attemptCounter > 1) {
         commandObj.logToStderr(
           `Succeeded to ${yellowMessage} after ${numToStr(attemptCounter)} attempts`,
         );
+      } else {
+        dbg(`Succeeded to ${yellowMessage}`);
       }
 
+      clearTimeout(timeout);
+      isTrying = false;
       return res;
     } catch (e) {
       if (failCondition !== undefined && failCondition(e)) {