Copy&paste typo fix

[NovacoinLibrary.git] / Novacoin / CBlock.cs

diff --git a/Novacoin/CBlock.cs b/Novacoin/CBlock.cs
index f33dda6..6ff2da3 100644 (file)
--- a/Novacoin/CBlock.cs
+++ b/Novacoin/CBlock.cs
@@ -17,17 +17,34 @@
  */
 
 using System;
-using System.Linq;
 using System.Text;
 using System.Collections.Generic;
-using System.Security.Cryptography;
+using System.Diagnostics.Contracts;
 
 namespace Novacoin
 {
-       /// <summary>
-       /// Represents the block. Block consists of header, transaction array and header signature.
-       /// </summary>
-       public class CBlock
+    [Serializable]
+    public class BlockConstructorException : Exception
+    {
+        public BlockConstructorException()
+        {
+        }
+
+        public BlockConstructorException(string message)
+                : base(message)
+        {
+        }
+
+        public BlockConstructorException(string message, Exception inner)
+                : base(message, inner)
+        {
+        }
+    }
+
+    /// <summary>
+    /// Represents the block. Block consists of header, transaction array and header signature.
+    /// </summary>
+    public class CBlock
        {
                /// <summary>
                /// Block header.
@@ -44,9 +61,14 @@ namespace Novacoin
         /// </summary>
         public byte[] signature = new byte[0];
 
+        /// <summary>
+        /// Copy constructor.
+        /// </summary>
+        /// <param name="b">CBlock instance.</param>
         public CBlock(CBlock b)
         {
             header = new CBlockHeader(b.header);
+            vtx = new CTransaction[b.vtx.Length];
 
             for (int i = 0; i < b.vtx.Length; i++)
             {
@@ -59,19 +81,26 @@ namespace Novacoin
         /// <summary>
         /// Parse byte sequence and initialize new block instance
         /// </summary>
-        /// <param name="blockBytes"></param>
-               public CBlock (IList<byte> blockBytes)
+        /// <param name="blockBytes">Bytes sequence.</param>
+               public CBlock (byte[] blockBytes)
                {
-            ByteQueue wBytes = new ByteQueue(blockBytes);
+            try
+            {
+                ByteQueue wBytes = new ByteQueue(blockBytes);
 
-            // Fill the block header fields
-            header = new CBlockHeader(wBytes.Get(80));
+                // Fill the block header fields
+                header = new CBlockHeader(wBytes.Get(80));
 
-            // Parse transactions list
-            vtx = CTransaction.ReadTransactionsList(ref wBytes);
+                // Parse transactions list
+                vtx = CTransaction.ReadTransactionsList(ref wBytes);
 
-            // Read block signature
-            signature = wBytes.Get((int)wBytes.GetVarInt());
+                // Read block signature
+                signature = wBytes.Get((int)wBytes.GetVarInt());
+            }
+            catch (Exception e)
+            {
+                throw new BlockConstructorException("Deserialization failed", e);
+            }
                }
 
         public CBlock()
@@ -143,28 +172,64 @@ namespace Novacoin
         }
 
         /// <summary>
-        /// Get current instance as sequence of bytes
+        /// Get instance as sequence of bytes
         /// </summary>
         /// <returns>Byte sequence</returns>
-        public IList<byte> Bytes 
+        public static implicit operator byte[] (CBlock b)
         {
-            get
+            var r = new List<byte>();
+
+            r.AddRange((byte[])b.header);
+            r.AddRange(VarInt.EncodeVarInt(b.vtx.LongLength)); // transactions count
+
+            foreach (var tx in b.vtx)
             {
-                var r = new List<byte>();
+                r.AddRange((byte[])tx);
+            }
 
-                r.AddRange(header.Bytes);
-                r.AddRange(VarInt.EncodeVarInt(vtx.LongLength)); // transactions count
+            r.AddRange(VarInt.EncodeVarInt(b.signature.LongLength));
+            r.AddRange(b.signature);
+
+            return r.ToArray();
+        }
+
+        /// <summary>
+        /// Serialized size
+        /// </summary>
+        public int Size
+        {
+            get
+            {
+                int nSize = 80 + VarInt.GetEncodedSize(vtx.Length); // CBlockHeader + NumTx
 
                 foreach (var tx in vtx)
                 {
-                    r.AddRange(tx.Bytes);
+                    nSize += tx.Size;
                 }
 
-                r.AddRange(VarInt.EncodeVarInt(signature.LongLength));
-                r.AddRange(signature);
+                nSize += VarInt.GetEncodedSize(signature.Length) + signature.Length;
+
+                return nSize;
+            }
+        }
 
-                return r;
+        /// <summary>
+        /// Get transaction offset inside block.
+        /// </summary>
+        /// <param name="nTx">Transaction index.</param>
+        /// <returns>Offset in bytes from the beginning of block header.</returns>
+        public int GetTxOffset(int nTx)
+        {
+            Contract.Requires<ArgumentException>(nTx >= 0 && nTx < vtx.Length, "Transaction index you've specified is incorrect.");
+
+            int nOffset = 80 + VarInt.GetEncodedSize(vtx.Length); // CBlockHeader + NumTx
+
+            for (int i = 0; i < nTx; i++)
+            {
+                nOffset += vtx[i].Size;
             }
+
+            return nOffset;
         }
 
         /// <summary>
@@ -178,7 +243,7 @@ namespace Novacoin
 
                 foreach (var tx in vtx)
                 {
-                    merkleTree.AddRange(Hash256.ComputeRaw256(tx.Bytes));
+                    merkleTree.AddRange(Hash256.ComputeRaw256(tx));
                 }
 
                 int levelOffset = 0;