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

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { AnchorProvider, web3 } from "@coral-xyz/anchor";
-import { DepositLeverageRequest, GetBankResponse, GetUserResponse, ModifyLeverageRequest, WithdrawLeverageRequest } from "./types";
+import { DepositLeverageRequest, GetBankResponse, GetUserResponse, AdjustLeverageRequest, WithdrawLeverageRequest } from "./types";
 export * from "./types";
 /**
  * HTTP Client for Carrot Boost API
@@ -39,11 +39,11 @@ export declare class Client {
      */
     depositLeverage(params: DepositLeverageRequest): Promise<string>;
     /**
-     * Modify the leverage of an existing position
-     * @param request Modify leverage request parameters
-     * @returns Modify leverage operation result
+     * Adjust the leverage of an existing position
+     * @param request Adjust leverage request parameters
+     * @returns Adjust leverage operation result
      */
-    modifyLeverage(params: ModifyLeverageRequest): Promise<any>;
+    adjustLeverage(params: AdjustLeverageRequest): Promise<any>;
     /**
      * Withdraw from or close a leveraged position
      * @param request Withdraw 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,6 +106,7 @@ 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;
     }
@@ -131,14 +132,14 @@ class Client {
         return txSig;
     }
     /**
-     * Modify the leverage of an existing position
-     * @param request Modify leverage request parameters
-     * @returns Modify leverage operation result
+     * Adjust the leverage of an existing position
+     * @param request Adjust leverage request parameters
+     * @returns Adjust leverage operation result
      */
-    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);
+    async adjustLeverage(params) {
+        const body = await handleApiCall(() => this.http.post("leverage/adjust", JSON.stringify(params)));
+        const adjustLeverageResponse = JSON.parse(body);
+        const txSig = await this.send(adjustLeverageResponse.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,9 +14,9 @@ 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
@@ -26,17 +25,17 @@ export interface DepositLeverageResponse {
     unsignedBase64Tx: string;
 }
 /**
- * Request to modify the leverage of an existing position
+ * Request to adjust the leverage of an existing position
  */
-export interface ModifyLeverageRequest {
+export interface AdjustLeverageRequest {
     owner: web3.PublicKey;
     leverage: number;
-    slippagePct: number;
+    slippageBps: number;
 }
 /**
- * Response for modify leverage operation
+ * Response for adjust leverage operation
  */
-export interface ModifyLeverageResponse {
+export interface AdjustLeverageResponse {
     unsignedBase64Tx: string;
 }
 /**
@@ -45,9 +44,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;
 }
 /**
  * Response for withdraw leverage operation
@@ -56,20 +55,13 @@ export interface WithdrawLeverageResponse {
     unsignedBase64Tx: 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;
+    clendAccount: any | undefined;
 }
 export interface GetBankResponse {
     totalBorrowTVL: number;

package/package.json

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

package/src/index.ts

@@ -5,8 +5,8 @@ import {
   DepositLeverageResponse,
   GetBankResponse,
   GetUserResponse,
-  ModifyLeverageRequest,
-  ModifyLeverageResponse,
+  AdjustLeverageRequest,
+  AdjustLeverageResponse,
   SendRequest,
   WithdrawLeverageRequest,
   WithdrawLeverageResponse,
@@ -47,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));
@@ -66,7 +63,7 @@ export class Client {
 
     // create request obj
     const sendRequest: SendRequest = {
-      txns: [encodedAndSignedTx, ...signedBase64Txns],
+      txns: [encodedAndSignedTx],
     };
 
     // send to api
@@ -98,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);
 
@@ -137,18 +135,18 @@ export class Client {
   }
 
   /**
-   * Modify the leverage of an existing position
-   * @param request Modify leverage request parameters
-   * @returns Modify leverage operation result
+   * Adjust the leverage of an existing position
+   * @param request Adjust leverage request parameters
+   * @returns Adjust leverage operation result
    */
-  async modifyLeverage(params: ModifyLeverageRequest): Promise<any> {
+  async adjustLeverage(params: AdjustLeverageRequest): Promise<any> {
     const body = await handleApiCall(() =>
-      this.http.post("leverage/modify", JSON.stringify(params)),
+      this.http.post("leverage/adjust", JSON.stringify(params)),
     );
 
-    const modifyLeverageResponse: ModifyLeverageResponse = JSON.parse(body);
+    const adjustLeverageResponse: AdjustLeverageResponse = JSON.parse(body);
 
-    const txSig = await this.send(modifyLeverageResponse.unsignedBase64Tx);
+    const txSig = await this.send(adjustLeverageResponse.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;
 }
 
 /**
@@ -33,18 +33,18 @@ export interface DepositLeverageResponse {
 }
 
 /**
- * Request to modify the leverage of an existing position
+ * Request to adjust the leverage of an existing position
  */
-export interface ModifyLeverageRequest {
+export interface AdjustLeverageRequest {
   owner: web3.PublicKey;
   leverage: number;
-  slippagePct: number;
+  slippageBps: number;
 }
 
 /**
- * Response for modify leverage operation
+ * Response for adjust leverage operation
  */
-export interface ModifyLeverageResponse {
+export interface AdjustLeverageResponse {
   unsignedBase64Tx: string;
 }
 
@@ -54,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;
 }
 
 /**
@@ -67,20 +67,13 @@ export interface WithdrawLeverageResponse {
 }
 
 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;
+  clendAccount: any | undefined;
 }
 
 export interface GetBankResponse {