@swapkit/helpers 1.7.1 → 1.9.0

package/package.json

@@ -2,17 +2,16 @@
   "author": "swapkit-oss",
   "description": "SwapKit - Helpers",
   "dependencies": {
-    "@swapkit/contracts": "1.0.4",
-    "@swapkit/tokens": "1.4.0",
-    "picocolors": "1.0.1"
+    "@swapkit/contracts": "1.0.5",
+    "@swapkit/tokens": "1.6.0"
   },
   "devDependencies": {
-    "@swapkit/toolbox-cosmos": "1.2.1",
-    "@swapkit/toolbox-evm": "1.3.5",
-    "@swapkit/toolbox-radix": "1.0.27",
-    "@swapkit/toolbox-solana": "1.0.27",
-    "@swapkit/toolbox-substrate": "1.2.5",
-    "@swapkit/toolbox-utxo": "1.1.10"
+    "@swapkit/toolbox-cosmos": "1.3.1",
+    "@swapkit/toolbox-evm": "1.4.0",
+    "@swapkit/toolbox-radix": "1.1.0",
+    "@swapkit/toolbox-solana": "1.1.0",
+    "@swapkit/toolbox-substrate": "1.2.7",
+    "@swapkit/toolbox-utxo": "1.1.12"
   },
   "files": [
     "src/",
@@ -30,12 +29,12 @@
   "scripts": {
     "build": "bun run ./build.ts",
     "clean": "rm -rf dist node_modules *.tsbuildinfo",
-    "lint": "biome check --write ./src",
+    "lint": "biome check --diagnostic-level=error --write ./src",
     "test": "bun test",
     "test:coverage": "bun test --coverage",
     "type-check": "tsc --noEmit"
   },
   "type": "module",
   "types": "./src/index.ts",
-  "version": "1.7.1"
+  "version": "1.9.0"
 }

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

@@ -1,7 +1,7 @@
 import { describe, expect, test } from "bun:test";
 import { BaseDecimal, Chain } from "../../types";
 
-import { assetFromString, getAssetType, getDecimal } from "../asset.ts";
+import { assetFromString, getAssetType, getDecimal } from "../asset";
 
 const tickerMap: Record<string, string> = {
   [Chain.THORChain]: "RUNE",
@@ -88,19 +88,20 @@ describe("getDecimal", () => {
         expect(wbtcDecimal).toBe(8);
         await Bun.sleep(500);
 
-        const kindDecimal = await getDecimal({
-          chain: Chain.Ethereum,
-          symbol: "KIND-0x4618519de4c304f3444ffa7f812dddc2971cc688",
-        });
-        expect(kindDecimal).toBe(8);
-        await Bun.sleep(500);
-
-        const shitcoinDecimal = await getDecimal({
-          chain: Chain.Ethereum,
-          symbol: "HOMI-0xCa208BfD69ae6D2667f1FCbE681BAe12767c0078",
-        });
-        expect(shitcoinDecimal).toBe(0);
-        await Bun.sleep(500);
+        // TODO: this times out
+        // const kindDecimal = await getDecimal({
+        //   chain: Chain.Ethereum,
+        //   symbol: "KIND-0x4618519de4c304f3444ffa7f812dddc2971cc688",
+        // });
+        // expect(kindDecimal).toBe(8);
+        // await Bun.sleep(500);
+
+        // const shitcoinDecimal = await getDecimal({
+        //   chain: Chain.Ethereum,
+        //   symbol: "HOMI-0xCa208BfD69ae6D2667f1FCbE681BAe12767c0078",
+        // });
+        // expect(shitcoinDecimal).toBe(0);
+        // await Bun.sleep(500);
       },
       { retry: 3 },
     );
@@ -134,19 +135,20 @@ describe("getDecimal", () => {
         expect(timeDecimal).toBe(9);
         await Bun.sleep(500);
 
-        const usdtDecimal = await getDecimal({
-          chain: Chain.Avalanche,
-          symbol: "USDT-0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7",
-        });
-        expect(usdtDecimal).toBe(6);
-        await Bun.sleep(500);
-
-        const usdcDecimal = await getDecimal({
-          chain: Chain.Avalanche,
-          symbol: "USDC-0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E",
-        });
-        expect(usdcDecimal).toBe(6);
-        await Bun.sleep(500);
+        // TODO: this times out
+        // const usdtDecimal = await getDecimal({
+        //   chain: Chain.Avalanche,
+        //   symbol: "USDT-0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7",
+        // });
+        // expect(usdtDecimal).toBe(6);
+        // await Bun.sleep(500);
+
+        // const usdcDecimal = await getDecimal({
+        //   chain: Chain.Avalanche,
+        //   symbol: "USDC-0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E",
+        // });
+        // expect(usdcDecimal).toBe(6);
+        // await Bun.sleep(500);
       },
       { retry: 3 },
     );

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

@@ -11,7 +11,7 @@ import {
   getMemoForSaverDeposit,
   getMemoForSaverWithdraw,
   getMemoForWithdraw,
-} from "../memo.ts";
+} from "../memo";
 
 describe("getMemoForSaverDeposit", () => {
   test("returns correct memo for single side", () => {

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

@@ -1,8 +1,8 @@
 import { describe, expect, test } from "bun:test";
 import { Chain } from "../../types";
 
-import { findAssetBy } from "../asset.ts";
-import { getTHORNameCost } from "../others.ts";
+import { findAssetBy } from "../asset";
+import { getTHORNameCost } from "../others";
 
 describe("getTHORNameCost", () => {
   describe("for correct values", () => {

package/src/helpers/asset.ts

@@ -1,8 +1,8 @@
-import { AssetValue } from "../modules/assetValue.ts";
-import { RequestClient } from "../modules/requestClient.ts";
-import { BaseDecimal, Chain, ChainToRPC, type EVMChain, EVMChains } from "../types/chains.ts";
-import type { RadixCoreStateResourceDTO } from "../types/radix.ts";
-import type { TokenNames } from "../types/tokens.ts";
+import { AssetValue } from "../modules/assetValue";
+import { RequestClient } from "../modules/requestClient";
+import { BaseDecimal, Chain, ChainToRPC, type EVMChain, EVMChains } from "../types/chains";
+import type { RadixCoreStateResourceDTO } from "../types/radix";
+import type { TokenNames } from "../types/tokens";
 
 const getDecimalMethodHex = "0x313ce567";
 

package/src/helpers/liquidity.ts

@@ -1,5 +1,5 @@
-import { SwapKitNumber } from "../index.ts";
-import { BaseDecimal } from "../types/chains.ts";
+import { SwapKitNumber } from "../index";
+import { BaseDecimal } from "../types/chains";
 
 type ShareParams<T extends {}> = T & {
   liquidityUnits: string;

package/src/helpers/memo.ts

@@ -166,7 +166,7 @@ type WithdrawParams = {
 /**
  * @deprecated - Use separate functions per each memo type like getMemoForDeposit, getMemoForWithdraw, etc.
  */
-export const getMemoFor = <T extends MemoType>(memoType: T, options: NotWorth) => {
+export const getMemoFor = <T extends MemoType>(memoType: T, options: any) => {
   switch (memoType) {
     case MemoType.LEAVE:
     case MemoType.BOND: {

package/src/helpers/web3wallets.ts

@@ -26,7 +26,7 @@ declare const window: {
   ethereum: EthereumWindowProvider;
   trustwallet: EthereumWindowProvider;
   coinbaseWalletExtension: EthereumWindowProvider;
-  braveSolana: Todo;
+  braveSolana: any;
 } & Window;
 
 type NetworkParams = {
@@ -43,7 +43,7 @@ type NetworkParams = {
 
 type ProviderRequestParams = {
   provider?: BrowserProvider;
-  params?: Todo;
+  params?: any;
   method:
     | "wallet_addEthereumChain"
     | "wallet_switchEthereumChain"
@@ -69,12 +69,12 @@ const methodsToWrap = [
   "createContractTxObject",
 ];
 
-export const wrapMethodWithNetworkSwitch = <T extends (...args: Todo[]) => Todo>(
+export const wrapMethodWithNetworkSwitch = <T extends (...args: any[]) => any>(
   func: T,
   provider: BrowserProvider,
   chainId: ChainId,
 ) =>
-  (async (...args: Todo[]) => {
+  (async (...args: any[]) => {
     try {
       await switchEVMWalletNetwork(provider, chainId);
     } catch (error) {
@@ -95,7 +95,7 @@ const providerRequest = ({ provider, params, method }: ProviderRequestParams) =>
   return provider.send(method, providerParams);
 };
 
-export const prepareNetworkSwitch = <T extends { [key: string]: (...args: Todo[]) => Todo }>({
+export const prepareNetworkSwitch = <T extends { [key: string]: (...args: any[]) => any }>({
   toolbox,
   chainId,
   provider = window.ethereum,

package/src/index.ts

@@ -1,22 +1,22 @@
 export * from "@swapkit/contracts";
-export * from "./types/index.ts";
+export * from "./types/index";
 
 /**
  * Helpers
  */
-export * from "./helpers/asset.ts";
-export * from "./helpers/derivationPath.ts";
-export * from "./helpers/liquidity.ts";
-export * from "./helpers/memo.ts";
-export * from "./helpers/others.ts";
-export * from "./helpers/validators.ts";
-export * from "./helpers/web3wallets.ts";
+export * from "./helpers/asset";
+export * from "./helpers/derivationPath";
+export * from "./helpers/liquidity";
+export * from "./helpers/memo";
+export * from "./helpers/others";
+export * from "./helpers/validators";
+export * from "./helpers/web3wallets";
 
 /**
  * Modules
  */
-export * from "./modules/assetValue.ts";
-export * from "./modules/bigIntArithmetics.ts";
-export * from "./modules/requestClient.ts";
-export * from "./modules/swapKitError.ts";
-export * from "./modules/swapKitNumber.ts";
+export * from "./modules/assetValue";
+export * from "./modules/bigIntArithmetics";
+export * from "./modules/requestClient";
+export * from "./modules/swapKitError";
+export * from "./modules/swapKitNumber";

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

@@ -1,7 +1,7 @@
 import { describe, expect, test } from "bun:test";
 
-import { BaseDecimal, Chain } from "../../types/chains.ts";
-import { AssetValue, getMinAmountByChain } from "../assetValue.ts";
+import { BaseDecimal, Chain } from "../../types/chains";
+import { AssetValue, getMinAmountByChain } from "../assetValue";
 
 describe("AssetValue", () => {
   describe("assetValue", () => {
@@ -76,6 +76,15 @@ describe("AssetValue", () => {
       expect(ethMayaSynth.toString({ includeSynthProtocol: true })).toBe("MAYA.ETH/ETH");
       expect(ethMayaSynth.getBaseValue("string")).toBe("1000000000");
 
+      const ethTCSynthFallback = AssetValue.from({
+        asset: "ETH/ETH",
+        value: 10,
+      });
+
+      expect(ethTCSynthFallback.toString()).toBe("ETH/ETH");
+      expect(ethTCSynthFallback.toString({ includeSynthProtocol: true })).toBe("THOR.ETH/ETH");
+      expect(ethTCSynthFallback.getBaseValue("string")).toBe("1000000000");
+
       // TODO:
       // const radixXWBTC = new AssetValue({
       //   identifier:

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

@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test";
 
-import { formatBigIntToSafeValue } from "../bigIntArithmetics.ts";
+import { formatBigIntToSafeValue } from "../bigIntArithmetics";
 
 describe("BigIntArithmatics", () => {
   describe("formatBigIntToSafeValue", () => {

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

@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test";
 
-import { SwapKitNumber } from "../swapKitNumber.ts";
+import { SwapKitNumber } from "../swapKitNumber";
 
 describe("SwapKitNumber", () => {
   describe("constructors", () => {

package/src/modules/assetValue.ts

@@ -1,4 +1,3 @@
-import { red, yellow } from "picocolors";
 import {
   type CommonAssetString,
   CommonAssetStrings,
@@ -6,16 +5,16 @@ import {
   getCommonAssetInfo,
   getDecimal,
   isGasAsset,
-} from "../helpers/asset.ts";
-import { warnOnce } from "../helpers/others.ts";
-import { validateIdentifier } from "../helpers/validators.ts";
-import { BaseDecimal, Chain, type ChainId, ChainToChainId } from "../types/chains.ts";
-import type { TokenNames, TokenTax } from "../types/tokens.ts";
+} from "../helpers/asset";
+import { warnOnce } from "../helpers/others";
+import { validateIdentifier } from "../helpers/validators";
+import { BaseDecimal, Chain, type ChainId, ChainToChainId } from "../types/chains";
+import type { TokenNames, TokenTax } from "../types/tokens";
 
-import type { NumberPrimitives } from "./bigIntArithmetics.ts";
-import { BigIntArithmetics, formatBigIntToSafeValue } from "./bigIntArithmetics.ts";
-import { SwapKitError } from "./swapKitError.ts";
-import type { SwapKitValueType } from "./swapKitNumber.ts";
+import type { NumberPrimitives } from "./bigIntArithmetics";
+import { BigIntArithmetics, formatBigIntToSafeValue } from "./bigIntArithmetics";
+import { SwapKitError } from "./swapKitError";
+import type { SwapKitValueType } from "./swapKitNumber";
 
 const staticTokensMap = new Map<
   TokenNames,
@@ -131,12 +130,10 @@ export class AssetValue extends BigIntArithmetics {
 
     warnOnce(
       !(asyncTokenLookup || tokenDecimal),
-      yellow(
-        `Couldn't find static decimal for ${red(unsafeIdentifier)} (Using default ${red(BaseDecimal[chain])} decimal as fallback).
+      `Couldn't find static decimal for ${unsafeIdentifier} (Using default ${BaseDecimal[chain]} decimal as fallback).
 This can result in incorrect calculations and mess with amount sent on transactions.
 You can load static assets by installing @swapkit/tokens package and calling AssetValue.loadStaticAssets()
 or by passing asyncTokenLookup: true to the from() function, which will make it async and return a promise.`,
-      ),
     );
 
     const { decimal, identifier, tax } = token || {
@@ -158,7 +155,7 @@ or by passing asyncTokenLookup: true to the from() function, which will make it
   }
 
   static loadStaticAssets() {
-    return new Promise<{ ok: true } | { ok: false; message: string; error: Todo }>(
+    return new Promise<{ ok: true } | { ok: false; message: string; error: any }>(
       (resolve, reject) => {
         try {
           import("@swapkit/tokens").then((tokenPackages) => {
@@ -289,7 +286,9 @@ async function createAssetValue(identifier: string, value: NumberPrimitives = 0)
 }
 
 function createSyntheticAssetValue(identifier: string, value: NumberPrimitives = 0) {
-  const chain = identifier.split(".")?.[0]?.toUpperCase() as Chain | undefined;
+  const chain = identifier.includes(".")
+    ? (identifier.split(".")?.[0]?.toUpperCase() as Chain)
+    : undefined;
   const isMayaOrThor = chain ? [Chain.Maya, Chain.THORChain].includes(chain) : false;
 
   const [synthChain, symbol] = isMayaOrThor

package/src/modules/bigIntArithmetics.ts

@@ -1,5 +1,5 @@
-import { BaseDecimal } from "../types/chains.ts";
-import type { SwapKitNumber } from "./swapKitNumber.ts";
+import { BaseDecimal } from "../types/chains";
+import type { SwapKitNumber } from "./swapKitNumber";
 
 type NumberPrimitivesType = {
   bigint: bigint;

package/src/modules/requestClient.ts

@@ -2,8 +2,8 @@ type Options = Parameters<typeof fetch>[1] & {
   headers?: Record<string, string>;
   apiKey?: string;
   method?: "GET" | "POST";
-  onError?: (error: NotWorth) => NotWorth;
-  responseHandler?: (response: NotWorth) => NotWorth;
+  onError?: (error: any) => any;
+  responseHandler?: (response: any) => any;
   searchParams?: Record<string, string>;
   json?: unknown;
 };

package/src/modules/swapKitError.ts

@@ -86,6 +86,8 @@ const errorCodes = {
   wallet_talisman_not_enabled: 20601,
   wallet_talisman_not_found: 20602,
   wallet_polkadot_not_found: 20701,
+  wallet_radix_not_found: 20801,
+  wallet_radix_transaction_failed: 20802,
   /**
    * Chainflip
    */
@@ -130,6 +132,7 @@ const errorCodes = {
   toolbox_evm_provider_not_eip1193_compatible: 90210,
   toolbox_evm_error_estimating_gas_limit: 90211,
   toolbox_evm_error_sending_transaction: 90212,
+  toolbox_radix_signer_not_defined: 90301,
   /**
    * Helpers
    */
@@ -153,8 +156,8 @@ export class SwapKitError extends Error {
   static ErrorCode = errorCodes;
 
   constructor(
-    errorOrErrorKey: ErrorKeys | { errorKey: ErrorKeys; info?: Record<string, NotWorth> },
-    sourceError?: NotWorth,
+    errorOrErrorKey: ErrorKeys | { errorKey: ErrorKeys; info?: Record<string, any> },
+    sourceError?: any,
   ) {
     const isErrorString = typeof errorOrErrorKey === "string";
 

package/src/modules/swapKitNumber.ts

@@ -1,4 +1,4 @@
-import { BigIntArithmetics, formatBigIntToSafeValue } from "./bigIntArithmetics.ts";
+import { BigIntArithmetics, formatBigIntToSafeValue } from "./bigIntArithmetics";
 
 export type SwapKitValueType = BigIntArithmetics | string | number;
 

package/src/types/chains.ts

@@ -52,7 +52,7 @@ export enum ChainId {
   Polygon = "137",
   PolygonHex = "0x89",
   Radix = "radix-mainnet",
-  THORChain = "thorchain-mainnet-v1",
+  THORChain = "thorchain-1",
   THORChainStagenet = "thorchain-stagenet-v2",
   Solana = "solana",
 }

package/src/types/commonTypes.ts

@@ -1,6 +1,6 @@
-import type { Chain } from "./chains.ts";
-import type { ChainApis } from "./sdk.ts";
-import type { ChainWallet } from "./wallet.ts";
+import type { Chain } from "./chains";
+import type { ChainApis } from "./sdk";
+import type { ChainWallet } from "./wallet";
 
 export type ConnectConfig = {
   stagenet?: boolean;
@@ -47,9 +47,17 @@ export type ConnectConfig = {
    * @optional for setting the chainflip broker url
    */
   chainflipBrokerUrl?: string;
+  /**
+   * @optional for setting the chainflip radix dapp config
+   */
+  radixDappConfig?: {
+    dAppDefinitionAddress: string;
+    applicationName: string;
+    applicationVersion: string;
+  };
 };
 
-export type ConnectWalletParams<M = { [key in string]: NotWorth }> = {
+export type ConnectWalletParams<M = { [key in string]: any }> = {
   addChain: <T extends Chain>(params: ChainWallet<T> & M) => void;
   apis: ChainApis;
   config: ConnectConfig;

package/src/types/network.ts

@@ -20,7 +20,7 @@ export enum RPCUrl {
   Radix = "https://radix-mainnet.rpc.grove.city/v1/326002fc/core",
   THORChain = "https://rpc.thorswap.net",
   THORChainStagenet = "https://stagenet-rpc.ninerealms.com",
-  Solana = "https://mainnet.helius-rpc.com/?api-key=2cbe3ae6-cfc5-4141-a093-0055d0fa3d80",
+  Solana = "https://mainnet.helius-rpc.com",
 }
 
 export enum ExplorerUrl {

package/src/types/radix.ts

@@ -1,5 +1,5 @@
 export type RadixCoreStateResourceDTO = {
-  at_ledger_state?: Todo; // not needed
+  at_ledger_state?: any; // not needed
   manager: {
     resource_type: string;
     divisibility: {
@@ -10,5 +10,5 @@ export type RadixCoreStateResourceDTO = {
       };
     };
   };
-  owner_role?: Todo; // not needed
+  owner_role?: any; // not needed
 };

package/src/types/tokens.ts

@@ -6,7 +6,6 @@ import type {
   PangolinList,
   SushiswapList,
   ThorchainList,
-  TraderjoeV1List,
   TraderjoeV2List,
   UniswapV2List,
   UniswapV3List,
@@ -22,7 +21,6 @@ export type TokenNames =
   | (typeof PangolinList)["tokens"][number]["identifier"]
   | (typeof SushiswapList)["tokens"][number]["identifier"]
   | (typeof ThorchainList)["tokens"][number]["identifier"]
-  | (typeof TraderjoeV1List)["tokens"][number]["identifier"]
   | (typeof TraderjoeV2List)["tokens"][number]["identifier"]
   | (typeof UniswapV2List)["tokens"][number]["identifier"]
   | (typeof UniswapV3List)["tokens"][number]["identifier"];

package/src/types/wallet.ts

@@ -1,6 +1,7 @@
 import type { CosmosWallets, ThorchainWallets } from "@swapkit/toolbox-cosmos";
 import type { EVMWallets } from "@swapkit/toolbox-evm";
-import type { SolanaWallet } from "@swapkit/toolbox-solana";
+import type { RadixWallets } from "@swapkit/toolbox-radix";
+import type { SolanaWallets } from "@swapkit/toolbox-solana";
 import type { SubstrateWallets } from "@swapkit/toolbox-substrate";
 import type { UTXOWallets } from "@swapkit/toolbox-utxo";
 import type { Eip1193Provider } from "ethers";
@@ -62,7 +63,13 @@ export type BaseWallet<T extends EmptyWallet | Record<string, unknown>> = {
 };
 
 export type FullWallet = BaseWallet<
-  EVMWallets & UTXOWallets & CosmosWallets & ThorchainWallets & SubstrateWallets & SolanaWallet
+  EVMWallets &
+    UTXOWallets &
+    CosmosWallets &
+    ThorchainWallets &
+    SubstrateWallets &
+    SolanaWallets &
+    RadixWallets
 >;
 
 /**
@@ -70,7 +77,7 @@ export type FullWallet = BaseWallet<
  */
 export type Wallet = FullWallet;
 
-export type SwapKitWallet<ConnectParams extends Todo[]> = (
+export type SwapKitWallet<ConnectParams extends any[]> = (
   params: ConnectWalletParams,
 ) => (...connectParams: ConnectParams) => boolean | Promise<boolean>;