Skip to content

Feat/improved storage usage calcs #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Feat/improved storage usage calcs #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb9f99d
chore: updated synapse-sdk version
nijoe1 Sep 18, 2025
ff22da3
feat: first improvements iteration
nijoe1 Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions components/DatasetsViewer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
23 changes: 14 additions & 9 deletions components/FileUploader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -107,32 +110,34 @@ 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
onClick={() => {
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"
}
Expand Down
64 changes: 16 additions & 48 deletions hooks/useDatasets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -29,68 +30,36 @@ import { useSynapse } from "@/providers/SynapseProvider";
*/
export const useDatasets = () => {
const { address } = useAccount();
const { synapse, warmStorageService } = useSynapse();
const { synapse } = useSynapse();

return useQuery({
enabled: !!address,
queryKey: ["datasets", address],
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
Expand All @@ -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(
Expand All @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 11 additions & 1 deletion types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Loading