@carrot-protocol/boost-http-client 0.2.15-group-refactor1-dev-72c1344 → 0.2.15-group-refactor1-dev-5488543

package/dist/index.js

@@ -107,6 +107,7 @@ class Client {
     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);
+        console.log(JSON.stringify(jsonRawResponse, null, 2));
         // parse balances
         const walletBalances = [];
         for (const b of jsonRawResponse.wallet.balances) {
@@ -202,9 +203,13 @@ class Client {
                     assetBalance: new anchor_1.BN(b.assetBalance, "hex"),
                     assetBalanceUi: Number(b.assetBalanceUi),
                     assetValue: Number(b.assetValue),
+                    assetYieldBps: Number(b.assetYieldBps),
+                    assetYieldApy: Number(b.assetYieldApy),
                     liabilityBalance: new anchor_1.BN(b.liabilityBalance, "hex"),
                     liabilityBalanceUi: Number(b.liabilityBalanceUi),
                     liabilityValue: Number(b.liabilityValue),
+                    liabilityBorrowCostBps: Number(b.liabilityBorrowCostBps),
+                    liabilityBorrowCostApy: Number(b.liabilityBorrowCostApy),
                     price: Number(b.price),
                     liquidation,
                 });
@@ -269,11 +274,11 @@ class Client {
         const body = await handleApiCall(() => this.http.get(`/group?group=${groupAddress.toString()}`));
         const marketJson = JSON.parse(body);
         const group = {
-            group: new anchor_1.web3.PublicKey(marketJson.group),
-            groupName: marketJson.groupName,
+            group: new anchor_1.web3.PublicKey(marketJson.group.group),
+            groupName: marketJson.group.groupName,
             banks: [],
         };
-        for (const bankJson of marketJson.banks) {
+        for (const bankJson of marketJson.group.banks) {
             const bank = parseBank(bankJson);
             group.banks.push(bank);
         }

package/dist/types.d.ts

@@ -117,9 +117,13 @@ export interface ClendAccountBalance {
     assetBalance: BN;
     assetBalanceUi: number;
     assetValue: number;
+    assetYieldBps: number;
+    assetYieldApy: number;
     liabilityBalance: BN;
     liabilityBalanceUi: number;
     liabilityValue: number;
+    liabilityBorrowCostBps: number;
+    liabilityBorrowCostApy: number;
     price: number;
     liquidation: ClendAccountAssetLiquidation | null;
 }

package/package.json

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

package/src/index.ts

@@ -119,6 +119,7 @@ export class Client {
     );
 
     const jsonRawResponse: any = JSON.parse(body);
+    console.log(JSON.stringify(jsonRawResponse, null, 2));
 
     // parse balances
     const walletBalances: UserBalance[] = [];
@@ -227,9 +228,13 @@ export class Client {
           assetBalance: new BN(b.assetBalance, "hex"),
           assetBalanceUi: Number(b.assetBalanceUi),
           assetValue: Number(b.assetValue),
+          assetYieldBps: Number(b.assetYieldBps),
+          assetYieldApy: Number(b.assetYieldApy),
           liabilityBalance: new BN(b.liabilityBalance, "hex"),
           liabilityBalanceUi: Number(b.liabilityBalanceUi),
           liabilityValue: Number(b.liabilityValue),
+          liabilityBorrowCostBps: Number(b.liabilityBorrowCostBps),
+          liabilityBorrowCostApy: Number(b.liabilityBorrowCostApy),
           price: Number(b.price),
           liquidation,
         });
@@ -310,11 +315,11 @@ export class Client {
 
     const marketJson: any = JSON.parse(body);
     const group: GroupAndBanks = {
-      group: new web3.PublicKey(marketJson.group),
-      groupName: marketJson.groupName,
+      group: new web3.PublicKey(marketJson.group.group),
+      groupName: marketJson.group.groupName,
       banks: [],
     };
-    for (const bankJson of marketJson.banks) {
+    for (const bankJson of marketJson.group.banks) {
       const bank = parseBank(bankJson);
       group.banks.push(bank);
     }

package/src/types.ts

@@ -134,9 +134,13 @@ export interface ClendAccountBalance {
   assetBalance: BN;
   assetBalanceUi: number;
   assetValue: number;
+  assetYieldBps: number;
+  assetYieldApy: number;
   liabilityBalance: BN;
   liabilityBalanceUi: number;
   liabilityValue: number;
+  liabilityBorrowCostBps: number;
+  liabilityBorrowCostApy: number;
   price: number;
   liquidation: ClendAccountAssetLiquidation | null;
 }