Use byte[] instead of IEnumerable<byte> if possible
[NovacoinLibrary.git] / Novacoin / CKeyPair.cs
index f59f45f..f5deeed 100644 (file)
@@ -1,14 +1,28 @@
-\feffusing System.Collections.Generic;
-using System.Linq;
-using System;
+\feff/**
+ *  Novacoin classes library
+ *  Copyright (C) 2015 Alex D. (balthazar.ad@gmail.com)
 
-using Org.BouncyCastle.Math;
-using Org.BouncyCastle.Math.EC;
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 using Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.Crypto.Generators;
 using Org.BouncyCastle.Crypto.Parameters;
+using Org.BouncyCastle.Math;
 using Org.BouncyCastle.Security;
+using System.Collections.Generic;
+using System.Linq;
 
 
 namespace Novacoin
@@ -22,10 +36,10 @@ namespace Novacoin
         /// </summary>
         public CKeyPair(bool Compressed=true)
         {
-            ECKeyGenerationParameters genParams = new ECKeyGenerationParameters(domain, new SecureRandom());
-            ECKeyPairGenerator generator = new ECKeyPairGenerator("ECDSA");
+            var genParams = new ECKeyGenerationParameters(domain, new SecureRandom());
+            var generator = new ECKeyPairGenerator("ECDSA");
             generator.Init(genParams);
-            AsymmetricCipherKeyPair ecKeyPair = generator.GenerateKeyPair();
+            var ecKeyPair = generator.GenerateKeyPair();
 
             _Private = (ECPrivateKeyParameters)ecKeyPair.Private;
             _Public = (ECPublicKeyParameters)ecKeyPair.Public;
@@ -41,21 +55,21 @@ namespace Novacoin
         /// </summary>
         /// <param name="secretBytes">Byte sequence</param>
         /// <param name="Compressed">Compression flag</param>
-        public CKeyPair(IEnumerable<byte> secretBytes, bool Compressed=true)
+        public CKeyPair(byte[] secretBytes, bool Compressed=true)
         {
             // Deserialize secret value
-            BigInteger D = new BigInteger(secretBytes.Take(32).ToArray());
+            var D = new BigInteger(secretBytes.Take(32).ToArray());
 
             if (D.SignValue == -1)
             {
-                List<byte> fixedKeyBytes = secretBytes.Take(32).ToList();
+                var fixedKeyBytes = secretBytes.Take(32).ToList();
                 fixedKeyBytes.Insert(0, 0x00); // prepend with sign byte
 
                 D = new BigInteger(fixedKeyBytes.ToArray());
             }
 
             // Calculate public key
-            ECPoint Q = curve.G.Multiply(D);
+            var Q = curve.G.Multiply(D);
 
             _Private = new ECPrivateKeyParameters(D, domain);
             _Public = new ECPublicKeyParameters(Q, domain);
@@ -70,29 +84,29 @@ namespace Novacoin
         /// Init key pair using secret sequence of bytes
         /// </summary>
         /// <param name="secretBytes">Byte sequence</param>
-        public CKeyPair(IEnumerable<byte> secretBytes) : 
-            this (secretBytes.Take(32), (secretBytes.Count() == 33 && secretBytes.Last() == 0x01))
+        public CKeyPair(byte[] secretBytes) : 
+            this (secretBytes.Take(32).ToArray(), (secretBytes.Count() == 33 && secretBytes.Last() == 0x01))
         {
         }
 
         public CKeyPair(string strBase58)
         {
-            List<byte> rawBytes = AddressTools.Base58DecodeCheck(strBase58).ToList();
+            var rawBytes = AddressTools.Base58DecodeCheck(strBase58).ToList();
             rawBytes.RemoveAt(0); // Remove key version byte
 
             // Deserialize secret value
-            BigInteger D = new BigInteger(rawBytes.Take(32).ToArray());
+            var D = new BigInteger(rawBytes.Take(32).ToArray());
 
             if (D.SignValue == -1)
             {
-                List<byte> secretbytes = rawBytes.Take(32).ToList(); // Copy secret
+                var secretbytes = rawBytes.Take(32).ToList(); // Copy secret
                 secretbytes.Insert(0, 0x00); // Prepend with sign byte
 
                 D = new BigInteger(secretbytes.ToArray()); // Try decoding again
             }
 
             // Calculate public key
-            ECPoint Q = curve.G.Multiply(D);
+            var Q = curve.G.Multiply(D);
 
             _Private = new ECPrivateKeyParameters(D, domain);
             _Public = new ECPublicKeyParameters(Q, domain);
@@ -116,32 +130,30 @@ namespace Novacoin
         /// <summary>
         /// Create signature for supplied data
         /// </summary>
-        /// <param name="data">Data bytes sequence</param>
+        /// <param name="data">Hash to sigh</param>
         /// <returns>Signature bytes sequence</returns>
-        public IEnumerable<byte> Sign(IEnumerable<byte> data)
+        public byte[] Sign(Hash sigHash)
         {
-            byte[] dataBytes = data.ToArray();
-
-            ISigner signer = SignerUtilities.GetSigner("SHA-256withECDSA");
+            var signer = SignerUtilities.GetSigner("NONEwithECDSA");
             signer.Init(true, _Private);
-            signer.BlockUpdate(dataBytes, 0, dataBytes.Length);
+            signer.BlockUpdate(sigHash.hashBytes, 0, sigHash.hashSize);
 
             return signer.GenerateSignature();
         }
 
-        public CPubKey GetPubKey()
+        public CPubKey PubKey
         {
-            return new CPubKey(Public);
+            get { return new CPubKey(PublicBytes); }
         }
 
         /// <summary>
-        /// Secret part of key pair
+        /// SecretBytes part of key pair
         /// </summary>
-        public IEnumerable<byte> Secret
+        public byte[] SecretBytes
         {
             get
             {
-                List<byte> secretBytes = new List<byte>(_Private.D.ToByteArray());
+                var secretBytes = new List<byte>(_Private.D.ToByteArray());
 
                 if (secretBytes[0] == 0x00)
                 {
@@ -155,23 +167,23 @@ namespace Novacoin
                     secretBytes.Add(0x01);
                 }
 
-                return secretBytes;
+                return secretBytes.ToArray();
             }
         }
 
         public string ToHex()
         {
-            return Interop.ToHex(Secret);
+            return Interop.ToHex(SecretBytes);
         }
 
         public override string ToString()
         {
-            List<byte> r = new List<byte>();
+            var r = new List<byte>();
 
             r.Add((byte)(128 + AddrType.PUBKEY_ADDRESS)); // Key version
-            r.AddRange(Secret); // Key data
+            r.AddRange(SecretBytes); // Key data
 
-            return AddressTools.Base58EncodeCheck(r);
+            return AddressTools.Base58EncodeCheck(r.ToArray());
         }
     }
 }