@swapkit/toolboxes 1.0.0-beta.15 → 1.0.0-beta.17

package/src/ripple/index.ts

@@ -13,6 +13,12 @@ import { Client, type Payment, Wallet, isValidAddress, xrpToDrops } from "xrpl";
 
 export type RippleWallet = Awaited<ReturnType<typeof getRippleToolbox>>;
 
+export { hashes, type Transaction } from "xrpl";
+
+const RIPPLE_ERROR_CODES = {
+  ACCOUNT_NOT_FOUND: 19,
+} as const;
+
 // Note: Ripple seeds generate a single address, no derivation path/index support.
 function createSigner(phrase: string): ChainSigner<Transaction, { tx_blob: string; hash: string }> {
   const wallet = Wallet.fromMnemonic(phrase);
@@ -64,11 +70,7 @@ export const getRippleToolbox = async (params: RippleToolboxParams = {}) => {
     const addr = address || (await getAddress());
 
     try {
-      await client.connect();
-      const accountInfo = await client.request({
-        command: "account_info",
-        account: addr,
-      });
+      const accountInfo = await client.request({ command: "account_info", account: addr });
 
       const balance = accountInfo.result.account_data.Balance;
 
@@ -81,7 +83,7 @@ export const getRippleToolbox = async (params: RippleToolboxParams = {}) => {
       ];
     } catch (error) {
       // empty account
-      if ((error as any).data.error_code === 19) {
+      if ((error as any).data.error_code === RIPPLE_ERROR_CODES.ACCOUNT_NOT_FOUND) {
         return [
           AssetValue.from({
             chain: Chain.Ripple,
@@ -148,22 +150,15 @@ export const getRippleToolbox = async (params: RippleToolboxParams = {}) => {
 
   const broadcastTransaction = async (signedTxHex: string) => {
     const submitResult = await client.submitAndWait(signedTxHex);
-    // Cast result to any to bypass potential type mismatches in xrpl.js definitions
-    const result: any = submitResult.result;
+    const result = submitResult.result;
 
-    // Check engine_result directly on result
-    if (result.engine_result === "tesSUCCESS" || result.engine_result === "terQUEUED") {
-      // Access hash from tx_json if available, otherwise fallback to result.hash
-      return result.tx_json?.hash || result.hash;
+    if (result.validated) {
+      return result.hash;
     }
 
-    const message = result.engine_result_message || "Unknown error";
-    const code = result.engine_result || "Unknown code";
-
     throw new SwapKitError({
       errorKey: "toolbox_ripple_broadcast_error",
-      info: { chain: Chain.Ripple, message, code, result },
-      // Remove explicit message when using object format
+      info: { chain: Chain.Ripple },
     });
   };
 
@@ -177,9 +172,7 @@ export const getRippleToolbox = async (params: RippleToolboxParams = {}) => {
     return broadcastTransaction(signedTx.tx_blob);
   };
 
-  // Disconnect client on demand or handle elsewhere?
-  // For now, let's assume connection is managed outside or persists.
-  // const disconnect = () => client.disconnect();
+  const disconnect = () => client.disconnect();
 
   return {
     // Signer related
@@ -194,6 +187,6 @@ export const getRippleToolbox = async (params: RippleToolboxParams = {}) => {
     broadcastTransaction,
     transfer,
     estimateTransactionFee,
-    // disconnect, // Optional: expose disconnect
+    disconnect,
   };
 };

package/src/solana/toolbox.ts

@@ -22,10 +22,79 @@ import {
 import { P } from "ts-pattern";
 import { match } from "ts-pattern";
 import type { SolanaCreateTransactionParams, SolanaProvider, SolanaTransferParams } from ".";
-import { getBalance } from "../utils";
 
 type SolanaSigner = SolanaProvider | Signer;
 
+type TokenMetadata = {
+  name: string;
+  symbol: string;
+  decimals: number;
+  logoURI?: string;
+  tags?: string[];
+  daily_volume?: number;
+};
+
+async function fetchTokenMetaData(mintAddress: string): Promise<TokenMetadata | null> {
+  try {
+    const response = await fetch(`https://lite-api.jup.ag/tokens/v1/token/${mintAddress}`);
+    if (!response.ok) return null;
+    return await response.json();
+  } catch {
+    return null;
+  }
+}
+
+async function getSolanaBalance(address: string) {
+  const connection = await getConnection();
+  const { PublicKey } = await import("@solana/web3.js");
+  const { TOKEN_PROGRAM_ID } = await import("@solana/spl-token");
+  const publicKey = new PublicKey(address);
+
+  const balances: AssetValue[] = [];
+
+  // Get SOL balance
+  const solBalance = await connection.getBalance(publicKey);
+  if (solBalance > 0) {
+    balances.push(
+      AssetValue.from({
+        chain: Chain.Solana,
+        value: solBalance,
+        fromBaseDecimal: BaseDecimal[Chain.Solana],
+      }),
+    );
+  }
+
+  // Get token balances
+  const tokenAccounts = await connection.getParsedTokenAccountsByOwner(publicKey, {
+    programId: TOKEN_PROGRAM_ID,
+  });
+
+  for (const { account } of tokenAccounts.value) {
+    const tokenInfo = account.data.parsed.info;
+    const mintAddress = tokenInfo.mint;
+    const amount = tokenInfo.tokenAmount.amount;
+
+    if (Number(amount) === 0) continue;
+
+    // Fetch token metadata from Jupiter
+    const metadata = await fetchTokenMetaData(mintAddress);
+    const symbol = metadata?.symbol || "UNKNOWN";
+    const decimals = metadata?.decimals || tokenInfo.tokenAmount.decimals;
+
+    balances.push(
+      AssetValue.from({
+        chain: Chain.Solana,
+        symbol,
+        address: mintAddress,
+        value: amount,
+        fromBaseDecimal: decimals,
+      }),
+    );
+  }
+
+  return balances;
+}
+
 export async function getSolanaAddressValidator() {
   const { PublicKey } = await import("@solana/web3.js");
 
@@ -68,7 +137,11 @@ export async function getSolanaToolbox(
     getPubkeyFromAddress,
     createTransaction: createTransaction(getConnection),
     createTransactionFromInstructions,
-    getBalance: getBalance(Chain.Solana),
+    getBalance: (addressParam?: string) => {
+      const address = addressParam || getAddress();
+      if (!address) throw new SwapKitError("core_wallet_connection_not_found");
+      return getSolanaBalance(address);
+    },
     transfer: transfer(getConnection, signer),
     broadcastTransaction: broadcastTransaction(getConnection),
     getAddressValidator: getSolanaAddressValidator,