@swapkit/helpers 3.0.0-beta.12 → 3.0.0-beta.14

package/src/types/chains.ts

@@ -1,3 +1,6 @@
+import { match } from "ts-pattern";
+import { SwapKitError } from "../modules/swapKitError";
+
 export enum Chain {
   Arbitrum = "ARB",
   Avalanche = "AVAX",
@@ -22,6 +25,7 @@ export enum Chain {
   Ripple = "XRP",
   THORChain = "THOR",
   Solana = "SOL",
+  Tron = "TRX",
 }
 
 export enum StagenetChain {
@@ -62,6 +66,7 @@ export enum ChainId {
   THORChain = "thorchain-1",
   THORChainStagenet = "thorchain-stagenet-v2",
   Solana = "solana",
+  Tron = "tron",
 }
 
 export const ChainIdToChain: Record<ChainId, Chain> = {
@@ -97,6 +102,7 @@ export const ChainIdToChain: Record<ChainId, Chain> = {
   [ChainId.Solana]: Chain.Solana,
   [ChainId.THORChainStagenet]: Chain.THORChain,
   [ChainId.THORChain]: Chain.THORChain,
+  [ChainId.Tron]: Chain.Tron,
 };
 
 type ChainNameType = keyof typeof Chain;
@@ -125,6 +131,7 @@ export const BaseDecimal: Record<Chain, number> = {
   OP: 18,
   SOL: 9,
   THOR: 8,
+  TRX: 6,
   XRD: 18,
   XRP: 6,
 };
@@ -153,6 +160,7 @@ export const BlockTimes: Record<Partial<Chain>, number> = {
   [Chain.Ripple]: 5,
   [Chain.Solana]: 0.4,
   [Chain.THORChain]: 6,
+  [Chain.Tron]: 3,
 };
 
 export type SubstrateChain = Chain.Polkadot | Chain.Chainflip;
@@ -245,6 +253,7 @@ export const RPC_URLS: Record<Chain | StagenetChain, string> = {
   [Chain.Ripple]: "wss://xrpl.ws/",
   [Chain.Solana]: "https://solana-rpc.publicnode.com",
   [Chain.THORChain]: "https://rpc.thorswap.net",
+  [Chain.Tron]: "https://api.trongrid.io",
   [StagenetChain.Maya]: "https://stagenet.tendermint.mayachain.info",
   [StagenetChain.THORChain]: "https://stagenet-rpc.ninerealms.com",
 };
@@ -300,6 +309,7 @@ export const FALLBACK_URLS: Record<Chain | StagenetChain, string[]> = {
   [Chain.THORChain]: ["https://thornode.ninerealms.com", NODE_URLS[Chain.THORChain]],
   [StagenetChain.THORChain]: [],
   [Chain.Solana]: ["https://api.mainnet-beta.solana.com", "https://rpc.ankr.com/solana"],
+  [Chain.Tron]: ["https://api.tronstack.io", "https://api.tron.network"],
 };
 
 export const EXPLORER_URLS: Record<Chain, string> = {
@@ -326,51 +336,49 @@ export const EXPLORER_URLS: Record<Chain, string> = {
   [Chain.Ripple]: "https://livenet.xrpl.org/",
   [Chain.THORChain]: "https://runescan.io",
   [Chain.Solana]: "https://solscan.io",
+  [Chain.Tron]: "https://tronscan.org",
 };
 
 let RPCUrlsMerged = RPC_URLS;
 
 const getRpcBody = (chain: Chain | StagenetChain) => {
-  switch (chain) {
-    case Chain.Arbitrum:
-    case Chain.Avalanche:
-    case Chain.Base:
-    case Chain.BinanceSmartChain:
-    case Chain.Ethereum:
-    case Chain.Optimism:
-    case Chain.Polygon:
-      return { id: 1, jsonrpc: "2.0", method: "eth_blockNumber", params: [] };
-    case Chain.Bitcoin:
-    case Chain.Dogecoin:
-    case Chain.BitcoinCash:
-    case Chain.Dash:
-    case Chain.Litecoin:
-      return { id: "test", jsonrpc: "1.0", method: "getblockchaininfo", params: [] };
-    case Chain.Cosmos:
-    case Chain.Kujira:
-    case Chain.Maya:
-    case Chain.THORChain:
-    case StagenetChain.Maya:
-    case StagenetChain.THORChain:
-      return { id: 1, jsonrpc: "2.0", method: "status", params: {} };
-    case Chain.Polkadot:
-      return { id: 1, jsonrpc: "2.0", method: "system_health", params: [] };
-    case Chain.Solana:
-      return { id: 1, jsonrpc: "2.0", method: "getHealth" };
-    case Chain.Radix:
-      return "";
-    default:
-      throw new Error(`Unsupported chain: ${chain}`);
-  }
+  return match(chain)
+    .with(
+      Chain.Arbitrum,
+      Chain.Avalanche,
+      Chain.Base,
+      Chain.BinanceSmartChain,
+      Chain.Ethereum,
+      Chain.Optimism,
+      Chain.Polygon,
+      Chain.Tron,
+      () => ({ id: 1, jsonrpc: "2.0", method: "eth_blockNumber", params: [] }),
+    )
+    .with(Chain.Bitcoin, Chain.Dogecoin, Chain.BitcoinCash, Chain.Dash, Chain.Litecoin, () => ({
+      id: "test",
+      jsonrpc: "1.0",
+      method: "getblockchaininfo",
+      params: [],
+    }))
+    .with(
+      Chain.Cosmos,
+      Chain.Kujira,
+      Chain.Maya,
+      Chain.THORChain,
+      StagenetChain.Maya,
+      StagenetChain.THORChain,
+      () => ({ id: 1, jsonrpc: "2.0", method: "status", params: {} }),
+    )
+    .with(Chain.Polkadot, () => ({ id: 1, jsonrpc: "2.0", method: "system_health", params: [] }))
+    .with(Chain.Solana, () => ({ id: 1, jsonrpc: "2.0", method: "getHealth" }))
+    .with(Chain.Radix, () => "")
+    .otherwise(() => {
+      throw new SwapKitError("helpers_chain_not_supported", { chain });
+    });
 };
 
 function getChainStatusEndpoint(chain: Chain | StagenetChain) {
-  switch (chain) {
-    case Chain.Radix:
-      return "/status/network-configuration";
-    default:
-      return "";
-  }
+  return chain === Chain.Radix ? "/status/network-configuration" : "";
 }
 
 const testRPCConnection = async (chain: Chain | StagenetChain, url: string) => {

package/src/types/derivationPath.ts

@@ -32,6 +32,7 @@ export const NetworkDerivationPath: Record<Chain, DerivationPathArray> = {
   OP: [44, 60, 0, 0, 0],
   SOL: [44, 501, 0, 0, 0],
   THOR: [44, 931, 0, 0, 0],
+  TRX: [44, 195, 0, 0, 0],
 
   // Polkadot and related network derivation path is not number based
   DOT: [0, 0, 0, 0, 0],

package/src/types/wallet.ts

@@ -4,6 +4,7 @@ import type { RadixWallet } from "@swapkit/toolboxes/radix";
 import type { RippleWallet } from "@swapkit/toolboxes/ripple";
 import type { SolanaWallet } from "@swapkit/toolboxes/solana";
 import type { SubstrateToolboxes } from "@swapkit/toolboxes/substrate";
+import type { TronWallet } from "@swapkit/toolboxes/tron";
 import type { UTXOToolboxes } from "@swapkit/toolboxes/utxo";
 import type { BrowserProvider } from "ethers";
 import type { Eip1193Provider } from "ethers";
@@ -108,6 +109,7 @@ export type FullWallet = BaseWallet<
       [Chain.Radix]: RadixWallet;
       [Chain.Ripple]: RippleWallet;
       [Chain.Solana]: SolanaWallet;
+      [Chain.Tron]: TronWallet;
     }
 >;
 

package/src/utils/asset.ts

@@ -53,7 +53,7 @@ async function getContractDecimals({ chain, to }: { chain: EVMChain; to: string
 
     return Number.parseInt(BigInt(result || BaseDecimal[chain]).toString());
   } catch (error) {
-    console.error(error);
+    console.error(`Failed to fetch contract decimals for ${to} on ${chain}:`, error);
     return BaseDecimal[chain];
   }
 }
@@ -77,7 +77,7 @@ async function getRadixAssetDecimal(symbol: string) {
 
     return manager.divisibility.value.divisibility;
   } catch (error) {
-    console.error(error);
+    console.error(`Failed to fetch Radix asset decimal for ${symbol}:`, error);
     return BaseDecimal[Chain.Radix];
   }
 }
@@ -139,6 +139,7 @@ export const getCommonAssetInfo = (assetString: CommonAssetString) => {
       Chain.Kujira,
       Chain.Ripple,
       Chain.Polkadot,
+      Chain.Tron,
       (asset) => ({ identifier: `${asset}.${asset}`, decimal }),
     )
     .with(Chain.Radix, "XRD.XRD", () => ({ identifier: "XRD.XRD", decimal }))

package/src/utils/memo.ts

@@ -1,3 +1,4 @@
+import { match } from "ts-pattern";
 import { Chain } from "../types/chains";
 import { MemoType } from "../types/sdk";
 
@@ -95,17 +96,10 @@ function getPoolIdentifier({
   chain: Chain;
   symbol: string;
 }) {
-  switch (chain) {
-    case Chain.Bitcoin:
-    case Chain.Dogecoin:
-    case Chain.Litecoin:
-      return chain.slice(0, 1).toLowerCase();
-    case Chain.BitcoinCash:
-      return "c";
-
-    default:
-      return `${chain}.${symbol}`;
-  }
+  return match(chain)
+    .with(Chain.Bitcoin, Chain.Dogecoin, Chain.Litecoin, () => chain.slice(0, 1).toLowerCase())
+    .with(Chain.BitcoinCash, () => "c")
+    .otherwise(() => `${chain}.${symbol}`);
 }
 
 type WithAffiliate<T extends {}> = T & {

package/src/utils/others.ts

@@ -34,7 +34,7 @@ export function wrapWithThrow<T>(fn: () => T, errorKey?: ErrorKeys) {
       throw new SwapKitError(errorKey, error);
     }
 
-    return console.error(error);
+    return;
   }
 }
 
@@ -62,7 +62,6 @@ export function warnOnce(condition: boolean, warning: string) {
     }
 
     warnings.add(warning);
-    console.warn(warning);
   }
 }
 

package/src/utils/wallets.ts

@@ -70,7 +70,10 @@ export async function switchEVMWalletNetwork(
     });
   } catch (_error) {
     if (!networkParams) {
-      throw new Error("Failed to switch network, networkParams not provided");
+      throw new SwapKitError("helpers_failed_to_switch_network", {
+        error: _error,
+        reason: "networkParams not provided",
+      });
     }
     await addEVMWalletNetwork(provider, networkParams);
   }
@@ -107,7 +110,7 @@ export function wrapMethodWithNetworkSwitch<T extends (...args: any[]) => any>(
   provider: BrowserProvider,
   chain: Chain,
 ) {
-  (async (...args: any[]) => {
+  return (async (...args: any[]) => {
     try {
       await switchEVMWalletNetwork(provider, chain);
     } catch (error) {