@carrot-protocol/boost-http-client 0.2.6 → 0.2.7-actions1-dev-4c5f4e1

package/dist/index.js

@@ -109,7 +109,7 @@ class Client {
         if (!user) {
             user = this.address();
         }
-        const body = await handleApiCall(() => this.http.get(`/user?user=${user.toString()}&getClendEvents=${request.getClendEvents}`));
+        const body = await handleApiCall(() => this.http.get(`/user?user=${user.toString()}&getClendAccountSummary=${request.getClendAccountSummary}`));
         const jsonRawResponse = JSON.parse(body);
         // get tokens still in user wallet
         const wallet = {
@@ -125,7 +125,7 @@ class Client {
             return {
                 wallet,
                 clendAccount: undefined,
-                events: [],
+                summary: [],
             };
         }
         // parse lending account balances
@@ -159,34 +159,41 @@ class Client {
             liquidationPriceChangePercentage: Number(jsonRawResponse.clendAccount.liquidationPriceChangePercentage),
             ltv: Number(jsonRawResponse.clendAccount.ltv),
         };
-        // get events for account
-        const events = [];
-        for (const event of jsonRawResponse.events) {
-            let closeBalance = null;
-            if (event.closeBalance !== null) {
-                closeBalance = Boolean(event.closeBalance);
-            }
-            // parse amount
-            const clendAccountEvent = {
-                txSig: event.txSig,
-                eventIndex: event.eventIndex,
-                time: event.time,
-                eventName: event.eventName,
-                clendAccount: new anchor_1.web3.PublicKey(event.clendAccount),
-                signer: event.signer ? new anchor_1.web3.PublicKey(event.signer) : null,
-                clendAccountAuthority: new anchor_1.web3.PublicKey(event.clendAccountAuthority),
-                clendGroup: new anchor_1.web3.PublicKey(event.clendGroup),
-                bank: event.bank ? new anchor_1.web3.PublicKey(event.bank) : null,
-                mint: event.mint ? new anchor_1.web3.PublicKey(event.mint) : null,
-                amount: event.amount ? new anchor_1.BN(event.amount) : null,
-                closeBalance,
+        // get tx summary for each account
+        const summary = [];
+        for (const s of jsonRawResponse.summary) {
+            const txSummary = {
+                txSig: s.txSig,
+                time: s.time,
+                clendAccount: new anchor_1.web3.PublicKey(s.clendAccount),
+                clendAccountAuthority: new anchor_1.web3.PublicKey(s.clendAccountAuthority),
+                clendGroup: new anchor_1.web3.PublicKey(s.clendGroup),
+                action: s.action,
+                events: [],
             };
-            events.push(clendAccountEvent);
+            // get events for each summary
+            for (const event of s.events) {
+                let closeBalance = null;
+                if (event.closeBalance !== null) {
+                    closeBalance = Boolean(event.closeBalance);
+                }
+                // parse amount
+                const clendAccountEvent = {
+                    eventIndex: event.eventIndex,
+                    eventName: event.eventName,
+                    bank: event.bank ? new anchor_1.web3.PublicKey(event.bank) : null,
+                    mint: event.mint ? new anchor_1.web3.PublicKey(event.mint) : null,
+                    amount: event.amount ? new anchor_1.BN(event.amount, "hex") : null,
+                    closeBalance,
+                };
+                txSummary.events.push(clendAccountEvent);
+            }
+            summary.push(txSummary);
         }
         return {
             wallet,
             clendAccount,
-            events,
+            summary,
         };
     }
     /**

package/dist/types.d.ts

@@ -53,12 +53,12 @@ export interface GetGroupResponse {
 }
 export interface GetUserRequest {
     user?: web3.PublicKey;
-    getClendEvents?: boolean;
+    getClendAccountSummary?: boolean;
 }
 export interface GetUserResponse {
     wallet: UserWallet;
     clendAccount: ClendAccount | undefined;
-    events: ClendAccountEvent[];
+    summary: ClendAccountTxSummary[];
 }
 export interface UserWallet {
     usdcBalance: BN;
@@ -122,15 +122,18 @@ export interface Bank {
     borrowLimit: BN;
     borrowLimitUi: number;
 }
-export interface ClendAccountEvent {
+export interface ClendAccountTxSummary {
     txSig: string;
-    eventIndex: number;
     time: Date;
-    eventName: string;
     clendAccount: web3.PublicKey;
-    signer: web3.PublicKey | null;
     clendAccountAuthority: web3.PublicKey;
     clendGroup: web3.PublicKey;
+    action: string;
+    events: ClendAccountEvent[];
+}
+export interface ClendAccountEvent {
+    eventIndex: number;
+    eventName: string;
     bank: web3.PublicKey | null;
     mint: web3.PublicKey | null;
     amount: BN | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carrot-protocol/boost-http-client",
-  "version": "0.2.6",
+  "version": "0.2.7-actions1-dev-4c5f4e1",
   "description": "HTTP client for Carrot Boost API",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -17,6 +17,7 @@ import {
   GetGroupResponse,
   ClendAccountEvent,
   GetUserRequest,
+  ClendAccountTxSummary,
 } from "./types";
 import encode from "bs58";
 
@@ -106,7 +107,7 @@ export class Client {
 
     const body = await handleApiCall(() =>
       this.http.get(
-        `/user?user=${user.toString()}&getClendEvents=${request.getClendEvents}`,
+        `/user?user=${user.toString()}&getClendAccountSummary=${request.getClendAccountSummary}`,
       ),
     );
 
@@ -127,7 +128,7 @@ export class Client {
       return {
         wallet,
         clendAccount: undefined,
-        events: [],
+        summary: [],
       };
     }
 
@@ -174,36 +175,44 @@ export class Client {
       ltv: Number(jsonRawResponse.clendAccount.ltv),
     };
 
-    // get events for account
-    const events: ClendAccountEvent[] = [];
-    for (const event of jsonRawResponse.events) {
-      let closeBalance: boolean | null = null;
-      if (event.closeBalance !== null) {
-        closeBalance = Boolean(event.closeBalance);
-      }
-
-      // parse amount
-      const clendAccountEvent: ClendAccountEvent = {
-        txSig: event.txSig,
-        eventIndex: event.eventIndex,
-        time: event.time,
-        eventName: event.eventName,
-        clendAccount: new web3.PublicKey(event.clendAccount),
-        signer: event.signer ? new web3.PublicKey(event.signer) : null,
-        clendAccountAuthority: new web3.PublicKey(event.clendAccountAuthority),
-        clendGroup: new web3.PublicKey(event.clendGroup),
-        bank: event.bank ? new web3.PublicKey(event.bank) : null,
-        mint: event.mint ? new web3.PublicKey(event.mint) : null,
-        amount: event.amount ? new BN(event.amount) : null,
-        closeBalance,
+    // get tx summary for each account
+    const summary: ClendAccountTxSummary[] = [];
+    for (const s of jsonRawResponse.summary) {
+      const txSummary: ClendAccountTxSummary = {
+        txSig: s.txSig,
+        time: s.time,
+        clendAccount: new web3.PublicKey(s.clendAccount),
+        clendAccountAuthority: new web3.PublicKey(s.clendAccountAuthority),
+        clendGroup: new web3.PublicKey(s.clendGroup),
+        action: s.action,
+        events: [],
       };
-      events.push(clendAccountEvent);
+
+      // get events for each summary
+      for (const event of s.events) {
+        let closeBalance: boolean | null = null;
+        if (event.closeBalance !== null) {
+          closeBalance = Boolean(event.closeBalance);
+        }
+
+        // parse amount
+        const clendAccountEvent: ClendAccountEvent = {
+          eventIndex: event.eventIndex,
+          eventName: event.eventName,
+          bank: event.bank ? new web3.PublicKey(event.bank) : null,
+          mint: event.mint ? new web3.PublicKey(event.mint) : null,
+          amount: event.amount ? new BN(event.amount, "hex") : null,
+          closeBalance,
+        };
+        txSummary.events.push(clendAccountEvent);
+      }
+      summary.push(txSummary);
     }
 
     return {
       wallet,
       clendAccount,
-      events,
+      summary,
     };
   }
 

package/src/types.ts

@@ -1,5 +1,4 @@
 import { BN, web3 } from "@coral-xyz/anchor";
-import Decimal from "decimal.js";
 
 // Represents a request to send a transaction
 export interface SendRequest {
@@ -64,13 +63,13 @@ export interface GetGroupResponse {
 
 export interface GetUserRequest {
   user?: web3.PublicKey;
-  getClendEvents?: boolean;
+  getClendAccountSummary?: boolean;
 }
 
 export interface GetUserResponse {
   wallet: UserWallet;
   clendAccount: ClendAccount | undefined;
-  events: ClendAccountEvent[];
+  summary: ClendAccountTxSummary[];
 }
 
 export interface UserWallet {
@@ -140,15 +139,19 @@ export interface Bank {
   borrowLimitUi: number;
 }
 
-export interface ClendAccountEvent {
+export interface ClendAccountTxSummary {
   txSig: string;
-  eventIndex: number;
   time: Date;
-  eventName: string;
   clendAccount: web3.PublicKey;
-  signer: web3.PublicKey | null;
   clendAccountAuthority: web3.PublicKey;
   clendGroup: web3.PublicKey;
+  action: string;
+  events: ClendAccountEvent[];
+}
+
+export interface ClendAccountEvent {
+  eventIndex: number;
+  eventName: string;
   bank: web3.PublicKey | null;
   mint: web3.PublicKey | null;
   amount: BN | null;