@carrot-protocol/boost-http-client 0.2.15-group-refactor1-dev-44d9397 → 0.2.15-group-refactor1-dev-6ecf454

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, GetGroupsResponse } from "./types";
 export * from "./types";
 export * from "./utils";
 export * as Common from "@carrot-protocol/clend-common";
@@ -28,6 +28,12 @@ export declare class Client {
      * @returns User details
      */
     getUser(groups: web3.PublicKey[], user: web3.PublicKey, getClendAccountSummary: boolean): Promise<GetUserResponse>;
+    /**
+     * Get all groups
+     * @param includeBankData Whether to include bank data in the response, if not strictly necessary keep false
+     * @returns All groups
+     */
+    getGroups(includeBankData: boolean): Promise<GetGroupsResponse>;
     /**
      * Get market details
      * @param groupAddress group public key
@@ -51,11 +57,11 @@ export declare class Client {
      * @param request Adjust leverage request parameters
      * @returns Adjust leverage operation result
      */
-    adjustLeverage(clendGroup: web3.PublicKey, assetTokenMint: web3.PublicKey, liabilityTokenMint: web3.PublicKey, leverage: number, slippageBps: number): Promise<any>;
+    adjustLeverage(clendGroup: web3.PublicKey, clendAccount: web3.PublicKey, assetTokenMint: web3.PublicKey, liabilityTokenMint: web3.PublicKey, leverage: number, slippageBps: number): Promise<any>;
     /**
      * Withdraw from or close a leveraged position
      * @param request Withdraw leverage request parameters
      * @returns Withdraw leverage operation result
      */
-    withdrawLeverage(clendGroup: web3.PublicKey, outputTokenMint: web3.PublicKey, assetTokenMint: web3.PublicKey, liabilityTokenMint: web3.PublicKey, uiAmount: number, slippageBps: number, withdrawAll: boolean): Promise<any>;
+    withdrawLeverage(clendGroup: web3.PublicKey, clendAccount: web3.PublicKey, outputTokenMint: web3.PublicKey, assetTokenMint: web3.PublicKey, liabilityTokenMint: web3.PublicKey, uiAmount: number, slippageBps: number, withdrawAll: boolean): Promise<any>;
 }

package/dist/index.js

@@ -236,6 +236,29 @@ class Client {
             clendAccounts,
         };
     }
+    /**
+     * Get all groups
+     * @param includeBankData Whether to include bank data in the response, if not strictly necessary keep false
+     * @returns All groups
+     */
+    async getGroups(includeBankData) {
+        const body = await handleApiCall(() => this.http.get(`/groups?includeBankData=${includeBankData}`));
+        const marketJson = JSON.parse(body);
+        const groups = [];
+        for (const groupJson of marketJson.groups) {
+            const group = new anchor_1.web3.PublicKey(groupJson.group);
+            const banks = [];
+            for (const bankJson of groupJson.banks) {
+                const bank = parseBank(bankJson);
+                banks.push(bank);
+            }
+            groups.push({ group, banks });
+        }
+        const response = {
+            groups,
+        };
+        return response;
+    }
     /**
      * Get market details
      * @param groupAddress group public key
@@ -244,13 +267,16 @@ class Client {
     async getGroup(groupAddress) {
         const body = await handleApiCall(() => this.http.get(`/group?group=${groupAddress.toString()}`));
         const marketJson = JSON.parse(body);
-        const banks = [];
+        const group = {
+            group: new anchor_1.web3.PublicKey(marketJson.group),
+            banks: [],
+        };
         for (const bankJson of marketJson.banks) {
             const bank = parseBank(bankJson);
-            banks.push(bank);
+            group.banks.push(bank);
         }
         const response = {
-            banks,
+            group,
         };
         return response;
     }
@@ -299,10 +325,11 @@ class Client {
      * @param request Adjust leverage request parameters
      * @returns Adjust leverage operation result
      */
-    async adjustLeverage(clendGroup, assetTokenMint, liabilityTokenMint, leverage, slippageBps) {
+    async adjustLeverage(clendGroup, clendAccount, assetTokenMint, liabilityTokenMint, leverage, slippageBps) {
         const req = {
             owner: this.address(),
             clendGroup,
+            clendAccount,
             assetTokenMint,
             liabilityTokenMint,
             leverage,
@@ -318,10 +345,11 @@ class Client {
      * @param request Withdraw leverage request parameters
      * @returns Withdraw leverage operation result
      */
-    async withdrawLeverage(clendGroup, outputTokenMint, assetTokenMint, liabilityTokenMint, uiAmount, slippageBps, withdrawAll) {
+    async withdrawLeverage(clendGroup, clendAccount, outputTokenMint, assetTokenMint, liabilityTokenMint, uiAmount, slippageBps, withdrawAll) {
         const req = {
             owner: this.address(),
             clendGroup,
+            clendAccount,
             outputTokenMint,
             assetTokenMint,
             liabilityTokenMint,

package/dist/types.d.ts

@@ -30,6 +30,7 @@ export interface DepositLeverageResponse {
 export interface AdjustLeverageRequest {
     owner: web3.PublicKey;
     clendGroup: web3.PublicKey;
+    clendAccount: web3.PublicKey;
     assetTokenMint: web3.PublicKey;
     liabilityTokenMint: web3.PublicKey;
     leverage: number;
@@ -48,6 +49,7 @@ export interface AdjustLeverageResponse {
 export interface WithdrawLeverageRequest {
     owner: web3.PublicKey;
     clendGroup: web3.PublicKey;
+    clendAccount: web3.PublicKey;
     outputTokenMint: web3.PublicKey;
     assetTokenMint: web3.PublicKey;
     liabilityTokenMint: web3.PublicKey;
@@ -62,7 +64,14 @@ export interface WithdrawLeverageResponse {
     userRequestId: string;
     unsignedBase64Tx: string;
 }
+export interface GetGroupsResponse {
+    groups: GroupAndBanks[];
+}
 export interface GetGroupResponse {
+    group: GroupAndBanks;
+}
+export interface GroupAndBanks {
+    group: web3.PublicKey;
     banks: Bank[];
 }
 export interface GetUserRequest {

package/package.json

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

package/src/index.ts

@@ -21,6 +21,8 @@ import {
   UserRequest,
   UserBalance,
   ClendAccountAssetLiquidation,
+  GetGroupsResponse,
+  GroupAndBanks,
 } from "./types";
 import encode from "bs58";
 
@@ -266,6 +268,35 @@ export class Client {
     };
   }
 
+  /**
+   * Get all groups
+   * @param includeBankData Whether to include bank data in the response, if not strictly necessary keep false
+   * @returns All groups
+   */
+  async getGroups(includeBankData: boolean): Promise<GetGroupsResponse> {
+    const body = await handleApiCall(() =>
+      this.http.get(`/groups?includeBankData=${includeBankData}`),
+    );
+
+    const marketJson: any = JSON.parse(body);
+    const groups: GroupAndBanks[] = [];
+    for (const groupJson of marketJson.groups) {
+      const group: web3.PublicKey = new web3.PublicKey(groupJson.group);
+      const banks: Bank[] = [];
+      for (const bankJson of groupJson.banks) {
+        const bank = parseBank(bankJson);
+        banks.push(bank);
+      }
+      groups.push({ group, banks });
+    }
+
+    const response: GetGroupsResponse = {
+      groups,
+    };
+
+    return response;
+  }
+
   /**
    * Get market details
    * @param groupAddress group public key
@@ -277,14 +308,17 @@ export class Client {
     );
 
     const marketJson: any = JSON.parse(body);
-    const banks: Bank[] = [];
+    const group: GroupAndBanks = {
+      group: new web3.PublicKey(marketJson.group),
+      banks: [],
+    };
     for (const bankJson of marketJson.banks) {
       const bank = parseBank(bankJson);
-      banks.push(bank);
+      group.banks.push(bank);
     }
 
     const response: GetGroupResponse = {
-      banks,
+      group,
     };
 
     return response;
@@ -366,6 +400,7 @@ export class Client {
    */
   async adjustLeverage(
     clendGroup: web3.PublicKey,
+    clendAccount: web3.PublicKey,
     assetTokenMint: web3.PublicKey,
     liabilityTokenMint: web3.PublicKey,
     leverage: number,
@@ -374,6 +409,7 @@ export class Client {
     const req: AdjustLeverageRequest = {
       owner: this.address(),
       clendGroup,
+      clendAccount,
       assetTokenMint,
       liabilityTokenMint,
       leverage,
@@ -400,6 +436,7 @@ export class Client {
    */
   async withdrawLeverage(
     clendGroup: web3.PublicKey,
+    clendAccount: web3.PublicKey,
     outputTokenMint: web3.PublicKey,
     assetTokenMint: web3.PublicKey,
     liabilityTokenMint: web3.PublicKey,
@@ -410,6 +447,7 @@ export class Client {
     const req: WithdrawLeverageRequest = {
       owner: this.address(),
       clendGroup,
+      clendAccount,
       outputTokenMint,
       assetTokenMint,
       liabilityTokenMint,

package/src/types.ts

@@ -35,6 +35,7 @@ export interface DepositLeverageResponse {
 export interface AdjustLeverageRequest {
   owner: web3.PublicKey;
   clendGroup: web3.PublicKey;
+  clendAccount: web3.PublicKey;
   assetTokenMint: web3.PublicKey;
   liabilityTokenMint: web3.PublicKey;
   leverage: number;
@@ -55,6 +56,7 @@ export interface AdjustLeverageResponse {
 export interface WithdrawLeverageRequest {
   owner: web3.PublicKey;
   clendGroup: web3.PublicKey;
+  clendAccount: web3.PublicKey;
   outputTokenMint: web3.PublicKey;
   assetTokenMint: web3.PublicKey;
   liabilityTokenMint: web3.PublicKey;
@@ -71,7 +73,16 @@ export interface WithdrawLeverageResponse {
   unsignedBase64Tx: string;
 }
 
+export interface GetGroupsResponse {
+  groups: GroupAndBanks[];
+}
+
 export interface GetGroupResponse {
+  group: GroupAndBanks;
+}
+
+export interface GroupAndBanks {
+  group: web3.PublicKey;
   banks: Bank[];
 }