@carrot-protocol/boost-http-client 0.2.7-actions1-dev-ccd7ce6 → 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 = {
@@ -161,35 +161,29 @@ class Client {
         };
         // get tx summary for each account
         const summary = [];
-        for (const summary of jsonRawResponse.summary) {
+        for (const s of jsonRawResponse.summary) {
             const txSummary = {
-                txSig: summary.txSig,
-                time: summary.time,
-                clendAccount: new anchor_1.web3.PublicKey(summary.clendAccount),
-                clendAccountAuthority: new anchor_1.web3.PublicKey(summary.clendAccountAuthority),
-                clendGroup: new anchor_1.web3.PublicKey(summary.clendGroup),
-                action: summary.action,
+                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: [],
             };
             // get events for each summary
-            for (const event of summary.events) {
+            for (const event of s.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,
+                    amount: event.amount ? new anchor_1.BN(event.amount, "hex") : null,
                     closeBalance,
                 };
                 txSummary.events.push(clendAccountEvent);

package/dist/types.d.ts

@@ -53,7 +53,7 @@ export interface GetGroupResponse {
 }
 export interface GetUserRequest {
     user?: web3.PublicKey;
-    getClendEvents?: boolean;
+    getClendAccountSummary?: boolean;
 }
 export interface GetUserResponse {
     wallet: UserWallet;
@@ -132,14 +132,8 @@ export interface ClendAccountTxSummary {
     events: ClendAccountEvent[];
 }
 export interface ClendAccountEvent {
-    txSig: string;
     eventIndex: number;
-    time: Date;
     eventName: string;
-    clendAccount: web3.PublicKey;
-    signer: web3.PublicKey | null;
-    clendAccountAuthority: web3.PublicKey;
-    clendGroup: web3.PublicKey;
     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.7-actions1-dev-ccd7ce6",
+  "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

@@ -107,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}`,
       ),
     );
 
@@ -177,21 +177,19 @@ export class Client {
 
     // get tx summary for each account
     const summary: ClendAccountTxSummary[] = [];
-    for (const summary of jsonRawResponse.summary) {
+    for (const s of jsonRawResponse.summary) {
       const txSummary: ClendAccountTxSummary = {
-        txSig: summary.txSig,
-        time: summary.time,
-        clendAccount: new web3.PublicKey(summary.clendAccount),
-        clendAccountAuthority: new web3.PublicKey(
-          summary.clendAccountAuthority,
-        ),
-        clendGroup: new web3.PublicKey(summary.clendGroup),
-        action: summary.action,
+        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: [],
       };
 
       // get events for each summary
-      for (const event of summary.events) {
+      for (const event of s.events) {
         let closeBalance: boolean | null = null;
         if (event.closeBalance !== null) {
           closeBalance = Boolean(event.closeBalance);
@@ -199,19 +197,11 @@ export class Client {
 
         // 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,
+          amount: event.amount ? new BN(event.amount, "hex") : null,
           closeBalance,
         };
         txSummary.events.push(clendAccountEvent);

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,7 +63,7 @@ export interface GetGroupResponse {
 
 export interface GetUserRequest {
   user?: web3.PublicKey;
-  getClendEvents?: boolean;
+  getClendAccountSummary?: boolean;
 }
 
 export interface GetUserResponse {
@@ -151,14 +150,8 @@ export interface ClendAccountTxSummary {
 }
 
 export interface ClendAccountEvent {
-  txSig: string;
   eventIndex: number;
-  time: Date;
   eventName: string;
-  clendAccount: web3.PublicKey;
-  signer: web3.PublicKey | null;
-  clendAccountAuthority: web3.PublicKey;
-  clendGroup: web3.PublicKey;
   bank: web3.PublicKey | null;
   mint: web3.PublicKey | null;
   amount: BN | null;