@uswap/toolboxes 4.3.6 → 4.3.9

package/src/evm/toolbox/baseEVMToolbox.ts

@@ -1,3 +1,9 @@
+/**
+ * Based on code from SwapKit (https://github.com/swapkit/SwapKit),
+ * licensed under the Apache License 2.0.
+ * Modifications © 2025 Horizontal Systems.
+ */
+
 import {
   type Asset,
   AssetValue,
@@ -8,8 +14,8 @@ import {
   EVMChains,
   FeeOption,
   isGasAsset,
-  SwapKitError,
   SwapKitNumber,
+  USwapError,
 } from "@uswap/helpers";
 import { erc20ABI } from "@uswap/helpers/contracts";
 import {
@@ -26,7 +32,8 @@ import {
   type Signer,
 } from "ethers";
 import { match } from "ts-pattern";
-import { toHexString } from "../helpers";
+import { getEvmApi } from "../api";
+import { getNetworkParams, toHexString } from "../helpers";
 import type {
   ApproveParams,
   CallParams,
@@ -80,6 +87,8 @@ export function BaseEVMToolbox<
     getAddress: () => {
       return signer ? signer.getAddress() : undefined;
     },
+    getBalance: getEvmApi(chain).getBalance,
+    getNetworkParams: getNetworkParams(chain),
     isApproved: getIsApproved({ chain, provider }),
     sendTransaction: getSendTransaction({ chain, isEIP1559Compatible, provider, signer }),
     signMessage: signer ? (message: string | Uint8Array) => signer.signMessage(message) : undefined,
@@ -115,7 +124,7 @@ const stateMutable = ["payable", "nonpayable"];
 // const nonStateMutable = ['view', 'pure'];
 export function isStateChangingCall({ abi, funcName }: { abi: readonly JsonFragment[]; funcName: string }) {
   const abiFragment = abi.find((fragment: any) => fragment.name === funcName) as any;
-  if (!abiFragment) throw new SwapKitError("toolbox_evm_no_abi_fragment", { funcName });
+  if (!abiFragment) throw new USwapError("toolbox_evm_no_abi_fragment", { funcName });
   return abiFragment.stateMutability && stateMutable.includes(abiFragment.stateMutability);
 }
 
@@ -126,7 +135,7 @@ export function toChecksumAddress(address: string) {
 export function getEIP1193SendTransaction(provider: Provider | BrowserProvider) {
   return function EIP1193SendTransaction({ value, ...params }: EVMTxParams | ContractTransaction): Promise<string> {
     if (!isBrowserProvider(provider)) {
-      throw new SwapKitError("toolbox_evm_provider_not_eip1193_compatible");
+      throw new USwapError("toolbox_evm_provider_not_eip1193_compatible");
     }
 
     // Remove gas-related parameters to let the wallet estimate them
@@ -152,7 +161,7 @@ export function getChecksumAddressFromAsset(asset: Asset, chain: EVMChain) {
     return getAddress(assetAddress.toLowerCase());
   }
 
-  throw new SwapKitError("toolbox_evm_invalid_gas_asset_address");
+  throw new USwapError("toolbox_evm_invalid_gas_asset_address");
 }
 
 const baseContractAddresses = EVMChains.reduce(
@@ -211,7 +220,7 @@ export function getEstimateGasPrices({
       return async function estimateGasPrices() {
         try {
           const { gasPrice, maxPriorityFeePerGas } = await provider.getFeeData();
-          if (!gasPrice || maxPriorityFeePerGas === null) throw new SwapKitError("toolbox_evm_no_fee_data");
+          if (!gasPrice || maxPriorityFeePerGas === null) throw new USwapError("toolbox_evm_no_fee_data");
 
           return {
             [FeeOption.Average]: {
@@ -228,7 +237,7 @@ export function getEstimateGasPrices({
             },
           };
         } catch (error) {
-          throw new SwapKitError("toolbox_evm_gas_estimation_error", {
+          throw new USwapError("toolbox_evm_gas_estimation_error", {
             error: (error as any).msg ?? (error as any).toString(),
           });
         }
@@ -238,7 +247,7 @@ export function getEstimateGasPrices({
       return async function estimateGasPrices() {
         try {
           const { gasPrice } = await provider.getFeeData();
-          if (!gasPrice) throw new SwapKitError("toolbox_evm_no_fee_data");
+          if (!gasPrice) throw new USwapError("toolbox_evm_no_fee_data");
 
           return {
             [FeeOption.Average]: { gasPrice },
@@ -246,7 +255,7 @@ export function getEstimateGasPrices({
             [FeeOption.Fastest]: { gasPrice },
           };
         } catch (error) {
-          throw new SwapKitError("toolbox_evm_gas_estimation_error", {
+          throw new USwapError("toolbox_evm_gas_estimation_error", {
             error: (error as any).msg ?? (error as any).toString(),
           });
         }
@@ -258,8 +267,7 @@ export function getEstimateGasPrices({
           const { maxFeePerGas, maxPriorityFeePerGas, gasPrice } = await provider.getFeeData();
 
           if (isEIP1559Compatible) {
-            if (maxFeePerGas === null || maxPriorityFeePerGas === null)
-              throw new SwapKitError("toolbox_evm_no_fee_data");
+            if (maxFeePerGas === null || maxPriorityFeePerGas === null) throw new USwapError("toolbox_evm_no_fee_data");
 
             return {
               [FeeOption.Average]: { maxFeePerGas, maxPriorityFeePerGas },
@@ -273,7 +281,7 @@ export function getEstimateGasPrices({
               },
             };
           }
-          if (!gasPrice) throw new SwapKitError("toolbox_evm_no_gas_price");
+          if (!gasPrice) throw new USwapError("toolbox_evm_no_gas_price");
 
           return {
             [FeeOption.Average]: { gasPrice },
@@ -281,7 +289,7 @@ export function getEstimateGasPrices({
             [FeeOption.Fastest]: { gasPrice: applyFeeMultiplierToBigInt(gasPrice, FeeOption.Fastest) },
           };
         } catch (error) {
-          throw new SwapKitError("toolbox_evm_gas_estimation_error", {
+          throw new USwapError("toolbox_evm_gas_estimation_error", {
             error: (error as any).msg ?? (error as any).toString(),
           });
         }
@@ -306,7 +314,7 @@ function getCall({ provider, isEIP1559Compatible, signer, chain }: ToolboxWrapPa
   }: CallParams): Promise<T> {
     const contractProvider = callProvider || provider;
     if (!contractAddress)
-      throw new SwapKitError("toolbox_evm_invalid_params", { error: "contractAddress must be provided" });
+      throw new USwapError("toolbox_evm_invalid_params", { error: "contractAddress must be provided" });
 
     const isStateChanging = isStateChangingCall({ abi, funcName });
 
@@ -328,10 +336,10 @@ function getCall({ provider, isEIP1559Compatible, signer, chain }: ToolboxWrapPa
 
     // only use signer if the contract function is state changing
     if (isStateChanging) {
-      if (!signer) throw new SwapKitError("toolbox_evm_no_signer");
+      if (!signer) throw new USwapError("toolbox_evm_no_signer");
 
       const from = txOverrides?.from || (await signer.getAddress());
-      if (!from) throw new SwapKitError("toolbox_evm_no_signer_address");
+      if (!from) throw new USwapError("toolbox_evm_no_signer_address");
 
       const connectedContract = contract.connect(signer);
       const estimateGasPrices = getEstimateGasPrices({ chain, isEIP1559Compatible, provider });
@@ -444,7 +452,7 @@ function getTransfer({ signer, isEIP1559Compatible = true, provider }: ToolboxWr
     const from = sender || (await signer?.getAddress());
     const sendTx = getSendTransaction({ chain, isEIP1559Compatible, provider, signer });
 
-    if (!from) throw new SwapKitError("toolbox_evm_no_from_address");
+    if (!from) throw new USwapError("toolbox_evm_no_from_address");
 
     if (assetValue.isGasAsset) {
       const transaction = {
@@ -461,7 +469,7 @@ function getTransfer({ signer, isEIP1559Compatible = true, provider }: ToolboxWr
 
     // const call = getCall({ signer, provider, isEIP1559Compatible });
     const contractAddress = getTokenAddress(assetValue, chain);
-    if (!contractAddress) throw new SwapKitError("toolbox_evm_no_contract_address");
+    if (!contractAddress) throw new USwapError("toolbox_evm_no_contract_address");
 
     const { maxFeePerGas, maxPriorityFeePerGas, gasPrice } = (
       await getEstimateGasPrices({ chain, isEIP1559Compatible, provider })()
@@ -484,7 +492,7 @@ function getTransfer({ signer, isEIP1559Compatible = true, provider }: ToolboxWr
 
 function getEstimateCall({ provider, signer }: { signer?: Signer; provider: Provider }) {
   return function estimateCall({ contractAddress, abi, funcName, funcParams = [], txOverrides }: EstimateCallParams) {
-    if (!contractAddress) throw new SwapKitError("toolbox_evm_no_contract_address");
+    if (!contractAddress) throw new USwapError("toolbox_evm_no_contract_address");
 
     const contract = createContract(contractAddress, abi, provider);
     return signer
@@ -547,8 +555,8 @@ function getSendTransaction({ provider, signer, isEIP1559Compatible = true, chai
   }: EVMTxParams & { feeOptionKey?: FeeOption }) {
     const { from, to, data, value, ...transaction } = tx;
 
-    if (!signer) throw new SwapKitError("toolbox_evm_no_signer");
-    if (!to) throw new SwapKitError("toolbox_evm_no_to_address");
+    if (!signer) throw new USwapError("toolbox_evm_no_signer");
+    if (!to) throw new USwapError("toolbox_evm_no_to_address");
 
     const parsedTxObject = { ...transaction, data: data || "0x", from, to, value: BigInt(value || 0) };
 
@@ -581,7 +589,7 @@ function getSendTransaction({ provider, signer, isEIP1559Compatible = true, chai
     try {
       gasLimit = toHexString(parsedTxObject.gasLimit || ((await provider.estimateGas(parsedTxObject)) * 11n) / 10n);
     } catch (error) {
-      throw new SwapKitError("toolbox_evm_error_estimating_gas_limit", { error });
+      throw new USwapError("toolbox_evm_error_estimating_gas_limit", { error });
     }
 
     try {
@@ -596,7 +604,7 @@ function getSendTransaction({ provider, signer, isEIP1559Compatible = true, chai
         return response.hash;
       }
     } catch (error) {
-      throw new SwapKitError("toolbox_evm_error_sending_transaction", { error });
+      throw new USwapError("toolbox_evm_error_sending_transaction", { error });
     }
   };
 }
@@ -617,7 +625,7 @@ function getCreateTransferTx({ provider, signer }: ToolboxWrapParams) {
     const chain = assetValue.chain as EVMChain;
     const from = fromOverride || (await signer?.getAddress());
 
-    if (!from) throw new SwapKitError("toolbox_evm_no_from_address");
+    if (!from) throw new USwapError("toolbox_evm_no_from_address");
 
     if (isGasAsset(assetValue)) {
       const { hexlify, toUtf8Bytes } = await import("ethers");
@@ -626,7 +634,7 @@ function getCreateTransferTx({ provider, signer }: ToolboxWrapParams) {
     }
 
     const contractAddress = getTokenAddress(assetValue, chain);
-    if (!contractAddress) throw new SwapKitError("toolbox_evm_no_contract_address");
+    if (!contractAddress) throw new USwapError("toolbox_evm_no_contract_address");
     const createTx = getCreateContractTxObject({ chain: assetValue.chain as EVMChain, provider });
 
     return createTx({
@@ -690,6 +698,6 @@ function getEstimateTransactionFee({
       return assetValue.set(SwapKitNumber.fromBigInt(fee, assetValue.decimal));
     }
 
-    throw new SwapKitError("toolbox_evm_no_gas_price");
+    throw new USwapError("toolbox_evm_no_gas_price");
   };
 }

package/src/evm/toolbox/evm.ts

@@ -1,9 +1,8 @@
 import { Chain, type EVMChain, FeeOption, getRPCUrl } from "@uswap/helpers";
 import { match, P } from "ts-pattern";
 
-import { getEvmApi } from "../api";
 import { multicallAbi } from "../contracts/eth/multicall";
-import { getIsEIP1559Compatible, getNetworkParams, getProvider } from "../helpers";
+import { getIsEIP1559Compatible, getProvider } from "../helpers";
 import type { EVMToolboxParams } from "../types";
 import { BaseEVMToolbox } from "./baseEVMToolbox";
 
@@ -62,6 +61,6 @@ function createEvmToolbox<C extends EVMChain>(chain: C) {
 
     const evmToolbox = BaseEVMToolbox({ chain, isEIP1559Compatible, provider, signer });
 
-    return { ...evmToolbox, getBalance: getEvmApi(chain).getBalance, getNetworkParams: getNetworkParams(chain) };
+    return evmToolbox;
   };
 }

package/src/evm/toolbox/op.ts

@@ -1,4 +1,10 @@
-import { applyFeeMultiplierToBigInt, Chain, FeeOption, getChainConfig, getRPCUrl, SwapKitError } from "@uswap/helpers";
+/**
+ * Based on code from SwapKit (https://github.com/swapkit/SwapKit),
+ * licensed under the Apache License 2.0.
+ * Modifications © 2025 Horizontal Systems.
+ */
+
+import { applyFeeMultiplierToBigInt, Chain, FeeOption, getRPCUrl, USwapError } from "@uswap/helpers";
 import type { Authorization, BrowserProvider, JsonRpcProvider, Provider, TransactionRequest } from "ethers";
 import { Contract, HDNodeWallet } from "ethers";
 import { match, P } from "ts-pattern";
@@ -30,7 +36,7 @@ function serializeTx<P extends JsonRpcProvider | BrowserProvider>(provider: P) {
   return async function serializeTx({ from, to, nonce, ...tx }: TransactionRequest) {
     const { Transaction } = await import("ethers");
 
-    if (!to) throw new SwapKitError("toolbox_evm_invalid_transaction", { error: "Missing to address" });
+    if (!to) throw new USwapError("toolbox_evm_invalid_transaction", { error: "Missing to address" });
 
     return Transaction.from({
       ...tx,
@@ -79,18 +85,6 @@ function estimateL1Gas<P extends JsonRpcProvider | BrowserProvider>(provider: P)
   };
 }
 
-function getNetworkParams() {
-  const { baseDecimal, chainId, explorerUrl, name, rpcUrls } = getChainConfig(Chain.Optimism);
-
-  return {
-    blockExplorerUrls: [explorerUrl],
-    chainId,
-    chainName: name,
-    nativeCurrency: { decimals: baseDecimal, name: "Ethereum", symbol: Chain.Ethereum },
-    rpcUrls,
-  };
-}
-
 async function estimateGasPrices(provider: Provider) {
   try {
     const { maxFeePerGas, maxPriorityFeePerGas, gasPrice } = await provider.getFeeData();
@@ -98,7 +92,7 @@ async function estimateGasPrices(provider: Provider) {
     const price = gasPrice as bigint;
 
     if (!(maxFeePerGas && maxPriorityFeePerGas)) {
-      throw new SwapKitError("toolbox_evm_no_fee_data");
+      throw new USwapError("toolbox_evm_no_fee_data");
     }
 
     return {
@@ -124,7 +118,7 @@ async function estimateGasPrices(provider: Provider) {
       };
     };
   } catch (error) {
-    throw new SwapKitError("toolbox_evm_gas_estimation_error", {
+    throw new USwapError("toolbox_evm_gas_estimation_error", {
       error: (error as any).msg ?? (error as any).toString(),
     });
   }
@@ -151,6 +145,5 @@ export async function OPToolbox({ provider: providerParam, ...toolboxSignerParam
     estimateTotalGasCost: estimateTotalGasCost(provider),
     getBalance: getEvmApi(Chain.Optimism).getBalance,
     getL1GasPrice,
-    getNetworkParams,
   };
 }

package/src/index.ts

@@ -1,3 +1,9 @@
+/**
+ * Based on code from SwapKit (https://github.com/swapkit/SwapKit),
+ * licensed under the Apache License 2.0.
+ * Modifications © 2025 Horizontal Systems.
+ */
+
 import {
   AssetValue,
   Chain,
@@ -9,7 +15,7 @@ import {
   type GenericCreateTransactionParams,
   type SubstrateChain,
   SubstrateChains,
-  SwapKitError,
+  USwapError,
   type UTXOChain,
   UTXOChains,
 } from "@uswap/helpers";
@@ -255,6 +261,6 @@ export async function getToolbox<T extends keyof Toolboxes>(
       return tonToolbox as Toolboxes[T];
     })
     .otherwise(() => {
-      throw new SwapKitError("toolbox_not_supported", { chain });
+      throw new USwapError("toolbox_not_supported", { chain });
     });
 }

package/src/near/helpers/core.ts

@@ -1,7 +1,13 @@
+/**
+ * Based on code from SwapKit (https://github.com/swapkit/SwapKit),
+ * licensed under the Apache License 2.0.
+ * Modifications © 2025 Horizontal Systems.
+ */
+
 import type { KeyPair } from "@near-js/crypto";
 import type { Provider } from "@near-js/providers";
 import { KeyPairSigner } from "@near-js/signers";
-import { type DerivationPathArray, derivationPathToString, SwapKitError } from "@uswap/helpers";
+import { type DerivationPathArray, derivationPathToString, USwapError } from "@uswap/helpers";
 import type { NearSigner } from "../types";
 
 export async function getValidateNearAddress() {
@@ -74,7 +80,7 @@ export async function getFullAccessPublicKey(provider: Provider, accountId: stri
   const fullAccessKey = (response as any).keys.find((key: any) => key.access_key.permission === "FullAccess");
 
   if (!fullAccessKey) {
-    throw new SwapKitError("toolbox_near_no_public_key_found");
+    throw new USwapError("toolbox_near_no_public_key_found");
   }
   const { PublicKey } = await import("@near-js/crypto");
 

package/src/near/toolbox.ts

@@ -1,6 +1,12 @@
+/**
+ * Based on code from SwapKit (https://github.com/swapkit/SwapKit),
+ * licensed under the Apache License 2.0.
+ * Modifications © 2025 Horizontal Systems.
+ */
+
 import type { Account, Contract } from "@near-js/accounts";
 import type { SignedTransaction, Transaction } from "@near-js/transactions";
-import { AssetValue, Chain, getChainConfig, getRPCUrl, SwapKitError } from "@uswap/helpers";
+import { AssetValue, Chain, getChainConfig, getRPCUrl, USwapError } from "@uswap/helpers";
 import { getBalance } from "../utils";
 import {
   getFullAccessPublicKey,
@@ -62,7 +68,7 @@ export async function getNearToolbox(toolboxParams?: NearToolboxParams) {
 
   async function getAddress() {
     if (!signer) {
-      throw new SwapKitError("toolbox_near_no_signer");
+      throw new USwapError("toolbox_near_no_signer");
     }
     const address = await signer.getAddress();
     return address;
@@ -110,7 +116,7 @@ export async function getNearToolbox(toolboxParams?: NearToolboxParams) {
 
   async function transfer(params: NearTransferParams) {
     if (!signer) {
-      throw new SwapKitError("toolbox_near_no_signer");
+      throw new USwapError("toolbox_near_no_signer");
     }
 
     const { assetValue, recipient, memo } = params;
@@ -135,11 +141,11 @@ export async function getNearToolbox(toolboxParams?: NearToolboxParams) {
     const validateNearAddress = await getValidateNearAddress();
 
     if (!validateNearAddress(recipient)) {
-      throw new SwapKitError("toolbox_near_invalid_address", { recipient: recipient });
+      throw new USwapError("toolbox_near_invalid_address", { recipient: recipient });
     }
 
     if (!validateNearAddress(signerId)) {
-      throw new SwapKitError("toolbox_near_invalid_address", { signerId: signerId });
+      throw new USwapError("toolbox_near_invalid_address", { signerId: signerId });
     }
 
     if (functionCall) {
@@ -149,7 +155,7 @@ export async function getNearToolbox(toolboxParams?: NearToolboxParams) {
     if (!assetValue.isGasAsset) {
       const contractId = assetValue.address;
       if (!contractId) {
-        throw new SwapKitError("toolbox_near_missing_contract_address");
+        throw new USwapError("toolbox_near_missing_contract_address");
       }
 
       return createContractFunctionCall({
@@ -224,7 +230,7 @@ export async function getNearToolbox(toolboxParams?: NearToolboxParams) {
 
   async function signTransaction(transaction: Transaction): Promise<SignedTransaction> {
     if (!signer) {
-      throw new SwapKitError("toolbox_near_no_signer");
+      throw new USwapError("toolbox_near_no_signer");
     }
 
     const [_hash, signedTx] = await signer.signTransaction(transaction);
@@ -238,7 +244,7 @@ export async function getNearToolbox(toolboxParams?: NearToolboxParams) {
 
   async function signAndSendTransaction(transaction: Transaction) {
     if (!signer) {
-      throw new SwapKitError("toolbox_near_no_signer");
+      throw new USwapError("toolbox_near_no_signer");
     }
 
     try {
@@ -287,7 +293,7 @@ export async function getNearToolbox(toolboxParams?: NearToolboxParams) {
 
   async function createSubAccount(subAccountId: string, publicKey: string, initialBalance: string): Promise<string> {
     if (!signer) {
-      throw new SwapKitError("toolbox_near_no_signer");
+      throw new USwapError("toolbox_near_no_signer");
     }
 
     const account = await getAccount();
@@ -304,7 +310,7 @@ export async function getNearToolbox(toolboxParams?: NearToolboxParams) {
   async function callFunction(params: NearFunctionCallParams): Promise<string> {
     try {
       if (!signer) {
-        throw new SwapKitError("toolbox_near_no_signer");
+        throw new USwapError("toolbox_near_no_signer");
       }
 
       const { actionCreators } = await import("@near-js/transactions");
@@ -325,7 +331,7 @@ export async function getNearToolbox(toolboxParams?: NearToolboxParams) {
 
       return result.transaction_outcome.id;
     } catch (error) {
-      throw new SwapKitError("toolbox_near_transfer_failed", { error });
+      throw new USwapError("toolbox_near_transfer_failed", { error });
     }
   }
 
@@ -343,11 +349,11 @@ export async function getNearToolbox(toolboxParams?: NearToolboxParams) {
 
   async function executeBatchTransaction(batch: BatchTransaction): Promise<string> {
     if (!signer) {
-      throw new SwapKitError("toolbox_near_no_signer");
+      throw new USwapError("toolbox_near_no_signer");
     }
 
     if (batch.actions.length === 0) {
-      throw new SwapKitError("toolbox_near_empty_batch");
+      throw new USwapError("toolbox_near_empty_batch");
     }
 
     const account = await getAccount();
@@ -369,12 +375,12 @@ export async function getNearToolbox(toolboxParams?: NearToolboxParams) {
       .when(isContractDeployment, () => GAS_COSTS.CONTRACT_DEPLOYMENT)
       .when(isCustomEstimator, (p) => {
         if (!account) {
-          throw new SwapKitError("toolbox_near_no_account");
+          throw new USwapError("toolbox_near_no_account");
         }
         return p.customEstimator(account);
       })
       .otherwise(() => {
-        throw new SwapKitError("toolbox_near_invalid_gas_params");
+        throw new USwapError("toolbox_near_invalid_gas_params");
       });
 
     const gasInUnits = BigInt(gasInTGas) * BigInt(10 ** 12);

package/src/radix/index.ts

@@ -1,3 +1,9 @@
+/**
+ * Based on code from SwapKit (https://github.com/swapkit/SwapKit),
+ * licensed under the Apache License 2.0.
+ * Modifications © 2025 Horizontal Systems.
+ */
+
 import type {
   FungibleResourcesCollectionItem,
   GatewayApiClient,
@@ -5,7 +11,7 @@ import type {
   StateEntityFungiblesPageRequest,
   StateEntityFungiblesPageResponse,
 } from "@radixdlt/babylon-gateway-api-sdk";
-import { AssetValue, Chain, SKConfig, type SKConfigIntegrations, SwapKitError } from "@uswap/helpers";
+import { AssetValue, Chain, SKConfig, type SKConfigIntegrations, USwapError } from "@uswap/helpers";
 
 export type RadixWallet = Awaited<ReturnType<typeof RadixToolbox>>;
 
@@ -18,7 +24,13 @@ export function radixValidateAddress(address: string) {
 function getBalance({ networkApi }: { networkApi: GatewayApiClient }) {
   return async function getBalance(address: string) {
     const fungibleResources = await fetchFungibleResources({ address, networkApi });
-    const fungibleBalances = convertResourcesToBalances({ networkApi, resources: fungibleResources });
+    const fungibleBalances = await convertResourcesToBalances({ networkApi, resources: fungibleResources });
+
+    const hasNativeAsset = fungibleBalances.some((asset) => asset.isGasAsset);
+    if (!hasNativeAsset) {
+      return [AssetValue.from({ chain: Chain.Radix }), ...fungibleBalances];
+    }
+
     return fungibleBalances;
   };
 }
@@ -125,7 +137,7 @@ export const RadixToolbox = async ({ dappConfig }: { dappConfig?: SKConfigIntegr
     getBalance: getBalance({ networkApi }),
     networkApi,
     signAndBroadcast: (() => {
-      throw new SwapKitError("toolbox_radix_method_not_supported", { method: "signAndBroadcast" });
+      throw new USwapError("toolbox_radix_method_not_supported", { method: "signAndBroadcast" });
     }) as (params: any) => Promise<string>,
     validateAddress: radixValidateAddress,
   };

package/src/ripple/index.ts

@@ -1,3 +1,9 @@
+/**
+ * Based on code from SwapKit (https://github.com/swapkit/SwapKit),
+ * licensed under the Apache License 2.0.
+ * Modifications © 2025 Horizontal Systems.
+ */
+
 import {
   AssetValue,
   Chain,
@@ -5,8 +11,8 @@ import {
   type GenericTransferParams,
   getChainConfig,
   getRPCUrl,
-  SwapKitError,
   SwapKitNumber,
+  USwapError,
 } from "@uswap/helpers";
 import type { Transaction } from "xrpl";
 import { Client, isValidAddress, type Payment, Wallet, xrpToDrops } from "xrpl";
@@ -47,7 +53,7 @@ export const getRippleToolbox = async (params: RippleToolboxParams = {}) => {
 
   const rpcUrl = await getRPCUrl(Chain.Ripple);
   if (!rpcUrl) {
-    throw new SwapKitError({ errorKey: "toolbox_ripple_rpc_not_configured", info: { chain: Chain.Ripple } });
+    throw new USwapError({ errorKey: "toolbox_ripple_rpc_not_configured", info: { chain: Chain.Ripple } });
   }
 
   const client = new Client(rpcUrl);
@@ -55,7 +61,7 @@ export const getRippleToolbox = async (params: RippleToolboxParams = {}) => {
 
   const getAddress = () => {
     if (!signer) {
-      throw new SwapKitError({ errorKey: "toolbox_ripple_signer_not_found" });
+      throw new USwapError({ errorKey: "toolbox_ripple_signer_not_found" });
     }
     return signer.getAddress();
   };
@@ -75,7 +81,7 @@ export const getRippleToolbox = async (params: RippleToolboxParams = {}) => {
       if ((error as any).data.error_code === RIPPLE_ERROR_CODES.ACCOUNT_NOT_FOUND) {
         return [AssetValue.from({ chain: Chain.Ripple, value: 0 })];
       }
-      throw new SwapKitError("toolbox_ripple_get_balance_error", { info: { address: addr, error } });
+      throw new USwapError("toolbox_ripple_get_balance_error", { info: { address: addr, error } });
     }
   };
 
@@ -104,16 +110,13 @@ export const getRippleToolbox = async (params: RippleToolboxParams = {}) => {
     memo?: string;
   }) => {
     if (!rippleValidateAddress(recipient)) {
-      throw new SwapKitError({ errorKey: "core_transaction_invalid_recipient_address" });
+      throw new USwapError({ errorKey: "core_transaction_invalid_recipient_address" });
     }
 
     const senderAddress = sender || (await getAddress());
 
     if (!assetValue.isGasAsset || assetValue.chain !== Chain.Ripple) {
-      throw new SwapKitError({
-        errorKey: "toolbox_ripple_asset_not_supported",
-        info: { asset: assetValue.toString() },
-      });
+      throw new USwapError({ errorKey: "toolbox_ripple_asset_not_supported", info: { asset: assetValue.toString() } });
     }
 
     const transaction: Payment = {
@@ -133,7 +136,7 @@ export const getRippleToolbox = async (params: RippleToolboxParams = {}) => {
 
   const signTransaction = (tx: Transaction) => {
     if (!signer) {
-      throw new SwapKitError({ errorKey: "toolbox_ripple_signer_not_found" });
+      throw new USwapError({ errorKey: "toolbox_ripple_signer_not_found" });
     }
     return signer.signTransaction(tx);
   };
@@ -146,12 +149,12 @@ export const getRippleToolbox = async (params: RippleToolboxParams = {}) => {
       return result.hash;
     }
 
-    throw new SwapKitError({ errorKey: "toolbox_ripple_broadcast_error", info: { chain: Chain.Ripple } });
+    throw new USwapError({ errorKey: "toolbox_ripple_broadcast_error", info: { chain: Chain.Ripple } });
   };
 
   const transfer = async (params: GenericTransferParams) => {
     if (!signer) {
-      throw new SwapKitError({ errorKey: "toolbox_ripple_signer_not_found" });
+      throw new USwapError({ errorKey: "toolbox_ripple_signer_not_found" });
     }
     const sender = await signer.getAddress();
     const tx = await createTransaction({ ...params, sender });