Turn ByteQueue into MemoryStream wrapper, use MemoryStream for serialization of COutP...

[NovacoinLibrary.git] / Novacoin / CPubKey.cs

diff --git a/Novacoin/CPubKey.cs b/Novacoin/CPubKey.cs
index 03bbb19..33d1b92 100644 (file)
--- a/Novacoin/CPubKey.cs
+++ b/Novacoin/CPubKey.cs
@@ -1,73 +1,91 @@
-\feffusing System;
+\feff/**
+ *  Novacoin classes library
+ *  Copyright (C) 2015 Alex D. (balthazar.ad@gmail.com)
+
+ *  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 System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Org.BouncyCastle.Crypto.Parameters;
 
 namespace Novacoin
 {
     /// <summary>
     /// Representation of ECDSA public key
     /// </summary>
-    public class CPubKey
+    public class CPubKey : CKey
     {
         /// <summary>
-        /// Public key bytes
-        /// </summary>
-        private List<byte> pubKeyBytes;
-
-        /// <summary>
         /// Initializes a new instance of CPubKey class as the copy of another instance
         /// </summary>
         /// <param name="pubKey">Another CPubKey instance</param>
         public CPubKey(CPubKey pubKey)
         {
-            pubKeyBytes = pubKey.pubKeyBytes;
+            _Public = pubKey._Public;
         }
 
         /// <summary>
         /// Initializes a new instance of CPubKey class using supplied sequence of bytes
         /// </summary>
-        /// <param name="bytesList"></param>
-        public CPubKey(IEnumerable<byte> bytesList)
+        /// <param name="bytes">Byte sequence</param>
+        public CPubKey(byte[] bytes)
         {
-            pubKeyBytes = new List<byte>(bytesList);
+            var pQ = curve.Curve.DecodePoint(bytes);
+            _Public = new ECPublicKeyParameters(pQ, domain);
         }
 
         /// <summary>
-        /// Quick validity test
+        /// Init with base58 encoded sequence of bytes
         /// </summary>
-        /// <returns>Validation result</returns>
-        public bool IsValid()
+        /// <param name="strBase58"></param>
+        public CPubKey(string strBase58)
         {
-            return pubKeyBytes.Count == 33 || pubKeyBytes.Count == 65;
+            var pQ = curve.Curve.DecodePoint(AddressTools.Base58DecodeCheck(strBase58));
+            _Public = new ECPublicKeyParameters(pQ, domain);
         }
 
         /// <summary>
-        /// Is this a compressed public key?
+        /// Quick validity test
         /// </summary>
-        /// <returns></returns>
-        public bool IsCompressed()
+        /// <returns>Validation result</returns>
+        public bool IsValid
         {
-            // Compressed public keys are 33 bytes long
-            return pubKeyBytes.Count == 33;
+            get { return !_Public.Q.IsInfinity; }
         }
 
-        /// <summary>
-        /// Calculate Hash160 and create new CKeyID instance.
-        /// </summary>
-        /// <returns>New key ID</returns>
-        public CKeyID GetKeyID()
+        public string ToHex()
         {
-            return new CKeyID(Hash160.Compute160(this.Raw));
+            return Interop.ToHex(this);
         }
 
         /// <summary>
-        /// Accessor for internal representation
+        /// Public part of key pair
         /// </summary>
-        public IList<byte> Raw
+        public static implicit operator byte[] (CPubKey p)
         {
-            get { return pubKeyBytes; }
+            return p._Public.Q.GetEncoded();
+        }
+
+        public override string ToString()
+        {
+            var r = new List<byte>();
+
+            r.Add((byte)(AddrType.PUBKEY_ADDRESS));
+            r.AddRange((byte[])this);
+
+            return AddressTools.Base58EncodeCheck(r.ToArray());
         }
     }
 }