@carrot-protocol/boost-http-client 0.2.0-mrgn-fork1-dev-37e1e0b → 0.2.0-mrgn-fork1-dev-4dad661

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { AnchorProvider, web3 } from "@coral-xyz/anchor";
-import { DepositLeverageRequest, GetBankResponse, GetUserResponse, AdjustLeverageRequest, WithdrawLeverageRequest } from "./types";
+import { DepositLeverageRequest, GetBankResponse, GetUserResponse, AdjustLeverageRequest, WithdrawLeverageRequest, GetGroupResponse } from "./types";
 export * from "./types";
 /**
  * HTTP Client for Carrot Boost API
@@ -26,12 +26,18 @@ export declare class Client {
      * @returns User details
      */
     getUser(user?: web3.PublicKey): Promise<GetUserResponse>;
+    /**
+     * Get market details
+     * @returns Group Details
+     */
+    getGroup(): Promise<GetGroupResponse>;
     /**
      * Get bank details
-     * @param mint token mint of the bank public key
+     * @param addr token mint or bank public key
+     * @param addrType "mint" or "bank"
      * @returns Bank details
      */
-    getBank(mint: web3.PublicKey): Promise<GetBankResponse>;
+    getBank(addr: web3.PublicKey, addrType: "mint" | "bank"): Promise<GetBankResponse>;
     /**
      * Deposit collateral and create a leveraged position
      * @param request Deposit leverage request parameters

package/dist/index.js

@@ -106,18 +106,86 @@ class Client {
             user = this.address();
         }
         const body = await handleApiCall(() => this.http.get(`/user?user=${user.toString()}`));
-        console.log(JSON.stringify(body));
-        const response = JSON.parse(body);
+        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,
+            };
+        }
+        // parse lending account balances
+        const balances = [];
+        for (const b of jsonRawResponse.clendAccount.balances) {
+            balances.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),
+            });
+        }
+        // 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),
+        };
+        return {
+            wallet,
+            clendAccount,
+        };
+    }
+    /**
+     * Get market details
+     * @returns Group Details
+     */
+    async getGroup() {
+        const body = await handleApiCall(() => this.http.get(`/group`));
+        const marketJson = JSON.parse(body);
+        const banks = [];
+        for (const bankJson of marketJson.banks) {
+            const bank = parseBank(bankJson);
+            banks.push(bank);
+        }
+        const response = {
+            banks,
+        };
         return response;
     }
     /**
      * Get bank details
-     * @param mint token mint of the bank public key
+     * @param addr token mint or bank public key
+     * @param addrType "mint" or "bank"
      * @returns Bank details
      */
-    async getBank(mint) {
-        const body = await handleApiCall(() => this.http.get(`/bank?mint=${mint.toString()}`));
-        const response = JSON.parse(body);
+    async getBank(addr, addrType) {
+        const body = await handleApiCall(() => this.http.get(`/bank?${addrType}=${addr.toString()}`));
+        const bankJson = JSON.parse(body);
+        const bank = parseBank(bankJson.bank);
+        const response = {
+            bank,
+        };
         return response;
     }
     /**
@@ -188,3 +256,18 @@ function getDummyProvider() {
         skipPreflight: true,
     });
 }
+function parseBank(bankJson) {
+    return {
+        mint: new anchor_1.web3.PublicKey(bankJson.mint),
+        key: new anchor_1.web3.PublicKey(bankJson.key),
+        group: new anchor_1.web3.PublicKey(bankJson.group),
+        supplyApy: Number(bankJson.supplyApy),
+        borrowApy: Number(bankJson.borrowApy),
+        utilizationRate: Number(bankJson.utilizationRate),
+        assetAmount: new anchor_1.BN(bankJson.assetAmount, "hex"),
+        assetAmountUi: Number(bankJson.assetAmountUi),
+        liabilityAmount: new anchor_1.BN(bankJson.liabilityAmount, "hex"),
+        liabilityAmountUi: Number(bankJson.liabilityAmountUi),
+        price: Number(bankJson.price),
+    };
+}

package/dist/types.d.ts

@@ -54,21 +54,57 @@ export interface WithdrawLeverageRequest {
 export interface WithdrawLeverageResponse {
     unsignedBase64Tx: string;
 }
+export interface GetGroupResponse {
+    banks: Bank[];
+}
 export interface GetUserResponse {
+    wallet: UserWallet;
+    clendAccount: ClendAccount | undefined;
+}
+export interface UserWallet {
     usdcBalance: BN;
     usdcBalanceUi: number;
     jlpBalance: BN;
     jlpBalanceUi: number;
     solBalance: BN;
     solBalanceUi: number;
-    clendAccount: any | undefined;
+}
+export interface ClendAccount {
+    balances: Balance[];
+    netValue: number;
+    netApy: number;
+    pnl: number;
+    totalAssetValue: number;
+    totalLiabilityValue: number;
+    healthFactorNotional: number;
+    healthFactorRiskAdjusted: number;
+    notionalLeverage: number;
+    riskAdjustedLeverage: number;
+}
+export interface Balance {
+    mint: web3.PublicKey;
+    bank: web3.PublicKey;
+    assetBalance: BN;
+    assetBalanceUi: number;
+    assetValue: number;
+    liabilityBalance: BN;
+    liabilityBalanceUi: number;
+    liabilityValue: number;
+    price: number;
 }
 export interface GetBankResponse {
-    totalBorrowTVL: number;
-    totalSupplyTVL: number;
+    bank: Bank;
+}
+export interface Bank {
+    group: web3.PublicKey;
+    key: web3.PublicKey;
+    mint: web3.PublicKey;
     supplyApy: number;
     borrowApy: number;
-    supplyAmount: number;
-    borrowAmount: number;
+    utilizationRate: number;
+    assetAmount: BN;
+    assetAmountUi: number;
+    liabilityAmount: BN;
+    liabilityAmountUi: number;
     price: number;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carrot-protocol/boost-http-client",
-  "version": "0.2.0-mrgn-fork1-dev-37e1e0b",
+  "version": "0.2.0-mrgn-fork1-dev-4dad661",
   "description": "HTTP client for Carrot Boost API",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -1,5 +1,5 @@
 import axios, { AxiosInstance, AxiosError, AxiosResponse } from "axios";
-import { AnchorProvider, Wallet, web3 } from "@coral-xyz/anchor";
+import { AnchorProvider, BN, Wallet, web3 } from "@coral-xyz/anchor";
 import {
   DepositLeverageRequest,
   DepositLeverageResponse,
@@ -10,6 +10,11 @@ import {
   SendRequest,
   WithdrawLeverageRequest,
   WithdrawLeverageResponse,
+  UserWallet,
+  ClendAccount,
+  Balance,
+  Bank,
+  GetGroupResponse,
 } from "./types";
 import encode from "bs58";
 
@@ -95,24 +100,112 @@ export class Client {
     const body = await handleApiCall(() =>
       this.http.get(`/user?user=${user.toString()}`),
     );
-    console.log(JSON.stringify(body));
 
-    const response: GetUserResponse = JSON.parse(body);
+    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,
+      };
+    }
+
+    // parse lending account balances
+    const balances: Balance[] = [];
+    for (const b of jsonRawResponse.clendAccount.balances) {
+      balances.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),
+      });
+    }
+
+    // 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,
+      ),
+    };
+
+    return {
+      wallet,
+      clendAccount,
+    };
+  }
+
+  /**
+   * Get market details
+   * @returns Group Details
+   */
+  async getGroup(): Promise<GetGroupResponse> {
+    const body = await handleApiCall(() => this.http.get(`/group`));
+
+    const marketJson: any = JSON.parse(body);
+    const banks: Bank[] = [];
+    for (const bankJson of marketJson.banks) {
+      const bank = parseBank(bankJson);
+      banks.push(bank);
+    }
+
+    const response: GetGroupResponse = {
+      banks,
+    };
 
     return response;
   }
 
   /**
    * Get bank details
-   * @param mint token mint of the bank public key
+   * @param addr token mint or bank public key
+   * @param addrType "mint" or "bank"
    * @returns Bank details
    */
-  async getBank(mint: web3.PublicKey): Promise<GetBankResponse> {
+  async getBank(
+    addr: web3.PublicKey,
+    addrType: "mint" | "bank",
+  ): Promise<GetBankResponse> {
     const body = await handleApiCall(() =>
-      this.http.get(`/bank?mint=${mint.toString()}`),
+      this.http.get(`/bank?${addrType}=${addr.toString()}`),
     );
 
-    const response: GetBankResponse = JSON.parse(body);
+    const bankJson: any = JSON.parse(body);
+    const bank = parseBank(bankJson.bank);
+
+    const response: GetBankResponse = {
+      bank,
+    };
 
     return response;
   }
@@ -209,3 +302,19 @@ function getDummyProvider(): AnchorProvider {
     },
   );
 }
+
+function parseBank(bankJson: any): Bank {
+  return {
+    mint: new web3.PublicKey(bankJson.mint),
+    key: new web3.PublicKey(bankJson.key),
+    group: new web3.PublicKey(bankJson.group),
+    supplyApy: Number(bankJson.supplyApy),
+    borrowApy: Number(bankJson.borrowApy),
+    utilizationRate: Number(bankJson.utilizationRate),
+    assetAmount: new BN(bankJson.assetAmount, "hex"),
+    assetAmountUi: Number(bankJson.assetAmountUi),
+    liabilityAmount: new BN(bankJson.liabilityAmount, "hex"),
+    liabilityAmountUi: Number(bankJson.liabilityAmountUi),
+    price: Number(bankJson.price),
+  };
+}

package/src/types.ts

@@ -66,22 +66,63 @@ export interface WithdrawLeverageResponse {
   unsignedBase64Tx: string;
 }
 
+export interface GetGroupResponse {
+  banks: Bank[];
+}
+
 export interface GetUserResponse {
+  wallet: UserWallet;
+  clendAccount: ClendAccount | undefined;
+}
+
+export interface UserWallet {
   usdcBalance: BN;
   usdcBalanceUi: number;
   jlpBalance: BN;
   jlpBalanceUi: number;
   solBalance: BN;
   solBalanceUi: number;
-  clendAccount: any | undefined;
+}
+
+export interface ClendAccount {
+  balances: Balance[];
+  netValue: number;
+  netApy: number;
+  pnl: number;
+  totalAssetValue: number;
+  totalLiabilityValue: number;
+  healthFactorNotional: number;
+  healthFactorRiskAdjusted: number;
+  notionalLeverage: number;
+  riskAdjustedLeverage: number;
+}
+
+export interface Balance {
+  mint: web3.PublicKey;
+  bank: web3.PublicKey;
+  assetBalance: BN;
+  assetBalanceUi: number;
+  assetValue: number;
+  liabilityBalance: BN;
+  liabilityBalanceUi: number;
+  liabilityValue: number;
+  price: number;
 }
 
 export interface GetBankResponse {
-  totalBorrowTVL: number;
-  totalSupplyTVL: number;
+  bank: Bank;
+}
+
+export interface Bank {
+  group: web3.PublicKey;
+  key: web3.PublicKey;
+  mint: web3.PublicKey;
   supplyApy: number;
   borrowApy: number;
-  supplyAmount: number;
-  borrowAmount: number;
+  utilizationRate: number;
+  assetAmount: BN;
+  assetAmountUi: number;
+  liabilityAmount: BN;
+  liabilityAmountUi: number;
   price: number;
 }