Browse Source

cnv4 protocol changes

pull/123/head
notgiven688 2 years ago
parent
commit
5f25ff8e43
6 changed files with 272 additions and 237 deletions
  1. +2
    -2
      SDK/miner_raw/mine.html
  2. +1
    -0
      SDK/miner_raw/miner/miner.js
  3. +7
    -3
      server/Server/AlgorithmHelper.cs
  4. +236
    -217
      server/Server/Fleck/WebSocketConnection.cs
  5. +4
    -1
      server/Server/PoolConnection.cs
  6. +22
    -14
      server/Server/Program.cs

+ 2
- 2
SDK/miner_raw/mine.html View File

@ -24,8 +24,8 @@
/* start mining, use a local server */
server = "ws://localhost:8181";
startMining("moneroocean.stream",
"422QQNhnhX8hmMEkF3TWePWSvKm6DiV7sS3Za2dXrynsJ1w8U6AzwjEdnewdhmP3CDaqvaS6BjEjGMK9mnumtufvLmz5HJi");
startMining("killallasics",
"9v4vTVwqZzfjCFyPi7b9Uv1hHntJxycC4XvRyEscqwtq8aycw5xGpTxFyasurgf2KRBfbdAJY4AVcemL1JCegXU4EZfMtaz");
/* keep us updated */

+ 1
- 0
SDK/miner_raw/miner/miner.js View File

@ -242,6 +242,7 @@ function informWorker(wrk) {
function on_servermsg(e) {
var obj = JSON.parse(e.data);
console.log(e.data);
receiveStack.push(obj);

+ 7
- 3
server/Server/AlgorithmHelper.cs View File

@ -1,6 +1,6 @@
// The MIT License (MIT)
// Copyright (c) 2018 - the webminerpool developer
// Copyright (c) 2018-2019 - the webminerpool developer
// Permission is hereby granted, free of charge, to any person obtaining a copy of
// this software and associated documentation files (the "Software"), to deal in
@ -27,7 +27,7 @@ using JsonData = System.Collections.Generic.Dictionary;
namespace Server
{
public class AlgorithmHelper
public static class AlgorithmHelper
{
// quite a mess
@ -38,12 +38,14 @@ namespace Server
{ "cryptonight/0", new Tuple<string, int>("cn", 0) },
{ "cryptonight/1", new Tuple<string, int>("cn", 1) },
{ "cryptonight/2", new Tuple<string, int>("cn", 2) },
{ "cryptonight/r", new Tuple<string, int>("cn", 4) },
{ "cryptonight-lite/0", new Tuple<string, int>("cn-lite", 0) },
{ "cryptonight-lite/1", new Tuple<string, int>("cn-lite", 1) },
{ "cryptonight-lite/2", new Tuple<string, int>("cn-lite", 2) },
{ "cn/0", new Tuple<string, int>("cn", 0) },
{ "cn/1", new Tuple<string, int>("cn", 1) },
{ "cn/2", new Tuple<string, int>("cn", 2) },
{ "cn/r", new Tuple<string, int>("cn", 4) },
{ "cn-lite/0", new Tuple<string, int>("cn-lite", 0) },
{ "cn-lite/1", new Tuple<string, int>("cn-lite", 1) },
{ "cn-lite/2", new Tuple<string, int>("cn-lite", 2) }
@ -51,8 +53,10 @@ namespace Server
public static bool NormalizeAlgorithmAndVariant(JsonData job)
{
string algo = job["algo"].GetString().ToLower();
string variant = job["variant"].GetString().ToLower();
if (variant == "r") job["variant"] = "4";
if (algo == "cn" || algo == "cryptonight")
job["algo"] = "cn";

+ 236
- 217
server/Server/Fleck/WebSocketConnection.cs View File

@ -29,268 +29,287 @@ using System.Threading.Tasks;
namespace Fleck
{
public class WebSocketConnection : IWebSocketConnection
{
public WebSocketConnection(ISocket socket, Action<IWebSocketConnection> initialize, Func<byte[], WebSocketHttpRequest> parseRequest, Func<WebSocketHttpRequest, IHandler> handlerFactory, Func<IEnumerable<string>, string> negotiateSubProtocol)
public class WebSocketConnection : IWebSocketConnection
{
Socket = socket;
OnOpen = () => { };
OnClose = () => { };
OnMessage = x => { };
OnBinary = x => { };
OnPing = x => SendPong(x);
OnPong = x => { };
OnError = x => { };
_initialize = initialize;
_handlerFactory = handlerFactory;
_parseRequest = parseRequest;
_negotiateSubProtocol = negotiateSubProtocol;
}
public WebSocketConnection(ISocket socket, Action<IWebSocketConnection> initialize, Func<byte[], WebSocketHttpRequest> parseRequest, Func<WebSocketHttpRequest, IHandler> handlerFactory, Func<IEnumerable<string>, string> negotiateSubProtocol)
{
Socket = socket;
OnOpen = () => { };
OnClose = () => { };
OnMessage = x => { };
OnBinary = x => { };
OnPing = x => SendPong(x);
OnPong = x => { };
OnError = x => { };
_initialize = initialize;
_handlerFactory = handlerFactory;
_parseRequest = parseRequest;
_negotiateSubProtocol = negotiateSubProtocol;
}
public ISocket Socket { get; set; }
public ISocket Socket { get; set; }
private readonly Action<IWebSocketConnection> _initialize;
private readonly Func<WebSocketHttpRequest, IHandler> _handlerFactory;
private readonly Func<IEnumerable<string>, string> _negotiateSubProtocol;
readonly Func<byte[], WebSocketHttpRequest> _parseRequest;
private readonly Action<IWebSocketConnection> _initialize;
private readonly Func<WebSocketHttpRequest, IHandler> _handlerFactory;
private readonly Func<IEnumerable<string>, string> _negotiateSubProtocol;
readonly Func<byte[], WebSocketHttpRequest> _parseRequest;
public IHandler Handler { get; set; }
public IHandler Handler { get; set; }
private bool _opened = false;
private bool _closing;
private bool _closed;
private const int ReadSize = 1024 * 4;
private bool _opened = false;
private bool _closing;
private bool _closed;
private const int ReadSize = 1024 * 4;
public Action OnOpen { get; set; }
public Action OnOpen { get; set; }
public Action OnClose { get; set; }
public Action OnClose { get; set; }
public Action<string> OnMessage { get; set; }
public Action<string> OnMessage { get; set; }
public Action<byte[]> OnBinary { get; set; }
public Action<byte[]> OnBinary { get; set; }
public Action<byte[]> OnPing { get; set; }
public Action<byte[]> OnPing { get; set; }
public Action<byte[]> OnPong { get; set; }
public Action<byte[]> OnPong { get; set; }
public Action<Exception> OnError { get; set; }
public Action<Exception> OnError { get; set; }
public IWebSocketConnectionInfo ConnectionInfo { get; private set; }
public IWebSocketConnectionInfo ConnectionInfo { get; private set; }
public bool IsAvailable {
get { return !_closing && !_closed && Socket.Connected; }
}
public bool IsAvailable
{
get { return !_closing && !_closed && Socket.Connected; }
}
public Task Send(string message)
{
return Send(message, Handler.FrameText);
}
public Task Send(string message)
{
return Send(message, Handler.FrameText);
}
public Task Send(byte[] message)
{
return Send(message, Handler.FrameBinary);
}
public Task Send(byte[] message)
{
return Send(message, Handler.FrameBinary);
}
public Task SendPing(byte[] message)
{
return Send(message, Handler.FramePing);
}
public Task SendPing(byte[] message)
{
return Send(message, Handler.FramePing);
}
public Task SendPong(byte[] message)
{
return Send(message, Handler.FramePong);
}
public Task SendPong(byte[] message)
{
return Send(message, Handler.FramePong);
}
private Task Send<T>(T message, Func<T, byte[]> createFrame)
{
if (Handler == null)
throw new InvalidOperationException("Cannot send before handshake");
if (!IsAvailable)
{
const string errorMessage = "Data sent while closing or after close. Ignoring.";
FleckLog.Warn(errorMessage);
var taskForException = new TaskCompletionSource<object>();
taskForException.SetException(new ConnectionNotAvailableException(errorMessage));
return taskForException.Task;
}
var bytes = createFrame(message);
return SendBytes(bytes);
}
private Task Send<T>(T message, Func<T, byte[]> createFrame)
{
if (Handler == null)
throw new InvalidOperationException("Cannot send before handshake");
if (!IsAvailable)
{
const string errorMessage = "Data sent while closing or after close. Ignoring.";
FleckLog.Warn(errorMessage);
byte[] buffer;
var taskForException = new TaskCompletionSource<object>();
taskForException.SetException(new ConnectionNotAvailableException(errorMessage));
return taskForException.Task;
}
public void StartReceiving()
{
var bytes = createFrame(message);
return SendBytes(bytes);
}
List<byte> data = new List<byte>(ReadSize);
buffer = new byte[ReadSize];
Task.Run(async delegate
{
await Task.Delay(TimeSpan.FromSeconds(20));
byte[] buffer;
if (!_closed && !_opened) {
Console.WriteLine("Closing/Disposing WebSocketConnection. Not able to perform handshake within 20s.");
CloseSocket ();
}
public void StartReceiving()
{
});
List<byte> data = new List<byte>(ReadSize);
buffer = new byte[ReadSize];
Read(data, buffer);
}
Task.Run(async delegate
{
await Task.Delay(TimeSpan.FromSeconds(20));
public void Close()
{
Close(WebSocketStatusCodes.NormalClosure);
}
public void Close(int code)
{
if (!_closed && !_opened)
{
Console.WriteLine("Closing/Disposing WebSocketConnection. Not able to perform handshake within 20s.");
CloseSocket();
}
//try{ CloseSocket();} catch{ // added by tl
// }
});
if (!IsAvailable)
return;
_closing = true;
Read(data, buffer);
}
if (Handler == null) {
CloseSocket();
return;
}
public void Close()
{
Close(WebSocketStatusCodes.NormalClosure);
}
var bytes = Handler.FrameClose(code);
if (bytes.Length == 0)
CloseSocket();
else
SendBytes(bytes, CloseSocket);
}
public void Close(int code)
{
public void CreateHandler(IEnumerable<byte> data)
{
var request = _parseRequest(data.ToArray());
if (request == null)
return;
Handler = _handlerFactory(request);
if (Handler == null)
return;
var subProtocol = _negotiateSubProtocol(request.SubProtocols);
ConnectionInfo = WebSocketConnectionInfo.Create(request, Socket.RemoteIpAddress, Socket.RemotePort, subProtocol);
_initialize(this);
var handshake = Handler.CreateHandshake(subProtocol);
SendBytes(handshake, () => { OnOpen(); _opened = true; });
}
//try{ CloseSocket();} catch{ // added by tl
// }
private void Read(List<byte> data, byte[] buffer)
{
if (!IsAvailable)
return;
Socket.Receive(buffer, r =>
{
if (r <= 0) {
FleckLog.Debug("0 bytes read. Closing.");
CloseSocket();
return;
if (!IsAvailable)
return;
_closing = true;
if (Handler == null)
{
CloseSocket();
return;
}
var bytes = Handler.FrameClose(code);
if (bytes.Length == 0)
CloseSocket();
else
SendBytes(bytes, CloseSocket);
}
FleckLog.Debug(r + " bytes read");
var readBytes = buffer.Take(r);
if (Handler != null) {
Handler.Receive(readBytes);
} else {
data.AddRange(readBytes);
CreateHandler(data);
public void CreateHandler(IEnumerable<byte> data)
{
var request = _parseRequest(data.ToArray());
if (request == null)
return;
Handler = _handlerFactory(request);
if (Handler == null)
return;
var subProtocol = _negotiateSubProtocol(request.SubProtocols);
ConnectionInfo = WebSocketConnectionInfo.Create(request, Socket.RemoteIpAddress, Socket.RemotePort, subProtocol);
_initialize(this);
var handshake = Handler.CreateHandshake(subProtocol);
SendBytes(handshake, () => { OnOpen(); _opened = true; });
}
Read(data, buffer);
},
HandleReadError);
}
private void Read(List<byte> data, byte[] buffer)
{
if (!IsAvailable)
return;
Socket.Receive(buffer, r =>
{
if (r <= 0)
{
FleckLog.Debug("0 bytes read. Closing.");
CloseSocket();
return;
}
FleckLog.Debug(r + " bytes read");
var readBytes = buffer.Take(r);
if (Handler != null)
{
Handler.Receive(readBytes);
}
else
{
data.AddRange(readBytes);
CreateHandler(data);
}
Read(data, buffer);
},
HandleReadError);
}
private void HandleReadError(Exception e)
{
if (e is AggregateException) {
var agg = e as AggregateException;
HandleReadError(agg.InnerException);
return;
}
if (e is ObjectDisposedException) {
FleckLog.Debug("Swallowing ObjectDisposedException", e);
CloseSocket();
return;
}
OnError(e);
if (e is HandshakeException) {
FleckLog.Debug("Error while reading", e);
// why no close here?? TL
//Close(WebSocketStatusCodes.ProtocolError);
CloseSocket();
} else if (e is WebSocketException) {
FleckLog.Debug("Error while reading", e);
//Close(((WebSocketException)e).StatusCode);
CloseSocket();
} else if (e is SubProtocolNegotiationFailureException) {
FleckLog.Debug(e.Message);
CloseSocket();
//Close(WebSocketStatusCodes.ProtocolError);
} else if (e is IOException) {
FleckLog.Debug("Error while reading", e);
CloseSocket();
//Close(WebSocketStatusCodes.AbnormalClosure);
} else {
FleckLog.Error("Application Error", e);
CloseSocket();
//Close(WebSocketStatusCodes.InternalServerError);
}
}
private void HandleReadError(Exception e)
{
if (e is AggregateException)
{
var agg = e as AggregateException;
HandleReadError(agg.InnerException);
return;
}
if (e is ObjectDisposedException)
{
FleckLog.Debug("Swallowing ObjectDisposedException", e);
CloseSocket();
return;
}
OnError(e);
if (e is HandshakeException)
{
FleckLog.Debug("Error while reading", e);
// why no close here?? TL
//Close(WebSocketStatusCodes.ProtocolError);
CloseSocket();
}
else if (e is WebSocketException)
{
FleckLog.Debug("Error while reading", e);
//Close(((WebSocketException)e).StatusCode);
CloseSocket();
}
else if (e is SubProtocolNegotiationFailureException)
{
FleckLog.Debug(e.Message);
CloseSocket();
//Close(WebSocketStatusCodes.ProtocolError);
}
else if (e is IOException)
{
FleckLog.Debug("Error while reading", e);
CloseSocket();
//Close(WebSocketStatusCodes.AbnormalClosure);
}
else
{
FleckLog.Error("Application Error", e);
CloseSocket();
//Close(WebSocketStatusCodes.InternalServerError);
}
}
private Task SendBytes(byte[] bytes, Action callback = null)
{
return Socket.Send(bytes, () =>
{
FleckLog.Debug("Sent " + bytes.Length + " bytes");
if (callback != null)
callback();
},
e =>
{
if (e is IOException)
FleckLog.Debug("Failed to send. Disconnecting.", e);
else
FleckLog.Info("Failed to send. Disconnecting.", e);
CloseSocket();
});
}
private Task SendBytes(byte[] bytes, Action callback = null)
{
return Socket.Send(bytes, () =>
{
FleckLog.Debug("Sent " + bytes.Length + " bytes");
if (callback != null)
callback();
},
e =>
{
if (e is IOException)
FleckLog.Debug("Failed to send. Disconnecting.", e);
else
FleckLog.Info("Failed to send. Disconnecting.", e);
CloseSocket();
});
}
public void CloseSocket()
{
_closing = true;
if (!_closed) {
_closed = true;
OnClose ();
}
public void CloseSocket()
{
_closing = true;
Socket.Close();
Socket.Dispose();
_closing = false;
if (!_closed)
{
_closed = true;
OnClose();
}
buffer = null;
Socket.Close();
Socket.Dispose();
_closing = false;
}
buffer = null;
}
}
}
}

+ 4
- 1
server/Server/PoolConnection.cs View File

@ -156,6 +156,7 @@ namespace Server
}
json = Encoding.ASCII.GetString(mypc.ReceiveBuffer, 0, bytesread);
Console.WriteLine(json);
networkStream.BeginRead(mypc.ReceiveBuffer, 0, mypc.ReceiveBuffer.Length, new AsyncCallback(ReceiveCallback), mypc);
@ -215,6 +216,7 @@ namespace Server
// extended stratum
if (!lastjob.ContainsKey("variant")) lastjob.Add("variant", mypc.DefaultVariant);
if (!lastjob.ContainsKey("algo")) lastjob.Add("algo", mypc.DefaultAlgorithm);
if (!lastjob.ContainsKey("height")) lastjob.Add("height", 0);
AlgorithmHelper.NormalizeAlgorithmAndVariant(lastjob);
mypc.LastJob = lastjob;
@ -246,6 +248,7 @@ namespace Server
// extended stratum
if (!lastjob.ContainsKey("variant")) lastjob.Add("variant", mypc.DefaultVariant);
if (!lastjob.ContainsKey("algo")) lastjob.Add("algo", mypc.DefaultAlgorithm);
if (!lastjob.ContainsKey("height")) lastjob.Add("height", 0);
AlgorithmHelper.NormalizeAlgorithmAndVariant(lastjob);
mypc.LastJob = lastjob;
@ -299,7 +302,7 @@ namespace Server
string msg0 = "{\"method\":\"login\",\"params\":{\"login\":\"";
string msg1 = "\",\"pass\":\"";
string msg2 = "\",\"agent\":\"webminerpool.com\",\"algo\": [\"cn/0\",\"cn/1\",\"cn/2\",\"cn-lite/0\",\"cn-lite/1\",\"cn-lite/2\"]}, \"id\":1}";
string msg2 = "\",\"agent\":\"webminerpool.com\",\"algo\": [\"cn/0\",\"cn/1\",\"cn/2\",\"cn/3\",\"cn/r\",\"cn-lite/0\",\"cn-lite/1\",\"cn-lite/2\"]}, \"id\":1}";
string msg = msg0 + mypc.Login + msg1 + mypc.Password + msg2 + "\n";
mypc.Send(mypc.LastSender, msg);

+ 22
- 14
server/Server/Program.cs View File

@ -62,6 +62,7 @@ namespace Server
public string Blob;
public string Target;
public int Variant;
public int Height;
public string Algo;
public CcHashset<string> Solved;
public bool DevJob;
@ -72,6 +73,7 @@ namespace Server
public string Blob;
public string Target;
public int Variant;
public int Height;
public string JobId;
public string Algo;
public DateTime Age = DateTime.MinValue;
@ -157,7 +159,8 @@ namespace Server
byte[] bytes = new byte[NumberChars / 2];
for (int i = 0; i < NumberChars; i += 2)
bytes[i / 2] = Convert.ToByte(hex.Substring(i, 2), 16);
return BitConverter.ToUInt32(bytes, 0); ;
UInt32 result = BitConverter.ToUInt32(bytes, 0);
return result;
}
private static bool CheckHashTarget(string target, string result)
@ -247,21 +250,22 @@ namespace Server
private static bool IsCompatible(string blob, int variant, int clientVersion)
{
// clientVersion < 5 is not allowed to connect anymore.
// clientVersion 5 does support variant 0 and 1
// clientVersion 6 does support 0,1 and >1
// blobVersion7 = cn1, blobVersionX = cn2 if X > 7
if (clientVersion > 5) return true;
// current client version should be 7
// clientVersion < 6 is not allowed to connect anymore.
// clientVersion 6 does support cn 0,1,2,3
// clientVersion 7 does support cn 0,1,2,3,>3
if (clientVersion > 6) return true;
else
{
if (variant == -1)
{
bool iscn2 = false;
try { iscn2 = (HexToUInt32(blob.Substring(0, 2) + "000000") > 7); } catch { }
if (iscn2) return false;
bool iscn4 = false;
try { iscn4 = (HexToUInt32(blob.Substring(0, 2) + "000000") > 9); } catch { }
if (iscn4) return false;
}
else if (variant > 1)
else if (variant > 3)
{
return false;
}
@ -292,6 +296,7 @@ namespace Server
};
if (!int.TryParse(msg["variant"].GetString(), out ji.Variant)) { ji.Variant = -1; }
if (!int.TryParse(msg["height"].GetString(), out ji.Height)) { ji.Height = 0; }
jobInfos.TryAdd(jobId, ji); // Todo: We can combine these two datastructures
jobQueue.Enqueue(jobId);
@ -303,6 +308,7 @@ namespace Server
devJob.Age = DateTime.Now;
devJob.Algo = ji.Algo;
devJob.Target = ji.Target;
devJob.Height = ji.Height;
devJob.Variant = ji.Variant;
List<Client> slavelist = new List<Client>(slaves.Values);
@ -334,6 +340,7 @@ namespace Server
"\",\"job_id\":\"" + devJob.JobId +
"\",\"algo\":\"" + devJob.Algo.ToLower() +
"\",\"variant\":" + devJob.Variant.ToString() +
",\"height\":" + devJob.Height.ToString() +
",\"blob\":\"" + devJob.Blob +
"\",\"target\":\"" + newtarget + "\"}\n";
@ -384,6 +391,7 @@ namespace Server
"\",\"job_id\":\"" + devJob.JobId +
"\",\"algo\":\"" + devJob.Algo.ToLower() +
"\",\"variant\":" + devJob.Variant.ToString() +
",\"height\":" + devJob.Height.ToString() +
",\"blob\":\"" + devJob.Blob +
"\",\"target\":\"" + newtarget + "\"}\n";
@ -403,6 +411,7 @@ namespace Server
"\",\"job_id\":\"" + jobId +
"\",\"algo\":\"" + msg["algo"].GetString().ToLower() +
"\",\"variant\":" + msg["variant"].GetString() +
",\"height\":" + msg["height"].GetString() +
",\"blob\":\"" + msg["blob"].GetString() +
"\",\"target\":\"" + msg["target"].GetString() + "\"}\n";
@ -485,7 +494,6 @@ namespace Server
ourself.Password = DevDonation.DevPoolPwd;
ourself.WebSocket = new EmptyWebsocket();
clients.TryAdd(Guid.Empty, ourself);
ourself.PoolConnection = PoolConnectionFactory.CreatePoolConnection(ourself,
@ -540,7 +548,7 @@ namespace Server
public static void Main(string[] args)
{
//ExcessiveHashTest(); return;
CConsole.ColorInfo(() =>
@ -817,13 +825,13 @@ namespace Server
int.TryParse(msg["version"].GetString(), out client.Version);
}
if (client.Version < 5)
if (client.Version < 6)
{
DisconnectClient(client, "Client version too old.");
return;
}
if (client.Version < 6)
if (client.Version < 7)
{
CConsole.ColorWarning(() => Console.WriteLine("Warning: Outdated client connected. Make sure to update the clients"));
}

Loading…
Cancel
Save