@swapkit/helpers 3.0.0-beta.12 → 3.0.0-beta.14

package/dist/tokens/index.js

@@ -1,3 +1,3 @@
-import{a as w}from"../chunk-hbnf5tky.js";import{b as C}from"../chunk-qpz3c078.js";import{c as p}from"../chunk-qkreqkaa.js";import{d as m}from"../chunk-zv69dnwn.js";import{e as x}from"../chunk-3ts9cha8.js";import{f}from"../chunk-prm0g9b0.js";import{g as l}from"../chunk-mt3sdnfg.js";import{h as L}from"../chunk-4edjz16h.js";import{i as e}from"../chunk-c4ndre32.js";import{j as V}from"../chunk-frkpmajq.js";import{k as t}from"../chunk-4mz4n5jc.js";import{l as a}from"../chunk-k2m9hvag.js";import{m as i}from"../chunk-2vqx8ecy.js";import{n as o}from"../chunk-hk0jx7rp.js";import{p as T}from"../chunk-ganzk321.js";var s={};T(s,{UniswapV3List:()=>C,UniswapV2List:()=>w,TraderjoeV2List:()=>V,ThorchainList:()=>e,SushiswapList:()=>L,PangolinList:()=>l,PancakeswapList:()=>f,OpenOceanV2List:()=>x,OneInchList:()=>m,MayaList:()=>p,JupiterList:()=>o,ChainflipList:()=>i,CaviarV1List:()=>a,CamelotV3List:()=>t});function B(O){for(let c of Object.values(s)){let r=c.tokens.find((P)=>P.identifier===O);if(r?.logoURI)return r.logoURI}return}export{s as tokenLists,B as getTokenIcon};
+import{e as w}from"../chunk-dzypg9sp.js";import{f as C}from"../chunk-vgg88vt8.js";import{g as p}from"../chunk-wssz50sc.js";import{h as m}from"../chunk-vadspc46.js";import{i as x}from"../chunk-jhmhh7ax.js";import{j as f}from"../chunk-tn4e7zrk.js";import{k as l}from"../chunk-ghdhtvtt.js";import{l as L}from"../chunk-rarep8vg.js";import{m as e}from"../chunk-bf0ph1bk.js";import{n as V}from"../chunk-nm1av1e6.js";import{o as t}from"../chunk-bh986mnf.js";import{p as a}from"../chunk-b8hashv0.js";import{q as i}from"../chunk-rr043vwc.js";import{r as o}from"../chunk-7shcm26h.js";import{t as T}from"../chunk-s82pm7xc.js";var s={};T(s,{UniswapV3List:()=>C,UniswapV2List:()=>w,TraderjoeV2List:()=>V,ThorchainList:()=>e,SushiswapList:()=>L,PangolinList:()=>l,PancakeswapList:()=>f,OpenOceanV2List:()=>x,OneInchList:()=>m,MayaList:()=>p,JupiterList:()=>o,ChainflipList:()=>i,CaviarV1List:()=>a,CamelotV3List:()=>t});function B(O){for(let c of Object.values(s)){let r=c.tokens.find((P)=>P.identifier===O);if(r?.logoURI)return r.logoURI}return}export{s as tokenLists,B as getTokenIcon};
 
-//# debugId=4914D9B24FD3F03364756E2164756E21
+//# debugId=3A5B936F2C5A6EC964756E2164756E21

package/dist/tokens/index.js.map

@@ -4,7 +4,7 @@
   "sourcesContent": [
     "import * as tokenLists from \"./lists\";\n\nexport function getTokenIcon(identifier: string): string | undefined {\n  // Search through all lists for a matching token\n  for (const list of Object.values(tokenLists)) {\n    const token = list.tokens.find((token) => token.identifier === identifier);\n    if (token?.logoURI) {\n      return token.logoURI;\n    }\n  }\n\n  return undefined;\n}\n\nexport { tokenLists };\n"
   ],
-  "mappings": "28BAEO,IAAS,JAAY,JAAC,HAAwC,JAEnE,GAAW,AAAQ,EAAO,EAAO,JAAU,HAAG,JAC5C,DAAM,HAAQ,EAAK,OAAO,KAAK,CAAC,IAAU,EAAM,aAAe,CAAU,EACzE,GAAI,GAAO,QACT,OAAO,EAAM,QAIjB",
-  "debugId": "4914D9B24FD3F03364756E2164756E21",
+  "mappings": "g9BAEO,IAAS,JAAY,JAAC,HAAwC,JAEnE,GAAW,AAAQ,EAAO,EAAO,JAAU,HAAG,JAC5C,DAAM,HAAQ,EAAK,OAAO,KAAK,CAAC,IAAU,EAAM,aAAe,CAAU,EACzE,GAAI,GAAO,QACT,OAAO,EAAM,QAIjB",
+  "debugId": "3A5B936F2C5A6EC964756E2164756E21",
   "names": []
 }

package/package.json

@@ -8,7 +8,7 @@
   },
   "description": "SwapKit - Helpers",
   "devDependencies": {
-    "@swapkit/toolboxes": "1.0.0-beta.17"
+    "@swapkit/toolboxes": "1.0.0-beta.19"
   },
   "exports": {
     ".": {
@@ -55,5 +55,5 @@
     "type-check:go": "tsgo"
   },
   "type": "module",
-  "version": "3.0.0-beta.12"
+  "version": "3.0.0-beta.14"
 }

package/src/api/midgard/endpoints.ts

@@ -1,45 +1,8 @@
-import {
-  AssetValue,
-  BaseDecimal,
-  Chain,
-  RequestClient,
-  SKConfig,
-  StagenetChain,
-  SwapKitNumber,
-} from "@swapkit/helpers";
+import { AssetValue, BaseDecimal, Chain, RequestClient, SwapKitNumber } from "@swapkit/helpers";
 import type { MemberDetailsMayachain, MemberDetailsThorchain, THORNameDetails } from "./types";
 
-// Create extended RequestClient instances for each API
-const getMidgardRequestClient = () => {
-  const apiHeaders = SKConfig.get("apiHeaders");
-  return RequestClient.extend({
-    headers: apiHeaders.midgard || {},
-  });
-};
-
 function getMidgardBaseUrl(isThorchain = true) {
-  const { isStagenet } = SKConfig.get("envs");
-  const midgardUrls = SKConfig.get("midgardUrls");
-
-  if (isThorchain) {
-    const chain = isStagenet ? StagenetChain.THORChain : Chain.THORChain;
-    // Use the configured URL if available, otherwise use defaults
-    if (midgardUrls[chain]) {
-      return midgardUrls[chain];
-    }
-    // Default URLs based on environment
-    return isStagenet
-      ? "https://stagenet-midgard.ninerealms.com"
-      : "https://midgard.ninerealms.com";
-  }
-
-  const chain = isStagenet ? StagenetChain.Maya : Chain.Maya;
-  // Use the configured URL if available, otherwise use defaults
-  if (midgardUrls[chain]) {
-    return midgardUrls[chain];
-  }
-  // Default URLs based on environment
-  return isStagenet ? "https://stagenet-midgard.mayachain.info" : "https://midgard.mayachain.info";
+  return isThorchain ? "https://midgard.ninerealms.com" : "https://midgard.mayachain.info";
 }
 
 function getNameServiceBaseUrl(isThorchain = true) {
@@ -51,8 +14,7 @@ function getLiquidityPositionRaw<Chain extends Chain.THORChain | Chain.Maya>(bas
   return function getLiquidityPosition(
     address: string,
   ): Promise<Chain extends Chain.THORChain ? MemberDetailsThorchain : MemberDetailsMayachain> {
-    const MidgardRequestClient = getMidgardRequestClient();
-    return MidgardRequestClient.get<
+    return RequestClient.get<
       Chain extends Chain.THORChain ? MemberDetailsThorchain : MemberDetailsMayachain
     >(`${baseUrl}/v2/member/${address}`);
   };
@@ -60,22 +22,19 @@ function getLiquidityPositionRaw<Chain extends Chain.THORChain | Chain.Maya>(bas
 
 function getNameDetails(baseUrl: string) {
   return function getNameDetails(name: string) {
-    const MidgardRequestClient = getMidgardRequestClient();
-    return MidgardRequestClient.get<THORNameDetails>(`${baseUrl}/lookup/${name}`);
+    return RequestClient.get<THORNameDetails>(`${baseUrl}/lookup/${name}`);
   };
 }
 
 function getNamesByAddress(baseUrl: string) {
   return function getNamesByAddress(address: string) {
-    const MidgardRequestClient = getMidgardRequestClient();
-    return MidgardRequestClient.get<string[]>(`${baseUrl}/rlookup/${address}`);
+    return RequestClient.get<string[]>(`${baseUrl}/rlookup/${address}`);
   };
 }
 
 function getNamesByOwner(baseUrl: string) {
   return function getNamesByOwner(address: string) {
-    const MidgardRequestClient = getMidgardRequestClient();
-    return MidgardRequestClient.get<string[]>(`${baseUrl}/owner/${address}`);
+    return RequestClient.get<string[]>(`${baseUrl}/owner/${address}`);
   };
 }
 

package/src/api/swapkitApi/endpoints.ts

@@ -9,14 +9,6 @@ import {
   isGasAsset,
 } from "@swapkit/helpers";
 
-// Create extended RequestClient for swapkitApi with custom headers
-const getSwapkitApiRequestClient = () => {
-  const apiHeaders = SKConfig.get("apiHeaders");
-  return RequestClient.extend({
-    headers: apiHeaders.swapkitApi || {},
-  });
-};
-
 import {
   type BalanceResponse,
   type BrokerDepositChannelParams,
@@ -37,13 +29,11 @@ import {
 } from "./types";
 
 export function getTrackerDetails(json: TrackerParams) {
-  const SwapkitApiRequestClient = getSwapkitApiRequestClient();
-  return SwapkitApiRequestClient.post<TrackerResponse>(getApiUrl("/track"), { json });
+  return RequestClient.post<TrackerResponse>(getApiUrl("/track"), { json });
 }
 
 export async function getSwapQuote(json: QuoteRequest) {
-  const SwapkitApiRequestClient = getSwapkitApiRequestClient();
-  const response = await SwapkitApiRequestClient.post<QuoteResponse>(getApiUrl("/quote"), { json });
+  const response = await RequestClient.post<QuoteResponse>(getApiUrl("/quote"), { json });
 
   if (response.error) {
     throw new SwapKitError("api_v2_server_error", { message: response.error });
@@ -57,9 +47,8 @@ export async function getSwapQuote(json: QuoteRequest) {
     }
 
     return parsedResponse.data;
-  } catch (error) {
+  } catch (_error) {
     // throw new SwapKitError("api_v2_invalid_response", error);
-    console.warn(error);
     return response;
   }
 }
@@ -69,30 +58,26 @@ export async function getChainBalance<T extends Chain>({
   address,
   scamFilter = true,
 }: { chain: T; address: string; scamFilter?: boolean }) {
-  const SwapkitApiRequestClient = getSwapkitApiRequestClient();
   const url = getApiUrl(`/balance?chain=${chain}&address=${address}`);
-  const balanceResponse = await SwapkitApiRequestClient.get<BalanceResponse>(url);
+  const balanceResponse = await RequestClient.get<BalanceResponse>(url);
   const balances = Array.isArray(balanceResponse) ? balanceResponse : [];
 
   return scamFilter ? filterAssets(balances) : balances;
 }
 
 export function getTokenListProviders() {
-  const SwapkitApiRequestClient = getSwapkitApiRequestClient();
   const url = getApiUrl("/providers");
-  return SwapkitApiRequestClient.get<TokenListProvidersResponse>(url);
+  return RequestClient.get<TokenListProvidersResponse>(url);
 }
 
 export function getTokenList(provider: ProviderName) {
-  const SwapkitApiRequestClient = getSwapkitApiRequestClient();
   const url = getApiUrl(`/tokens?provider=${provider}`);
-  return SwapkitApiRequestClient.get<TokensResponseV2>(url);
+  return RequestClient.get<TokensResponseV2>(url);
 }
 
 export async function getPrice(body: PriceRequest) {
-  const SwapkitApiRequestClient = getSwapkitApiRequestClient();
   const url = getApiUrl("/price");
-  const response = await SwapkitApiRequestClient.post<PriceResponse>(url, {
+  const response = await RequestClient.post<PriceResponse>(url, {
     json: body,
   });
 
@@ -110,9 +95,8 @@ export async function getPrice(body: PriceRequest) {
 }
 
 export async function getGasRate() {
-  const SwapkitApiRequestClient = getSwapkitApiRequestClient();
   const url = getApiUrl("/gas");
-  const response = await SwapkitApiRequestClient.get<GasResponse>(url);
+  const response = await RequestClient.get<GasResponse>(url);
 
   try {
     const parsedResponse = GasResponseSchema.safeParse(response);
@@ -133,10 +117,9 @@ export async function getChainflipDepositChannel(body: BrokerDepositChannelParam
   if (!destinationAddress) {
     throw new SwapKitError("chainflip_broker_invalid_params");
   }
-  const SwapkitApiRequestClient = getSwapkitApiRequestClient();
   const url = SKConfig.get("integrations").chainflip?.brokerUrl || getApiUrl("/channel");
 
-  const response = await SwapkitApiRequestClient.post<DepositChannelResponse>(url, { json: body });
+  const response = await RequestClient.post<DepositChannelResponse>(url, { json: body });
 
   try {
     const parsedResponse = DepositChannelResponseSchema.safeParse(response);

package/src/api/swapkitApi/types.ts

@@ -2,7 +2,6 @@ import {
   type AssetValue,
   Chain,
   ChainId,
-  ErrorCode,
   FeeTypeEnum,
   ProviderName,
   WarningCodeEnum,
@@ -20,6 +19,7 @@ import {
   unknown,
   type z,
 } from "zod";
+import { ErrorCode } from "../../types/quotes";
 
 export enum PriorityLabel {
   CHEAPEST = "CHEAPEST",

package/src/api/thornode/endpoints.ts

@@ -10,14 +10,6 @@ import type {
   THORNodeType,
 } from "./types";
 
-// Create extended RequestClient for thornode with custom headers
-const getThornodeRequestClient = () => {
-  const apiHeaders = SKConfig.get("apiHeaders");
-  return RequestClient.extend({
-    headers: apiHeaders.thornode || {},
-  });
-};
-
 function baseUrl(type?: THORNodeType) {
   const { isStagenet } = SKConfig.get("envs");
   const nodeUrls = SKConfig.get("nodeUrls");
@@ -43,28 +35,23 @@ function getNameServiceBaseUrl(type?: THORNodeType) {
 }
 
 export function getLastBlock<T extends THORNodeType = "thorchain">(type: T = "thorchain" as T) {
-  const ThornodeRequestClient = getThornodeRequestClient();
-  return ThornodeRequestClient.get<LastBlockItem<T>[]>(`${baseUrl(type)}/lastblock`);
+  return RequestClient.get<LastBlockItem<T>[]>(`${baseUrl(type)}/lastblock`);
 }
 
 export function getThorchainQueue(type?: THORNodeType) {
-  const ThornodeRequestClient = getThornodeRequestClient();
-  return ThornodeRequestClient.get(`${baseUrl(type)}/queue`);
+  return RequestClient.get(`${baseUrl(type)}/queue`);
 }
 
 export function getNodes(type?: THORNodeType) {
-  const ThornodeRequestClient = getThornodeRequestClient();
-  return ThornodeRequestClient.get<NodeItem[]>(`${baseUrl(type)}/nodes`);
+  return RequestClient.get<NodeItem[]>(`${baseUrl(type)}/nodes`);
 }
 
 export function getMimirInfo(type?: THORNodeType) {
-  const ThornodeRequestClient = getThornodeRequestClient();
-  return ThornodeRequestClient.get<MimirData>(`${baseUrl(type)}/mimir`);
+  return RequestClient.get<MimirData>(`${baseUrl(type)}/mimir`);
 }
 
 export function getInboundAddresses(type?: THORNodeType) {
-  const ThornodeRequestClient = getThornodeRequestClient();
-  return ThornodeRequestClient.get<InboundAddressesItem[]>(`${baseUrl(type)}/inbound_addresses`);
+  return RequestClient.get<InboundAddressesItem[]>(`${baseUrl(type)}/inbound_addresses`);
 }
 
 export async function getTHORNodeTNSDetails({
@@ -72,8 +59,7 @@ export async function getTHORNodeTNSDetails({
   name,
 }: { type?: THORNodeType; name: string }): Promise<THORNodeTNSDetails> {
   try {
-    const ThornodeRequestClient = getThornodeRequestClient();
-    const result = await ThornodeRequestClient.get<THORNodeTNSDetails>(
+    const result = await RequestClient.get<THORNodeTNSDetails>(
       `${getNameServiceBaseUrl(type)}/${name}`,
     );
     return result;
@@ -99,16 +85,12 @@ export async function getTNSPreferredAsset({ type, tns }: { type?: THORNodeType;
 }
 
 export function getRunePoolInfo(type?: THORNodeType) {
-  const ThornodeRequestClient = getThornodeRequestClient();
-  return ThornodeRequestClient.get<RunePoolInfo>(`${baseUrl(type)}/runepool`);
+  return RequestClient.get<RunePoolInfo>(`${baseUrl(type)}/runepool`);
 }
 
 export function getRunePoolProviderInfo({
   type,
   thorAddress,
 }: { type?: THORNodeType; thorAddress: string }) {
-  const ThornodeRequestClient = getThornodeRequestClient();
-  return ThornodeRequestClient.get<RunePoolProviderInfo>(
-    `${baseUrl(type)}/rune_provider/${thorAddress}`,
-  );
+  return RequestClient.get<RunePoolProviderInfo>(`${baseUrl(type)}/rune_provider/${thorAddress}`);
 }

package/src/modules/__tests__/assetValue.test.ts

@@ -794,6 +794,32 @@ describe("AssetValue", () => {
           type: "Native",
         }),
       );
+
+      const trxAsset = AssetValue.from({ chain: Chain.Tron });
+      expect(trxAsset).toEqual(
+        expect.objectContaining({
+          chain: Chain.Tron,
+          decimal: BaseDecimal.TRX,
+          isGasAsset: true,
+          isSynthetic: false,
+          symbol: "TRX",
+          ticker: "TRX",
+          type: "Native",
+        }),
+      );
+
+      const trxAssetFromString = AssetValue.from({ asset: "TRX.TRX" });
+      expect(trxAssetFromString).toEqual(
+        expect.objectContaining({
+          chain: Chain.Tron,
+          decimal: BaseDecimal.TRX,
+          isGasAsset: true,
+          isSynthetic: false,
+          symbol: "TRX",
+          ticker: "TRX",
+          type: "Native",
+        }),
+      );
     });
 
     test("keep SOL address casing", () => {
@@ -811,6 +837,22 @@ describe("AssetValue", () => {
         }),
       );
     });
+
+    test("TRC20 tokens are not marked as gas assets", () => {
+      const tronUsdt = AssetValue.from({
+        asset: "TRX.USDT-TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t",
+      });
+      expect(tronUsdt).toEqual(
+        expect.objectContaining({
+          address: "tr7nhqjekqxgtci8q8zy4pl8otszgjlj6t",
+          chain: Chain.Tron,
+          isGasAsset: false,
+          isSynthetic: false,
+          symbol: "USDT-tr7nhqjekqxgtci8q8zy4pl8otszgjlj6t",
+          ticker: "USDT",
+        }),
+      );
+    });
   });
 });
 

package/src/modules/__tests__/swapKitNumber.test.ts

@@ -27,11 +27,11 @@ describe("SwapKitNumber", () => {
 
       const skNumber5 = new SwapKitNumber({ value: 0.1005, decimal: 3 });
       expect(skNumber5.getValue("string")).toBe("0.101");
-      expect(skNumber5.getBaseValue("bigint")).toBe(100n);
+      expect(skNumber5.getBaseValue("bigint")).toBe(101n);
 
       const skNumber6 = new SwapKitNumber({ value: -0.1005, decimal: 3 });
       expect(skNumber6.getValue("string")).toBe("-0.101");
-      expect(skNumber6.getBaseValue("bigint")).toBe(-100n);
+      expect(skNumber6.getBaseValue("bigint")).toBe(-101n);
       expect(skNumber6.decimal).toBe(3);
       expect(skNumber6.getValue("number")).toBe(-0.101);
       expect(skNumber6.decimalMultiplier).toBe(100000000n);
@@ -355,9 +355,8 @@ describe("SwapKitNumber", () => {
 
       const result = skNumber1.mul(skNumber2);
 
-      // The exact result of 1.23 * 4.56 is 5.6088
       expect(result.getValue("string")).toBe("5.609");
-      expect(result.getBaseValue("bigint")).toBe(5608n);
+      expect(result.getBaseValue("bigint")).toBe(5609n);
 
       const skNumber3 = new SwapKitNumber({ decimal: 2, value: 1.23 });
       const skNumber4 = new SwapKitNumber(-1.234567891);
@@ -367,7 +366,7 @@ describe("SwapKitNumber", () => {
       // The exact result of 1.23 * -1.234567891 is -1,518518505
       // If we round it to 2 decimal places, we should get 5.61
       expect(result2.getValue("string")).toBe("-1.52");
-      expect(result2.getBaseValue("bigint")).toBe(-151n);
+      expect(result2.getBaseValue("bigint")).toBe(-152n);
     });
   });
 

package/src/modules/assetValue.ts

@@ -1,3 +1,6 @@
+import { getAddress } from "ethers";
+import { match } from "ts-pattern";
+
 import {
   BaseDecimal,
   Chain,
@@ -19,7 +22,6 @@ import { warnOnce } from "../utils/others";
 import { type TokenListName, loadTokenLists } from "../utils/tokens";
 import { validateIdentifier } from "../utils/validators";
 
-import { getAddress } from "ethers";
 import type { NumberPrimitives } from "./bigIntArithmetics";
 import { BigIntArithmetics, formatBigIntToSafeValue } from "./bigIntArithmetics";
 import { SwapKitError } from "./swapKitError";
@@ -213,33 +215,15 @@ or by passing asyncTokenLookup: true to the from() function, which will make it
 export function getMinAmountByChain(chain: Chain) {
   const asset = AssetValue.from({ chain });
 
-  switch (chain) {
-    case Chain.Bitcoin:
-    case Chain.Litecoin:
-    case Chain.BitcoinCash:
-    case Chain.Dash:
-      return asset.set(0.00010001);
-
-    case Chain.Dogecoin:
-      return asset.set(1.00000001);
-
-    case Chain.Avalanche:
-    case Chain.Ethereum:
-    case Chain.Arbitrum:
-    case Chain.BinanceSmartChain:
-      return asset.set(0.00000001);
-
-    case Chain.THORChain:
-    case Chain.Maya:
-      return asset.set(0);
-
-    case Chain.Cosmos:
-    case Chain.Kujira:
-      return asset.set(0.000001);
-
-    default:
-      return asset.set(0.00000001);
-  }
+  return match(chain)
+    .with(Chain.Bitcoin, Chain.Litecoin, Chain.BitcoinCash, Chain.Dash, () => asset.set(0.00010001))
+    .with(Chain.Dogecoin, () => asset.set(1.00000001))
+    .with(Chain.Avalanche, Chain.Ethereum, Chain.Arbitrum, Chain.BinanceSmartChain, () =>
+      asset.set(0.00000001),
+    )
+    .with(Chain.THORChain, Chain.Maya, () => asset.set(0))
+    .with(Chain.Cosmos, Chain.Kujira, () => asset.set(0.000001))
+    .otherwise(() => asset.set(0.00000001));
 }
 
 async function createAssetValue(identifier: string, value: NumberPrimitives = 0) {

package/src/modules/bigIntArithmetics.ts

@@ -54,6 +54,17 @@ export function formatBigIntToSafeValue({
   );
 }
 
+function divideBigIntWithRounding(n: bigint, d: bigint) {
+  if (d === 0n) {
+    throw new Error("Cannot divide by zero");
+  }
+  const half = d / 2n;
+  if ((n >= 0n && d >= 0n) || (n < 0n && d < 0n)) {
+    return (n + half) / d;
+  }
+  return (n - half) / d;
+}
+
 export class BigIntArithmetics {
   decimalMultiplier: bigint = 10n ** 8n;
   bigIntValue = 0n;
@@ -153,7 +164,7 @@ export class BigIntArithmetics {
   getBaseValue<T extends AllowedNumberTypes>(type: T, decimal?: number): NumberPrimitivesType[T] {
     const divisor =
       this.decimalMultiplier / toMultiplier(decimal || this.decimal || BaseDecimal.THOR);
-    const baseValue = this.bigIntValue / divisor;
+    const baseValue = divideBigIntWithRounding(this.bigIntValue, divisor);
 
     switch (type) {
       case "number":

package/src/modules/requestClient.ts

@@ -1,8 +1,9 @@
 import { SKConfig } from "./swapKitConfig";
+import { SwapKitError } from "./swapKitError";
 
 type Options = RequestInit & {
   /**
-   * @deprecated Use onSuccess instead
+   * @deprecated Use onSuccess instead - will be removed in next major @MarkedV4
    */
   responseHandler?: (response: any) => any;
   json?: unknown;
@@ -24,40 +25,53 @@ export const RequestClient = {
 function fetchWithConfig(method: "GET" | "POST", extendOptions: Options = {}) {
   return async <T>(url: string, options: Options = {}): Promise<T> => {
     const { searchParams, json, body, headers: headersOptions } = { ...extendOptions, ...options };
-    const { swapKit } = SKConfig.get("apiKeys");
 
-    const isJson = json || url.endsWith(".json");
+    const isJson = !!json || url.endsWith(".json");
     const bodyToSend = isJson ? JSON.stringify(json) : body;
-    const urlInstance = new URL(url);
-
-    if (searchParams) {
-      urlInstance.search = new URLSearchParams(searchParams).toString();
-    }
-
-    const headers = {
-      ...headersOptions,
-      ...(isJson ? { "Content-Type": "application/json" } : {}),
-      ...(swapKit ? { "x-api-key": swapKit } : {}),
-    };
 
     try {
-      const response = await fetch(urlInstance.toString(), {
-        ...options,
-        method,
-        body: bodyToSend,
-        headers,
-      });
+      const requestUrl = buildUrl(url, searchParams);
+      const headers = buildHeaders(isJson, headersOptions);
+
+      const response = await fetch(requestUrl, { ...options, method, body: bodyToSend, headers });
 
       if (!response.ok) {
         const message = await response.text();
-        throw new Error(`${response.statusText}(${response.status}): ${message}`);
+        throw new SwapKitError("helpers_invalid_response", {
+          status: response.status,
+          statusText: response.statusText,
+          message,
+        });
       }
 
       const body = await response.json();
 
       return options.onSuccess?.(body) || options.responseHandler?.(body) || body;
     } catch (error) {
-      return options.onError?.(error) || console.error(error);
+      if (options.onError) {
+        return options.onError(error);
+      }
+      throw error;
     }
   };
 }
+
+function buildHeaders(isJson: boolean, headersOptions?: HeadersInit) {
+  const { swapKit } = SKConfig.get("apiKeys");
+
+  return {
+    ...headersOptions,
+    ...(isJson ? { "Content-Type": "application/json" } : {}),
+    ...(swapKit ? { "x-api-key": swapKit } : {}),
+  };
+}
+
+function buildUrl(url: string, searchParams?: Record<string, string>) {
+  const urlInstance = new URL(url);
+
+  if (searchParams) {
+    urlInstance.search = new URLSearchParams(searchParams).toString();
+  }
+
+  return urlInstance.toString();
+}