improve startDate and expirationDate display

packages/cli/package/src/lib/chain/commitment.ts

@@ -46,7 +46,7 @@ import type {
   CapacityCommitmentStatus,
   CcDetailsQuery,
 } from "../gql/gqlGenerated.js";
-import { bigintSecondsToDate } from "../helpers/bigintOps.js";
+import { secondsToDate } from "../helpers/bigintOps.js";
 import { stringifyUnknown } from "../helpers/stringifyUnknown.js";
 import { bigintToStr, numToStr } from "../helpers/typesafeStringify.js";
 import { splitErrorsAndResults, commaSepStrToArr } from "../helpers/utils.js";
@@ -1041,6 +1041,23 @@ async function getDetailedCommitmentInfo({
     | undefined;
   ccFromChain: Awaited<ReturnType<Contracts["diamond"]["getCommitment"]>>;
 }) {
+  const { calculateTimestamp } = await import(
+    "@fluencelabs/deal-ts-clients/dist/dealExplorerClient/utils.js"
+  );
+
+  function getStartOrExpirationDate(epoch: bigint) {
+    // if startEpoch is 0, then it's not yet started - no need to show anything
+    return ccFromChain.startEpoch === 0n
+      ? "-"
+      : secondsToDate(
+          calculateTimestamp(
+            Number(epoch),
+            Number(initTimestamp),
+            Number(epochDuration),
+          ),
+        ).toLocaleString();
+  }
+
   const totalRewardsSplit = splitRewards(
     totalRewards,
     ccFromChain.rewardDelegatorRate,
@@ -1081,12 +1098,8 @@ async function getDetailedCommitmentInfo({
     startEpoch: bigintToStr(ccFromChain.startEpoch),
     endEpoch: bigintToStr(ccFromChain.endEpoch),
     currentEpoch: bigintToStr(currentEpoch),
-    startDate: bigintSecondsToDate(
-      initTimestamp + ccFromChain.startEpoch * epochDuration,
-    ).toLocaleString(),
-    expirationDate: bigintSecondsToDate(
-      initTimestamp + ccFromChain.endEpoch * epochDuration,
-    ).toLocaleString(),
+    startDate: getStartOrExpirationDate(ccFromChain.startEpoch),
+    expirationDate: getStartOrExpirationDate(ccFromChain.endEpoch),
     totalCU: bigintToStr(ccFromChain.unitCount),
     missedProofs: bigintToStr(ccFromChain.totalFailCount),
     threshold: bigintToStr(maxFailedRatio * ccFromChain.unitCount),

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

@@ -474,6 +474,10 @@ async function getMatchedOffersByDealId(dealAddress: string) {
     throw new Error(`Deal already has target number of workers matched.`);
   }
 
+  const { calculateEpoch } = await import(
+    "@fluencelabs/deal-ts-clients/dist/dealExplorerClient/utils.js"
+  );
+
   const currentEpoch = calculateEpoch(
     _meta.block.timestamp,
     initTimestamp,
@@ -632,22 +636,6 @@ async function getMatchedOffersByDealId(dealAddress: string) {
   return matchedOffers;
 }
 
-function calculateEpoch(
-  timestamp: number,
-  epochControllerStorageInitTimestamp: number,
-  epochControllerStorageEpochDuration: number,
-) {
-  dbg(
-    `timestamp: ${numToStr(timestamp)} epochControllerStorageInitTimestamp: ${numToStr(epochControllerStorageInitTimestamp)} epochControllerStorageEpochDuration: ${numToStr(epochControllerStorageEpochDuration)}`,
-  );
-
-  return Math.floor(
-    1 +
-      (timestamp - epochControllerStorageInitTimestamp) /
-        epochControllerStorageEpochDuration,
-  );
-}
-
 function prepareDealProviderAccessLists(
   providersAccessType: number,
   providersAccessList:

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

@@ -15,6 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-export function bigintSecondsToDate(bigSec: bigint): Date {
-  return new Date(Number(bigSec * 1000n));
+export function secondsToDate(bigSec: bigint | number): Date {
+  return new Date(Number(bigSec) * 1000);
 }