@swapkit/helpers 3.0.0-beta.8 → 4.0.0-beta.24

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,8 @@ export enum Chain {
   Ripple = "XRP",
   THORChain = "THOR",
   Solana = "SOL",
+  Tron = "TRX",
+  Zcash = "ZEC",
 }
 
 export enum StagenetChain {
@@ -62,6 +67,9 @@ export enum ChainId {
   THORChain = "thorchain-1",
   THORChainStagenet = "thorchain-stagenet-v2",
   Solana = "solana",
+  Tron = "728126428",
+  TronHex = "0x2b6653dc",
+  Zcash = "zcash",
 }
 
 export const ChainIdToChain: Record<ChainId, Chain> = {
@@ -97,6 +105,9 @@ export const ChainIdToChain: Record<ChainId, Chain> = {
   [ChainId.Solana]: Chain.Solana,
   [ChainId.THORChainStagenet]: Chain.THORChain,
   [ChainId.THORChain]: Chain.THORChain,
+  [ChainId.Tron]: Chain.Tron,
+  [ChainId.TronHex]: Chain.Tron,
+  [ChainId.Zcash]: Chain.Zcash,
 };
 
 type ChainNameType = keyof typeof Chain;
@@ -125,8 +136,10 @@ export const BaseDecimal: Record<Chain, number> = {
   OP: 18,
   SOL: 9,
   THOR: 8,
+  TRX: 6,
   XRD: 18,
   XRP: 6,
+  ZEC: 8,
 };
 
 export const BlockTimes: Record<Partial<Chain>, number> = {
@@ -153,6 +166,8 @@ export const BlockTimes: Record<Partial<Chain>, number> = {
   [Chain.Ripple]: 5,
   [Chain.Solana]: 0.4,
   [Chain.THORChain]: 6,
+  [Chain.Tron]: 3,
+  [Chain.Zcash]: 150,
 };
 
 export type SubstrateChain = Chain.Polkadot | Chain.Chainflip;
@@ -182,13 +197,15 @@ export type UTXOChain =
   | Chain.BitcoinCash
   | Chain.Dash
   | Chain.Dogecoin
-  | Chain.Litecoin;
+  | Chain.Litecoin
+  | Chain.Zcash;
 export const UTXOChains = [
   Chain.Bitcoin,
   Chain.BitcoinCash,
   Chain.Dash,
   Chain.Dogecoin,
   Chain.Litecoin,
+  Chain.Zcash,
 ] as const;
 
 export type CosmosChain = Chain.Cosmos | Chain.THORChain | Chain.Maya | Chain.Kujira;
@@ -237,7 +254,7 @@ export const RPC_URLS: Record<Chain | StagenetChain, string> = {
   [Chain.Kujira]: "https://kujira-rpc.ibs.team",
   [Chain.Litecoin]: "https://node-router.thorswap.net/litecoin",
   [Chain.Maya]: "https://tendermint.mayachain.info",
-  [Chain.Near]: "https://rpc.ankr.com/near",
+  [Chain.Near]: "https://rpc.mainnet.near.org",
   [Chain.Optimism]: "https://mainnet.optimism.io",
   [Chain.Polkadot]: "wss://rpc.polkadot.io",
   [Chain.Polygon]: "https://polygon-rpc.com",
@@ -245,6 +262,8 @@ 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://tron-rpc.publicnode.com",
+  [Chain.Zcash]: "https://api.blockchair.com/zcash",
   [StagenetChain.Maya]: "https://stagenet.tendermint.mayachain.info",
   [StagenetChain.THORChain]: "https://stagenet-rpc.ninerealms.com",
 };
@@ -279,27 +298,36 @@ export const FALLBACK_URLS: Record<Chain | StagenetChain, string[]> = {
     "wss://archive-1.mainnet.chainflip.io",
     "wss://archive-2.mainnet.chainflip.io",
   ],
-  [Chain.Cosmos]: ["https://cosmos-rpc.quickapi.com", "https://cosmos-rpc.publicnode.com"],
+  [Chain.Cosmos]: ["https://cosmos-rpc.publicnode.com"],
   [Chain.Dash]: ["https://dash-rpc.publicnode.com"],
   [Chain.Dogecoin]: ["https://doge.getblock.io/mainnet", "https://dogecoin.publicnode.com"],
-  [Chain.Ethereum]: ["https://eth.llamarpc.com", "https://rpc.ankr.com/eth"],
+  [Chain.Ethereum]: ["https://eth.llamarpc.com", "https://cloudflare-eth.com"],
   [Chain.Fiat]: [],
   [Chain.Kujira]: ["https://kujira-rpc.polkachu.com", "https://rpc-kujira.synergynodes.com/"],
   [Chain.Litecoin]: ["https://ltc.getblock.io/mainnet", "https://litecoin.publicnode.com"],
   [Chain.Maya]: ["https://tendermint.mayachain.info", "https://maya-tendermint.publicnode.com"],
   [StagenetChain.Maya]: [],
-  [Chain.Near]: ["https://1rpc.io/near"],
+  [Chain.Near]: [
+    "https://1rpc.io/near",
+    "https://near.lava.build",
+    "https://near-mainnet.infura.io/v3/3cbfcafa5e1e48b7bb0ea41f2fbc4abf",
+  ],
   [Chain.Optimism]: ["https://optimism.llamarpc.com", "https://1rpc.io/op"],
   [Chain.Polkadot]: [
     "wss://polkadot-rpc.dwellir.com",
     "wss://polkadot.api.onfinality.io/public-ws",
   ],
-  [Chain.Polygon]: ["https://polygon.llamarpc.com", "https://rpc.ankr.com/polygon"],
+  [Chain.Polygon]: ["https://polygon.llamarpc.com", "https://polygon-bor-rpc.publicnode.com"],
   [Chain.Radix]: ["https://mainnet.radixdlt.com", "https://radix-mainnet.rpc.grove.city/v1"],
   [Chain.Ripple]: ["wss://s1.ripple.com/", "wss://s2.ripple.com/"],
   [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.Solana]: [
+    "https://api.mainnet-beta.solana.com",
+    "https://solana-mainnet.rpc.extrnode.com",
+  ],
+  [Chain.Tron]: ["https://api.tronstack.io", "https://api.tron.network"],
+  [Chain.Zcash]: ["https://api.blockchair.com/zcash"],
 };
 
 export const EXPLORER_URLS: Record<Chain, string> = {
@@ -326,51 +354,77 @@ 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",
+  [Chain.Zcash]: "https://blockchair.com/zcash",
 };
 
 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,
+      () => ({ id: 1, jsonrpc: "2.0", method: "eth_blockNumber", params: [] }),
+    )
+    .with(
+      Chain.Bitcoin,
+      Chain.Dogecoin,
+      Chain.BitcoinCash,
+      Chain.Dash,
+      Chain.Litecoin,
+      Chain.Zcash,
+      () => ({
+        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, Chain.Chainflip, () => ({
+      id: 1,
+      jsonrpc: "2.0",
+      method: "system_health",
+      params: [],
+    }))
+    .with(Chain.Solana, () => ({ id: 1, jsonrpc: "2.0", method: "getHealth" }))
+    .with(Chain.Tron, Chain.Radix, Chain.Fiat, () => "")
+    .with(Chain.Near, () => ({
+      jsonrpc: "2.0",
+      id: "dontcare",
+      method: "status",
+      params: [],
+    }))
+    .with(Chain.Ripple, () => ({
+      method: "ping",
+      params: [{}],
+      id: 1,
+      jsonrpc: "2.0",
+    }))
+    .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 match(chain)
+    .with(Chain.Radix, () => "/status/network-configuration")
+    .with(Chain.Tron, () => "/wallet/getnowblock")
+    .otherwise(() => "");
 }
 
 const testRPCConnection = async (chain: Chain | StagenetChain, url: string) => {

package/src/types/derivationPath.ts

@@ -32,6 +32,8 @@ 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],
+  ZEC: [44, 133, 0, 0, 0],
 
   // Polkadot and related network derivation path is not number based
   DOT: [0, 0, 0, 0, 0],

package/src/types/quotes.ts

@@ -76,7 +76,6 @@ export enum ErrorCode {
   addressScreeningFailed = "addressScreeningFailed",
   noLiquidtyProvidersFound = "noLiquidtyProvidersFound",
   insufficientLiquidity = "insufficientLiquidity",
-  noSaversFound = "noSaversFound",
   noInboundDataFound = "noInbounDataFound",
   noInboundAddressesFound = "noInboundAddressesFound",
   noInboundAddressFoundForChain = "noInboundAddressFoundForChain",
@@ -110,7 +109,6 @@ export enum ErrorCode {
   thorchainPoolUnavailable = "thorchainPoolUnavailable",
   noOhlcvDataFound = "noOhlcvDataFound",
   noTradingPairs = "noTradingPairs",
-  noLoanPositionFound = "noLoanPositionFound",
   noLendingAvailability = "noLendingAvailability",
   lendingRepayTooSmall = "lendingRepayTooSmall",
   missingState = "missingState",
@@ -160,6 +158,7 @@ export enum ProviderName {
   UNISWAP_V2 = "UNISWAP_V2",
   UNISWAP_V3 = "UNISWAP_V3",
   KADO = "KADO",
+  NEAR = "NEAR",
 }
 
 export enum FeeTypeEnum {

package/src/types/sdk.ts

@@ -34,8 +34,6 @@ export enum MemoType {
   LEAVE = "LEAVE",
   UNBOND = "UNBOND",
   WITHDRAW = "-",
-  OPEN_LOAN = "$+",
-  CLOSE_LOAN = "$-",
   RUNEPOOL_DEPOSIT = "POOL+",
   RUNEPOOL_WITHDRAW = "POOL-",
 }

package/src/types/wallet.ts

@@ -1,9 +1,11 @@
 import type { CosmosWallets, ThorchainWallets } from "@swapkit/toolboxes/cosmos";
 import type { EVMToolboxes } from "@swapkit/toolboxes/evm";
+import type { NearWallet } from "@swapkit/toolboxes/near";
 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";
@@ -53,6 +55,7 @@ export enum WalletOption {
   BRAVE = "BRAVE",
   COINBASE_MOBILE = "COINBASE_MOBILE",
   COINBASE_WEB = "COINBASE_WEB",
+  COSMOSTATION = "COSMOSTATION",
   CTRL = "CTRL",
   EIP6963 = "EIP6963",
   EXODUS = "EXODUS",
@@ -107,6 +110,8 @@ export type FullWallet = BaseWallet<
       [Chain.Radix]: RadixWallet;
       [Chain.Ripple]: RippleWallet;
       [Chain.Solana]: SolanaWallet;
+      [Chain.Tron]: TronWallet;
+      [Chain.Near]: NearWallet;
     }
 >;
 

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

@@ -8,29 +8,9 @@ import {
   getMemoForNameRegister,
   getMemoForRunePoolDeposit,
   getMemoForRunePoolWithdraw,
-  getMemoForSaverDeposit,
-  getMemoForSaverWithdraw,
   getMemoForWithdraw,
 } from "../memo";
 
-describe("getMemoForSaverDeposit", () => {
-  test("returns correct memo for single side", () => {
-    const result = getMemoForSaverDeposit({ chain: Chain.Ethereum, symbol: "ETH" });
-    expect(result).toBe("+:ETH/ETH");
-  });
-});
-
-describe("getMemoForSaverWithdraw", () => {
-  test("returns correct memo for single side", () => {
-    const result = getMemoForSaverWithdraw({
-      basisPoints: 5000,
-      chain: Chain.Ethereum,
-      symbol: "ETH",
-    });
-    expect(result).toBe("-:ETH/ETH:5000");
-  });
-});
-
 describe("getMemoForLeaveAndBond", () => {
   test("returns correct memo for Leave", () => {
     const result = getMemoForLeaveAndBond({ address: "ABC123", type: MemoType.LEAVE });

package/src/utils/asset.ts

@@ -14,6 +14,7 @@ export type ConditionalAssetValueReturn<T extends boolean> = T extends true
 
 export const CommonAssetStrings = [
   `${Chain.Maya}.MAYA`,
+  `${Chain.Maya}.CACAO`,
   `${Chain.Ethereum}.THOR`,
   `${Chain.Ethereum}.vTHOR`,
   `${Chain.Kujira}.USK`,
@@ -52,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];
   }
 }
@@ -76,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];
   }
 }
@@ -125,27 +126,12 @@ export const getCommonAssetInfo = (assetString: CommonAssetString) => {
   const decimal = BaseDecimal[assetString as Chain];
 
   const commonAssetInfo = match(assetString.toUpperCase())
-    .with(...ethGasChains, () => ({
-      identifier: `${assetString.toUpperCase()}.ETH`,
-      decimal,
-    }))
-    .with(Chain.THORChain, () => ({
-      identifier: `${assetString.toUpperCase()}.RUNE`,
-      decimal,
-    }))
-    .with(Chain.Cosmos, () => ({ identifier: `${assetString.toUpperCase()}.ATOM`, decimal }))
-    .with(Chain.Maya, () => ({
-      identifier: `${assetString.toUpperCase()}.CACAO`,
-      decimal: 10,
-    }))
-    .with(Chain.BinanceSmartChain, () => ({
-      identifier: `${assetString.toUpperCase()}.BNB`,
-      decimal,
-    }))
-    .with(Chain.Avalanche, () => ({
-      identifier: `${assetString.toUpperCase()}.AVAX`,
-      decimal,
-    }))
+    .with(...ethGasChains, (asset) => ({ identifier: `${asset}.ETH`, decimal }))
+    .with(Chain.THORChain, (asset) => ({ identifier: `${asset}.RUNE`, decimal }))
+    .with(Chain.Cosmos, (asset) => ({ identifier: `${asset}.ATOM`, decimal }))
+    .with(Chain.Maya, (asset) => ({ identifier: `${asset}.CACAO`, decimal: 10 }))
+    .with(Chain.BinanceSmartChain, (asset) => ({ identifier: `${asset}.BNB`, decimal }))
+    .with(Chain.Avalanche, (asset) => ({ identifier: `${asset}.AVAX`, decimal }))
     .with(
       ...UTXOChains,
       Chain.Solana,
@@ -153,13 +139,13 @@ export const getCommonAssetInfo = (assetString: CommonAssetString) => {
       Chain.Kujira,
       Chain.Ripple,
       Chain.Polkadot,
-      () => ({ identifier: `${assetString.toUpperCase()}.${assetString.toUpperCase()}`, decimal }),
+      Chain.Tron,
+      Chain.Near,
+      (asset) => ({ identifier: `${asset}.${asset}`, decimal }),
     )
-    .with(Chain.Radix, "XRD.XRD", () => ({
-      identifier: "XRD.XRD",
-      decimal,
-    }))
-    .with("KUJI.USK", () => ({ identifier: assetString.toUpperCase(), decimal: 6 }))
+    .with(Chain.Radix, "XRD.XRD", () => ({ identifier: "XRD.XRD", decimal }))
+
+    .with("KUJI.USK", (asset) => ({ identifier: asset, decimal: 6 }))
     .with("ETH.FLIP", () => ({
       identifier: "ETH.FLIP-0x826180541412D574cf1336d22c0C0a287822678A",
       decimal: BaseDecimal.ETH,
@@ -172,7 +158,8 @@ export const getCommonAssetInfo = (assetString: CommonAssetString) => {
       identifier: "ETH.vTHOR-0x815c23eca83261b6ec689b60cc4a58b54bc24d8d",
       decimal: BaseDecimal.ETH,
     }))
-    .with("MAYA.MAYA", () => ({ identifier: assetString.toUpperCase(), decimal: 4 }))
+    .with("MAYA.CACAO", (identifier) => ({ identifier, decimal: 10 }))
+    .with("MAYA.MAYA", (identifier) => ({ identifier, decimal: 4 }))
     // Just to be sure that we are not missing any chain
     .otherwise(() => ({ identifier: assetString, decimal }));
 

package/src/utils/derivationPath.ts

@@ -36,9 +36,15 @@ export function updateDerivationPath(
 }
 
 export function derivationPathToString([network, chainId, account, change, index]:
+  | [number, number, number, number?, number?]
   | [number, number, number, number, number?]
   | DerivationPathArray) {
   const shortPath = typeof index !== "number";
+  const accountPath = typeof change !== "number";
+
+  if (accountPath) {
+    return `m/${network}'/${chainId}'/${account}'`;
+  }
 
   return `m/${network}'/${chainId}'/${account}'/${change}${shortPath ? "" : `/${index}`}`;
 }

package/src/utils/memo.ts

@@ -1,3 +1,4 @@
+import { match } from "ts-pattern";
 import { Chain } from "../types/chains";
 import { MemoType } from "../types/sdk";
 
@@ -16,14 +17,6 @@ export function getMemoForRunePoolDeposit(affiliate?: WithAffiliate<{}>) {
   return addAffiliate(MemoType.RUNEPOOL_DEPOSIT, affiliate);
 }
 
-export function getMemoForSaverDeposit({
-  chain,
-  symbol,
-  ...affiliate
-}: WithAffiliate<{ chain: Chain; symbol: string }>) {
-  return addAffiliate(`${MemoType.DEPOSIT}:${chain}/${symbol}`, affiliate);
-}
-
 export function getMemoForDeposit({
   chain,
   symbol,
@@ -43,14 +36,6 @@ export function getMemoForDeposit({
 /**
  * Withdraw
  */
-export function getMemoForSaverWithdraw({
-  chain,
-  symbol,
-  basisPoints,
-}: { chain: Chain; symbol: string; basisPoints: number }) {
-  return `${MemoType.WITHDRAW}:${chain}/${symbol}:${basisPoints}`;
-}
-
 export function getMemoForWithdraw({
   chain,
   symbol,
@@ -92,21 +77,6 @@ export function getMemoForNamePreferredAssetRegister({
   return `${MemoType.NAME_REGISTER}:${name}:${chain}:${payout}:${owner}:${asset}`;
 }
 
-export function getMemoForLoan(
-  memoType: MemoType.OPEN_LOAN | MemoType.CLOSE_LOAN,
-  {
-    asset,
-    address,
-    minAmount,
-    ...affiliate
-  }: WithAffiliate<{ address: string; asset: string; minAmount?: string }>,
-) {
-  const baseMemo = `${memoType}:${asset}:${address}`;
-  const minAmountPart = minAmount ? `:${minAmount}` : "";
-
-  return addAffiliate(`${baseMemo}${minAmountPart}`, affiliate);
-}
-
 /**
  * Internal helpers
  */
@@ -126,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) {
@@ -247,7 +250,7 @@ export function createWallet<
   };
 }
 
-function providerRequest({
+export function providerRequest({
   provider,
   params,
   method,