Skip to content

[Bybit] Changed bybit exchange names #802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vslee merged 3 commits into from
Apr 3, 2023
Merged

[Bybit] Changed bybit exchange names #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c5d8fd
Implementation of Bybit V5 unified API
TarasMi Apr 1, 2023
2b95e76
Merge branch 'master' of https://github.com/TarasMi/ExchangeSharp
TarasMi Apr 2, 2023
989dd6c
[Bybit] Changed bybit exchange names
TarasMi Apr 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ExchangeSharp/API/Exchanges/Bybit/ExchangeBybitInverseAPI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

namespace ExchangeSharp
{
[ApiName(ExchangeName.Bybit)]
public class ExchangeBybitInverseAPI : ExchangeBybitV5Base
{
protected override MarketCategory MarketCategory => MarketCategory.Inverse;
Expand All @@ -18,4 +17,5 @@ public ExchangeBybitInverseAPI(bool isUnifiedAccount)
IsUnifiedAccount = isUnifiedAccount;
}
}
public partial class ExchangeName { public const string BybitInverse = "BybitInverse"; }
}
2 changes: 1 addition & 1 deletion src/ExchangeSharp/API/Exchanges/Bybit/ExchangeBybitLinearAPI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

namespace ExchangeSharp
{
[ApiName(ExchangeName.Bybit)]
public class ExchangeBybitLinearAPI : ExchangeBybitV5Base
{
protected override MarketCategory MarketCategory => MarketCategory.Linear;
Expand All @@ -18,4 +17,5 @@ public ExchangeBybitLinearAPI(bool isUnifiedAccount)
IsUnifiedAccount = isUnifiedAccount;
}
}
public partial class ExchangeName { public const string BybitLinear = "BybitLinear"; }
}
2 changes: 1 addition & 1 deletion src/ExchangeSharp/API/Exchanges/Bybit/ExchangeBybitOptionAPI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

namespace ExchangeSharp
{
[ApiName(ExchangeName.Bybit)]
public class ExchangeBybitOptionAPI : ExchangeBybitV5Base
{
protected override MarketCategory MarketCategory => MarketCategory.Option;
Expand All @@ -18,4 +17,5 @@ public ExchangeBybitOptionAPI(bool isUnifiedAccount)
IsUnifiedAccount = isUnifiedAccount;
}
}
public partial class ExchangeName { public const string BybitOption = "BybitOption"; }
}
2 changes: 1 addition & 1 deletion src/ExchangeSharp/API/Exchanges/Bybit/ExchangeBybitSpotAPI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

namespace ExchangeSharp
{
[ApiName(ExchangeName.Bybit)]
public class ExchangeBybitSpotAPI : ExchangeBybitV5Base
{
protected override MarketCategory MarketCategory => MarketCategory.Spot;
Expand All @@ -18,4 +17,5 @@ public ExchangeBybitSpotAPI(bool isUnified)
IsUnifiedAccount = isUnified;
}
}
public partial class ExchangeName { public const string BybitSpot = "BybitSpot"; }
}
11 changes: 8 additions & 3 deletions src/ExchangeSharp/API/Exchanges/Bybit/ExchangeBybitV5Base.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,10 @@ protected override async Task<IEnumerable<MarketCandle>> OnGetCandlesAsync(strin
string url = "/v5/market/kline";
int maxLimit = 200;
limit ??= maxLimit;
if (limit.Value > maxLimit) { limit = maxLimit; }
if (limit.Value > maxLimit)
{
limit = maxLimit;
}
List<MarketCandle> candles = new List<MarketCandle>();
string periodString = PeriodSecondsToString(periodSeconds);
if (startDate == null)
Expand Down Expand Up @@ -244,7 +247,10 @@ protected override async Task<Dictionary<string, decimal>> OnGetAmountsAvailable
Dictionary<string, decimal> amounts = new Dictionary<string, decimal>(StringComparer.OrdinalIgnoreCase);

var accountBalances = result["list"].FirstOrDefault(i => i["accountType"].ToStringInvariant() == accType);
if (accountBalances == null) return amounts;
if (accountBalances == null)
{
return amounts;
}
if (IsUnifiedAccount.Value)
{
// All assets that can be used as collateral, converted to USD, will be here
Expand All @@ -253,7 +259,6 @@ protected override async Task<Dictionary<string, decimal>> OnGetAmountsAvailable
string balanceKey = accType == "SPOT" ? "free" : "availableToWithdraw";
foreach (var coin in accountBalances["coin"])
{

decimal amount = coin[balanceKey].ConvertInvariant<decimal>();
if (amount > 0m)
{
Expand Down
2 changes: 1 addition & 1 deletion src/ExchangeSharp/Model/ExchangeOrderBook.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public ExchangeOrderPrice(BinaryReader reader)
public sealed class ExchangeOrderBook
{
/// <summary>
/// Needed to distinguish between fool book and deltas
/// Needed to distinguish between full book and deltas
/// </summary>
public bool IsFromSnapshot { get; set; }
public string ExchangeName { get; set; }
Expand Down