X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=Novacoin%2FCTxOut.cs;h=eb24845cbd503f15d2c0b6714fdb512a496ba074;hb=be9d844557911f95165d2c9875c4f5b2822cfc92;hp=3e3d4c18bf4fd0c5c299da3ee595afb67408e9f1;hpb=12a559c6cb61ae1c22e2859742ea0edd552eca07;p=NovacoinLibrary.git

diff --git a/Novacoin/CTxOut.cs b/Novacoin/CTxOut.cs
index 3e3d4c1..eb24845 100644
--- a/Novacoin/CTxOut.cs
+++ b/Novacoin/CTxOut.cs
@@ -1,6 +1,25 @@
-using System;
+/**
+ *  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;
 using System.Text;
 using System.Collections.Generic;
+using System.IO;
 
 namespace Novacoin
 {
@@ -12,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.
@@ -34,7 +53,7 @@ namespace Novacoin
         /// </summary>
         public CTxOut()
         {
-            scriptPubKey = new CScript();
+            SetEmpty();
         }
 
         /// <summary>
@@ -42,19 +61,19 @@ namespace Novacoin
         /// </summary>
         /// <param name="wBytes">Reference to byte sequence</param>
         /// <returns>Outputs array</returns>
-        public static CTxOut[] ReadTxOutList(ref WrappedList<byte> wBytes)
+        public static CTxOut[] ReadTxOutList(ref ByteQueue wBytes)
         {
-            int nOutputs = (int)VarInt.ReadVarInt(ref wBytes);
-            CTxOut[] vout =new CTxOut[nOutputs];
+            int nOutputs = (int)wBytes.GetVarInt();
+            var vout =new CTxOut[nOutputs];
 
             for (int nIndex = 0; nIndex < nOutputs; nIndex++)
             {
                 // Fill outputs array
                 vout[nIndex] = new CTxOut();
-                vout[nIndex].nValue = BitConverter.ToUInt32(wBytes.GetItems(8), 0);
+                vout[nIndex].nValue = BitConverter.ToUInt64(wBytes.Get(8), 0);
 
-                int nScriptPKLen = (int)VarInt.ReadVarInt(ref wBytes);
-                vout[nIndex].scriptPubKey = new CScript(wBytes.GetItems(nScriptPKLen));
+                int nScriptPKLen = (int)wBytes.GetVarInt();
+                vout[nIndex].scriptPubKey = new CScript(wBytes.Get(nScriptPKLen));
             }
 
             return vout;
@@ -64,38 +83,43 @@ namespace Novacoin
         /// Get raw bytes representation of our output.
         /// </summary>
         /// <returns>Byte sequence.</returns>
-        public IList<byte> Bytes
+        public static implicit operator byte[] (CTxOut output)
         {
-            get
-            {
-                List<byte> resultBytes = new List<byte>();
+            var stream = new MemoryStream();
+            var writer = new BinaryWriter(stream);
 
-                resultBytes.AddRange(BitConverter.GetBytes(nValue)); // txout value
+            writer.Write(output.nValue); // txout value
+            writer.Write(VarInt.EncodeVarInt(output.scriptPubKey.Size)); // scriptPubKey length
+            writer.Write(output.scriptPubKey);  // scriptPubKey
 
-                List<byte> s = new List<byte>(scriptPubKey.Bytes);
+            var resultBytes = stream.ToArray();
 
-                resultBytes.AddRange(VarInt.EncodeVarInt(s.Count)); // scriptPubKey length
-                resultBytes.AddRange(s); // scriptPubKey
+            writer.Close();
 
-                return resultBytes;
-            }
+            return resultBytes;
         }
 
+        /// <summary>
+        /// Null prevouts have -1 value
+        /// </summary>
         public void SetNull()
         {
-            nValue = -1;
-            scriptPubKey.SetNullDestination();
+            nValue = ulong.MaxValue;
+            scriptPubKey = new CScript();
         }
 
+        /// <summary>
+        /// Empty outputs have zero value and empty scriptPubKey
+        /// </summary>
         public void SetEmpty()
         {
             nValue = 0;
-            scriptPubKey.SetNullDestination();
+            scriptPubKey = new CScript();
         }
 
         public bool IsNull
         {
-            get { return (nValue == -1); }
+            get { return (nValue == ulong.MaxValue); }
         }
 
         public bool IsEmpty
@@ -103,9 +127,21 @@ 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 ()
 		{
-			StringBuilder sb = new StringBuilder ();
+			var sb = new StringBuilder ();
 			sb.AppendFormat ("CTxOut(nValue={0}, scriptPubKey={1})", nValue, scriptPubKey.ToString());
 
 			return sb.ToString ();