@carrot-protocol/boost-http-client 0.4.0-stub-position-endpoints-dev-666335f → 0.4.0-stub-position-endpoints-dev-f996c8b

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

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

package/dist/charting/bank/index.js

@@ -8,11 +8,12 @@ class BankChartingExtension extends api_1.ApiClient {
         this.bank = bank;
     }
     async getApy(options = {}) {
+        const { fromTime, toTime } = options;
         const body = await this.handleApiCall(() => this.http.get(`/bank/apys`, {
             params: {
                 bank: this.bank.toString(),
-                fromTime: options.fromTime?.toISOString(),
-                toTime: options.toTime?.toISOString(),
+                fromTime: fromTime?.toISOString(),
+                toTime: toTime?.toISOString(),
             },
         }));
         const response = JSON.parse(body).map((apy) => ({

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

@@ -1,11 +1,9 @@
 import { web3 } from "@coral-xyz/anchor";
 import { PerformanceResponse } from "./types";
 import { ApiClient } from "../../api";
+import { DateRangeOptions } from "../../types";
 export declare class GroupChartingExtension extends ApiClient {
     private readonly group;
     constructor(baseUrl: string, group: web3.PublicKey);
-    getPerformance(options?: {
-        fromTime?: Date;
-        toTime?: Date;
-    }): Promise<PerformanceResponse[]>;
+    getPerformance(options?: DateRangeOptions): Promise<PerformanceResponse[]>;
 }

package/dist/charting/group/index.js

@@ -8,11 +8,12 @@ class GroupChartingExtension extends api_1.ApiClient {
         this.group = group;
     }
     async getPerformance(options = {}) {
+        const { fromTime, toTime } = options;
         const body = await this.handleApiCall(() => this.http.get(`/group/pnls`, {
             params: {
                 group: this.group.toString(),
-                fromTime: options.fromTime?.toISOString(),
-                toTime: options.toTime?.toISOString(),
+                fromTime: fromTime?.toISOString(),
+                toTime: toTime?.toISOString(),
             },
         }));
         const response = JSON.parse(body).map((performance) => ({

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

@@ -1,5 +1,6 @@
 import { web3 } from "@coral-xyz/anchor";
 import { ApyResponse, LoanBalanceResponse, PerformanceResponse } from "./types";
+import { ChartingOptions } from "../../types";
 import { ApiClient } from "../../api";
 export declare class PositionChartingExtension extends ApiClient {
     private readonly clendAccount;
@@ -8,12 +9,6 @@ export declare class PositionChartingExtension extends ApiClient {
         fromTime?: Date;
         toTime?: Date;
     }): Promise<LoanBalanceResponse[]>;
-    getPerformance(options?: {
-        fromTime?: Date;
-        toTime?: Date;
-    }): Promise<PerformanceResponse[]>;
-    getApy(options?: {
-        fromTime?: Date;
-        toTime?: Date;
-    }): Promise<ApyResponse[]>;
+    getPerformance(options?: ChartingOptions): Promise<PerformanceResponse[]>;
+    getApy(options?: ChartingOptions): Promise<ApyResponse[]>;
 }

package/dist/charting/position/index.js

@@ -25,11 +25,13 @@ class PositionChartingExtension extends api_1.ApiClient {
         return response;
     }
     async getPerformance(options = {}) {
+        const { fromTime, toTime, aggregationMethod } = options;
         const body = await this.handleApiCall(() => this.http.get(`/account/performance`, {
             params: {
                 account: this.clendAccount.toString(),
-                fromTime: options.fromTime?.toISOString(),
-                toTime: options.toTime?.toISOString(),
+                fromTime: fromTime?.toISOString(),
+                toTime: toTime?.toISOString(),
+                aggregationMethod,
             },
         }));
         const response = JSON.parse(body).map((performance) => ({
@@ -41,11 +43,13 @@ class PositionChartingExtension extends api_1.ApiClient {
         return response;
     }
     async getApy(options = {}) {
+        const { fromTime, toTime, aggregationMethod } = options;
         const body = await this.handleApiCall(() => this.http.get(`/account/apys`, {
             params: {
                 account: this.clendAccount.toString(),
-                fromTime: options.fromTime?.toISOString(),
-                toTime: options.toTime?.toISOString(),
+                fromTime: fromTime?.toISOString(),
+                toTime: toTime?.toISOString(),
+                aggregationMethod,
             },
         }));
         const response = JSON.parse(body).map((apy) => ({

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

@@ -1,11 +1,9 @@
 import { web3 } from "@coral-xyz/anchor";
 import { PerformanceResponse } from "./types";
 import { ApiClient } from "../../api";
+import { DateRangeOptions } from "../../types";
 export declare class WalletChartingExtension extends ApiClient {
     private readonly address;
     constructor(baseUrl: string, address: web3.PublicKey);
-    getPerformance(options?: {
-        fromTime?: Date;
-        toTime?: Date;
-    }): Promise<PerformanceResponse[]>;
+    getPerformance(options?: DateRangeOptions): Promise<PerformanceResponse[]>;
 }

package/dist/charting/wallet/index.js

@@ -8,11 +8,12 @@ class WalletChartingExtension extends api_1.ApiClient {
         this.address = address;
     }
     async getPerformance(options = {}) {
+        const { fromTime, toTime } = options;
         const body = await this.handleApiCall(() => this.http.get(`/user/pnls`, {
             params: {
                 authority: this.address.toString(),
-                fromTime: options.fromTime?.toISOString(),
-                toTime: options.toTime?.toISOString(),
+                fromTime: fromTime?.toISOString(),
+                toTime: toTime?.toISOString(),
             },
         }));
         const response = JSON.parse(body).map((performance) => ({

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { AnchorProvider, web3 } from "@coral-xyz/anchor";
-import { GetBankResponse, GetUserResponse, GetGroupResponse, GetUserRequest, GetGroupsResponse, GetAccountResponse, GetAccountRequest, ExtensionKey } from "./types";
+import { GetBankResponse, GetUserResponse, GetGroupResponse, GetUserRequest, GetGroupsResponse, GetAccountResponse, GetAccountRequest } from "./types";
 import { ApiClient } from "./api";
 import { PositionChartingExtension } from "./charting/position";
 import { BankChartingExtension } from "./charting/bank";
@@ -79,5 +79,8 @@ export declare class Client extends ApiClient {
      * @returns Withdraw emissions operation result
      */
     withdrawEmissions(clendAccount: web3.PublicKey): Promise<string>;
-    getExtension(extension: ExtensionKey): Promise<((clendAccount: web3.PublicKey) => PositionChartingExtension) | ((group: web3.PublicKey) => GroupChartingExtension) | ((address?: web3.PublicKey) => WalletChartingExtension) | ((bank: web3.PublicKey) => BankChartingExtension)>;
+    getPerformanceChartingExtension(clendAccount: web3.PublicKey): Promise<PositionChartingExtension>;
+    getGroupChartingExtension(group: web3.PublicKey): Promise<GroupChartingExtension>;
+    getWalletChartingExtension(address?: web3.PublicKey): Promise<WalletChartingExtension>;
+    getBankChartingExtension(bank: web3.PublicKey): Promise<BankChartingExtension>;
 }

package/dist/index.js

@@ -428,19 +428,17 @@ class Client extends api_1.ApiClient {
         const txSig = await this.send(withdrawEmissionsResponse.unsignedBase64Tx, withdrawEmissionsResponse.userRequestId);
         return txSig;
     }
-    async getExtension(extension) {
-        switch (extension) {
-            case "positionCharting":
-                return (clendAccount) => new position_1.PositionChartingExtension(this.baseUrl, clendAccount);
-            case "groupCharting":
-                return (group) => new group_1.GroupChartingExtension(this.baseUrl, group);
-            case "walletCharting":
-                return (address) => new wallet_1.WalletChartingExtension(this.baseUrl, address ?? this.address());
-            case "bankCharting":
-                return (bank) => new bank_1.BankChartingExtension(this.baseUrl, bank);
-            default:
-                throw new Error(`Unknown extension: ${extension}`);
-        }
+    async getPerformanceChartingExtension(clendAccount) {
+        return new position_1.PositionChartingExtension(this.baseUrl, clendAccount);
+    }
+    async getGroupChartingExtension(group) {
+        return new group_1.GroupChartingExtension(this.baseUrl, group);
+    }
+    async getWalletChartingExtension(address) {
+        return new wallet_1.WalletChartingExtension(this.baseUrl, address ?? this.address());
+    }
+    async getBankChartingExtension(bank) {
+        return new bank_1.BankChartingExtension(this.baseUrl, bank);
     }
 }
 exports.Client = Client;

package/dist/types.d.ts

@@ -251,5 +251,13 @@ export interface UserRequest {
     openPosition: boolean | null;
     closePosition: boolean | null;
 }
+export type DateRangeOptions = {
+    fromTime?: Date;
+    toTime?: Date;
+};
+export type AggregationMethod = "average" | "endOfDay" | "startOfDay";
+export type ChartingOptions = DateRangeOptions & {
+    aggregationMethod?: AggregationMethod;
+};
 export type ExtensionKey = "positionCharting" | "groupCharting" | "walletCharting" | "bankCharting";
 export type Extension = InstanceType<typeof PositionChartingExtension> | InstanceType<typeof GroupChartingExtension> | InstanceType<typeof WalletChartingExtension> | InstanceType<typeof BankChartingExtension>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carrot-protocol/boost-http-client",
-  "version": "0.4.0-stub-position-endpoints-dev-666335f",
+  "version": "0.4.0-stub-position-endpoints-dev-f996c8b",
   "description": "HTTP client for Carrot Boost",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/charting/bank/index.ts

@@ -1,5 +1,6 @@
 import { web3 } from "@coral-xyz/anchor";
 import { ApyResponse } from "./types";
+import { DateRangeOptions } from "../../types";
 import { ApiClient } from "../../api";
 
 export class BankChartingExtension extends ApiClient {
@@ -10,15 +11,14 @@ export class BankChartingExtension extends ApiClient {
     this.bank = bank;
   }
 
-  public async getApy(
-    options: { fromTime?: Date; toTime?: Date } = {},
-  ): Promise<ApyResponse[]> {
+  public async getApy(options: DateRangeOptions = {}): Promise<ApyResponse[]> {
+    const { fromTime, toTime } = options;
     const body = await this.handleApiCall(() =>
       this.http.get(`/bank/apys`, {
         params: {
           bank: this.bank.toString(),
-          fromTime: options.fromTime?.toISOString(),
-          toTime: options.toTime?.toISOString(),
+          fromTime: fromTime?.toISOString(),
+          toTime: toTime?.toISOString(),
         },
       }),
     );

package/src/charting/group/index.ts

@@ -1,6 +1,7 @@
 import { web3 } from "@coral-xyz/anchor";
 import { PerformanceResponse } from "./types";
 import { ApiClient } from "../../api";
+import { DateRangeOptions } from "../../types";
 
 export class GroupChartingExtension extends ApiClient {
   private readonly group: web3.PublicKey;
@@ -11,14 +12,15 @@ export class GroupChartingExtension extends ApiClient {
   }
 
   public async getPerformance(
-    options: { fromTime?: Date; toTime?: Date } = {},
+    options: DateRangeOptions = {},
   ): Promise<PerformanceResponse[]> {
+    const { fromTime, toTime } = options;
     const body = await this.handleApiCall(() =>
       this.http.get(`/group/pnls`, {
         params: {
           group: this.group.toString(),
-          fromTime: options.fromTime?.toISOString(),
-          toTime: options.toTime?.toISOString(),
+          fromTime: fromTime?.toISOString(),
+          toTime: toTime?.toISOString(),
         },
       }),
     );

package/src/charting/position/index.ts

@@ -1,5 +1,6 @@
 import { web3 } from "@coral-xyz/anchor";
 import { ApyResponse, LoanBalanceResponse, PerformanceResponse } from "./types";
+import { ChartingOptions } from "../../types";
 import { ApiClient } from "../../api";
 
 export class PositionChartingExtension extends ApiClient {
@@ -42,14 +43,16 @@ export class PositionChartingExtension extends ApiClient {
   }
 
   public async getPerformance(
-    options: { fromTime?: Date; toTime?: Date } = {},
+    options: ChartingOptions = {},
   ): Promise<PerformanceResponse[]> {
+    const { fromTime, toTime, aggregationMethod } = options;
     const body = await this.handleApiCall(() =>
       this.http.get(`/account/performance`, {
         params: {
           account: this.clendAccount.toString(),
-          fromTime: options.fromTime?.toISOString(),
-          toTime: options.toTime?.toISOString(),
+          fromTime: fromTime?.toISOString(),
+          toTime: toTime?.toISOString(),
+          aggregationMethod,
         },
       }),
     );
@@ -70,15 +73,15 @@ export class PositionChartingExtension extends ApiClient {
     return response;
   }
 
-  public async getApy(
-    options: { fromTime?: Date; toTime?: Date } = {},
-  ): Promise<ApyResponse[]> {
+  public async getApy(options: ChartingOptions = {}): Promise<ApyResponse[]> {
+    const { fromTime, toTime, aggregationMethod } = options;
     const body = await this.handleApiCall(() =>
       this.http.get(`/account/apys`, {
         params: {
           account: this.clendAccount.toString(),
-          fromTime: options.fromTime?.toISOString(),
-          toTime: options.toTime?.toISOString(),
+          fromTime: fromTime?.toISOString(),
+          toTime: toTime?.toISOString(),
+          aggregationMethod,
         },
       }),
     );

package/src/charting/wallet/index.ts

@@ -1,6 +1,7 @@
 import { web3 } from "@coral-xyz/anchor";
 import { PerformanceResponse } from "./types";
 import { ApiClient } from "../../api";
+import { DateRangeOptions } from "../../types";
 
 export class WalletChartingExtension extends ApiClient {
   private readonly address: web3.PublicKey;
@@ -11,14 +12,15 @@ export class WalletChartingExtension extends ApiClient {
   }
 
   public async getPerformance(
-    options: { fromTime?: Date; toTime?: Date } = {},
+    options: DateRangeOptions = {},
   ): Promise<PerformanceResponse[]> {
+    const { fromTime, toTime } = options;
     const body = await this.handleApiCall(() =>
       this.http.get(`/user/pnls`, {
         params: {
           authority: this.address.toString(),
-          fromTime: options.fromTime?.toISOString(),
-          toTime: options.toTime?.toISOString(),
+          fromTime: fromTime?.toISOString(),
+          toTime: toTime?.toISOString(),
         },
       }),
     );

package/src/index.ts

@@ -606,23 +606,28 @@ export class Client extends ApiClient {
     return txSig;
   }
 
-  public async getExtension(extension: ExtensionKey) {
-    switch (extension) {
-      case "positionCharting":
-        return (clendAccount: web3.PublicKey) =>
-          new PositionChartingExtension(this.baseUrl, clendAccount);
-      case "groupCharting":
-        return (group: web3.PublicKey) =>
-          new GroupChartingExtension(this.baseUrl, group);
-      case "walletCharting":
-        return (address?: web3.PublicKey) =>
-          new WalletChartingExtension(this.baseUrl, address ?? this.address());
-      case "bankCharting":
-        return (bank: web3.PublicKey) =>
-          new BankChartingExtension(this.baseUrl, bank);
-      default:
-        throw new Error(`Unknown extension: ${extension}`);
-    }
+  public async getPerformanceChartingExtension(
+    clendAccount: web3.PublicKey,
+  ): Promise<PositionChartingExtension> {
+    return new PositionChartingExtension(this.baseUrl, clendAccount);
+  }
+
+  public async getGroupChartingExtension(
+    group: web3.PublicKey,
+  ): Promise<GroupChartingExtension> {
+    return new GroupChartingExtension(this.baseUrl, group);
+  }
+
+  public async getWalletChartingExtension(
+    address?: web3.PublicKey,
+  ): Promise<WalletChartingExtension> {
+    return new WalletChartingExtension(this.baseUrl, address ?? this.address());
+  }
+
+  public async getBankChartingExtension(
+    bank: web3.PublicKey,
+  ): Promise<BankChartingExtension> {
+    return new BankChartingExtension(this.baseUrl, bank);
   }
 }
 

package/src/types.ts

@@ -288,6 +288,17 @@ export interface UserRequest {
   closePosition: boolean | null;
 }
 
+export type DateRangeOptions = {
+  fromTime?: Date;
+  toTime?: Date;
+};
+
+export type AggregationMethod = "average" | "endOfDay" | "startOfDay";
+
+export type ChartingOptions = DateRangeOptions & {
+  aggregationMethod?: AggregationMethod;
+};
+
 export type ExtensionKey =
   | "positionCharting"
   | "groupCharting"