_

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-4655-lightblue)
+![Lines Of Code](https://img.shields.io/badge/LoC-4861-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

@@ -27,6 +27,14 @@ impl Exchange for Binance {
 		self.source_market.unwrap()
 	}
 
+	fn __client(&self) -> &Client {
+		&self.client
+	}
+
+	fn __client_mut(&mut self) -> &mut Client {
+		&mut self.client
+	}
+
 	fn auth(&mut self, key: String, secret: SecretString) {
 		self.update_default_option(BinanceOption::Key(key));
 		self.update_default_option(BinanceOption::Secret(secret));

v_exchanges/src/binance/mod.rs

@@ -33,6 +33,14 @@ impl Exchange for Bybit {
 		self.source_market.unwrap()
 	}
 
+	fn __client(&self) -> &Client {
+		&self.client
+	}
+
+	fn __client_mut(&mut self) -> &mut Client {
+		&mut self.client
+	}
+
 	fn auth(&mut self, key: String, secret: SecretString) {
 		self.update_default_option(BybitOption::Key(key));
 		self.update_default_option(BybitOption::Secret(secret));

v_exchanges/src/bybit/mod.rs

@@ -1,5 +1,6 @@
 use std::collections::{BTreeMap, VecDeque};
 
+use adapters::Client;
 use chrono::{DateTime, TimeDelta, Utc};
 use derive_more::{Deref, DerefMut};
 use eyre::{Report, Result, bail};
@@ -18,12 +19,19 @@ pub trait Exchange: std::fmt::Debug + Send {
 	fn exchange_name(&self) -> &'static str {
 		self.source_market().exchange_name()
 	}
+	fn __client_mut(&mut self) -> &mut Client;
+	fn __client(&self) -> &Client;
 	//,}}}
 
 	// Config {{{
 	fn auth(&mut self, key: String, secret: SecretString);
 	/// Set number of **milliseconds** the request is valid for. Recv Window of over a minute does not make sense, thus it's expressed as u16.
 	fn set_recv_window(&mut self, recv_window: u16);
+	fn set_timeout(&mut self, timeout: u16) {
+		//self.__client_mut().set_timeout(timeout);
+		todo!();
+	}
+	//DO: same for other fields in [RequestConfig](v_exchanges_api_generics::http::RequestConfig)
 	//,}}}
 
 	async fn exchange_info(&self, m: AbsMarket) -> Result<ExchangeInfo>;

v_exchanges/src/core.rs

@@ -33,6 +33,14 @@ impl Exchange for Mexc {
 		self.source_market.unwrap()
 	}
 
+	fn __client(&self) -> &Client {
+		&self.client
+	}
+
+	fn __client_mut(&mut self) -> &mut Client {
+		&mut self.client
+	}
+
 	fn auth(&mut self, key: String, secret: SecretString) {
 		self.update_default_option(MexcOption::Key(key));
 		self.update_default_option(MexcOption::Secret(secret));

v_exchanges/src/mexc/mod.rs

@@ -172,12 +172,10 @@ where
 	type Successful = R;
 	type Unsuccessful = BinanceHandlerError;
 
-	fn request_config(&self) -> RequestConfig {
-		let mut config = self.options.request_config.clone();
-		if self.options.http_url != BinanceHttpUrl::None {
+	fn patch_request_config(&self, config: &mut RequestConfig) {
+		if self.options.http_url == BinanceHttpUrl::default() {
 			config.url_prefix = self.options.http_url.as_str().to_owned();
 		}
-		config
 	}
 
 	#[tracing::instrument(skip_all, fields(?builder))]
@@ -227,6 +225,9 @@ where
 			})
 		} else {
 			// https://binance-docs.github.io/apidocs/spot/en/#limits
+			//TODO: error parsing from status
+			//let error_code = BinanceErrorCode::from(status.as_u16());
+			//XXX: binance doesn't even return these
 			if status == 429 || status == 418 {
 				let retry_after = if let Some(value) = headers.get("Retry-After") {
 					if let Ok(string) = value.to_str() {
@@ -399,3 +400,201 @@ impl Default for BinanceOption {
 		Self::Default
 	}
 }
+
+#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[serde(from = "i32")]
+pub enum BinanceErrorCode {
+	// 10xx - General Server/Network
+	Unknown,
+	Disconnected,
+	Unauthorized,
+	TooManyRequests,
+	UnexpectedResponse,
+	Timeout,
+	ServerBusy,
+	InvalidMessage,
+	UnknownOrderComposition,
+	TooManyOrders,
+	ServiceShuttingDown,
+	UnsupportedOperation,
+	InvalidTimestamp,
+	InvalidSignature,
+
+	// 11xx - Request issues
+	IllegalChars,
+	TooManyParameters,
+	MandatoryParamEmptyOrMalformed,
+	UnknownParam,
+	UnreadParameters,
+	ParamEmpty,
+	ParamNotRequired,
+	ParamOverflow,
+	BadPrecision,
+	NoDepth,
+	TifNotRequired,
+	InvalidTif,
+	InvalidOrderType,
+	InvalidSide,
+	EmptyNewClOrdId,
+	EmptyOrgClOrdId,
+	BadInterval,
+	BadSymbol,
+	InvalidSymbolStatus,
+	InvalidListenKey,
+	MoreThanXXHours,
+	OptionalParamsBadCombo,
+	InvalidParameter,
+	BadStrategyType,
+	InvalidJson,
+	InvalidTickerType,
+	InvalidCancelRestrictions,
+	DuplicateSymbols,
+	InvalidSbeHeader,
+	UnsupportedSchemaId,
+	SbeDisabled,
+	OcoOrderTypeRejected,
+	OcoIcebergqtyTimeinforce,
+	DeprecatedSchema,
+	BuyOcoLimitMustBeBelow,
+	SellOcoLimitMustBeAbove,
+	BothOcoOrdersCannotBeLimit,
+	InvalidTagNumber,
+	TagNotDefinedInMessage,
+	TagAppearsMoreThanOnce,
+	TagOutOfOrder,
+	GroupFieldsOutOfOrder,
+	InvalidComponent,
+	ResetSeqNumSupport,
+	AlreadyLoggedIn,
+	GarbledMessage,
+	BadSenderCompid,
+	BadSeqNum,
+	ExpectedLogon,
+	TooManyMessages,
+	ParamsBadCombo,
+	NotAllowedInDropCopySessions,
+	DropCopySessionNotAllowed,
+	DropCopySessionRequired,
+	NotAllowedInOrderEntrySessions,
+	NotAllowedInMarketDataSessions,
+	IncorrectNumInGroupCount,
+	DuplicateEntriesInAGroup,
+	InvalidRequestId,
+	TooManySubscriptions,
+	BuyOcoStopLossMustBeAbove,
+	SellOcoStopLossMustBeBelow,
+	BuyOcoTakeProfitMustBeBelow,
+	SellOcoTakeProfitMustBeAbove,
+
+	// 20xx - Business logic errors
+	NewOrderRejected,
+	CancelRejected,
+	NoSuchOrder,
+	BadApiKeyFmt,
+	RejectedMbxKey,
+	NoTradingWindow,
+	OrderArchived,
+	OrderCancelReplacePartiallyFailed,
+	OrderCancelReplaceFailed,
+
+	// Unknown error code
+	Other(i32),
+}
+
+impl From<i32> for BinanceErrorCode {
+	fn from(code: i32) -> Self {
+		match code {
+			-1000 => Self::Unknown,
+			-1001 => Self::Disconnected,
+			-1002 => Self::Unauthorized,
+			-1003 => Self::TooManyRequests,
+			-1006 => Self::UnexpectedResponse,
+			-1007 => Self::Timeout,
+			-1008 => Self::ServerBusy,
+			-1013 => Self::InvalidMessage,
+			-1014 => Self::UnknownOrderComposition,
+			-1015 => Self::TooManyOrders,
+			-1016 => Self::ServiceShuttingDown,
+			-1020 => Self::UnsupportedOperation,
+			-1021 => Self::InvalidTimestamp,
+			-1022 => Self::InvalidSignature,
+
+			-1100 => Self::IllegalChars,
+			-1101 => Self::TooManyParameters,
+			-1102 => Self::MandatoryParamEmptyOrMalformed,
+			-1103 => Self::UnknownParam,
+			-1104 => Self::UnreadParameters,
+			-1105 => Self::ParamEmpty,
+			-1106 => Self::ParamNotRequired,
+			-1108 => Self::ParamOverflow,
+			-1111 => Self::BadPrecision,
+			-1112 => Self::NoDepth,
+			-1114 => Self::TifNotRequired,
+			-1115 => Self::InvalidTif,
+			-1116 => Self::InvalidOrderType,
+			-1117 => Self::InvalidSide,
+			-1118 => Self::EmptyNewClOrdId,
+			-1119 => Self::EmptyOrgClOrdId,
+			-1120 => Self::BadInterval,
+			-1121 => Self::BadSymbol,
+			-1122 => Self::InvalidSymbolStatus,
+			-1125 => Self::InvalidListenKey,
+			-1127 => Self::MoreThanXXHours,
+			-1128 => Self::OptionalParamsBadCombo,
+			-1130 => Self::InvalidParameter,
+			-1134 => Self::BadStrategyType,
+			-1135 => Self::InvalidJson,
+			-1139 => Self::InvalidTickerType,
+			-1145 => Self::InvalidCancelRestrictions,
+			-1151 => Self::DuplicateSymbols,
+			-1152 => Self::InvalidSbeHeader,
+			-1153 => Self::UnsupportedSchemaId,
+			-1155 => Self::SbeDisabled,
+			-1158 => Self::OcoOrderTypeRejected,
+			-1160 => Self::OcoIcebergqtyTimeinforce,
+			-1161 => Self::DeprecatedSchema,
+			-1165 => Self::BuyOcoLimitMustBeBelow,
+			-1166 => Self::SellOcoLimitMustBeAbove,
+			-1168 => Self::BothOcoOrdersCannotBeLimit,
+			-1169 => Self::InvalidTagNumber,
+			-1170 => Self::TagNotDefinedInMessage,
+			-1171 => Self::TagAppearsMoreThanOnce,
+			-1172 => Self::TagOutOfOrder,
+			-1173 => Self::GroupFieldsOutOfOrder,
+			-1174 => Self::InvalidComponent,
+			-1175 => Self::ResetSeqNumSupport,
+			-1176 => Self::AlreadyLoggedIn,
+			-1177 => Self::GarbledMessage,
+			-1178 => Self::BadSenderCompid,
+			-1179 => Self::BadSeqNum,
+			-1180 => Self::ExpectedLogon,
+			-1181 => Self::TooManyMessages,
+			-1182 => Self::ParamsBadCombo,
+			-1183 => Self::NotAllowedInDropCopySessions,
+			-1184 => Self::DropCopySessionNotAllowed,
+			-1185 => Self::DropCopySessionRequired,
+			-1186 => Self::NotAllowedInOrderEntrySessions,
+			-1187 => Self::NotAllowedInMarketDataSessions,
+			-1188 => Self::IncorrectNumInGroupCount,
+			-1189 => Self::DuplicateEntriesInAGroup,
+			-1190 => Self::InvalidRequestId,
+			-1191 => Self::TooManySubscriptions,
+			-1196 => Self::BuyOcoStopLossMustBeAbove,
+			-1197 => Self::SellOcoStopLossMustBeBelow,
+			-1198 => Self::BuyOcoTakeProfitMustBeBelow,
+			-1199 => Self::SellOcoTakeProfitMustBeAbove,
+
+			-2010 => Self::NewOrderRejected,
+			-2011 => Self::CancelRejected,
+			-2013 => Self::NoSuchOrder,
+			-2014 => Self::BadApiKeyFmt,
+			-2015 => Self::RejectedMbxKey,
+			-2016 => Self::NoTradingWindow,
+			-2021 => Self::OrderCancelReplacePartiallyFailed,
+			-2022 => Self::OrderCancelReplaceFailed,
+			-2026 => Self::OrderArchived,
+
+			code => Self::Other(code),
+		}
+	}
+}

v_exchanges_adapters/src/exchanges/binance.rs

@@ -72,11 +72,12 @@ pub struct BitFlyerOptions {
 }
 
 /// A `enum` that represents the base url of the BitFlyer HTTP API.
-#[derive(Debug, Eq, PartialEq, Copy, Clone)]
+#[derive(Debug, Eq, PartialEq, Copy, Clone, Default)]
 pub enum BitFlyerHttpUrl {
 	/// `https://api.bitflyer.com`
-	Default,
+	Main,
 	/// The url will not be modified by [BitFlyerRequestHandler]
+	#[default]
 	None,
 }
 
@@ -124,12 +125,10 @@ where
 	type Successful = R;
 	type Unsuccessful = BitFlyerHandlerError;
 
-	fn request_config(&self) -> RequestConfig {
-		let mut config = self.options.request_config.clone();
-		if self.options.http_url != BitFlyerHttpUrl::None {
+	fn patch_request_config(&self, config: &mut RequestConfig) {
+		if self.options.http_url != BitFlyerHttpUrl::default() {
 			config.url_prefix = self.options.http_url.as_str().to_owned();
 		}
-		config
 	}
 
 	fn build_request(&self, mut builder: RequestBuilder, request_body: &Option<B>, _: u8) -> Result<Request, Self::BuildError> {
@@ -298,7 +297,7 @@ impl BitFlyerHttpUrl {
 	#[inline(always)]
 	fn as_str(&self) -> &'static str {
 		match self {
-			Self::Default => "https://api.bitflyer.com",
+			Self::Main => "https://api.bitflyer.com",
 			Self::None => "",
 		}
 	}
@@ -345,7 +344,7 @@ impl Default for BitFlyerOptions {
 		Self {
 			key: None,
 			secret: None,
-			http_url: BitFlyerHttpUrl::Default,
+			http_url: BitFlyerHttpUrl::Main,
 			http_auth: false,
 			request_config: RequestConfig::default(),
 			websocket_url: BitFlyerWebSocketUrl::Default,

v_exchanges_adapters/src/exchanges/bitflyer.rs

@@ -148,12 +148,10 @@ where
 	type Successful = R;
 	type Unsuccessful = BybitHandlerError;
 
-	fn request_config(&self) -> RequestConfig {
-		let mut config = self.options.request_config.clone();
-		if self.options.http_url != BybitHttpUrl::None {
+	fn patch_request_config(&self, config: &mut RequestConfig) {
+		if self.options.http_url != BybitHttpUrl::default() {
 			config.url_prefix = self.options.http_url.as_str().to_owned();
 		}
-		config
 	}
 
 	fn build_request(&self, mut builder: RequestBuilder, request_body: &Option<B>, _: u8) -> Result<Request, Self::BuildError> {