@carrot-protocol/boost-http-client 0.5.0-bank-token-apy-timeseries-dev-e208fe4 → 0.5.0-bank-token-apy-timeseries-dev-686f9e8

package/dist/charting/bank/index.d.ts

@@ -1,9 +1,9 @@
 import { web3 } from "@coral-xyz/anchor";
-import { ApyResponse } from "./types";
-import { DateRangeOptions } from "../../types";
+import { ChartingOptions, GetBankApysResponse, GetBankMetricsResponse } from "../../types";
 import { ApiClient } from "../../api";
 export declare class BankChartingExtension extends ApiClient {
-    private readonly bank;
-    constructor(baseUrl: string, bank: web3.PublicKey);
-    getApy(options?: DateRangeOptions): Promise<ApyResponse[]>;
+    private readonly banks;
+    constructor(baseUrl: string, banks: web3.PublicKey[]);
+    getApy(options?: ChartingOptions): Promise<GetBankApysResponse>;
+    getMetrics(options?: ChartingOptions): Promise<GetBankMetricsResponse>;
 }

package/dist/charting/bank/index.js

@@ -1,26 +1,68 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BankChartingExtension = void 0;
+const anchor_1 = require("@coral-xyz/anchor");
 const api_1 = require("../../api");
 class BankChartingExtension extends api_1.ApiClient {
-    constructor(baseUrl, bank) {
+    constructor(baseUrl, banks) {
         super(baseUrl);
-        this.bank = bank;
+        this.banks = banks;
     }
     async getApy(options = {}) {
-        const { fromTime, toTime } = options;
+        const { fromTime, toTime, aggregationMethod } = options;
         const body = await this.handleApiCall(() => this.http.get(`/bank/apys`, {
             params: {
-                bank: this.bank.toString(),
+                banks: this.banks.map((b) => b.toString()).join(","),
                 fromTime: fromTime?.toISOString(),
                 toTime: toTime?.toISOString(),
+                aggregationMethod,
             },
         }));
-        const response = JSON.parse(body).map((apy) => ({
-            time: new Date(apy.time),
-            assetApy: Number(apy.supply_apy),
-            liabilityApy: Number(apy.borrow_apy),
+        const jsonResponse = JSON.parse(body);
+        const response = {
+            banks: jsonResponse.banks.map((bankData) => ({
+                bank: new anchor_1.web3.PublicKey(bankData.bank),
+                mint: new anchor_1.web3.PublicKey(bankData.mint),
+                timeseries: bankData.timeseries.map((ts) => ({
+                    time: new Date(ts.time),
+                    supplyApy: Number(ts.supplyApy),
+                    borrowApy: Number(ts.borrowApy),
+                    utilizationRate: Number(ts.utilizationRate),
+                })),
+            })),
+        };
+        return response;
+    }
+    async getMetrics(options = {}) {
+        const { fromTime, toTime, aggregationMethod } = options;
+        const body = await this.handleApiCall(() => this.http.get(`/bank/metrics`, {
+            params: {
+                banks: this.banks.map((b) => b.toString()).join(","),
+                fromTime: fromTime?.toISOString(),
+                toTime: toTime?.toISOString(),
+                aggregationMethod,
+            },
         }));
+        const jsonResponse = JSON.parse(body);
+        const response = {
+            banks: jsonResponse.banks.map((bankData) => ({
+                bank: new anchor_1.web3.PublicKey(bankData.bank),
+                timeseries: bankData.timeseries.map((ts) => ({
+                    time: new Date(ts.time),
+                    mint: new anchor_1.web3.PublicKey(ts.mint),
+                    mintDecimals: Number(ts.mintDecimals),
+                    mintPrice: Number(ts.mintPrice),
+                    mintSymbol: String(ts.mintSymbol),
+                    supplyAmount: Number(ts.supplyAmount),
+                    supplyValue: Number(ts.supplyValue),
+                    supplyApy: Number(ts.supplyApy),
+                    borrowAmount: Number(ts.borrowAmount),
+                    borrowValue: Number(ts.borrowValue),
+                    borrowApy: Number(ts.borrowApy),
+                    utilizationRate: Number(ts.utilizationRate),
+                })),
+            })),
+        };
         return response;
     }
 }

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { AnchorProvider, web3 } from "@coral-xyz/anchor";
-import { GetBankResponse, GetUserResponse, GetGroupResponse, GetUserRequest, GetGroupsResponse, GetAccountResponse, GetAccountRequest, GetWalletBalancesRequest, GetWalletBalancesResponse, GetBankApysRequest, GetBankApysResponse, GetTokenApysRequest, GetTokenApysResponse } from "./types";
+import { GetBankResponse, GetUserResponse, GetGroupResponse, GetUserRequest, GetGroupsResponse, GetAccountResponse, GetAccountRequest, GetWalletBalancesRequest, GetWalletBalancesResponse, GetTokenApysRequest, GetTokenApysResponse } from "./types";
 import { ApiClient } from "./api";
 import { PositionChartingExtension } from "./charting/position";
 import { BankChartingExtension } from "./charting/bank";
@@ -87,10 +87,6 @@ export declare class Client extends ApiClient {
      * @returns Wallet balances grouped by group with timeseries data
      */
     getWalletBalances(request?: GetWalletBalancesRequest): Promise<GetWalletBalancesResponse>;
-    /**
-     * Get bank APY timeseries for one or more banks
-     */
-    getBankApys(request: GetBankApysRequest): Promise<GetBankApysResponse>;
     /**
      * Get token yield APY timeseries for one or more mints
      */
@@ -98,5 +94,5 @@ export declare class Client extends ApiClient {
     getPerformanceChartingExtension(clendAccount: web3.PublicKey): Promise<PositionChartingExtension>;
     getGroupChartingExtension(group: web3.PublicKey): Promise<GroupChartingExtension>;
     getWalletChartingExtension(address?: web3.PublicKey): Promise<WalletChartingExtension>;
-    getBankChartingExtension(bank: web3.PublicKey): Promise<BankChartingExtension>;
+    getBankChartingExtension(banks: web3.PublicKey[]): Promise<BankChartingExtension>;
 }

package/dist/index.js

@@ -507,34 +507,6 @@ class Client extends api_1.ApiClient {
         };
         return response;
     }
-    /**
-     * Get bank APY timeseries for one or more banks
-     */
-    async getBankApys(request) {
-        const { banks, fromTime, toTime, aggregationMethod } = request;
-        const body = await this.handleApiCall(() => this.http.get(`/bank/apys`, {
-            params: {
-                banks: banks.map((b) => b.toString()).join(","),
-                fromTime: fromTime?.toISOString(),
-                toTime: toTime?.toISOString(),
-                aggregationMethod,
-            },
-        }));
-        const jsonResponse = JSON.parse(body);
-        const response = {
-            banks: jsonResponse.banks.map((bankData) => ({
-                bank: new anchor_1.web3.PublicKey(bankData.bank),
-                mint: new anchor_1.web3.PublicKey(bankData.mint),
-                timeseries: bankData.timeseries.map((ts) => ({
-                    time: new Date(ts.time),
-                    supplyApy: Number(ts.supplyApy),
-                    borrowApy: Number(ts.borrowApy),
-                    utilizationRate: Number(ts.utilizationRate),
-                })),
-            })),
-        };
-        return response;
-    }
     /**
      * Get token yield APY timeseries for one or more mints
      */
@@ -569,8 +541,8 @@ class Client extends api_1.ApiClient {
     async getWalletChartingExtension(address) {
         return new wallet_1.WalletChartingExtension(this.baseUrl, address ?? this.address());
     }
-    async getBankChartingExtension(bank) {
-        return new bank_1.BankChartingExtension(this.baseUrl, bank);
+    async getBankChartingExtension(banks) {
+        return new bank_1.BankChartingExtension(this.baseUrl, banks);
     }
 }
 exports.Client = Client;

package/dist/types.d.ts

@@ -341,6 +341,27 @@ export interface BankApysEntry {
 export interface GetBankApysResponse {
     banks: BankApysEntry[];
 }
+export interface BankMetricsTimeseries {
+    time: Date;
+    mint: web3.PublicKey;
+    mintDecimals: number;
+    mintPrice: number;
+    mintSymbol: string;
+    supplyAmount: number;
+    supplyValue: number;
+    supplyApy: number;
+    borrowAmount: number;
+    borrowValue: number;
+    borrowApy: number;
+    utilizationRate: number;
+}
+export interface BankMetricsEntry {
+    bank: web3.PublicKey;
+    timeseries: BankMetricsTimeseries[];
+}
+export interface GetBankMetricsResponse {
+    banks: BankMetricsEntry[];
+}
 export interface GetTokenApysRequest {
     mints: web3.PublicKey[];
     fromTime?: Date;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carrot-protocol/boost-http-client",
-  "version": "0.5.0-bank-token-apy-timeseries-dev-e208fe4",
+  "version": "0.5.0-bank-token-apy-timeseries-dev-686f9e8",
   "description": "HTTP client for Carrot Boost",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/charting/bank/index.ts

@@ -1,35 +1,101 @@
 import { web3 } from "@coral-xyz/anchor";
-import { ApyResponse } from "./types";
-import { DateRangeOptions } from "../../types";
+import {
+  ChartingOptions,
+  GetBankApysResponse,
+  BankApysEntry,
+  BankApyTimeseries,
+  GetBankMetricsResponse,
+  BankMetricsEntry,
+  BankMetricsTimeseries,
+} from "../../types";
 import { ApiClient } from "../../api";
 
 export class BankChartingExtension extends ApiClient {
-  private readonly bank: web3.PublicKey;
+  private readonly banks: web3.PublicKey[];
 
-  constructor(baseUrl: string, bank: web3.PublicKey) {
+  constructor(baseUrl: string, banks: web3.PublicKey[]) {
     super(baseUrl);
-    this.bank = bank;
+    this.banks = banks;
   }
 
-  public async getApy(options: DateRangeOptions = {}): Promise<ApyResponse[]> {
-    const { fromTime, toTime } = options;
+  public async getApy(
+    options: ChartingOptions = {},
+  ): Promise<GetBankApysResponse> {
+    const { fromTime, toTime, aggregationMethod } = options;
     const body = await this.handleApiCall(() =>
       this.http.get(`/bank/apys`, {
         params: {
-          bank: this.bank.toString(),
+          banks: this.banks.map((b) => b.toString()).join(","),
           fromTime: fromTime?.toISOString(),
           toTime: toTime?.toISOString(),
+          aggregationMethod,
         },
       }),
     );
 
-    const response: ApyResponse[] = JSON.parse(body).map(
-      (apy: { time: string; supply_apy: string; borrow_apy: string }) => ({
-        time: new Date(apy.time),
-        assetApy: Number(apy.supply_apy),
-        liabilityApy: Number(apy.borrow_apy),
+    const jsonResponse: any = JSON.parse(body);
+
+    const response: GetBankApysResponse = {
+      banks: jsonResponse.banks.map(
+        (bankData: any): BankApysEntry => ({
+          bank: new web3.PublicKey(bankData.bank),
+          mint: new web3.PublicKey(bankData.mint),
+          timeseries: bankData.timeseries.map(
+            (ts: any): BankApyTimeseries => ({
+              time: new Date(ts.time),
+              supplyApy: Number(ts.supplyApy),
+              borrowApy: Number(ts.borrowApy),
+              utilizationRate: Number(ts.utilizationRate),
+            }),
+          ),
+        }),
+      ),
+    };
+
+    return response;
+  }
+
+  public async getMetrics(
+    options: ChartingOptions = {},
+  ): Promise<GetBankMetricsResponse> {
+    const { fromTime, toTime, aggregationMethod } = options;
+    const body = await this.handleApiCall(() =>
+      this.http.get(`/bank/metrics`, {
+        params: {
+          banks: this.banks.map((b) => b.toString()).join(","),
+          fromTime: fromTime?.toISOString(),
+          toTime: toTime?.toISOString(),
+          aggregationMethod,
+        },
       }),
     );
+
+    const jsonResponse: any = JSON.parse(body);
+
+    const response: GetBankMetricsResponse = {
+      banks: jsonResponse.banks.map(
+        (bankData: any): BankMetricsEntry => ({
+          bank: new web3.PublicKey(bankData.bank),
+          timeseries: bankData.timeseries.map(
+            (ts: any): BankMetricsTimeseries => ({
+              time: new Date(ts.time),
+              mint: new web3.PublicKey(ts.mint),
+              mintDecimals: Number(ts.mintDecimals),
+              mintPrice: Number(ts.mintPrice),
+              mintSymbol: String(ts.mintSymbol),
+              supplyAmount: Number(ts.supplyAmount),
+              supplyValue: Number(ts.supplyValue),
+              supplyApy: Number(ts.supplyApy),
+              borrowAmount: Number(ts.borrowAmount),
+              borrowValue: Number(ts.borrowValue),
+              borrowApy: Number(ts.borrowApy),
+              utilizationRate: Number(ts.utilizationRate),
+            }),
+          ),
+        }),
+      ),
+    };
+
     return response;
   }
 }

package/src/index.ts

@@ -41,10 +41,6 @@ import {
   GroupWalletBalances,
   WalletBalances,
   WalletBalancesTimeseries,
-  GetBankApysRequest,
-  GetBankApysResponse,
-  BankApysEntry,
-  BankApyTimeseries,
   GetTokenApysRequest,
   GetTokenApysResponse,
   TokenApysEntry,
@@ -764,45 +760,6 @@ export class Client extends ApiClient {
     return response;
   }
 
-  /**
-   * Get bank APY timeseries for one or more banks
-   */
-  async getBankApys(request: GetBankApysRequest): Promise<GetBankApysResponse> {
-    const { banks, fromTime, toTime, aggregationMethod } = request;
-
-    const body = await this.handleApiCall(() =>
-      this.http.get(`/bank/apys`, {
-        params: {
-          banks: banks.map((b) => b.toString()).join(","),
-          fromTime: fromTime?.toISOString(),
-          toTime: toTime?.toISOString(),
-          aggregationMethod,
-        },
-      }),
-    );
-
-    const jsonResponse: any = JSON.parse(body);
-
-    const response: GetBankApysResponse = {
-      banks: jsonResponse.banks.map(
-        (bankData: any): BankApysEntry => ({
-          bank: new web3.PublicKey(bankData.bank),
-          mint: new web3.PublicKey(bankData.mint),
-          timeseries: bankData.timeseries.map(
-            (ts: any): BankApyTimeseries => ({
-              time: new Date(ts.time),
-              supplyApy: Number(ts.supplyApy),
-              borrowApy: Number(ts.borrowApy),
-              utilizationRate: Number(ts.utilizationRate),
-            }),
-          ),
-        }),
-      ),
-    };
-
-    return response;
-  }
-
   /**
    * Get token yield APY timeseries for one or more mints
    */
@@ -860,9 +817,9 @@ export class Client extends ApiClient {
   }
 
   public async getBankChartingExtension(
-    bank: web3.PublicKey,
+    banks: web3.PublicKey[],
   ): Promise<BankChartingExtension> {
-    return new BankChartingExtension(this.baseUrl, bank);
+    return new BankChartingExtension(this.baseUrl, banks);
   }
 }
 

package/src/types.ts

@@ -406,6 +406,31 @@ export interface GetBankApysResponse {
   banks: BankApysEntry[];
 }
 
+// Bank metrics time-series
+export interface BankMetricsTimeseries {
+  time: Date;
+  mint: web3.PublicKey;
+  mintDecimals: number;
+  mintPrice: number;
+  mintSymbol: string;
+  supplyAmount: number;
+  supplyValue: number;
+  supplyApy: number;
+  borrowAmount: number;
+  borrowValue: number;
+  borrowApy: number;
+  utilizationRate: number;
+}
+
+export interface BankMetricsEntry {
+  bank: web3.PublicKey;
+  timeseries: BankMetricsTimeseries[];
+}
+
+export interface GetBankMetricsResponse {
+  banks: BankMetricsEntry[];
+}
+
 // Token yield APY time-series
 export interface GetTokenApysRequest {
   mints: web3.PublicKey[];

package/dist/charting/bank/types.d.ts

@@ -1,5 +0,0 @@
-export interface ApyResponse {
-    time: Date;
-    assetApy: number;
-    liabilityApy: number;
-}

package/dist/charting/bank/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/src/charting/bank/types.ts

@@ -1,5 +0,0 @@
-export interface ApyResponse {
-  time: Date;
-  assetApy: number;
-  liabilityApy: number;
-}