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

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { AnchorProvider, web3 } from "@coral-xyz/anchor";
-import { GetBankResponse, GetUserResponse, GetGroupResponse, GetUserRequest } from "./types";
+import { GetBankResponse, GetUserResponse, GetGroupResponse } from "./types";
 export * from "./types";
 export * from "./utils";
 export * as Common from "@carrot-protocol/clend-common";
@@ -27,7 +27,7 @@ export declare class Client {
      * @param user wallet public key
      * @returns User details
      */
-    getUser(request: GetUserRequest): Promise<GetUserResponse>;
+    getUser(group: web3.PublicKey, user: web3.PublicKey, getClendAccountSummary: boolean): Promise<GetUserResponse>;
     /**
      * Get market details
      * @param groupAddress group public key

package/dist/index.js

@@ -104,13 +104,8 @@ class Client {
      * @param user wallet public key
      * @returns User details
      */
-    async getUser(request) {
-        // use loaded wallet if not provided
-        let user = request.user;
-        if (!user) {
-            user = this.address();
-        }
-        const body = await handleApiCall(() => this.http.get(`/user?user=${user.toString()}&getClendAccountSummary=${request.getClendAccountSummary}`));
+    async getUser(group, user, getClendAccountSummary) {
+        const body = await handleApiCall(() => this.http.get(`/user?user=${user.toString()}&group=${group.toString()}&getClendAccountSummary=${getClendAccountSummary}`));
         const jsonRawResponse = JSON.parse(body);
         // parse balances
         const walletBalances = [];
@@ -127,7 +122,7 @@ class Client {
         };
         // get tx summary for each account and group them
         const summaryByAccount = new Map();
-        if (request.getClendAccountSummary && jsonRawResponse.summary) {
+        if (getClendAccountSummary && jsonRawResponse.summary) {
             for (const s of jsonRawResponse.summary) {
                 const accountAddress = new anchor_1.web3.PublicKey(s.clendAccount).toBase58();
                 if (!summaryByAccount.has(accountAddress)) {

package/dist/types.d.ts

@@ -65,8 +65,9 @@ export interface GetGroupResponse {
     banks: Bank[];
 }
 export interface GetUserRequest {
-    user?: web3.PublicKey;
-    getClendAccountSummary?: boolean;
+    group: web3.PublicKey;
+    user: web3.PublicKey;
+    getClendAccountSummary: boolean;
 }
 export interface GetUserResponse {
     wallet: UserWallet;

package/package.json

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

package/src/index.ts

@@ -104,16 +104,14 @@ export class Client {
    * @param user wallet public key
    * @returns User details
    */
-  async getUser(request: GetUserRequest): Promise<GetUserResponse> {
-    // use loaded wallet if not provided
-    let user = request.user;
-    if (!user) {
-      user = this.address();
-    }
-
+  async getUser(
+    group: web3.PublicKey,
+    user: web3.PublicKey,
+    getClendAccountSummary: boolean,
+  ): Promise<GetUserResponse> {
     const body = await handleApiCall(() =>
       this.http.get(
-        `/user?user=${user.toString()}&getClendAccountSummary=${request.getClendAccountSummary}`,
+        `/user?user=${user.toString()}&group=${group.toString()}&getClendAccountSummary=${getClendAccountSummary}`,
       ),
     );
 
@@ -136,7 +134,7 @@ export class Client {
 
     // get tx summary for each account and group them
     const summaryByAccount = new Map<string, ClendAccountTxSummary[]>();
-    if (request.getClendAccountSummary && jsonRawResponse.summary) {
+    if (getClendAccountSummary && jsonRawResponse.summary) {
       for (const s of jsonRawResponse.summary) {
         const accountAddress = new web3.PublicKey(s.clendAccount).toBase58();
         if (!summaryByAccount.has(accountAddress)) {

package/src/types.ts

@@ -75,8 +75,9 @@ export interface GetGroupResponse {
 }
 
 export interface GetUserRequest {
-  user?: web3.PublicKey;
-  getClendAccountSummary?: boolean;
+  group: web3.PublicKey;
+  user: web3.PublicKey;
+  getClendAccountSummary: boolean;
 }
 
 export interface GetUserResponse {