Dev (#432)

* Fixed fatal array reverse bug * Improved rejected share logging
oliverw · Oct 19, 2018 · 70f224e · 70f224e
1 parent bf5015a
commit 70f224e
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 19 deletions.
diff --git a/src/Miningcore/Blockchain/Bitcoin/BitcoinPool.cs b/src/Miningcore/Blockchain/Bitcoin/BitcoinPool.cs
@@ -184,9 +184,9 @@ protected virtual async Task OnSubmitAsync(StratumClient client, Timestamped<Jso
 
                 // validate worker
                 if (!context.IsAuthorized)
-                    throw new StratumException(StratumError.UnauthorizedWorker, "Unauthorized worker");
+                    throw new StratumException(StratumError.UnauthorizedWorker, "unauthorized worker");
                 else if (!context.IsSubscribed)
-                    throw new StratumException(StratumError.NotSubscribed, "Not subscribed");
+                    throw new StratumException(StratumError.NotSubscribed, "not subscribed");
 
                 // submit
                 var requestParams = request.ParamsAs<string[]>();
@@ -220,7 +220,7 @@ protected virtual async Task OnSubmitAsync(StratumClient client, Timestamped<Jso
 
                 // update client stats
                 context.Stats.InvalidShares++;
-                logger.Info(() => $"[{client.ConnectionId}] Share rejected: {ex.Code}");
+                logger.Info(() => $"[{client.ConnectionId}] Share rejected: {ex.Message}");
 
                 // banning
                 ConsiderBan(client, context, poolConfig.Banning);

diff --git a/src/Miningcore/Blockchain/Equihash/EquihashPool.cs b/src/Miningcore/Blockchain/Equihash/EquihashPool.cs
@@ -239,9 +239,9 @@ protected virtual async Task OnSubmitAsync(StratumClient client, Timestamped<Jso
 
                 // validate worker
                 if (!context.IsAuthorized)
-                    throw new StratumException(StratumError.UnauthorizedWorker, "Unauthorized worker");
+                    throw new StratumException(StratumError.UnauthorizedWorker, "unauthorized worker");
                 else if (!context.IsSubscribed)
-                    throw new StratumException(StratumError.NotSubscribed, "Not subscribed");
+                    throw new StratumException(StratumError.NotSubscribed, "not subscribed");
 
                 // submit
                 var requestParams = request.ParamsAs<string[]>();
@@ -275,7 +275,7 @@ protected virtual async Task OnSubmitAsync(StratumClient client, Timestamped<Jso
 
                 // update client stats
                 context.Stats.InvalidShares++;
-                logger.Info(() => $"[{client.ConnectionId}] Share rejected: {ex.Code}");
+                logger.Info(() => $"[{client.ConnectionId}] Share rejected: {ex.Message}");
 
                 // banning
                 ConsiderBan(client, context, poolConfig.Banning);

diff --git a/src/Miningcore/Blockchain/Ethereum/EthereumPool.cs b/src/Miningcore/Blockchain/Ethereum/EthereumPool.cs
@@ -159,9 +159,9 @@ private async Task OnSubmitAsync(StratumClient client, Timestamped<JsonRpcReques
 
                 // validate worker
                 if (!context.IsAuthorized)
-                    throw new StratumException(StratumError.UnauthorizedWorker, "Unauthorized worker");
+                    throw new StratumException(StratumError.UnauthorizedWorker, "unauthorized worker");
                 else if (!context.IsSubscribed)
-                    throw new StratumException(StratumError.NotSubscribed, "Not subscribed");
+                    throw new StratumException(StratumError.NotSubscribed, "not subscribed");
 
                 // check request
                 var submitRequest = request.ParamsAs<string[]>();
@@ -205,7 +205,7 @@ private async Task OnSubmitAsync(StratumClient client, Timestamped<JsonRpcReques
 
                 // update client stats
                 context.Stats.InvalidShares++;
-                logger.Info(() => $"[{client.ConnectionId}] Share rejected: {ex.Code}");
+                logger.Info(() => $"[{client.ConnectionId}] Share rejected: {ex.Message}");
 
                 // banning
                 ConsiderBan(client, context, poolConfig.Banning);

diff --git a/src/Miningcore/Extensions/StringExtensions.cs b/src/Miningcore/Extensions/StringExtensions.cs
@@ -61,8 +61,8 @@ public static byte[] HexToReverseByteArray(this string str)
             var arr = new byte[str.Length >> 1];
             var count = str.Length >> 1;
 
-            for (var i = count - 1; i > 0; i--)
-                arr[i] = (byte)((GetHexVal(str[i << 1]) << 4) + GetHexVal(str[(i << 1) + 1]));
+            for (var i = 0; i < count; ++i)
+                arr[count - 1 - i] = (byte)((GetHexVal(str[i << 1]) << 4) + GetHexVal(str[(i << 1) + 1]));
 
             return arr;
         }

diff --git a/src/Miningcore/Mining/ShareRecorder.cs b/src/Miningcore/Mining/ShareRecorder.cs
@@ -109,7 +109,7 @@ await cf.RunTx(async (con, tx) =>
             {
                 // Insert shares
                 var mapped = shares.Select(mapper.Map<Persistence.Model.Share>).ToArray();
-                await shareRepo.BulkInsertAsync(con, tx, mapped);
+                await shareRepo.BatchInsertAsync(con, tx, mapped);
 
                 // Insert blocks
                 foreach (var share in shares)

diff --git a/src/Miningcore/Persistence/Postgres/Repositories/ShareRepository.cs b/src/Miningcore/Persistence/Postgres/Repositories/ShareRepository.cs
@@ -60,17 +60,19 @@ public async Task InsertAsync(IDbConnection con, IDbTransaction tx, Share share)
             await con.ExecuteAsync(query, mapped, tx);
         }
 
-        public Task BulkInsertAsync(IDbConnection con, IDbTransaction tx, IEnumerable<Share> shares)
+        public Task BatchInsertAsync(IDbConnection con, IDbTransaction tx, IEnumerable<Share> shares)
         {
-            logger.LogInvoke();
-
-            // NOTE: Even though the tx parameter is completely ignored here,
-            // the COPY command still honors the current transaction if there is one
+            logger.LogInvoke();
+
+            // NOTE: Even though the tx parameter is completely ignored here,
+            // the COPY command still honors a current ambient transaction
 
+            var pgCon = (NpgsqlConnection)con;
+
             const string query = "COPY shares (poolid, blockheight, difficulty, " +
                 "networkdifficulty, miner, worker, useragent, ipaddress, source, created) FROM STDIN (FORMAT BINARY)";
 
-            using (var writer = ((NpgsqlConnection) con).BeginBinaryImport(query))
+            using (var writer = pgCon.BeginBinaryImport(query))
             {
                 foreach (var share in shares)
                 {

diff --git a/src/Miningcore/Persistence/Repositories/IShareRepository.cs b/src/Miningcore/Persistence/Repositories/IShareRepository.cs
@@ -30,7 +30,7 @@ namespace Miningcore.Persistence.Repositories
     public interface IShareRepository
     {
         Task InsertAsync(IDbConnection con, IDbTransaction tx, Share share);
-        Task BulkInsertAsync(IDbConnection con, IDbTransaction tx, IEnumerable<Share> shares);
+        Task BatchInsertAsync(IDbConnection con, IDbTransaction tx, IEnumerable<Share> shares);
         Task<Share[]> ReadSharesBeforeCreatedAsync(IDbConnection con, string poolId, DateTime before, bool inclusive, int pageSize);
         Task<Share[]> ReadSharesBeforeAndAfterCreatedAsync(IDbConnection con, string poolId, DateTime before, DateTime after, bool inclusive, int pageSize);
         Task<Share[]> PageSharesBetweenCreatedAsync(IDbConnection con, string poolId, DateTime start, DateTime end, int page, int pageSize);