From eb9f99d187dda3ba662c34a7f13f22ec63bee335 Mon Sep 17 00:00:00 2001
From: nijoe1 <nick@fil.builders>
Date: Thu, 18 Sep 2025 13:54:55 +0300
Subject: [PATCH 1/2] chore: updated synapse-sdk version

---
 package.json   |  2 +-
 pnpm-lock.yaml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 36701be..161e2cb 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@filoz/synapse-sdk": "^0.24.3",
+    "@filoz/synapse-sdk": "^0.25.1",
     "@rainbow-me/rainbowkit": "^2.2.8",
     "@tanstack/react-query": "^5.83.0",
     "@wagmi/core": "^2.17.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 833259e..363b945 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@filoz/synapse-sdk':
-        specifier: ^0.24.3
-        version: 0.24.3(bufferutil@4.0.9)(typescript@5.9.2)(utf-8-validate@5.0.10)(zod@3.22.4)
+        specifier: ^0.25.1
+        version: 0.25.1(bufferutil@4.0.9)(typescript@5.9.2)(utf-8-validate@5.0.10)(zod@3.22.4)
       '@rainbow-me/rainbowkit':
         specifier: ^2.2.8
         version: 2.2.8(@tanstack/react-query@5.85.8(react@19.1.1))(@types/react@19.1.12)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)(typescript@5.9.2)(viem@2.37.1(bufferutil@4.0.9)(typescript@5.9.2)(utf-8-validate@5.0.10)(zod@3.22.4))(wagmi@2.16.9(@tanstack/query-core@5.85.7)(@tanstack/react-query@5.85.8(react@19.1.1))(@types/react@19.1.12)(bufferutil@4.0.9)(react@19.1.1)(typescript@5.9.2)(utf-8-validate@5.0.10)(viem@2.37.1(bufferutil@4.0.9)(typescript@5.9.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4))
@@ -174,8 +174,8 @@ packages:
     resolution: {integrity: sha512-zQ0IqbdX8FZ9aw11vP+dZkKDkS+kgIvQPHnSAXzP9pLu+Rfu3D3XEeLbicvoXJTYnhZiPmsZUxgdzXwNKxRPbA==}
     engines: {node: '>=14'}
 
-  '@filoz/synapse-sdk@0.24.3':
-    resolution: {integrity: sha512-78HyFPvSZ0T+OSxzU8UHrOeJuwUxq7JwrVj3vMIwMzdV12h/4XxbBSsg3dWdvpMCodcxM4fgZvGGc5vV2iRdMw==}
+  '@filoz/synapse-sdk@0.25.1':
+    resolution: {integrity: sha512-WHlf4ImKA0Gmicv7tJubbwDZexaWSrTWjgXJ3nQecJO5pq3LFuad7wR/ICCKUfgKi3UhYEwRfP5NjwO646xCOg==}
 
   '@gemini-wallet/core@0.2.0':
     resolution: {integrity: sha512-vv9aozWnKrrPWQ3vIFcWk7yta4hQW1Ie0fsNNPeXnjAxkbXr2hqMagEptLuMxpEP2W3mnRu05VDNKzcvAuuZDw==}
@@ -3426,7 +3426,7 @@ snapshots:
       ethereum-cryptography: 2.2.1
       micro-ftch: 0.3.1
 
-  '@filoz/synapse-sdk@0.24.3(bufferutil@4.0.9)(typescript@5.9.2)(utf-8-validate@5.0.10)(zod@3.22.4)':
+  '@filoz/synapse-sdk@0.25.1(bufferutil@4.0.9)(typescript@5.9.2)(utf-8-validate@5.0.10)(zod@3.22.4)':
     dependencies:
       '@web3-storage/data-segment': 5.3.0
       ethers: 6.15.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)

From ff22da3dda99f75224009aaed97cfc348873dda7 Mon Sep 17 00:00:00 2001
From: nijoe1 <nick@fil.builders>
Date: Thu, 18 Sep 2025 13:55:44 +0300
Subject: [PATCH 2/2] feat: first improvements iteration

---
 components/DatasetsViewer.tsx    |   2 +
 components/FileUploader.tsx      |  23 +++--
 hooks/useDatasets.ts             |  64 ++++---------
 types.ts                         |  12 ++-
 utils/calculateStorageMetrics.ts | 157 +++++++++++++++++++++++++++++--
 utils/warmStorageUtils.ts        |  36 -------
 6 files changed, 192 insertions(+), 102 deletions(-)

diff --git a/components/DatasetsViewer.tsx b/components/DatasetsViewer.tsx
index e941190..89632b9 100644
--- a/components/DatasetsViewer.tsx
+++ b/components/DatasetsViewer.tsx
@@ -77,6 +77,8 @@ export const DatasetsViewer = () => {
                       </p>
                     </div>
                     <div className="text-right">
+                      <p className="text-sm text-gray-600">{dataset.message}</p>
+
                       <p className="text-sm text-gray-600">
                         Commission: {dataset.commissionBps / 100}%
                       </p>
diff --git a/components/FileUploader.tsx b/components/FileUploader.tsx
index a9c65fd..4236f33 100644
--- a/components/FileUploader.tsx
+++ b/components/FileUploader.tsx
@@ -11,8 +11,11 @@ export const FileUploader = () => {
   const { uploadFileMutation, uploadedInfo, handleReset, status, progress } =
     useFileUpload();
 
-  const { isPending: isUploading, mutateAsync: uploadFile } =
-    uploadFileMutation;
+  const {
+    isPending: isUploading,
+    mutateAsync: uploadFile,
+    isError,
+  } = uploadFileMutation;
 
   const handleDrag = useCallback((e: React.DragEvent) => {
     e.preventDefault();
@@ -107,20 +110,22 @@ export const FileUploader = () => {
             if (!file) return;
             await uploadFile(file);
           }}
-          disabled={!file || isUploading || !!uploadedInfo}
-          aria-disabled={!file || isUploading}
+          disabled={(!file || isUploading || !!uploadedInfo) && !isError}
+          aria-disabled={(!file || isUploading || !!uploadedInfo) && !isError}
           className={`px-6 py-2 rounded-[20px] text-center border-2 transition-all
             ${
-              !file || isUploading || uploadedInfo
+              (!file || isUploading || !!uploadedInfo) && !isError
                 ? "border-gray-200 text-gray-400 cursor-not-allowed"
                 : "border-secondary text-secondary hover:bg-secondary/70 hover:text-secondary-foreground focus:outline-none focus:ring-2 focus:ring-secondary/50 hover:border-secondary/70 hover:cursor-pointer"
             }
           `}
         >
-          {isUploading
+          {isUploading && !isError
             ? "Uploading..."
             : !uploadedInfo
             ? "Submit"
+            : isError
+            ? "Error(Try again) 🔄"
             : "Submitted"}
         </button>
         <button
@@ -128,11 +133,11 @@ export const FileUploader = () => {
             handleReset();
             setFile(null);
           }}
-          disabled={!file || isUploading}
-          aria-disabled={!file || isUploading}
+          disabled={!file || (isUploading && !isError)}
+          aria-disabled={!file || (isUploading && !isError)}
           className={`px-6 py-2 rounded-[20px] text-center border-2 transition-all
             ${
-              !file || isUploading
+              !file || (isUploading && !isError)
                 ? "border-gray-200 text-gray-400 cursor-not-allowed"
                 : "border-secondary text-secondary hover:bg-secondary/70 hover:text-secondary-foreground focus:outline-none focus:ring-2 focus:ring-secondary/50 hover:border-secondary/70 hover:cursor-pointer"
             }
diff --git a/hooks/useDatasets.ts b/hooks/useDatasets.ts
index 6620705..210e887 100644
--- a/hooks/useDatasets.ts
+++ b/hooks/useDatasets.ts
@@ -5,6 +5,7 @@ import { EnhancedDataSetInfo, PDPServer } from "@filoz/synapse-sdk";
 import { useAccount } from "wagmi";
 import { DataSet } from "@/types";
 import { useSynapse } from "@/providers/SynapseProvider";
+import { getDatasetsSizeInfo } from "@/utils/calculateStorageMetrics";
 
 /**
  * Hook to fetch and manage user datasets from Filecoin storage
@@ -29,7 +30,7 @@ import { useSynapse } from "@/providers/SynapseProvider";
  */
 export const useDatasets = () => {
   const { address } = useAccount();
-  const { synapse, warmStorageService } = useSynapse();
+  const { synapse } = useSynapse();
 
   return useQuery({
     enabled: !!address,
@@ -37,60 +38,28 @@ export const useDatasets = () => {
     queryFn: async () => {
       // STEP 1: Validate prerequisites
       if (!synapse) throw new Error("Synapse not found");
-      if (!address) throw new Error("Address not found");
-      if (!warmStorageService)
-        throw new Error("Warm storage service not found");
-      // Initialize WarmStorage service for dataset management
 
       // STEP 3: Fetch providers and datasets in parallel for efficiency
-      const [providerIds, datasets] = await Promise.all([
-        warmStorageService.getApprovedProviderIds(),
-        warmStorageService.getClientDataSetsWithDetails(address),
-      ]);
-
-      // STEP 4: Create provider ID to address mapping from datasets
-      const providerIdToAddressMap = datasets.reduce((acc, dataset) => {
-        acc[dataset.providerId] = dataset.payee;
-        return acc;
-      }, {} as Record<number, string>);
+      const datasets = await synapse.storage.findDataSets();
 
       // STEP 5: Fetch provider information with error handling
+      const datasetsSizeInfo = await getDatasetsSizeInfo(datasets, synapse);
+      console.log("datasetsSizeInfo", datasetsSizeInfo);
       const providers = await Promise.all(
-        providerIds.map(async (providerId) => {
-          const providerAddress = providerIdToAddressMap[providerId];
-          if (!providerAddress) {
-            return null; // Skip if no address mapping exists
-          }
-          try {
-            return await synapse.getProviderInfo(providerId);
-          } catch (error) {
-            console.warn(`Failed to fetch provider ${providerId}:`, error);
-            return null; // Continue with other providers
-          }
-        })
-      );
-
-      // Filter out failed provider requests
-      const filteredProviders = providers.filter(
-        (provider) => provider !== null
+        datasets.map((dataset) => synapse.getProviderInfo(dataset.providerId))
       );
 
       // STEP 6: Create provider ID to service URL mapping
-      const providerIdToServiceUrlMap = filteredProviders.reduce(
-        (acc, provider) => {
-          acc[provider.id] = provider.products.PDP?.data.serviceURL || "";
-          return acc;
-        },
-        {} as Record<string, string>
-      );
+      const providerIdToServiceUrlMap = providers.reduce((acc, provider) => {
+        acc[provider.id] = provider.products.PDP?.data.serviceURL || "";
+        return acc;
+      }, {} as Record<string, string>);
 
       // STEP 7: Fetch detailed dataset information with PDP data
-      const datasetDetailsPromises = datasets.map(
-        async (dataset: EnhancedDataSetInfo) => {
+      const datasetDataResults = await Promise.all(
+        datasets.map(async (dataset: EnhancedDataSetInfo) => {
           const serviceURL = providerIdToServiceUrlMap[dataset.providerId];
-          const provider = filteredProviders.find(
-            (p) => p.id === dataset.providerId
-          );
+          const provider = providers.find((p) => p.id === dataset.providerId);
 
           try {
             // Connect to PDP server to get piece information
@@ -104,6 +73,7 @@ export const useDatasets = () => {
               provider: provider,
               serviceURL: serviceURL,
               data, // Contains pieces array with CIDs
+              ...datasetsSizeInfo[dataset.pdpVerifierDataSetId],
             } as DataSet;
           } catch (error) {
             console.warn(
@@ -115,14 +85,12 @@ export const useDatasets = () => {
               ...dataset,
               provider: provider,
               serviceURL: serviceURL,
+              message: "datasetsSizeInfo[dataset.pdpVerifierDataSetId].message",
             } as unknown as DataSet;
           }
-        }
+        })
       );
 
-      // STEP 8: Wait for all dataset details to resolve
-      const datasetDataResults = await Promise.all(datasetDetailsPromises);
-
       // STEP 9: Map results back to original dataset order
       const datasetsWithDetails = datasets.map((dataset) => {
         const dataResult = datasetDataResults.find(
diff --git a/types.ts b/types.ts
index da190d1..898a62d 100644
--- a/types.ts
+++ b/types.ts
@@ -4,7 +4,17 @@ import {
   EnhancedDataSetInfo,
 } from "@filoz/synapse-sdk";
 
-export interface DataSet extends EnhancedDataSetInfo {
+export interface DatasetsSizeInfo {
+  leafCount: number;
+  pieceCount: number;
+  withCDN: boolean;
+  sizeInBytes: number;
+  sizeInKiB: number;
+  sizeInMiB: number;
+  sizeInGB: number;
+  message: string;
+}
+export interface DataSet extends EnhancedDataSetInfo, DatasetsSizeInfo {
   data: DataSetData | null;
   provider: ProviderInfo | null;
 }
diff --git a/utils/calculateStorageMetrics.ts b/utils/calculateStorageMetrics.ts
index 6ac07ed..6fb38da 100644
--- a/utils/calculateStorageMetrics.ts
+++ b/utils/calculateStorageMetrics.ts
@@ -1,13 +1,20 @@
-import { Synapse, TIME_CONSTANTS, SIZE_CONSTANTS } from "@filoz/synapse-sdk";
+import {
+  Synapse,
+  TIME_CONSTANTS,
+  SIZE_CONSTANTS,
+  PDPVerifier,
+  EnhancedDataSetInfo,
+} from "@filoz/synapse-sdk";
 import { config } from "@/config";
-import { StorageCalculationResult } from "@/types";
+import { StorageCalculationResult, DatasetsSizeInfo } from "@/types";
 import { calculateRateAllowanceGB } from "@/utils/storageCostUtils";
 import {
-  calculateCurrentStorageUsage,
   fetchWarmStorageCosts,
   fetchWarmStorageBalanceData,
 } from "@/utils/warmStorageUtils";
 
+const LEAF_SIZE = 32n;
+
 /**
  * Calculates storage metrics for WarmStorage service based on balance data and user config.
  * Fetches costs and balances, then computes all relevant metrics for storage and allowance sufficiency.
@@ -41,6 +48,19 @@ export const calculateStorageMetrics = async (
   const lockupPerDayAtCurrentRate =
     TIME_CONSTANTS.EPOCHS_PER_DAY * warmStorageBalance.currentRateUsed;
 
+  const datasets = await synapse.storage.findDataSets();
+
+  const datasetsSizeInfo = await getDatasetsSizeInfo(datasets, synapse);
+
+  const currentStorageBytes = Object.values(datasetsSizeInfo).reduce(
+    (acc, dataset) => acc + dataset.sizeInBytes,
+    0
+  );
+  const currentStorageGB = Object.values(datasetsSizeInfo).reduce(
+    (acc, dataset) => acc + dataset.sizeInGB,
+    0
+  );
+
   // Calculate remaining lockup and persistence days
   const currentLockupRemaining =
     warmStorageBalance.currentLockupAllowance -
@@ -56,10 +76,6 @@ export const calculateStorageMetrics = async (
       ? Infinity
       : 0;
 
-  // Calculate current storage usage (in bytes and GB)
-  const { currentStorageBytes, currentStorageGB } =
-    calculateCurrentStorageUsage(warmStorageBalance, storageCapacityBytes);
-
   // Determine sufficiency of allowances
   const isRateSufficient =
     warmStorageBalance.currentRateAllowance >= rateNeeded;
@@ -81,7 +97,7 @@ export const calculateStorageMetrics = async (
   return {
     rateNeeded, // rate needed per epoch for requested storage
     rateUsed: rateUsed, // rate currently used
-    currentStorageBytes, // current storage used in bytes
+    currentStorageBytes: BigInt(currentStorageBytes), // current storage used in bytes
     currentStorageGB, // current storage used in GB
     totalLockupNeeded, // total lockup needed
     depositNeeded, // deposit needed for storage
@@ -94,3 +110,128 @@ export const calculateStorageMetrics = async (
     currentLockupAllowance, // current lockup allowance
   };
 };
+
+export const getDatasetsSizeInfo = async (
+  datasets: EnhancedDataSetInfo[],
+  synapse: Synapse
+) => {
+  try {
+    const pdpVerifier = new PDPVerifier(
+      synapse.getProvider(),
+      synapse.getPDPVerifierAddress()
+    );
+    if (!datasets || datasets.length === 0) {
+      return {} as Record<number, DatasetsSizeInfo>;
+    }
+
+    const entries = await Promise.all(
+      datasets.map(async (dataset) => {
+        const [leafCountRaw, pieceCountRaw] = await Promise.all([
+          pdpVerifier.getDataSetLeafCount(dataset.pdpVerifierDataSetId),
+          pdpVerifier.getNextPieceId(dataset.pdpVerifierDataSetId),
+        ]);
+
+        const leafCount = Number(leafCountRaw);
+        const pieceCount = Number(pieceCountRaw);
+        const withCDN = dataset.withCDN;
+
+        const sizeInBytes = leafCount * Number(LEAF_SIZE);
+        const sizeInKiB = sizeInBytes / Number(SIZE_CONSTANTS.KiB);
+        const sizeInMiB = sizeInBytes / Number(SIZE_CONSTANTS.MiB);
+        const sizeInGB = sizeInBytes / Number(SIZE_CONSTANTS.GiB);
+
+        const info = {
+          leafCount,
+          pieceCount,
+          withCDN,
+          sizeInBytes,
+          sizeInKiB,
+          sizeInMiB,
+          sizeInGB,
+        };
+
+        const message = getDatasetSizeMessage(info);
+
+        const dataSetSizeInfo: DatasetsSizeInfo = {
+          ...info,
+          message,
+        };
+
+        return [dataset.pdpVerifierDataSetId, dataSetSizeInfo] as const;
+      })
+    );
+
+    return Object.fromEntries(entries) as Record<number, DatasetsSizeInfo>;
+  } catch (error) {
+    console.warn("Failed to get datasets size info:", error);
+    return {} as Record<number, DatasetsSizeInfo>;
+  }
+};
+
+export const getDatasetsSizeMessage = (
+  datasetsSizeInfo: Record<number, Omit<DatasetsSizeInfo, "message">>
+) => {
+  if (Object.keys(datasetsSizeInfo).length === 0) {
+    return "No datasets found";
+  }
+  const sizeInGB = Object.values(datasetsSizeInfo).reduce(
+    (acc, dataset) => acc + dataset?.sizeInGB,
+    0
+  );
+  const sizeInMB = Object.values(datasetsSizeInfo).reduce(
+    (acc, dataset) => acc + dataset?.sizeInMiB,
+    0
+  );
+  const sizeInKB = Object.values(datasetsSizeInfo).reduce(
+    (acc, dataset) => acc + dataset?.sizeInKiB,
+    0
+  );
+  const sizeInBytes = Object.values(datasetsSizeInfo).reduce(
+    (acc, dataset) => acc + dataset?.sizeInBytes,
+    0
+  );
+  if (sizeInGB < 0.1 && sizeInMB > 0.1) {
+    return `Dataset size: ${sizeInMB} MB`;
+  }
+  if (sizeInMB < 0.1 && sizeInKB > 0.1) {
+    return `Dataset size: ${sizeInKB} KB`;
+  }
+  return `Dataset size: ${sizeInBytes} Bytes`;
+};
+
+export const getDatasetSizeMessage = (datasetSizeInfo: {
+  leafCount: number;
+  pieceCount: number;
+  withCDN: boolean;
+  sizeInBytes: number;
+  sizeInKiB: number;
+  sizeInMiB: number;
+  sizeInGB: number;
+}) => {
+  if (datasetSizeInfo?.sizeInGB < 0.1 && datasetSizeInfo?.sizeInMiB > 0.1) {
+    return `Dataset size: ${datasetSizeInfo.sizeInMiB.toFixed(4)} MB`;
+  }
+  if (datasetSizeInfo?.sizeInMiB < 0.1 && datasetSizeInfo?.sizeInKiB > 0.1) {
+    return `Dataset size: ${datasetSizeInfo?.sizeInKiB.toFixed(4)} KB`;
+  }
+  return `Dataset size: ${datasetSizeInfo?.sizeInBytes} Bytes`;
+};
+
+export const getStorageUsage = (
+  datasetsSizeInfo: Record<number, DatasetsSizeInfo>
+): {
+  usageInBytes: number;
+  usageInKiB: number;
+  usageInMiB: number;
+  usageInGB: number;
+} => {
+  return Object.values(datasetsSizeInfo).reduce(
+    (acc, dataset) => ({
+      usageInBytes: acc.usageInBytes + dataset?.sizeInBytes,
+      usageInKiB: acc.usageInKiB + dataset?.sizeInKiB,
+      usageInMiB: acc.usageInMiB + dataset?.sizeInMiB,
+      usageInGB: acc.usageInGB + dataset?.sizeInGB,
+    }),
+    { usageInBytes: 0, usageInKiB: 0, usageInMiB: 0, usageInGB: 0 }
+  );
+};
diff --git a/utils/warmStorageUtils.ts b/utils/warmStorageUtils.ts
index 6ee3290..1d6d8df 100644
--- a/utils/warmStorageUtils.ts
+++ b/utils/warmStorageUtils.ts
@@ -2,7 +2,6 @@ import { config } from "@/config";
 import { WarmStorageBalance, StorageCosts } from "@/types";
 import { DATA_SET_CREATION_FEE } from "@/utils/constants";
 import {
-  SIZE_CONSTANTS,
   Synapse,
   TIME_CONSTANTS,
   WarmStorageService,
@@ -47,41 +46,6 @@ export const fetchWarmStorageBalanceData = async (
   );
 };
 
-/**
- * Calculates current storage usage based on rate usage and storage capacity.
- *
- * @param warmStorageBalance - The WarmStorage balance data
- * @param storageCapacityBytes - The storage capacity in bytes
- * @returns Object with currentStorageBytes and currentStorageGB
- */
-export const calculateCurrentStorageUsage = (
-  warmStorageBalance: WarmStorageBalance,
-  storageCapacityBytes: number
-): { currentStorageBytes: bigint; currentStorageGB: number } => {
-  let currentStorageBytes = 0n;
-  let currentStorageGB = 0;
-
-  if (
-    warmStorageBalance.currentRateUsed > 0n &&
-    warmStorageBalance.rateAllowanceNeeded > 0n
-  ) {
-    try {
-      // Proportionally calculate storage usage based on rate used
-      currentStorageBytes =
-        (warmStorageBalance.currentRateUsed * BigInt(storageCapacityBytes)) /
-        warmStorageBalance.rateAllowanceNeeded;
-      // Convert bytes to GB
-      currentStorageGB =
-        Number(currentStorageBytes) / Number(SIZE_CONSTANTS.GiB);
-      console.log("currentStorageGB", currentStorageGB);
-    } catch (error) {
-      console.warn("Failed to calculate current storage usage:", error);
-    }
-  }
-
-  return { currentStorageBytes, currentStorageGB };
-};
-
 /**
  * Checks if the current allowances and balances are sufficient for storage and dataset creation.
  *