@carrot-protocol/boost-http-client 0.2.3-withdraw-jlp-dev-e591dae → 0.2.3-withdraw-jlp-dev-6a31381

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { AnchorProvider, web3 } from "@coral-xyz/anchor";
-import { GetBankResponse, GetUserResponse, GetGroupResponse } from "./types";
+import { GetBankResponse, GetUserResponse, GetGroupResponse, GetUserRequest } from "./types";
 export * from "./types";
 export * from "./utils";
 /**
@@ -26,7 +26,7 @@ export declare class Client {
      * @param user wallet public key
      * @returns User details
      */
-    getUser(user?: web3.PublicKey): Promise<GetUserResponse>;
+    getUser(request: GetUserRequest): Promise<GetUserResponse>;
     /**
      * Get market details
      * @returns Group Details

package/dist/index.js

@@ -21,6 +21,7 @@ exports.Client = void 0;
 const axios_1 = __importDefault(require("axios"));
 const anchor_1 = require("@coral-xyz/anchor");
 const bs58_1 = __importDefault(require("bs58"));
+const utils_1 = require("./utils");
 // Re-export types
 __exportStar(require("./types"), exports);
 __exportStar(require("./utils"), exports);
@@ -79,12 +80,13 @@ class Client {
      * @param user wallet public key
      * @returns User details
      */
-    async getUser(user) {
+    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()}`));
+        const body = await handleApiCall(() => this.http.get(`/user?user=${user.toString()}&getClendEvents=${request.getClendEvents}`));
         const jsonRawResponse = JSON.parse(body);
         // get tokens still in user wallet
         const wallet = {
@@ -140,6 +142,9 @@ class Client {
             if (event.closeBalance !== null) {
                 closeBalance = Boolean(event.closeBalance);
             }
+            // parse amount
+            const amount = event.amount ? new anchor_1.BN(event.amount, "hex") : null;
+            const amountUi = amount !== null ? (0, utils_1.amountToUi)(amount, 6) : null;
             const clendAccountEvent = {
                 txSig: event.txSig,
                 eventIndex: event.eventIndex,
@@ -151,7 +156,8 @@ class Client {
                 clendGroup: new anchor_1.web3.PublicKey(event.clendGroup),
                 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,
+                amount,
+                amountUi,
                 closeBalance,
             };
             events.push(clendAccountEvent);

package/dist/types.d.ts

@@ -51,6 +51,10 @@ export interface WithdrawLeverageResponse {
 export interface GetGroupResponse {
     banks: Bank[];
 }
+export interface GetUserRequest {
+    user?: web3.PublicKey;
+    getClendEvents?: boolean;
+}
 export interface GetUserResponse {
     wallet: UserWallet;
     clendAccount: ClendAccount | undefined;
@@ -121,5 +125,6 @@ export interface ClendAccountEvent {
     bank: web3.PublicKey | null;
     mint: web3.PublicKey | null;
     amount: BN | null;
+    amountUi: number | null;
     closeBalance: boolean | null;
 }

package/dist/utils.d.ts

@@ -1,3 +1,4 @@
-import { web3 } from "@coral-xyz/anchor";
+import { BN, web3 } from "@coral-xyz/anchor";
 import { ClendAccount } from "./types";
+export declare function amountToUi(amount: BN | number, decimals: number): number;
 export declare function netValueInToken(clendAccount: ClendAccount, tokenMint: web3.PublicKey): number;

package/dist/utils.js

@@ -1,6 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.amountToUi = amountToUi;
 exports.netValueInToken = netValueInToken;
+const anchor_1 = require("@coral-xyz/anchor");
+function amountToUi(amount, decimals) {
+    if (amount instanceof anchor_1.BN) {
+        return Number(amount.toNumber() / 10 ** decimals);
+    }
+    else {
+        return Number(amount / 10 ** decimals);
+    }
+}
 // 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));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carrot-protocol/boost-http-client",
-  "version": "0.2.3-withdraw-jlp-dev-e591dae",
+  "version": "0.2.3-withdraw-jlp-dev-6a31381",
   "description": "HTTP client for Carrot Boost API",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -16,8 +16,10 @@ import {
   Bank,
   GetGroupResponse,
   ClendAccountEvent,
+  GetUserRequest,
 } from "./types";
 import encode from "bs58";
+import { amountToUi } from "./utils";
 
 // Re-export types
 export * from "./types";
@@ -93,14 +95,17 @@ export class Client {
    * @param user wallet public key
    * @returns User details
    */
-  async getUser(user?: web3.PublicKey): Promise<GetUserResponse> {
+  async getUser(request: GetUserRequest): Promise<GetUserResponse> {
     // use loaded wallet if not provided
+    let user = request.user;
     if (!user) {
       user = this.address();
     }
 
     const body = await handleApiCall(() =>
-      this.http.get(`/user?user=${user.toString()}`),
+      this.http.get(
+        `/user?user=${user.toString()}&getClendEvents=${request.getClendEvents}`,
+      ),
     );
 
     const jsonRawResponse: any = JSON.parse(body);
@@ -172,6 +177,10 @@ export class Client {
         closeBalance = Boolean(event.closeBalance);
       }
 
+      // parse amount
+      const amount = event.amount ? new BN(event.amount, "hex") : null;
+      const amountUi = amount !== null ? amountToUi(amount, 6) : null;
+
       const clendAccountEvent: ClendAccountEvent = {
         txSig: event.txSig,
         eventIndex: event.eventIndex,
@@ -183,7 +192,8 @@ export class Client {
         clendGroup: new web3.PublicKey(event.clendGroup),
         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,
+        amount,
+        amountUi,
         closeBalance,
       };
       events.push(clendAccountEvent);

package/src/types.ts

@@ -62,6 +62,11 @@ export interface GetGroupResponse {
   banks: Bank[];
 }
 
+export interface GetUserRequest {
+  user?: web3.PublicKey;
+  getClendEvents?: boolean;
+}
+
 export interface GetUserResponse {
   wallet: UserWallet;
   clendAccount: ClendAccount | undefined;
@@ -138,5 +143,6 @@ export interface ClendAccountEvent {
   bank: web3.PublicKey | null;
   mint: web3.PublicKey | null;
   amount: BN | null;
+  amountUi: number | null;
   closeBalance: boolean | null;
 }

package/src/utils.ts

@@ -1,6 +1,14 @@
-import { web3 } from "@coral-xyz/anchor";
+import { BN, web3 } from "@coral-xyz/anchor";
 import { ClendAccount } from "./types";
 
+export function amountToUi(amount: BN | number, decimals: number): number {
+  if (amount instanceof BN) {
+    return Number(amount.toNumber() / 10 ** decimals);
+  } else {
+    return Number(amount / 10 ** decimals);
+  }
+}
+
 // returns the net value of the clend account in a given tokens price
 export function netValueInToken(
   clendAccount: ClendAccount,