@swapkit/helpers 1.0.0-rc.23 → 1.0.0-rc.25

package/package.json

@@ -42,7 +42,7 @@
   "repository": "https://github.com/thorswap/SwapKit.git",
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "1.0.0-rc.23",
+  "version": "1.0.0-rc.25",
   "scripts": {
     "build": "vite build",
     "clean": "rm -rf dist vite.config.ts.* .turbo node_modules",

package/src/helpers/asset.ts

@@ -1,7 +1,7 @@
 import type { EVMChain } from '@swapkit/types';
 import { BaseDecimal, Chain, ChainToRPC, EVMChainList, FeeOption } from '@swapkit/types';
 
-import { type AssetValue, RequestClient } from '../index.ts';
+import { RequestClient } from '../index.ts';
 
 const getDecimalMethodHex = '0x313ce567';
 
@@ -187,16 +187,28 @@ const potentialScamRegex = new RegExp(
   'gmi',
 );
 
-const evmAssetHasAddress = (asset: AssetValue) => {
-  if (!EVMChainList.includes(asset.chain as EVMChain)) return true;
+const evmAssetHasAddress = (assetString: string) => {
+  const [chain, symbol] = assetString.split('.') as [EVMChain, string];
+  if (!EVMChainList.includes(chain as EVMChain)) return true;
+  const [, address] = symbol.split('-') as [string, string?];
 
-  return !asset.isGasAsset && asset.address && !Number.isNaN(asset.decimal);
+  return isGasAsset({ chain: chain as Chain, symbol }) || !!address;
 };
 
-export const filterAssets = (assets: AssetValue[]) =>
-  assets.filter(
-    (asset) =>
-      !asset.toString().includes('undefined') &&
-      !potentialScamRegex.test(asset.toString()) &&
-      evmAssetHasAddress(asset),
-  );
+export const filterAssets = (
+  tokens: {
+    value: string;
+    decimal: number;
+    chain: Chain;
+    symbol: string;
+  }[],
+) =>
+  tokens.filter((token) => {
+    const assetString = `${token.chain}.${token.symbol}`;
+
+    return (
+      !potentialScamRegex.test(assetString) &&
+      evmAssetHasAddress(assetString) &&
+      token.value !== '0'
+    );
+  });

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

@@ -12,14 +12,13 @@ describe('AssetValue', () => {
         chain: Chain.Avalanche,
         symbol: 'USDC-0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e',
       });
-      expect(fakeAvaxUSDCAsset.assetValue).toBe('1234567890 USDC');
+      expect(fakeAvaxUSDCAsset.toString(true)).toBe('USDC');
       expect(fakeAvaxUSDCAsset.toString()).toBe(
         'AVAX.USDC-0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e',
       );
-      expect(fakeAvaxUSDCAsset.toString(true)).toBe('AVAX.USDC');
 
       const thor = AssetValue.fromChainOrSignature('ETH.THOR');
-      expect(thor.assetValue).toBe('0 THOR');
+      expect(thor.toString(true)).toBe('THOR');
 
       const ethSynth = new AssetValue({
         chain: Chain.THORChain,
@@ -28,7 +27,6 @@ describe('AssetValue', () => {
         value: 1234567890,
       });
 
-      expect(ethSynth.assetValue).toBe('1234567890 ETH');
       expect(ethSynth.toString()).toBe('THOR.ETH/ETH');
       expect(ethSynth.toString(true)).toBe('ETH/ETH');
       expect(ethSynth.mul(21.37).getValue('string')).toBe('26382715809.3');
@@ -39,9 +37,8 @@ describe('AssetValue', () => {
         value: 123456789,
       });
 
-      expect(atomDerived.assetValue).toBe('123456789 ATOM');
+      expect(atomDerived.toString(true)).toBe('ATOM');
       expect(atomDerived.toString()).toBe('THOR.ATOM');
-      expect(atomDerived.toString(true)).toBe('THOR.ATOM');
     });
   });
 

package/src/modules/assetValue.ts

@@ -66,26 +66,23 @@ const createAssetValue = async (assetString: string, value: NumberPrimitives = 0
   return new AssetValue({ decimal, value: parsedValue, identifier: assetString });
 };
 
-export class AssetValue extends BigIntArithmetics {
-  address?: string;
-  chain: Chain;
-  isSynthetic = false;
-  isGasAsset = false;
-  symbol: string;
-  ticker: string;
-  type: ReturnType<typeof getAssetType>;
+const cacheAssetValue = new Map<string, AssetValue>();
 
+export class AssetValue extends BigIntArithmetics {
   constructor(params: AssetValueParams) {
+    const identifier =
+      'identifier' in params ? params.identifier : `${params.chain}.${params.symbol}`;
+
+    const cachedAsset = cacheAssetValue.get(identifier);
+    if (cachedAsset) return cachedAsset.set(params.value);
+
     super(
       params.value instanceof BigIntArithmetics
         ? params.value
         : { decimal: params.decimal, value: params.value },
     );
 
-    const identifier =
-      'identifier' in params ? params.identifier : `${params.chain}.${params.symbol}`;
     const assetInfo = getAssetInfo(identifier);
-
     this.type = getAssetType(assetInfo);
     this.chain = assetInfo.chain;
     this.ticker = assetInfo.ticker;
@@ -93,17 +90,25 @@ export class AssetValue extends BigIntArithmetics {
     this.address = assetInfo.address;
     this.isSynthetic = assetInfo.isSynthetic;
     this.isGasAsset = assetInfo.isGasAsset;
-  }
 
-  get assetValue() {
-    return `${this.getValue('string')} ${this.ticker}`;
+    cacheAssetValue.set(identifier, this);
   }
 
+  address?: string;
+  isSynthetic = false;
+  isGasAsset = false;
+  // @ts-expect-error cache is false positive on that case
+  chain: Chain;
+  // @ts-expect-error cache is false positive on that case
+  symbol: string;
+  // @ts-expect-error cache is false positive on that case
+  ticker: string;
+  // @ts-expect-error cache is false positive on that case
+  type: ReturnType<typeof getAssetType>;
+
   toString(short = false) {
     // THOR.RUNE | ETH/ETH
-    const shortFormat = this.isSynthetic
-      ? this.symbol.split('-')[0]
-      : `${this.chain}.${this.ticker}`;
+    const shortFormat = this.isSynthetic ? this.symbol.split('-')[0] : this.ticker;
 
     return short
       ? shortFormat
@@ -127,11 +132,13 @@ export class AssetValue extends BigIntArithmetics {
 
     const parsedValue = safeValue(value, decimal);
 
-    return tokenIdentifier
+    const asset = tokenIdentifier
       ? new AssetValue({ decimal, identifier: tokenIdentifier, value: parsedValue })
       : isSynthetic
       ? new AssetValue({ decimal: 8, identifier: assetString, value: parsedValue })
       : undefined;
+
+    return asset;
   }
 
   static async fromIdentifier(

package/src/modules/bigIntArithmetics.ts

@@ -93,8 +93,8 @@ export class BigIntArithmetics {
   }
 
   set(value: SKBigIntParams): this {
-    // @ts-expect-error False positive
-    return new this.constructor({ decimal: this.decimal, value, identifier: this.toString() });
+    this.#setValue(getStringValue(value));
+    return this;
   }
   add(...args: InitialisationValueType[]) {
     return this.#arithmetics('add', ...args);