@swapkit/helpers 1.1.2 → 1.2.0

package/package.json

@@ -3,17 +3,16 @@
   "description": "SwapKit - Helpers",
   "dependencies": {
     "@swapkit/tokens": "1.0.3",
-    "ky": "1.4.0",
     "picocolors": "1.0.1",
     "zod": "3.23.8"
   },
   "devDependencies": {
-    "@swapkit/toolbox-cosmos": "1.0.7",
-    "@swapkit/toolbox-evm": "1.1.2",
-    "@swapkit/toolbox-solana": "1.0.7",
-    "@swapkit/toolbox-radix": "1.0.7",
-    "@swapkit/toolbox-substrate": "1.1.2",
-    "@swapkit/toolbox-utxo": "1.0.7"
+    "@swapkit/toolbox-cosmos": "1.0.9",
+    "@swapkit/toolbox-evm": "1.1.4",
+    "@swapkit/toolbox-solana": "1.0.9",
+    "@swapkit/toolbox-radix": "1.0.9",
+    "@swapkit/toolbox-substrate": "1.1.4",
+    "@swapkit/toolbox-utxo": "1.0.9"
   },
   "files": [
     "src/",
@@ -38,5 +37,5 @@
   },
   "type": "module",
   "types": "./src/index.ts",
-  "version": "1.1.2"
+  "version": "1.2.0"
 }

package/src/helpers/__tests__/memo.test.ts

@@ -6,6 +6,8 @@ import {
   getMemoForLeaveAndBond,
   getMemoForNamePreferredAssetRegister,
   getMemoForNameRegister,
+  getMemoForRunePoolDeposit,
+  getMemoForRunePoolWithdraw,
   getMemoForSaverDeposit,
   getMemoForSaverWithdraw,
   getMemoForWithdraw,
@@ -73,6 +75,16 @@ describe("getMemoForDeposit", () => {
     const result = getMemoForDeposit({ chain: Chain.Ethereum, symbol: "ETH" });
     expect(result).toBe("+:ETH.ETH");
   });
+
+  test("returns correct memo when paired address is not available but affiliate info is present", () => {
+    const result = getMemoForDeposit({
+      chain: Chain.Ethereum,
+      symbol: "ETH",
+      affiliateAddress: "thor1abc123",
+      affiliateBasisPoints: 500,
+    });
+    expect(result).toBe("+:ETH.ETH::thor1abc123:500");
+  });
 });
 
 describe("getMemoForWithdraw", () => {
@@ -86,3 +98,26 @@ describe("getMemoForWithdraw", () => {
     expect(result).toBe("-:ETH.ETH:100");
   });
 });
+
+describe("getMemoForRunePoolDeposit", () => {
+  test("returns correct memo for single side", () => {
+    const result = getMemoForRunePoolDeposit();
+    expect(result).toBe("POOL+");
+  });
+});
+
+describe("getMemoForRunePoolWithdraw", () => {
+  test("returns correct memo for single side", () => {
+    const result = getMemoForRunePoolWithdraw({ basisPoints: 500 });
+    expect(result).toBe("POOL-:500");
+  });
+
+  test("returns correct memo when affiliate info is present", () => {
+    const result = getMemoForRunePoolWithdraw({
+      basisPoints: 500,
+      affiliateAddress: "thor1abc123",
+      affiliateBasisPoints: 500,
+    });
+    expect(result).toBe("POOL-:500:thor1abc123:500");
+  });
+});

package/src/helpers/asset.ts

@@ -171,7 +171,7 @@ export const getCommonAssetInfo = (
     case Chain.BinanceSmartChain:
       return { identifier: `${assetString}.BNB`, decimal: BaseDecimal[assetString] };
     case Chain.Maya:
-      return { identifier: `${assetString}.CACAO`, decimal: BaseDecimal[assetString] };
+      return { identifier: `${assetString}.CACAO`, decimal: 10 };
     case Chain.Radix:
       return { identifier: `${Chain.Radix}.XRD`, decimal: BaseDecimal[assetString] };
 

package/src/helpers/memo.ts

@@ -128,7 +128,8 @@ export function getMemoForDeposit({
   address?: string;
 }>) {
   const poolIdentifier = getPoolIdentifier({ chain, symbol });
-  const addressPart = address ? `:${address}` : "";
+  const hasAffiliateInfo = !!affiliate.affiliateAddress;
+  const addressPart = address ? `:${address}` : hasAffiliateInfo ? ":" : "";
 
   return addAffiliate(`${MemoType.DEPOSIT}:${poolIdentifier}${addressPart}`, affiliate);
 }
@@ -137,9 +138,8 @@ export function getMemoForSaverWithdraw({
   chain,
   symbol,
   basisPoints,
-  ...affiliate
-}: WithAffiliate<{ chain: Chain; symbol: string; basisPoints: number }>) {
-  return addAffiliate(`${MemoType.WITHDRAW}:${chain}/${symbol}:${basisPoints}`, affiliate);
+}: { chain: Chain; symbol: string; basisPoints: number }) {
+  return `${MemoType.WITHDRAW}:${chain}/${symbol}:${basisPoints}`;
 }
 
 export function getMemoForWithdraw({
@@ -148,22 +148,29 @@ export function getMemoForWithdraw({
   ticker,
   basisPoints,
   targetAsset,
-  ...affiliate
-}: WithAffiliate<{
+}: {
   chain: Chain;
   symbol: string;
   ticker: string;
   basisPoints: number;
   targetAsset?: string;
-}>) {
+}) {
   const shortenedSymbol =
     chain === "ETH" && ticker !== "ETH" ? `${ticker}-${symbol.slice(-3)}` : symbol;
   const targetPart = targetAsset ? `:${targetAsset}` : "";
 
-  return addAffiliate(
-    `${MemoType.WITHDRAW}:${chain}.${shortenedSymbol}:${basisPoints}${targetPart}`,
-    affiliate,
-  );
+  return `${MemoType.WITHDRAW}:${chain}.${shortenedSymbol}:${basisPoints}${targetPart}`;
+}
+
+export function getMemoForRunePoolDeposit() {
+  return `${MemoType.RUNEPOOL_DEPOSIT}`;
+}
+
+export function getMemoForRunePoolWithdraw({
+  basisPoints,
+  ...affiliate
+}: WithAffiliate<{ basisPoints: number }>) {
+  return addAffiliate(`${MemoType.RUNEPOOL_WITHDRAW}:${basisPoints}`, affiliate);
 }
 
 /**
@@ -188,6 +195,12 @@ export type MemoOptions<T extends MemoType> = {
     singleSide?: boolean;
   }>;
   [MemoType.NAME_REGISTER]: { name: string; chain: string; address: string };
+  [MemoType.RUNEPOOL_DEPOSIT]: {};
+  [MemoType.RUNEPOOL_WITHDRAW]: {
+    basisPoints: number;
+    affiliateAddress?: string;
+    affiliateBasisPoints?: number;
+  };
 }[T];
 
 /**

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

@@ -567,7 +567,7 @@ describe("AssetValue", () => {
         expect.objectContaining({
           address: undefined,
           chain: Chain.Maya,
-          decimal: BaseDecimal.MAYA,
+          decimal: 10,
           isGasAsset: true,
           isSynthetic: false,
           symbol: "CACAO",

package/src/modules/assetValue.ts

@@ -151,7 +151,7 @@ or by passing asyncTokenLookup: true to the from() function, which will make it
     const assetValue = asyncTokenLookup
       ? createAssetValue(identifier, fromBaseDecimal ? adjustedValue : parsedValue)
       : isSynthetic
-        ? createSyntheticAssetValue(identifier, parsedValue)
+        ? createSyntheticAssetValue(identifier, adjustedValue)
         : new AssetValue({ tax, decimal, identifier, value: adjustedValue });
 
     return assetValue as ConditionalAssetValueReturn<T>;

package/src/modules/requestClient.ts

@@ -1,39 +1,56 @@
-import type { KyInstance, Options } from "ky";
-import ky from "ky";
+type Options = {
+  headers?: Record<string, string>;
+  apiKey?: string;
+  method?: "GET" | "POST";
+  onError?: (error: NotWorth) => NotWorth;
+  responseHandler?: (response: NotWorth) => NotWorth;
+  [key: string]: NotWorth;
+};
 
-let kyClientConfig: Options & { apiKey?: string } = {};
+let clientConfig: Options = {};
 
 export const defaultRequestHeaders =
   typeof window !== "undefined"
     ? ({} as Record<string, string>)
     : { referrer: "https://sk.thorswap.net", referer: "https://sk.thorswap.net" };
 
-export function setRequestClientConfig({ apiKey, ...config }: Options & { apiKey?: string }) {
-  kyClientConfig = { ...config, apiKey };
+export function setRequestClientConfig({ apiKey, ...config }: Options) {
+  clientConfig = { ...config, apiKey };
 }
 
-function getKyClient() {
-  const { apiKey, ...config } = kyClientConfig;
-  return ky.create({
-    ...config,
-    headers: { ...defaultRequestHeaders, ...config.headers, "x-api-key": apiKey },
-  });
-}
+async function fetchWithConfig(url: string, options: Options = {}) {
+  const { apiKey, ...config } = clientConfig;
+  const headers = { ...defaultRequestHeaders, ...config.headers, ...options.headers };
+
+  if (apiKey) headers["x-api-key"] = apiKey;
+
+  try {
+    const response = await fetch(url, { ...config, ...options, headers });
+    const body = await response.json();
 
-const getTypedBaseRequestClient = (ky: KyInstance) => ({
-  get: async <T>(url: string | URL | Request, options?: Options) =>
-    (await ky.get(url, options)).json<T>(),
-  post: async <T>(url: string | URL | Request, options?: Options) =>
-    (await ky.post(url, options)).json<T>(),
-});
+    if (options.responseHandler) return options.responseHandler(body);
+
+    return body;
+  } catch (error) {
+    if (options.onError) return options.onError(error);
+
+    console.error(error);
+  }
+}
 
 export const RequestClient = {
-  ...getTypedBaseRequestClient(getKyClient()),
+  get: async <T>(url: string, options?: Options): Promise<T> =>
+    fetchWithConfig(url, { ...options, method: "GET" }),
+  post: async <T>(url: string, options?: Options): Promise<T> =>
+    fetchWithConfig(url, { ...options, method: "POST" }),
   extend: (options: Options) => {
-    const extendedClient = getKyClient().extend(options);
+    const extendedConfig = { ...clientConfig, ...options };
     return {
-      ...getTypedBaseRequestClient(extendedClient),
-      extend: RequestClient.extend,
+      get: async <T>(url: string, options?: Options): Promise<T> =>
+        fetchWithConfig(url, { ...extendedConfig, ...options, method: "GET" }),
+      post: async <T>(url: string, options?: Options): Promise<T> =>
+        fetchWithConfig(url, { ...extendedConfig, ...options, method: "POST" }),
+      extend: (newOptions: Options) => RequestClient.extend({ ...extendedConfig, ...newOptions }),
     };
   },
 };

package/src/types/chains.ts

@@ -103,7 +103,7 @@ export enum BaseDecimal {
   KUJI = 6,
   LTC = 8,
   MATIC = 18,
-  MAYA = 10,
+  MAYA = 8,
   OP = 18,
   SOL = 9,
   THOR = 8,

package/src/types/sdk.ts

@@ -62,6 +62,8 @@ export enum MemoType {
   WITHDRAW = "-",
   OPEN_LOAN = "$+",
   CLOSE_LOAN = "$-",
+  RUNEPOOL_DEPOSIT = "POOL+",
+  RUNEPOOL_WITHDRAW = "POOL-",
 }
 
 export const QuoteRequestSchema = z