X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=Novacoin%2FCTransaction.cs;h=8a5f6a76ca90fa955116102af048e6e345131072;hb=514b68fc3103fca11d6d06ddb65ed8d2a14507e1;hp=fd62f4152730a5ee332e1cfab9bb05ffb68c6c42;hpb=100c6ed3d220fd1aa1ddcccaab3af9734905194b;p=NovacoinLibrary.git
diff --git a/Novacoin/CTransaction.cs b/Novacoin/CTransaction.cs
index fd62f41..8a5f6a7 100644
--- a/Novacoin/CTransaction.cs
+++ b/Novacoin/CTransaction.cs
@@ -20,6 +20,7 @@ using System;
using System.Text;
using System.Collections.Generic;
using System.IO;
+using System.Diagnostics.Contracts;
namespace Novacoin
{
@@ -56,6 +57,11 @@ namespace Novacoin
public const ulong nMaxMoney = 2000000000 * nCoin;
///
+ /// Maximum transaction size is 250Kb
+ ///
+ public const uint nMaxTxSize = 250000;
+
+ ///
/// Version of transaction schema.
///
public uint nVersion;
@@ -132,15 +138,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 +180,7 @@ namespace Novacoin
/// Checking result
public bool CheckTransaction()
{
- if (Size > 250000 || vin.Length == 0 || vout.Length == 0)
+ if (Size > nMaxTxSize || vin.Length == 0 || vout.Length == 0)
{
return false;
}
@@ -393,9 +399,26 @@ namespace Novacoin
///
/// Transaction hash
///
- public Hash256 Hash
+ public uint256 Hash
+ {
+ get { return CryptoUtils.ComputeHash256(this); }
+ }
+
+ ///
+ /// Amount of novacoins spent by this transaction.
+ ///
+ public ulong ValueOut
{
- get { return Hash256.Compute256(this); }
+ get
+ {
+ ulong nValueOut = 0;
+ foreach (var txout in vout)
+ {
+ nValueOut += txout.nValue;
+ Contract.Assert(MoneyRange(txout.nValue) && MoneyRange(nValueOut));
+ }
+ return nValueOut;
+ }
}
///