@carrot-protocol/boost-http-client 0.1.7 → 0.2.0-mrgn-fork1-dev-e3a1df6

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { AnchorProvider, web3 } from "@coral-xyz/anchor";
-import { DepositLeverageRequest, GetMarketResponse, GetUserResponse, ModifyLeverageRequest, WithdrawLeverageRequest } from "./types";
+import { DepositLeverageRequest, GetBankResponse, GetUserResponse, ModifyLeverageRequest, WithdrawLeverageRequest } from "./types";
 export * from "./types";
 /**
  * HTTP Client for Carrot Boost API
@@ -27,15 +27,11 @@ export declare class Client {
      */
     getUser(user?: web3.PublicKey): Promise<GetUserResponse>;
     /**
-     * Get market details for the carrot boost market
-     * @returns Market details
+     * Get bank details
+     * @param mint token mint of the bank public key
+     * @returns Bank details
      */
-    getMarket(): Promise<GetMarketResponse>;
-    /**
-     * Create an obligation for the client
-     * @returns Transaction signature
-     */
-    createObligation(): Promise<string>;
+    getBank(mint: web3.PublicKey): Promise<GetBankResponse>;
     /**
      * Deposit collateral and create a leveraged position
      * @param request Deposit leverage request parameters

package/dist/index.js

@@ -70,7 +70,7 @@ class Client {
         return this.provider.wallet.publicKey;
     }
     // sign and send tx to api for sending to network
-    async send(unsignedBase64Tx, ...signedBase64Txns) {
+    async send(unsignedBase64Tx) {
         // deserialize into tx obj
         const txBytes = Buffer.from(unsignedBase64Tx, "base64");
         const tx = anchor_1.web3.VersionedTransaction.deserialize(new Uint8Array(txBytes));
@@ -81,7 +81,7 @@ class Client {
         const encodedAndSignedTx = Buffer.from(signedTx.serialize()).toString("base64");
         // create request obj
         const sendRequest = {
-            txns: [encodedAndSignedTx, ...signedBase64Txns],
+            txns: [encodedAndSignedTx],
         };
         // send to api
         await handleApiCall(() => this.http.post(`send`, sendRequest));
@@ -106,28 +106,20 @@ 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);
         return response;
     }
     /**
-     * Get market details for the carrot boost market
-     * @returns Market details
+     * Get bank details
+     * @param mint token mint of the bank public key
+     * @returns Bank details
      */
-    async getMarket() {
-        const body = await handleApiCall(() => this.http.get(`market`));
+    async getBank(mint) {
+        const body = await handleApiCall(() => this.http.get(`/bank?mint=${mint.toString()}`));
         const response = JSON.parse(body);
         return response;
     }
-    /**
-     * Create an obligation for the client
-     * @returns Transaction signature
-     */
-    async createObligation() {
-        const body = await handleApiCall(() => this.http.post("createObligation", JSON.stringify({ owner: this.address() })));
-        const createObligationResponse = JSON.parse(body);
-        const txSig = await this.send(createObligationResponse.unsignedBase64Tx);
-        return txSig;
-    }
     /**
      * Deposit collateral and create a leveraged position
      * @param request Deposit leverage request parameters
@@ -136,7 +128,7 @@ class Client {
     async depositLeverage(params) {
         const body = await handleApiCall(() => this.http.post("leverage/deposit", JSON.stringify(params)));
         const depositLeverageResponse = JSON.parse(body);
-        const txSig = await this.send(depositLeverageResponse.unsignedBase64Tx, depositLeverageResponse.signedSetBorrowRateBase64Tx);
+        const txSig = await this.send(depositLeverageResponse.unsignedBase64Tx);
         return txSig;
     }
     /**
@@ -147,7 +139,7 @@ class Client {
     async modifyLeverage(params) {
         const body = await handleApiCall(() => this.http.post("leverage/modify", JSON.stringify(params)));
         const modifyLeverageResponse = JSON.parse(body);
-        const txSig = await this.send(modifyLeverageResponse.unsignedBase64Tx, modifyLeverageResponse.signedSetBorrowRateBase64Tx);
+        const txSig = await this.send(modifyLeverageResponse.unsignedBase64Tx);
         return txSig;
     }
     /**
@@ -158,7 +150,7 @@ class Client {
     async withdrawLeverage(params) {
         const body = await handleApiCall(() => this.http.post("leverage/withdraw", JSON.stringify(params)));
         const withdrawLeverageResponse = JSON.parse(body);
-        const txSig = await this.send(withdrawLeverageResponse.unsignedBase64Tx, withdrawLeverageResponse.signedSetBorrowRateBase64Tx);
+        const txSig = await this.send(withdrawLeverageResponse.unsignedBase64Tx);
         return txSig;
     }
 }

package/dist/types.d.ts

@@ -1,5 +1,4 @@
 import { BN, web3 } from "@coral-xyz/anchor";
-import Decimal from "decimal.js";
 export interface SendRequest {
     txns: string[];
 }
@@ -15,16 +14,15 @@ export interface CreateObligationResponse {
 export interface DepositLeverageRequest {
     owner: web3.PublicKey;
     selectedTokenMint: web3.PublicKey;
-    depositAmount: Decimal;
+    depositAmount: BN;
     leverage: number;
-    slippagePct: number;
+    slippageBps: number;
 }
 /**
  * Response for deposit leverage operation
  */
 export interface DepositLeverageResponse {
     unsignedBase64Tx: string;
-    signedSetBorrowRateBase64Tx: string;
 }
 /**
  * Request to modify the leverage of an existing position
@@ -39,7 +37,6 @@ export interface ModifyLeverageRequest {
  */
 export interface ModifyLeverageResponse {
     unsignedBase64Tx: string;
-    signedSetBorrowRateBase64Tx: string;
 }
 /**
  * Request to withdraw from a leveraged position
@@ -47,41 +44,31 @@ export interface ModifyLeverageResponse {
 export interface WithdrawLeverageRequest {
     owner: web3.PublicKey;
     selectedTokenMint: web3.PublicKey;
-    withdrawAmount: Decimal;
-    slippagePct: number;
-    closePosition: boolean;
+    withdrawAmount: BN;
+    slippageBps: number;
+    withdrawAll: boolean;
 }
 /**
  * Response for withdraw leverage operation
  */
 export interface WithdrawLeverageResponse {
     unsignedBase64Tx: string;
-    signedSetBorrowRateBase64Tx: string;
 }
 export interface GetUserResponse {
-    netValue: number;
-    pnl: number;
-    netAPY: number;
-    leverage: number;
-    totalCollateral: number;
-    totalDebt: number;
-    ltv: number;
-    liquidationLtv: number;
     usdcBalance: BN;
     usdcBalanceUi: number;
     jlpBalance: BN;
     jlpBalanceUi: number;
     solBalance: BN;
     solBalanceUi: number;
-    obligationCreated: boolean;
+    clendAccount: any | undefined;
 }
-export interface GetMarketResponse {
+export interface GetBankResponse {
     totalBorrowTVL: number;
     totalSupplyTVL: number;
-    usdcSupplyApy: number;
-    usdcBorrowApy: number;
-    usdcSupplyAmount: number;
-    usdcBorrowAmount: number;
-    usdcPrice: number;
-    jlpPrice: number;
+    supplyApy: number;
+    borrowApy: number;
+    supplyAmount: number;
+    borrowAmount: number;
+    price: number;
 }

package/package.json

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

package/src/index.ts

@@ -1,10 +1,9 @@
 import axios, { AxiosInstance, AxiosError, AxiosResponse } from "axios";
 import { AnchorProvider, Wallet, web3 } from "@coral-xyz/anchor";
 import {
-  CreateObligationResponse,
   DepositLeverageRequest,
   DepositLeverageResponse,
-  GetMarketResponse,
+  GetBankResponse,
   GetUserResponse,
   ModifyLeverageRequest,
   ModifyLeverageResponse,
@@ -48,10 +47,7 @@ export class Client {
   }
 
   // sign and send tx to api for sending to network
-  private async send(
-    unsignedBase64Tx: string,
-    ...signedBase64Txns: string[]
-  ): Promise<string> {
+  private async send(unsignedBase64Tx: string): Promise<string> {
     // deserialize into tx obj
     const txBytes = Buffer.from(unsignedBase64Tx, "base64");
     const tx = web3.VersionedTransaction.deserialize(new Uint8Array(txBytes));
@@ -67,7 +63,7 @@ export class Client {
 
     // create request obj
     const sendRequest: SendRequest = {
-      txns: [encodedAndSignedTx, ...signedBase64Txns],
+      txns: [encodedAndSignedTx],
     };
 
     // send to api
@@ -99,6 +95,7 @@ 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);
 
@@ -106,34 +103,18 @@ export class Client {
   }
 
   /**
-   * Get market details for the carrot boost market
-   * @returns Market details
+   * Get bank details
+   * @param mint token mint of the bank public key
+   * @returns Bank details
    */
-  async getMarket(): Promise<GetMarketResponse> {
-    const body = await handleApiCall(() => this.http.get(`market`));
-
-    const response: GetMarketResponse = JSON.parse(body);
-
-    return response;
-  }
-
-  /**
-   * Create an obligation for the client
-   * @returns Transaction signature
-   */
-  async createObligation(): Promise<string> {
+  async getBank(mint: web3.PublicKey): Promise<GetBankResponse> {
     const body = await handleApiCall(() =>
-      this.http.post(
-        "createObligation",
-        JSON.stringify({ owner: this.address() }),
-      ),
+      this.http.get(`/bank?mint=${mint.toString()}`),
     );
 
-    const createObligationResponse: CreateObligationResponse = JSON.parse(body);
+    const response: GetBankResponse = JSON.parse(body);
 
-    const txSig = await this.send(createObligationResponse.unsignedBase64Tx);
-
-    return txSig;
+    return response;
   }
 
   /**
@@ -148,10 +129,7 @@ export class Client {
 
     const depositLeverageResponse: DepositLeverageResponse = JSON.parse(body);
 
-    const txSig = await this.send(
-      depositLeverageResponse.unsignedBase64Tx,
-      depositLeverageResponse.signedSetBorrowRateBase64Tx,
-    );
+    const txSig = await this.send(depositLeverageResponse.unsignedBase64Tx);
 
     return txSig;
   }
@@ -168,10 +146,7 @@ export class Client {
 
     const modifyLeverageResponse: ModifyLeverageResponse = JSON.parse(body);
 
-    const txSig = await this.send(
-      modifyLeverageResponse.unsignedBase64Tx,
-      modifyLeverageResponse.signedSetBorrowRateBase64Tx,
-    );
+    const txSig = await this.send(modifyLeverageResponse.unsignedBase64Tx);
 
     return txSig;
   }
@@ -188,10 +163,7 @@ export class Client {
 
     const withdrawLeverageResponse: WithdrawLeverageResponse = JSON.parse(body);
 
-    const txSig = await this.send(
-      withdrawLeverageResponse.unsignedBase64Tx,
-      withdrawLeverageResponse.signedSetBorrowRateBase64Tx,
-    );
+    const txSig = await this.send(withdrawLeverageResponse.unsignedBase64Tx);
 
     return txSig;
   }

package/src/types.ts

@@ -20,9 +20,9 @@ export interface CreateObligationResponse {
 export interface DepositLeverageRequest {
   owner: web3.PublicKey;
   selectedTokenMint: web3.PublicKey;
-  depositAmount: Decimal;
+  depositAmount: BN;
   leverage: number;
-  slippagePct: number;
+  slippageBps: number;
 }
 
 /**
@@ -30,7 +30,6 @@ export interface DepositLeverageRequest {
  */
 export interface DepositLeverageResponse {
   unsignedBase64Tx: string;
-  signedSetBorrowRateBase64Tx: string;
 }
 
 /**
@@ -47,7 +46,6 @@ export interface ModifyLeverageRequest {
  */
 export interface ModifyLeverageResponse {
   unsignedBase64Tx: string;
-  signedSetBorrowRateBase64Tx: string;
 }
 
 /**
@@ -56,9 +54,9 @@ export interface ModifyLeverageResponse {
 export interface WithdrawLeverageRequest {
   owner: web3.PublicKey;
   selectedTokenMint: web3.PublicKey;
-  withdrawAmount: Decimal;
-  slippagePct: number;
-  closePosition: boolean;
+  withdrawAmount: BN;
+  slippageBps: number;
+  withdrawAll: boolean;
 }
 
 /**
@@ -66,34 +64,24 @@ export interface WithdrawLeverageRequest {
  */
 export interface WithdrawLeverageResponse {
   unsignedBase64Tx: string;
-  signedSetBorrowRateBase64Tx: string;
 }
 
 export interface GetUserResponse {
-  netValue: number;
-  pnl: number;
-  netAPY: number;
-  leverage: number;
-  totalCollateral: number;
-  totalDebt: number;
-  ltv: number;
-  liquidationLtv: number;
   usdcBalance: BN;
   usdcBalanceUi: number;
   jlpBalance: BN;
   jlpBalanceUi: number;
   solBalance: BN;
   solBalanceUi: number;
-  obligationCreated: boolean;
+  clendAccount: any | undefined;
 }
 
-export interface GetMarketResponse {
+export interface GetBankResponse {
   totalBorrowTVL: number;
   totalSupplyTVL: number;
-  usdcSupplyApy: number;
-  usdcBorrowApy: number;
-  usdcSupplyAmount: number;
-  usdcBorrowAmount: number;
-  usdcPrice: number;
-  jlpPrice: number;
+  supplyApy: number;
+  borrowApy: number;
+  supplyAmount: number;
+  borrowAmount: number;
+  price: number;
 }