Replace CTransaction constructor with MemoryStream based implementation.

[NovacoinLibrary.git] / Novacoin / CTransaction.cs

diff --git a/Novacoin/CTransaction.cs b/Novacoin/CTransaction.cs
index d1cc3dd..5cbd54c 100644 (file)
--- a/Novacoin/CTransaction.cs
+++ b/Novacoin/CTransaction.cs
@@ -269,12 +269,13 @@ namespace Novacoin
         {
             try
             {
-                var wBytes = new ByteQueue(ref txBytes);
+                var stream = new MemoryStream(txBytes);
+                var reader = new BinaryReader(stream);
 
-                nVersion = BitConverter.ToUInt32(wBytes.Get(4), 0);
-                nTime = BitConverter.ToUInt32(wBytes.Get(4), 0);
+                nVersion = reader.ReadUInt32();
+                nTime = reader.ReadUInt32();
 
-                int nInputs = (int)wBytes.GetVarInt();
+                int nInputs = (int)VarInt.ReadVarInt(ref reader);
                 vin = new CTxIn[nInputs];
 
                 for (int nCurrentInput = 0; nCurrentInput < nInputs; nCurrentInput++)
@@ -282,28 +283,28 @@ namespace Novacoin
                     // Fill inputs array
                     vin[nCurrentInput] = new CTxIn();
 
-                    vin[nCurrentInput].prevout = new COutPoint(wBytes.Get(36));
+                    vin[nCurrentInput].prevout = new COutPoint(reader.ReadBytes(36));
 
-                    int nScriptSigLen = (int)wBytes.GetVarInt();
-                    vin[nCurrentInput].scriptSig = new CScript(wBytes.Get(nScriptSigLen));
+                    int nScriptSigLen = (int)VarInt.ReadVarInt(ref reader);
+                    vin[nCurrentInput].scriptSig = new CScript(reader.ReadBytes(nScriptSigLen));
 
-                    vin[nCurrentInput].nSequence = BitConverter.ToUInt32(wBytes.Get(4), 0);
+                    vin[nCurrentInput].nSequence = reader.ReadUInt32();
                 }
 
-                int nOutputs = (int)wBytes.GetVarInt();
+                int nOutputs = (int)VarInt.ReadVarInt(ref reader);
                 vout = new CTxOut[nOutputs];
 
                 for (int nCurrentOutput = 0; nCurrentOutput < nOutputs; nCurrentOutput++)
                 {
                     // Fill outputs array
                     vout[nCurrentOutput] = new CTxOut();
-                    vout[nCurrentOutput].nValue = BitConverter.ToUInt64(wBytes.Get(8), 0);
+                    vout[nCurrentOutput].nValue = reader.ReadUInt64();
 
-                    int nScriptPKLen = (int)wBytes.GetVarInt();
-                    vout[nCurrentOutput].scriptPubKey = new CScript(wBytes.Get(nScriptPKLen));
+                    int nScriptPKLen = (int)VarInt.ReadVarInt(ref reader);
+                    vout[nCurrentOutput].scriptPubKey = new CScript(reader.ReadBytes(nScriptPKLen));
                 }
 
-                nLockTime = BitConverter.ToUInt32(wBytes.Get(4), 0);
+                nLockTime = reader.ReadUInt32();
             }
             catch (Exception e)
             {
@@ -342,12 +343,12 @@ namespace Novacoin
         /// </summary>
         /// <param name="wTxBytes">Bytes sequence</param>
         /// <returns>Transactions array</returns>
-        public static CTransaction[] ReadTransactionsList(ref ByteQueue wTxBytes)
+        internal static CTransaction[] ReadTransactionsList(ref BinaryReader reader)
         {
             try
             {
                 // Read amount of transactions
-                int nTransactions = (int)wTxBytes.GetVarInt();
+                int nTransactions = (int)VarInt.ReadVarInt(ref reader);
                 var tx = new CTransaction[nTransactions];
 
                 for (int nTx = 0; nTx < nTransactions; nTx++)
@@ -355,16 +356,16 @@ namespace Novacoin
                     // Fill the transactions array
                     tx[nTx] = new CTransaction();
 
-                    tx[nTx].nVersion = BitConverter.ToUInt32(wTxBytes.Get(4), 0);
-                    tx[nTx].nTime = BitConverter.ToUInt32(wTxBytes.Get(4), 0);
+                    tx[nTx].nVersion = reader.ReadUInt32();
+                    tx[nTx].nTime = reader.ReadUInt32();
 
                     // Inputs array
-                    tx[nTx].vin = CTxIn.ReadTxInList(ref wTxBytes);
+                    tx[nTx].vin = CTxIn.ReadTxInList(ref reader);
 
                     // outputs array
-                    tx[nTx].vout = CTxOut.ReadTxOutList(ref wTxBytes);
+                    tx[nTx].vout = CTxOut.ReadTxOutList(ref reader);
 
-                    tx[nTx].nLockTime = BitConverter.ToUInt32(wTxBytes.Get(4), 0);
+                    tx[nTx].nLockTime = reader.ReadUInt32();
                 }
 
                 return tx;