@carrot-protocol/boost-http-client 0.2.15-group-refactor1-dev-ef145c2 → 0.2.15-group-refactor1-dev-d9350a8

package/dist/index.d.ts

@@ -27,7 +27,7 @@ export declare class Client {
      * @param user wallet public key
      * @returns User details
      */
-    getUser(group: web3.PublicKey, user: web3.PublicKey, getClendAccountSummary: boolean): Promise<GetUserResponse>;
+    getUser(groups: web3.PublicKey[], user: web3.PublicKey, getClendAccountSummary: boolean): Promise<GetUserResponse>;
     /**
      * Get market details
      * @param groupAddress group public key

package/dist/index.js

@@ -104,8 +104,8 @@ class Client {
      * @param user wallet public key
      * @returns User details
      */
-    async getUser(group, user, getClendAccountSummary) {
-        const body = await handleApiCall(() => this.http.get(`/user?user=${user.toString()}&group=${group.toString()}&getClendAccountSummary=${getClendAccountSummary}`));
+    async getUser(groups, user, getClendAccountSummary) {
+        const body = await handleApiCall(() => this.http.get(`/user?user=${user.toString()}&groups=${groups.map((g) => g.toString()).join(",")}&getClendAccountSummary=${getClendAccountSummary}`));
         const jsonRawResponse = JSON.parse(body);
         // parse balances
         const walletBalances = [];
@@ -199,6 +199,8 @@ class Client {
                         liabilityBalanceUi: Number(b.liabilityBalanceUi),
                         liabilityValue: Number(b.liabilityValue),
                         price: Number(b.price),
+                        liquidationPrice: Number(b.liquidationPrice),
+                        liquidationPriceChangePercentage: Number(b.liquidationPriceChangePercentage),
                     });
                 }
                 // create clend account
@@ -213,8 +215,6 @@ class Client {
                     healthFactorRiskAdjusted: Number(ca.healthFactorRiskAdjusted),
                     notionalLeverage: Number(ca.notionalLeverage),
                     riskAdjustedLeverage: Number(ca.riskAdjustedLeverage),
-                    liquidationPrice: Number(ca.liquidationPrice),
-                    liquidationPriceChangePercentage: Number(ca.liquidationPriceChangePercentage),
                     notionalLtv: Number(ca.notionalLtv),
                     riskAdjustedLtv: Number(ca.riskAdjustedLtv),
                 };

package/dist/types.d.ts

@@ -65,7 +65,7 @@ export interface GetGroupResponse {
     banks: Bank[];
 }
 export interface GetUserRequest {
-    group: web3.PublicKey;
+    groups: web3.PublicKey[];
     user: web3.PublicKey;
     getClendAccountSummary: boolean;
 }
@@ -95,8 +95,6 @@ export interface ClendAccount {
     healthFactorRiskAdjusted: number;
     notionalLeverage: number;
     riskAdjustedLeverage: number;
-    liquidationPrice: number;
-    liquidationPriceChangePercentage: number;
     notionalLtv: number;
     riskAdjustedLtv: number;
 }
@@ -110,6 +108,8 @@ export interface ClendAccountBalance {
     liabilityBalanceUi: number;
     liabilityValue: number;
     price: number;
+    liquidationPrice: number;
+    liquidationPriceChangePercentage: number;
 }
 export interface GetBankResponse {
     bank: Bank;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carrot-protocol/boost-http-client",
-  "version": "0.2.15-group-refactor1-dev-ef145c2",
+  "version": "0.2.15-group-refactor1-dev-d9350a8",
   "description": "HTTP client for Carrot Boost",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.29.0",
-    "@carrot-protocol/clend-common": "0.1.7",
+    "@carrot-protocol/clend-common": "0.1.8-group-refactor1-dev-cb4b228",
     "axios": "^1.8.3",
     "bs58": "^6.0.0",
     "decimal.js": "^10.5.0"

package/src/index.ts

@@ -105,13 +105,13 @@ export class Client {
    * @returns User details
    */
   async getUser(
-    group: web3.PublicKey,
+    groups: web3.PublicKey[],
     user: web3.PublicKey,
     getClendAccountSummary: boolean,
   ): Promise<GetUserResponse> {
     const body = await handleApiCall(() =>
       this.http.get(
-        `/user?user=${user.toString()}&group=${group.toString()}&getClendAccountSummary=${getClendAccountSummary}`,
+        `/user?user=${user.toString()}&groups=${groups.map((g) => g.toString()).join(",")}&getClendAccountSummary=${getClendAccountSummary}`,
       ),
     );
 
@@ -222,6 +222,10 @@ export class Client {
             liabilityBalanceUi: Number(b.liabilityBalanceUi),
             liabilityValue: Number(b.liabilityValue),
             price: Number(b.price),
+            liquidationPrice: Number(b.liquidationPrice),
+            liquidationPriceChangePercentage: Number(
+              b.liquidationPriceChangePercentage,
+            ),
           });
         }
 
@@ -239,10 +243,6 @@ export class Client {
           ),
           notionalLeverage: Number((ca as any).notionalLeverage),
           riskAdjustedLeverage: Number((ca as any).riskAdjustedLeverage),
-          liquidationPrice: Number((ca as any).liquidationPrice),
-          liquidationPriceChangePercentage: Number(
-            (ca as any).liquidationPriceChangePercentage,
-          ),
           notionalLtv: Number((ca as any).notionalLtv),
           riskAdjustedLtv: Number((ca as any).riskAdjustedLtv),
         };

package/src/types.ts

@@ -75,7 +75,7 @@ export interface GetGroupResponse {
 }
 
 export interface GetUserRequest {
-  group: web3.PublicKey;
+  groups: web3.PublicKey[];
   user: web3.PublicKey;
   getClendAccountSummary: boolean;
 }
@@ -109,8 +109,6 @@ export interface ClendAccount {
   healthFactorRiskAdjusted: number;
   notionalLeverage: number;
   riskAdjustedLeverage: number;
-  liquidationPrice: number;
-  liquidationPriceChangePercentage: number;
   notionalLtv: number;
   riskAdjustedLtv: number;
 }
@@ -125,6 +123,8 @@ export interface ClendAccountBalance {
   liabilityBalanceUi: number;
   liabilityValue: number;
   price: number;
+  liquidationPrice: number;
+  liquidationPriceChangePercentage: number;
 }
 
 export interface GetBankResponse {