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 0294f1d..33d1b92 100644 (file)
--- a/Novacoin/CPubKey.cs
+++ b/Novacoin/CPubKey.cs
@@ -1,6 +1,23 @@
-\feffusing System.Collections.Generic;
+\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 Org.BouncyCastle.Math.EC;
 using Org.BouncyCastle.Crypto.Parameters;
 
 namespace Novacoin
@@ -23,9 +40,9 @@ namespace Novacoin
         /// Initializes a new instance of CPubKey class using supplied sequence of bytes
         /// </summary>
         /// <param name="bytes">Byte sequence</param>
-        public CPubKey(IEnumerable<byte> bytes)
+        public CPubKey(byte[] bytes)
         {
-            ECPoint pQ = curve.Curve.DecodePoint(bytes.ToArray());
+            var pQ = curve.Curve.DecodePoint(bytes);
             _Public = new ECPublicKeyParameters(pQ, domain);
         }
 
@@ -35,7 +52,7 @@ namespace Novacoin
         /// <param name="strBase58"></param>
         public CPubKey(string strBase58)
         {
-            ECPoint pQ = curve.Curve.DecodePoint(AddressTools.Base58DecodeCheck(strBase58).ToArray());
+            var pQ = curve.Curve.DecodePoint(AddressTools.Base58DecodeCheck(strBase58));
             _Public = new ECPublicKeyParameters(pQ, domain);
         }
 
@@ -50,18 +67,25 @@ namespace Novacoin
 
         public string ToHex()
         {
-            return Interop.ToHex(PublicBytes);
+            return Interop.ToHex(this);
+        }
+
+        /// <summary>
+        /// Public part of key pair
+        /// </summary>
+        public static implicit operator byte[] (CPubKey p)
+        {
+            return p._Public.Q.GetEncoded();
         }
 
         public override string ToString()
         {
-            List<byte> r = new List<byte>();
+            var r = new List<byte>();
 
             r.Add((byte)(AddrType.PUBKEY_ADDRESS));
+            r.AddRange((byte[])this);
 
-            r.AddRange(PublicBytes);
-
-            return AddressTools.Base58EncodeCheck(r);
+            return AddressTools.Base58EncodeCheck(r.ToArray());
         }
     }
 }