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

package/src/modules/requestClient.ts

@@ -1,14 +1,15 @@
-import { SKConfig } from "./swapKitConfig";
+import { SwapKitError } from "./swapKitError";
 
 type Options = RequestInit & {
   /**
-   * @deprecated Use onSuccess instead
+   * @deprecated Use onSuccess instead - will be removed in next major @MarkedV4
    */
   responseHandler?: (response: any) => any;
   json?: unknown;
   onError?: (error: any) => any;
   onSuccess?: (response: any) => any;
   searchParams?: Record<string, string>;
+  dynamicHeader?: () => Record<string, string> | {};
 };
 
 export const RequestClient = {
@@ -23,41 +24,60 @@ export const RequestClient = {
 
 function fetchWithConfig(method: "GET" | "POST", extendOptions: Options = {}) {
   return async <T>(url: string, options: Options = {}): Promise<T> => {
-    const { searchParams, json, body, headers: headersOptions } = { ...extendOptions, ...options };
-    const { swapKit } = SKConfig.get("apiKeys");
+    const {
+      searchParams,
+      json,
+      body,
+      headers: headersOptions,
+      dynamicHeader,
+    } = { ...extendOptions, ...options };
 
-    const isJson = json || url.endsWith(".json");
+    const isJson = !!json || url.endsWith(".json");
     const bodyToSend = isJson ? JSON.stringify(json) : body;
-    const urlInstance = new URL(url);
-
-    if (searchParams) {
-      urlInstance.search = new URLSearchParams(searchParams).toString();
-    }
-
-    const headers = {
-      ...headersOptions,
-      ...(isJson ? { "Content-Type": "application/json" } : {}),
-      ...(swapKit ? { "x-api-key": swapKit } : {}),
-    };
 
     try {
-      const response = await fetch(urlInstance.toString(), {
-        ...options,
-        method,
-        body: bodyToSend,
-        headers,
+      const requestUrl = buildUrl(url, searchParams);
+      const headers = buildHeaders(isJson, {
+        ...headersOptions,
+        ...dynamicHeader?.(),
       });
 
+      const response = await fetch(requestUrl, { ...options, method, body: bodyToSend, headers });
+
       if (!response.ok) {
         const message = await response.text();
-        throw new Error(`${response.statusText}(${response.status}): ${message}`);
+        throw new SwapKitError("helpers_invalid_response", {
+          status: response.status,
+          statusText: response.statusText,
+          message,
+        });
       }
 
       const body = await response.json();
 
       return options.onSuccess?.(body) || options.responseHandler?.(body) || body;
     } catch (error) {
-      return options.onError?.(error) || console.error(error);
+      if (options.onError) {
+        return options.onError(error);
+      }
+      throw error;
     }
   };
 }
+
+function buildHeaders(isJson: boolean, headersOptions?: HeadersInit) {
+  return {
+    ...headersOptions,
+    ...(isJson ? { "Content-Type": "application/json" } : {}),
+  };
+}
+
+function buildUrl(url: string, searchParams?: Record<string, string>) {
+  const urlInstance = new URL(url);
+
+  if (searchParams) {
+    urlInstance.search = new URLSearchParams(searchParams).toString();
+  }
+
+  return urlInstance.toString();
+}

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

@@ -2,44 +2,44 @@ const errorCodes = {
   /**
    * Core
    */
-  core_estimated_max_spendable_chain_not_supported: 10002,
-  core_extend_error: 10003,
-  core_inbound_data_not_found: 10004,
-  core_approve_asset_address_or_from_not_found: 10005,
-  core_plugin_not_found: 10006,
-  core_plugin_swap_not_found: 10007,
-  core_approve_asset_target_invalid: 10008,
-  core_explorer_unsupported_chain: 10009,
-  core_verify_message_not_supported: 10010,
-  core_chain_halted: 10099,
+  core_estimated_max_spendable_chain_not_supported: 10001,
+  core_extend_error: 10002,
+  core_inbound_data_not_found: 10003,
+  core_approve_asset_address_or_from_not_found: 10004,
+  core_plugin_not_found: 10005,
+  core_plugin_swap_not_found: 10006,
+  core_approve_asset_target_invalid: 10007,
+  core_explorer_unsupported_chain: 10008,
+  core_verify_message_not_supported: 10009,
+  core_chain_halted: 10010,
   /**
    * Core - Wallet
    */
-  core_wallet_connection_not_found: 10100,
-  core_wallet_ctrl_not_installed: 10101,
-  core_wallet_evmwallet_not_installed: 10102,
-  core_wallet_walletconnect_not_installed: 10103,
-  core_wallet_keystore_not_installed: 10104,
-  core_wallet_ledger_not_installed: 10105,
-  core_wallet_trezor_not_installed: 10106,
-  core_wallet_keplr_not_installed: 10107,
-  core_wallet_okx_not_installed: 10108,
-  core_wallet_keepkey_not_installed: 10109,
-  core_wallet_talisman_not_installed: 10110,
-  core_wallet_not_keypair_wallet: 10111,
-  core_wallet_sign_message_not_supported: 10110,
-  core_wallet_connection_failed: 10112,
+  core_wallet_connection_not_found: 10101,
+  core_wallet_ctrl_not_installed: 10102,
+  core_wallet_evmwallet_not_installed: 10103,
+  core_wallet_walletconnect_not_installed: 10104,
+  core_wallet_keystore_not_installed: 10105,
+  core_wallet_ledger_not_installed: 10106,
+  core_wallet_trezor_not_installed: 10107,
+  core_wallet_keplr_not_installed: 10108,
+  core_wallet_okx_not_installed: 10109,
+  core_wallet_keepkey_not_installed: 10110,
+  core_wallet_talisman_not_installed: 10111,
+  core_wallet_not_keypair_wallet: 10112,
+  core_wallet_sign_message_not_supported: 10113,
+  core_wallet_connection_failed: 10114,
   /**
    * Core - Swap
    */
-  core_swap_invalid_params: 10200,
-  core_swap_route_not_complete: 10201,
-  core_swap_asset_not_recognized: 10202,
-  core_swap_contract_not_found: 10203,
-  core_swap_route_transaction_not_found: 10204,
-  core_swap_contract_not_supported: 10205,
-  core_swap_transaction_error: 10206,
-  core_swap_quote_mode_not_supported: 10207,
+  core_swap_invalid_params: 10201,
+  core_swap_route_not_complete: 10202,
+  core_swap_asset_not_recognized: 10203,
+  core_swap_contract_not_found: 10204,
+  core_swap_route_transaction_not_found: 10205,
+  core_swap_contract_not_supported: 10206,
+  core_swap_transaction_error: 10207,
+  core_swap_quote_mode_not_supported: 10208,
   /**
    * Core - Transaction
    */
@@ -61,111 +61,326 @@ const errorCodes = {
   core_transaction_failed: 10316,
   core_transaction_invalid_recipient_address: 10317,
   /**
-   * Wallets
+   * Wallets - General
+   */
+  wallet_connection_rejected_by_user: 20001,
+  wallet_missing_api_key: 20002,
+  wallet_chain_not_supported: 20003,
+  wallet_missing_params: 20004,
+  wallet_provider_not_found: 20005,
+  wallet_failed_to_add_or_switch_network: 20006,
+  /**
+   * Wallets - Ledger
    */
-  wallet_connection_rejected_by_user: 20000,
-  wallet_missing_api_key: 20001,
-  wallet_chain_not_supported: 20002,
-  wallet_missing_params: 20003,
-  wallet_provider_not_found: 20004,
-  wallet_failed_to_add_or_switch_network: 20005,
   wallet_ledger_connection_error: 20101,
   wallet_ledger_connection_claimed: 20102,
   wallet_ledger_get_address_error: 20103,
   wallet_ledger_device_not_found: 20104,
   wallet_ledger_device_locked: 20105,
+  wallet_ledger_transport_error: 20106,
+  wallet_ledger_public_key_error: 20107,
+  wallet_ledger_derivation_path_error: 20108,
+  wallet_ledger_signing_error: 20109,
+  wallet_ledger_app_not_open: 20110,
+  wallet_ledger_invalid_response: 20111,
+  wallet_ledger_method_not_supported: 20112,
+  wallet_ledger_invalid_params: 20113,
+  wallet_ledger_invalid_signature: 20114,
+  wallet_ledger_no_provider: 20115,
+  wallet_ledger_pubkey_not_found: 20116,
+  wallet_ledger_transport_not_defined: 20117,
+  wallet_ledger_webusb_not_supported: 20118,
+  wallet_ledger_chain_not_supported: 20119,
+  wallet_ledger_invalid_asset: 20120,
+  wallet_ledger_invalid_account: 20121,
+  wallet_ledger_address_not_found: 20122,
+  wallet_ledger_failed_to_get_address: 20123,
+  /**
+   * Wallets - Phantom
+   */
   wallet_phantom_not_found: 20201,
+  /**
+   * Wallets - Ctrl
+   */
   wallet_ctrl_not_found: 20301,
   wallet_ctrl_send_transaction_no_address: 20302,
   wallet_ctrl_contract_address_not_provided: 20303,
   wallet_ctrl_asset_not_defined: 20304,
+  /**
+   * Wallets - WalletConnect
+   */
   wallet_walletconnect_project_id_not_specified: 20401,
   wallet_walletconnect_connection_not_established: 20402,
   wallet_walletconnect_namespace_not_supported: 20403,
+  wallet_walletconnect_chain_not_supported: 20404,
+  wallet_walletconnect_invalid_method: 20405,
+  wallet_walletconnect_method_not_supported: 20406,
+  /**
+   * Wallets - Trezor
+   */
   wallet_trezor_failed_to_sign_transaction: 20501,
   wallet_trezor_derivation_path_not_supported: 20502,
   wallet_trezor_failed_to_get_address: 20503,
+  wallet_trezor_transport_error: 20504,
+  wallet_trezor_method_not_supported: 20505,
+  /**
+   * Wallets - Talisman
+   */
   wallet_talisman_not_enabled: 20601,
   wallet_talisman_not_found: 20602,
+  /**
+   * Wallets - Polkadot
+   */
   wallet_polkadot_not_found: 20701,
+  /**
+   * Wallets - Radix
+   */
   wallet_radix_not_found: 20801,
   wallet_radix_transaction_failed: 20802,
-  wallet_keepkey_not_found: 20900,
-  wallet_keepkey_asset_not_defined: 20901,
-  wallet_keepkey_contract_address_not_provided: 20902,
-  wallet_keepkey_send_transaction_no_address: 20903,
+  wallet_radix_invalid_manifest: 20803,
+  wallet_radix_method_not_supported: 20804,
+  wallet_radix_no_account: 20805,
+  /**
+   * Wallets - KeepKey
+   */
+  wallet_keepkey_not_found: 20901,
+  wallet_keepkey_asset_not_defined: 20902,
+  wallet_keepkey_contract_address_not_provided: 20903,
+  wallet_keepkey_send_transaction_no_address: 20904,
+  wallet_keepkey_derivation_path_error: 20905,
+  wallet_keepkey_signing_error: 20906,
+  wallet_keepkey_transport_error: 20907,
+  wallet_keepkey_unsupported_chain: 20908,
+  wallet_keepkey_invalid_response: 20909,
+  wallet_keepkey_chain_not_supported: 20910,
+  wallet_keepkey_signer_not_found: 20911,
+  wallet_keepkey_no_accounts: 20912,
+  wallet_keepkey_method_not_supported: 20913,
+  wallet_keepkey_invalid_params: 20914,
+  wallet_keepkey_config_not_found: 20915,
+  wallet_keepkey_no_provider: 20916,
+  wallet_keepkey_account_not_found: 20917,
+  /**
+   * Wallets - BitKeep/BitGet
+   */
   wallet_bitkeep_not_found: 21001,
-  wallet_exodus_sign_transaction_error: 21100,
-  wallet_keystore_invalid_password: 29900,
-  wallet_keystore_unsupported_version: 29901,
-  wallet_onekey_not_found: 21200,
-  wallet_onekey_sign_transaction_error: 21201,
+  wallet_bitkeep_failed_to_switch_network: 21002,
+  wallet_bitkeep_no_accounts: 21003,
+  /**
+   * Wallets - Exodus
+   */
+  wallet_exodus_sign_transaction_error: 21101,
+  wallet_exodus_not_found: 21102,
+  wallet_exodus_no_address: 21103,
+  wallet_exodus_request_canceled: 21104,
+  wallet_exodus_signature_canceled: 21105,
+  wallet_exodus_failed_to_switch_network: 21106,
+  wallet_exodus_chain_not_supported: 21107,
+  wallet_exodus_instance_missing: 21108,
+  /**
+   * Wallets - OneKey
+   */
+  wallet_onekey_not_found: 21201,
+  wallet_onekey_sign_transaction_error: 21202,
+  /**
+   * Wallets - OKX
+   */
+  wallet_okx_not_found: 21301,
+  wallet_okx_chain_not_supported: 21302,
+  wallet_okx_failed_to_switch_network: 21303,
+  wallet_okx_no_accounts: 21304,
+  /**
+   * Wallets - Keplr
+   */
+  wallet_keplr_not_found: 21401,
+  wallet_keplr_chain_not_supported: 21402,
+  wallet_keplr_signer_not_found: 21403,
+  wallet_keplr_no_accounts: 21404,
+  /**
+   * Wallets - Cosmostation
+   */
+  wallet_cosmostation_not_found: 21501,
+  wallet_cosmostation_chain_not_supported: 21502,
+  wallet_cosmostation_evm_provider_not_found: 21503,
+  wallet_cosmostation_keplr_provider_not_found: 21504,
+  wallet_cosmostation_no_accounts: 21505,
+  wallet_cosmostation_no_evm_accounts: 21506,
+  wallet_cosmostation_no_evm_address: 21507,
+  wallet_cosmostation_signer_not_found: 21508,
+  /**
+   * Wallets - XDefi
+   */
+  wallet_xdefi_not_found: 21601,
+  wallet_xdefi_chain_not_supported: 21602,
+  /**
+   * Wallets - Coinbase
+   */
+  wallet_coinbase_not_found: 21701,
+  wallet_coinbase_chain_not_supported: 21702,
+  wallet_coinbase_method_not_supported: 21703,
+  wallet_coinbase_no_accounts: 21704,
+  /**
+   * Wallets - EVM Extensions
+   */
+  wallet_evm_extensions_failed_to_switch_network: 21801,
+  wallet_evm_extensions_no_provider: 21802,
+  wallet_evm_extensions_not_found: 21803,
+  /**
+   * Wallets - Keystore
+   */
+  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
    */
   chainflip_channel_error: 30001,
   chainflip_unknown_asset: 30002,
-  chainflip_broker_invalid_params: 30100,
-  chainflip_broker_recipient_error: 30101,
-  chainflip_broker_register: 30102,
-  chainflip_broker_tx_error: 30103,
-  chainflip_broker_withdraw: 30104,
-  chainflip_broker_fund_only_flip_supported: 30105,
-  chainflip_broker_fund_invalid_address: 30106,
+  /**
+   * Chainflip - Broker
+   */
+  chainflip_broker_invalid_params: 30101,
+  chainflip_broker_recipient_error: 30102,
+  chainflip_broker_register: 30103,
+  chainflip_broker_tx_error: 30104,
+  chainflip_broker_withdraw: 30105,
+  chainflip_broker_fund_only_flip_supported: 30106,
+  chainflip_broker_fund_invalid_address: 30107,
   /**
    * THORChain
    */
   thorchain_chain_halted: 40001,
   thorchain_trading_halted: 40002,
-  thorchain_swapin_router_required: 40100,
-  thorchain_swapin_vault_required: 40101,
-  thorchain_swapin_memo_required: 40102,
-  thorchain_swapin_token_required: 40103,
-  thorchain_preferred_asset_payout_required: 40104,
+  /**
+   * THORChain - Swap
+   */
+  thorchain_swapin_router_required: 40101,
+  thorchain_swapin_vault_required: 40102,
+  thorchain_swapin_memo_required: 40103,
+  thorchain_swapin_token_required: 40104,
+  thorchain_preferred_asset_payout_required: 40105,
+  /**
+   * Toolboxes - Cosmos
+   */
+  toolbox_cosmos_account_not_found: 50101,
+  toolbox_cosmos_invalid_fee: 50102,
+  toolbox_cosmos_invalid_params: 50103,
+  toolbox_cosmos_no_signer: 50104,
+  toolbox_cosmos_not_supported: 50105,
+  toolbox_cosmos_signer_not_defined: 50106,
+  toolbox_cosmos_validate_address_prefix_not_found: 50107,
+  toolbox_cosmos_verify_signature_no_pubkey: 50108,
+  /**
+   * Toolboxes - EVM
+   */
+  toolbox_evm_error_estimating_gas_limit: 50201,
+  toolbox_evm_error_sending_transaction: 50202,
+  toolbox_evm_gas_estimation_error: 50203,
+  toolbox_evm_invalid_gas_asset_address: 50204,
+  toolbox_evm_invalid_params: 50205,
+  toolbox_evm_invalid_transaction: 50206,
+  toolbox_evm_no_abi_fragment: 50207,
+  toolbox_evm_no_contract_address: 50208,
+  toolbox_evm_no_fee_data: 50209,
+  toolbox_evm_no_from_address: 50210,
+  toolbox_evm_no_gas_price: 50211,
+  toolbox_evm_no_signer_address: 50212,
+  toolbox_evm_no_signer: 50213,
+  toolbox_evm_no_to_address: 50214,
+  toolbox_evm_not_supported: 50215,
+  toolbox_evm_provider_not_eip1193_compatible: 50216,
+  /**
+   * Toolboxes - UTXO
+   */
+  toolbox_utxo_api_error: 50301,
+  toolbox_utxo_broadcast_failed: 50302,
+  toolbox_utxo_insufficient_balance: 50303,
+  toolbox_utxo_invalid_address: 50304,
+  toolbox_utxo_invalid_params: 50305,
+  toolbox_utxo_invalid_transaction: 50306,
+  toolbox_utxo_no_signer: 50307,
+  toolbox_utxo_not_supported: 50308,
+  /**
+   * Toolboxes - Solana
+   */
+  toolbox_solana_no_signer: 50401,
+  toolbox_solana_fee_estimation_failed: 50402,
+  /**
+   * Toolboxes - Substrate
+   */
+  toolbox_substrate_not_supported: 50501,
+  /**
+   * Toolboxes - Radix
+   */
+  toolbox_radix_method_not_supported: 50601,
+  /**
+   * Toolboxes - Ripple
+   */
+  toolbox_ripple_get_balance_error: 50701,
+  toolbox_ripple_rpc_not_configured: 50702,
+  toolbox_ripple_signer_not_found: 50703,
+  toolbox_ripple_asset_not_supported: 50704,
+  toolbox_ripple_broadcast_error: 50705,
+  /**
+   * Toolboxes - Tron
+   */
+  toolbox_tron_no_signer: 50801,
+  toolbox_tron_invalid_token_identifier: 50802,
+  toolbox_tron_token_transfer_failed: 50803,
+  toolbox_tron_transaction_creation_failed: 50804,
+  /**
+   * 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: 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
    */
-  api_v2_invalid_response: 50001,
-  api_v2_server_error: 50002,
-  api_v2_invalid_method_key_hash: 50003,
-  /**
-   * Toolboxes
-   */
-  toolbox_cosmos_signer_not_defined: 90101,
-  toolbox_cosmos_no_accounts_found: 90102,
-  toolbox_cosmos_verify_signature_no_pubkey: 90103,
-  toolbox_cosmos_validate_address_prefix_not_found: 90104,
-  toolbox_evm_no_abi_fragment: 90201,
-  toolbox_evm_no_signer: 90202,
-  toolbox_evm_no_signer_address: 90203,
-  toolbox_evm_no_from_address: 90204,
-  toolbox_evm_no_contract_address: 90205,
-  toolbox_evm_no_fee_data: 90206,
-  toolbox_evm_no_gas_price: 90207,
-  toolbox_evm_no_to_address: 90208,
-  toolbox_evm_invalid_gas_asset_address: 90209,
-  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,
-  toolbox_solana_no_signer: 90401,
-  toolbox_solana_fee_estimation_failed: 90402,
-  toolbox_ripple_rpc_not_configured: 90501,
-  toolbox_ripple_signer_not_found: 90502,
-  toolbox_ripple_asset_not_supported: 90503,
-  toolbox_ripple_broadcast_error: 90504,
-  toolbox_ripple_get_balance_error: 90505,
+  api_v2_invalid_response: 60001,
+  api_v2_server_error: 60002,
+  api_v2_invalid_method_key_hash: 60003,
   /**
    * Helpers
    */
-  helpers_invalid_number_different_decimals: 99000,
-  helpers_invalid_number_of_years: 99001,
-  helpers_invalid_identifier: 99002,
-  helpers_invalid_asset_url: 99003,
-  helpers_invalid_asset_identifier: 99004,
-  helpers_invalid_memo_type: 99005,
-  helpers_failed_to_switch_network: 99103,
-  helpers_not_found_provider: 99200,
+  helpers_invalid_number_different_decimals: 70001,
+  helpers_invalid_number_of_years: 70002,
+  helpers_invalid_identifier: 70003,
+  helpers_invalid_asset_url: 70004,
+  helpers_invalid_asset_identifier: 70005,
+  helpers_invalid_memo_type: 70006,
+  helpers_failed_to_switch_network: 70007,
+  helpers_not_found_provider: 70008,
+  helpers_chain_not_supported: 70009,
+  helpers_invalid_params: 70010,
+  helpers_invalid_response: 70011,
   /**
    * Anything else
    */
@@ -183,15 +398,20 @@ export class SwapKitError extends Error {
   ) {
     const isErrorString = typeof errorOrErrorKey === "string";
     const errorKey = isErrorString ? errorOrErrorKey : errorOrErrorKey.errorKey;
-    const message = `${errorKey}${isErrorString ? "" : `: ${JSON.stringify(errorOrErrorKey.info)}`}`;
+    const info = isErrorString ? undefined : errorOrErrorKey.info;
+    const message = `${errorKey}${info ? `: ${JSON.stringify(info)}` : ""}`;
 
-    if (sourceErrorOrInfo) {
-      console.error(sourceErrorOrInfo);
-    }
+    super(message);
+    Object.setPrototypeOf(this, SwapKitError.prototype);
 
-    console.error(errorKey, { code: SwapKitError.ErrorCode[errorKey], message });
+    this.name = "SwapKitError";
+    this.cause = sourceErrorOrInfo;
 
-    super(errorKey);
-    Object.setPrototypeOf(this, SwapKitError.prototype);
+    // Log errors for debugging - bundlers can strip this in production if needed
+    if (sourceErrorOrInfo) {
+      console.error(`SwapKitError [${errorKey}]:`, sourceErrorOrInfo);
+    } else if (info) {
+      console.error(`SwapKitError [${errorKey}]:`, info);
+    }
   }
 }