Browse Source

round 5

pull/123/head
notgiven688 2 years ago
parent
commit
426d80e0e9
2 changed files with 14 additions and 7 deletions
  1. +1
    -1
      SDK/miner_compressed/mine.html
  2. +13
    -6
      server/Server/Program.cs

+ 1
- 1
SDK/miner_compressed/mine.html View File

@ -24,7 +24,7 @@
/* start mining, use a local server */
server = "ws://localhost:8181";
startMining("minexmr.com",
startMining("moneroocean.stream",
"422QQNhnhX8hmMEkF3TWePWSvKm6DiV7sS3Za2dXrynsJ1w8U6AzwjEdnewdhmP3CDaqvaS6BjEjGMK9mnumtufvLmz5HJi");

+ 13
- 6
server/Server/Program.cs View File

@ -599,8 +599,8 @@ namespace Server
if (!libHashAvailable) CConsole.ColorWarning(() =>
{
Console.WriteLine("libhash.so is not available. Checking user submitted hashes disabled.");
Console.WriteLine("Details: {0}", exception.Message);
Console.WriteLine("libhash.so is not available. Checking user submitted hashes disabled:");
Console.WriteLine(" -> {0}", new StringReader(exception.ToString()).ReadLine());
});
PoolConnectionFactory.RegisterCallbacks(PoolReceiveCallback, PoolErrorCallback, PoolDisconnectCallback);
@ -671,8 +671,11 @@ namespace Server
bool certAvailable = (cert != null);
if (!certAvailable)
CConsole.ColorWarning(() => Console.WriteLine("SSL certificate could not be loaded. Secure connection disabled."));
if (!certAvailable) CConsole.ColorWarning(() =>
{
Console.WriteLine("SSL certificate could not be loaded. Secure connection disabled.");
Console.WriteLine(" -> {0}", new StringReader(exception.ToString()).ReadLine());
});
WebSocketServer server;
@ -975,7 +978,9 @@ namespace Server
HashesCheckedThisHeartbeat++;
}
bool validHash = CheckHash(ji, reportedNonce, reportedResult, performFullCheck);
bool validHash = CheckHash(ji, reportedResult, reportedNonce, performFullCheck);
if (!validHash)
{
@ -990,7 +995,7 @@ namespace Server
if (performFullCheck)
Console.WriteLine("{0}: got hash-checked", client.WebSocket.ConnectionInfo.Id.ToString());
if (!string.IsNullOrEmpty(ipadr)) Firewall.Update(ipadr, Firewall.UpdateEntry.SolvedJob);
ji.Solved.TryAdd(reportedNonce.ToLower());
@ -1021,6 +1026,8 @@ namespace Server
",\"id\":\"" + "1" + "\"}\n"; // TODO: check the "1"
jiClient.PoolConnection.Send(jiClient, msg0);
Console.WriteLine("i");
}
}).Start();

Loading…
Cancel
Save