@swapkit/helpers 1.0.0-rc.67 → 1.0.0-rc.69

package/package.json

@@ -2,22 +2,22 @@
   "author": "swapkit-oss-team",
   "description": "SwapKit Lib swapkit-helpers",
   "dependencies": {
-    "@swapkit/api": "1.0.0-rc.36"
+    "@swapkit/api": "1.0.0-rc.38"
   },
   "devDependencies": {
     "@vitest/coverage-istanbul": "1.2.1",
     "vite": "5.0.12",
     "vitest": "1.2.1",
     "@internal/config": "0.0.2-rc.0",
-    "@swapkit/tokens": "1.0.0-rc.33",
-    "@swapkit/types": "1.0.0-rc.35"
+    "@swapkit/tokens": "1.0.0-rc.34",
+    "@swapkit/types": "1.0.0-rc.37"
   },
   "eslintConfig": {
     "extends": "../../../internal/eslint-config"
   },
   "peerDependencies": {
-    "@swapkit/tokens": "1.0.0-rc.33",
-    "@swapkit/types": "1.0.0-rc.35"
+    "@swapkit/tokens": "1.0.0-rc.34",
+    "@swapkit/types": "1.0.0-rc.37"
   },
   "exports": {
     ".": {
@@ -42,7 +42,7 @@
   },
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "1.0.0-rc.67",
+  "version": "1.0.0-rc.69",
   "scripts": {
     "build": "vite build",
     "clean": "rm -rf dist vite.config.ts.* .turbo node_modules",

package/src/helpers/asset.ts

@@ -78,25 +78,13 @@ export const gasFeeMultiplier: Record<FeeOption, number> = {
 
 export const isGasAsset = ({ chain, symbol }: { chain: Chain; symbol: string }) => {
   switch (chain) {
-    case Chain.Bitcoin:
-    case Chain.BitcoinCash:
-    case Chain.Litecoin:
-    case Chain.Dogecoin:
-    case Chain.Binance:
-    case Chain.Ethereum:
-    case Chain.Avalanche:
-      return symbol === chain;
-
     case Chain.Arbitrum:
     case Chain.Optimism:
-      return 'ETH' === symbol;
-
+      return symbol === 'ETH';
     case Chain.Maya:
       return symbol === 'CACAO';
-
     case Chain.Kujira:
       return symbol === 'KUJI';
-
     case Chain.Cosmos:
       return symbol === 'ATOM';
     case Chain.Polygon:
@@ -105,6 +93,9 @@ export const isGasAsset = ({ chain, symbol }: { chain: Chain; symbol: string })
       return symbol === 'BNB';
     case Chain.THORChain:
       return symbol === 'RUNE';
+
+    default:
+      return symbol === chain;
   }
 };
 
@@ -131,17 +122,7 @@ export const getCommonAssetInfo = (
     case `${Chain.Kujira}.USK`:
       return { identifier: `${Chain.Kujira}.USK`, decimal: 6 };
 
-    case Chain.Kujira:
-    case Chain.Arbitrum:
-    case Chain.Optimism:
-    case Chain.BitcoinCash:
-    case Chain.Litecoin:
-    case Chain.Dogecoin:
-    case Chain.Binance:
-    case Chain.Avalanche:
-    case Chain.Polygon:
-    case Chain.Bitcoin:
-    case Chain.Ethereum:
+    default:
       return { identifier: `${assetString}.${assetString}`, decimal: BaseDecimal[assetString] };
   }
 };
@@ -150,14 +131,6 @@ export const getAssetType = ({ chain, symbol }: { chain: Chain; symbol: string }
   if (symbol.includes('/')) return 'Synth';
 
   switch (chain) {
-    case Chain.Bitcoin:
-    case Chain.BitcoinCash:
-    case Chain.Dogecoin:
-    case Chain.Litecoin:
-    case Chain.Maya:
-    case Chain.THORChain:
-      return 'Native';
-
     case Chain.Cosmos:
       return symbol === 'ATOM' ? 'Native' : Chain.Cosmos;
     case Chain.Kujira:
@@ -177,6 +150,9 @@ export const getAssetType = ({ chain, symbol }: { chain: Chain; symbol: string }
       return [Chain.Ethereum, Chain.Arbitrum].includes(symbol as Chain) ? 'Native' : 'ARBITRUM';
     case Chain.Optimism:
       return [Chain.Ethereum, Chain.Optimism].includes(symbol as Chain) ? 'Native' : 'OPTIMISM';
+
+    default:
+      return 'Native';
   }
 };
 
@@ -210,12 +186,10 @@ export const filterAssets = (
     symbol: string;
   }[],
 ) =>
-  tokens.filter((token) => {
-    const assetString = `${token.chain}.${token.symbol}`;
+  tokens.filter(({ chain, value, symbol }) => {
+    const assetString = `${chain}.${symbol}`;
 
     return (
-      !potentialScamRegex.test(assetString) &&
-      evmAssetHasAddress(assetString) &&
-      token.value !== '0'
+      !potentialScamRegex.test(assetString) && evmAssetHasAddress(assetString) && value !== '0'
     );
   });

package/src/helpers/validators.ts

@@ -3,7 +3,7 @@ import { Chain } from '@swapkit/types';
 // Backward compatibility
 const supportedChains = [...Object.values(Chain), 'TERRA'];
 
-export function validateIdentifier(identifier: string = '') {
+export function validateIdentifier(identifier = '') {
   const uppercasedIdentifier = identifier.toUpperCase();
 
   const [chain] = uppercasedIdentifier.split('.') as [Chain, string];

package/src/types.ts

@@ -1,4 +1,5 @@
 import type {
+  ChainflipList,
   CoinGeckoList,
   MayaList,
   PancakeswapETHList,
@@ -25,4 +26,5 @@ export type TokenNames =
   | (typeof SushiswapList)['tokens'][number]['identifier']
   | (typeof TraderjoeList)['tokens'][number]['identifier']
   | (typeof WoofiList)['tokens'][number]['identifier']
-  | (typeof UniswapList)['tokens'][number]['identifier'];
+  | (typeof UniswapList)['tokens'][number]['identifier']
+  | (typeof ChainflipList)['tokens'][number]['identifier'];