@swapkit/helpers 1.0.0-rc.64 → 1.0.0-rc.66

package/package.json

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

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

@@ -254,6 +254,25 @@ describe('AssetValue', () => {
         }),
       );
     });
+
+    test('returns proper avax string with address from `@swapkit/tokens` lists', async () => {
+      await AssetValue.loadStaticAssets();
+      const avaxBTCb = 'AVAX.BTC.b-0x152b9d0fdc40c096757f570a51e494bd4b943e50';
+      const AvaxBTCb = AssetValue.fromStringSync(avaxBTCb);
+
+      expect(AvaxBTCb).toBeDefined();
+      expect(AvaxBTCb).toEqual(
+        expect.objectContaining({
+          address: '0x152b9d0fdc40c096757f570a51e494bd4b943e50',
+          chain: Chain.Avalanche,
+          decimal: 8,
+          isGasAsset: false,
+          isSynthetic: false,
+          symbol: 'BTC.b-0x152b9d0fdc40c096757f570a51e494bd4b943e50',
+          ticker: 'BTC.b',
+        }),
+      );
+    });
   });
 
   describe('fromChainOrSignature', () => {

package/src/modules/assetValue.ts

@@ -108,6 +108,7 @@ export class AssetValue extends BigIntArithmetics {
       decimal: BaseDecimal[chain],
       identifier: assetString,
     };
+
     return new AssetValue({
       tax,
       value: safeValue(value, decimal),
@@ -231,8 +232,10 @@ function safeValue(value: NumberPrimitives, decimal: number) {
     : value;
 }
 
+// TODO refactor & split into smaller functions
 function getAssetInfo(identifier: string) {
   const isSynthetic = identifier.slice(0, 14).includes('/');
+
   const [synthChain, synthSymbol] =
     identifier.split('.')[0].toUpperCase() === Chain.THORChain
       ? identifier.split('.').slice(1)!.join().split('/')
@@ -243,8 +246,12 @@ function getAssetInfo(identifier: string) {
   const adjustedIdentifier =
     identifier.includes('.') && !isSynthetic ? identifier : `${Chain.THORChain}.${synthSymbol}`;
 
-  const [chain, symbol] = adjustedIdentifier.split('.') as [Chain, string];
-  const [ticker, address] = (isSynthetic ? synthSymbol : symbol).split('-') as [string, string?];
+  const [chain, ...rest] = adjustedIdentifier.split('.') as [Chain, string];
+  const [ticker, address] = (isSynthetic ? synthSymbol : rest.join('.')).split('-') as [
+    string,
+    string?,
+  ];
+  const symbol = isSynthetic ? synthSymbol : rest.join('.');
 
   return {
     address: address?.toLowerCase(),

package/src/modules/swapKitError.ts

@@ -47,12 +47,17 @@ const errorMessages = {
   core_transaction_deposit_insufficient_funds_error: 10311,
   core_transaction_deposit_gas_error: 10312,
   core_transaction_invalid_sender_address: 10313,
-  core_transaction_deposit_server_error: 10313,
+  core_transaction_deposit_server_error: 10314,
+  core_transaction_user_rejected: 10315,
 
   /**
    * Wallets
    */
   wallet_ledger_connection_error: 20001,
+  wallet_ledger_connection_claimed: 20002,
+  wallet_ledger_get_address_error: 20003,
+  wallet_ledger_device_not_found: 20004,
+  wallet_ledger_device_locked: 20005,
 
   /**
    * Helpers
@@ -60,11 +65,13 @@ const errorMessages = {
   helpers_number_different_decimals: 99101,
 } as const;
 
-export type Keys = keyof typeof errorMessages;
+export type ErrorKeys = keyof typeof errorMessages;
 
 export class SwapKitError extends Error {
-  constructor(errorKey: Keys, sourceError?: any) {
-    console.error(sourceError, { stack: sourceError?.stack, message: sourceError?.message });
+  constructor(errorKey: ErrorKeys, sourceError?: any) {
+    if (sourceError) {
+      console.error(sourceError, { stack: sourceError?.stack, message: sourceError?.message });
+    }
 
     super(errorKey, { cause: { code: errorMessages[errorKey], message: errorKey } });
     Object.setPrototypeOf(this, SwapKitError.prototype);