@carrot-protocol/boost-http-client 0.2.15-swapper1-dev-cda79a9 → 0.2.16-group-refactor1-dev-50c976e

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, GetUserRequest } from "./types";
 export * from "./types";
 export * from "./utils";
 export * as Common from "@carrot-protocol/clend-common";
@@ -27,13 +27,7 @@ export declare class Client {
      * @param user wallet public key
      * @returns User details
      */
-    getUser(groups: web3.PublicKey[], user: web3.PublicKey, getClendAccountSummary: boolean): Promise<GetUserResponse>;
-    /**
-     * Get all groups
-     * @param includeBankData Whether to include bank data in the response, if not strictly necessary keep false
-     * @returns All groups
-     */
-    getGroups(includeBankData: boolean): Promise<GetGroupsResponse>;
+    getUser(request: GetUserRequest): Promise<GetUserResponse>;
     /**
      * Get market details
      * @param groupAddress group public key
@@ -51,17 +45,17 @@ export declare class Client {
      * @param request Deposit leverage request parameters
      * @returns Deposit leverage operation result
      */
-    depositLeverage(clendGroup: web3.PublicKey, clendAccount: web3.PublicKey | null, inputTokenMint: web3.PublicKey, assetTokenMint: web3.PublicKey, liabilityTokenMint: web3.PublicKey, uiAmount: number, leverage: number, slippageBps: number): Promise<string>;
+    depositLeverage(inputMint: web3.PublicKey, assetMint: web3.PublicKey, liabilityMint: web3.PublicKey, uiAmount: number, leverage: number, slippageBps: number): Promise<string>;
     /**
      * Adjust the leverage of an existing position
      * @param request Adjust leverage request parameters
      * @returns Adjust leverage operation result
      */
-    adjustLeverage(clendGroup: web3.PublicKey, clendAccount: web3.PublicKey, assetTokenMint: web3.PublicKey, liabilityTokenMint: web3.PublicKey, leverage: number, slippageBps: number): Promise<any>;
+    adjustLeverage(leverage: number, slippageBps: number): Promise<any>;
     /**
      * Withdraw from or close a leveraged position
      * @param request Withdraw leverage request parameters
      * @returns Withdraw leverage operation result
      */
-    withdrawLeverage(clendGroup: web3.PublicKey, clendAccount: web3.PublicKey, outputTokenMint: web3.PublicKey, assetTokenMint: web3.PublicKey, liabilityTokenMint: web3.PublicKey, uiAmount: number, slippageBps: number, withdrawAll: boolean): Promise<any>;
+    withdrawLeverage(selectedTokenMint: web3.PublicKey, uiAmount: number, slippageBps: number, withdrawAll: boolean): Promise<any>;
 }

package/dist/index.js

@@ -104,166 +104,122 @@ class Client {
      * @param user wallet public key
      * @returns User details
      */
-    async getUser(groups, user, getClendAccountSummary) {
-        const body = await handleApiCall(() => this.http.get(`/user?user=${user.toString()}&groups=${groups.map((g) => g.toString()).join(",")}&getClendAccountSummary=${getClendAccountSummary}`));
+    async getUser(request) {
+        // use loaded wallet if not provided
+        let user = request.user;
+        if (!user) {
+            user = this.address();
+        }
+        const body = await handleApiCall(() => this.http.get(`/user?user=${user.toString()}&getClendAccountSummary=${request.getClendAccountSummary}`));
         const jsonRawResponse = JSON.parse(body);
-        console.log(JSON.stringify(jsonRawResponse, null, 2));
-        // parse balances
-        const walletBalances = [];
-        for (const b of jsonRawResponse.wallet.balances) {
-            walletBalances.push({
+        // get tokens still in user wallet
+        const wallet = {
+            usdcBalance: new anchor_1.BN(jsonRawResponse.wallet.usdcBalance, "hex"),
+            usdcBalanceUi: Number(jsonRawResponse.wallet.usdcBalanceUi),
+            jlpBalance: new anchor_1.BN(jsonRawResponse.wallet.jlpBalance, "hex"),
+            jlpBalanceUi: Number(jsonRawResponse.wallet.jlpBalanceUi),
+            solBalance: new anchor_1.BN(jsonRawResponse.wallet.solBalance, "hex"),
+            solBalanceUi: Number(jsonRawResponse.wallet.solBalanceUi),
+        };
+        // if no clend account, return undefined for clend
+        if (!jsonRawResponse.clendAccount) {
+            return {
+                wallet,
+                clendAccount: undefined,
+                summary: [],
+            };
+        }
+        // parse lending account balances
+        const balances = [];
+        for (const b of jsonRawResponse.clendAccount.balances) {
+            balances.push({
                 mint: new anchor_1.web3.PublicKey(b.mint),
-                balance: new anchor_1.BN(b.balance, "hex"),
-                balanceUi: Number(b.balanceUi),
+                bank: new anchor_1.web3.PublicKey(b.bank),
+                assetBalance: new anchor_1.BN(b.assetBalance, "hex"),
+                assetBalanceUi: Number(b.assetBalanceUi),
+                assetValue: Number(b.assetValue),
+                liabilityBalance: new anchor_1.BN(b.liabilityBalance, "hex"),
+                liabilityBalanceUi: Number(b.liabilityBalanceUi),
+                liabilityValue: Number(b.liabilityValue),
+                price: Number(b.price),
             });
         }
-        // get tokens still in user wallet
-        const wallet = {
-            balances: walletBalances,
+        // create clend account
+        const clendAccount = {
+            balances,
+            netValue: Number(jsonRawResponse.clendAccount.netValue),
+            netApy: Number(jsonRawResponse.clendAccount.netApy),
+            pnl: Number(jsonRawResponse.clendAccount.pnl),
+            totalAssetValue: Number(jsonRawResponse.clendAccount.totalAssetValue),
+            totalLiabilityValue: Number(jsonRawResponse.clendAccount.totalLiabilityValue),
+            healthFactorNotional: Number(jsonRawResponse.clendAccount.healthFactorNotional),
+            healthFactorRiskAdjusted: Number(jsonRawResponse.clendAccount.healthFactorRiskAdjusted),
+            notionalLeverage: Number(jsonRawResponse.clendAccount.notionalLeverage),
+            riskAdjustedLeverage: Number(jsonRawResponse.clendAccount.riskAdjustedLeverage),
+            liquidationPrice: Number(jsonRawResponse.clendAccount.liquidationPrice),
+            liquidationPriceChangePercentage: Number(jsonRawResponse.clendAccount.liquidationPriceChangePercentage),
+            notionalLtv: Number(jsonRawResponse.clendAccount.notionalLtv),
+            riskAdjustedLtv: Number(jsonRawResponse.clendAccount.riskAdjustedLtv),
         };
-        // get tx summary for each account and group them
-        const summaryByAccount = new Map();
-        if (getClendAccountSummary && jsonRawResponse.summary) {
-            for (const s of jsonRawResponse.summary) {
-                const accountAddress = new anchor_1.web3.PublicKey(s.clendAccount).toBase58();
-                if (!summaryByAccount.has(accountAddress)) {
-                    summaryByAccount.set(accountAddress, []);
-                }
-                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: undefined,
-                    events: [],
+        // get tx summary for each account
+        const summary = [];
+        for (const s of jsonRawResponse.summary) {
+            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: undefined,
+                events: [],
+            };
+            // parse inputs if they exist
+            if (s.input) {
+                const 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
+                        ? Boolean(s.input.openPosition)
+                        : null,
+                    closePosition: s.input.closePosition
+                        ? Boolean(s.input.closePosition)
+                        : null,
                 };
-                // parse inputs if they exist
-                if (s.input) {
-                    const 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
-                            ? Boolean(s.input.openPosition)
-                            : null,
-                        closePosition: s.input.closePosition
-                            ? Boolean(s.input.closePosition)
-                            : null,
-                    };
-                    txSummary.input = input;
-                }
-                // get events for each summary
-                for (const event of s.events) {
-                    let closeBalance = null;
-                    if (event.closeBalance !== null) {
-                        closeBalance = Boolean(event.closeBalance);
-                    }
-                    // parse amount
-                    const clendAccountEvent = {
-                        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,
-                    };
-                    txSummary.events.push(clendAccountEvent);
-                }
-                summaryByAccount.get(accountAddress).push(txSummary);
+                txSummary.input = input;
             }
-        }
-        // if no clend accounts, return empty array
-        const clendAccounts = [];
-        for (const accountAndSumary of jsonRawResponse.clendAccounts) {
-            const clendAccountBalances = [];
-            const ca = accountAndSumary.clendAccount;
-            for (const b of ca.balances) {
-                // parse liquidation data if exists
-                const liquidation = b.liquidation
-                    ? {
-                        price: Number(b.liquidation.price),
-                        changePercentage: Number(b.liquidation.changePercentage),
-                    }
-                    : null;
-                // create clend account balance
-                clendAccountBalances.push({
-                    mint: new anchor_1.web3.PublicKey(b.mint),
-                    bank: new anchor_1.web3.PublicKey(b.bank),
-                    assetBalance: new anchor_1.BN(b.assetBalance, "hex"),
-                    assetBalanceUi: Number(b.assetBalanceUi),
-                    assetValue: Number(b.assetValue),
-                    assetYieldBps: Number(b.assetYieldBps),
-                    assetYieldApy: Number(b.assetYieldApy),
-                    liabilityBalance: new anchor_1.BN(b.liabilityBalance, "hex"),
-                    liabilityBalanceUi: Number(b.liabilityBalanceUi),
-                    liabilityValue: Number(b.liabilityValue),
-                    liabilityBorrowCostBps: Number(b.liabilityBorrowCostBps),
-                    liabilityBorrowCostApy: Number(b.liabilityBorrowCostApy),
-                    price: Number(b.price),
-                    liquidation,
-                });
+            // get events for each summary
+            for (const event of s.events) {
+                let closeBalance = null;
+                if (event.closeBalance !== null) {
+                    closeBalance = Boolean(event.closeBalance);
+                }
+                // parse amount
+                const clendAccountEvent = {
+                    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,
+                };
+                txSummary.events.push(clendAccountEvent);
             }
-            // create clend account
-            const clendAccountAddress = new anchor_1.web3.PublicKey(accountAndSumary.clendAccount.key);
-            const clendAccount = {
-                key: clendAccountAddress,
-                group: new anchor_1.web3.PublicKey(ca.group),
-                balances: clendAccountBalances,
-                netValue: Number(ca.netValue),
-                netApy: Number(ca.netApy),
-                pnl: Number(ca.pnl),
-                totalAssetValue: Number(ca.totalAssetValue),
-                totalLiabilityValue: Number(ca.totalLiabilityValue),
-                healthFactorNotional: Number(ca.healthFactorNotional),
-                healthFactorRiskAdjusted: Number(ca.healthFactorRiskAdjusted),
-                notionalLeverage: Number(ca.notionalLeverage),
-                riskAdjustedLeverage: Number(ca.riskAdjustedLeverage),
-                notionalLtv: Number(ca.notionalLtv),
-                riskAdjustedLtv: Number(ca.riskAdjustedLtv),
-            };
-            // find corresponding tx summary for account
-            const summary = summaryByAccount.get(clendAccountAddress.toString()) || [];
-            clendAccounts.push({ clendAccount, summary });
+            summary.push(txSummary);
         }
         return {
             wallet,
-            clendAccounts,
-        };
-    }
-    /**
-     * Get all groups
-     * @param includeBankData Whether to include bank data in the response, if not strictly necessary keep false
-     * @returns All groups
-     */
-    async getGroups(includeBankData) {
-        const body = await handleApiCall(() => this.http.get(`/groups?includeBankData=${includeBankData}`));
-        const marketJson = JSON.parse(body);
-        const groups = [];
-        for (const groupJson of marketJson.groups) {
-            const group = new anchor_1.web3.PublicKey(groupJson.group);
-            const groupName = groupJson.groupName;
-            const banks = [];
-            for (const bankJson of groupJson.banks) {
-                const bank = parseBank(bankJson);
-                banks.push(bank);
-            }
-            groups.push({ group, groupName, banks });
-        }
-        const response = {
-            groups,
+            clendAccount,
+            summary,
         };
-        return response;
     }
     /**
      * Get market details
@@ -273,17 +229,13 @@ class Client {
     async getGroup(groupAddress) {
         const body = await handleApiCall(() => this.http.get(`/group?group=${groupAddress.toString()}`));
         const marketJson = JSON.parse(body);
-        const group = {
-            group: new anchor_1.web3.PublicKey(marketJson.group.group),
-            groupName: marketJson.group.groupName,
-            banks: [],
-        };
-        for (const bankJson of marketJson.group.banks) {
+        const banks = [];
+        for (const bankJson of marketJson.banks) {
             const bank = parseBank(bankJson);
-            group.banks.push(bank);
+            banks.push(bank);
         }
         const response = {
-            group,
+            banks,
         };
         return response;
     }
@@ -306,18 +258,15 @@ class Client {
      * @param request Deposit leverage request parameters
      * @returns Deposit leverage operation result
      */
-    async depositLeverage(clendGroup, clendAccount, inputTokenMint, assetTokenMint, liabilityTokenMint, uiAmount, leverage, slippageBps) {
-        if (!inputTokenMint.equals(assetTokenMint) &&
-            !inputTokenMint.equals(liabilityTokenMint)) {
+    async depositLeverage(inputMint, assetMint, liabilityMint, uiAmount, leverage, slippageBps) {
+        if (!inputMint.equals(assetMint) || !inputMint.equals(liabilityMint)) {
             throw new Error("Input mint must be the same as the asset or liability mint");
         }
         const req = {
             owner: this.address(),
-            clendGroup,
-            clendAccount,
-            inputTokenMint,
-            assetTokenMint,
-            liabilityTokenMint,
+            inputMint,
+            assetMint,
+            liabilityMint,
             depositAmountUi: uiAmount,
             leverage,
             slippageBps,
@@ -332,13 +281,9 @@ class Client {
      * @param request Adjust leverage request parameters
      * @returns Adjust leverage operation result
      */
-    async adjustLeverage(clendGroup, clendAccount, assetTokenMint, liabilityTokenMint, leverage, slippageBps) {
+    async adjustLeverage(leverage, slippageBps) {
         const req = {
             owner: this.address(),
-            clendGroup,
-            clendAccount,
-            assetTokenMint,
-            liabilityTokenMint,
             leverage,
             slippageBps,
         };
@@ -352,14 +297,10 @@ class Client {
      * @param request Withdraw leverage request parameters
      * @returns Withdraw leverage operation result
      */
-    async withdrawLeverage(clendGroup, clendAccount, outputTokenMint, assetTokenMint, liabilityTokenMint, uiAmount, slippageBps, withdrawAll) {
+    async withdrawLeverage(selectedTokenMint, uiAmount, slippageBps, withdrawAll) {
         const req = {
             owner: this.address(),
-            clendGroup,
-            clendAccount,
-            outputTokenMint,
-            assetTokenMint,
-            liabilityTokenMint,
+            selectedTokenMint,
             withdrawAmountUi: uiAmount,
             slippageBps,
             withdrawAll,

package/dist/types.d.ts

@@ -8,11 +8,9 @@ export interface SendRequest {
  */
 export interface DepositLeverageRequest {
     owner: web3.PublicKey;
-    clendGroup: web3.PublicKey;
-    clendAccount: web3.PublicKey | null;
-    inputTokenMint: web3.PublicKey;
-    assetTokenMint: web3.PublicKey;
-    liabilityTokenMint: web3.PublicKey;
+    inputMint: web3.PublicKey;
+    assetMint: web3.PublicKey;
+    liabilityMint: web3.PublicKey;
     depositAmountUi: number;
     leverage: number;
     slippageBps: number;
@@ -29,10 +27,6 @@ export interface DepositLeverageResponse {
  */
 export interface AdjustLeverageRequest {
     owner: web3.PublicKey;
-    clendGroup: web3.PublicKey;
-    clendAccount: web3.PublicKey;
-    assetTokenMint: web3.PublicKey;
-    liabilityTokenMint: web3.PublicKey;
     leverage: number;
     slippageBps: number;
 }
@@ -48,11 +42,7 @@ export interface AdjustLeverageResponse {
  */
 export interface WithdrawLeverageRequest {
     owner: web3.PublicKey;
-    clendGroup: web3.PublicKey;
-    clendAccount: web3.PublicKey;
-    outputTokenMint: web3.PublicKey;
-    assetTokenMint: web3.PublicKey;
-    liabilityTokenMint: web3.PublicKey;
+    selectedTokenMint: web3.PublicKey;
     withdrawAmountUi: number;
     slippageBps: number;
     withdrawAll: boolean;
@@ -64,41 +54,28 @@ export interface WithdrawLeverageResponse {
     userRequestId: string;
     unsignedBase64Tx: string;
 }
-export interface GetGroupsResponse {
-    groups: GroupAndBanks[];
-}
 export interface GetGroupResponse {
-    group: GroupAndBanks;
-}
-export interface GroupAndBanks {
-    group: web3.PublicKey;
-    groupName: string;
     banks: Bank[];
 }
 export interface GetUserRequest {
-    groups: web3.PublicKey[];
-    user: web3.PublicKey;
-    getClendAccountSummary: boolean;
+    user?: web3.PublicKey;
+    getClendAccountSummary?: boolean;
 }
 export interface GetUserResponse {
     wallet: UserWallet;
-    clendAccounts: {
-        clendAccount: ClendAccount;
-        summary: ClendAccountTxSummary[];
-    }[];
+    clendAccount: ClendAccount | undefined;
+    summary: ClendAccountTxSummary[];
 }
 export interface UserWallet {
-    balances: UserBalance[];
-}
-export interface UserBalance {
-    mint: web3.PublicKey;
-    balance: BN;
-    balanceUi: number;
+    usdcBalance: BN;
+    usdcBalanceUi: number;
+    jlpBalance: BN;
+    jlpBalanceUi: number;
+    solBalance: BN;
+    solBalanceUi: number;
 }
 export interface ClendAccount {
-    key: web3.PublicKey;
-    group: web3.PublicKey;
-    balances: ClendAccountBalance[];
+    balances: Balance[];
     netValue: number;
     netApy: number;
     pnl: number;
@@ -108,28 +85,21 @@ export interface ClendAccount {
     healthFactorRiskAdjusted: number;
     notionalLeverage: number;
     riskAdjustedLeverage: number;
+    liquidationPrice: number;
+    liquidationPriceChangePercentage: number;
     notionalLtv: number;
     riskAdjustedLtv: number;
 }
-export interface ClendAccountBalance {
+export interface Balance {
     mint: web3.PublicKey;
     bank: web3.PublicKey;
     assetBalance: BN;
     assetBalanceUi: number;
     assetValue: number;
-    assetYieldBps: number;
-    assetYieldApy: number;
     liabilityBalance: BN;
     liabilityBalanceUi: number;
     liabilityValue: number;
-    liabilityBorrowCostBps: number;
-    liabilityBorrowCostApy: number;
-    price: number;
-    liquidation: ClendAccountAssetLiquidation | null;
-}
-export interface ClendAccountAssetLiquidation {
     price: number;
-    changePercentage: number;
 }
 export interface GetBankResponse {
     bank: Bank;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carrot-protocol/boost-http-client",
-  "version": "0.2.15-swapper1-dev-cda79a9",
+  "version": "0.2.16-group-refactor1-dev-50c976e",
   "description": "HTTP client for Carrot Boost",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.29.0",
-    "@carrot-protocol/clend-common": "0.1.8-group-refactor1-dev-cb4b228",
+    "@carrot-protocol/clend-common": "0.1.7",
     "axios": "^1.8.3",
     "bs58": "^6.0.0",
     "decimal.js": "^10.5.0"

package/src/index.ts

@@ -12,17 +12,13 @@ import {
   WithdrawLeverageResponse,
   UserWallet,
   ClendAccount,
-  ClendAccountBalance,
+  Balance,
   Bank,
   GetGroupResponse,
   ClendAccountEvent,
   GetUserRequest,
   ClendAccountTxSummary,
   UserRequest,
-  UserBalance,
-  ClendAccountAssetLiquidation,
-  GetGroupsResponse,
-  GroupAndBanks,
 } from "./types";
 import encode from "bs58";
 
@@ -107,200 +103,147 @@ export class Client {
    * @param user wallet public key
    * @returns User details
    */
-  async getUser(
-    groups: web3.PublicKey[],
-    user: web3.PublicKey,
-    getClendAccountSummary: boolean,
-  ): Promise<GetUserResponse> {
+  async getUser(request: GetUserRequest): Promise<GetUserResponse> {
+    // use loaded wallet if not provided
+    let user = request.user;
+    if (!user) {
+      user = this.address();
+    }
+
     const body = await handleApiCall(() =>
       this.http.get(
-        `/user?user=${user.toString()}&groups=${groups.map((g) => g.toString()).join(",")}&getClendAccountSummary=${getClendAccountSummary}`,
+        `/user?user=${user.toString()}&getClendAccountSummary=${request.getClendAccountSummary}`,
       ),
     );
 
     const jsonRawResponse: any = JSON.parse(body);
-    console.log(JSON.stringify(jsonRawResponse, null, 2));
 
-    // parse balances
-    const walletBalances: UserBalance[] = [];
-    for (const b of jsonRawResponse.wallet.balances) {
-      walletBalances.push({
+    // get tokens still in user wallet
+    const wallet: UserWallet = {
+      usdcBalance: new BN(jsonRawResponse.wallet.usdcBalance, "hex"),
+      usdcBalanceUi: Number(jsonRawResponse.wallet.usdcBalanceUi),
+      jlpBalance: new BN(jsonRawResponse.wallet.jlpBalance, "hex"),
+      jlpBalanceUi: Number(jsonRawResponse.wallet.jlpBalanceUi),
+      solBalance: new BN(jsonRawResponse.wallet.solBalance, "hex"),
+      solBalanceUi: Number(jsonRawResponse.wallet.solBalanceUi),
+    };
+
+    // if no clend account, return undefined for clend
+    if (!jsonRawResponse.clendAccount) {
+      return {
+        wallet,
+        clendAccount: undefined,
+        summary: [],
+      };
+    }
+
+    // parse lending account balances
+    const balances: Balance[] = [];
+    for (const b of jsonRawResponse.clendAccount.balances) {
+      balances.push({
         mint: new web3.PublicKey(b.mint),
-        balance: new BN(b.balance, "hex"),
-        balanceUi: Number(b.balanceUi),
+        bank: new web3.PublicKey(b.bank),
+        assetBalance: new BN(b.assetBalance, "hex"),
+        assetBalanceUi: Number(b.assetBalanceUi),
+        assetValue: Number(b.assetValue),
+        liabilityBalance: new BN(b.liabilityBalance, "hex"),
+        liabilityBalanceUi: Number(b.liabilityBalanceUi),
+        liabilityValue: Number(b.liabilityValue),
+        price: Number(b.price),
       });
     }
 
-    // get tokens still in user wallet
-    const wallet: UserWallet = {
-      balances: walletBalances,
+    // create clend account
+    const clendAccount: ClendAccount = {
+      balances,
+      netValue: Number(jsonRawResponse.clendAccount.netValue),
+      netApy: Number(jsonRawResponse.clendAccount.netApy),
+      pnl: Number(jsonRawResponse.clendAccount.pnl),
+      totalAssetValue: Number(jsonRawResponse.clendAccount.totalAssetValue),
+      totalLiabilityValue: Number(
+        jsonRawResponse.clendAccount.totalLiabilityValue,
+      ),
+      healthFactorNotional: Number(
+        jsonRawResponse.clendAccount.healthFactorNotional,
+      ),
+      healthFactorRiskAdjusted: Number(
+        jsonRawResponse.clendAccount.healthFactorRiskAdjusted,
+      ),
+      notionalLeverage: Number(jsonRawResponse.clendAccount.notionalLeverage),
+      riskAdjustedLeverage: Number(
+        jsonRawResponse.clendAccount.riskAdjustedLeverage,
+      ),
+      liquidationPrice: Number(jsonRawResponse.clendAccount.liquidationPrice),
+      liquidationPriceChangePercentage: Number(
+        jsonRawResponse.clendAccount.liquidationPriceChangePercentage,
+      ),
+      notionalLtv: Number(jsonRawResponse.clendAccount.notionalLtv),
+      riskAdjustedLtv: Number(jsonRawResponse.clendAccount.riskAdjustedLtv),
     };
 
-    // get tx summary for each account and group them
-    const summaryByAccount = new Map<string, ClendAccountTxSummary[]>();
-    if (getClendAccountSummary && jsonRawResponse.summary) {
-      for (const s of jsonRawResponse.summary) {
-        const accountAddress = new web3.PublicKey(s.clendAccount).toBase58();
-        if (!summaryByAccount.has(accountAddress)) {
-          summaryByAccount.set(accountAddress, []);
-        }
+    // get tx summary for each account
+    const summary: ClendAccountTxSummary[] = [];
+    for (const s of jsonRawResponse.summary) {
+      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: undefined,
+        events: [],
+      };
 
-        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: undefined,
-          events: [],
+      // parse inputs if they exist
+      if (s.input) {
+        const input: UserRequest = {
+          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
+            ? Boolean(s.input.openPosition)
+            : null,
+          closePosition: s.input.closePosition
+            ? Boolean(s.input.closePosition)
+            : null,
         };
+        txSummary.input = input;
+      }
 
-        // parse inputs if they exist
-        if (s.input) {
-          const input: UserRequest = {
-            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
-              ? Boolean(s.input.openPosition)
-              : null,
-            closePosition: s.input.closePosition
-              ? Boolean(s.input.closePosition)
-              : null,
-          };
-          txSummary.input = input;
-        }
-
-        // get events for each summary
-        for (const event of s.events) {
-          let closeBalance: boolean | null = null;
-          if (event.closeBalance !== null) {
-            closeBalance = Boolean(event.closeBalance);
-          }
-
-          // parse amount
-          const clendAccountEvent: ClendAccountEvent = {
-            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,
-          };
-          txSummary.events.push(clendAccountEvent);
+      // get events for each summary
+      for (const event of s.events) {
+        let closeBalance: boolean | null = null;
+        if (event.closeBalance !== null) {
+          closeBalance = Boolean(event.closeBalance);
         }
 
-        summaryByAccount.get(accountAddress)!.push(txSummary);
+        // parse amount
+        const clendAccountEvent: ClendAccountEvent = {
+          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,
+        };
+        txSummary.events.push(clendAccountEvent);
       }
-    }
-
-    // if no clend accounts, return empty array
-    const clendAccounts: {
-      clendAccount: ClendAccount;
-      summary: ClendAccountTxSummary[];
-    }[] = [];
-    for (const accountAndSumary of jsonRawResponse.clendAccounts) {
-      const clendAccountBalances: ClendAccountBalance[] = [];
-      const ca = accountAndSumary.clendAccount;
-      for (const b of ca.balances) {
-        // parse liquidation data if exists
-        const liquidation: ClendAccountAssetLiquidation | null = b.liquidation
-          ? {
-              price: Number(b.liquidation.price),
-              changePercentage: Number(b.liquidation.changePercentage),
-            }
-          : null;
-
-        // create clend account balance
-        clendAccountBalances.push({
-          mint: new web3.PublicKey(b.mint),
-          bank: new web3.PublicKey(b.bank),
-          assetBalance: new BN(b.assetBalance, "hex"),
-          assetBalanceUi: Number(b.assetBalanceUi),
-          assetValue: Number(b.assetValue),
-          assetYieldBps: Number(b.assetYieldBps),
-          assetYieldApy: Number(b.assetYieldApy),
-          liabilityBalance: new BN(b.liabilityBalance, "hex"),
-          liabilityBalanceUi: Number(b.liabilityBalanceUi),
-          liabilityValue: Number(b.liabilityValue),
-          liabilityBorrowCostBps: Number(b.liabilityBorrowCostBps),
-          liabilityBorrowCostApy: Number(b.liabilityBorrowCostApy),
-          price: Number(b.price),
-          liquidation,
-        });
-      }
-
-      // create clend account
-      const clendAccountAddress = new web3.PublicKey(
-        accountAndSumary.clendAccount.key,
-      );
-      const clendAccount: ClendAccount = {
-        key: clendAccountAddress,
-        group: new web3.PublicKey(ca.group),
-        balances: clendAccountBalances,
-        netValue: Number(ca.netValue),
-        netApy: Number(ca.netApy),
-        pnl: Number(ca.pnl),
-        totalAssetValue: Number(ca.totalAssetValue),
-        totalLiabilityValue: Number(ca.totalLiabilityValue),
-        healthFactorNotional: Number(ca.healthFactorNotional),
-        healthFactorRiskAdjusted: Number(ca.healthFactorRiskAdjusted),
-        notionalLeverage: Number(ca.notionalLeverage),
-        riskAdjustedLeverage: Number(ca.riskAdjustedLeverage),
-        notionalLtv: Number(ca.notionalLtv),
-        riskAdjustedLtv: Number(ca.riskAdjustedLtv),
-      };
-
-      // find corresponding tx summary for account
-      const summary =
-        summaryByAccount.get(clendAccountAddress.toString()) || [];
-      clendAccounts.push({ clendAccount, summary });
+      summary.push(txSummary);
     }
 
     return {
       wallet,
-      clendAccounts,
-    };
-  }
-
-  /**
-   * Get all groups
-   * @param includeBankData Whether to include bank data in the response, if not strictly necessary keep false
-   * @returns All groups
-   */
-  async getGroups(includeBankData: boolean): Promise<GetGroupsResponse> {
-    const body = await handleApiCall(() =>
-      this.http.get(`/groups?includeBankData=${includeBankData}`),
-    );
-
-    const marketJson: any = JSON.parse(body);
-    const groups: GroupAndBanks[] = [];
-    for (const groupJson of marketJson.groups) {
-      const group: web3.PublicKey = new web3.PublicKey(groupJson.group);
-      const groupName = groupJson.groupName;
-      const banks: Bank[] = [];
-      for (const bankJson of groupJson.banks) {
-        const bank = parseBank(bankJson);
-        banks.push(bank);
-      }
-      groups.push({ group, groupName, banks });
-    }
-
-    const response: GetGroupsResponse = {
-      groups,
+      clendAccount,
+      summary,
     };
-
-    return response;
   }
 
   /**
@@ -314,18 +257,14 @@ export class Client {
     );
 
     const marketJson: any = JSON.parse(body);
-    const group: GroupAndBanks = {
-      group: new web3.PublicKey(marketJson.group.group),
-      groupName: marketJson.group.groupName,
-      banks: [],
-    };
-    for (const bankJson of marketJson.group.banks) {
+    const banks: Bank[] = [];
+    for (const bankJson of marketJson.banks) {
       const bank = parseBank(bankJson);
-      group.banks.push(bank);
+      banks.push(bank);
     }
 
     const response: GetGroupResponse = {
-      group,
+      banks,
     };
 
     return response;
@@ -357,19 +296,14 @@ export class Client {
    * @returns Deposit leverage operation result
    */
   async depositLeverage(
-    clendGroup: web3.PublicKey,
-    clendAccount: web3.PublicKey | null,
-    inputTokenMint: web3.PublicKey,
-    assetTokenMint: web3.PublicKey,
-    liabilityTokenMint: web3.PublicKey,
+    inputMint: web3.PublicKey,
+    assetMint: web3.PublicKey,
+    liabilityMint: web3.PublicKey,
     uiAmount: number,
     leverage: number,
     slippageBps: number,
   ): Promise<string> {
-    if (
-      !inputTokenMint.equals(assetTokenMint) &&
-      !inputTokenMint.equals(liabilityTokenMint)
-    ) {
+    if (!inputMint.equals(assetMint) || !inputMint.equals(liabilityMint)) {
       throw new Error(
         "Input mint must be the same as the asset or liability mint",
       );
@@ -377,11 +311,9 @@ export class Client {
 
     const req: DepositLeverageRequest = {
       owner: this.address(),
-      clendGroup,
-      clendAccount,
-      inputTokenMint,
-      assetTokenMint,
-      liabilityTokenMint,
+      inputMint,
+      assetMint,
+      liabilityMint,
       depositAmountUi: uiAmount,
       leverage,
       slippageBps,
@@ -405,20 +337,9 @@ export class Client {
    * @param request Adjust leverage request parameters
    * @returns Adjust leverage operation result
    */
-  async adjustLeverage(
-    clendGroup: web3.PublicKey,
-    clendAccount: web3.PublicKey,
-    assetTokenMint: web3.PublicKey,
-    liabilityTokenMint: web3.PublicKey,
-    leverage: number,
-    slippageBps: number,
-  ): Promise<any> {
+  async adjustLeverage(leverage: number, slippageBps: number): Promise<any> {
     const req: AdjustLeverageRequest = {
       owner: this.address(),
-      clendGroup,
-      clendAccount,
-      assetTokenMint,
-      liabilityTokenMint,
       leverage,
       slippageBps,
     };
@@ -442,22 +363,14 @@ export class Client {
    * @returns Withdraw leverage operation result
    */
   async withdrawLeverage(
-    clendGroup: web3.PublicKey,
-    clendAccount: web3.PublicKey,
-    outputTokenMint: web3.PublicKey,
-    assetTokenMint: web3.PublicKey,
-    liabilityTokenMint: web3.PublicKey,
+    selectedTokenMint: web3.PublicKey,
     uiAmount: number,
     slippageBps: number,
     withdrawAll: boolean,
   ): Promise<any> {
     const req: WithdrawLeverageRequest = {
       owner: this.address(),
-      clendGroup,
-      clendAccount,
-      outputTokenMint,
-      assetTokenMint,
-      liabilityTokenMint,
+      selectedTokenMint,
       withdrawAmountUi: uiAmount,
       slippageBps,
       withdrawAll,

package/src/types.ts

@@ -11,11 +11,9 @@ export interface SendRequest {
  */
 export interface DepositLeverageRequest {
   owner: web3.PublicKey;
-  clendGroup: web3.PublicKey;
-  clendAccount: web3.PublicKey | null;
-  inputTokenMint: web3.PublicKey;
-  assetTokenMint: web3.PublicKey;
-  liabilityTokenMint: web3.PublicKey;
+  inputMint: web3.PublicKey;
+  assetMint: web3.PublicKey;
+  liabilityMint: web3.PublicKey;
   depositAmountUi: number;
   leverage: number;
   slippageBps: number;
@@ -34,10 +32,6 @@ export interface DepositLeverageResponse {
  */
 export interface AdjustLeverageRequest {
   owner: web3.PublicKey;
-  clendGroup: web3.PublicKey;
-  clendAccount: web3.PublicKey;
-  assetTokenMint: web3.PublicKey;
-  liabilityTokenMint: web3.PublicKey;
   leverage: number;
   slippageBps: number;
 }
@@ -55,11 +49,7 @@ export interface AdjustLeverageResponse {
  */
 export interface WithdrawLeverageRequest {
   owner: web3.PublicKey;
-  clendGroup: web3.PublicKey;
-  clendAccount: web3.PublicKey;
-  outputTokenMint: web3.PublicKey;
-  assetTokenMint: web3.PublicKey;
-  liabilityTokenMint: web3.PublicKey;
+  selectedTokenMint: web3.PublicKey;
   withdrawAmountUi: number;
   slippageBps: number;
   withdrawAll: boolean;
@@ -73,48 +63,32 @@ export interface WithdrawLeverageResponse {
   unsignedBase64Tx: string;
 }
 
-export interface GetGroupsResponse {
-  groups: GroupAndBanks[];
-}
-
 export interface GetGroupResponse {
-  group: GroupAndBanks;
-}
-
-export interface GroupAndBanks {
-  group: web3.PublicKey;
-  groupName: string;
   banks: Bank[];
 }
 
 export interface GetUserRequest {
-  groups: web3.PublicKey[];
-  user: web3.PublicKey;
-  getClendAccountSummary: boolean;
+  user?: web3.PublicKey;
+  getClendAccountSummary?: boolean;
 }
 
 export interface GetUserResponse {
   wallet: UserWallet;
-  clendAccounts: {
-    clendAccount: ClendAccount;
-    summary: ClendAccountTxSummary[];
-  }[];
+  clendAccount: ClendAccount | undefined;
+  summary: ClendAccountTxSummary[];
 }
 
 export interface UserWallet {
-  balances: UserBalance[];
-}
-
-export interface UserBalance {
-  mint: web3.PublicKey;
-  balance: BN;
-  balanceUi: number;
+  usdcBalance: BN;
+  usdcBalanceUi: number;
+  jlpBalance: BN;
+  jlpBalanceUi: number;
+  solBalance: BN;
+  solBalanceUi: number;
 }
 
 export interface ClendAccount {
-  key: web3.PublicKey;
-  group: web3.PublicKey;
-  balances: ClendAccountBalance[];
+  balances: Balance[];
   netValue: number;
   netApy: number;
   pnl: number;
@@ -124,30 +98,22 @@ export interface ClendAccount {
   healthFactorRiskAdjusted: number;
   notionalLeverage: number;
   riskAdjustedLeverage: number;
+  liquidationPrice: number;
+  liquidationPriceChangePercentage: number;
   notionalLtv: number;
   riskAdjustedLtv: number;
 }
 
-export interface ClendAccountBalance {
+export interface Balance {
   mint: web3.PublicKey;
   bank: web3.PublicKey;
   assetBalance: BN;
   assetBalanceUi: number;
   assetValue: number;
-  assetYieldBps: number;
-  assetYieldApy: number;
   liabilityBalance: BN;
   liabilityBalanceUi: number;
   liabilityValue: number;
-  liabilityBorrowCostBps: number;
-  liabilityBorrowCostApy: number;
-  price: number;
-  liquidation: ClendAccountAssetLiquidation | null;
-}
-
-export interface ClendAccountAssetLiquidation {
   price: number;
-  changePercentage: number;
 }
 
 export interface GetBankResponse {