Implemented another optimization, algorithms Hash() function doesn't …

…require dynamic config parameter anymore.
bonesoul · Oct 28, 2014 · f756002 · f756002
1 parent 0433e47
commit f756002
Show file tree

Hide file tree

Showing 22 changed files with 22 additions and 23 deletions.
diff --git a/src/CoiniumServ/Algorithms/HashAlgorithmBase.cs b/src/CoiniumServ/Algorithms/HashAlgorithmBase.cs
@@ -46,7 +46,7 @@ public HashAlgorithmBase()
             _storage = new List<IPool>(); // initialize the pool storage.            
         }
 
-        public virtual byte[] Hash(byte[] input, dynamic config)
+        public virtual byte[] Hash(byte[] input)
         {
             throw new NotImplementedException();
         }

diff --git a/src/CoiniumServ/Algorithms/IHashAlgorithm.cs b/src/CoiniumServ/Algorithms/IHashAlgorithm.cs
@@ -56,9 +56,8 @@ public interface IHashAlgorithm: IRepository<IPool>, IJsonService
         /// Hashes the input data.
         /// </summary>
         /// <param name="input"></param>
-        /// <param name="config"></param>
         /// <returns></returns>
-        byte[] Hash(byte[] input, dynamic config);
+        byte[] Hash(byte[] input);
 
         /// <summary>
         /// Assigns pools that runs on the algorithm.

diff --git a/src/CoiniumServ/Algorithms/Implementations/Blake.cs b/src/CoiniumServ/Algorithms/Implementations/Blake.cs
@@ -39,7 +39,7 @@ public Blake()
             Multiplier = (UInt32) Math.Pow(2, 8);
         }
 
-        public override byte[] Hash(byte[] input, dynamic config)
+        public override byte[] Hash(byte[] input)
         {
             return _hasher.ComputeBytes(input).GetBytes();
         }

diff --git a/src/CoiniumServ/Algorithms/Implementations/Fresh.cs b/src/CoiniumServ/Algorithms/Implementations/Fresh.cs
@@ -44,7 +44,7 @@ public Fresh()
             Multiplier = 1;
         }
 
-        public override byte[] Hash(byte[] input, dynamic config)
+        public override byte[] Hash(byte[] input)
         {
             var buffer = input;
 

diff --git a/src/CoiniumServ/Algorithms/Implementations/Fugue.cs b/src/CoiniumServ/Algorithms/Implementations/Fugue.cs
@@ -39,7 +39,7 @@ public Fugue()
             Multiplier = (UInt32)Math.Pow(2, 8);
         }
 
-        public override byte[] Hash(byte[] input, dynamic config)
+        public override byte[] Hash(byte[] input)
         {
             return _hasher.ComputeBytes(input).GetBytes();
         }

diff --git a/src/CoiniumServ/Algorithms/Implementations/Groestl.cs b/src/CoiniumServ/Algorithms/Implementations/Groestl.cs
@@ -39,7 +39,7 @@ public Groestl()
             Multiplier = (UInt32)Math.Pow(2, 8);
         }
 
-        public override byte[] Hash(byte[] input, dynamic config)
+        public override byte[] Hash(byte[] input)
         {
             return _hasher.ComputeBytes(input).GetBytes();
         }

diff --git a/src/CoiniumServ/Algorithms/Implementations/Keccak.cs b/src/CoiniumServ/Algorithms/Implementations/Keccak.cs
@@ -39,7 +39,7 @@ public Keccak()
             Multiplier = (UInt32)Math.Pow(2, 8);
         }
 
-        public override byte[] Hash(byte[] input, dynamic config)
+        public override byte[] Hash(byte[] input)
         {
             return _hasher.ComputeBytes(input).GetBytes();
         }

diff --git a/src/CoiniumServ/Algorithms/Implementations/Nist5.cs b/src/CoiniumServ/Algorithms/Implementations/Nist5.cs
@@ -46,7 +46,7 @@ public Nist5()
             Multiplier = 1;
         }
 
-        public override byte[] Hash(byte[] input, dynamic config)
+        public override byte[] Hash(byte[] input)
         {
             var buffer = input;
 

diff --git a/src/CoiniumServ/Algorithms/Implementations/Qubit.cs b/src/CoiniumServ/Algorithms/Implementations/Qubit.cs
@@ -46,7 +46,7 @@ public Qubit()
             Multiplier = 1;
         }
 
-        public override byte[] Hash(byte[] input, dynamic config)
+        public override byte[] Hash(byte[] input)
         {
             var buffer = input;
 

diff --git a/src/CoiniumServ/Algorithms/Implementations/Scrypt.cs b/src/CoiniumServ/Algorithms/Implementations/Scrypt.cs
@@ -55,7 +55,7 @@ public Scrypt()
             Multiplier = (UInt32) Math.Pow(2, 16);
         }
 
-        public override byte[] Hash(byte[] input, dynamic config)
+        public override byte[] Hash(byte[] input)
         {
             return SCrypt.ComputeDerivedKey(input, input, _n, _r, _p, null, 32);
         }

diff --git a/src/CoiniumServ/Algorithms/Implementations/ScryptN.cs b/src/CoiniumServ/Algorithms/Implementations/ScryptN.cs
@@ -85,7 +85,7 @@ private void InitTimeTable(dynamic table)
             }
         }
 
-        public override byte[] Hash(byte[] input, dynamic config)
+        public override byte[] Hash(byte[] input)
         {
             var now = (UInt64)TimeHelpers.NowInUnixTimestamp();
 

diff --git a/src/CoiniumServ/Algorithms/Implementations/ScryptOg.cs b/src/CoiniumServ/Algorithms/Implementations/ScryptOg.cs
@@ -53,7 +53,7 @@ public ScryptOg()
             Multiplier = (UInt32)Math.Pow(2, 16);
         }
 
-        public override byte[] Hash(byte[] input, dynamic config)
+        public override byte[] Hash(byte[] input)
         {
             return SCrypt.ComputeDerivedKey(input, input, _n, _r, _p, null, 32);
         }

diff --git a/src/CoiniumServ/Algorithms/Implementations/Sha1.cs b/src/CoiniumServ/Algorithms/Implementations/Sha1.cs
@@ -38,7 +38,7 @@ public Sha1()
             Multiplier = 1;
         }
 
-        public override byte[] Hash(byte[] input, dynamic config)
+        public override byte[] Hash(byte[] input)
         {
             return _hasher.ComputeBytes(input).GetBytes();
         }

diff --git a/src/CoiniumServ/Algorithms/Implementations/Sha256.cs b/src/CoiniumServ/Algorithms/Implementations/Sha256.cs
@@ -38,7 +38,7 @@ public Sha256()
             Multiplier = 1;           
         }
 
-        public override byte[] Hash(byte[] input, dynamic config)
+        public override byte[] Hash(byte[] input)
         {
             return DoubleDigest(input); // coins like bitcoin (sha256d coins) uses double-digest.
         }

diff --git a/src/CoiniumServ/Algorithms/Implementations/Shavite3.cs b/src/CoiniumServ/Algorithms/Implementations/Shavite3.cs
@@ -38,7 +38,7 @@ public Shavite3()
             Multiplier = 1;
         }
 
-        public override byte[] Hash(byte[] input, dynamic config)
+        public override byte[] Hash(byte[] input)
         {
             return _hasher.ComputeBytes(input).GetBytes();
         }

diff --git a/src/CoiniumServ/Algorithms/Implementations/Skein.cs b/src/CoiniumServ/Algorithms/Implementations/Skein.cs
@@ -38,7 +38,7 @@ public Skein()
             Multiplier = 1;
         }
 
-        public override byte[] Hash(byte[] input, dynamic config)
+        public override byte[] Hash(byte[] input)
         {
             return _hasher.ComputeBytes(input).GetBytes();
         }

diff --git a/src/CoiniumServ/Algorithms/Implementations/X11.cs b/src/CoiniumServ/Algorithms/Implementations/X11.cs
@@ -52,7 +52,7 @@ public X11()
             Multiplier = 1;
         }
 
-        public override byte[] Hash(byte[] input, dynamic config)
+        public override byte[] Hash(byte[] input)
         {
             var buffer = input;
 

diff --git a/src/CoiniumServ/Algorithms/Implementations/X13.cs b/src/CoiniumServ/Algorithms/Implementations/X13.cs
@@ -54,7 +54,7 @@ public X13()
             Multiplier = 1;
         }
 
-        public override byte[] Hash(byte[] input, dynamic config)
+        public override byte[] Hash(byte[] input)
         {
             var buffer = input;
 

diff --git a/src/CoiniumServ/Algorithms/Implementations/X14.cs b/src/CoiniumServ/Algorithms/Implementations/X14.cs
@@ -55,7 +55,7 @@ public X14()
             Multiplier = 1;
         }
 
-        public override byte[] Hash(byte[] input, dynamic config)
+        public override byte[] Hash(byte[] input)
         {
             var buffer = input;
 

diff --git a/src/CoiniumServ/Algorithms/Implementations/X15.cs b/src/CoiniumServ/Algorithms/Implementations/X15.cs
@@ -56,7 +56,7 @@ public X15()
             Multiplier = 1;
         }
 
-        public override byte[] Hash(byte[] input, dynamic config)
+        public override byte[] Hash(byte[] input)
         {
             var buffer = input;
 

diff --git a/src/CoiniumServ/Algorithms/Implementations/X17.cs b/src/CoiniumServ/Algorithms/Implementations/X17.cs
@@ -58,7 +58,7 @@ public X17()
             Multiplier = 1;
         }
 
-        public override byte[] Hash(byte[] input, dynamic config)
+        public override byte[] Hash(byte[] input)
         {
             var buffer = input;
 

diff --git a/src/CoiniumServ/Shares/Share.cs b/src/CoiniumServ/Shares/Share.cs
@@ -128,7 +128,7 @@ public Share(IStratumMiner miner, UInt64 jobId, IJob job, string extraNonce2, st
 
             // create the block headers
             HeaderBuffer = Serializers.SerializeHeader(Job, MerkleRoot, NTime, Nonce);
-            HeaderHash = Job.HashAlgorithm.Hash(HeaderBuffer, miner.Pool.Config.Coin.Extra);
+            HeaderHash = Job.HashAlgorithm.Hash(HeaderBuffer);
             HeaderValue = new BigInteger(HeaderHash);
 
             // calculate the share difficulty