@swapkit/helpers 1.0.0-rc.8 → 1.0.0-rc.9

package/package.json

@@ -1,20 +1,23 @@
 {
   "author": "swapkit-oss-team",
   "description": "SwapKit Lib swapkit-helpers",
+  "dependencies": {
+    "ky": "1.1.2"
+  },
   "devDependencies": {
     "@vitest/coverage-istanbul": "0.34.4",
     "vite": "4.4.9",
     "vitest": "0.34.4",
     "@internal/config": "0.0.0-internal.0",
-    "@swapkit/tokens": "1.0.0-rc.5",
-    "@swapkit/types": "1.0.0-rc.5"
+    "@swapkit/tokens": "1.0.0-rc.6",
+    "@swapkit/types": "1.0.0-rc.6"
   },
   "eslintConfig": {
     "extends": "../../../internal/eslint-config"
   },
   "peerDependencies": {
-    "@swapkit/tokens": "1.0.0-rc.5",
-    "@swapkit/types": "1.0.0-rc.5"
+    "@swapkit/tokens": "1.0.0-rc.6",
+    "@swapkit/types": "1.0.0-rc.6"
   },
   "exports": {
     ".": {
@@ -39,7 +42,7 @@
   "repository": "https://github.com/thorswap/SwapKit.git",
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "1.0.0-rc.8",
+  "version": "1.0.0-rc.9",
   "scripts": {
     "build": "vite build",
     "clean": "rm -rf dist vite.config.ts.* .turbo node_modules",

package/src/helpers/asset.ts

@@ -1,9 +1,7 @@
 import type { EVMChain } from '@swapkit/types';
 import { BaseDecimal, Chain, ChainToRPC, FeeOption } from '@swapkit/types';
 
-import type { AssetValue } from '../index.ts';
-
-import { postRequest } from './others.ts';
+import { type AssetValue, RequestClient } from '../index.ts';
 
 const getDecimalMethodHex = '0x313ce567';
 
@@ -11,19 +9,15 @@ export type CommonAssetString = 'MAYA.MAYA' | 'ETH.THOR' | 'ETH.vTHOR' | Chain;
 
 const getContractDecimals = async ({ chain, to }: { chain: EVMChain; to: string }) => {
   try {
-    const response = await postRequest<string>(
-      ChainToRPC[chain],
-      JSON.stringify({
-        method: 'eth_call',
-        params: [{ to: to.toLowerCase(), data: getDecimalMethodHex }, 'latest'],
+    const { result } = await RequestClient.post<{ result: string }>(ChainToRPC[chain], {
+      headers: { accept: '*/*', 'cache-control': 'no-cache' },
+      body: JSON.stringify({
         id: 44,
         jsonrpc: '2.0',
+        method: 'eth_call',
+        params: [{ to: to.toLowerCase(), data: getDecimalMethodHex }, 'latest'],
       }),
-      { accept: '*/*', 'cache-control': 'no-cache', 'content-type': 'application/json' },
-      true,
-    );
-
-    const { result } = JSON.parse(response) as { result: string };
+    });
 
     return parseInt(BigInt(result).toString());
   } catch (error) {

package/src/helpers/others.ts

@@ -18,51 +18,3 @@ export const derivationPathToString = ([network, chainId, account, change, index
 
   return `${network}'/${chainId}'/${account}'/${change}${shortPath ? '' : `/${index}`}`;
 };
-
-export const getRequest = async <T>(
-  url: string,
-  params?: { [key in string]?: any },
-): Promise<T> => {
-  try {
-    const queryParams = Object.entries(params || {}).reduce(
-      (acc, [key, value]) => {
-        if (value) {
-          acc[key] = value;
-        }
-
-        return acc;
-      },
-      {} as { [key in string]: any },
-    );
-
-    const response = await fetch(
-      `${url}${params ? `?${new URLSearchParams(queryParams).toString()}` : ''}`,
-      { method: 'GET', mode: 'cors', credentials: 'omit', referrer: 'https://sk.thorswap.net' },
-    );
-
-    return response.json();
-  } catch (error) {
-    console.error(error);
-    return {} as T;
-  }
-};
-
-export const postRequest = async <T>(
-  url: string,
-  body: string,
-  headers?: Record<string, string>,
-  parseAsString = false,
-): Promise<T> => {
-  try {
-    const response = await fetch(`${url}`, {
-      body,
-      headers,
-      method: 'POST',
-      referrer: 'https://sk.thorswap.net',
-    });
-
-    return parseAsString ? response.text() : response.json();
-  } catch (error) {
-    return {} as T;
-  }
-};

package/src/helpers/request.ts

@@ -0,0 +1,16 @@
+import type { Options } from 'ky';
+import ky from 'ky';
+
+const kyClient = ky.create({
+  headers: {
+    referrer: 'https://sk.thorswap.net',
+    referer: 'https://sk.thorswap.net',
+    'Content-Type': 'application/json',
+  },
+});
+
+export const RequestClient = {
+  get: <T>(url: string | URL | Request, options?: Options) => kyClient.get(url, options).json<T>(),
+  post: <T>(url: string | URL | Request, options?: Options) =>
+    kyClient.post(url, options).json<T>(),
+};

package/src/index.ts

@@ -5,6 +5,7 @@ export * from './helpers/asset.ts';
 export * from './helpers/liquidity.ts';
 export * from './helpers/memo.ts';
 export * from './helpers/others.ts';
+export * from './helpers/request.ts';
 
 /**
  * Modules

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

@@ -79,15 +79,13 @@ describe('AssetValue', () => {
 
   describe('toString', () => {
     test('returns asset value string/identifier', async () => {
-      const fakeAvaxUSDCAsset = new AssetValue({
+      const avaxUSDCAsset = new AssetValue({
         decimal: 6,
         value: 1234567890,
         chain: Chain.Avalanche,
         symbol: 'USDC-0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e',
       });
-      expect(fakeAvaxUSDCAsset.toString()).toBe(
-        'AVAX.USDC-0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e',
-      );
+      expect(avaxUSDCAsset.toString()).toBe('AVAX.USDC-0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e');
 
       const thor = AssetValue.fromChainOrSignature('ETH.THOR');
       expect(thor.toString()).toBe('ETH.THOR-0xa5f2211b9b8170f694421f2046281775e8468044');
@@ -99,10 +97,11 @@ describe('AssetValue', () => {
 
   describe('fromIdentifier', () => {
     test('creates AssetValue from string', async () => {
-      const fakeAvaxUSDCAssetString = 'AVAX.USDC-0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e';
-      const fakeAvaxUSDCAsset = await AssetValue.fromIdentifier(fakeAvaxUSDCAssetString);
+      const avaxUSDCAsset = await AssetValue.fromIdentifier(
+        'AVAX.USDC-0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e',
+      );
 
-      expect(fakeAvaxUSDCAsset).toEqual(
+      expect(avaxUSDCAsset).toEqual(
         expect.objectContaining({
           address: '0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e',
           chain: Chain.Avalanche,