@2bad/walt 2.1.0 → 2.1.1

package/build/client.d.ts

@@ -28,9 +28,9 @@ export type Portfolio = {
   /** Spot balances above zero, largest fiat value first. */
   entries: PortfolioEntry[];
   entriesTotal: number;
-  /** The API's own total, which includes staked funds. */
+  /** `entriesTotal + staked`. */
   total: number;
-  /** `total - entriesTotal`, itemised by `earnCampaigns()`. */
+  /** What the API total counts beyond spot balances, itemised by `earnCampaigns()`. */
   staked: number;
   fiatCurrency: string;
 };
@@ -150,7 +150,7 @@ export declare class WaltClient {
   /**
    * OHLCV candles for several tickers in one request.
    *
-   * @param requests - One per series wanted.
+   * @param requests - One per series wanted, 20 at most.
    */
   candles(requests: CandleRequest[]): Promise<CandleSeries[]>;
   coinDetails(currency: string, fiatCurrency: FiatCurrency): Promise<CoinDetails>;
@@ -171,6 +171,9 @@ export declare class WaltClient {
    * @param request - The exchange, in the shape the API takes it.
    */
   createExchange(request: ExchangeRequest): Promise<Exchange>;
-  /** Non-zero spot balances against the API total, which also counts staked funds. */
+  /**
+   * Non-zero spot balances and the total, which also counts staked funds.
+   * A USD account is priced at the latest candle close, any other at the rates `accounts()` reports.
+   */
   portfolio(): Promise<Portfolio>;
 }

package/build/client.js

@@ -1,6 +1,7 @@
 import { Transport, WaltAuthError } from "./transport.js";
 // source/client.ts
 const BASE_URL = "https://walletbot.me";
+const CANDLE_BATCH_SIZE = 20;
 const calendarDate = (date) => [
 	date.getUTCFullYear(),
 	date.getUTCMonth() + 1,
@@ -271,7 +272,7 @@ var WaltClient = class {
 	/**
 	* OHLCV candles for several tickers in one request.
 	*
-	* @param requests - One per series wanted.
+	* @param requests - One per series wanted, 20 at most.
 	*/
 	async candles(requests) {
 		const { responses } = await this.transport.post("/kandelabr/public-api/v1/candles/batch", { requests });
@@ -317,12 +318,15 @@ var WaltClient = class {
 	createExchange(request) {
 		return this.transport.post("/api/v1/exchange/create_exchange/", request, 0);
 	}
-	/** Non-zero spot balances against the API total, which also counts staked funds. */
+	/**
+	* Non-zero spot balances and the total, which also counts staked funds.
+	* A USD account is priced at the latest candle close, any other at the rates `accounts()` reports.
+	*/
 	async portfolio() {
 		const data = await this.accounts();
 		if (!Array.isArray(data.accounts)) throw new Error("accounts response carries no accounts array");
-		const total = decimal(data.available_balance_total_fiat_amount);
-		if (total === null) throw new Error(`accounts total is not a number: ${String(data.available_balance_total_fiat_amount)}`);
+		const accountsTotal = decimal(data.available_balance_total_fiat_amount);
+		if (accountsTotal === null) throw new Error(`accounts total is not a number: ${String(data.available_balance_total_fiat_amount)}`);
 		const entries = [];
 		for (const account of data.accounts) {
 			const balance = decimal(account.available_balance);
@@ -336,12 +340,28 @@ var WaltClient = class {
 				fiatValue
 			});
 		}
+		const staked = accountsTotal - entries.reduce((sum, entry) => sum + entry.fiatValue, 0);
+		if (data.available_balance_total_fiat_currency === "USD") {
+			const requests = entries.map((entry) => ({
+				ticker: `${entry.currency}/USD/SPOT`,
+				resolution: "1m",
+				limit: 1
+			}));
+			const batches = Array.from({ length: Math.ceil(requests.length / CANDLE_BATCH_SIZE) }, (_, index) => requests.slice(index * CANDLE_BATCH_SIZE, (index + 1) * CANDLE_BATCH_SIZE));
+			const series = (await Promise.all(batches.map((batch) => this.candles(batch)))).flat();
+			const closes = new Map(series.map((item) => [item.ticker, decimal(item.candles.at(-1)?.c)]));
+			for (const entry of entries) {
+				const close = closes.get(`${entry.currency}/USD/SPOT`) ?? null;
+				if (close === null) throw new Error(`${entry.currency} has no candle price`);
+				entry.fiatValue = Number(entry.amount) * close;
+			}
+		}
 		const entriesTotal = entries.reduce((sum, entry) => sum + entry.fiatValue, 0);
 		return {
 			entries: entries.sort((a, b) => b.fiatValue - a.fiatValue),
 			entriesTotal,
-			total,
-			staked: total - entriesTotal,
+			total: entriesTotal + staked,
+			staked,
 			fiatCurrency: data.available_balance_total_fiat_currency
 		};
 	}

package/build/refresh.js

@@ -91,7 +91,8 @@ var RefreshTokenSource = class {
 		return this.store(data, state.deviceSerial);
 	}
 	async post(path, body) {
-		const response = await this.fetchImpl(`${this.authUrl}${path}`, {
+		const { fetchImpl } = this;
+		const response = await fetchImpl(`${this.authUrl}${path}`, {
 			method: "POST",
 			headers: {
 				...BROWSER_HEADERS,

package/build/transport.js

@@ -136,9 +136,10 @@ var Transport = class {
 			headers["content-type"] = "application/json";
 			headers["origin"] = this.baseUrl;
 		}
+		const { fetchImpl } = this;
 		let response;
 		try {
-			response = await this.fetchImpl(`${this.baseUrl}${path}`, {
+			response = await fetchImpl(`${this.baseUrl}${path}`, {
 				method,
 				headers,
 				body: method === "POST" ? JSON.stringify(body) : null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@2bad/walt",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Client for the Walt (ex. Wallet) API in Telegram to track a crypto portfolio and exchange between assets",
   "keywords": [
     "telegram",