@swapkit/helpers 3.0.0-beta.13 → 3.0.0-beta.15

package/package.json

@@ -8,7 +8,7 @@
   },
   "description": "SwapKit - Helpers",
   "devDependencies": {
-    "@swapkit/toolboxes": "1.0.0-beta.18"
+    "@swapkit/toolboxes": "1.0.0-beta.20"
   },
   "exports": {
     ".": {
@@ -55,5 +55,5 @@
     "type-check:go": "tsgo"
   },
   "type": "module",
-  "version": "3.0.0-beta.13"
+  "version": "3.0.0-beta.15"
 }

package/src/index.ts

@@ -7,6 +7,7 @@ export * from "./modules/requestClient";
 export * from "./modules/swapKitError";
 export * from "./modules/swapKitNumber";
 export * from "./modules/swapKitConfig";
+export * from "./modules/feeMultiplier";
 
 /**
  * Utils

package/src/modules/feeMultiplier.ts

@@ -0,0 +1,87 @@
+import { FeeOption } from "../types";
+import { SKConfig } from "./swapKitConfig";
+
+export interface FeeMultiplierConfig {
+  [FeeOption.Average]: number;
+  [FeeOption.Fast]: number;
+  [FeeOption.Fastest]: number;
+}
+
+const DEFAULT_FEE_MULTIPLIERS: FeeMultiplierConfig = {
+  [FeeOption.Average]: 1.0,
+  [FeeOption.Fast]: 1.5,
+  [FeeOption.Fastest]: 2.0,
+};
+
+/**
+ * Get fee multiplier for the given fee option.
+ * Checks SKConfig for custom multipliers first, then falls back to defaults.
+ *
+ * @param feeOption - The fee option (Average, Fast, Fastest)
+ * @returns The fee multiplier as a number
+ */
+export function getFeeMultiplier(feeOption: FeeOption = FeeOption.Average): number {
+  const customMultipliers = SKConfig.get("feeMultipliers");
+
+  if (customMultipliers && customMultipliers[feeOption] !== undefined) {
+    return customMultipliers[feeOption];
+  }
+
+  return DEFAULT_FEE_MULTIPLIERS[feeOption];
+}
+
+/**
+ * Get fee multiplier as BigInt for EVM calculations.
+ * Returns numerator and denominator for precise BigInt arithmetic.
+ *
+ * @param feeOption - The fee option (Average, Fast, Fastest)
+ * @returns Object with numerator and denominator for BigInt calculations
+ */
+export function getFeeMultiplierAsBigInt(feeOption: FeeOption = FeeOption.Average): {
+  numerator: bigint;
+  denominator: bigint;
+} {
+  const multiplier = getFeeMultiplier(feeOption);
+
+  // Convert decimal multiplier to fraction for precise BigInt arithmetic
+  // e.g., 1.5 -> 15/10, 2.0 -> 20/10
+  const denominator = 10n;
+  const numerator = BigInt(Math.round(multiplier * 10));
+
+  return { numerator, denominator };
+}
+
+/**
+ * Apply fee multiplier to a BigInt value (for EVM chains).
+ *
+ * @param value - The base fee value as BigInt
+ * @param feeOption - The fee option (Average, Fast, Fastest)
+ * @returns The multiplied fee value as BigInt
+ */
+export function applyFeeMultiplierToBigInt(
+  value: bigint,
+  feeOption: FeeOption = FeeOption.Average,
+): bigint {
+  const { numerator, denominator } = getFeeMultiplierAsBigInt(feeOption);
+  return (value * numerator) / denominator;
+}
+
+/**
+ * Apply fee multiplier to a number value (for non-EVM chains).
+ *
+ * @param value - The base fee value as number
+ * @param feeOption - The fee option (Average, Fast, Fastest)
+ * @param floor - Whether to floor the result (default: false)
+ * @returns The multiplied fee value as number
+ */
+export function applyFeeMultiplier(
+  value: number,
+  feeOption: FeeOption = FeeOption.Average,
+  floor = false,
+): number {
+  const multiplier = getFeeMultiplier(feeOption);
+  const result = value * multiplier;
+  return floor ? Math.floor(result) : result;
+}
+
+export { DEFAULT_FEE_MULTIPLIERS };

package/src/modules/swapKitConfig.ts

@@ -1,5 +1,6 @@
 import { createStore } from "zustand/vanilla";
 import { Chain, EXPLORER_URLS, NODE_URLS, RPC_URLS, WalletOption } from "../types";
+import type { FeeMultiplierConfig } from "./feeMultiplier";
 
 export type SKConfigIntegrations = {
   chainflip?: { useSDKBroker?: boolean; brokerUrl: string };
@@ -60,6 +61,8 @@ const initialState = {
       },
     },
   } as SKConfigIntegrations,
+
+  feeMultipliers: undefined as FeeMultiplierConfig | undefined,
 };
 type SKState = typeof initialState;
 
@@ -72,6 +75,7 @@ export type SKConfigState = {
   nodeUrls?: Partial<SKState["nodeUrls"]>;
   rpcUrls?: Partial<SKState["rpcUrls"]>;
   wallets?: SKState["wallets"];
+  feeMultipliers?: FeeMultiplierConfig;
 };
 
 type SwapKitConfigStore = SKState & {
@@ -85,6 +89,7 @@ type SwapKitConfigStore = SKState & {
     integration: keyof SKState["integrations"],
     config: SKConfigIntegrations[keyof SKConfigIntegrations],
   ) => void;
+  setFeeMultipliers: (multipliers: FeeMultiplierConfig) => void;
 };
 
 const swapKitState = createStore<SwapKitConfigStore>((set) => ({
@@ -98,6 +103,7 @@ const swapKitState = createStore<SwapKitConfigStore>((set) => ({
   setRpcUrl: (chain, url) => set((s) => ({ rpcUrls: { ...s.rpcUrls, [chain]: url } })),
   setIntegrationConfig: (integration, config) =>
     set((s) => ({ integrations: { ...s.integrations, [integration]: config } })),
+  setFeeMultipliers: (multipliers) => set(() => ({ feeMultipliers: multipliers })),
   setConfig: (config) =>
     set((s) => ({
       apiKeys: { ...s.apiKeys, ...config.apiKeys },
@@ -106,6 +112,7 @@ const swapKitState = createStore<SwapKitConfigStore>((set) => ({
       integrations: { ...s.integrations, ...config.integrations },
       nodeUrls: { ...s.nodeUrls, ...config.nodeUrls },
       rpcUrls: { ...s.rpcUrls, ...config.rpcUrls },
+      feeMultipliers: config.feeMultipliers || s.feeMultipliers,
       chains: s.chains.concat(config.chains || []),
       wallets: s.wallets.concat(config.wallets || []),
     })),
@@ -130,4 +137,6 @@ export const SKConfig = {
     integration: T,
     config: SKConfigIntegrations[T],
   ) => swapKitState.getState().setIntegrationConfig(integration, config),
+  setFeeMultipliers: (multipliers: FeeMultiplierConfig) =>
+    swapKitState.getState().setFeeMultipliers(multipliers),
 };

package/src/modules/swapKitError.ts

@@ -230,6 +230,13 @@ const errorCodes = {
    */
   wallet_keystore_invalid_password: 21901,
   wallet_keystore_unsupported_version: 21902,
+  /**
+   * Wallets - Near Extensions
+   */
+  wallet_near_extensions_failed_to_switch_network: 22001,
+  wallet_near_extensions_no_provider: 22002,
+  wallet_near_extensions_not_found: 22003,
+  wallet_near_method_not_supported: 22003,
   /**
    * Chainflip
    */
@@ -326,10 +333,33 @@ const errorCodes = {
   toolbox_tron_no_signer: 50801,
   toolbox_tron_invalid_token_identifier: 50802,
   toolbox_tron_token_transfer_failed: 50803,
+  /**
+   * Toolboxes - Near
+   */
+  toolbox_near_no_signer: 90601,
+  toolbox_near_invalid_address: 90602,
+  toolbox_near_invalid_amount: 90603,
+  toolbox_near_transfer_failed: 90604,
+  toolbox_near_access_key_error: 90605,
+  toolbox_near_no_rpc_url: 90606,
+  toolbox_near_empty_batch: 90607,
+  toolbox_near_balance_failed: 90608,
+  toolbox_near_invalid_name: 90609,
+  toolbox_near_missing_contract_address: 90610,
+  toolbox_near_no_account: 90611,
+  toolbox_near_invalid_gas_params: 90612,
   /**
    * Toolboxes - General
    */
-  toolbox_not_supported: 50801,
+  toolbox_not_supported: 59901,
+  /**
+   * NEAR Plugin
+   */
+  plugin_near_invalid_name: 41001,
+  plugin_near_no_connection: 41002,
+  plugin_near_name_unavailable: 41003,
+  plugin_near_registration_failed: 41004,
+  plugin_near_transfer_failed: 41005,
   /**
    * SwapKit API
    */

package/src/types/chains.ts

@@ -245,7 +245,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",
@@ -288,27 +288,34 @@ 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"],
 };
 

package/src/types/wallet.ts

@@ -1,5 +1,6 @@
 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";
@@ -110,6 +111,7 @@ export type FullWallet = BaseWallet<
       [Chain.Ripple]: RippleWallet;
       [Chain.Solana]: SolanaWallet;
       [Chain.Tron]: TronWallet;
+      [Chain.Near]: NearWallet;
     }
 >;
 

package/src/utils/asset.ts

@@ -140,6 +140,7 @@ export const getCommonAssetInfo = (assetString: CommonAssetString) => {
       Chain.Ripple,
       Chain.Polkadot,
       Chain.Tron,
+      Chain.Near,
       (asset) => ({ identifier: `${asset}.${asset}`, decimal }),
     )
     .with(Chain.Radix, "XRD.XRD", () => ({ identifier: "XRD.XRD", 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/wallets.ts

@@ -110,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) {