@carrot-protocol/boost-http-client 0.2.15-group-refactor1-dev-94d77e6 → 0.2.15-group-refactor1-dev-54bdd58

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, GetGroupResponse, GetGroupsResponse } from "./types";
 export * from "./types";
 export * from "./utils";
 export * as Common from "@carrot-protocol/clend-common";
@@ -22,12 +22,7 @@ export declare class Client {
      * @returns Index details
      */
     index(): Promise<any>;
-    /**
-     * Get user details for a wallet
-     * @param user wallet public key
-     * @returns User details
-     */
-    getUser(groups: web3.PublicKey[], user: web3.PublicKey, getClendAccountSummary: boolean): Promise<GetUserResponse>;
+    getUser(user: web3.PublicKey, groups: web3.PublicKey[], getClendAccountSummary: boolean): Promise<any>;
     /**
      * Get all groups
      * @param includeBankData Whether to include bank data in the response, if not strictly necessary keep false

package/dist/index.js

@@ -99,104 +99,35 @@ class Client {
     async index() {
         return handleApiCall(() => this.http.get(""));
     }
-    /**
-     * Get user details for a wallet
-     * @param user wallet public key
-     * @returns User details
-     */
-    async getUser(groups, user, getClendAccountSummary) {
+    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}`));
+        // Parse the raw string body into a JSON object.
         const jsonRawResponse = JSON.parse(body);
-        // parse balances
-        const walletBalances = [];
-        for (const b of jsonRawResponse.wallet.balances) {
-            walletBalances.push({
-                mint: new anchor_1.web3.PublicKey(b.mint),
-                balance: new anchor_1.BN(b.balance, "hex"),
-                balanceUi: Number(b.balanceUi),
-            });
-        }
-        // get tokens still in user wallet
+        // 1. Parse Wallet Balances
+        // This section correctly iterates through the wallet balances and creates typed objects.
+        const walletBalances = (jsonRawResponse.wallet.balances || []).map((b) => ({
+            mint: new anchor_1.web3.PublicKey(b.mint),
+            balance: new anchor_1.BN(b.balance, "hex"),
+            balanceUi: Number(b.balanceUi),
+        }));
         const wallet = {
             balances: walletBalances,
         };
-        // 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: [],
-                };
-                // 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);
-            }
-        }
-        // 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
+        // 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;
-                // create clend account balance
-                clendAccountBalances.push({
+                return {
                     mint: new anchor_1.web3.PublicKey(b.mint),
                     bank: new anchor_1.web3.PublicKey(b.bank),
                     assetBalance: new anchor_1.BN(b.assetBalance, "hex"),
@@ -211,30 +142,84 @@ class Client {
                     liabilityBorrowCostApy: Number(b.liabilityBorrowCostApy),
                     price: Number(b.price),
                     liquidation,
-                });
-            }
-            // 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),
+                key: new anchor_1.web3.PublicKey(rawClendAccount.key),
+                group: new anchor_1.web3.PublicKey(rawClendAccount.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),
+                netValue: Number(rawClendAccount.netValue),
+                netApy: Number(rawClendAccount.netApy),
+                pnl: Number(rawClendAccount.pnl),
+                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),
             };
-            // find corresponding tx summary for account
-            const summary = summaryByAccount.get(clendAccountAddress.toString()) || [];
-            clendAccounts.push({ clendAccount, summary });
-        }
+            // 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 };
+        });
+        // 3. Return the final, correctly structured response object.
         return {
             wallet,
             clendAccounts,

package/package.json

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

package/src/index.ts

@@ -102,176 +102,168 @@ export class Client {
     return handleApiCall(() => this.http.get(""));
   }
 
-  /**
-   * Get user details for a wallet
-   * @param user wallet public key
-   * @returns User details
-   */
   async getUser(
-    groups: web3.PublicKey[],
     user: web3.PublicKey,
+    groups: web3.PublicKey[],
     getClendAccountSummary: boolean,
-  ): Promise<GetUserResponse> {
+  ): Promise<any> {
+    // 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}`,
       ),
     );
 
+    // Parse the raw string body into a JSON object.
     const jsonRawResponse: any = JSON.parse(body);
 
-    // parse balances
-    const walletBalances: UserBalance[] = [];
-    for (const b of jsonRawResponse.wallet.balances) {
-      walletBalances.push({
-        mint: new web3.PublicKey(b.mint),
-        balance: new BN(b.balance, "hex"),
-        balanceUi: Number(b.balanceUi),
-      });
-    }
+    // 1. Parse Wallet Balances
+    // This section correctly iterates through the wallet balances and creates typed objects.
+    const walletBalances: UserBalance[] = (
+      jsonRawResponse.wallet.balances || []
+    ).map((b: any) => ({
+      mint: new web3.PublicKey(b.mint),
+      balance: new BN(b.balance, "hex"),
+      balanceUi: Number(b.balanceUi),
+    }));
 
-    // get tokens still in user wallet
     const wallet: UserWallet = {
       balances: walletBalances,
     };
 
-    // 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, []);
-        }
+    // 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: 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;
+
+          return {
+            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,
+          };
+        });
 
-        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 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),
+          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),
         };
 
-        // 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;
-        }
+        // 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,
+              };
+            }
 
-        // 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);
+            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;
+          });
         }
 
-        summaryByAccount.get(accountAddress)!.push(txSummary);
-      }
-    }
-
-    // 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 });
-    }
+        // C. Combine the parsed account and its summary
+        return { clendAccount, summary };
+      },
+    );
 
+    // 3. Return the final, correctly structured response object.
     return {
       wallet,
       clendAccounts,
     };
   }
-
   /**
    * Get all groups
    * @param includeBankData Whether to include bank data in the response, if not strictly necessary keep false