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

[NovacoinLibrary.git] / Novacoin / CTxOut.cs

diff --git a/Novacoin/CTxOut.cs b/Novacoin/CTxOut.cs
index c5adf1c..eb24845 100644 (file)
--- a/Novacoin/CTxOut.cs
+++ b/Novacoin/CTxOut.cs
@@ -19,6 +19,7 @@
 using System;
 using System.Text;
 using System.Collections.Generic;
+using System.IO;
 
 namespace Novacoin
 {
@@ -30,7 +31,7 @@ namespace Novacoin
                /// <summary>
                /// Input value.
                /// </summary>
-        public long nValue = -1;
+        public ulong nValue = ulong.MaxValue;
 
                /// <summary>
                /// Second half of script which contains spending instructions.
@@ -69,7 +70,7 @@ namespace Novacoin
             {
                 // Fill outputs array
                 vout[nIndex] = new CTxOut();
-                vout[nIndex].nValue = BitConverter.ToUInt32(wBytes.Get(8), 0);
+                vout[nIndex].nValue = BitConverter.ToUInt64(wBytes.Get(8), 0);
 
                 int nScriptPKLen = (int)wBytes.GetVarInt();
                 vout[nIndex].scriptPubKey = new CScript(wBytes.Get(nScriptPKLen));
@@ -84,15 +85,18 @@ namespace Novacoin
         /// <returns>Byte sequence.</returns>
         public static implicit operator byte[] (CTxOut output)
         {
-                var resultBytes = new List<byte>();
+            var stream = new MemoryStream();
+            var writer = new BinaryWriter(stream);
 
-                resultBytes.AddRange(BitConverter.GetBytes(output.nValue)); // txout value
+            writer.Write(output.nValue); // txout value
+            writer.Write(VarInt.EncodeVarInt(output.scriptPubKey.Size)); // scriptPubKey length
+            writer.Write(output.scriptPubKey);  // scriptPubKey
 
-                var s = (byte[])output.scriptPubKey;
-                resultBytes.AddRange(VarInt.EncodeVarInt(s.Length)); // scriptPubKey length
-                resultBytes.AddRange(s); // scriptPubKey
+            var resultBytes = stream.ToArray();
 
-                return resultBytes.ToArray();
+            writer.Close();
+
+            return resultBytes;
         }
 
         /// <summary>
@@ -100,7 +104,7 @@ namespace Novacoin
         /// </summary>
         public void SetNull()
         {
-            nValue = -1;
+            nValue = ulong.MaxValue;
             scriptPubKey = new CScript();
         }
 
@@ -115,7 +119,7 @@ namespace Novacoin
 
         public bool IsNull
         {
-            get { return (nValue == -1); }
+            get { return (nValue == ulong.MaxValue); }
         }
 
         public bool IsEmpty
@@ -123,7 +127,19 @@ namespace Novacoin
            get { return nValue == 0 && scriptPubKey.IsNull; }
         }
 
-               public override string ToString ()
+        /// <summary>
+        /// Serialized size
+        /// </summary>
+        public int Size
+        {
+            get
+            {
+                var nScriptSize = scriptPubKey.Size;
+                return 8 + VarInt.GetEncodedSize(nScriptSize) + nScriptSize;
+            }
+        }
+
+        public override string ToString ()
                {
                        var sb = new StringBuilder ();
                        sb.AppendFormat ("CTxOut(nValue={0}, scriptPubKey={1})", nValue, scriptPubKey.ToString());