@carrot-protocol/boost-http-client 0.2.15-swapper1-dev-cda79a9 → 0.2.15

package/dist/index.d.ts

@@ -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<GetUserResponse>;
     /**
      * Get all groups
      * @param includeBankData Whether to include bank data in the response, if not strictly necessary keep false
@@ -57,11 +52,16 @@ export declare class Client {
      * @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(clendAccount: web3.PublicKey, assetTokenMint: web3.PublicKey, liabilityTokenMint: web3.PublicKey, leverage: number, slippageBps: number): Promise<string>;
     /**
      * 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(clendAccount: web3.PublicKey, outputTokenMint: web3.PublicKey, assetTokenMint: web3.PublicKey, liabilityTokenMint: web3.PublicKey, uiAmount: number, slippageBps: number, withdrawAll: boolean): Promise<string>;
+    /**
+     * Withdraw emissions from a bank
+     * @returns Withdraw emissions operation result
+     */
+    withdrawEmissions(): Promise<string>;
 }

package/dist/index.js

@@ -99,143 +99,131 @@ 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);
-        console.log(JSON.stringify(jsonRawResponse, null, 2));
-        // 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({
+                const emissionsOutstandingAndUnclaimed = new anchor_1.BN(b.emissionsOutstandingAndUnclaimed, "hex");
+                return {
                     mint: new anchor_1.web3.PublicKey(b.mint),
                     bank: new anchor_1.web3.PublicKey(b.bank),
+                    tokenYieldApy: Number(b.tokenYieldApy),
                     assetBalance: new anchor_1.BN(b.assetBalance, "hex"),
                     assetBalanceUi: Number(b.assetBalanceUi),
                     assetValue: Number(b.assetValue),
-                    assetYieldBps: Number(b.assetYieldBps),
-                    assetYieldApy: Number(b.assetYieldApy),
+                    assetEmissionsApy: Number(b.assetEmissionsApy),
                     liabilityBalance: new anchor_1.BN(b.liabilityBalance, "hex"),
                     liabilityBalanceUi: Number(b.liabilityBalanceUi),
                     liabilityValue: Number(b.liabilityValue),
-                    liabilityBorrowCostBps: Number(b.liabilityBorrowCostBps),
                     liabilityBorrowCostApy: Number(b.liabilityBorrowCostApy),
+                    liabilityEmissionsApy: Number(b.liabilityEmissionsApy),
+                    emissionsOutstandingAndUnclaimed,
+                    emissionsOutstandingAndUnclaimedUi: Number(b.emissionsOutstandingAndUnclaimedUi),
                     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),
+                totalEmissionsApy: Number(rawClendAccount.totalEmissionsApy),
+                totalAssetValue: Number(rawClendAccount.totalAssetValue),
+                totalLiabilityValue: Number(rawClendAccount.totalLiabilityValue),
+                healthFactorNotional: Number(rawClendAccount.healthFactorNotional),
+                healthFactorRiskAdjusted: Number(rawClendAccount.healthFactorRiskAdjusted),
+                notionalLeverage: Number(rawClendAccount.notionalLeverage),
+                riskAdjustedLeverage: Number(rawClendAccount.riskAdjustedLeverage),
+                notionalLtv: Number(rawClendAccount.notionalLtv),
+                riskAdjustedLtv: Number(rawClendAccount.riskAdjustedLtv),
             };
-            // 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,
@@ -332,10 +320,8 @@ class Client {
      * @param request Adjust leverage request parameters
      * @returns Adjust leverage operation result
      */
-    async adjustLeverage(clendGroup, clendAccount, assetTokenMint, liabilityTokenMint, leverage, slippageBps) {
+    async adjustLeverage(clendAccount, assetTokenMint, liabilityTokenMint, leverage, slippageBps) {
         const req = {
-            owner: this.address(),
-            clendGroup,
             clendAccount,
             assetTokenMint,
             liabilityTokenMint,
@@ -352,10 +338,8 @@ 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(clendAccount, outputTokenMint, assetTokenMint, liabilityTokenMint, uiAmount, slippageBps, withdrawAll) {
         const req = {
-            owner: this.address(),
-            clendGroup,
             clendAccount,
             outputTokenMint,
             assetTokenMint,
@@ -369,16 +353,21 @@ class Client {
         const txSig = await this.send(withdrawLeverageResponse.unsignedBase64Tx, withdrawLeverageResponse.userRequestId);
         return txSig;
     }
-}
-exports.Client = Client;
-function handleStatusCode(statusCode) {
-    switch (statusCode) {
-        case 200:
-            break;
-        default:
-            throw new Error(`unexpected status code: ${statusCode}`);
+    /**
+     * Withdraw emissions from a bank
+     * @returns Withdraw emissions operation result
+     */
+    async withdrawEmissions() {
+        const req = {
+            owner: this.address(),
+        };
+        const body = await handleApiCall(() => this.http.post("emissions/withdraw", JSON.stringify(req)));
+        const withdrawEmissionsResponse = JSON.parse(body);
+        const txSig = await this.send(withdrawEmissionsResponse.unsignedBase64Tx, withdrawEmissionsResponse.userRequestId);
+        return txSig;
     }
 }
+exports.Client = Client;
 // Helper function to handle API calls
 async function handleApiCall(call) {
     try {
@@ -403,6 +392,17 @@ function getDummyProvider() {
     });
 }
 function parseBank(bankJson) {
+    let bankEmissions = null;
+    if (bankJson.emissions) {
+        bankEmissions = {
+            emissionsMode: bankJson.emissions.emissionsMode,
+            emissionsApy: Number(bankJson.emissions.emissionsApy),
+            emissionsMint: new anchor_1.web3.PublicKey(bankJson.emissions.emissionsMint),
+            emissionsTokenPrice: Number(bankJson.emissions.emissionsTokenPrice),
+            emissionsRate: new anchor_1.BN(bankJson.emissions.emissionsRate, "hex"),
+            emissionsRemainingUi: Number(bankJson.emissions.emissionsRemainingUi),
+        };
+    }
     return {
         mint: new anchor_1.web3.PublicKey(bankJson.mint),
         key: new anchor_1.web3.PublicKey(bankJson.key),
@@ -416,6 +416,7 @@ function parseBank(bankJson) {
         assetMaintWeight: Number(bankJson.assetMaintWeight),
         totalAssetShares: Number(bankJson.totalAssetShares),
         assetShareValue: Number(bankJson.assetShareValue),
+        tokenYieldApy: Number(bankJson.tokenYieldApy),
         liabilityAmount: new anchor_1.BN(bankJson.liabilityAmount, "hex"),
         liabilityAmountUi: Number(bankJson.liabilityAmountUi),
         liabilityInitWeight: Number(bankJson.liabilityInitWeight),
@@ -427,5 +428,6 @@ function parseBank(bankJson) {
         depositLimitUi: Number(bankJson.depositLimitUi),
         borrowLimit: new anchor_1.BN(bankJson.borrowLimit, "hex"),
         borrowLimitUi: Number(bankJson.borrowLimitUi),
+        emissions: bankEmissions,
     };
 }

package/dist/types.d.ts

@@ -28,8 +28,6 @@ export interface DepositLeverageResponse {
  * Request to adjust the leverage of an existing position
  */
 export interface AdjustLeverageRequest {
-    owner: web3.PublicKey;
-    clendGroup: web3.PublicKey;
     clendAccount: web3.PublicKey;
     assetTokenMint: web3.PublicKey;
     liabilityTokenMint: web3.PublicKey;
@@ -47,8 +45,6 @@ export interface AdjustLeverageResponse {
  * Request to withdraw from a leveraged position
  */
 export interface WithdrawLeverageRequest {
-    owner: web3.PublicKey;
-    clendGroup: web3.PublicKey;
     clendAccount: web3.PublicKey;
     outputTokenMint: web3.PublicKey;
     assetTokenMint: web3.PublicKey;
@@ -64,6 +60,19 @@ export interface WithdrawLeverageResponse {
     userRequestId: string;
     unsignedBase64Tx: string;
 }
+/**
+ * Request to withdraw emissions from a bank
+ */
+export interface WithdrawEmissionsRequest {
+    owner: web3.PublicKey;
+}
+/**
+ * Response for withdraw emissions operation
+ */
+export interface WithdrawEmissionsResponse {
+    userRequestId: string;
+    unsignedBase64Tx: string;
+}
 export interface GetGroupsResponse {
     groups: GroupAndBanks[];
 }
@@ -102,6 +111,7 @@ export interface ClendAccount {
     netValue: number;
     netApy: number;
     pnl: number;
+    totalEmissionsApy: number;
     totalAssetValue: number;
     totalLiabilityValue: number;
     healthFactorNotional: number;
@@ -114,16 +124,18 @@ export interface ClendAccount {
 export interface ClendAccountBalance {
     mint: web3.PublicKey;
     bank: web3.PublicKey;
+    tokenYieldApy: number;
     assetBalance: BN;
     assetBalanceUi: number;
     assetValue: number;
-    assetYieldBps: number;
-    assetYieldApy: number;
+    assetEmissionsApy: number;
     liabilityBalance: BN;
     liabilityBalanceUi: number;
     liabilityValue: number;
-    liabilityBorrowCostBps: number;
     liabilityBorrowCostApy: number;
+    liabilityEmissionsApy: number;
+    emissionsOutstandingAndUnclaimed: BN;
+    emissionsOutstandingAndUnclaimedUi: number;
     price: number;
     liquidation: ClendAccountAssetLiquidation | null;
 }
@@ -138,6 +150,7 @@ export interface Bank {
     group: web3.PublicKey;
     key: web3.PublicKey;
     mint: web3.PublicKey;
+    tokenYieldApy: number;
     supplyApy: number;
     borrowApy: number;
     utilizationRate: number;
@@ -158,7 +171,17 @@ export interface Bank {
     depositLimitUi: number;
     borrowLimit: BN;
     borrowLimitUi: number;
+    emissions: BankEmissions | null;
+}
+export interface BankEmissions {
+    emissionsMode: BankEmissionsMode;
+    emissionsApy: number;
+    emissionsMint: web3.PublicKey;
+    emissionsTokenPrice: number;
+    emissionsRate: BN;
+    emissionsRemainingUi: number;
 }
+export type BankEmissionsMode = "LENDING_ONLY" | "BORROW_ONLY" | "LENDING_AND_BORROWING";
 export interface ClendAccountTxSummary {
     txSig: string;
     time: Date;

package/dist/utils.d.ts

@@ -1,5 +1,3 @@
 import { web3 } from "@coral-xyz/anchor";
 import { ClendAccount } from "./types";
 export declare function netValueInToken(clendAccount: ClendAccount, tokenMint: web3.PublicKey): number;
-export declare function getProductionGroups(): web3.PublicKey[];
-export declare function getStagingGroups(): web3.PublicKey[];

package/dist/utils.js

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.netValueInToken = netValueInToken;
-exports.getProductionGroups = getProductionGroups;
-exports.getStagingGroups = getStagingGroups;
-const anchor_1 = require("@coral-xyz/anchor");
 // returns the net value of the clend account in a given tokens price
 function netValueInToken(clendAccount, tokenMint) {
     const clendAccountTokenBalance = clendAccount.balances.find((balance) => balance.mint.equals(tokenMint));
@@ -12,9 +9,3 @@ function netValueInToken(clendAccount, tokenMint) {
     }
     return clendAccount.netValue / clendAccountTokenBalance.price;
 }
-function getProductionGroups() {
-    return [new anchor_1.web3.PublicKey("9bCWxAXFdWQ9GcZTSU3G636T6EyGXYMgaWR74yc7QZz8")];
-}
-function getStagingGroups() {
-    return [new anchor_1.web3.PublicKey("HKMDWLBK7yUmorSx9argg2rYcro6KoWf41N57FccKRP5")];
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carrot-protocol/boost-http-client",
-  "version": "0.2.15-swapper1-dev-cda79a9",
+  "version": "0.2.15",
   "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.8-group-refactor1-dev-19efede",
     "axios": "^1.8.3",
     "bs58": "^6.0.0",
     "decimal.js": "^10.5.0"

package/src/index.ts

@@ -23,6 +23,10 @@ import {
   ClendAccountAssetLiquidation,
   GetGroupsResponse,
   GroupAndBanks,
+  BankEmissions,
+  BankEmissionsMode,
+  WithdrawEmissionsRequest,
+  WithdrawEmissionsResponse,
 } from "./types";
 import encode from "bs58";
 
@@ -102,177 +106,178 @@ 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> {
+    // 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);
-    console.log(JSON.stringify(jsonRawResponse, null, 2));
-
-    // 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),
-      });
-    }
 
-    // get tokens still in user wallet
+    // 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),
+    }));
+
     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;
+
+          const emissionsOutstandingAndUnclaimed = new BN(
+            b.emissionsOutstandingAndUnclaimed,
+            "hex",
+          );
+
+          return {
+            mint: new web3.PublicKey(b.mint),
+            bank: new web3.PublicKey(b.bank),
+            tokenYieldApy: Number(b.tokenYieldApy),
+            assetBalance: new BN(b.assetBalance, "hex"),
+            assetBalanceUi: Number(b.assetBalanceUi),
+            assetValue: Number(b.assetValue),
+            assetEmissionsApy: Number(b.assetEmissionsApy),
+            liabilityBalance: new BN(b.liabilityBalance, "hex"),
+            liabilityBalanceUi: Number(b.liabilityBalanceUi),
+            liabilityValue: Number(b.liabilityValue),
+            liabilityBorrowCostApy: Number(b.liabilityBorrowCostApy),
+            liabilityEmissionsApy: Number(b.liabilityEmissionsApy),
+            emissionsOutstandingAndUnclaimed,
+            emissionsOutstandingAndUnclaimedUi: Number(
+              b.emissionsOutstandingAndUnclaimedUi,
+            ),
+            price: Number(b.price),
+            liquidation,
+          };
+        });
 
-        const 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),
+          totalEmissionsApy: Number(rawClendAccount.totalEmissionsApy),
+          totalAssetValue: Number(rawClendAccount.totalAssetValue),
+          totalLiabilityValue: Number(rawClendAccount.totalLiabilityValue),
+          healthFactorNotional: Number(rawClendAccount.healthFactorNotional),
+          healthFactorRiskAdjusted: Number(
+            rawClendAccount.healthFactorRiskAdjusted,
+          ),
+          notionalLeverage: Number(rawClendAccount.notionalLeverage),
+          riskAdjustedLeverage: Number(rawClendAccount.riskAdjustedLeverage),
+          notionalLtv: Number(rawClendAccount.notionalLtv),
+          riskAdjustedLtv: Number(rawClendAccount.riskAdjustedLtv),
         };
 
-        // 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
@@ -406,16 +411,13 @@ export class Client {
    * @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> {
+  ): Promise<string> {
     const req: AdjustLeverageRequest = {
-      owner: this.address(),
-      clendGroup,
       clendAccount,
       assetTokenMint,
       liabilityTokenMint,
@@ -442,7 +444,6 @@ export class Client {
    * @returns Withdraw leverage operation result
    */
   async withdrawLeverage(
-    clendGroup: web3.PublicKey,
     clendAccount: web3.PublicKey,
     outputTokenMint: web3.PublicKey,
     assetTokenMint: web3.PublicKey,
@@ -450,10 +451,8 @@ export class Client {
     uiAmount: number,
     slippageBps: number,
     withdrawAll: boolean,
-  ): Promise<any> {
+  ): Promise<string> {
     const req: WithdrawLeverageRequest = {
-      owner: this.address(),
-      clendGroup,
       clendAccount,
       outputTokenMint,
       assetTokenMint,
@@ -475,6 +474,30 @@ export class Client {
 
     return txSig;
   }
+
+  /**
+   * Withdraw emissions from a bank
+   * @returns Withdraw emissions operation result
+   */
+  async withdrawEmissions(): Promise<string> {
+    const req: WithdrawEmissionsRequest = {
+      owner: this.address(),
+    };
+
+    const body = await handleApiCall(() =>
+      this.http.post("emissions/withdraw", JSON.stringify(req)),
+    );
+
+    const withdrawEmissionsResponse: WithdrawEmissionsResponse =
+      JSON.parse(body);
+
+    const txSig = await this.send(
+      withdrawEmissionsResponse.unsignedBase64Tx,
+      withdrawEmissionsResponse.userRequestId,
+    );
+
+    return txSig;
+  }
 }
 
 type ApiErrorPayload = {
@@ -484,15 +507,6 @@ type ApiErrorPayload = {
   timestamp: string;
 };
 
-function handleStatusCode(statusCode: number): void {
-  switch (statusCode) {
-    case 200:
-      break;
-    default:
-      throw new Error(`unexpected status code: ${statusCode}`);
-  }
-}
-
 // Helper function to handle API calls
 async function handleApiCall<T>(
   call: () => Promise<AxiosResponse<T>>,
@@ -526,6 +540,18 @@ function getDummyProvider(): AnchorProvider {
 }
 
 function parseBank(bankJson: any): Bank {
+  let bankEmissions: BankEmissions | null = null;
+  if (bankJson.emissions) {
+    bankEmissions = {
+      emissionsMode: bankJson.emissions.emissionsMode as BankEmissionsMode,
+      emissionsApy: Number(bankJson.emissions.emissionsApy),
+      emissionsMint: new web3.PublicKey(bankJson.emissions.emissionsMint),
+      emissionsTokenPrice: Number(bankJson.emissions.emissionsTokenPrice),
+      emissionsRate: new BN(bankJson.emissions.emissionsRate, "hex"),
+      emissionsRemainingUi: Number(bankJson.emissions.emissionsRemainingUi),
+    };
+  }
+
   return {
     mint: new web3.PublicKey(bankJson.mint),
     key: new web3.PublicKey(bankJson.key),
@@ -539,6 +565,7 @@ function parseBank(bankJson: any): Bank {
     assetMaintWeight: Number(bankJson.assetMaintWeight),
     totalAssetShares: Number(bankJson.totalAssetShares),
     assetShareValue: Number(bankJson.assetShareValue),
+    tokenYieldApy: Number(bankJson.tokenYieldApy),
     liabilityAmount: new BN(bankJson.liabilityAmount, "hex"),
     liabilityAmountUi: Number(bankJson.liabilityAmountUi),
     liabilityInitWeight: Number(bankJson.liabilityInitWeight),
@@ -550,5 +577,6 @@ function parseBank(bankJson: any): Bank {
     depositLimitUi: Number(bankJson.depositLimitUi),
     borrowLimit: new BN(bankJson.borrowLimit, "hex"),
     borrowLimitUi: Number(bankJson.borrowLimitUi),
+    emissions: bankEmissions,
   };
 }

package/src/types.ts

@@ -1,6 +1,6 @@
 import { BN, web3 } from "@coral-xyz/anchor";
 
-// Represents a request to send a transaction
+// Send a tx
 export interface SendRequest {
   userRequestId: string;
   txns: string[];
@@ -33,8 +33,6 @@ export interface DepositLeverageResponse {
  * Request to adjust the leverage of an existing position
  */
 export interface AdjustLeverageRequest {
-  owner: web3.PublicKey;
-  clendGroup: web3.PublicKey;
   clendAccount: web3.PublicKey;
   assetTokenMint: web3.PublicKey;
   liabilityTokenMint: web3.PublicKey;
@@ -54,8 +52,6 @@ export interface AdjustLeverageResponse {
  * Request to withdraw from a leveraged position
  */
 export interface WithdrawLeverageRequest {
-  owner: web3.PublicKey;
-  clendGroup: web3.PublicKey;
   clendAccount: web3.PublicKey;
   outputTokenMint: web3.PublicKey;
   assetTokenMint: web3.PublicKey;
@@ -73,6 +69,21 @@ export interface WithdrawLeverageResponse {
   unsignedBase64Tx: string;
 }
 
+/**
+ * Request to withdraw emissions from a bank
+ */
+export interface WithdrawEmissionsRequest {
+  owner: web3.PublicKey;
+}
+
+/**
+ * Response for withdraw emissions operation
+ */
+export interface WithdrawEmissionsResponse {
+  userRequestId: string;
+  unsignedBase64Tx: string;
+}
+
 export interface GetGroupsResponse {
   groups: GroupAndBanks[];
 }
@@ -118,6 +129,7 @@ export interface ClendAccount {
   netValue: number;
   netApy: number;
   pnl: number;
+  totalEmissionsApy: number;
   totalAssetValue: number;
   totalLiabilityValue: number;
   healthFactorNotional: number;
@@ -131,16 +143,18 @@ export interface ClendAccount {
 export interface ClendAccountBalance {
   mint: web3.PublicKey;
   bank: web3.PublicKey;
+  tokenYieldApy: number;
   assetBalance: BN;
   assetBalanceUi: number;
   assetValue: number;
-  assetYieldBps: number;
-  assetYieldApy: number;
+  assetEmissionsApy: number;
   liabilityBalance: BN;
   liabilityBalanceUi: number;
   liabilityValue: number;
-  liabilityBorrowCostBps: number;
   liabilityBorrowCostApy: number;
+  liabilityEmissionsApy: number;
+  emissionsOutstandingAndUnclaimed: BN;
+  emissionsOutstandingAndUnclaimedUi: number;
   price: number;
   liquidation: ClendAccountAssetLiquidation | null;
 }
@@ -158,6 +172,7 @@ export interface Bank {
   group: web3.PublicKey;
   key: web3.PublicKey;
   mint: web3.PublicKey;
+  tokenYieldApy: number;
   supplyApy: number;
   borrowApy: number;
   utilizationRate: number;
@@ -178,8 +193,23 @@ export interface Bank {
   depositLimitUi: number;
   borrowLimit: BN;
   borrowLimitUi: number;
+  emissions: BankEmissions | null;
+}
+
+export interface BankEmissions {
+  emissionsMode: BankEmissionsMode;
+  emissionsApy: number;
+  emissionsMint: web3.PublicKey;
+  emissionsTokenPrice: number;
+  emissionsRate: BN;
+  emissionsRemainingUi: number;
 }
 
+export type BankEmissionsMode =
+  | "LENDING_ONLY"
+  | "BORROW_ONLY"
+  | "LENDING_AND_BORROWING";
+
 export interface ClendAccountTxSummary {
   txSig: string;
   time: Date;

package/src/utils.ts

@@ -15,11 +15,3 @@ export function netValueInToken(
 
   return clendAccount.netValue / clendAccountTokenBalance.price;
 }
-
-export function getProductionGroups(): web3.PublicKey[] {
-  return [new web3.PublicKey("9bCWxAXFdWQ9GcZTSU3G636T6EyGXYMgaWR74yc7QZz8")];
-}
-
-export function getStagingGroups(): web3.PublicKey[] {
-  return [new web3.PublicKey("HKMDWLBK7yUmorSx9argg2rYcro6KoWf41N57FccKRP5")];
-}