@carrot-protocol/boost-http-client 0.2.14 → 0.2.15-group-refactor1-dev-616fdaa

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { AnchorProvider, web3 } from "@coral-xyz/anchor";
-import { GetBankResponse, GetUserResponse, GetGroupResponse, GetUserRequest, GetGroupRequest } from "./types";
+import { GetBankResponse, GetUserResponse, GetGroupResponse, GetUserRequest } from "./types";
 export * from "./types";
 export * from "./utils";
 export * as Common from "@carrot-protocol/clend-common";
@@ -30,22 +30,22 @@ export declare class Client {
     getUser(request: GetUserRequest): Promise<GetUserResponse>;
     /**
      * Get market details
-     * @returns Group Details
+     * @param groupAddress group public key
+     * @returns Group Details, which is really just all the bank data for that group
      */
-    getGroup(request: GetGroupRequest): Promise<GetGroupResponse>;
+    getGroup(groupAddress: web3.PublicKey): Promise<GetGroupResponse>;
     /**
      * Get bank details
-     * @param addr token mint or bank public key
-     * @param addrType "mint" or "bank"
+     * @param bankAddress bank public key
      * @returns Bank details
      */
-    getBank(addr: web3.PublicKey, addrType: "mint" | "bank"): Promise<GetBankResponse>;
+    getBank(bankAddress: web3.PublicKey): Promise<GetBankResponse>;
     /**
      * Deposit collateral and create a leveraged position
      * @param request Deposit leverage request parameters
      * @returns Deposit leverage operation result
      */
-    depositLeverage(selectedTokenMint: web3.PublicKey, uiAmount: number, leverage: number, slippageBps: number): Promise<string>;
+    depositLeverage(inputMint: web3.PublicKey, assetMint: web3.PublicKey, liabilityMint: web3.PublicKey, uiAmount: number, leverage: number, slippageBps: number): Promise<string>;
     /**
      * Adjust the leverage of an existing position
      * @param request Adjust leverage request parameters

package/dist/index.js

@@ -223,10 +223,11 @@ class Client {
     }
     /**
      * Get market details
-     * @returns Group Details
+     * @param groupAddress group public key
+     * @returns Group Details, which is really just all the bank data for that group
      */
-    async getGroup(request) {
-        const body = await handleApiCall(() => this.http.get(`/group?group=${request.group.toString()}`));
+    async getGroup(groupAddress) {
+        const body = await handleApiCall(() => this.http.get(`/group?group=${groupAddress.toString()}`));
         const marketJson = JSON.parse(body);
         const banks = [];
         for (const bankJson of marketJson.banks) {
@@ -240,12 +241,11 @@ class Client {
     }
     /**
      * Get bank details
-     * @param addr token mint or bank public key
-     * @param addrType "mint" or "bank"
+     * @param bankAddress bank public key
      * @returns Bank details
      */
-    async getBank(addr, addrType) {
-        const body = await handleApiCall(() => this.http.get(`/bank?${addrType}=${addr.toString()}`));
+    async getBank(bankAddress) {
+        const body = await handleApiCall(() => this.http.get(`/bank?bank=${bankAddress.toString()}`));
         const bankJson = JSON.parse(body);
         const bank = parseBank(bankJson.bank);
         const response = {
@@ -258,10 +258,15 @@ class Client {
      * @param request Deposit leverage request parameters
      * @returns Deposit leverage operation result
      */
-    async depositLeverage(selectedTokenMint, uiAmount, leverage, slippageBps) {
+    async depositLeverage(inputMint, assetMint, liabilityMint, uiAmount, leverage, slippageBps) {
+        if (!inputMint.equals(assetMint) || !inputMint.equals(liabilityMint)) {
+            throw new Error("Input mint must be the same as the asset or liability mint");
+        }
         const req = {
             owner: this.address(),
-            selectedTokenMint,
+            inputMint,
+            assetMint,
+            liabilityMint,
             depositAmountUi: uiAmount,
             leverage,
             slippageBps,

package/dist/types.d.ts

@@ -8,7 +8,9 @@ export interface SendRequest {
  */
 export interface DepositLeverageRequest {
     owner: web3.PublicKey;
-    selectedTokenMint: web3.PublicKey;
+    inputMint: web3.PublicKey;
+    assetMint: web3.PublicKey;
+    liabilityMint: web3.PublicKey;
     depositAmountUi: number;
     leverage: number;
     slippageBps: number;
@@ -52,9 +54,6 @@ export interface WithdrawLeverageResponse {
     userRequestId: string;
     unsignedBase64Tx: string;
 }
-export interface GetGroupRequest {
-    group: web3.PublicKey;
-}
 export interface GetGroupResponse {
     banks: Bank[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carrot-protocol/boost-http-client",
-  "version": "0.2.14",
+  "version": "0.2.15-group-refactor1-dev-616fdaa",
   "description": "HTTP client for Carrot Boost",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -19,7 +19,6 @@ import {
   GetUserRequest,
   ClendAccountTxSummary,
   UserRequest,
-  GetGroupRequest,
 } from "./types";
 import encode from "bs58";
 
@@ -249,11 +248,12 @@ export class Client {
 
   /**
    * Get market details
-   * @returns Group Details
+   * @param groupAddress group public key
+   * @returns Group Details, which is really just all the bank data for that group
    */
-  async getGroup(request: GetGroupRequest): Promise<GetGroupResponse> {
+  async getGroup(groupAddress: web3.PublicKey): Promise<GetGroupResponse> {
     const body = await handleApiCall(() =>
-      this.http.get(`/group?group=${request.group.toString()}`),
+      this.http.get(`/group?group=${groupAddress.toString()}`),
     );
 
     const marketJson: any = JSON.parse(body);
@@ -272,16 +272,12 @@ export class Client {
 
   /**
    * Get bank details
-   * @param addr token mint or bank public key
-   * @param addrType "mint" or "bank"
+   * @param bankAddress bank public key
    * @returns Bank details
    */
-  async getBank(
-    addr: web3.PublicKey,
-    addrType: "mint" | "bank",
-  ): Promise<GetBankResponse> {
+  async getBank(bankAddress: web3.PublicKey): Promise<GetBankResponse> {
     const body = await handleApiCall(() =>
-      this.http.get(`/bank?${addrType}=${addr.toString()}`),
+      this.http.get(`/bank?bank=${bankAddress.toString()}`),
     );
 
     const bankJson: any = JSON.parse(body);
@@ -300,14 +296,24 @@ export class Client {
    * @returns Deposit leverage operation result
    */
   async depositLeverage(
-    selectedTokenMint: web3.PublicKey,
+    inputMint: web3.PublicKey,
+    assetMint: web3.PublicKey,
+    liabilityMint: web3.PublicKey,
     uiAmount: number,
     leverage: number,
     slippageBps: number,
   ): Promise<string> {
+    if (!inputMint.equals(assetMint) || !inputMint.equals(liabilityMint)) {
+      throw new Error(
+        "Input mint must be the same as the asset or liability mint",
+      );
+    }
+
     const req: DepositLeverageRequest = {
       owner: this.address(),
-      selectedTokenMint,
+      inputMint,
+      assetMint,
+      liabilityMint,
       depositAmountUi: uiAmount,
       leverage,
       slippageBps,

package/src/types.ts

@@ -11,7 +11,9 @@ export interface SendRequest {
  */
 export interface DepositLeverageRequest {
   owner: web3.PublicKey;
-  selectedTokenMint: web3.PublicKey;
+  inputMint: web3.PublicKey;
+  assetMint: web3.PublicKey;
+  liabilityMint: web3.PublicKey;
   depositAmountUi: number;
   leverage: number;
   slippageBps: number;
@@ -61,10 +63,6 @@ export interface WithdrawLeverageResponse {
   unsignedBase64Tx: string;
 }
 
-export interface GetGroupRequest {
-  group: web3.PublicKey;
-}
-
 export interface GetGroupResponse {
   banks: Bank[];
 }