@carrot-protocol/boost-http-client 0.2.15-group-refactor1-dev-e792f4d → 0.2.15-group-refactor1-dev-ef145c2

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { AnchorProvider, web3 } from "@coral-xyz/anchor";
-import { GetBankResponse, GetUserResponse, GetGroupResponse, GetUserRequest } from "./types";
+import { GetBankResponse, GetUserResponse, GetGroupResponse } from "./types";
 export * from "./types";
 export * from "./utils";
 export * as Common from "@carrot-protocol/clend-common";
@@ -27,7 +27,7 @@ export declare class Client {
      * @param user wallet public key
      * @returns User details
      */
-    getUser(request: GetUserRequest): Promise<GetUserResponse>;
+    getUser(group: web3.PublicKey, user: web3.PublicKey, getClendAccountSummary: boolean): Promise<GetUserResponse>;
     /**
      * Get market details
      * @param groupAddress group public key

package/dist/index.js

@@ -104,121 +104,127 @@ class Client {
      * @param user wallet public key
      * @returns User details
      */
-    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}`));
+    async getUser(group, user, getClendAccountSummary) {
+        const body = await handleApiCall(() => this.http.get(`/user?user=${user.toString()}&group=${group.toString()}&getClendAccountSummary=${getClendAccountSummary}`));
         const jsonRawResponse = JSON.parse(body);
-        // 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({
+        // parse balances
+        const walletBalances = [];
+        for (const b of jsonRawResponse.wallet.balances) {
+            walletBalances.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),
-                liabilityBalance: new anchor_1.BN(b.liabilityBalance, "hex"),
-                liabilityBalanceUi: Number(b.liabilityBalanceUi),
-                liabilityValue: Number(b.liabilityValue),
-                price: Number(b.price),
+                balance: new anchor_1.BN(b.balance, "hex"),
+                balanceUi: Number(b.balanceUi),
             });
         }
-        // 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 tokens still in user wallet
+        const wallet = {
+            balances: walletBalances,
         };
-        // 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,
+        // 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: [],
                 };
-                txSummary.input = input;
+                // 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);
             }
-            // get events for each summary
-            for (const event of s.events) {
-                let closeBalance = null;
-                if (event.closeBalance !== null) {
-                    closeBalance = Boolean(event.closeBalance);
+        }
+        // if no clend account, return undefined for clend
+        const clendAccounts = [];
+        if (jsonRawResponse.clendAccounts) {
+            for (const [address, ca] of Object.entries(jsonRawResponse.clendAccounts)) {
+                // parse lending account balances
+                const clendAccountBalances = [];
+                for (const b of ca.balances) {
+                    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),
+                        liabilityBalance: new anchor_1.BN(b.liabilityBalance, "hex"),
+                        liabilityBalanceUi: Number(b.liabilityBalanceUi),
+                        liabilityValue: Number(b.liabilityValue),
+                        price: Number(b.price),
+                    });
                 }
-                // 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,
+                // create clend account
+                const clendAccount = {
+                    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),
+                    liquidationPrice: Number(ca.liquidationPrice),
+                    liquidationPriceChangePercentage: Number(ca.liquidationPriceChangePercentage),
+                    notionalLtv: Number(ca.notionalLtv),
+                    riskAdjustedLtv: Number(ca.riskAdjustedLtv),
                 };
-                txSummary.events.push(clendAccountEvent);
+                const summary = summaryByAccount.get(address) || [];
+                clendAccounts.push({ clendAccount, summary });
             }
-            summary.push(txSummary);
         }
         return {
             wallet,
-            clendAccount,
-            summary,
+            clendAccounts,
         };
     }
     /**

package/dist/types.d.ts

@@ -65,24 +65,27 @@ export interface GetGroupResponse {
     banks: Bank[];
 }
 export interface GetUserRequest {
-    user?: web3.PublicKey;
-    getClendAccountSummary?: boolean;
+    group: web3.PublicKey;
+    user: web3.PublicKey;
+    getClendAccountSummary: boolean;
 }
 export interface GetUserResponse {
     wallet: UserWallet;
-    clendAccount: ClendAccount | undefined;
-    summary: ClendAccountTxSummary[];
+    clendAccounts: {
+        clendAccount: ClendAccount;
+        summary: ClendAccountTxSummary[];
+    }[];
 }
 export interface UserWallet {
-    usdcBalance: BN;
-    usdcBalanceUi: number;
-    jlpBalance: BN;
-    jlpBalanceUi: number;
-    solBalance: BN;
-    solBalanceUi: number;
+    balances: UserBalance[];
+}
+export interface UserBalance {
+    mint: web3.PublicKey;
+    balance: BN;
+    balanceUi: number;
 }
 export interface ClendAccount {
-    balances: Balance[];
+    balances: ClendAccountBalance[];
     netValue: number;
     netApy: number;
     pnl: number;
@@ -97,7 +100,7 @@ export interface ClendAccount {
     notionalLtv: number;
     riskAdjustedLtv: number;
 }
-export interface Balance {
+export interface ClendAccountBalance {
     mint: web3.PublicKey;
     bank: web3.PublicKey;
     assetBalance: BN;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carrot-protocol/boost-http-client",
-  "version": "0.2.15-group-refactor1-dev-e792f4d",
+  "version": "0.2.15-group-refactor1-dev-ef145c2",
   "description": "HTTP client for Carrot Boost",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -12,13 +12,14 @@ import {
   WithdrawLeverageResponse,
   UserWallet,
   ClendAccount,
-  Balance,
+  ClendAccountBalance,
   Bank,
   GetGroupResponse,
   ClendAccountEvent,
   GetUserRequest,
   ClendAccountTxSummary,
   UserRequest,
+  UserBalance,
 } from "./types";
 import encode from "bs58";
 
@@ -103,146 +104,157 @@ export class Client {
    * @param user wallet public key
    * @returns User details
    */
-  async getUser(request: GetUserRequest): Promise<GetUserResponse> {
-    // use loaded wallet if not provided
-    let user = request.user;
-    if (!user) {
-      user = this.address();
-    }
-
+  async getUser(
+    group: web3.PublicKey,
+    user: web3.PublicKey,
+    getClendAccountSummary: boolean,
+  ): Promise<GetUserResponse> {
     const body = await handleApiCall(() =>
       this.http.get(
-        `/user?user=${user.toString()}&getClendAccountSummary=${request.getClendAccountSummary}`,
+        `/user?user=${user.toString()}&group=${group.toString()}&getClendAccountSummary=${getClendAccountSummary}`,
       ),
     );
 
     const jsonRawResponse: any = JSON.parse(body);
 
-    // 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({
+    // parse balances
+    const walletBalances: UserBalance[] = [];
+    for (const b of jsonRawResponse.wallet.balances) {
+      walletBalances.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),
-        liabilityBalance: new BN(b.liabilityBalance, "hex"),
-        liabilityBalanceUi: Number(b.liabilityBalanceUi),
-        liabilityValue: Number(b.liabilityValue),
-        price: Number(b.price),
+        balance: new BN(b.balance, "hex"),
+        balanceUi: Number(b.balanceUi),
       });
     }
 
-    // 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 tokens still in user wallet
+    const wallet: UserWallet = {
+      balances: walletBalances,
     };
 
-    // 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: [],
-      };
-
-      // 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,
+    // 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, []);
+        }
+
+        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: [],
         };
-        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);
+        }
+
+        summaryByAccount.get(accountAddress)!.push(txSummary);
       }
+    }
 
-      // get events for each summary
-      for (const event of s.events) {
-        let closeBalance: boolean | null = null;
-        if (event.closeBalance !== null) {
-          closeBalance = Boolean(event.closeBalance);
+    // if no clend account, return undefined for clend
+    const clendAccounts: {
+      clendAccount: ClendAccount;
+      summary: ClendAccountTxSummary[];
+    }[] = [];
+    if (jsonRawResponse.clendAccounts) {
+      for (const [address, ca] of Object.entries(
+        jsonRawResponse.clendAccounts,
+      )) {
+        // parse lending account balances
+        const clendAccountBalances: ClendAccountBalance[] = [];
+        for (const b of (ca as any).balances) {
+          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),
+            liabilityBalance: new BN(b.liabilityBalance, "hex"),
+            liabilityBalanceUi: Number(b.liabilityBalanceUi),
+            liabilityValue: Number(b.liabilityValue),
+            price: Number(b.price),
+          });
         }
 
-        // 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,
+        // create clend account
+        const clendAccount: ClendAccount = {
+          balances: clendAccountBalances,
+          netValue: Number((ca as any).netValue),
+          netApy: Number((ca as any).netApy),
+          pnl: Number((ca as any).pnl),
+          totalAssetValue: Number((ca as any).totalAssetValue),
+          totalLiabilityValue: Number((ca as any).totalLiabilityValue),
+          healthFactorNotional: Number((ca as any).healthFactorNotional),
+          healthFactorRiskAdjusted: Number(
+            (ca as any).healthFactorRiskAdjusted,
+          ),
+          notionalLeverage: Number((ca as any).notionalLeverage),
+          riskAdjustedLeverage: Number((ca as any).riskAdjustedLeverage),
+          liquidationPrice: Number((ca as any).liquidationPrice),
+          liquidationPriceChangePercentage: Number(
+            (ca as any).liquidationPriceChangePercentage,
+          ),
+          notionalLtv: Number((ca as any).notionalLtv),
+          riskAdjustedLtv: Number((ca as any).riskAdjustedLtv),
         };
-        txSummary.events.push(clendAccountEvent);
+
+        const summary = summaryByAccount.get(address) || [];
+        clendAccounts.push({ clendAccount, summary });
       }
-      summary.push(txSummary);
     }
 
     return {
       wallet,
-      clendAccount,
-      summary,
+      clendAccounts,
     };
   }
 

package/src/types.ts

@@ -75,27 +75,31 @@ export interface GetGroupResponse {
 }
 
 export interface GetUserRequest {
-  user?: web3.PublicKey;
-  getClendAccountSummary?: boolean;
+  group: web3.PublicKey;
+  user: web3.PublicKey;
+  getClendAccountSummary: boolean;
 }
 
 export interface GetUserResponse {
   wallet: UserWallet;
-  clendAccount: ClendAccount | undefined;
-  summary: ClendAccountTxSummary[];
+  clendAccounts: {
+    clendAccount: ClendAccount;
+    summary: ClendAccountTxSummary[];
+  }[];
 }
 
 export interface UserWallet {
-  usdcBalance: BN;
-  usdcBalanceUi: number;
-  jlpBalance: BN;
-  jlpBalanceUi: number;
-  solBalance: BN;
-  solBalanceUi: number;
+  balances: UserBalance[];
+}
+
+export interface UserBalance {
+  mint: web3.PublicKey;
+  balance: BN;
+  balanceUi: number;
 }
 
 export interface ClendAccount {
-  balances: Balance[];
+  balances: ClendAccountBalance[];
   netValue: number;
   netApy: number;
   pnl: number;
@@ -111,7 +115,7 @@ export interface ClendAccount {
   riskAdjustedLtv: number;
 }
 
-export interface Balance {
+export interface ClendAccountBalance {
   mint: web3.PublicKey;
   bank: web3.PublicKey;
   assetBalance: BN;