-
- Port forwarding should be {forwardingPortValue} for TCP and 8090 by
- default for UDP.
-
+
Ensure that port forwarding is enabled for your settings.
diff --git a/src/components/ManifestFetch/ManifestFetch.tsx b/src/components/ManifestFetch/ManifestFetch.tsx
index 082f1a2..c611cad 100644
--- a/src/components/ManifestFetch/ManifestFetch.tsx
+++ b/src/components/ManifestFetch/ManifestFetch.tsx
@@ -11,6 +11,17 @@ export function ManifestFetch() {
const { refetch } = useQuery({
queryFn: () => {
+ CodexSdk.data()
+ .networkDownload(cid)
+ .then((s) => {
+ if (s.error === false) {
+ setCid("");
+ queryClient.invalidateQueries({ queryKey: ["cids"] });
+ console.info("Done");
+ }
+ return Promises.rejectOnError(s);
+ });
+
return CodexSdk.data()
.fetchManifest(cid)
.then((s) => {
diff --git a/src/components/Purchase/PurchasesTable.tsx b/src/components/Purchase/PurchasesTable.tsx
index c776850..c771879 100644
--- a/src/components/Purchase/PurchasesTable.tsx
+++ b/src/components/Purchase/PurchasesTable.tsx
@@ -80,7 +80,7 @@ export function PurchasesTable() {
["request id"],
["duration", onSortByDuration],
["slots"],
- ["reward", onSortByReward],
+ ["price per byte", onSortByReward],
["proof probability"],
["state", onSortByState],
] satisfies [string, ((state: TabSortState) => void)?][];
@@ -90,9 +90,8 @@ export function PurchasesTable() {
const rows = sorted.map((p, index) => {
const r = p.request;
const ask = p.request.ask;
- const duration = parseInt(p.request.ask.duration, 10);
- const pf = parseInt(p.request.ask.proofProbability, 10);
-
+ const duration = parseInt(ask.duration, 10);
+ const pf = parseInt(ask.proofProbability, 10);
return (
|
,
{Times.pretty(duration)} | ,
{ask.slots.toString()} | ,
- {ask.reward + " CDX"} | ,
+ {p.request.ask.pricePerBytePerSecond + " CDX"} | ,
{pf.toString()} | ,
,
]}>
diff --git a/src/components/Purchase/purchase.utils.ts b/src/components/Purchase/purchase.utils.ts
index 3005d8b..4d77736 100644
--- a/src/components/Purchase/purchase.utils.ts
+++ b/src/components/Purchase/purchase.utils.ts
@@ -1,42 +1,42 @@
-import { TabSortState } from "@codex-storage/marketplace-ui-components"
-import { CodexPurchase } from "@codex-storage/sdk-js"
+import { TabSortState } from "@codex-storage/marketplace-ui-components";
+import { CodexPurchase, CodexStorageRequest } from "@codex-storage/sdk-js";
export const PurchaseUtils = {
- sortById: (state: TabSortState) =>
- (a: CodexPurchase, b: CodexPurchase) => {
-
- return state === "desc"
- ? b.requestId
- .toLocaleLowerCase()
- .localeCompare(a.requestId.toLocaleLowerCase())
- : a.requestId
- .toLocaleLowerCase()
- .localeCompare(b.requestId.toLocaleLowerCase())
- },
- sortByState: (state: TabSortState) =>
- (a: CodexPurchase, b: CodexPurchase) => state === "desc"
- ? b.state
- .toLocaleLowerCase()
- .localeCompare(a.state.toLocaleLowerCase())
- : a.state
- .toLocaleLowerCase()
- .localeCompare(b.state.toLocaleLowerCase())
- ,
- sortByDuration: (state: TabSortState) =>
- (a: CodexPurchase, b: CodexPurchase) => state === "desc"
- ? Number(b.request.ask.duration) - Number(a.request.ask.duration)
- : Number(a.request.ask.duration) - Number(b.request.ask.duration)
- ,
- sortByReward: (state: TabSortState) =>
- (a: CodexPurchase, b: CodexPurchase) => state === "desc"
- ? Number(b.request.ask.reward) - Number(a.request.ask.reward)
- : Number(a.request.ask.reward) - Number(b.request.ask.reward)
- ,
- sortByUploadedAt: (state: TabSortState, table: Record) =>
- (a: CodexPurchase, b: CodexPurchase) => {
- return state === "desc"
- ? (table[b.requestId] || 0) - (table[a.requestId] || 0)
- : (table[a.requestId] || 0) - (table[b.requestId] || 0)
- }
- ,
-}
\ No newline at end of file
+ sortById: (state: TabSortState) => (a: CodexPurchase, b: CodexPurchase) => {
+ return state === "desc"
+ ? b.requestId
+ .toLocaleLowerCase()
+ .localeCompare(a.requestId.toLocaleLowerCase())
+ : a.requestId
+ .toLocaleLowerCase()
+ .localeCompare(b.requestId.toLocaleLowerCase());
+ },
+ sortByState: (state: TabSortState) => (a: CodexPurchase, b: CodexPurchase) =>
+ state === "desc"
+ ? b.state.toLocaleLowerCase().localeCompare(a.state.toLocaleLowerCase())
+ : a.state.toLocaleLowerCase().localeCompare(b.state.toLocaleLowerCase()),
+ sortByDuration:
+ (state: TabSortState) => (a: CodexPurchase, b: CodexPurchase) =>
+ state === "desc"
+ ? Number(b.request.ask.duration) - Number(a.request.ask.duration)
+ : Number(a.request.ask.duration) - Number(b.request.ask.duration),
+ sortByReward:
+ (state: TabSortState) => (a: CodexPurchase, b: CodexPurchase) => {
+ const aPrice = parseInt(a.request.ask.pricePerBytePerSecond, 10);
+ const bPrice = parseInt(b.request.ask.pricePerBytePerSecond, 10);
+ return state === "desc" ? bPrice - aPrice : aPrice - bPrice;
+ },
+ sortByUploadedAt:
+ (state: TabSortState, table: Record) =>
+ (a: CodexPurchase, b: CodexPurchase) => {
+ return state === "desc"
+ ? (table[b.requestId] || 0) - (table[a.requestId] || 0)
+ : (table[a.requestId] || 0) - (table[b.requestId] || 0);
+ },
+ calculatePrice(request: CodexStorageRequest) {
+ return (
+ parseInt(request.ask.slotSize, 10) *
+ parseInt(request.ask.pricePerBytePerSecond, 10)
+ );
+ },
+};
diff --git a/src/components/StorageRequestSetup/StorageRequestCreate.tsx b/src/components/StorageRequestSetup/StorageRequestCreate.tsx
index 3158d41..f2a674b 100644
--- a/src/components/StorageRequestSetup/StorageRequestCreate.tsx
+++ b/src/components/StorageRequestSetup/StorageRequestCreate.tsx
@@ -83,12 +83,26 @@ export function StorageRequestCreate() {
WebStorage.set("storage-request-step", step);
if (step == CONFIRM_STATE) {
- const { availability, availabilityUnit, expiration, ...rest } =
- storageRequest;
+ const {
+ availability,
+ availabilityUnit,
+ expiration,
+ reward,
+ collateral,
+ proofProbability,
+ cid,
+ nodes,
+ tolerance,
+ } = storageRequest;
mutateAsync({
- ...rest,
duration: Math.trunc(availability * Times.value(availabilityUnit)),
+ pricePerBytePerSecond: reward,
+ proofProbability,
+ collateralPerByte: collateral,
expiry: expiration * 60,
+ cid,
+ nodes,
+ tolerance,
});
} else {
dispatch({
diff --git a/src/components/StorageRequestSetup/StorageRequestFileChooser.tsx b/src/components/StorageRequestSetup/StorageRequestFileChooser.tsx
index 9f934ae..8514b40 100644
--- a/src/components/StorageRequestSetup/StorageRequestFileChooser.tsx
+++ b/src/components/StorageRequestSetup/StorageRequestFileChooser.tsx
@@ -12,6 +12,7 @@ import { StorageRequestComponentProps } from "./types";
import { useQueryClient } from "@tanstack/react-query";
import ChooseCidIcon from "../../assets/icons/choose-cid.svg?react";
import UploadIcon from "../../assets/icons/upload.svg?react";
+import { FilesUtils } from "../Files/files.utils";
export function StorageRequestFileChooser({
storageRequest,
@@ -39,6 +40,8 @@ export function StorageRequestFileChooser({
};
const onSuccess = (data: string) => {
+ FilesUtils.setUploadedAt(data, Date.now() / 1000);
+
queryClient.invalidateQueries({ queryKey: ["cids"] });
onStorageRequestChange({ cid: data });
diff --git a/src/components/StorageRequestSetup/StorageRequestReview.tsx b/src/components/StorageRequestSetup/StorageRequestReview.tsx
index 787e382..c04b8c6 100644
--- a/src/components/StorageRequestSetup/StorageRequestReview.tsx
+++ b/src/components/StorageRequestSetup/StorageRequestReview.tsx
@@ -282,7 +282,7 @@ export function StorageRequestReview({
onChange={onAvailabilityChange}
onValidation={isInvalidAvailability}>
+ title="Price per byte">
diff --git a/src/components/UploadCard/UploadCard.tsx b/src/components/UploadCard/UploadCard.tsx
index a437007..b598a7f 100644
--- a/src/components/UploadCard/UploadCard.tsx
+++ b/src/components/UploadCard/UploadCard.tsx
@@ -2,11 +2,13 @@ import { Upload } from "@codex-storage/marketplace-ui-components";
import { CodexSdk } from "../../sdk/codex";
import { useQueryClient } from "@tanstack/react-query";
import UploadIcon from "../../assets/icons/upload.svg?react";
+import { FilesUtils } from "../Files/files.utils";
export function UploadCard() {
const queryClient = useQueryClient();
- const onSuccess = () => {
+ const onSuccess = (cid: string) => {
+ FilesUtils.setUploadedAt(cid, Date.now() / 1000);
queryClient.invalidateQueries({ queryKey: ["cids"] });
};
diff --git a/src/hooks/useData.tsx b/src/hooks/useData.tsx
index 19e7b52..a2865f1 100644
--- a/src/hooks/useData.tsx
+++ b/src/hooks/useData.tsx
@@ -2,6 +2,7 @@ import { useQuery } from "@tanstack/react-query";
import { CodexSdk } from "../sdk/codex";
import { CodexDataResponse } from "@codex-storage/sdk-js";
import { Promises } from "../utils/promises";
+import { FilesUtils } from "../components/Files/files.utils";
export function useData() {
const { data = { content: [] } satisfies CodexDataResponse } =
@@ -29,5 +30,8 @@ export function useData() {
throwOnError: true,
});
- return data.content;
+ return data.content.map((c) => ({
+ ...c,
+ uploadedAt: FilesUtils.getUploadedAt(c.cid),
+ }));
}
diff --git a/src/main.tsx b/src/main.tsx
index 0fe4066..da29709 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -21,6 +21,7 @@ import { SettingsRoute } from "./routes/dashboard/settings.tsx";
import { HelpRoute } from "./routes/dashboard/help.tsx";
import { DisclaimerRoute } from "./routes/dashboard/disclaimer.tsx";
import { RouteErrorBoundary } from "./components/RouteErrorBoundary/RouteErrorBoundary.tsx";
+import { HealthCheckUtils } from "./components/HealthChecks/health-check.utils.ts";
if (import.meta.env.PROD && !import.meta.env.CI) {
Sentry.init({
@@ -117,14 +118,36 @@ const queryClient = new QueryClient();
const rootElement = document.getElementById("root")!;
if (rootElement) {
- CodexSdk.load().then(() => {
- render(
-
-
-
-
- ,
- rootElement
- );
- });
+ CodexSdk.load()
+ .then(() => {
+ const queryString = window.location.search;
+ if (queryString) {
+ const urlParams = new URLSearchParams(queryString);
+ const param = urlParams.get("api-port");
+ if (param) {
+ const port = parseInt(param, 10);
+ if (!isNaN(port)) {
+ const address = HealthCheckUtils.removePort(CodexSdk.url());
+
+ const url = address + ":" + port;
+
+ if (HealthCheckUtils.isUrlInvalid(url)) {
+ return;
+ }
+
+ return CodexSdk.updateURL(url);
+ }
+ }
+ }
+ })
+ .then(() => {
+ render(
+
+
+
+
+ ,
+ rootElement
+ );
+ });
}
diff --git a/src/proxy.ts b/src/proxy.ts
index 28be468..a705af3 100644
--- a/src/proxy.ts
+++ b/src/proxy.ts
@@ -7,10 +7,7 @@ import {
import { CodexSdk as Sdk } from "./sdk/codex";
import { WebStorage } from "./utils/web-storage";
-class CodexDataMock extends CodexData {
-
-}
-
+class CodexDataMock extends CodexData {}
class CodexMarketplaceMock extends CodexMarketplace {
// override async purchases(): Promise> {
@@ -31,26 +28,29 @@ class CodexMarketplaceMock extends CodexMarketplace {
// }
/**
- * Maintains a temporary link between the CID and the file metadata.
- * When the metadata is available in the manifest, the CID link
- * should still be maintained, but the metadata should be retrieved
+ * Maintains a temporary link between the CID and the file metadata.
+ * When the metadata is available in the manifest, the CID link
+ * should still be maintained, but the metadata should be retrieved
* using a REST API call.
*/
- override async createStorageRequest(input: CodexCreateStorageRequestInput): Promise> {
- const res = await super.createStorageRequest(input)
+ override async createStorageRequest(
+ input: CodexCreateStorageRequestInput
+ ): Promise> {
+ console.info(input);
+ const res = await super.createStorageRequest(input);
if (res.error) {
- return res
+ console.error(res.data);
+ return res;
}
- await WebStorage.purchases.set("0x" + res.data, input.cid)
+ await WebStorage.purchases.set("0x" + res.data, input.cid);
// await PurchaseDatesStorage.set(res.data, new Date().toJSON())
- return res
+ return res;
}
-
// override createStorageRequest(
// input: CodexCreateStorageRequestInput
// ): Promise> {
@@ -139,5 +139,3 @@ export const CodexSdk = {
marketplace: () => new CodexMarketplaceMock(CodexSdk.url()),
data: () => new CodexDataMock(CodexSdk.url()),
};
-
-
diff --git a/src/utils/times.ts b/src/utils/times.ts
index 055513b..cd2490d 100644
--- a/src/utils/times.ts
+++ b/src/utils/times.ts
@@ -7,9 +7,9 @@ export type TimesUnit =
| "seconds";
const plural = (value: number, unit: TimesUnit) => {
- const val = Number.isInteger(value) ? value : value.toFixed(1)
+ const val = Number.isInteger(value) ? value : value.toFixed(1);
return value > 1 ? val + ` ${unit}` : val + ` ${unit.slice(0, -1)}`;
-}
+};
export const Times = {
toSeconds(value: number, unit: TimesUnit) {
@@ -73,24 +73,23 @@ export const Times = {
seconds /= 30;
if (value >= seconds) {
- return "days"
+ return "days";
}
- return "hours"
+ return "hours";
},
value(unit: "hours" | "days" | "months") {
switch (unit) {
case "months": {
- return 30 * 24 * 60 * 60
+ return 30 * 24 * 60 * 60;
}
case "days": {
- return 24 * 60 * 60
+ return 24 * 60 * 60;
}
default: {
- return 60 * 60
+ return 60 * 60;
}
}
- }
-
+ },
};
diff --git a/src/utils/web-storage.ts b/src/utils/web-storage.ts
index 4136c5b..cc37db0 100644
--- a/src/utils/web-storage.ts
+++ b/src/utils/web-storage.ts
@@ -1,6 +1,5 @@
import { createStore, del, entries, get, set } from "idb-keyval";
-
export const WebStorage = {
set(key: string, value: unknown) {
return set(key, value);
@@ -16,27 +15,27 @@ export const WebStorage = {
onBoarding: {
getStep() {
- return parseInt(localStorage.getItem("onboarding-step") || "0", 10)
+ return parseInt(localStorage.getItem("onboarding-step") || "0", 10);
},
setStep(step: number) {
- localStorage.setItem("onboarding-step", step.toString())
+ localStorage.setItem("onboarding-step", step.toString());
},
setDisplayName(displayName: string) {
- localStorage.setItem("display-name", displayName)
+ localStorage.setItem("display-name", displayName);
},
getDisplayName() {
- return localStorage.getItem("display-name") || ""
+ return localStorage.getItem("display-name") || "";
},
setEmoji(emoji: string) {
- localStorage.setItem("emoji", emoji)
+ localStorage.setItem("emoji", emoji);
},
getEmoji() {
- return localStorage.getItem("emoji") || "🤖"
+ return localStorage.getItem("emoji") || "🤖";
},
},
@@ -48,33 +47,35 @@ export const WebStorage = {
},
async list(): Promise<[string, string[]][]> {
- const items = await entries(this.store) || []
+ const items = (await entries(this.store)) || [];
if (items.length == 0) {
- return [["Favorites", []]]
+ return [["Favorites", []]];
}
if (items[0][0] !== "Favorites") {
- return [["Favorites", []], ...items]
+ return [["Favorites", []], ...items];
}
-
- return items
+ return items;
},
delete(key: string) {
return del(key, this.store);
},
async addFile(folder: string, cid: string) {
- const files = await get(folder, this.store) || []
+ const files = (await get(folder, this.store)) || [];
- return set(folder, [...files, cid], this.store)
+ return set(folder, [...files, cid], this.store);
},
async deleteFile(folder: string, cid: string) {
- const files = await get(folder, this.store) || []
-
- return set(folder, files.filter(item => item !== cid), this.store)
+ const files = (await get(folder, this.store)) || [];
+ return set(
+ folder,
+ files.filter((item) => item !== cid),
+ this.store
+ );
},
},
@@ -97,7 +98,6 @@ export const WebStorage = {
purchases: {
store: createStore("purchases", "purchases"),
-
async get(key: string) {
return get(key, this.store);
},
@@ -120,6 +120,6 @@ export const WebStorage = {
async set(key: string, date: string) {
return set(key, date, this.store);
},
- }
- }
+ },
+ },
};