@carrot-protocol/boost-http-client 0.2.16-token22-dev-158437a → 0.3.0-feat-get-account-endpoint-dev-6a0523c

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { AnchorProvider, web3 } from "@coral-xyz/anchor";
-import { GetBankResponse, GetUserResponse, GetGroupResponse, GetGroupsResponse } from "./types";
+import { GetBankResponse, GetUserResponse, GetGroupResponse, GetGroupsResponse, GetAccountResponse } from "./types";
 export * from "./types";
 export * from "./utils";
 export * as Common from "@carrot-protocol/clend-common";
@@ -22,6 +22,15 @@ export declare class Client {
      * @returns Index details
      */
     index(): Promise<any>;
+    /**
+     * Fetch and parse a single clend account by pubkey
+     */
+    getAccount(account: web3.PublicKey, getClendAccountSummary: boolean): Promise<GetAccountResponse>;
+    /**
+     * Helper to parse a clend account summary array from API response
+     */
+    private parseClendAccountSummary;
+    private parseClendAccountWithSummary;
     getUser(user: web3.PublicKey, groups: web3.PublicKey[], getClendAccountSummary: boolean): Promise<GetUserResponse>;
     /**
      * Get all groups
@@ -41,8 +50,6 @@ export declare class Client {
      * @returns Bank details
      */
     getBank(bankAddress: web3.PublicKey): Promise<GetBankResponse>;
-    deposit(clendGroup: web3.PublicKey, clendAccount: web3.PublicKey | null, inputTokenMint: web3.PublicKey, uiAmount: number): Promise<string>;
-    withdraw(clendAccount: web3.PublicKey, outputTokenMint: web3.PublicKey, uiAmount: number, withdrawAll: boolean): Promise<string>;
     /**
      * Deposit collateral and create a leveraged position
      * @param request Deposit leverage request parameters

package/dist/index.js

@@ -99,6 +99,120 @@ class Client {
     async index() {
         return handleApiCall(() => this.http.get(""));
     }
+    /**
+     * Fetch and parse a single clend account by pubkey
+     */
+    async getAccount(account, getClendAccountSummary) {
+        const body = await handleApiCall(() => this.http.get(`/account?account=${account.toString()}&getClendAccountSummary=${getClendAccountSummary}`));
+        const jsonRawResponse = JSON.parse(body);
+        return this.parseClendAccountWithSummary(jsonRawResponse, getClendAccountSummary);
+    }
+    /**
+     * Helper to parse a clend account summary array from API response
+     */
+    parseClendAccountSummary(summaryArr) {
+        return summaryArr.map((s) => {
+            let input = undefined;
+            if (s.input) {
+                input = {
+                    apiPath: s.input.apiPath,
+                    selectedTokenMint: s.input.selectedTokenMint
+                        ? new anchor_1.web3.PublicKey(s.input.selectedTokenMint)
+                        : null,
+                    amountUi: s.input.amountUi ? Number(s.input.amountUi) : null,
+                    leverage: s.input.leverage ? Number(s.input.leverage) : null,
+                    slippageBps: s.input.slippageBps ? Number(s.input.slippageBps) : null,
+                    openPosition: s.input.openPosition != null ? Boolean(s.input.openPosition) : null,
+                    closePosition: s.input.closePosition != null
+                        ? Boolean(s.input.closePosition)
+                        : null,
+                };
+            }
+            const events = (s.events || []).map((event) => {
+                let closeBalance = null;
+                if (event.closeBalance !== null && event.closeBalance !== undefined) {
+                    closeBalance = Boolean(event.closeBalance);
+                }
+                return {
+                    eventIndex: event.eventIndex,
+                    eventName: event.eventName,
+                    bank: event.bank ? new anchor_1.web3.PublicKey(event.bank) : null,
+                    mint: event.mint ? new anchor_1.web3.PublicKey(event.mint) : null,
+                    amount: event.amount ? new anchor_1.BN(event.amount, "hex") : null,
+                    amountUi: event.amountUi ? Number(event.amountUi) : null,
+                    value: event.value ? Number(event.value) : null,
+                    price: event.price ? Number(event.price) : null,
+                    closeBalance,
+                };
+            });
+            const txSummary = {
+                txSig: s.txSig,
+                time: s.time,
+                clendAccount: new anchor_1.web3.PublicKey(s.clendAccount),
+                clendAccountAuthority: new anchor_1.web3.PublicKey(s.clendAccountAuthority),
+                clendGroup: new anchor_1.web3.PublicKey(s.clendGroup),
+                action: s.action,
+                input,
+                events,
+            };
+            return txSummary;
+        });
+    }
+    parseClendAccountWithSummary(accountData, getClendAccountSummary) {
+        // A. Parse the main ClendAccount object
+        const rawClendAccount = accountData.clendAccount;
+        const clendAccountBalances = (rawClendAccount.balances || []).map((b) => {
+            const liquidation = b.liquidation
+                ? {
+                    price: Number(b.liquidation.price),
+                    changePercentage: Number(b.liquidation.changePercentage),
+                }
+                : null;
+            const emissionsOutstandingAndUnclaimed = new anchor_1.BN(b.emissionsOutstandingAndUnclaimed, "hex");
+            return {
+                mint: new anchor_1.web3.PublicKey(b.mint),
+                bank: new anchor_1.web3.PublicKey(b.bank),
+                tokenYieldApy: Number(b.tokenYieldApy),
+                assetBalance: new anchor_1.BN(b.assetBalance, "hex"),
+                assetBalanceUi: Number(b.assetBalanceUi),
+                assetValue: Number(b.assetValue),
+                assetEmissionsApy: Number(b.assetEmissionsApy),
+                liabilityBalance: new anchor_1.BN(b.liabilityBalance, "hex"),
+                liabilityBalanceUi: Number(b.liabilityBalanceUi),
+                liabilityValue: Number(b.liabilityValue),
+                liabilityBorrowCostApy: Number(b.liabilityBorrowCostApy),
+                liabilityEmissionsApy: Number(b.liabilityEmissionsApy),
+                emissionsOutstandingAndUnclaimed,
+                emissionsOutstandingAndUnclaimedUi: Number(b.emissionsOutstandingAndUnclaimedUi),
+                price: Number(b.price),
+                liquidation,
+            };
+        });
+        const clendAccount = {
+            key: new anchor_1.web3.PublicKey(rawClendAccount.key),
+            group: new anchor_1.web3.PublicKey(rawClendAccount.group),
+            balances: clendAccountBalances,
+            netValue: Number(rawClendAccount.netValue),
+            netApy: Number(rawClendAccount.netApy),
+            pnl: Number(rawClendAccount.pnl),
+            totalEmissionsApy: Number(rawClendAccount.totalEmissionsApy),
+            totalAssetValue: Number(rawClendAccount.totalAssetValue),
+            totalLiabilityValue: Number(rawClendAccount.totalLiabilityValue),
+            healthFactorNotional: Number(rawClendAccount.healthFactorNotional),
+            healthFactorRiskAdjusted: Number(rawClendAccount.healthFactorRiskAdjusted),
+            notionalLeverage: Number(rawClendAccount.notionalLeverage),
+            riskAdjustedLeverage: Number(rawClendAccount.riskAdjustedLeverage),
+            notionalLtv: Number(rawClendAccount.notionalLtv),
+            riskAdjustedLtv: Number(rawClendAccount.riskAdjustedLtv),
+        };
+        // B. Parse the associated Summary array for the account
+        let summary = [];
+        if (getClendAccountSummary && accountData.summary) {
+            summary = this.parseClendAccountSummary(accountData.summary);
+        }
+        // C. Combine the parsed account and its summary
+        return { clendAccount, summary };
+    }
     async getUser(user, groups, getClendAccountSummary) {
         // Make the API call to fetch the raw user data as a string.
         const body = await handleApiCall(() => this.http.get(`/user?user=${user.toString()}&groups=${groups.map((g) => g.toString()).join(",")}&getClendAccountSummary=${getClendAccountSummary}`));
@@ -117,112 +231,7 @@ class Client {
         // 2. Parse Clend Accounts and their Summaries
         // This is the main refactored section. It iterates through the clendAccounts array
         // from the response, which contains both the account data and its summary.
-        const clendAccounts = (jsonRawResponse.clendAccounts || []).map((accountData) => {
-            // A. Parse the main ClendAccount object
-            const rawClendAccount = accountData.clendAccount;
-            const clendAccountBalances = (rawClendAccount.balances || []).map((b) => {
-                const liquidation = b.liquidation
-                    ? {
-                        price: Number(b.liquidation.price),
-                        changePercentage: Number(b.liquidation.changePercentage),
-                    }
-                    : null;
-                const emissionsOutstandingAndUnclaimed = new anchor_1.BN(b.emissionsOutstandingAndUnclaimed, "hex");
-                return {
-                    mint: new anchor_1.web3.PublicKey(b.mint),
-                    bank: new anchor_1.web3.PublicKey(b.bank),
-                    tokenYieldApy: Number(b.tokenYieldApy),
-                    assetBalance: new anchor_1.BN(b.assetBalance, "hex"),
-                    assetBalanceUi: Number(b.assetBalanceUi),
-                    assetValue: Number(b.assetValue),
-                    assetEmissionsApy: Number(b.assetEmissionsApy),
-                    liabilityBalance: new anchor_1.BN(b.liabilityBalance, "hex"),
-                    liabilityBalanceUi: Number(b.liabilityBalanceUi),
-                    liabilityValue: Number(b.liabilityValue),
-                    liabilityBorrowCostApy: Number(b.liabilityBorrowCostApy),
-                    liabilityEmissionsApy: Number(b.liabilityEmissionsApy),
-                    emissionsOutstandingAndUnclaimed,
-                    emissionsOutstandingAndUnclaimedUi: Number(b.emissionsOutstandingAndUnclaimedUi),
-                    price: Number(b.price),
-                    liquidation,
-                };
-            });
-            const clendAccount = {
-                key: new anchor_1.web3.PublicKey(rawClendAccount.key),
-                group: new anchor_1.web3.PublicKey(rawClendAccount.group),
-                balances: clendAccountBalances,
-                netValue: Number(rawClendAccount.netValue),
-                netApy: Number(rawClendAccount.netApy),
-                pnl: Number(rawClendAccount.pnl),
-                totalEmissionsApy: Number(rawClendAccount.totalEmissionsApy),
-                totalAssetValue: Number(rawClendAccount.totalAssetValue),
-                totalLiabilityValue: Number(rawClendAccount.totalLiabilityValue),
-                healthFactorNotional: Number(rawClendAccount.healthFactorNotional),
-                healthFactorRiskAdjusted: Number(rawClendAccount.healthFactorRiskAdjusted),
-                notionalLeverage: Number(rawClendAccount.notionalLeverage),
-                riskAdjustedLeverage: Number(rawClendAccount.riskAdjustedLeverage),
-                notionalLtv: Number(rawClendAccount.notionalLtv),
-                riskAdjustedLtv: Number(rawClendAccount.riskAdjustedLtv),
-            };
-            // B. Parse the associated Summary array for the account
-            let summary = [];
-            if (getClendAccountSummary && accountData.summary) {
-                summary = accountData.summary.map((s) => {
-                    let input = undefined;
-                    if (s.input) {
-                        input = {
-                            apiPath: s.input.apiPath,
-                            selectedTokenMint: s.input.selectedTokenMint
-                                ? new anchor_1.web3.PublicKey(s.input.selectedTokenMint)
-                                : null,
-                            amountUi: s.input.amountUi ? Number(s.input.amountUi) : null,
-                            leverage: s.input.leverage ? Number(s.input.leverage) : null,
-                            slippageBps: s.input.slippageBps
-                                ? Number(s.input.slippageBps)
-                                : null,
-                            openPosition: s.input.openPosition != null
-                                ? Boolean(s.input.openPosition)
-                                : null,
-                            closePosition: s.input.closePosition != null
-                                ? Boolean(s.input.closePosition)
-                                : null,
-                        };
-                    }
-                    const events = (s.events || []).map((event) => {
-                        let closeBalance = null;
-                        // Only convert to boolean if the value is not null/undefined to preserve the null state.
-                        if (event.closeBalance !== null &&
-                            event.closeBalance !== undefined) {
-                            closeBalance = Boolean(event.closeBalance);
-                        }
-                        return {
-                            eventIndex: event.eventIndex,
-                            eventName: event.eventName,
-                            bank: event.bank ? new anchor_1.web3.PublicKey(event.bank) : null,
-                            mint: event.mint ? new anchor_1.web3.PublicKey(event.mint) : null,
-                            amount: event.amount ? new anchor_1.BN(event.amount, "hex") : null,
-                            amountUi: event.amountUi ? Number(event.amountUi) : null,
-                            value: event.value ? Number(event.value) : null,
-                            price: event.price ? Number(event.price) : null,
-                            closeBalance,
-                        };
-                    });
-                    const txSummary = {
-                        txSig: s.txSig,
-                        time: s.time,
-                        clendAccount: new anchor_1.web3.PublicKey(s.clendAccount),
-                        clendAccountAuthority: new anchor_1.web3.PublicKey(s.clendAccountAuthority),
-                        clendGroup: new anchor_1.web3.PublicKey(s.clendGroup),
-                        action: s.action,
-                        input,
-                        events,
-                    };
-                    return txSummary;
-                });
-            }
-            // C. Combine the parsed account and its summary
-            return { clendAccount, summary };
-        });
+        const clendAccounts = (jsonRawResponse.clendAccounts || []).map((accountData) => this.parseClendAccountWithSummary(accountData, getClendAccountSummary));
         // 3. Return the final, correctly structured response object.
         return {
             wallet,
@@ -289,31 +298,6 @@ class Client {
         };
         return response;
     }
-    async deposit(clendGroup, clendAccount, inputTokenMint, uiAmount) {
-        const req = {
-            owner: this.address(),
-            clendGroup,
-            clendAccount,
-            inputTokenMint,
-            depositAmountUi: uiAmount,
-        };
-        const body = await handleApiCall(() => this.http.post("deposit", JSON.stringify(req)));
-        const depositResponse = JSON.parse(body);
-        const txSig = await this.send(depositResponse.unsignedBase64Tx, depositResponse.userRequestId);
-        return txSig;
-    }
-    async withdraw(clendAccount, outputTokenMint, uiAmount, withdrawAll) {
-        const req = {
-            clendAccount,
-            outputTokenMint,
-            withdrawAmountUi: uiAmount,
-            withdrawAll,
-        };
-        const body = await handleApiCall(() => this.http.post("withdraw", JSON.stringify(req)));
-        const withdrawResponse = JSON.parse(body);
-        const txSig = await this.send(withdrawResponse.unsignedBase64Tx, withdrawResponse.userRequestId);
-        return txSig;
-    }
     /**
      * Deposit collateral and create a leveraged position
      * @param request Deposit leverage request parameters

package/dist/types.d.ts

@@ -3,33 +3,6 @@ export interface SendRequest {
     userRequestId: string;
     txns: string[];
 }
-/**
- * Request to deposit collateral
- */
-export interface DepositRequest {
-    owner: web3.PublicKey;
-    clendGroup: web3.PublicKey;
-    clendAccount: web3.PublicKey | null;
-    inputTokenMint: web3.PublicKey;
-    depositAmountUi: number;
-}
-export interface DepositResponse {
-    userRequestId: string;
-    unsignedBase64Tx: string;
-}
-/**
- * Request to withdraw collateral
- */
-export interface WithdrawRequest {
-    clendAccount: web3.PublicKey;
-    outputTokenMint: web3.PublicKey;
-    withdrawAmountUi: number;
-    withdrawAll: boolean;
-}
-export interface WithdrawResponse {
-    userRequestId: string;
-    unsignedBase64Tx: string;
-}
 /**
  * Request to deposit collateral and create a leveraged position
  */
@@ -111,6 +84,14 @@ export interface GroupAndBanks {
     groupName: string;
     banks: Bank[];
 }
+export interface GetAccountRequest {
+    account: web3.PublicKey;
+    getClendAccountSummary: boolean;
+}
+export interface GetAccountResponse {
+    clendAccount: ClendAccount;
+    summary: ClendAccountTxSummary[];
+}
 export interface GetUserRequest {
     groups: web3.PublicKey[];
     user: web3.PublicKey;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carrot-protocol/boost-http-client",
-  "version": "0.2.16-token22-dev-158437a",
+  "version": "0.3.0-feat-get-account-endpoint-dev-6a0523c",
   "description": "HTTP client for Carrot Boost",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -27,10 +27,7 @@ import {
   BankEmissionsMode,
   WithdrawEmissionsRequest,
   WithdrawEmissionsResponse,
-  DepositRequest,
-  DepositResponse,
-  WithdrawRequest,
-  WithdrawResponse,
+  GetAccountResponse,
 } from "./types";
 import encode from "bs58";
 
@@ -110,6 +107,155 @@ export class Client {
     return handleApiCall(() => this.http.get(""));
   }
 
+  /**
+   * Fetch and parse a single clend account by pubkey
+   */
+  async getAccount(
+    account: web3.PublicKey,
+    getClendAccountSummary: boolean,
+  ): Promise<GetAccountResponse> {
+    const body = await handleApiCall(() =>
+      this.http.get(
+        `/account?account=${account.toString()}&getClendAccountSummary=${getClendAccountSummary}`,
+      ),
+    );
+    const jsonRawResponse: any = JSON.parse(body);
+    return this.parseClendAccountWithSummary(
+      jsonRawResponse,
+      getClendAccountSummary,
+    );
+  }
+
+  /**
+   * Helper to parse a clend account summary array from API response
+   */
+  private parseClendAccountSummary(summaryArr: any[]): ClendAccountTxSummary[] {
+    return summaryArr.map((s: any) => {
+      let input: UserRequest | undefined = undefined;
+      if (s.input) {
+        input = {
+          apiPath: s.input.apiPath,
+          selectedTokenMint: s.input.selectedTokenMint
+            ? new web3.PublicKey(s.input.selectedTokenMint)
+            : null,
+          amountUi: s.input.amountUi ? Number(s.input.amountUi) : null,
+          leverage: s.input.leverage ? Number(s.input.leverage) : null,
+          slippageBps: s.input.slippageBps ? Number(s.input.slippageBps) : null,
+          openPosition:
+            s.input.openPosition != null ? Boolean(s.input.openPosition) : null,
+          closePosition:
+            s.input.closePosition != null
+              ? Boolean(s.input.closePosition)
+              : null,
+        };
+      }
+
+      const events: ClendAccountEvent[] = (s.events || []).map((event: any) => {
+        let closeBalance: boolean | null = null;
+        if (event.closeBalance !== null && event.closeBalance !== undefined) {
+          closeBalance = Boolean(event.closeBalance);
+        }
+
+        return {
+          eventIndex: event.eventIndex,
+          eventName: event.eventName,
+          bank: event.bank ? new web3.PublicKey(event.bank) : null,
+          mint: event.mint ? new web3.PublicKey(event.mint) : null,
+          amount: event.amount ? new BN(event.amount, "hex") : null,
+          amountUi: event.amountUi ? Number(event.amountUi) : null,
+          value: event.value ? Number(event.value) : null,
+          price: event.price ? Number(event.price) : null,
+          closeBalance,
+        };
+      });
+
+      const txSummary: ClendAccountTxSummary = {
+        txSig: s.txSig,
+        time: s.time,
+        clendAccount: new web3.PublicKey(s.clendAccount),
+        clendAccountAuthority: new web3.PublicKey(s.clendAccountAuthority),
+        clendGroup: new web3.PublicKey(s.clendGroup),
+        action: s.action,
+        input,
+        events,
+      };
+      return txSummary;
+    });
+  }
+
+  private parseClendAccountWithSummary(
+    accountData: any,
+    getClendAccountSummary: boolean,
+  ): GetAccountResponse {
+    // A. Parse the main ClendAccount object
+    const rawClendAccount = accountData.clendAccount;
+    const clendAccountBalances: ClendAccountBalance[] = (
+      rawClendAccount.balances || []
+    ).map((b: any) => {
+      const liquidation: ClendAccountAssetLiquidation | null = b.liquidation
+        ? {
+            price: Number(b.liquidation.price),
+            changePercentage: Number(b.liquidation.changePercentage),
+          }
+        : null;
+
+      const emissionsOutstandingAndUnclaimed = new BN(
+        b.emissionsOutstandingAndUnclaimed,
+        "hex",
+      );
+
+      return {
+        mint: new web3.PublicKey(b.mint),
+        bank: new web3.PublicKey(b.bank),
+        tokenYieldApy: Number(b.tokenYieldApy),
+        assetBalance: new BN(b.assetBalance, "hex"),
+        assetBalanceUi: Number(b.assetBalanceUi),
+        assetValue: Number(b.assetValue),
+        assetEmissionsApy: Number(b.assetEmissionsApy),
+        liabilityBalance: new BN(b.liabilityBalance, "hex"),
+        liabilityBalanceUi: Number(b.liabilityBalanceUi),
+        liabilityValue: Number(b.liabilityValue),
+        liabilityBorrowCostApy: Number(b.liabilityBorrowCostApy),
+        liabilityEmissionsApy: Number(b.liabilityEmissionsApy),
+        emissionsOutstandingAndUnclaimed,
+        emissionsOutstandingAndUnclaimedUi: Number(
+          b.emissionsOutstandingAndUnclaimedUi,
+        ),
+        price: Number(b.price),
+        liquidation,
+      };
+    });
+
+    const clendAccount: ClendAccount = {
+      key: new web3.PublicKey(rawClendAccount.key),
+      group: new web3.PublicKey(rawClendAccount.group),
+      balances: clendAccountBalances,
+      netValue: Number(rawClendAccount.netValue),
+      netApy: Number(rawClendAccount.netApy),
+      pnl: Number(rawClendAccount.pnl),
+      totalEmissionsApy: Number(rawClendAccount.totalEmissionsApy),
+      totalAssetValue: Number(rawClendAccount.totalAssetValue),
+      totalLiabilityValue: Number(rawClendAccount.totalLiabilityValue),
+      healthFactorNotional: Number(rawClendAccount.healthFactorNotional),
+      healthFactorRiskAdjusted: Number(
+        rawClendAccount.healthFactorRiskAdjusted,
+      ),
+      notionalLeverage: Number(rawClendAccount.notionalLeverage),
+      riskAdjustedLeverage: Number(rawClendAccount.riskAdjustedLeverage),
+      notionalLtv: Number(rawClendAccount.notionalLtv),
+      riskAdjustedLtv: Number(rawClendAccount.riskAdjustedLtv),
+    };
+
+    // B. Parse the associated Summary array for the account
+    let summary: ClendAccountTxSummary[] = [];
+    if (getClendAccountSummary && accountData.summary) {
+      summary = this.parseClendAccountSummary(accountData.summary);
+    }
+
+    // C. Combine the parsed account and its summary
+    return { clendAccount, summary };
+  }
+
   async getUser(
     user: web3.PublicKey,
     groups: web3.PublicKey[],
@@ -143,137 +289,8 @@ export class Client {
     // This is the main refactored section. It iterates through the clendAccounts array
     // from the response, which contains both the account data and its summary.
     const clendAccounts = (jsonRawResponse.clendAccounts || []).map(
-      (accountData: any) => {
-        // A. Parse the main ClendAccount object
-        const rawClendAccount = accountData.clendAccount;
-        const clendAccountBalances: ClendAccountBalance[] = (
-          rawClendAccount.balances || []
-        ).map((b: any) => {
-          const liquidation: ClendAccountAssetLiquidation | null = b.liquidation
-            ? {
-                price: Number(b.liquidation.price),
-                changePercentage: Number(b.liquidation.changePercentage),
-              }
-            : null;
-
-          const emissionsOutstandingAndUnclaimed = new BN(
-            b.emissionsOutstandingAndUnclaimed,
-            "hex",
-          );
-
-          return {
-            mint: new web3.PublicKey(b.mint),
-            bank: new web3.PublicKey(b.bank),
-            tokenYieldApy: Number(b.tokenYieldApy),
-            assetBalance: new BN(b.assetBalance, "hex"),
-            assetBalanceUi: Number(b.assetBalanceUi),
-            assetValue: Number(b.assetValue),
-            assetEmissionsApy: Number(b.assetEmissionsApy),
-            liabilityBalance: new BN(b.liabilityBalance, "hex"),
-            liabilityBalanceUi: Number(b.liabilityBalanceUi),
-            liabilityValue: Number(b.liabilityValue),
-            liabilityBorrowCostApy: Number(b.liabilityBorrowCostApy),
-            liabilityEmissionsApy: Number(b.liabilityEmissionsApy),
-            emissionsOutstandingAndUnclaimed,
-            emissionsOutstandingAndUnclaimedUi: Number(
-              b.emissionsOutstandingAndUnclaimedUi,
-            ),
-            price: Number(b.price),
-            liquidation,
-          };
-        });
-
-        const clendAccount: ClendAccount = {
-          key: new web3.PublicKey(rawClendAccount.key),
-          group: new web3.PublicKey(rawClendAccount.group),
-          balances: clendAccountBalances,
-          netValue: Number(rawClendAccount.netValue),
-          netApy: Number(rawClendAccount.netApy),
-          pnl: Number(rawClendAccount.pnl),
-          totalEmissionsApy: Number(rawClendAccount.totalEmissionsApy),
-          totalAssetValue: Number(rawClendAccount.totalAssetValue),
-          totalLiabilityValue: Number(rawClendAccount.totalLiabilityValue),
-          healthFactorNotional: Number(rawClendAccount.healthFactorNotional),
-          healthFactorRiskAdjusted: Number(
-            rawClendAccount.healthFactorRiskAdjusted,
-          ),
-          notionalLeverage: Number(rawClendAccount.notionalLeverage),
-          riskAdjustedLeverage: Number(rawClendAccount.riskAdjustedLeverage),
-          notionalLtv: Number(rawClendAccount.notionalLtv),
-          riskAdjustedLtv: Number(rawClendAccount.riskAdjustedLtv),
-        };
-
-        // B. Parse the associated Summary array for the account
-        let summary: ClendAccountTxSummary[] = [];
-        if (getClendAccountSummary && accountData.summary) {
-          summary = accountData.summary.map((s: any) => {
-            let input: UserRequest | undefined = undefined;
-            if (s.input) {
-              input = {
-                apiPath: s.input.apiPath,
-                selectedTokenMint: s.input.selectedTokenMint
-                  ? new web3.PublicKey(s.input.selectedTokenMint)
-                  : null,
-                amountUi: s.input.amountUi ? Number(s.input.amountUi) : null,
-                leverage: s.input.leverage ? Number(s.input.leverage) : null,
-                slippageBps: s.input.slippageBps
-                  ? Number(s.input.slippageBps)
-                  : null,
-                openPosition:
-                  s.input.openPosition != null
-                    ? Boolean(s.input.openPosition)
-                    : null,
-                closePosition:
-                  s.input.closePosition != null
-                    ? Boolean(s.input.closePosition)
-                    : null,
-              };
-            }
-
-            const events: ClendAccountEvent[] = (s.events || []).map(
-              (event: any) => {
-                let closeBalance: boolean | null = null;
-                // Only convert to boolean if the value is not null/undefined to preserve the null state.
-                if (
-                  event.closeBalance !== null &&
-                  event.closeBalance !== undefined
-                ) {
-                  closeBalance = Boolean(event.closeBalance);
-                }
-
-                return {
-                  eventIndex: event.eventIndex,
-                  eventName: event.eventName,
-                  bank: event.bank ? new web3.PublicKey(event.bank) : null,
-                  mint: event.mint ? new web3.PublicKey(event.mint) : null,
-                  amount: event.amount ? new BN(event.amount, "hex") : null,
-                  amountUi: event.amountUi ? Number(event.amountUi) : null,
-                  value: event.value ? Number(event.value) : null,
-                  price: event.price ? Number(event.price) : null,
-                  closeBalance,
-                };
-              },
-            );
-
-            const txSummary: ClendAccountTxSummary = {
-              txSig: s.txSig,
-              time: s.time,
-              clendAccount: new web3.PublicKey(s.clendAccount),
-              clendAccountAuthority: new web3.PublicKey(
-                s.clendAccountAuthority,
-              ),
-              clendGroup: new web3.PublicKey(s.clendGroup),
-              action: s.action,
-              input,
-              events,
-            };
-            return txSummary;
-          });
-        }
-
-        // C. Combine the parsed account and its summary
-        return { clendAccount, summary };
-      },
+      (accountData: any) =>
+        this.parseClendAccountWithSummary(accountData, getClendAccountSummary),
     );
 
     // 3. Return the final, correctly structured response object.
@@ -360,61 +377,6 @@ export class Client {
     return response;
   }
 
-  async deposit(
-    clendGroup: web3.PublicKey,
-    clendAccount: web3.PublicKey | null,
-    inputTokenMint: web3.PublicKey,
-    uiAmount: number,
-  ): Promise<string> {
-    const req: DepositRequest = {
-      owner: this.address(),
-      clendGroup,
-      clendAccount,
-      inputTokenMint,
-      depositAmountUi: uiAmount,
-    };
-
-    const body = await handleApiCall(() =>
-      this.http.post("deposit", JSON.stringify(req)),
-    );
-
-    const depositResponse: DepositResponse = JSON.parse(body);
-
-    const txSig = await this.send(
-      depositResponse.unsignedBase64Tx,
-      depositResponse.userRequestId,
-    );
-
-    return txSig;
-  }
-
-  async withdraw(
-    clendAccount: web3.PublicKey,
-    outputTokenMint: web3.PublicKey,
-    uiAmount: number,
-    withdrawAll: boolean,
-  ): Promise<string> {
-    const req: WithdrawRequest = {
-      clendAccount,
-      outputTokenMint,
-      withdrawAmountUi: uiAmount,
-      withdrawAll,
-    };
-
-    const body = await handleApiCall(() =>
-      this.http.post("withdraw", JSON.stringify(req)),
-    );
-
-    const withdrawResponse: WithdrawResponse = JSON.parse(body);
-
-    const txSig = await this.send(
-      withdrawResponse.unsignedBase64Tx,
-      withdrawResponse.userRequestId,
-    );
-
-    return txSig;
-  }
-
   /**
    * Deposit collateral and create a leveraged position
    * @param request Deposit leverage request parameters

package/src/types.ts

@@ -6,37 +6,6 @@ export interface SendRequest {
   txns: string[];
 }
 
-/**
- * Request to deposit collateral
- */
-export interface DepositRequest {
-  owner: web3.PublicKey;
-  clendGroup: web3.PublicKey;
-  clendAccount: web3.PublicKey | null;
-  inputTokenMint: web3.PublicKey;
-  depositAmountUi: number;
-}
-
-export interface DepositResponse {
-  userRequestId: string;
-  unsignedBase64Tx: string;
-}
-
-/**
- * Request to withdraw collateral
- */
-export interface WithdrawRequest {
-  clendAccount: web3.PublicKey;
-  outputTokenMint: web3.PublicKey;
-  withdrawAmountUi: number;
-  withdrawAll: boolean;
-}
-
-export interface WithdrawResponse {
-  userRequestId: string;
-  unsignedBase64Tx: string;
-}
-
 /**
  * Request to deposit collateral and create a leveraged position
  */
@@ -129,6 +98,16 @@ export interface GroupAndBanks {
   banks: Bank[];
 }
 
+export interface GetAccountRequest {
+  account: web3.PublicKey;
+  getClendAccountSummary: boolean;
+}
+
+export interface GetAccountResponse {
+  clendAccount: ClendAccount;
+  summary: ClendAccountTxSummary[];
+}
+
 export interface GetUserRequest {
   groups: web3.PublicKey[];
   user: web3.PublicKey;