From 555619a02b1523860590916be35c372b1494ee56 Mon Sep 17 00:00:00 2001
From: Arnaud <arnaud@status.im>
Date: Wed, 2 Apr 2025 17:05:48 +0200
Subject: [PATCH] Fix merge

---
 package-lock.json              | 5 ++---
 package.json                   | 4 +++-
 src/marketplace/marketplace.ts | 8 ++------
 src/node/node.ts               | 6 ++++--
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b89356a..eba2921 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,6 @@
       "version": "0.1.1",
       "license": "MIT",
       "dependencies": {
-        "undici": "^7.7.0",
         "valibot": "^1.0.0"
       },
       "devDependencies": {
@@ -26,7 +25,7 @@
         "node": ">=20.18.1"
       },
       "peerDependencies": {
-        "undici": "^7.0.0"
+        "undici": "^7.7.0"
       }
     },
     "node_modules/@apidevtools/json-schema-ref-parser": {
@@ -3477,4 +3476,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 5b90d77..582d7b8 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,9 @@
     "vitest": "^3.1.1"
   },
   "dependencies": {
-    "undici": "^7.7.0",
     "valibot": "^1.0.0"
+  },
+  "peerDependencies": {
+    "undici": "^7.7.0"
   }
 }
\ No newline at end of file
diff --git a/src/marketplace/marketplace.ts b/src/marketplace/marketplace.ts
index 917d2d8..04cd737 100644
--- a/src/marketplace/marketplace.ts
+++ b/src/marketplace/marketplace.ts
@@ -77,8 +77,6 @@ export class CodexMarketplace {
   }: CodexAvailabilityWithoutTypes) {
     const availability: CodexAvailability = {
       ...a,
-      totalSize: a.totalSize,
-      duration: a.duration,
       minPricePerBytePerSecond: parseInt(a.minPricePerBytePerSecond, 10),
       totalCollateral: parseInt(a.totalCollateral, 10),
       totalRemainingCollateral: parseInt(a.totalRemainingCollateral, 10),
@@ -259,8 +257,6 @@ export class CodexMarketplace {
         ...p.request,
         ask: {
           ...p.request.ask,
-          slotSize: p.request.ask.slotSize,
-          duration: p.request.ask.duration,
           proofProbability: parseInt(p.request.ask.proofProbability, 10),
           pricePerBytePerSecond: parseInt(
             p.request.ask.pricePerBytePerSecond,
@@ -352,12 +348,12 @@ export class CodexMarketplace {
       method: "POST",
       headers: FetchAuthBuilder.build(this.auth),
       body: JSON.stringify({
-        duration: duration,
+        duration,
         pricePerBytePerSecond: pricePerBytePerSecond.toString(),
         proofProbability: proofProbability.toString(),
         nodes,
         collateralPerByte: collateralPerByte.toString(),
-        expiry: expiry,
+        expiry,
         tolerance,
       } satisfies CodexStorageRequestCreateBody),
     });
diff --git a/src/node/node.ts b/src/node/node.ts
index 532152f..c304166 100644
--- a/src/node/node.ts
+++ b/src/node/node.ts
@@ -61,6 +61,7 @@ export class CodexNode {
       return Fetch.safeJson<CodexSprJsonResponse>(url, {
         method: "GET",
         headers: {
+          ...FetchAuthBuilder.build(this.auth),
           "Content-Type": "application/json",
         },
       });
@@ -69,8 +70,8 @@ export class CodexNode {
     return Fetch.safeText(url, {
       method: "GET",
       headers: {
-        "Content-Type": "text/plain",
         ...FetchAuthBuilder.build(this.auth),
+        "Content-Type": "text/plain",
       },
     });
   }
@@ -87,6 +88,7 @@ export class CodexNode {
       return Fetch.safeJson<CodexPeerIdJsonResponse>(url, {
         method: "GET",
         headers: {
+          ...FetchAuthBuilder.build(this.auth),
           "Content-Type": "application/json",
         },
       });
@@ -95,8 +97,8 @@ export class CodexNode {
     return Fetch.safeText(url, {
       method: "GET",
       headers: {
-        "Content-Type": "text/plain",
         ...FetchAuthBuilder.build(this.auth),
+        "Content-Type": "text/plain",
       },
     });
   }