[#43] Client: Memory optimization

Signed-off-by: Pavel Gross <p.gross@yadro.com>

src/FrostFS.SDK.Client/ApeRules/Actions.cs

@@ -8,7 +8,7 @@ public struct Actions(bool inverted, string[] names) : System.IEquatable<Actions
 
     public override readonly bool Equals(object obj)
     {
-         if (obj == null || obj is not Actions)
+        if (obj == null || obj is not Actions)
             return false;
 
         return Equals((Actions)obj);

src/FrostFS.SDK.Client/ApeRules/Condition.cs

@@ -12,7 +12,7 @@ public struct Condition : System.IEquatable<Condition>
 
     public override bool Equals(object obj)
     {
-         if (obj == null || obj is not Condition)
+        if (obj == null || obj is not Condition)
             return false;
 
         return Equals((Condition)obj);

src/FrostFS.SDK.Client/ApeRules/Resources.cs

@@ -8,7 +8,7 @@ public struct Resources(bool inverted, string[] names) : System.IEquatable<Resou
 
     public override readonly bool Equals(object obj)
     {
-         if (obj == null || obj is not Resources)
+        if (obj == null || obj is not Resources)
             return false;
 
         return Equals((Resources)obj);

src/FrostFS.SDK.Client/AssemblyInfo.cs

@@ -1,8 +1,8 @@
 using System.Reflection;
 
 [assembly: AssemblyCompany("FrostFS.SDK.Client")]
-[assembly: AssemblyFileVersion("1.0.2.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
 [assembly: AssemblyInformationalVersion("1.0.0+d6fe0344538a223303c9295452f0ad73681ca376")]
 [assembly: AssemblyProduct("FrostFS.SDK.Client")]
 [assembly: AssemblyTitle("FrostFS.SDK.Client")]
-[assembly: AssemblyVersion("1.0.3")]
+[assembly: AssemblyVersion("1.0.4")]

src/FrostFS.SDK.Client/Caches.cs

@@ -6,17 +6,8 @@ internal static class Caches
 {
     private static readonly IMemoryCache _ownersCache = new MemoryCache(new MemoryCacheOptions
     {
-        // TODO: get from options?
         SizeLimit = 256
     });
 
-    private static readonly IMemoryCache _containersCache = new MemoryCache(new MemoryCacheOptions
-    {
-        // TODO: get from options?
-        SizeLimit = 1024
-    });
-
     internal static IMemoryCache Owners => _ownersCache;
-
-    internal static IMemoryCache Containers => _containersCache;
 }

src/FrostFS.SDK.Client/Exceptions/FrostFsResponseException.cs

@@ -10,8 +10,8 @@ public class FrostFsResponseException : FrostFsException
     {
     }
 
-    public FrostFsResponseException(FrostFsResponseStatus status) 
-        :  base(status != null ? status.Message != null ? "" : "" : "")
+    public FrostFsResponseException(FrostFsResponseStatus status)
+        : base(status != null ? status.Message != null ? "" : "" : "")
     {
         Status = status;
     }

src/FrostFS.SDK.Client/Extensions/FrostFsExtensions.cs

@@ -1,14 +1,17 @@
 using System;
-
+using System.Security.Cryptography;
 using Google.Protobuf;
 
 namespace FrostFS.SDK.Cryptography;
 
 public static class FrostFsExtensions
 {
-    public static ByteString Sha256(this IMessage data)
+    public static byte[] Sha256(this IMessage data)
     {
-        return ByteString.CopyFrom(data.ToByteArray().Sha256());
+        using var sha256 = SHA256.Create();
+        using HashStream stream = new(sha256);
+        data.WriteTo(stream);
+        return stream.Hash();
     }
 
     public static Guid ToUuid(this ByteString id)
@@ -16,9 +19,18 @@ public static class FrostFsExtensions
         if (id == null)
             throw new ArgumentNullException(nameof(id));
 
-        var orderedBytes = GetGuidBytesDirectOrder(id.Span);
-
-        return new Guid(orderedBytes);
+        return new Guid(
+           (id[0] << 24) + (id[1] << 16) + (id[2] << 8) + id[3],
+           (short)((id[4] << 8) + id[5]),
+           (short)((id[6] << 8) + id[7]),
+           id[8],
+           id[9],
+           id[10],
+           id[11],
+           id[12],
+           id[13],
+           id[14],
+           id[15]);
     }
 
     /// <summary>
@@ -26,37 +38,25 @@ public static class FrostFsExtensions
     /// </summary>
     /// <param name="id"></param>
     /// <returns></returns>
-    public static byte[] ToBytes(this Guid id)
+    public unsafe static void ToBytes(this Guid id, Span<byte> span)
     {
-        var bytes = id.ToByteArray();
+        var pGuid = (byte*)&id;
 
-        var orderedBytes = GetGuidBytesDirectOrder(bytes);
-
-        return orderedBytes;
-    }
-
-    private static byte[] GetGuidBytesDirectOrder(ReadOnlySpan<byte> source)
-    {
-        if (source.Length != 16)
-            throw new ArgumentException("Wrong uuid binary format");
-
-        return [
-            source[3],
-            source[2],
-            source[1],
-            source[0],
-            source[5],
-            source[4],
-            source[7],
-            source[6],
-            source[8],
-            source[9],
-            source[10],
-            source[11],
-            source[12],
-            source[13],
-            source[14],
-            source[15]
-        ];
+        span[0] = pGuid[3];
+        span[1] = pGuid[2];
+        span[2] = pGuid[1];
+        span[3] = pGuid[0];
+        span[4] = pGuid[5];
+        span[5] = pGuid[4];
+        span[6] = pGuid[7];
+        span[7] = pGuid[6];
+        span[8] = pGuid[8];
+        span[9] = pGuid[9];
+        span[10] = pGuid[10];
+        span[11] = pGuid[11];
+        span[12] = pGuid[12];
+        span[13] = pGuid[13];
+        span[14] = pGuid[14];
+        span[15] = pGuid[15];
     }
 }

src/FrostFS.SDK.Client/FrostFS.SDK.Client.csproj

@@ -31,10 +31,10 @@
 
   <PropertyGroup>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.HighPerformance" Version="7.1.2" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.4">
       <PrivateAssets>all</PrivateAssets>

src/FrostFS.SDK.Client/FrostFSClient.cs

@@ -162,25 +162,7 @@ public class FrostFSClient : IFrostFSClient
             Callback = settings.Value.Callback,
             Interceptors = settings.Value.Interceptors
         };
-
-        // TODO: define timeout logic
-        // CheckFrostFsVersionSupport(new Context { Timeout = TimeSpan.FromSeconds(20) });
-    }
-
-    internal FrostFSClient(WrapperPrm prm, SessionCache cache)
-    {
-        ClientCtx = new ClientContext(
-           client: this,
-           key: new ClientKey(prm.Key),
-           owner: FrostFsOwner.FromKey(prm.Key!),
-           channel: prm.GrpcChannelFactory(prm.Address),
-           version: new FrostFsVersion(2, 13))
-        {
-            SessionCache = cache,
-            Interceptors = prm.Interceptors,
-            Callback = prm.Callback
-        };
-    }
+    }   
 
     #region ApeManagerImplementation
     public Task<ReadOnlyMemory<byte>> AddChainAsync(PrmApeChainAdd args, CallContext ctx)
@@ -447,18 +429,5 @@ public class FrostFSClient : IFrostFSClient
         }
 
         return ObjectServiceProvider;
-    }
-
-    public async Task<string?> Dial(CallContext ctx)
-    {
-        var service = GetAccouningService();
-        _ = await service.GetBallance(ctx).ConfigureAwait(false);
-
-        return null;
-    }
-
-    public bool RestartIfUnhealthy(CallContext ctx)
-    {
-        throw new NotImplementedException();
-    }
+    }   
 }

src/FrostFS.SDK.Client/Interfaces/IFrostFSClient.cs

@@ -64,6 +64,4 @@ public interface IFrostFSClient
     #region Account
     Task<Accounting.Decimal> GetBalanceAsync(CallContext ctx);
     #endregion
-
-    public Task<string?> Dial(CallContext ctx);
 }

src/FrostFS.SDK.Client/Mappers/ContainerId.cs

@@ -5,16 +5,10 @@ using FrostFS.SDK.Cryptography;
 
 using Google.Protobuf;
 
-using Microsoft.Extensions.Caching.Memory;
-
 namespace FrostFS.SDK.Client.Mappers.GRPC;
 
 public static class ContainerIdMapper
 {
-    private static readonly MemoryCacheEntryOptions _oneHourExpiration = new MemoryCacheEntryOptions()
-       .SetSlidingExpiration(TimeSpan.FromHours(1))
-       .SetSize(1);
-
     public static ContainerID ToMessage(this FrostFsContainerId model)
     {
         if (model is null)
@@ -24,15 +18,11 @@ public static class ContainerIdMapper
 
         var containerId = model.GetValue() ?? throw new ArgumentNullException(nameof(model));
 
-        if (!Caches.Containers.TryGetValue(containerId, out ContainerID? message))
+        var message = new ContainerID
         {
-            message = new ContainerID
-            {
-                Value = ByteString.CopyFrom(Base58.Decode(containerId))
-            };
+            Value = UnsafeByteOperations.UnsafeWrap(Base58.Decode(containerId))
+        };
 
-            Caches.Containers.Set(containerId, message, _oneHourExpiration);
-        }
         return message!;
     }
 

src/FrostFS.SDK.Client/Mappers/Object/ObjectHeaderMapper.cs

@@ -24,25 +24,14 @@ public static class ObjectHeaderMapper
             _ => throw new ArgumentException($"Unknown ObjectType. Value: '{header.ObjectType}'.")
         };
 
-        FrostFsSplit? split = null;
-
-        if (header.Split != null)
-        {
-            var children = header.Split.Children.Count != 0 ? new ReadOnlyCollection<FrostFsObjectId>(
-                    header.Split.Children.Select(x => x.ToModel()).ToList()) : null;
-
-            split = new FrostFsSplit(new SplitId(header.Split.SplitId.ToUuid()),
-                header.Split.Previous?.ToModel(),
-                header.Split.Parent?.ToModel(),
-                header.Split.ParentHeader?.ToModel(),
-                null,
-                children);
-        }
+        FrostFsSplit? split = header!.Split != null
+            ? header.Split.ToModel()
+            : null;
 
         var model = new FrostFsObjectHeader(
             new FrostFsContainerId(Base58.Encode(header.ContainerId.Value.Span)),
             objTypeName,
-            header.Attributes.Select(attribute => attribute.ToModel()).ToArray(),
+            [.. header.Attributes.Select(attribute => attribute.ToModel())],
             split,
             header.OwnerId.ToModel(),
             header.Version.ToModel())
@@ -52,4 +41,18 @@ public static class ObjectHeaderMapper
 
         return model;
     }
+
+    public static FrostFsSplit ToModel(this Header.Types.Split split)
+    {
+        var children = split!.Children.Count != 0
+            ? new ReadOnlyCollection<FrostFsObjectId>([.. split.Children.Select(x => x.ToModel())])
+            : null;
+
+        return new FrostFsSplit(new SplitId(split.SplitId.ToUuid()),
+                        split.Previous?.ToModel(),
+                        split.Parent?.ToModel(),
+                        split.ParentHeader?.ToModel(),
+                        null,
+                        children);
+    }
 }

src/FrostFS.SDK.Client/Mappers/Object/ObjectId.cs

@@ -17,7 +17,7 @@ public static class ObjectIdMapper
 
         return new ObjectID
         {
-            Value = ByteString.CopyFrom(objectId.ToHash())
+            Value = UnsafeByteOperations.UnsafeWrap(objectId.ToHash())
         };
     }
 

src/FrostFS.SDK.Client/Mappers/OwnerId.cs

@@ -26,7 +26,7 @@ public static class OwnerIdMapper
         {
             message = new OwnerID
             {
-                Value = ByteString.CopyFrom(model.ToHash())
+                Value = UnsafeByteOperations.UnsafeWrap(model.ToHash())
             };
 
             Caches.Owners.Set(model, message, _oneHourExpiration);

src/FrostFS.SDK.Client/Mappers/Session/SessionMapper.cs

@@ -1,28 +0,0 @@
-using System;
-
-using Google.Protobuf;
-
-namespace FrostFS.SDK.Client;
-
-public static class SessionMapper
-{
-    public static byte[] Serialize(this Session.SessionToken token)
-    {
-        if (token is null)
-        {
-            throw new ArgumentNullException(nameof(token));
-        }
-
-        byte[] bytes = new byte[token.CalculateSize()];
-        using CodedOutputStream stream = new(bytes);
-        token.WriteTo(stream);
-
-        return bytes;
-    }
-
-    public static Session.SessionToken Deserialize(this Session.SessionToken token, byte[] bytes)
-    {
-        token.MergeFrom(bytes);
-        return token;
-    }
-}

src/FrostFS.SDK.Client/Mappers/SignatureMapper.cs

@@ -23,9 +23,9 @@ public static class SignatureMapper
 
         return new Refs.Signature
         {
-            Key = ByteString.CopyFrom(signature.Key),
+            Key = UnsafeByteOperations.UnsafeWrap(signature.Key),
             Scheme = scheme,
-            Sign = ByteString.CopyFrom(signature.Sign)
+            Sign = UnsafeByteOperations.UnsafeWrap(signature.Sign)
         };
     }
 }

src/FrostFS.SDK.Client/Models/Containers/FrostFsContainerInfo.cs

@@ -91,10 +91,13 @@ public class FrostFsContainerInfo
                 throw new ArgumentNullException("PlacementPolicy is null");
             }
 
+            Span<byte> nonce = stackalloc byte[16];
+            Nonce.ToBytes(nonce);
+
             this.container = new Container.Container()
             {
                 PlacementPolicy = PlacementPolicy.Value.GetPolicy(),
-                Nonce = ByteString.CopyFrom(Nonce.ToBytes()),
+                Nonce = ByteString.CopyFrom(nonce),
                 OwnerId = Owner?.OwnerID,
                 Version = Version?.VersionID
             };

src/FrostFS.SDK.Client/Models/Misc/CheckSum.cs

@@ -11,7 +11,7 @@ public class CheckSum
 
     public static CheckSum CreateCheckSum(byte[] content)
     {
-        return new CheckSum { hash = content.Sha256() };
+        return new CheckSum { hash = DataHasher.Sha256(content.AsSpan()) };
     }
 
     public override string ToString()

src/FrostFS.SDK.Client/Models/Netmap/Placement/Context.cs

@@ -353,7 +353,7 @@ internal struct Context
 
                     var start = hasPrefix ? likeWildcard.Length : 0;
                     var end = hasSuffix ? f.Value.Length - likeWildcard.Length : f.Value.Length;
-                    var str = f.Value.Substring(start, end-start);
+                    var str = f.Value.Substring(start, end - start);
 
                     if (hasPrefix && hasSuffix)
                         return nodeInfo.Attributes[f.Key].Contains(str);

src/FrostFS.SDK.Client/Models/Object/FrostFsObject.cs

@@ -4,10 +4,6 @@ namespace FrostFS.SDK;
 
 public class FrostFsObject
 {
-  //  private byte[]? _payloadBytes;
-  //  private ReadOnlyMemory<byte> _payloadMemory;
-  //  private bool _isInitPayloadMemory;
-
     /// <summary>
     /// Creates new instance from <c>ObjectHeader</c>
     /// </summary>
@@ -49,25 +45,6 @@ public class FrostFsObject
 
     public ReadOnlyMemory<byte> SingleObjectPayload { get; set; }
 
-    //public ReadOnlyMemory<byte> SingleObjectPayloadMemory
-    //{
-    //    get
-    //    {
-    //        if (!_isInitPayloadMemory)
-    //        {
-    //            _payloadMemory = _payloadBytes.AsMemory();
-    //            _isInitPayloadMemory = true;
-    //        }
-
-    //        return _payloadMemory;
-    //    }
-    //    set
-    //    {
-    //        _payloadMemory = value;
-    //        _isInitPayloadMemory = true;
-    //    }
-    //}
-
     /// <summary>
     /// Provide SHA256 hash of the payload. If null, the hash is calculated by internal logic
     /// </summary>

src/FrostFS.SDK.Client/Models/Object/FrostFsSplit.cs

@@ -1,4 +1,7 @@
 using System.Collections.ObjectModel;
+using System.Linq;
+using FrostFS.Object;
+using FrostFS.SDK.Client.Mappers.GRPC;
 
 namespace FrostFS.SDK;
 
@@ -9,6 +12,8 @@ public class FrostFsSplit(SplitId splitId,
     FrostFsSignature? parentSignature = null,
     ReadOnlyCollection<FrostFsObjectId>? children = null)
 {
+    private Header.Types.Split? _split;
+
     public FrostFsSplit() : this(new SplitId())
     {
     }
@@ -24,4 +29,25 @@ public class FrostFsSplit(SplitId splitId,
     public FrostFsObjectHeader? ParentHeader { get; set; } = parentHeader;
 
     public ReadOnlyCollection<FrostFsObjectId>? Children { get; } = children;
+
+    public Header.Types.Split GetSplit()
+    {
+        if (_split == null)
+        {
+            _split = new Header.Types.Split
+            {
+                SplitId = SplitId?.GetSplitId(),
+                Parent = Parent?.ToMessage(),
+                ParentHeader = ParentHeader?.GetHeader(),
+                ParentSignature = ParentSignature?.ToMessage()
+            };
+
+            if (Children != null)
+            {
+                _split.Children.AddRange(Children.Select(x => x.ToMessage()));
+            }
+        }
+
+        return _split;
+    }
 }

src/FrostFS.SDK.Client/Models/Object/SplitId.cs

@@ -47,16 +47,11 @@ public class SplitId
         return this.id.ToString();
     }
 
-    public byte[]? ToBinary()
-    {
-        if (this.id == Guid.Empty)
-            return null;
-
-        return this.id.ToBytes();
-    }
-
     public ByteString? GetSplitId()
     {
-        return this.message ??= ByteString.CopyFrom(ToBinary());
+        Span<byte> span = stackalloc byte[16];
+        id.ToBytes(span);
+
+        return this.message ??= ByteString.CopyFrom(span);
     }
 }

src/FrostFS.SDK.Client/Models/Response/FrostFsResponseStatus.cs

@@ -4,9 +4,9 @@ public class FrostFsResponseStatus(FrostFsStatusCode code, string? message = nul
 {
     public FrostFsStatusCode Code { get; set; } = code;
     public string Message { get; set; } = message ?? string.Empty;
-    
+
     public string Details { get; set; } = details ?? string.Empty;
-    
+
     public bool IsSuccess => Code == FrostFsStatusCode.Success;
 
     public override string ToString()

src/FrostFS.SDK.Client/Parameters/PrmApeChainRemove.cs

@@ -25,7 +25,7 @@ public readonly struct PrmApeChainRemove(
     public readonly bool Equals(PrmApeChainRemove other)
     {
         return Target == other.Target
-            && ChainId.Equals(other.ChainId)  
+            && ChainId.Equals(other.ChainId)
             && XHeaders == other.XHeaders;
     }
 

src/FrostFS.SDK.Client/Pool/ClientStatusMonitor.cs

@@ -1,163 +0,0 @@
-using System;
-using System.Threading;
-
-using Microsoft.Extensions.Logging;
-
-namespace FrostFS.SDK.Client;
-
-// clientStatusMonitor count error rate and other statistics for connection.
-public class ClientStatusMonitor : IClientStatus
-{
-    private static readonly MethodIndex[] MethodIndexes =
-    [
-        MethodIndex.methodBalanceGet,
-        MethodIndex.methodContainerPut,
-        MethodIndex.methodContainerGet,
-        MethodIndex.methodContainerList,
-        MethodIndex.methodContainerDelete,
-        MethodIndex.methodEndpointInfo,
-        MethodIndex.methodNetworkInfo,
-        MethodIndex.methodNetMapSnapshot,
-        MethodIndex.methodObjectPut,
-        MethodIndex.methodObjectDelete,
-        MethodIndex.methodObjectGet,
-        MethodIndex.methodObjectHead,
-        MethodIndex.methodObjectRange,
-        MethodIndex.methodObjectPatch,
-        MethodIndex.methodSessionCreate,
-        MethodIndex.methodAPEManagerAddChain,
-        MethodIndex.methodAPEManagerRemoveChain,
-        MethodIndex.methodAPEManagerListChains
-    ];
-
-    public static string GetMethodName(MethodIndex index)
-    {
-        return index switch
-        {
-            MethodIndex.methodBalanceGet => "BalanceGet",
-            MethodIndex.methodContainerPut => "ContainerPut",
-            MethodIndex.methodContainerGet => "ContainerGet",
-            MethodIndex.methodContainerList => "ContainerList",
-            MethodIndex.methodContainerDelete => "ContainerDelete",
-            MethodIndex.methodEndpointInfo => "EndpointInfo",
-            MethodIndex.methodNetworkInfo => "NetworkInfo",
-            MethodIndex.methodNetMapSnapshot => "NetMapSnapshot",
-            MethodIndex.methodObjectPut => "ObjectPut",
-            MethodIndex.methodObjectDelete => "ObjectDelete",
-            MethodIndex.methodObjectGet => "ObjectGet",
-            MethodIndex.methodObjectHead => "ObjectHead",
-            MethodIndex.methodObjectRange => "ObjectRange",
-            MethodIndex.methodObjectPatch => "ObjectPatch",
-            MethodIndex.methodSessionCreate => "SessionCreate",
-            MethodIndex.methodAPEManagerAddChain => "APEManagerAddChain",
-            MethodIndex.methodAPEManagerRemoveChain => "APEManagerRemoveChain",
-            MethodIndex.methodAPEManagerListChains => "APEManagerListChains",
-            _ => throw new ArgumentException("Unknown method", nameof(index)),
-        };
-    }
-
-    private readonly object _lock = new();
-
-    private readonly ILogger? logger;
-    private int healthy;
-
-    public ClientStatusMonitor(ILogger? logger, string address)
-    {
-        this.logger = logger;
-        healthy = (int)HealthyStatus.Healthy;
-
-        Address = address;
-        Methods = new MethodStatus[MethodIndexes.Length];
-
-        for (int i = 0; i < MethodIndexes.Length; i++)
-        {
-            Methods[i] = new MethodStatus(GetMethodName(MethodIndexes[i]));
-        }
-    }
-
-    public string Address { get; }
-
-    internal uint ErrorThreshold { get; set; }
-
-    public uint CurrentErrorCount { get; set; }
-
-    public ulong OverallErrorCount { get; set; }
-
-    public MethodStatus[] Methods { get; private set; }
-
-    public bool IsHealthy()
-    {
-        var res = Interlocked.CompareExchange(ref healthy, -1, -1) == (int)HealthyStatus.Healthy;
-        return res;
-    }
-
-    public bool IsDialed()
-    {
-        return Interlocked.CompareExchange(ref healthy, -1, -1) != (int)HealthyStatus.UnhealthyOnDial;
-    }
-
-    public void SetHealthy()
-    {
-        Interlocked.Exchange(ref healthy, (int)HealthyStatus.Healthy);
-    }
-    public void SetUnhealthy()
-    {
-        Interlocked.Exchange(ref healthy, (int)HealthyStatus.UnhealthyOnRequest);
-    }
-
-    public void SetUnhealthyOnDial()
-    {
-        Interlocked.Exchange(ref healthy, (int)HealthyStatus.UnhealthyOnDial);
-    }
-
-    public void IncErrorRate()
-    {
-        bool thresholdReached;
-        lock (_lock)
-        {
-            CurrentErrorCount++;
-            OverallErrorCount++;
-
-            thresholdReached = CurrentErrorCount >= ErrorThreshold;
-
-            if (thresholdReached)
-            {
-                SetUnhealthy();
-                CurrentErrorCount = 0;
-            }
-        }
-
-        if (thresholdReached && logger != null)
-        {
-            FrostFsMessages.ErrorЕhresholdReached(logger, Address, ErrorThreshold);
-        }
-    }
-
-    public uint GetCurrentErrorRate()
-    {
-        lock (_lock)
-        {
-            return CurrentErrorCount;
-        }
-    }
-
-    public ulong GetOverallErrorRate()
-    {
-        lock (_lock)
-        {
-            return OverallErrorCount;
-        }
-    }
-
-    public StatusSnapshot[] MethodsStatus()
-    {
-        var result = new StatusSnapshot[Methods.Length];
-
-        for (int i = 0; i < result.Length; i++)
-        {
-            result[i] = Methods[i].Snapshot!;
-        }
-
-        return result;
-    }
-}

src/FrostFS.SDK.Client/Pool/ClientWrapper.cs

@@ -1,135 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-using Grpc.Core;
-
-namespace FrostFS.SDK.Client;
-
-// clientWrapper is used by default, alternative implementations are intended for testing purposes only.
-public class ClientWrapper : ClientStatusMonitor
-{
-    private readonly object _lock = new();
-    private SessionCache sessionCache;
-
-    internal ClientWrapper(WrapperPrm wrapperPrm, Pool pool) : base(wrapperPrm.Logger, wrapperPrm.Address)
-    {
-        WrapperPrm = wrapperPrm;
-        ErrorThreshold = wrapperPrm.ErrorThreshold;
-
-        sessionCache = pool.SessionCache;
-        Client = new FrostFSClient(WrapperPrm, sessionCache);
-    }
-
-    internal FrostFSClient? Client { get; private set; }
-
-    internal WrapperPrm WrapperPrm { get; }
-
-    internal FrostFSClient? GetClient()
-    {
-        lock (_lock)
-        {
-            if (IsHealthy())
-            {
-                return Client;
-            }
-
-            return null;
-        }
-    }
-
-    // dial establishes a connection to the server from the FrostFS network.
-    // Returns an error describing failure reason. If failed, the client
-    // SHOULD NOT be used.
-    internal async Task Dial(CallContext ctx)
-    {
-        var client = GetClient() ?? throw new FrostFsInvalidObjectException("pool client unhealthy");
-
-        await client.Dial(ctx).ConfigureAwait(false);
-    }
-
-    internal void HandleError(Exception ex)
-    {
-        if (ex is FrostFsResponseException responseException && responseException.Status != null)
-        {
-            switch (responseException.Status.Code)
-            {
-                case FrostFsStatusCode.Internal:
-                case FrostFsStatusCode.WrongMagicNumber:
-                case FrostFsStatusCode.SignatureVerificationFailure:
-                case FrostFsStatusCode.NodeUnderMaintenance:
-                    IncErrorRate();
-                    return;
-            }
-        }
-
-        IncErrorRate();
-    }
-
-    private async Task ScheduleGracefulClose()
-    {
-        if (Client == null)
-            return;
-
-        await Task.Delay((int)WrapperPrm.GracefulCloseOnSwitchTimeout).ConfigureAwait(false);
-    }
-
-    // restartIfUnhealthy checks healthy status of client and recreate it if status is unhealthy.
-    // Indicating if status was changed by this function call and returns error that caused unhealthy status.
-    internal async Task<bool> RestartIfUnhealthy(CallContext ctx)
-    {
-        bool wasHealthy;
-
-        try
-        {
-            var response = await Client!.GetNodeInfoAsync(ctx).ConfigureAwait(false);
-            return false;
-        }
-        catch (RpcException)
-        {
-            wasHealthy = true;
-        }
-
-        // if connection is dialed before, to avoid routine/connection leak,
-        // pool has to close it and then initialize once again.
-        if (IsDialed())
-        {
-            await ScheduleGracefulClose().ConfigureAwait(false);
-        }
-
-        FrostFSClient? client = new(WrapperPrm, sessionCache);
-
-        var error = await client.Dial(ctx).ConfigureAwait(false);
-        if (!string.IsNullOrEmpty(error))
-        {
-            SetUnhealthyOnDial();
-            return wasHealthy;
-        }
-
-        lock (_lock)
-        {
-            Client = client;
-        }
-
-        try
-        {
-            var res = await Client.GetNodeInfoAsync(ctx).ConfigureAwait(false);
-        }
-        catch (FrostFsException)
-        {
-            SetUnhealthy();
-            
-            return wasHealthy;
-        }
-
-        SetHealthy();
-        return !wasHealthy;
-    }
-
-    internal void IncRequests(ulong elapsed, MethodIndex method)
-    {
-        var methodStat = Methods[(int)method];
-
-        methodStat.IncRequests(elapsed);
-    }
-}
-

src/FrostFS.SDK.Client/Pool/HealthyStatus.cs

@@ -1,18 +0,0 @@
-namespace FrostFS.SDK.Client;
-
-// values for healthy status of clientStatusMonitor.
-public enum HealthyStatus
-{
-    // statusUnhealthyOnDial is set when dialing to the endpoint is failed,
-    // so there is no connection to the endpoint, and pool should not close it
-    // before re-establishing connection once again.
-    UnhealthyOnDial,
-
-    // statusUnhealthyOnRequest is set when communication after dialing to the
-    // endpoint is failed due to immediate or accumulated errors, connection is
-    // available and pool should close it before re-establishing connection once again.
-    UnhealthyOnRequest,
-
-    // statusHealthy is set when connection is ready to be used by the pool.
-    Healthy
-}

src/FrostFS.SDK.Client/Pool/IClientStatus.cs

@@ -1,28 +0,0 @@
-namespace FrostFS.SDK.Client;
-
-public interface IClientStatus
-{
-    // isHealthy checks if the connection can handle requests.
-    bool IsHealthy();
-
-    // isDialed checks if the connection was created.
-    bool IsDialed();
-
-    // setUnhealthy marks client as unhealthy.
-    void SetUnhealthy();
-
-    // address return address of endpoint.
-    string Address { get; }
-
-    // currentErrorRate returns current errors rate.
-    // After specific threshold connection is considered as unhealthy.
-    // Pool.startRebalance routine can make this connection healthy again.
-    uint GetCurrentErrorRate();
-
-    // overallErrorRate returns the number of all happened errors.
-    ulong GetOverallErrorRate();
-
-    // methodsStatus returns statistic for all used methods.
-    StatusSnapshot[] MethodsStatus();
-}
-

src/FrostFS.SDK.Client/Pool/InitParameters.cs

@@ -1,45 +0,0 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Security.Cryptography;
-
-using Grpc.Core;
-using Grpc.Core.Interceptors;
-using Grpc.Net.Client;
-
-using Microsoft.Extensions.Logging;
-
-namespace FrostFS.SDK.Client;
-
-// InitParameters contains values used to initialize connection Pool.
-public class InitParameters(Func<string, ChannelBase> grpcChannelFactory)
-{
-    public ECDsa? Key { get; set; }
-
-    public ulong NodeDialTimeout { get; set; }
-
-    public ulong NodeStreamTimeout { get; set; }
-
-    public ulong HealthcheckTimeout { get; set; }
-
-    public ulong ClientRebalanceInterval { get; set; }
-
-    public ulong SessionExpirationDuration { get; set; }
-
-    public uint ErrorThreshold { get; set; }
-
-    public NodeParam[]? NodeParams { get; set; }
-
-    public GrpcChannelOptions[]? DialOptions { get; set; }
-
-    public Func<string, ClientWrapper>? ClientBuilder { get; set; }
-
-    public ulong GracefulCloseOnSwitchTimeout { get; set; }
-
-    public ILogger? Logger { get; set; }
-
-    public Action<CallStatistics>? Callback { get; set; }
-
-    public Collection<Interceptor> Interceptors { get; } = [];
-
-    public Func<string, ChannelBase> GrpcChannelFactory { get; set; } = grpcChannelFactory;
-}

src/FrostFS.SDK.Client/Pool/InnerPool.cs

@@ -1,47 +0,0 @@
-using FrostFS.SDK.Client;
-
-internal sealed class InnerPool
-{
-    private readonly object _lock = new();
-
-    internal InnerPool(Sampler sampler, ClientWrapper[] clients)
-    {
-        Clients = clients;
-        Sampler = sampler;
-    }
-
-    internal Sampler Sampler { get; set; }
-
-    internal ClientWrapper[] Clients { get; }
-
-    internal ClientWrapper? Connection()
-    {
-        lock (_lock)
-        {
-            if (Clients.Length == 1)
-            {
-                var client = Clients[0];
-                if (client.IsHealthy())
-                {
-                    return client;
-                }
-            }
-            else
-            {
-                var attempts = 3 * Clients.Length;
-
-                for (int i = 0; i < attempts; i++)
-                {
-                    int index = Sampler.Next();
-
-                    if (Clients[index].IsHealthy())
-                    {
-                        return Clients[index];
-                    }
-                }
-            }
-
-            return null;
-        }
-    }
-}

src/FrostFS.SDK.Client/Pool/MethodIndex.cs

@@ -1,24 +0,0 @@
-namespace FrostFS.SDK.Client;
-
-public enum MethodIndex
-{
-    methodBalanceGet,
-    methodContainerPut,
-    methodContainerGet,
-    methodContainerList,
-    methodContainerDelete,
-    methodEndpointInfo,
-    methodNetworkInfo,
-    methodNetMapSnapshot,
-    methodObjectPut,
-    methodObjectDelete,
-    methodObjectGet,
-    methodObjectHead,
-    methodObjectRange,
-    methodObjectPatch,
-    methodSessionCreate,
-    methodAPEManagerAddChain,
-    methodAPEManagerRemoveChain,
-    methodAPEManagerListChains,
-    methodLast
-}

src/FrostFS.SDK.Client/Pool/MethodStatus.cs

@@ -1,19 +0,0 @@
-namespace FrostFS.SDK.Client;
-
-public class MethodStatus(string name)
-{
-    private readonly object _lock = new();
-
-    public string Name { get; } = name;
-
-    public StatusSnapshot Snapshot { get; set; } = new StatusSnapshot();
-
-    internal void IncRequests(ulong elapsed)
-    {
-        lock (_lock)
-        {
-            Snapshot.AllTime += elapsed;
-            Snapshot.AllRequests++;
-        }
-    }
-}

src/FrostFS.SDK.Client/Pool/NodeParam.cs

@@ -1,12 +0,0 @@
-namespace FrostFS.SDK.Client;
-
-// NodeParam groups parameters of remote node.
-[System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1815:Override equals and operator equals on value types", Justification = "<Pending>")]
-public readonly struct NodeParam(int priority, string address, float weight)
-{
-    public int Priority { get; } = priority;
-
-    public string Address { get; } = address;
-
-    public float Weight { get; } = weight;
-}

src/FrostFS.SDK.Client/Pool/NodeStatistic.cs

@@ -1,12 +0,0 @@
-namespace FrostFS.SDK.Client;
-
-public class NodeStatistic
-{
-    public string? Address { get; internal set; }
-
-    public StatusSnapshot[]? Methods { get; internal set; }
-
-    public ulong OverallErrors { get; internal set; }
-
-    public uint CurrentErrors { get; internal set; }
-}

src/FrostFS.SDK.Client/Pool/NodesParam.cs

@@ -1,12 +0,0 @@
-using System.Collections.ObjectModel;
-
-namespace FrostFS.SDK.Client;
-
-public class NodesParam(int priority)
-{
-    public int Priority { get; } = priority;
-
-    public Collection<string> Addresses { get; } = [];
-
-    public Collection<double> Weights { get; } = [];
-}

src/FrostFS.SDK.Client/Pool/Pool.cs

@@ -1,677 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Threading;
-using System.Threading.Tasks;
-
-using FrostFS.Refs;
-using FrostFS.SDK.Client.Interfaces;
-using FrostFS.SDK.Client.Mappers.GRPC;
-using FrostFS.SDK.Cryptography;
-
-using Grpc.Core;
-
-using Microsoft.Extensions.Logging;
-
-
-namespace FrostFS.SDK.Client;
-
-public partial class Pool : IFrostFSClient
-{
-    const int defaultSessionTokenExpirationDuration = 100; // in epochs
-
-    const int defaultErrorThreshold = 100;
-
-    const int defaultGracefulCloseOnSwitchTimeout = 10; //Seconds;
-    const int defaultRebalanceInterval = 15; //Seconds;
-    const int defaultHealthcheckTimeout = 4; //Seconds;
-    const int defaultDialTimeout = 5; //Seconds;
-    const int defaultStreamTimeout = 10; //Seconds;
-
-    private readonly object _lock = new();
-
-    private InnerPool[]? InnerPools { get; set; }
-
-    private ClientKey Key { get; set; }
-
-    private OwnerID? _ownerId;
-
-    private FrostFsVersion _version;
-
-    private FrostFsOwner? _owner;
-
-    private FrostFsOwner Owner
-    {
-        get
-        {
-            _owner ??= new FrostFsOwner(Key.ECDsaKey.PublicKey().PublicKeyToAddress());
-            return _owner;
-        }
-    }
-
-    private OwnerID OwnerId
-    {
-        get
-        {
-            if (_ownerId == null)
-            {
-                _owner = Key.Owner;
-                _ownerId = _owner.ToMessage();
-            }
-            return _ownerId;
-        }
-    }
-
-    internal CancellationTokenSource CancellationTokenSource { get; } = new CancellationTokenSource();
-
-    internal SessionCache SessionCache { get; set; }
-
-    private ulong SessionTokenDuration { get; set; }
-
-    private RebalanceParameters RebalanceParams { get; set; }
-
-    private Func<string, ClientWrapper> ClientBuilder;
-
-    private bool disposedValue;
-
-    private ILogger? logger { get; set; }
-
-    private ulong MaxObjectSize { get; set; }
-
-    public IClientStatus? ClientStatus { get; }
-
-    // NewPool creates connection pool using parameters.
-    public Pool(InitParameters options)
-    {
-        if (options is null)
-        {
-            throw new ArgumentNullException(nameof(options));
-        }
-
-        if (options.Key == null)
-        {
-            throw new ArgumentException($"Missed required parameter {nameof(options.Key)}");
-        }
-
-        _version = new FrostFsVersion(2, 13);
-
-        var nodesParams = AdjustNodeParams(options.NodeParams);
-
-        var cache = new SessionCache(options.SessionExpirationDuration);
-
-        FillDefaultInitParams(options, this);
-
-        Key = new ClientKey(options.Key);
-
-        SessionCache = cache;
-        logger = options.Logger;
-        SessionTokenDuration = options.SessionExpirationDuration;
-
-        RebalanceParams = new RebalanceParameters(
-            nodesParams.ToArray(),
-            options.HealthcheckTimeout,
-            options.ClientRebalanceInterval,
-            options.SessionExpirationDuration);
-
-        ClientBuilder = options.ClientBuilder!;
-
-        // ClientContext.PoolErrorHandler = client.HandleError;
-
-    }
-
-    // Dial establishes a connection to the servers from the FrostFS network.
-    // It also starts a routine that checks the health of the nodes and
-    // updates the weights of the nodes for balancing.
-    // Returns an error describing failure reason.
-    //
-    // If failed, the Pool SHOULD NOT be used.
-    //
-    // See also InitParameters.SetClientRebalanceInterval.
-    public async Task<string?> Dial(CallContext ctx)
-    {
-        var inner = new InnerPool[RebalanceParams.NodesParams.Length];
-
-        bool atLeastOneHealthy = false;
-        int i = 0;
-        foreach (var nodeParams in RebalanceParams.NodesParams)
-        {
-            var wrappers = new ClientWrapper[nodeParams.Weights.Count];
-
-            for (int j = 0; j < nodeParams.Addresses.Count; j++)
-            {
-                ClientWrapper? wrapper = null;
-                bool dialed = false;
-                try
-                {
-                    wrapper = wrappers[j] = ClientBuilder(nodeParams.Addresses[j]);
-
-                    await wrapper.Dial(ctx).ConfigureAwait(false);
-                    dialed = true;
-
-                    var token = await InitSessionForDuration(ctx, wrapper, RebalanceParams.SessionExpirationDuration, Key.ECDsaKey, false)
-                        .ConfigureAwait(false);
-
-                    var key = FormCacheKey(nodeParams.Addresses[j], Key.PublicKey);
-                    SessionCache.SetValue(key, token);
-
-                    atLeastOneHealthy = true;
-                }
-                catch (RpcException ex)
-                {
-                    if (!dialed)
-                        wrapper!.SetUnhealthyOnDial();
-                    else
-                        wrapper!.SetUnhealthy();
-
-                    if (logger != null)
-                    {
-                        FrostFsMessages.SessionCreationError(logger, wrapper!.WrapperPrm.Address, ex.Message);
-                    }
-                }
-                catch (FrostFsInvalidObjectException)
-                {
-                    break;
-                }
-            }
-
-            var sampler = new Sampler(nodeParams.Weights.ToArray());
-
-            inner[i] = new InnerPool(sampler, wrappers);
-
-            i++;
-        }
-
-        if (!atLeastOneHealthy)
-            return "At least one node must be healthy";
-
-        InnerPools = inner;
-
-        var res = await GetNetworkSettingsAsync(default).ConfigureAwait(false);
-
-        MaxObjectSize = res.MaxObjectSize;
-
-        StartRebalance(ctx);
-
-        return null;
-    }
-
-    private static IEnumerable<NodesParam> AdjustNodeParams(NodeParam[]? nodeParams)
-    {
-        if (nodeParams == null || nodeParams.Length == 0)
-        {
-            throw new ArgumentException("No FrostFS peers configured");
-        }
-
-        Dictionary<int, NodesParam> nodesParamsDict = new(nodeParams.Length);
-        foreach (var nodeParam in nodeParams)
-        {
-            if (!nodesParamsDict.TryGetValue(nodeParam.Priority, out var nodes))
-            {
-                nodes = new NodesParam(nodeParam.Priority);
-                nodesParamsDict[nodeParam.Priority] = nodes;
-            }
-
-            nodes.Addresses.Add(nodeParam.Address);
-            nodes.Weights.Add(nodeParam.Weight);
-        }
-
-        var nodesParams = new List<NodesParam>(nodesParamsDict.Count);
-
-        foreach (var key in nodesParamsDict.Keys)
-        {
-            var nodes = nodesParamsDict[key];
-            var newWeights = AdjustWeights([.. nodes.Weights]);
-            nodes.Weights.Clear();
-            foreach (var weight in newWeights)
-            {
-                nodes.Weights.Add(weight);
-            }
-
-            nodesParams.Add(nodes);
-        }
-
-        return nodesParams.OrderBy(n => n.Priority);
-    }
-
-    private static double[] AdjustWeights(double[] weights)
-    {
-        var adjusted = new double[weights.Length];
-
-        var sum = weights.Sum();
-
-        if (sum > 0)
-        {
-            for (int i = 0; i < weights.Length; i++)
-            {
-                adjusted[i] = weights[i] / sum;
-            }
-        }
-
-        return adjusted;
-    }
-
-    private static void FillDefaultInitParams(InitParameters parameters, Pool pool)
-    {
-        if (parameters.SessionExpirationDuration == 0)
-            parameters.SessionExpirationDuration = defaultSessionTokenExpirationDuration;
-
-        if (parameters.ErrorThreshold == 0)
-            parameters.ErrorThreshold = defaultErrorThreshold;
-
-        if (parameters.ClientRebalanceInterval <= 0)
-            parameters.ClientRebalanceInterval = defaultRebalanceInterval;
-
-        if (parameters.GracefulCloseOnSwitchTimeout <= 0)
-            parameters.GracefulCloseOnSwitchTimeout = defaultGracefulCloseOnSwitchTimeout;
-
-        if (parameters.HealthcheckTimeout <= 0)
-            parameters.HealthcheckTimeout = defaultHealthcheckTimeout;
-
-        if (parameters.NodeDialTimeout <= 0)
-            parameters.NodeDialTimeout = defaultDialTimeout;
-
-        if (parameters.NodeStreamTimeout <= 0)
-            parameters.NodeStreamTimeout = defaultStreamTimeout;
-
-        if (parameters.SessionExpirationDuration == 0)
-            parameters.SessionExpirationDuration = defaultSessionTokenExpirationDuration;
-
-        parameters.ClientBuilder ??= new Func<string, ClientWrapper>((address) =>
-            {
-                var wrapperPrm = new WrapperPrm()
-                {
-                    Address = address,
-                    Key = parameters.Key!,
-                    Logger = parameters.Logger,
-                    DialTimeout = parameters.NodeDialTimeout,
-                    StreamTimeout = parameters.NodeStreamTimeout,
-                    ErrorThreshold = parameters.ErrorThreshold,
-                    GracefulCloseOnSwitchTimeout = parameters.GracefulCloseOnSwitchTimeout,
-                    Callback = parameters.Callback,
-                    Interceptors = parameters.Interceptors,
-                    GrpcChannelFactory = parameters.GrpcChannelFactory
-
-                };
-
-                return new ClientWrapper(wrapperPrm, pool);
-            }
-        );
-    }
-
-    private ClientWrapper Connection()
-    {
-        foreach (var pool in InnerPools!)
-        {
-            var client = pool.Connection();
-            if (client != null)
-            {
-                return client;
-            }
-        }
-
-        throw new FrostFsException("Cannot find alive client");
-    }
-
-    private static async Task<FrostFsSessionToken> InitSessionForDuration(CallContext ctx, ClientWrapper cw, ulong duration, ECDsa key, bool clientCut)
-    {
-        var client = cw.Client;
-        var networkInfo = await client!.GetNetworkSettingsAsync(ctx).ConfigureAwait(false);
-
-        var epoch = networkInfo.Epoch;
-
-        ulong exp = ulong.MaxValue - epoch < duration
-            ? ulong.MaxValue
-            : epoch + duration;
-
-        var prmSessionCreate = new PrmSessionCreate(exp);
-
-        return await client.CreateSessionAsync(prmSessionCreate, ctx).ConfigureAwait(false);
-    }
-
-    internal static string FormCacheKey(string address, string key)
-    {
-        return $"{address}{key}";
-    }
-
-    public void Close()
-    {
-        CancellationTokenSource.Cancel();
-
-        //if (InnerPools != null)
-        //{
-        //    // close all clients
-        //    foreach (var innerPool in InnerPools)
-        //        foreach (var client in innerPool.Clients)
-        //            if (client.IsDialed())
-        //                client.Client?.Close();
-        //}
-    }
-
-    // startRebalance runs loop to monitor connection healthy status.
-    internal void StartRebalance(CallContext ctx)
-    {
-        var buffers = new double[RebalanceParams.NodesParams.Length][];
-
-        for (int i = 0; i < RebalanceParams.NodesParams.Length; i++)
-        {
-            var parameters = RebalanceParams.NodesParams[i];
-            buffers[i] = new double[parameters.Weights.Count];
-
-            Task.Run(async () =>
-            {
-                await Task.Delay((int)RebalanceParams.ClientRebalanceInterval).ConfigureAwait(false);
-                UpdateNodesHealth(ctx, buffers);
-            });
-        }
-    }
-
-    private void UpdateNodesHealth(CallContext ctx, double[][] buffers)
-    {
-        var tasks = new Task[InnerPools!.Length];
-
-        for (int i = 0; i < InnerPools.Length; i++)
-        {
-            var bufferWeights = buffers[i];
-
-            tasks[i] = Task.Run(() => UpdateInnerNodesHealth(ctx, i, bufferWeights));
-        }
-
-        Task.WaitAll(tasks);
-    }
-
-    private async ValueTask UpdateInnerNodesHealth(CallContext ctx, int poolIndex, double[] bufferWeights)
-    {
-        if (poolIndex > InnerPools!.Length - 1)
-        {
-            return;
-        }
-
-        var pool = InnerPools[poolIndex];
-
-        var options = RebalanceParams;
-
-        int healthyChanged = 0;
-
-        var tasks = new Task[pool.Clients.Length];
-
-        for (int j = 0; j < pool.Clients.Length; j++)
-        {
-            var client = pool.Clients[j];
-            var healthy = false;
-            string? error = null;
-            var changed = false;
-
-            try
-            {
-                // check timeout settings
-                changed = await client!.RestartIfUnhealthy(ctx).ConfigureAwait(false);
-                healthy = true;
-                bufferWeights[j] = options.NodesParams[poolIndex].Weights[j];
-            }
-            // TODO: specify
-            catch (FrostFsException e)
-            {
-                error = e.Message;
-                bufferWeights[j] = 0;
-
-                SessionCache.DeleteByPrefix(client.Address);
-            }
-
-            if (changed)
-            {
-                if (!string.IsNullOrEmpty(error))
-                {
-                    if (logger != null)
-                    {
-                        FrostFsMessages.HealthChanged(logger, client.Address, healthy, error!);
-                    }
-
-                    Interlocked.Exchange(ref healthyChanged, 1);
-                }
-            }
-
-            await Task.WhenAll(tasks).ConfigureAwait(false);
-
-            if (Interlocked.CompareExchange(ref healthyChanged, -1, -1) == 1)
-            {
-                var probabilities = AdjustWeights(bufferWeights);
-
-                lock (_lock)
-                {
-                    pool.Sampler = new Sampler(probabilities);
-                }
-            }
-        }
-    }
-
-
-    // TODO: remove
-    private bool CheckSessionTokenErr(Exception error, string address)
-    {
-        if (error == null)
-        {
-            return false;
-        }
-
-        if (error is SessionNotFoundException || error is SessionExpiredException)
-        {
-            this.SessionCache.DeleteByPrefix(address);
-            return true;
-        }
-
-        return false;
-    }
-
-    public Statistic Statistic()
-    {
-        if (InnerPools == null)
-        {
-            throw new FrostFsInvalidObjectException(nameof(Pool));
-        }
-
-        var statistics = new Statistic();
-
-        foreach (var inner in InnerPools)
-        {
-            int valueIndex = 0;
-            var nodes = new string[inner.Clients.Length];
-
-            lock (_lock)
-            {
-                foreach (var client in inner.Clients)
-                {
-                    if (client.IsHealthy())
-                    {
-                        nodes[valueIndex] = client.Address;
-                    }
-
-                    var node = new NodeStatistic
-                    {
-                        Address = client.Address,
-                        Methods = client.MethodsStatus(),
-                        OverallErrors = client.GetOverallErrorRate(),
-                        CurrentErrors = client.GetCurrentErrorRate()
-                    };
-
-                    statistics.Nodes.Add(node);
-
-                    valueIndex++;
-
-                    statistics.OverallErrors += node.OverallErrors;
-                }
-
-                if (statistics.CurrentNodes == null || statistics.CurrentNodes.Length == 0)
-                {
-                    statistics.CurrentNodes = nodes;
-                }
-            }
-        }
-
-        return statistics;
-    }
-
-    public async Task<FrostFsNetmapSnapshot> GetNetmapSnapshotAsync(CallContext ctx)
-    {
-        var client = Connection();
-
-        return await client.Client!.GetNetmapSnapshotAsync(ctx).ConfigureAwait(false);
-    }
-
-    public async Task<FrostFsNodeInfo> GetNodeInfoAsync(CallContext ctx)
-    {
-        var client = Connection();
-        return await client.Client!.GetNodeInfoAsync(ctx).ConfigureAwait(false);
-    }
-
-    public async Task<NetworkSettings> GetNetworkSettingsAsync(CallContext ctx)
-    {
-        var client = Connection();
-        return await client.Client!.GetNetworkSettingsAsync(ctx).ConfigureAwait(false);
-    }
-
-    public async Task<FrostFsSessionToken> CreateSessionAsync(PrmSessionCreate args, CallContext ctx)
-    {
-        var client = Connection();
-        return await client.Client!.CreateSessionAsync(args, ctx).ConfigureAwait(false);
-    }
-
-    public async Task<ReadOnlyMemory<byte>> AddChainAsync(PrmApeChainAdd args, CallContext ctx)
-    {
-        var client = Connection();
-        return await client.Client!.AddChainAsync(args, ctx).ConfigureAwait(false);
-    }
-
-    public async Task RemoveChainAsync(PrmApeChainRemove args, CallContext ctx)
-    {
-        var client = Connection();
-        await client.Client!.RemoveChainAsync(args, ctx).ConfigureAwait(false);
-    }
-
-    public async Task<FrostFsChain[]> ListChainAsync(PrmApeChainList args, CallContext ctx)
-    {
-        var client = Connection();
-        return await client.Client!.ListChainAsync(args, ctx).ConfigureAwait(false);
-    }
-
-    public async Task<FrostFsContainerInfo> GetContainerAsync(PrmContainerGet args, CallContext ctx)
-    {
-        var client = Connection();
-        return await client.Client!.GetContainerAsync(args, ctx).ConfigureAwait(false);
-    }
-
-    public IAsyncEnumerable<FrostFsContainerId> ListContainersAsync(PrmContainerGetAll args, CallContext ctx)
-    {
-        var client = Connection();
-        return client.Client!.ListContainersAsync(args, ctx);
-    }
-
-    [Obsolete("Use PutContainerAsync method")]
-    public async Task<FrostFsContainerId> CreateContainerAsync(PrmContainerCreate args, CallContext ctx)
-    {
-        var client = Connection();
-        return await client.Client!.PutContainerAsync(args, ctx).ConfigureAwait(false);
-    }
-
-    public async Task<FrostFsContainerId> PutContainerAsync(PrmContainerCreate args, CallContext ctx)
-    {
-        var client = Connection();
-        return await client.Client!.PutContainerAsync(args, ctx).ConfigureAwait(false);
-    }
-
-    public async Task DeleteContainerAsync(PrmContainerDelete args, CallContext ctx)
-    {
-        var client = Connection();
-        await client.Client!.DeleteContainerAsync(args, ctx).ConfigureAwait(false);
-    }
-
-    public async Task<FrostFsHeaderResult> GetObjectHeadAsync(PrmObjectHeadGet args, CallContext ctx)
-    {
-        var client = Connection();
-        return await client.Client!.GetObjectHeadAsync(args, ctx).ConfigureAwait(false);
-    }
-
-    public async Task<FrostFsObject> GetObjectAsync(PrmObjectGet args, CallContext ctx)
-    {
-        var client = Connection();
-        return await client.Client!.GetObjectAsync(args, ctx).ConfigureAwait(false);
-    }
-
-    public async Task<IObjectWriter> PutObjectAsync(PrmObjectPut args, CallContext ctx)
-    {
-        var client = Connection();
-        return await client.Client!.PutObjectAsync(args, ctx).ConfigureAwait(false);
-    }
-
-    public async Task<FrostFsObjectId> PutClientCutObjectAsync(PrmObjectClientCutPut args, CallContext ctx)
-    {
-        var client = Connection();
-        return await client.Client!.PutClientCutObjectAsync(args, ctx).ConfigureAwait(false);
-    }
-
-    public async Task<FrostFsObjectId> PutSingleObjectAsync(PrmSingleObjectPut args, CallContext ctx)
-    {
-        var client = Connection();
-        return await client.Client!.PutSingleObjectAsync(args, ctx).ConfigureAwait(false);
-    }
-
-    public async Task<FrostFsObjectId> PatchObjectAsync(PrmObjectPatch args, CallContext ctx)
-    {
-        var client = Connection();
-        return await client.Client!.PatchObjectAsync(args, ctx).ConfigureAwait(false);
-    }
-
-    public async Task<RangeReader> GetRangeAsync(PrmRangeGet args, CallContext ctx)
-    {
-        var client = Connection();
-        return await client.Client!.GetRangeAsync(args, ctx).ConfigureAwait(false);
-    }
-
-    public async Task<ReadOnlyMemory<byte>[]> GetRangeHashAsync(PrmRangeHashGet args, CallContext ctx)
-    {
-        var client = Connection();
-        return await client.Client!.GetRangeHashAsync(args, ctx).ConfigureAwait(false);
-    }
-
-    public async Task<FrostFsObjectId> PatchAsync(PrmObjectPatch args, CallContext ctx)
-    {
-        var client = Connection();
-        return await client.Client!.PatchObjectAsync(args, ctx).ConfigureAwait(false);
-    }
-
-    public async Task DeleteObjectAsync(PrmObjectDelete args, CallContext ctx)
-    {
-        var client = Connection();
-        await client.Client!.DeleteObjectAsync(args, ctx).ConfigureAwait(false);
-    }
-
-    public IAsyncEnumerable<FrostFsObjectId> SearchObjectsAsync(PrmObjectSearch args, CallContext ctx)
-    {
-        var client = Connection();
-        return client.Client!.SearchObjectsAsync(args, ctx);
-    }
-
-    public async Task<Accounting.Decimal> GetBalanceAsync(CallContext ctx)
-    {
-        var client = Connection();
-        return await client.Client!.GetBalanceAsync(ctx).ConfigureAwait(false);
-    }
-
-    protected virtual void Dispose(bool disposing)
-    {
-        if (!disposedValue)
-        {
-            if (disposing)
-            {
-                Close();
-            }
-
-            disposedValue = true;
-        }
-    }
-
-    public void Dispose()
-    {
-        Dispose(disposing: true);
-    }
-}

src/FrostFS.SDK.Client/Pool/RebalanceParameters.cs

@@ -1,16 +0,0 @@
-namespace FrostFS.SDK.Client;
-
-public class RebalanceParameters(
-    NodesParam[] nodesParams,
-    ulong nodeRequestTimeout,
-    ulong clientRebalanceInterval,
-    ulong sessionExpirationDuration)
-{
-    public NodesParam[] NodesParams { get; set; } = nodesParams;
-
-    public ulong NodeRequestTimeout { get; set; } = nodeRequestTimeout;
-
-    public ulong ClientRebalanceInterval { get; set; } = clientRebalanceInterval;
-
-    public ulong SessionExpirationDuration { get; set; } = sessionExpirationDuration;
-}

src/FrostFS.SDK.Client/Pool/RequestInfo.cs

@@ -1,14 +0,0 @@
-using System;
-
-namespace FrostFS.SDK.Client;
-
-// RequestInfo groups info about pool request.
-struct RequestInfo
-{
-    public string Address { get; set; }
-
-    public MethodIndex MethodIndex { get; set; }
-
-    public TimeSpan Elapsed { get; set; }
-}
-

src/FrostFS.SDK.Client/Pool/Sampler.cs

@@ -1,85 +0,0 @@
-using System;
-
-namespace FrostFS.SDK.Client;
-
-internal sealed class Sampler
-{
-    private readonly object _lock = new();
-
-    private Random random = new();
-
-    internal double[] Probabilities { get; set; }
-    internal int[] Alias { get; set; }
-
-    internal Sampler(double[] probabilities)
-    {
-        var small = new WorkList();
-        var large = new WorkList();
-
-        var n = probabilities.Length;
-
-        //  sampler.randomGenerator = rand.New(source)
-        Probabilities = new double[n];
-        Alias = new int[n];
-
-        // Compute scaled probabilities.
-        var p = new double[n];
-
-        for (int i = 0; i < n; i++)
-        {
-            p[i] = probabilities[i] * n;
-            if (p[i] < 1)
-                small.Add(i);
-            else
-                large.Add(i);
-        }
-
-        while (small.Length > 0 && large.Length > 0)
-        {
-            var l = small.Remove();
-            var g = large.Remove();
-
-            Probabilities[l] = p[l];
-            Alias[l] = g;
-
-            p[g] = p[g] + p[l] - 1;
-
-            if (p[g] < 1)
-                small.Add(g);
-            else
-                large.Add(g);
-        }
-
-        while (large.Length > 0)
-        {
-            var g = large.Remove();
-            Probabilities[g] = 1;
-        }
-
-        while (small.Length > 0)
-        {
-            var l = small.Remove();
-            probabilities[l] = 1;
-        }
-    }
-
-    internal int Next()
-    {
-        var n = Alias.Length;
-
-        int i;
-        double f;
-        lock (_lock)
-        {
-            i = random.Next(0, n - 1);
-            f = random.NextDouble();
-        }
-
-        if (f < Probabilities[i])
-        {
-            return i;
-        }
-
-        return Alias[i];
-    }
-}

src/FrostFS.SDK.Client/Pool/Statistic.cs

@@ -1,12 +0,0 @@
-using System.Collections.ObjectModel;
-
-namespace FrostFS.SDK.Client;
-
-public sealed class Statistic
-{
-    public ulong OverallErrors { get; internal set; }
-
-    public Collection<NodeStatistic> Nodes { get; } = [];
-
-    public string[]? CurrentNodes { get; internal set; }
-}

src/FrostFS.SDK.Client/Pool/StatusSnapshot.cs

@@ -1,8 +0,0 @@
-namespace FrostFS.SDK.Client;
-
-public class StatusSnapshot()
-{
-    public ulong AllTime { get; internal set; }
-
-    public ulong AllRequests { get; internal set; }
-}

src/FrostFS.SDK.Client/Pool/WorkList.cs

@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace FrostFS.SDK.Client;
-
-internal sealed class WorkList
-{
-    private readonly List<int> elements = [];
-
-    internal int Length
-    {
-        get { return elements.Count; }
-    }
-
-    internal void Add(int element)
-    {
-        elements.Add(element);
-    }
-
-    internal int Remove()
-    {
-        int last = elements.LastOrDefault();
-        elements.RemoveAt(elements.Count - 1);
-        return last;
-    }
-}

src/FrostFS.SDK.Client/Pool/WrapperPrm.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Security.Cryptography;
-
-using Grpc.Core;
-using Grpc.Core.Interceptors;
-
-using Microsoft.Extensions.Logging;
-
-namespace FrostFS.SDK.Client;
-
-[System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1815:Override equals and operator equals on value types", Justification = "<Pending>")]
-public struct WrapperPrm
-{
-    internal ILogger? Logger { get; set; }
-
-    internal string Address { get; set; }
-
-    internal ECDsa Key { get; set; }
-
-    internal ulong DialTimeout { get; set; }
-
-    internal ulong StreamTimeout { get; set; }
-
-    internal uint ErrorThreshold { get; set; }
-
-    internal Action ResponseInfoCallback { get; set; }
-
-    internal Action PoolRequestInfoCallback { get; set; }
-
-    internal Func<string, ChannelBase> GrpcChannelFactory { get; set; }
-
-    internal ulong GracefulCloseOnSwitchTimeout { get; set; }
-
-    internal Action<CallStatistics>? Callback { get; set; }
-
-    internal Collection<Interceptor>? Interceptors { get; set; }
-}
-

src/FrostFS.SDK.Client/Services/ApeManagerServiceProvider.cs

@@ -20,8 +20,6 @@ internal sealed class ApeManagerServiceProvider : ContextAccessor
     {
         var binary = RuleSerializer.Serialize(args.Chain);
 
-        var base64 = Convert.ToBase64String(binary);
-        
         AddChainRequest request = new()
         {
             Body = new()

src/FrostFS.SDK.Client/Services/ContainerServiceProvider.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Security.Cryptography;
 using System.Threading.Tasks;
 
 using FrostFS.Container;
@@ -83,7 +82,7 @@ internal sealed class ContainerServiceProvider(ContainerService.ContainerService
             Body = new PutRequest.Types.Body
             {
                 Container = grpcContainer,
-                Signature = ClientContext.Key.ECDsaKey.SignRFC6979(grpcContainer)
+                Signature = ClientContext.Key.SignRFC6979(grpcContainer)
             }
         };
 
@@ -113,8 +112,8 @@ internal sealed class ContainerServiceProvider(ContainerService.ContainerService
         {
             Body = new DeleteRequest.Types.Body
             {
-                ContainerId = args.ContainerId.ToMessage(),
-                Signature = ClientContext.Key.ECDsaKey.SignRFC6979(args.ContainerId.ToMessage().Value)
+                ContainerId = args.ContainerId.GetContainerID(),
+                Signature = ClientContext.Key.SignRFC6979(args.ContainerId.GetContainerID().Value)
             }
         };
 

src/FrostFS.SDK.Client/Services/ObjectServiceProvider.cs

@@ -96,7 +96,7 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
             {
                 Address = new Address
                 {
-                    ContainerId = args.ContainerId.ToMessage(),
+                    ContainerId = args.ContainerId.GetContainerID(),
                     ObjectId = args.ObjectId.ToMessage()
                 }
             }
@@ -124,7 +124,7 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
             {
                 Address = new Address
                 {
-                    ContainerId = args.ContainerId.ToMessage(),
+                    ContainerId = args.ContainerId.GetContainerID(),
                     ObjectId = args.ObjectId.ToMessage()
                 },
                 Range = new Object.Range
@@ -159,7 +159,7 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
             {
                 Address = new Address
                 {
-                    ContainerId = args.ContainerId.ToMessage(),
+                    ContainerId = args.ContainerId.GetContainerID(),
                     ObjectId = args.ObjectId.ToMessage()
                 },
                 Type = ChecksumType.Sha256,
@@ -204,7 +204,7 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
             {
                 Address = new Address
                 {
-                    ContainerId = args.ContainerId.ToMessage(),
+                    ContainerId = args.ContainerId.GetContainerID(),
                     ObjectId = args.ObjectId.ToMessage()
                 }
             }
@@ -231,7 +231,7 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
         {
             Body = new SearchRequest.Types.Body
             {
-                ContainerId = args.ContainerId.ToMessage(),
+                ContainerId = args.ContainerId.GetContainerID(),
                 Version = 1  // TODO: clarify this param
             }
         };
@@ -296,18 +296,17 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
     {
         var chunkSize = args.MaxChunkLength;
         Stream payload = args.Payload ?? throw new ArgumentNullException(nameof(args), "Stream parameter is null");
-  
+
         var call = client.Patch(null, ctx.GetDeadline(), ctx.CancellationToken);
 
         byte[]? chunkBuffer = null;
         try
         {
-            // common 
             chunkBuffer = ArrayPool<byte>.Shared.Rent(chunkSize);
 
             bool isFirstChunk = true;
             ulong currentPos = args.Range.Offset;
-            
+
             var address = new Address
             {
                 ObjectId = args.Address.ObjectId,
@@ -327,11 +326,11 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
                 {
                     Body = new()
                     {
-                        Address = address,  
+                        Address = address,
                         Patch = new PatchRequest.Types.Body.Types.Patch
                         {
                             Chunk = UnsafeByteOperations.UnsafeWrap(chunkBuffer.AsMemory(0, bytesCount)),
-                            SourceRange = new Object.Range { Offset = currentPos, Length = (ulong)bytesCount }
+                            SourceRange = new Range { Offset = currentPos, Length = (ulong)bytesCount }
                         }
                     }
                 };
@@ -385,7 +384,7 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
 
         return response.Body.ObjectId.ToModel();
     }
- 
+
     internal async Task<FrostFsObjectId> PutClientCutObjectAsync(PrmObjectClientCutPut args, CallContext ctx)
     {
         var stream = args.Payload!;
@@ -567,7 +566,7 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
                     break;
 
                 sentBytes += bytesCount;
-               
+
                 var chunkRequest = new PutRequest
                 {
                     Body = new PutRequest.Types.Body
@@ -622,7 +621,7 @@ internal sealed class ObjectServiceProvider(ObjectService.ObjectServiceClient cl
         var initRequest = new PutRequest
         {
             Body = new PutRequest.Types.Body
-            {                
+            {
                 Init = new PutRequest.Types.Body.Types.Init
                 {
                     Header = grpcHeader,

src/FrostFS.SDK.Client/Services/Shared/SessionCache.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
 
 namespace FrostFS.SDK.Client;
 
@@ -36,15 +35,4 @@ internal sealed class SessionCache(ulong sessionExpirationDuration)
             _cache[key] = value;
         }
     }
-
-    internal void DeleteByPrefix(string prefix)
-    {
-        foreach (var key in _cache.Keys)
-        {
-            if (key.StartsWith(prefix, StringComparison.Ordinal))
-            {
-                _cache.TryRemove(key, out var _);
-            }
-        }
-    }
 }

src/FrostFS.SDK.Client/Tools/ClientContext.cs

@@ -39,7 +39,7 @@ public class ClientContext(FrostFSClient client, ClientKey key, FrostFsOwner own
         {
             if (sessionKey == null && Key != null && Address != null)
             {
-                sessionKey = Pool.FormCacheKey(Address, Key.PublicKey);
+                sessionKey = $"{Address}{Key}";
             }
 
             return sessionKey;

src/FrostFS.SDK.Client/Tools/ObjectTools.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-
+using System.Security.Cryptography;
 using FrostFS.Object;
 using FrostFS.Refs;
 using FrostFS.SDK.Client.Mappers.GRPC;
@@ -44,7 +44,11 @@ public static class ObjectTools
         if (header.Split != null)
             SetSplitValues(grpcHeader, header.Split, owner, version, key);
 
-        return new ObjectID { Value = grpcHeader.Sha256() }.ToModel();
+        using var sha256 = SHA256.Create();
+        using HashStream stream = new(sha256);
+        grpcHeader.WriteTo(stream);
+
+        return new FrostFsObjectId(Base58.Encode(stream.Hash()));
     }
 
     internal static Object.Object CreateSingleObject(FrostFsObject @object, ClientContext ctx)
@@ -75,7 +79,7 @@ public static class ObjectTools
         var obj = new Object.Object
         {
             Header = grpcHeader,
-            ObjectId = new ObjectID { Value = grpcHeader.Sha256() },
+            ObjectId = new ObjectID { Value = UnsafeByteOperations.UnsafeWrap(grpcHeader.Sha256()) },
             Payload = UnsafeByteOperations.UnsafeWrap(@object.SingleObjectPayload)
         };
 
@@ -117,9 +121,9 @@ public static class ObjectTools
 
         if (split.ParentHeader is not null)
         {
-            var grpcParentHeader = CreateHeader(split.ParentHeader, Array.Empty<byte>().Sha256(), owner, version);
+            var grpcParentHeader = CreateHeader(split.ParentHeader, DataHasher.Sha256([]), owner, version);
 
-            grpcHeader.Split.Parent = new ObjectID { Value = grpcParentHeader.Sha256() };
+            grpcHeader.Split.Parent = new ObjectID { Value = UnsafeByteOperations.UnsafeWrap(grpcParentHeader.Sha256()) };
             grpcHeader.Split.ParentHeader = grpcParentHeader;
             grpcHeader.Split.ParentSignature = new Signature
             {
@@ -147,21 +151,12 @@ public static class ObjectTools
         return grpcHeader;
     }
 
-    internal static Checksum Sha256Checksum(byte[] data)
-    {
-        return new Checksum
-        {
-            Type = ChecksumType.Sha256,
-            Sum = ByteString.CopyFrom(data.Sha256())
-        };
-    }
-
     internal static Checksum Sha256Checksum(ReadOnlyMemory<byte> data)
     {
         return new Checksum
         {
             Type = ChecksumType.Sha256,
-            Sum = ByteString.CopyFrom(data.Sha256())
+            Sum = UnsafeByteOperations.UnsafeWrap(DataHasher.Sha256(data))
         };
     }
 

src/FrostFS.SDK.Client/Tools/RequestSigner.cs

@@ -33,6 +33,7 @@ public static class RequestSigner
         var ecParameters = new ECDomainParameters(secp256R1.Curve, secp256R1.G, secp256R1.N);
         var privateKey = new ECPrivateKeyParameters(new BigInteger(1, key.PrivateKey()), ecParameters);
         var signer = new ECDsaSigner(new HMacDsaKCalculator(digest));
+
         var hash = new byte[digest.GetDigestSize()];
 
         digest.BlockUpdate(data, 0, data.Length);
@@ -54,21 +55,21 @@ public static class RequestSigner
         return ByteString.CopyFrom(signature);
     }
 
-    internal static SignatureRFC6979 SignRFC6979(this ECDsa key, IMessage message)
+    internal static SignatureRFC6979 SignRFC6979(this ClientKey key, IMessage message)
     {
         return new SignatureRFC6979
         {
-            Key = ByteString.CopyFrom(key.PublicKey()),
-            Sign = key.SignRFC6979(message.ToByteArray()),
+            Key = key.PublicKeyProto,
+            Sign = key.ECDsaKey.SignRFC6979(message.ToByteArray()),
         };
     }
 
-    internal static SignatureRFC6979 SignRFC6979(this ECDsa key, ByteString data)
+    internal static SignatureRFC6979 SignRFC6979(this ClientKey key, ByteString data)
     {
         return new SignatureRFC6979
         {
-            Key = ByteString.CopyFrom(key.PublicKey()),
-            Sign = key.SignRFC6979(data.ToByteArray()),
+            Key = key.PublicKeyProto,
+            Sign = key.ECDsaKey.SignRFC6979(data.ToByteArray()),
         };
     }
 
@@ -82,11 +83,11 @@ public static class RequestSigner
         Span<byte> result = stackalloc byte[65];
         result[0] = 0x04;
 
-        key.SignHash(data.Sha512()).AsSpan().CopyTo(result.Slice(1));
+        key.SignHash(DataHasher.Sha512(data)).AsSpan().CopyTo(result.Slice(1));
 
         return ByteString.CopyFrom(result);
     }
-    
+
     public static ByteString SignDataByHash(this ECDsa key, byte[] hash)
     {
         if (key is null)
@@ -112,8 +113,9 @@ public static class RequestSigner
                 Sign = key.ECDsaKey.SignData(ReadOnlyMemory<byte>.Empty),
             };
         }
-       
-        using HashStream stream = new();
+
+        using var sha512 = SHA512.Create();
+        using HashStream stream = new(sha512);
         data.WriteTo(stream);
 
         var sig = new Signature

src/FrostFS.SDK.Client/Tools/Verifier.cs

@@ -9,61 +9,13 @@ using FrostFS.Session;
 
 using Google.Protobuf;
 
-using Org.BouncyCastle.Asn1.Sec;
-using Org.BouncyCastle.Crypto.Digests;
-using Org.BouncyCastle.Crypto.Parameters;
-using Org.BouncyCastle.Crypto.Signers;
-using Org.BouncyCastle.Math;
-
 namespace FrostFS.SDK.Client;
 
 public static class Verifier
 {
     public const int RFC6979SignatureSize = 64;
 
-    private static BigInteger[] DecodeSignature(byte[] sig)
-    {
-        if (sig.Length != RFC6979SignatureSize)
-            throw new FormatException($"Wrong signature size, expect={RFC6979SignatureSize}, actual={sig.Length}");
-
-        var rs = new BigInteger[2];
-        rs[0] = new BigInteger(1, sig.AsSpan(0, 32).ToArray());
-        rs[1] = new BigInteger(1, sig.AsSpan(32).ToArray());
-
-        return rs;
-    }
-
-    public static bool VerifyRFC6979(this byte[] publicKey, byte[] data, byte[] sig)
-    {
-        if (publicKey is null || data is null || sig is null)
-            return false;
-
-        var rs = DecodeSignature(sig);
-        var digest = new Sha256Digest();
-        var signer = new ECDsaSigner(new HMacDsaKCalculator(digest));
-        var secp256R1 = SecNamedCurves.GetByName("secp256r1");
-        var ecParameters = new ECDomainParameters(secp256R1.Curve, secp256R1.G, secp256R1.N);
-        var bcPublicKey = new ECPublicKeyParameters(secp256R1.Curve.DecodePoint(publicKey), ecParameters);
-        var hash = new byte[digest.GetDigestSize()];
-
-        digest.BlockUpdate(data, 0, data.Length);
-        digest.DoFinal(hash, 0);
-        signer.Init(false, bcPublicKey);
-
-        return signer.VerifySignature(hash, rs[0], rs[1]);
-    }
-
-    public static bool VerifyRFC6979(this SignatureRFC6979 signature, IMessage message)
-    {
-        if (signature is null)
-        {
-            throw new ArgumentNullException(nameof(signature));
-        }
-
-        return signature.Key.ToByteArray().VerifyRFC6979(message.ToByteArray(), signature.Sign.ToByteArray());
-    }
-
-    public static bool VerifyData(this ECDsa key, ReadOnlyMemory<byte> data, byte[] sig)
+    public static bool VerifyData(this ECDsa key, IMessage data, ByteString sig)
     {
         if (key is null)
             throw new ArgumentNullException(nameof(key));
@@ -71,7 +23,18 @@ public static class Verifier
         if (sig is null)
             throw new ArgumentNullException(nameof(sig));
 
-        return key.VerifyHash(data.Sha512(), sig.AsSpan(1).ToArray());
+        var signature = sig.Span.Slice(1).ToArray();
+        using var sha = SHA512.Create();
+
+        if (data is null)
+        {
+            return key.VerifyHash(DataHasher.Sha512(new Span<byte>([])), signature);
+        }
+
+        using var stream = new HashStream(sha);
+        data.WriteTo(stream);
+
+        return key.VerifyHash(stream.Hash(), signature);
     }
 
     public static bool VerifyMessagePart(this Signature sig, IMessage data)
@@ -80,9 +43,8 @@ public static class Verifier
             return false;
 
         using var key = sig.Key.ToByteArray().LoadPublicKey();
-        var data2Verify = data is null ? [] : data.ToByteArray();
 
-        return key.VerifyData(data2Verify, sig.Sign.ToByteArray());
+        return key.VerifyData(data, sig.Sign);
     }
 
     internal static bool VerifyMatryoskaLevel(IMessage body, IMetaHeader meta, IVerificationHeader verification)