X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=Novacoin%2FCTransaction.cs;h=a061c70769885cb029fbfb4dc621ff56b232c64c;hb=624ac1021490395614a0cbee619c79860c22061a;hp=e67ed459b6f64e1f8c7d8a7195e286c1d2ccc4cb;hpb=161220f258cf9eb640d354951a48b45598301b1a;p=NovacoinLibrary.git

diff --git a/Novacoin/CTransaction.cs b/Novacoin/CTransaction.cs
index e67ed45..a061c70 100644
--- a/Novacoin/CTransaction.cs
+++ b/Novacoin/CTransaction.cs
@@ -20,6 +20,8 @@ using System;
 using System.Text;
 using System.Collections.Generic;
 using System.IO;
+using System.Diagnostics.Contracts;
+using System.Numerics;
 
 namespace Novacoin
 {
@@ -42,11 +44,16 @@ namespace Novacoin
     }
 
     /// <summary>
-    /// Represents the transaction. Any transaction must provide one input and one output at least.
+    /// Represents the transaction.
     /// </summary>
     public class CTransaction
     {
         /// <summary>
+        /// One cent = 10000 satoshis.
+        /// </summary>
+        public const ulong nCent = 10000;
+
+        /// <summary>
         /// One coin = 1000000 satoshis.
         /// </summary>
         public const ulong nCoin = 1000000;
@@ -56,6 +63,11 @@ namespace Novacoin
         public const ulong nMaxMoney = 2000000000 * nCoin;
 
         /// <summary>
+        /// Maximum transaction size is 250Kb
+        /// </summary>
+        public const uint nMaxTxSize = 250000;
+
+        /// <summary>
         /// Version of transaction schema.
         /// </summary>
         public uint nVersion;
@@ -132,15 +144,15 @@ namespace Novacoin
                 return true;
             }
 
-            CTransaction txPrev = null;
+            TxOutItem txOutCursor = null;
             for (int i = 0; i < vin.Length; i++)
             {
                 var outpoint = vin[i].prevout;
 
-                if (!CBlockStore.Instance.GetTransaction(outpoint.hash, ref txPrev))
+                if (!CBlockStore.Instance.GetTxOutCursor(outpoint, ref txOutCursor))
                     return false;
 
-                if (!ScriptCode.VerifyScript(vin[i].scriptSig, txPrev.vout[outpoint.n].scriptPubKey, this, i, (int)scriptflag.SCRIPT_VERIFY_P2SH, 0))
+                if (!ScriptCode.VerifyScript(vin[i].scriptSig, txOutCursor.scriptPubKey, this, i, (int)scriptflag.SCRIPT_VERIFY_P2SH, 0))
                     return false;
             }
 
@@ -174,7 +186,7 @@ namespace Novacoin
         /// <returns>Checking result</returns>
         public bool CheckTransaction()
         {
-            if (Size > 250000 || vin.Length == 0 || vout.Length == 0)
+            if (Size > nMaxTxSize || vin.Length == 0 || vout.Length == 0)
             {
                 return false;
             }
@@ -245,9 +257,9 @@ namespace Novacoin
             }
             if (nBlockTime == 0)
             {
-                nBlockTime = NetUtils.GetAdjustedTime();
+                nBlockTime = NetInfo.GetAdjustedTime();
             }
-            if (nLockTime < (nLockTime < NetUtils.nLockTimeThreshold ? nBlockHeight : nBlockTime))
+            if (nLockTime < (nLockTime < NetInfo.nLockTimeThreshold ? nBlockHeight : nBlockTime))
             {
                 return true;
             }
@@ -269,12 +281,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 +295,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)
             {
@@ -392,9 +405,26 @@ namespace Novacoin
         /// <summary>
         /// Transaction hash
         /// </summary>
-        public Hash256 Hash
+        public uint256 Hash
         {
-            get { return Hash256.Compute256(this); }
+            get { return CryptoUtils.ComputeHash256(this); }
+        }
+
+        /// <summary>
+        /// Amount of novacoins spent by this transaction.
+        /// </summary>
+        public ulong nValueOut
+        {
+            get
+            {
+                ulong nValueOut = 0;
+                foreach (var txout in vout)
+                {
+                    nValueOut += txout.nValue;
+                    Contract.Assert(MoneyRange(txout.nValue) && MoneyRange(nValueOut));
+                }
+                return nValueOut;
+            }
         }
 
         /// <summary>
@@ -428,8 +458,6 @@ namespace Novacoin
             return resultBytes;
         }
 
-
-
         public override string ToString()
         {
             var sb = new StringBuilder();
@@ -438,12 +466,12 @@ namespace Novacoin
 
             foreach (var txin in vin)
             {
-                sb.AppendFormat(" {0},\n", txin.ToString());
+                sb.AppendFormat(" {0},\n", txin);
             }
 
             foreach (var txout in vout)
             {
-                sb.AppendFormat(" {0},\n", txout.ToString());
+                sb.AppendFormat(" {0},\n", txout);
             }
 
             sb.AppendFormat("\nnLockTime={0}\n)", nLockTime);
@@ -452,5 +480,15 @@ namespace Novacoin
         }
 
         public static bool MoneyRange(ulong nValue) { return (nValue <= nMaxMoney); }
+
+        internal uint GetP2SHSigOpCount(Dictionary<COutPoint, TxOutItem> inputs)
+        {
+            throw new NotImplementedException();
+        }
+
+        internal ulong GetValueIn(Dictionary<COutPoint, TxOutItem> inputs)
+        {
+            throw new NotImplementedException();
+        }
     }
 }