mirror of
https://github.com/JKorf/CryptoExchange.Net.git
synced 2026-08-12 17:03:10 +00:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0b7107401f | |||
| 06add65354 | |||
| 773d288497 | |||
| fd4e8da938 | |||
| 271743b669 | |||
| f4797caf37 |
@@ -1,6 +1,7 @@
|
|||||||
using CryptoExchange.Net.Objects;
|
using CryptoExchange.Net.Objects;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
using NUnit.Framework.Legacy;
|
using NUnit.Framework.Legacy;
|
||||||
|
using System.Diagnostics;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
|
|
||||||
namespace CryptoExchange.Net.UnitTests
|
namespace CryptoExchange.Net.UnitTests
|
||||||
@@ -70,5 +71,20 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
var result = ExchangeHelpers.Normalize(input);
|
var result = ExchangeHelpers.Normalize(input);
|
||||||
Assert.That(expected == result.ToString(CultureInfo.InvariantCulture));
|
Assert.That(expected == result.ToString(CultureInfo.InvariantCulture));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
[TestCase("123", "BKR", 32, true, "BKRJK123")]
|
||||||
|
[TestCase("123", "BKR", 32, false, "123")]
|
||||||
|
[TestCase("123123123123123123123123123123", "BKR", 32, true, "123123123123123123123123123123")] // 30
|
||||||
|
[TestCase("12312312312312312312312312312", "BKR", 32, true, "12312312312312312312312312312")] // 27
|
||||||
|
[TestCase("123123123123123123123123123", "BKR", 32, true, "BKRJK123123123123123123123123123")] // 25
|
||||||
|
[TestCase(null, "BKR", 32, true, null)]
|
||||||
|
public void ApplyBrokerIdTests(string clientOrderId, string brokerId, int maxLength, bool allowValueAdjustement, string expected)
|
||||||
|
{
|
||||||
|
var result = LibraryHelpers.ApplyBrokerId(clientOrderId, brokerId, maxLength, allowValueAdjustement);
|
||||||
|
|
||||||
|
if (expected != null)
|
||||||
|
Assert.That(result, Is.EqualTo(expected));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
using System;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
namespace CryptoExchange.Net.Converters.SystemTextJson
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Attribute for allowing specifying a JsonConverter with constructor parameters
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="T"></typeparam>
|
||||||
|
[AttributeUsage(AttributeTargets.Property)]
|
||||||
|
public class JsonConverterCtorAttribute<T> : JsonConverterAttribute where T : JsonConverter
|
||||||
|
{
|
||||||
|
private readonly object[] _parameters;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// ctor
|
||||||
|
/// </summary>
|
||||||
|
public JsonConverterCtorAttribute(params object[] parameters) => _parameters = parameters;
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override JsonConverter CreateConverter(Type typeToConvert)
|
||||||
|
{
|
||||||
|
return (T)Activator.CreateInstance(typeof(T), _parameters);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
using System;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
namespace CryptoExchange.Net.Converters.SystemTextJson
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Replace a value on a string property
|
||||||
|
/// </summary>
|
||||||
|
public class ReplaceConverter : JsonConverter<string>
|
||||||
|
{
|
||||||
|
private readonly (string ValueToReplace, string ValueToReplaceWith)[] _replacementSets;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// ctor
|
||||||
|
/// </summary>
|
||||||
|
public ReplaceConverter(params string[] replaceSets)
|
||||||
|
{
|
||||||
|
_replacementSets = replaceSets.Select(x =>
|
||||||
|
{
|
||||||
|
var split = x.Split(new string[] { "->" }, StringSplitOptions.None);
|
||||||
|
if (split.Length != 2)
|
||||||
|
throw new ArgumentException("Invalid replacement config");
|
||||||
|
return (split[0], split[1]);
|
||||||
|
}).ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override string? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
|
||||||
|
{
|
||||||
|
var value = reader.GetString();
|
||||||
|
foreach (var set in _replacementSets)
|
||||||
|
value = value?.Replace(set.ValueToReplace, set.ValueToReplaceWith);
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options) => writer.WriteStringValue(value);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,9 +6,9 @@
|
|||||||
<PackageId>CryptoExchange.Net</PackageId>
|
<PackageId>CryptoExchange.Net</PackageId>
|
||||||
<Authors>JKorf</Authors>
|
<Authors>JKorf</Authors>
|
||||||
<Description>CryptoExchange.Net is a base library which is used to implement different cryptocurrency (exchange) API's. It provides a standardized way of implementing different API's, which results in a very similar experience for users of the API implementations.</Description>
|
<Description>CryptoExchange.Net is a base library which is used to implement different cryptocurrency (exchange) API's. It provides a standardized way of implementing different API's, which results in a very similar experience for users of the API implementations.</Description>
|
||||||
<PackageVersion>8.4.0</PackageVersion>
|
<PackageVersion>8.4.3</PackageVersion>
|
||||||
<AssemblyVersion>8.4.0</AssemblyVersion>
|
<AssemblyVersion>8.4.3</AssemblyVersion>
|
||||||
<FileVersion>8.4.0</FileVersion>
|
<FileVersion>8.4.3</FileVersion>
|
||||||
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
|
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
|
||||||
<PackageTags>OKX;OKX.Net;Mexc;Mexc.Net;Kucoin;Kucoin.Net;Kraken;Kraken.Net;Huobi;Huobi.Net;CoinEx;CoinEx.Net;Bybit;Bybit.Net;Bitget;Bitget.Net;Bitfinex;Bitfinex.Net;Binance;Binance.Net;CryptoCurrency;CryptoCurrency Exchange</PackageTags>
|
<PackageTags>OKX;OKX.Net;Mexc;Mexc.Net;Kucoin;Kucoin.Net;Kraken;Kraken.Net;Huobi;Huobi.Net;CoinEx;CoinEx.Net;Bybit;Bybit.Net;Bitget;Bitget.Net;Bitfinex;Bitfinex.Net;Binance;Binance.Net;CryptoCurrency;CryptoCurrency Exchange</PackageTags>
|
||||||
<RepositoryType>git</RepositoryType>
|
<RepositoryType>git</RepositoryType>
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||||
<PackageReleaseNotes>https://github.com/JKorf/CryptoExchange.Net?tab=readme-ov-file#release-notes</PackageReleaseNotes>
|
<PackageReleaseNotes>https://github.com/JKorf/CryptoExchange.Net?tab=readme-ov-file#release-notes</PackageReleaseNotes>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<LangVersion>10.0</LangVersion>
|
<LangVersion>12.0</LangVersion>
|
||||||
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -0,0 +1,47 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
namespace CryptoExchange.Net
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Helpers for client libraries
|
||||||
|
/// </summary>
|
||||||
|
public static class LibraryHelpers
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Client order id seperator
|
||||||
|
/// </summary>
|
||||||
|
public const string ClientOrderIdSeperator = "JK";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Apply broker id to a client order id
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="clientOrderId"></param>
|
||||||
|
/// <param name="brokerId"></param>
|
||||||
|
/// <param name="maxLength"></param>
|
||||||
|
/// <param name="allowValueAdjustement"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static string ApplyBrokerId(string? clientOrderId, string brokerId, int maxLength, bool allowValueAdjustement)
|
||||||
|
{
|
||||||
|
var reservedLength = brokerId.Length + ClientOrderIdSeperator.Length;
|
||||||
|
|
||||||
|
if ((clientOrderId?.Length + reservedLength) > maxLength)
|
||||||
|
return clientOrderId!;
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(clientOrderId))
|
||||||
|
{
|
||||||
|
if (allowValueAdjustement)
|
||||||
|
clientOrderId = brokerId + ClientOrderIdSeperator + clientOrderId;
|
||||||
|
|
||||||
|
return clientOrderId!;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
clientOrderId = ExchangeHelpers.AppendRandomString(brokerId + ClientOrderIdSeperator, maxLength);
|
||||||
|
}
|
||||||
|
|
||||||
|
return clientOrderId;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -23,7 +23,7 @@ namespace CryptoExchange.Net.Trackers.Klines
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// The internal data structure
|
/// The internal data structure
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected readonly Dictionary<DateTime, SharedKline> _data = new Dictionary<DateTime, SharedKline>();
|
protected readonly SortedDictionary<DateTime, SharedKline> _data = new SortedDictionary<DateTime, SharedKline>();
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The pre-snapshot queue buffering updates received before the snapshot is set and which will be applied after the snapshot was set
|
/// The pre-snapshot queue buffering updates received before the snapshot is set and which will be applied after the snapshot was set
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -50,6 +50,17 @@ Make a one time donation in a crypto currency of your choice. If you prefer to d
|
|||||||
Alternatively, sponsor me on Github using [Github Sponsors](https://github.com/sponsors/JKorf).
|
Alternatively, sponsor me on Github using [Github Sponsors](https://github.com/sponsors/JKorf).
|
||||||
|
|
||||||
## Release notes
|
## Release notes
|
||||||
|
* Version 8.4.3 - 03 Dec 2024
|
||||||
|
* Fixed KlineTracker update handling
|
||||||
|
|
||||||
|
* Version 8.4.2 - 02 Dec 2024
|
||||||
|
* Removed special characters in ClientOrderIdSeperator to adhere to field content rules
|
||||||
|
|
||||||
|
* Version 8.4.1 - 02 Dec 2024
|
||||||
|
* Added JsonConverterCtorAttribute to allow specifying a custom JsonConverter with constructor parameters on properties
|
||||||
|
* Added ReplaceConverter System.Text.Json converter
|
||||||
|
* Added LibraryHelpers class for internal helper methods
|
||||||
|
|
||||||
* Version 8.4.0 - 28 Nov 2024
|
* Version 8.4.0 - 28 Nov 2024
|
||||||
* Added GetFeesAsync Shared REST client support
|
* Added GetFeesAsync Shared REST client support
|
||||||
* Added LibraryOptions base class
|
* Added LibraryOptions base class
|
||||||
|
|||||||
Reference in New Issue
Block a user