_

Author: valeratrades

Cargo.lock

@@ -2,7 +2,7 @@
 ![Minimum Supported Rust Version](https://img.shields.io/badge/nightly-1.85+-ab6000.svg)
 [<img alt="crates.io" src="https://img.shields.io/crates/v/v_exchanges.svg?color=fc8d62&logo=rust" height="20" style=flat-square>](https://crates.io/crates/v_exchanges)
 [<img alt="docs.rs" src="https://img.shields.io/badge/docs.rs-66c2a5?style=for-the-badge&labelColor=555555&logo=docs.rs&style=flat-square" height="20">](https://docs.rs/v_exchanges)
-![Lines Of Code](https://img.shields.io/badge/LoC-3759-lightblue)
+![Lines Of Code](https://img.shields.io/badge/LoC-3769-lightblue)
 <br>
 [<img alt="ci errors" src="https://img.shields.io/github/actions/workflow/status/valeratrades/v_exchanges/errors.yml?branch=master&style=for-the-badge&style=flat-square&label=errors&labelColor=420d09" height="20">](https://github.com/valeratrades/v_exchanges/actions?query=branch%3Amaster) <!--NB: Won't find it if repo is private-->
 [<img alt="ci warnings" src="https://img.shields.io/github/actions/workflow/status/valeratrades/v_exchanges/warnings.yml?branch=master&style=for-the-badge&style=flat-square&label=warnings&labelColor=d16002" height="20">](https://github.com/valeratrades/v_exchanges/actions?query=branch%3Amaster) <!--NB: Won't find it if repo is private-->

README.md

@@ -0,0 +1,11 @@
+use v_exchanges::{binance::Binance, bitmex::Bitmex};
+
+#[tokio::main]
+async fn main() {
+	color_eyre::install().unwrap();
+	v_utils::utils::init_subscriber(v_utils::utils::LogDestination::xdg("v_exchanges"));
+
+	let bn = Binance::default();
+	let lsr = bn.lsr(("BTC", "USDT").into(), "5m".into(), (24 * 12 + 1).into(), "Global".into()).await.unwrap();
+	dbg!(&lsr[..2]);
+}

examples/test.rs

@@ -40,6 +40,7 @@ tracing.workspace = true
 v_utils = { workspace = true }
 
 v_exchanges_adapters = { version = "^0.3.0", path = "../v_exchanges_adapters/", features = ["full"] }
+async-trait = "0.1.85"
 
 reqwest = { version = "^0.12.12", optional = true }
 

v_exchanges/Cargo.toml

@@ -14,12 +14,13 @@ use crate::core::{AssetBalance, Exchange, ExchangeInfo, Klines, RequestRange};
 pub struct Binance(pub Client);
 
 //? currently client ends up importing this from crate::binance, but could it be possible to lift the [Client] reexport up, and still have the ability to call all exchange methods right on it?
+#[async_trait::async_trait]
 impl Exchange for Binance {
 	type M = Market;
 
-	fn auth<S: Into<String>>(&mut self, key: S, secret: S) {
-		self.update_default_option(BinanceOption::Key(key.into()));
-		self.update_default_option(BinanceOption::Secret(secret.into()));
+	fn auth(&mut self, key: String, secret: String) {
+		self.update_default_option(BinanceOption::Key(key));
+		self.update_default_option(BinanceOption::Secret(secret));
 	}
 
 	async fn exchange_info(&self, m: Self::M) -> Result<ExchangeInfo> {
@@ -71,13 +72,11 @@ pub enum Market {
 	Margin,
 }
 impl crate::core::MarketTrait for Market {
-	type Ex = Binance;
-
-	fn client(&self) -> Binance {
-		Binance::default()
+	fn client(&self) -> Box<dyn Exchange<M = Self>> {
+		Box::new(Binance::default())
 	}
 
 	fn fmt_abs(&self) -> String {
-	  format!("Binance/{self}")
+		format!("Binance/{self}")
 	}
 }

v_exchanges/src/binance/mod.rs

@@ -16,12 +16,13 @@ use crate::core::{AssetBalance, Exchange, ExchangeInfo, Klines, RequestRange};
 pub struct Bybit(pub Client);
 
 //? currently client ends up importing this from crate::binance, but could it be possible to lift the [Client] reexport up, and still have the ability to call all exchange methods right on it?
+#[async_trait::async_trait]
 impl Exchange for Bybit {
 	type M = Market;
 
-	fn auth<S: Into<String>>(&mut self, key: S, secret: S) {
-		self.update_default_option(BybitOption::Key(key.into()));
-		self.update_default_option(BybitOption::Secret(secret.into()));
+		fn auth(&mut self, key: String, secret: String) {
+		self.update_default_option(BybitOption::Key(key));
+		self.update_default_option(BybitOption::Secret(secret));
 	}
 
 	async fn exchange_info(&self, m: Self::M) -> Result<ExchangeInfo> {
@@ -69,10 +70,8 @@ pub enum Market {
 	Inverse,
 }
 impl crate::core::MarketTrait for Market {
-	type Ex = Bybit;
-
-	fn client(&self) -> Bybit {
-		Bybit::default()
+	fn client(&self) -> Box<dyn Exchange<M = Self>> {
+		Box::new(Bybit::default())
 	}
 
 	fn fmt_abs(&self) -> String {

v_exchanges/src/bybit/mod.rs

@@ -10,28 +10,28 @@ use v_utils::{
 };
 
 //TODO!!!!!!!!!!!!!: klines switch to defining the range via an Enum over either limit either start and end times
-
+#[async_trait::async_trait]
 pub trait Exchange {
 	type M: MarketTrait;
 
-	fn auth<S: Into<String>>(&mut self, key: S, secret: S);
+	fn auth(&mut self, key: String, secret: String);
 
-	fn exchange_info(&self, m: Self::M) -> impl std::future::Future<Output = Result<ExchangeInfo>> + Send;
+	async fn exchange_info(&self, m: Self::M) -> Result<ExchangeInfo>;
 
 	//? should I have Self::Pair too? Like to catch the non-existent ones immediately? Although this would increase the error surface on new listings.
-	fn klines(&self, pair: Pair, tf: Timeframe, range: RequestRange, m: Self::M) -> impl std::future::Future<Output = Result<Klines>> + Send;
+	async fn klines(&self, pair: Pair, tf: Timeframe, range: RequestRange, m: Self::M) -> Result<Klines>;
 
 	/// If no pairs are specified, returns for all;
-	fn prices(&self, pairs: Option<Vec<Pair>>, m: Self::M) -> impl std::future::Future<Output = Result<Vec<(Pair, f64)>>> + Send;
-	fn price(&self, pair: Pair, m: Self::M) -> impl std::future::Future<Output = Result<f64>> + Send;
+	async fn prices(&self, pairs: Option<Vec<Pair>>, m: Self::M) -> Result<Vec<(Pair, f64)>>;
+	async fn price(&self, pair: Pair, m: Self::M) -> Result<f64>;
 
 	// Defined in terms of actors
-	//TODO!!!: fn spawn_klines_listener(&self, symbol: Pair, tf: Timeframe) -> mpsc::Receiver<Kline>;
+	//TODO!!!: async fn spawn_klines_listener(&self, symbol: Pair, tf: Timeframe) -> mpsc::Receiver<Kline>;
 
 	/// balance of a specific asset
-	fn asset_balance(&self, asset: Asset, m: Self::M) -> impl std::future::Future<Output = Result<AssetBalance>> + Send;
+	async fn asset_balance(&self, asset: Asset, m: Self::M) -> Result<AssetBalance>;
 	/// vec of balances of specific assets
-	fn balances(&self, m: Self::M) -> impl std::future::Future<Output = Result<Vec<AssetBalance>>> + Send;
+	async fn balances(&self, m: Self::M) -> Result<Vec<AssetBalance>>;
 	//? potentially `total_balance`? Would return precompiled USDT-denominated balance of a (bybit::wallet/binance::account)
 	// balances are defined for each margin type: [futures_balance, spot_balance, margin_balance], but note that on some exchanges, (like bybit), some of these may point to the same exact call
 	// to negate confusion could add a `total_balance` endpoint
@@ -41,8 +41,7 @@ pub trait Exchange {
 
 // Market {{{
 pub trait MarketTrait {
-	type Ex: Exchange;
-	fn client(&self) -> Self::Ex;
+	fn client(&self) -> Box<dyn Exchange<M = Self>>;
 	fn fmt_abs(&self) -> String;
 	//TODO; require them to impl Display and FromStr
 }
@@ -55,6 +54,14 @@ pub enum Market {
 	Bybit(crate::bybit::Market),
 	//TODO
 }
+//impl Market {
+//	pub fn client(&self) -> Box<dyn Exchange<M = dyn Market>> {
+//		match self {
+//			Market::Binance(m) => m.client(),
+//			Market::Bybit(m) => m.client(),
+//		}
+//	}
+//}
 //
 //impl Default for Market {
 //	fn default() -> Self {