@crypticdot/defituna-api 1.1.55 → 1.2.0

package/dist/index.js

@@ -90,6 +90,10 @@ __export(schemas_exports, {
   TunaPositionNotification: () => TunaPositionNotification,
   TunaPositionState: () => TunaPositionState,
   TunaPositionStateSchema: () => TunaPositionStateSchema,
+  TunaSpotPosition: () => TunaSpotPosition,
+  TunaSpotPositionNotification: () => TunaSpotPositionNotification,
+  TunaSpotPositionState: () => TunaSpotPositionState,
+  TunaSpotPositionStateSchema: () => TunaSpotPositionStateSchema,
   UpdateStreamSubscriptionResult: () => UpdateStreamSubscriptionResult,
   Vault: () => Vault,
   VaultHistoricalStats: () => VaultHistoricalStats,
@@ -135,6 +139,10 @@ var TunaPositionState = {
   CLOSED_BY_LIMIT_ORDER: "closed_by_limit_order",
   CLOSED: "closed"
 };
+var TunaSpotPositionState = {
+  OPEN: "open",
+  CLOSED: "closed"
+};
 var LimitOrderState = {
   OPEN: "open",
   PARTIALLY_FILLED: "partially_filled",
@@ -156,6 +164,7 @@ var PoolSubscriptionTopic = {
 };
 var WalletSubscriptionTopic = {
   TUNA_POSITIONS: "tuna_positions",
+  TUNA_SPOT_POSITIONS: "tuna_spot_positions",
   LENDING_POSITIONS: "lending_positions",
   FUSION_LIMIT_ORDERS: "fusion_limit_orders",
   STAKING_POSITION: "staking_position"
@@ -164,6 +173,10 @@ var NotificationEntitySchema = import_zod.z.enum([NotificationEntity.POOL_SWAP,
 var NotificationActionSchema = import_zod.z.enum([NotificationAction.CREATE, ...Object.values(NotificationAction)]);
 var PoolProviderSchema = import_zod.z.enum([PoolProvider.ORCA, ...Object.values(PoolProvider)]);
 var TunaPositionStateSchema = import_zod.z.enum([TunaPositionState.OPEN, ...Object.values(TunaPositionState)]);
+var TunaSpotPositionStateSchema = import_zod.z.enum([
+  TunaSpotPositionState.OPEN,
+  ...Object.values(TunaSpotPositionState)
+]);
 var LimitOrderStateSchema = import_zod.z.enum([LimitOrderState.OPEN, ...Object.values(LimitOrderState)]);
 var StakingPositionHistoryActionTypeSchema = import_zod.z.enum([
   StakingPositionHistoryActionType.STAKE,
@@ -353,6 +366,30 @@ var TunaPosition = import_zod.z.object({
   updatedAtSlot: import_zod.z.coerce.bigint(),
   closedAt: import_zod.z.nullable(import_zod.z.coerce.date())
 });
+var TunaSpotPosition = import_zod.z.object({
+  address: import_zod.z.string(),
+  authority: import_zod.z.string(),
+  version: import_zod.z.number(),
+  state: TunaSpotPositionStateSchema,
+  entrySqrtPrice: import_zod.z.coerce.bigint(),
+  lowerLimitOrderSqrtPrice: import_zod.z.coerce.bigint(),
+  upperLimitOrderSqrtPrice: import_zod.z.coerce.bigint(),
+  flags: import_zod.z.number(),
+  pool: import_zod.z.string(),
+  poolSqrtPrice: import_zod.z.coerce.bigint(),
+  collateralToken: import_zod.z.string(),
+  borrowToken: import_zod.z.string(),
+  positionToken: import_zod.z.string(),
+  collateral: amountWithUsd,
+  loanFunds: amountWithUsd,
+  currentLoan: amountWithUsd,
+  total: amountWithUsd,
+  pnlUsd: usdPnl,
+  openedAt: import_zod.z.coerce.date(),
+  openedAtSlot: import_zod.z.coerce.bigint(),
+  updatedAtSlot: import_zod.z.coerce.bigint(),
+  closedAt: import_zod.z.nullable(import_zod.z.coerce.date())
+});
 var PoolSwap = import_zod.z.object({
   id: import_zod.z.string(),
   amountIn: import_zod.z.coerce.bigint(),
@@ -514,6 +551,7 @@ var PoolSwapNotification = createNotificationSchema(PoolSwap);
 var PoolPriceUpdateNotification = createNotificationSchema(PoolPriceUpdate);
 var OrderBookNotification = createNotificationSchema(OrderBook, OrderBookNotificationMeta);
 var TunaPositionNotification = createNotificationSchema(TunaPosition);
+var TunaSpotPositionNotification = createNotificationSchema(TunaSpotPosition);
 var LendingPositionNotification = createNotificationSchema(LendingPosition);
 var LimitOrderNotification = createNotificationSchema(LimitOrder);
 var StakingPositionNotification = createNotificationSchema(StakingPosition);
@@ -588,35 +626,35 @@ var TunaApiClient = class {
   /* Endpoints */
   async getMints() {
     const url = this.buildURL("mints");
-    return await this.httpRequest(url.toString(), Mint.array());
+    return await this.httpRequest(url, Mint.array());
   }
   async getMint(mintAddress) {
     const url = this.buildURL(`mints/${mintAddress}`);
-    return await this.httpRequest(url.toString(), Mint);
+    return await this.httpRequest(url, Mint);
   }
   async getMarkets() {
     const url = this.buildURL("markets");
-    return await this.httpRequest(url.toString(), Market.array());
+    return await this.httpRequest(url, Market.array());
   }
   async getMarket(marketAddress) {
     const url = this.buildURL(`markets/${marketAddress}`);
-    return await this.httpRequest(url.toString(), Market);
+    return await this.httpRequest(url, Market);
   }
   async getOraclePrices() {
     const url = this.buildURL("oracle-prices");
-    return await this.httpRequest(url.toString(), TokenOraclePrice.array());
+    return await this.httpRequest(url, TokenOraclePrice.array());
   }
   async getOraclePrice(mintAddress) {
     const url = this.buildURL(`oracle-prices/${mintAddress}`);
-    return await this.httpRequest(url.toString(), TokenOraclePrice);
+    return await this.httpRequest(url, TokenOraclePrice);
   }
   async getVaults() {
     const url = this.buildURL("vaults");
-    return await this.httpRequest(url.toString(), Vault.array());
+    return await this.httpRequest(url, Vault.array());
   }
   async getVault(vaultAddress) {
     const url = this.buildURL(`vaults/${vaultAddress}`);
-    return await this.httpRequest(url.toString(), Vault);
+    return await this.httpRequest(url, Vault);
   }
   /**
    *  Returns vault historical data for selected time interval.
@@ -624,137 +662,140 @@ var TunaApiClient = class {
    *  Example usage: getVaultHistory('H3ifgix98vzi3yCPbmZDLTheeTRf2jykXx8FpY5L7Sfd', '2025-03-10', '2025-04-10')
    */
   async getVaultHistory(vaultAddress, from, to) {
-    const url = this.buildURL(`vaults/${vaultAddress}/history`);
-    this.appendUrlSearchParams(url, { from: from.toISOString().slice(0, 10), to: to.toISOString().slice(0, 10) });
-    return await this.httpRequest(url.toString(), VaultHistoricalStats.array());
+    const url = this.appendUrlSearchParams(this.buildURL(`vaults/${vaultAddress}/history`), {
+      from: from.toISOString().slice(0, 10),
+      to: to.toISOString().slice(0, 10)
+    });
+    return await this.httpRequest(url, VaultHistoricalStats.array());
   }
   async getPools(providerFilter) {
-    const url = this.buildURL("pools");
-    if (providerFilter && providerFilter !== "all" /* ALL */) {
-      this.appendUrlSearchParams(url, { provider: providerFilter });
-    }
-    return await this.httpRequest(url.toString(), Pool.array());
+    const url = this.appendUrlSearchParams(this.buildURL("pools"), {
+      provider: providerFilter && providerFilter !== "all" /* ALL */ ? providerFilter : void 0
+    });
+    return await this.httpRequest(url, Pool.array());
   }
   async getPool(address) {
     const url = this.buildURL(`pools/${address}`);
-    return await this.httpRequest(url.toString(), Pool);
+    return await this.httpRequest(url, Pool);
   }
   async getPoolTicks(poolAddress) {
     const url = this.buildURL(`pools/${poolAddress}/ticks`);
-    return await this.httpRequest(url.toString(), PoolTicks);
+    return await this.httpRequest(url, PoolTicks);
   }
   async getPoolSwaps(poolAddress) {
     const url = this.buildURL(`pools/${poolAddress}/swaps`);
-    return await this.httpRequest(url.toString(), PoolSwap.array());
+    return await this.httpRequest(url, PoolSwap.array());
   }
   async getPoolOrderBook(poolAddress, priceStep, inverted) {
-    const url = this.buildURL(`pools/${poolAddress}/order-book`);
-    this.appendUrlSearchParams(url, { price_step: priceStep.toString() });
-    if (inverted) {
-      this.appendUrlSearchParams(url, { inverted: inverted.toString() });
-    }
-    return await this.httpRequest(url.toString(), OrderBook);
+    const url = this.appendUrlSearchParams(this.buildURL(`pools/${poolAddress}/order-book`), {
+      price_step: priceStep,
+      inverted: inverted || void 0
+    });
+    return await this.httpRequest(url, OrderBook);
   }
   async getPoolPriceCandles(poolAddress, options) {
     const { from, to, interval, candles } = options;
-    const url = this.buildURL(`pools/${poolAddress}/candles`);
-    this.appendUrlSearchParams(url, {
+    const url = this.appendUrlSearchParams(this.buildURL(`pools/${poolAddress}/candles`), {
       from: from.toISOString(),
       to: to.toISOString(),
-      candles: candles.toString(),
+      candles,
       interval
     });
-    return await this.httpRequest(url.toString(), PoolPriceCandle.array());
+    return await this.httpRequest(url, PoolPriceCandle.array());
   }
   async getStakingTreasury() {
     const url = this.buildURL(`staking/treasury`);
-    return await this.httpRequest(url.toString(), StakingTreasury);
+    return await this.httpRequest(url, StakingTreasury);
   }
   async getStakingLeaderboard(page, pageSize, search) {
-    const url = this.buildURL(`staking/leaderboard`);
-    this.appendUrlSearchParams(url, {
-      page: page.toString(),
-      page_size: pageSize.toString(),
-      ...search ? { search } : {}
+    const url = this.appendUrlSearchParams(this.buildURL(`staking/leaderboard`), {
+      page,
+      page_size: pageSize,
+      search: search || void 0
     });
-    return await this.httpRequest(url.toString(), StakingLeaderboardPage, { parseRoot: true });
+    return await this.httpRequest(url, StakingLeaderboardPage, { parseRoot: true });
   }
   async getUserLendingPositions(userAddress) {
     const url = this.buildURL(`users/${userAddress}/lending-positions`);
-    return await this.httpRequest(url.toString(), LendingPosition.array());
+    return await this.httpRequest(url, LendingPosition.array());
   }
   async getUserLendingPositionByAddress(userAddress, lendingPositionAddress) {
     const url = this.buildURL(`users/${userAddress}/lending-positions/${lendingPositionAddress}`);
-    return await this.httpRequest(url.toString(), LendingPosition);
+    return await this.httpRequest(url, LendingPosition);
   }
   async getUserTunaPositions(userAddress) {
     const url = this.buildURL(`users/${userAddress}/tuna-positions`);
-    return await this.httpRequest(url.toString(), TunaPosition.array());
+    return await this.httpRequest(url, TunaPosition.array());
   }
   async getUserTunaPositionByAddress(userAddress, tunaPositionAddress) {
     const url = this.buildURL(`users/${userAddress}/tuna-positions/${tunaPositionAddress}`);
-    return await this.httpRequest(url.toString(), TunaPosition);
+    return await this.httpRequest(url, TunaPosition);
+  }
+  async getUserTunaSpotPositions(userAddress) {
+    const url = this.buildURL(`users/${userAddress}/spot-positions`);
+    return await this.httpRequest(url, TunaSpotPosition.array());
+  }
+  async getUserTunaSpotPositionByAddress(userAddress, tunaSpotPositionAddress) {
+    const url = this.buildURL(`users/${userAddress}/spot-positions/${tunaSpotPositionAddress}`);
+    return await this.httpRequest(url, TunaSpotPosition);
   }
   async getUserLimitOrders(userAddress, poolFilter) {
-    const url = this.buildURL(`users/${userAddress}/limit-orders`);
-    if (poolFilter) {
-      this.appendUrlSearchParams(url, { pool: poolFilter });
-    }
-    return await this.httpRequest(url.toString(), LimitOrder.array());
+    const url = this.appendUrlSearchParams(this.buildURL(`users/${userAddress}/limit-orders`), {
+      pool: poolFilter || void 0
+    });
+    return await this.httpRequest(url, LimitOrder.array());
   }
   async getUserLimitOrderByAddress(userAddress, limitOrderAddress) {
     const url = this.buildURL(`users/${userAddress}/limit-orders/${limitOrderAddress}`);
-    return await this.httpRequest(url.toString(), LimitOrder);
+    return await this.httpRequest(url, LimitOrder);
   }
   async getUserStakingPosition(userAddress) {
     const url = this.buildURL(`users/${userAddress}/staking-position`);
-    return await this.httpRequest(url.toString(), StakingPosition);
+    return await this.httpRequest(url, StakingPosition);
   }
   async getUserStakingPositionHistory(userAddress) {
     const url = this.buildURL(`users/${userAddress}/staking-position/history`);
-    return await this.httpRequest(url.toString(), StakingPositionHistoryAction.array());
+    return await this.httpRequest(url, StakingPositionHistoryAction.array());
   }
   async getFeesStats(from, to, interval) {
-    const url = this.buildURL(`stats/fees`);
-    this.appendUrlSearchParams(url, {
+    const url = this.appendUrlSearchParams(this.buildURL(`stats/fees`), {
       from: from.toISOString(),
       to: to.toISOString(),
       interval
     });
-    return await this.httpRequest(url.toString(), FeesStatsGroup.array());
+    return await this.httpRequest(url, FeesStatsGroup.array());
   }
   async getStakingRevenueStats(from, to) {
-    const url = this.buildURL(`stats/staking/revenue`);
-    this.appendUrlSearchParams(url, {
+    const url = this.appendUrlSearchParams(this.buildURL(`stats/staking/revenue`), {
       from: from.toISOString().split("T")[0],
       to: to.toISOString().split("T")[0]
     });
-    return await this.httpRequest(url.toString(), StakingRevenueStatsGroup.array());
+    return await this.httpRequest(url, StakingRevenueStatsGroup.array());
   }
   async getUpdatesStream() {
     const url = this.buildURL(`streams/sse`);
-    return new EventSource(url.toString());
+    return new EventSource(url);
   }
   async updateStreamSubscription(streamId, subscription) {
     const url = this.buildURL(`streams/${streamId}/subscription`);
     const body = JSON.stringify((0, import_snakecase_keys.default)(subscription, { deep: true }));
-    return await this.httpRequest(url.toString(), UpdateStreamSubscriptionResult, { method: "PUT", body });
+    return await this.httpRequest(url, UpdateStreamSubscriptionResult, { method: "PUT", body });
   }
   /* Utility functions */
   buildURL(endpoint) {
-    return new URL(
-      `./v1/${endpoint}`,
-      // We ensure the `baseURL` ends with a `/` so that URL doesn't resolve the
-      // path relative to the parent.
-      `${this.baseURL}${this.baseURL.endsWith("/") ? "" : "/"}`
-    );
+    return `${this.baseURL}${this.baseURL.endsWith("/") ? "" : "/"}v1/${endpoint}`;
   }
   appendUrlSearchParams(url, params) {
+    const urlSearchParams = new URLSearchParams();
     Object.entries(params).forEach(([key, value]) => {
       if (value !== void 0) {
-        url.searchParams.append(key, String(value));
+        urlSearchParams.append(key, String(value));
       }
     });
+    if (urlSearchParams.size > 0) {
+      return `${url}?${urlSearchParams.toString()}`;
+    }
+    return url;
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/index.mjs

@@ -55,6 +55,10 @@ __export(schemas_exports, {
   TunaPositionNotification: () => TunaPositionNotification,
   TunaPositionState: () => TunaPositionState,
   TunaPositionStateSchema: () => TunaPositionStateSchema,
+  TunaSpotPosition: () => TunaSpotPosition,
+  TunaSpotPositionNotification: () => TunaSpotPositionNotification,
+  TunaSpotPositionState: () => TunaSpotPositionState,
+  TunaSpotPositionStateSchema: () => TunaSpotPositionStateSchema,
   UpdateStreamSubscriptionResult: () => UpdateStreamSubscriptionResult,
   Vault: () => Vault,
   VaultHistoricalStats: () => VaultHistoricalStats,
@@ -100,6 +104,10 @@ var TunaPositionState = {
   CLOSED_BY_LIMIT_ORDER: "closed_by_limit_order",
   CLOSED: "closed"
 };
+var TunaSpotPositionState = {
+  OPEN: "open",
+  CLOSED: "closed"
+};
 var LimitOrderState = {
   OPEN: "open",
   PARTIALLY_FILLED: "partially_filled",
@@ -121,6 +129,7 @@ var PoolSubscriptionTopic = {
 };
 var WalletSubscriptionTopic = {
   TUNA_POSITIONS: "tuna_positions",
+  TUNA_SPOT_POSITIONS: "tuna_spot_positions",
   LENDING_POSITIONS: "lending_positions",
   FUSION_LIMIT_ORDERS: "fusion_limit_orders",
   STAKING_POSITION: "staking_position"
@@ -129,6 +138,10 @@ var NotificationEntitySchema = z.enum([NotificationEntity.POOL_SWAP, ...Object.v
 var NotificationActionSchema = z.enum([NotificationAction.CREATE, ...Object.values(NotificationAction)]);
 var PoolProviderSchema = z.enum([PoolProvider.ORCA, ...Object.values(PoolProvider)]);
 var TunaPositionStateSchema = z.enum([TunaPositionState.OPEN, ...Object.values(TunaPositionState)]);
+var TunaSpotPositionStateSchema = z.enum([
+  TunaSpotPositionState.OPEN,
+  ...Object.values(TunaSpotPositionState)
+]);
 var LimitOrderStateSchema = z.enum([LimitOrderState.OPEN, ...Object.values(LimitOrderState)]);
 var StakingPositionHistoryActionTypeSchema = z.enum([
   StakingPositionHistoryActionType.STAKE,
@@ -318,6 +331,30 @@ var TunaPosition = z.object({
   updatedAtSlot: z.coerce.bigint(),
   closedAt: z.nullable(z.coerce.date())
 });
+var TunaSpotPosition = z.object({
+  address: z.string(),
+  authority: z.string(),
+  version: z.number(),
+  state: TunaSpotPositionStateSchema,
+  entrySqrtPrice: z.coerce.bigint(),
+  lowerLimitOrderSqrtPrice: z.coerce.bigint(),
+  upperLimitOrderSqrtPrice: z.coerce.bigint(),
+  flags: z.number(),
+  pool: z.string(),
+  poolSqrtPrice: z.coerce.bigint(),
+  collateralToken: z.string(),
+  borrowToken: z.string(),
+  positionToken: z.string(),
+  collateral: amountWithUsd,
+  loanFunds: amountWithUsd,
+  currentLoan: amountWithUsd,
+  total: amountWithUsd,
+  pnlUsd: usdPnl,
+  openedAt: z.coerce.date(),
+  openedAtSlot: z.coerce.bigint(),
+  updatedAtSlot: z.coerce.bigint(),
+  closedAt: z.nullable(z.coerce.date())
+});
 var PoolSwap = z.object({
   id: z.string(),
   amountIn: z.coerce.bigint(),
@@ -479,6 +516,7 @@ var PoolSwapNotification = createNotificationSchema(PoolSwap);
 var PoolPriceUpdateNotification = createNotificationSchema(PoolPriceUpdate);
 var OrderBookNotification = createNotificationSchema(OrderBook, OrderBookNotificationMeta);
 var TunaPositionNotification = createNotificationSchema(TunaPosition);
+var TunaSpotPositionNotification = createNotificationSchema(TunaSpotPosition);
 var LendingPositionNotification = createNotificationSchema(LendingPosition);
 var LimitOrderNotification = createNotificationSchema(LimitOrder);
 var StakingPositionNotification = createNotificationSchema(StakingPosition);
@@ -553,35 +591,35 @@ var TunaApiClient = class {
   /* Endpoints */
   async getMints() {
     const url = this.buildURL("mints");
-    return await this.httpRequest(url.toString(), Mint.array());
+    return await this.httpRequest(url, Mint.array());
   }
   async getMint(mintAddress) {
     const url = this.buildURL(`mints/${mintAddress}`);
-    return await this.httpRequest(url.toString(), Mint);
+    return await this.httpRequest(url, Mint);
   }
   async getMarkets() {
     const url = this.buildURL("markets");
-    return await this.httpRequest(url.toString(), Market.array());
+    return await this.httpRequest(url, Market.array());
   }
   async getMarket(marketAddress) {
     const url = this.buildURL(`markets/${marketAddress}`);
-    return await this.httpRequest(url.toString(), Market);
+    return await this.httpRequest(url, Market);
   }
   async getOraclePrices() {
     const url = this.buildURL("oracle-prices");
-    return await this.httpRequest(url.toString(), TokenOraclePrice.array());
+    return await this.httpRequest(url, TokenOraclePrice.array());
   }
   async getOraclePrice(mintAddress) {
     const url = this.buildURL(`oracle-prices/${mintAddress}`);
-    return await this.httpRequest(url.toString(), TokenOraclePrice);
+    return await this.httpRequest(url, TokenOraclePrice);
   }
   async getVaults() {
     const url = this.buildURL("vaults");
-    return await this.httpRequest(url.toString(), Vault.array());
+    return await this.httpRequest(url, Vault.array());
   }
   async getVault(vaultAddress) {
     const url = this.buildURL(`vaults/${vaultAddress}`);
-    return await this.httpRequest(url.toString(), Vault);
+    return await this.httpRequest(url, Vault);
   }
   /**
    *  Returns vault historical data for selected time interval.
@@ -589,137 +627,140 @@ var TunaApiClient = class {
    *  Example usage: getVaultHistory('H3ifgix98vzi3yCPbmZDLTheeTRf2jykXx8FpY5L7Sfd', '2025-03-10', '2025-04-10')
    */
   async getVaultHistory(vaultAddress, from, to) {
-    const url = this.buildURL(`vaults/${vaultAddress}/history`);
-    this.appendUrlSearchParams(url, { from: from.toISOString().slice(0, 10), to: to.toISOString().slice(0, 10) });
-    return await this.httpRequest(url.toString(), VaultHistoricalStats.array());
+    const url = this.appendUrlSearchParams(this.buildURL(`vaults/${vaultAddress}/history`), {
+      from: from.toISOString().slice(0, 10),
+      to: to.toISOString().slice(0, 10)
+    });
+    return await this.httpRequest(url, VaultHistoricalStats.array());
   }
   async getPools(providerFilter) {
-    const url = this.buildURL("pools");
-    if (providerFilter && providerFilter !== "all" /* ALL */) {
-      this.appendUrlSearchParams(url, { provider: providerFilter });
-    }
-    return await this.httpRequest(url.toString(), Pool.array());
+    const url = this.appendUrlSearchParams(this.buildURL("pools"), {
+      provider: providerFilter && providerFilter !== "all" /* ALL */ ? providerFilter : void 0
+    });
+    return await this.httpRequest(url, Pool.array());
   }
   async getPool(address) {
     const url = this.buildURL(`pools/${address}`);
-    return await this.httpRequest(url.toString(), Pool);
+    return await this.httpRequest(url, Pool);
   }
   async getPoolTicks(poolAddress) {
     const url = this.buildURL(`pools/${poolAddress}/ticks`);
-    return await this.httpRequest(url.toString(), PoolTicks);
+    return await this.httpRequest(url, PoolTicks);
   }
   async getPoolSwaps(poolAddress) {
     const url = this.buildURL(`pools/${poolAddress}/swaps`);
-    return await this.httpRequest(url.toString(), PoolSwap.array());
+    return await this.httpRequest(url, PoolSwap.array());
   }
   async getPoolOrderBook(poolAddress, priceStep, inverted) {
-    const url = this.buildURL(`pools/${poolAddress}/order-book`);
-    this.appendUrlSearchParams(url, { price_step: priceStep.toString() });
-    if (inverted) {
-      this.appendUrlSearchParams(url, { inverted: inverted.toString() });
-    }
-    return await this.httpRequest(url.toString(), OrderBook);
+    const url = this.appendUrlSearchParams(this.buildURL(`pools/${poolAddress}/order-book`), {
+      price_step: priceStep,
+      inverted: inverted || void 0
+    });
+    return await this.httpRequest(url, OrderBook);
   }
   async getPoolPriceCandles(poolAddress, options) {
     const { from, to, interval, candles } = options;
-    const url = this.buildURL(`pools/${poolAddress}/candles`);
-    this.appendUrlSearchParams(url, {
+    const url = this.appendUrlSearchParams(this.buildURL(`pools/${poolAddress}/candles`), {
       from: from.toISOString(),
       to: to.toISOString(),
-      candles: candles.toString(),
+      candles,
       interval
     });
-    return await this.httpRequest(url.toString(), PoolPriceCandle.array());
+    return await this.httpRequest(url, PoolPriceCandle.array());
   }
   async getStakingTreasury() {
     const url = this.buildURL(`staking/treasury`);
-    return await this.httpRequest(url.toString(), StakingTreasury);
+    return await this.httpRequest(url, StakingTreasury);
   }
   async getStakingLeaderboard(page, pageSize, search) {
-    const url = this.buildURL(`staking/leaderboard`);
-    this.appendUrlSearchParams(url, {
-      page: page.toString(),
-      page_size: pageSize.toString(),
-      ...search ? { search } : {}
+    const url = this.appendUrlSearchParams(this.buildURL(`staking/leaderboard`), {
+      page,
+      page_size: pageSize,
+      search: search || void 0
     });
-    return await this.httpRequest(url.toString(), StakingLeaderboardPage, { parseRoot: true });
+    return await this.httpRequest(url, StakingLeaderboardPage, { parseRoot: true });
   }
   async getUserLendingPositions(userAddress) {
     const url = this.buildURL(`users/${userAddress}/lending-positions`);
-    return await this.httpRequest(url.toString(), LendingPosition.array());
+    return await this.httpRequest(url, LendingPosition.array());
   }
   async getUserLendingPositionByAddress(userAddress, lendingPositionAddress) {
     const url = this.buildURL(`users/${userAddress}/lending-positions/${lendingPositionAddress}`);
-    return await this.httpRequest(url.toString(), LendingPosition);
+    return await this.httpRequest(url, LendingPosition);
   }
   async getUserTunaPositions(userAddress) {
     const url = this.buildURL(`users/${userAddress}/tuna-positions`);
-    return await this.httpRequest(url.toString(), TunaPosition.array());
+    return await this.httpRequest(url, TunaPosition.array());
   }
   async getUserTunaPositionByAddress(userAddress, tunaPositionAddress) {
     const url = this.buildURL(`users/${userAddress}/tuna-positions/${tunaPositionAddress}`);
-    return await this.httpRequest(url.toString(), TunaPosition);
+    return await this.httpRequest(url, TunaPosition);
+  }
+  async getUserTunaSpotPositions(userAddress) {
+    const url = this.buildURL(`users/${userAddress}/spot-positions`);
+    return await this.httpRequest(url, TunaSpotPosition.array());
+  }
+  async getUserTunaSpotPositionByAddress(userAddress, tunaSpotPositionAddress) {
+    const url = this.buildURL(`users/${userAddress}/spot-positions/${tunaSpotPositionAddress}`);
+    return await this.httpRequest(url, TunaSpotPosition);
   }
   async getUserLimitOrders(userAddress, poolFilter) {
-    const url = this.buildURL(`users/${userAddress}/limit-orders`);
-    if (poolFilter) {
-      this.appendUrlSearchParams(url, { pool: poolFilter });
-    }
-    return await this.httpRequest(url.toString(), LimitOrder.array());
+    const url = this.appendUrlSearchParams(this.buildURL(`users/${userAddress}/limit-orders`), {
+      pool: poolFilter || void 0
+    });
+    return await this.httpRequest(url, LimitOrder.array());
   }
   async getUserLimitOrderByAddress(userAddress, limitOrderAddress) {
     const url = this.buildURL(`users/${userAddress}/limit-orders/${limitOrderAddress}`);
-    return await this.httpRequest(url.toString(), LimitOrder);
+    return await this.httpRequest(url, LimitOrder);
   }
   async getUserStakingPosition(userAddress) {
     const url = this.buildURL(`users/${userAddress}/staking-position`);
-    return await this.httpRequest(url.toString(), StakingPosition);
+    return await this.httpRequest(url, StakingPosition);
   }
   async getUserStakingPositionHistory(userAddress) {
     const url = this.buildURL(`users/${userAddress}/staking-position/history`);
-    return await this.httpRequest(url.toString(), StakingPositionHistoryAction.array());
+    return await this.httpRequest(url, StakingPositionHistoryAction.array());
   }
   async getFeesStats(from, to, interval) {
-    const url = this.buildURL(`stats/fees`);
-    this.appendUrlSearchParams(url, {
+    const url = this.appendUrlSearchParams(this.buildURL(`stats/fees`), {
       from: from.toISOString(),
       to: to.toISOString(),
       interval
     });
-    return await this.httpRequest(url.toString(), FeesStatsGroup.array());
+    return await this.httpRequest(url, FeesStatsGroup.array());
   }
   async getStakingRevenueStats(from, to) {
-    const url = this.buildURL(`stats/staking/revenue`);
-    this.appendUrlSearchParams(url, {
+    const url = this.appendUrlSearchParams(this.buildURL(`stats/staking/revenue`), {
       from: from.toISOString().split("T")[0],
       to: to.toISOString().split("T")[0]
     });
-    return await this.httpRequest(url.toString(), StakingRevenueStatsGroup.array());
+    return await this.httpRequest(url, StakingRevenueStatsGroup.array());
   }
   async getUpdatesStream() {
     const url = this.buildURL(`streams/sse`);
-    return new EventSource(url.toString());
+    return new EventSource(url);
   }
   async updateStreamSubscription(streamId, subscription) {
     const url = this.buildURL(`streams/${streamId}/subscription`);
     const body = JSON.stringify(snakecaseKeys(subscription, { deep: true }));
-    return await this.httpRequest(url.toString(), UpdateStreamSubscriptionResult, { method: "PUT", body });
+    return await this.httpRequest(url, UpdateStreamSubscriptionResult, { method: "PUT", body });
   }
   /* Utility functions */
   buildURL(endpoint) {
-    return new URL(
-      `./v1/${endpoint}`,
-      // We ensure the `baseURL` ends with a `/` so that URL doesn't resolve the
-      // path relative to the parent.
-      `${this.baseURL}${this.baseURL.endsWith("/") ? "" : "/"}`
-    );
+    return `${this.baseURL}${this.baseURL.endsWith("/") ? "" : "/"}v1/${endpoint}`;
   }
   appendUrlSearchParams(url, params) {
+    const urlSearchParams = new URLSearchParams();
     Object.entries(params).forEach(([key, value]) => {
       if (value !== void 0) {
-        url.searchParams.append(key, String(value));
+        urlSearchParams.append(key, String(value));
       }
     });
+    if (urlSearchParams.size > 0) {
+      return `${url}?${urlSearchParams.toString()}`;
+    }
+    return url;
   }
 };
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crypticdot/defituna-api",
-  "version": "1.1.55",
+  "version": "1.2.0",
   "private": false,
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -14,8 +14,8 @@
     "README.md"
   ],
   "devDependencies": {
-    "@crypticdot/defituna-client": "^2.0.6",
-    "@crypticdot/eslint-config": "^1.0.0",
+    "@crypticdot/defituna-client": "^3.0.2",
+    "@crypticdot/eslint-config": "^1.0.2",
     "@crypticdot/prettier-config": "^1.0.0",
     "@crypticdot/typescript-config": "^1.0.0",
     "@solana/kit": "^2.1.0",