X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=Novacoin%2FCBlockStore.cs;h=62a021f970fa52b15b2cbef829372028de701e02;hb=6b0501a53995f78928332cfcd7ce1cae4b07486f;hp=cb07aeccae61ce8a5eeba98adadbfffde3fd5e4b;hpb=b0509838f87f0a5a136bfabf050e9f09412d4180;p=NovacoinLibrary.git
diff --git a/Novacoin/CBlockStore.cs b/Novacoin/CBlockStore.cs
index cb07aec..62a021f 100644
--- a/Novacoin/CBlockStore.cs
+++ b/Novacoin/CBlockStore.cs
@@ -19,774 +19,18 @@
using System;
using System.IO;
-using System.Linq;
using System.Collections.Concurrent;
using SQLite.Net;
-using SQLite.Net.Attributes;
using SQLite.Net.Interop;
using SQLite.Net.Platform.Generic;
-using SQLiteNetExtensions.Attributes;
using System.Collections.Generic;
-using System.Diagnostics.Contracts;
using System.Text;
+using System.Diagnostics.Contracts;
+using System.Linq;
namespace Novacoin
{
- [Table("ChainState")]
- public class ChainState
- {
- [PrimaryKey, AutoIncrement]
- public long itemId { get; set; }
-
- ///
- /// Hash of top block in the best chain
- ///
- public byte[] HashBestChain { get; set; }
-
- ///
- /// Total trust score of best chain
- ///
- public byte[] BestChainTrust { get; set; }
-
- public uint nBestHeight { get; set;}
-
- [Ignore]
- public uint256 nBestChainTrust
- {
- get { return BestChainTrust; }
- set { BestChainTrust = value; }
- }
-
- [Ignore]
- public uint256 nHashBestChain
- {
- get { return HashBestChain; }
- set { HashBestChain = value; }
- }
- }
-
- [Table("BlockStorage")]
- public class CBlockStoreItem : IBlockStorageItem
- {
- #region IBlockStorageItem
- ///
- /// Item ID in the database
- ///
- [PrimaryKey, AutoIncrement]
- public long ItemID { get; set; }
-
- ///
- /// PBKDF2+Salsa20 of block hash
- ///
- [Unique]
- public byte[] Hash { get; set; }
-
- ///
- /// Version of block schema
- ///
- [Column("nVersion")]
- public uint nVersion { get; set; }
-
- ///
- /// Previous block hash.
- ///
- [Column("prevHash")]
- public byte[] prevHash { get; set; }
-
- ///
- /// Merkle root hash.
- ///
- [Column("merkleRoot")]
- public byte[] merkleRoot { get; set; }
-
- ///
- /// Block timestamp.
- ///
- [Column("nTime")]
- public uint nTime { get; set; }
-
- ///
- /// Compressed difficulty representation.
- ///
- [Column("nBits")]
- public uint nBits { get; set; }
-
- ///
- /// Nonce counter.
- ///
- [Column("nNonce")]
- public uint nNonce { get; set; }
-
- ///
- /// Next block hash.
- ///
- [Column("nextHash")]
- public byte[] nextHash { get; set; }
-
- ///
- /// Block type flags
- ///
- [Column("BlockTypeFlag")]
- public BlockType BlockTypeFlag { get; set; }
-
- ///
- /// Stake modifier
- ///
- [Column("nStakeModifier")]
- public long nStakeModifier { get; set; }
-
- ///
- /// Proof-of-Stake hash
- ///
- [Column("hashProofOfStake")]
- public byte[] hashProofOfStake { get; set; }
-
- ///
- /// Stake generation outpoint.
- ///
- [Column("prevoutStake")]
- public byte[] prevoutStake { get; set; }
-
- ///
- /// Stake generation time.
- ///
- [Column("nStakeTime")]
- public uint nStakeTime { get; set; }
-
- ///
- /// Block height, encoded in VarInt format
- ///
- [Column("nHeight")]
- public uint nHeight { get; set; }
-
- ///
- /// Chain trust score, serialized and trimmed uint256 representation.
- ///
- [Column("ChainTrust")]
- public byte[] ChainTrust { get; set; }
-
- ///
- /// Block position in file, encoded in VarInt format
- ///
- [Column("BlockPos")]
- public byte[] BlockPos { get; set; }
-
- ///
- /// Block size in bytes, encoded in VarInt format
- ///
- [Column("BlockSize")]
- public byte[] BlockSize { get; set; }
- #endregion
-
- ///
- /// Accessor and mutator for BlockPos value.
- ///
- [Ignore]
- public long nBlockPos
- {
- get { return (long)VarInt.DecodeVarInt(BlockPos); }
- set { BlockPos = VarInt.EncodeVarInt(value); }
- }
-
- ///
- /// Accessor and mutator for BlockSize value.
- ///
- [Ignore]
- public int nBlockSize
- {
- get { return (int)VarInt.DecodeVarInt(BlockSize); }
- set { BlockSize = VarInt.EncodeVarInt(value); }
- }
-
- ///
- /// Fill database item with data from given block header.
- ///
- /// Block header
- /// Header hash
- public uint256 FillHeader(CBlockHeader header)
- {
- uint256 _hash = header.Hash;
-
- Hash = _hash;
-
- nVersion = header.nVersion;
- prevHash = header.prevHash;
- merkleRoot = header.merkleRoot;
- nTime = header.nTime;
- nBits = header.nBits;
- nNonce = header.nNonce;
-
- return _hash;
- }
-
- ///
- /// Reconstruct block header from item data.
- ///
- public CBlockHeader BlockHeader
- {
- get
- {
- CBlockHeader header = new CBlockHeader();
-
- header.nVersion = nVersion;
- header.prevHash = prevHash;
- header.merkleRoot = merkleRoot;
- header.nTime = nTime;
- header.nBits = nBits;
- header.nNonce = nNonce;
-
- return header;
- }
- }
-
- ///
- /// Read block from file.
- ///
- /// Stream with read access.
- /// CBlock reference.
- /// Result
- public bool ReadFromFile(ref Stream reader, out CBlock block)
- {
- var buffer = new byte[nBlockSize];
- block = null;
-
- try
- {
- reader.Seek(nBlockPos, SeekOrigin.Begin);
-
- if (nBlockSize != reader.Read(buffer, 0, nBlockSize))
- {
- return false;
- }
-
- block = new CBlock(buffer);
-
- return true;
- }
- catch (IOException)
- {
- // I/O error
- return false;
- }
- catch (BlockException)
- {
- // Constructor exception
- return false;
- }
- }
-
- ///
- /// Writes given block to file and prepares cursor object for insertion into the database.
- ///
- /// Stream with write access.
- /// CBlock reference.
- /// Result
- public bool WriteToFile(ref Stream writer, ref CBlock block)
- {
- try
- {
- byte[] blockBytes = block;
-
- var magicBytes = BitConverter.GetBytes(CBlockStore.nMagicNumber);
- var blkLenBytes = BitConverter.GetBytes(blockBytes.Length);
-
- // Seek to the end and then append magic bytes there.
- writer.Seek(0, SeekOrigin.End);
- writer.Write(magicBytes, 0, magicBytes.Length);
- writer.Write(blkLenBytes, 0, blkLenBytes.Length);
-
- // Save block size and current position in the block cursor fields.
- nBlockPos = writer.Position;
- nBlockSize = blockBytes.Length;
-
- // Write block and flush the stream.
- writer.Write(blockBytes, 0, blockBytes.Length);
- writer.Flush();
-
- return true;
- }
- catch (IOException)
- {
- // I/O error
- return false;
- }
- catch (Exception)
- {
- // Some serialization error
- return false;
- }
- }
-
- ///
- /// Previous block cursor
- ///
- [Ignore]
- public CBlockStoreItem prev
- {
- get { return CBlockStore.Instance.GetMapCursor(prevHash); }
- }
-
- ///
- /// Next block cursor
- ///
- [Ignore]
- public CBlockStoreItem next
- {
- get
- {
- if (nextHash == null)
- {
- return null;
- }
-
- return CBlockStore.Instance.GetMapCursor(nextHash);
- }
- set
- {
- nextHash = value.Hash;
-
- CBlockStore.Instance.UpdateMapCursor(this);
- }
- }
-
- [Ignore]
- bool IsInMainChain
- {
- get { return (next != null); }
- }
-
- ///
- /// STake modifier generation flag
- ///
- [Ignore]
- public bool GeneratedStakeModifier
- {
- get { return (BlockTypeFlag & BlockType.BLOCK_STAKE_MODIFIER) != 0; }
- }
-
- ///
- /// Stake entropy bit
- ///
- [Ignore]
- public uint StakeEntropyBit
- {
- get { return ((uint)(BlockTypeFlag & BlockType.BLOCK_STAKE_ENTROPY) >> 1); }
- }
-
- ///
- /// Sets stake modifier and flag.
- ///
- /// New stake modifier.
- /// Set generation flag?
- public void SetStakeModifier(long nModifier, bool fGeneratedStakeModifier)
- {
- nStakeModifier = nModifier;
- if (fGeneratedStakeModifier)
- BlockTypeFlag |= BlockType.BLOCK_STAKE_MODIFIER;
- }
-
- ///
- /// Set entropy bit.
- ///
- /// Entropy bit value (0 or 1).
- /// False if value is our of range.
- public bool SetStakeEntropyBit(byte nEntropyBit)
- {
- if (nEntropyBit > 1)
- return false;
- BlockTypeFlag |= (nEntropyBit != 0 ? BlockType.BLOCK_STAKE_ENTROPY : 0);
- return true;
- }
-
- ///
- /// Set proof-of-stake flag.
- ///
- public void SetProofOfStake()
- {
- BlockTypeFlag |= BlockType.BLOCK_PROOF_OF_STAKE;
- }
-
- ///
- /// Block has no proof-of-stake flag.
- ///
- [Ignore]
- public bool IsProofOfWork
- {
- get { return (BlockTypeFlag & BlockType.BLOCK_PROOF_OF_STAKE) == 0; }
- }
-
- ///
- /// Block has proof-of-stake flag set.
- ///
- [Ignore]
- public bool IsProofOfStake
- {
- get { return (BlockTypeFlag & BlockType.BLOCK_PROOF_OF_STAKE) != 0; }
- }
-
- ///
- /// Block trust score.
- ///
- [Ignore]
- public uint256 nBlockTrust
- {
- get
- {
- uint256 nTarget = 0;
- nTarget.Compact = nBits;
-
- /* Old protocol */
- if (nTime < NetInfo.nChainChecksSwitchTime)
- {
- return IsProofOfStake ? (new uint256(1) << 256) / (nTarget + 1) : 1;
- }
-
- /* New protocol */
-
- // Calculate work amount for block
- var nPoWTrust = NetInfo.nPoWBase / (nTarget + 1);
-
- // Set nPowTrust to 1 if we are checking PoS block or PoW difficulty is too low
- nPoWTrust = (IsProofOfStake || !nPoWTrust) ? 1 : nPoWTrust;
-
- // Return nPoWTrust for the first 12 blocks
- if (prev == null || prev.nHeight < 12)
- return nPoWTrust;
-
- CBlockStoreItem currentIndex = prev;
-
- if (IsProofOfStake)
- {
- var nNewTrust = (new uint256(1) << 256) / (nTarget + 1);
-
- // Return 1/3 of score if parent block is not the PoW block
- if (!prev.IsProofOfWork)
- {
- return nNewTrust / 3;
- }
-
- int nPoWCount = 0;
-
- // Check last 12 blocks type
- while (prev.nHeight - currentIndex.nHeight < 12)
- {
- if (currentIndex.IsProofOfWork)
- {
- nPoWCount++;
- }
- currentIndex = currentIndex.prev;
- }
-
- // Return 1/3 of score if less than 3 PoW blocks found
- if (nPoWCount < 3)
- {
- return nNewTrust / 3;
- }
-
- return nNewTrust;
- }
- else
- {
- var nLastBlockTrust = prev.nChainTrust - prev.prev.nChainTrust;
-
- // Return nPoWTrust + 2/3 of previous block score if two parent blocks are not PoS blocks
- if (!prev.IsProofOfStake || !prev.prev.IsProofOfStake)
- {
- return nPoWTrust + (2 * nLastBlockTrust / 3);
- }
-
- int nPoSCount = 0;
-
- // Check last 12 blocks type
- while (prev.nHeight - currentIndex.nHeight < 12)
- {
- if (currentIndex.IsProofOfStake)
- {
- nPoSCount++;
- }
- currentIndex = currentIndex.prev;
- }
-
- // Return nPoWTrust + 2/3 of previous block score if less than 7 PoS blocks found
- if (nPoSCount < 7)
- {
- return nPoWTrust + (2 * nLastBlockTrust / 3);
- }
-
- nTarget.Compact = prev.nBits;
-
- if (!nTarget)
- {
- return 0;
- }
-
- var nNewTrust = (new uint256(1) << 256) / (nTarget + 1);
-
- // Return nPoWTrust + full trust score for previous block nBits
- return nPoWTrust + nNewTrust;
- }
- }
- }
-
- ///
- /// Stake modifier checksum.
- ///
- public uint nStakeModifierChecksum;
-
- ///
- /// Chain trust score
- ///
- [Ignore]
- public uint256 nChainTrust {
- get { return Interop.AppendWithZeros(ChainTrust); }
- set { ChainTrust = Interop.TrimArray(value); }
- }
-
- public long nMint { get; internal set; }
- public long nMoneySupply { get; internal set; }
- }
-
- ///
- /// Block type.
- ///
- public enum BlockType
- {
- BLOCK_PROOF_OF_STAKE = (1 << 0), // is proof-of-stake block
- BLOCK_STAKE_ENTROPY = (1 << 1), // entropy bit for stake modifier
- BLOCK_STAKE_MODIFIER = (1 << 2), // regenerated stake modifier
- };
-
- ///
- /// Transaction type.
- ///
- public enum TxFlags : byte
- {
- TX_COINBASE,
- TX_COINSTAKE,
- TX_USER
- }
-
- ///
- /// Output flags.
- ///
- public enum OutputFlags : byte
- {
- AVAILABLE, // Unspent output
- SPENT // Spent output
- }
-
- [Table("MerkleNodes")]
- public class CMerkleNode : IMerkleNode
- {
- #region IMerkleNode
- ///
- /// Node identifier
- ///
- [PrimaryKey, AutoIncrement]
- public long nMerkleNodeID { get; set; }
-
- ///
- /// Reference to parent block database item.
- ///
- [ForeignKey(typeof(CBlockStoreItem), Name = "ItemId")]
- public long nParentBlockID { get; set; }
-
- ///
- /// Transaction type flag
- ///
- [Column("TransactionFlags")]
- public TxFlags TransactionFlags { get; set; }
-
- ///
- /// Transaction hash
- ///
- [Column("TransactionHash")]
- public byte[] TransactionHash { get; set; }
-
- ///
- /// Transaction offset from the beginning of block header, encoded in VarInt format.
- ///
- [Column("TxOffset")]
- public byte[] TxOffset { get; set; }
-
- ///
- /// Transaction size, encoded in VarInt format.
- ///
- [Column("TxSize")]
- public byte[] TxSize { get; set; }
- #endregion
-
- ///
- /// Read transaction from file.
- ///
- /// Stream with read access.
- /// CTransaction reference.
- /// Result
- public bool ReadFromFile(ref Stream reader, long nBlockPos, out CTransaction tx)
- {
- var buffer = new byte[CTransaction.nMaxTxSize];
-
- tx = null;
-
- try
- {
- reader.Seek(nBlockPos + nTxOffset, SeekOrigin.Begin); // Seek to transaction offset
-
- if (nTxSize != reader.Read(buffer, 0, nTxSize))
- {
- return false;
- }
-
- tx = new CTransaction(buffer);
-
- return true;
- }
- catch (IOException)
- {
- // I/O error
- return false;
- }
- catch (TransactionConstructorException)
- {
- // Constructor error
- return false;
- }
- }
-
- ///
- /// Transaction offset accessor
- ///
- [Ignore]
- public long nTxOffset
- {
- get { return (long) VarInt.DecodeVarInt(TxOffset); }
- private set { TxOffset = VarInt.EncodeVarInt(value); }
- }
-
- ///
- /// Transaction size accessor
- ///
- [Ignore]
- public int nTxSize
- {
- get { return (int)VarInt.DecodeVarInt(TxSize); }
- private set { TxSize = VarInt.EncodeVarInt(value); }
- }
-
- public CMerkleNode(CTransaction tx)
- {
- nTxOffset = -1;
- nParentBlockID = -1;
-
- nTxSize = tx.Size;
- TransactionHash = tx.Hash;
-
- if (tx.IsCoinBase)
- {
- TransactionFlags |= TxFlags.TX_COINBASE;
- }
- else if (tx.IsCoinStake)
- {
- TransactionFlags |= TxFlags.TX_COINSTAKE;
- }
- else
- {
- TransactionFlags |= TxFlags.TX_USER;
- }
- }
-
- public CMerkleNode(long nBlockId, long nOffset, CTransaction tx)
- {
- nParentBlockID = nBlockId;
-
- nTxOffset = nOffset;
- nTxSize = tx.Size;
- TransactionHash = tx.Hash;
-
- if (tx.IsCoinBase)
- {
- TransactionFlags |= TxFlags.TX_COINBASE;
- }
- else if (tx.IsCoinStake)
- {
- TransactionFlags |= TxFlags.TX_COINSTAKE;
- }
- else
- {
- TransactionFlags |= TxFlags.TX_USER;
- }
- }
-
- }
-
- [Table("Outputs")]
- public class TxOutItem : ITxOutItem
- {
- ///
- /// Reference to transaction item.
- ///
- [ForeignKey(typeof(CMerkleNode), Name = "nMerkleNodeID")]
- public long nMerkleNodeID { get; set; }
-
- ///
- /// Output flags
- ///
- public OutputFlags outputFlags { get; set; }
-
- ///
- /// Output number in VarInt format.
- ///
- public byte[] OutputNumber { get; set; }
-
- ///
- /// Output value in VarInt format.
- ///
- public byte[] OutputValue { get; set; }
-
- ///
- /// Second half of script which contains spending instructions.
- ///
- public byte[] scriptPubKey { get; set; }
-
- ///
- /// Getter for output number.
- ///
- [Ignore]
- public uint nOut
- {
- get { return (uint)VarInt.DecodeVarInt(OutputNumber); }
- private set { OutputNumber = VarInt.EncodeVarInt(value); }
- }
-
- ///
- /// Getter for output value.
- ///
- [Ignore]
- public ulong nValue
- {
- get { return VarInt.DecodeVarInt(OutputValue); }
- private set { OutputValue = VarInt.EncodeVarInt(value); }
- }
-
- ///
- /// Getter ans setter for IsSpent flag.
- ///
- [Ignore]
- public bool IsSpent
- {
- get { return (outputFlags & OutputFlags.SPENT) != 0; }
- set { outputFlags |= value ? OutputFlags.SPENT : OutputFlags.AVAILABLE; }
- }
-
- public TxOutItem(CTxOut o, uint nOut)
- {
- nValue = o.nValue;
- scriptPubKey = o.scriptPubKey;
- this.nOut = nOut;
- }
- }
-
public class CBlockStore : IDisposable
{
public const uint nMagicNumber = 0xe5e9e8e4;
@@ -841,7 +85,7 @@ namespace Novacoin
private ConcurrentDictionary mapStakeSeen = new ConcurrentDictionary();
- private ConcurrentDictionary mapStakeSeenOrphan = new ConcurrentDictionary();
+ private ConcurrentDictionary, uint256> mapStakeSeenOrphan = new ConcurrentDictionary, uint256>();
///
@@ -933,14 +177,14 @@ namespace Novacoin
));
// Write block to file.
- var itemTemplate = new CBlockStoreItem()
+ var rootCursor = new CBlockStoreItem()
{
nHeight = 0
};
- itemTemplate.FillHeader(genesisBlock.header);
+ rootCursor.FillHeader(genesisBlock.header);
- if (!AddItemToIndex(ref itemTemplate, ref genesisBlock))
+ if (!AddItemToIndex(ref rootCursor, ref genesisBlock))
{
throw new Exception("Unable to write genesis block");
}
@@ -953,6 +197,8 @@ namespace Novacoin
// Init list of block items
foreach (var item in blockTreeItems)
{
+ item.nStakeModifierChecksum = StakeModifier.GetModifierChecksum(item);
+
blockMap.TryAdd(item.Hash, item);
if (item.IsProofOfStake)
@@ -964,10 +210,13 @@ namespace Novacoin
// Load data about the top node.
ChainParams = dbConn.Table().First();
+
+ genesisBlockCursor = dbConn.Query("select * from [BlockStorage] where [Hash] = ?", (byte[])NetInfo.nHashGenesisBlock).First();
+ bestBlockCursor = dbConn.Query("select * from [BlockStorage] where [Hash] = ?", ChainParams.HashBestChain).First();
}
}
- public bool GetTxOutCursor(COutPoint outpoint, ref TxOutItem txOutCursor)
+ public bool GetTxOutCursor(COutPoint outpoint, out TxOutItem txOutCursor)
{
var queryResults = dbConn.Query("select o.* from [Outputs] o left join [MerkleNodes] m on (m.nMerkleNodeID = o.nMerkleNodeID) where m.[TransactionHash] = ?", (byte[])outpoint.hash);
@@ -980,32 +229,29 @@ namespace Novacoin
// Tx not found
+ txOutCursor = null;
+
return false;
}
-
- interface InputsJoin : ITxOutItem
- {
- byte[] TransactionHash { get; set; }
- }
-
- public bool FetchInputs(CTransaction tx, ref Dictionary queued, ref Dictionary inputs, bool IsBlock, out bool Invalid)
+
+ public bool FetchInputs(ref CTransaction tx, ref Dictionary queued, ref Dictionary inputs, bool IsBlock, out bool Invalid)
{
Invalid = false;
if (tx.IsCoinBase)
{
// Coinbase transactions have no inputs to fetch.
- return true;
+ return true;
}
StringBuilder queryBuilder = new StringBuilder();
-
+
queryBuilder.Append("select o.*, m.[TransactionHash] from [Outputs] o left join [MerkleNodes] m on (m.[nMerkleNodeID] = o.[nMerkleNodeID]) where ");
for (var i = 0; i < tx.vin.Length; i++)
{
- queryBuilder.AppendFormat(" {0} (m.[TransactionHash] = x'{1}' and o.[OutputNumber] = x'{2}')",
- (i > 0 ? "or" : string.Empty), Interop.ToHex(tx.vin[i].prevout.hash),
+ queryBuilder.AppendFormat(" {0} (m.[TransactionHash] = x'{1}' and o.[OutputNumber] = x'{2}')",
+ (i > 0 ? "or" : string.Empty), Interop.ToHex(tx.vin[i].prevout.hash),
Interop.ToHex(VarInt.EncodeVarInt(tx.vin[i].prevout.n)
));
}
@@ -1019,12 +265,10 @@ namespace Novacoin
return false; // Already spent
}
- var inputsKey = new COutPoint(item.TransactionHash, item.nOut);
-
- item.IsSpent = true;
+ var inputsKey = new COutPoint(item.TransactionHash, item.nOut);
// Add output data to dictionary
- inputs.Add(inputsKey, (TxOutItem) item);
+ inputs.Add(inputsKey, item.getTxOutItem());
}
if (queryResults.Count < tx.vin.Length)
@@ -1037,6 +281,11 @@ namespace Novacoin
{
var outPoint = txin.prevout;
+ if (inputs.ContainsKey(outPoint))
+ {
+ continue; // We have already seen this input.
+ }
+
if (!queued.ContainsKey(outPoint))
{
return false; // No such transaction
@@ -1046,7 +295,7 @@ namespace Novacoin
inputs.Add(outPoint, queued[outPoint]);
// Mark output as spent
- queued[outPoint].IsSpent = true;
+ // queued[outPoint].IsSpent = true;
}
}
else
@@ -1069,7 +318,7 @@ namespace Novacoin
return false; // nOut is out of range
}
-
+
// TODO: return inputs from map
throw new NotImplementedException();
@@ -1082,10 +331,9 @@ namespace Novacoin
return true;
}
- private bool AddItemToIndex(ref CBlockStoreItem itemTemplate, ref CBlock block)
+ private bool AddItemToIndex(ref CBlockStoreItem newCursor, ref CBlock block)
{
- var writer = new BinaryWriter(fStreamReadWrite).BaseStream;
- uint256 blockHash = itemTemplate.Hash;
+ uint256 blockHash = newCursor.Hash;
if (blockMap.ContainsKey(blockHash))
{
@@ -1093,75 +341,81 @@ namespace Novacoin
return false;
}
+ // Begin transaction
+ dbConn.BeginTransaction();
+
// Compute chain trust score
- itemTemplate.nChainTrust = (itemTemplate.prev != null ? itemTemplate.prev.nChainTrust : 0) + itemTemplate.nBlockTrust;
+ newCursor.nChainTrust = (newCursor.prev != null ? newCursor.prev.nChainTrust : 0) + newCursor.nBlockTrust;
- if (!itemTemplate.SetStakeEntropyBit(Entropy.GetStakeEntropyBit(itemTemplate.nHeight, blockHash)))
+ if (!newCursor.SetStakeEntropyBit(Entropy.GetStakeEntropyBit(newCursor.nHeight, blockHash)))
{
return false; // SetStakeEntropyBit() failed
}
- // Save proof-of-stake hash value
- if (itemTemplate.IsProofOfStake)
- {
- uint256 hashProofOfStake;
- if (!GetProofOfStakeHash(blockHash, out hashProofOfStake))
- {
- return false; // hashProofOfStake not found
- }
- itemTemplate.hashProofOfStake = hashProofOfStake;
- }
-
// compute stake modifier
long nStakeModifier = 0;
bool fGeneratedStakeModifier = false;
- if (!StakeModifier.ComputeNextStakeModifier(itemTemplate, ref nStakeModifier, ref fGeneratedStakeModifier))
+ if (!StakeModifier.ComputeNextStakeModifier(ref newCursor, ref nStakeModifier, ref fGeneratedStakeModifier))
{
return false; // ComputeNextStakeModifier() failed
}
- itemTemplate.SetStakeModifier(nStakeModifier, fGeneratedStakeModifier);
- itemTemplate.nStakeModifierChecksum = StakeModifier.GetStakeModifierChecksum(itemTemplate);
+ newCursor.SetStakeModifier(nStakeModifier, fGeneratedStakeModifier);
+ newCursor.nStakeModifierChecksum = StakeModifier.GetModifierChecksum(newCursor);
- // TODO: verify stake modifier checkpoints
+ if (!ModifierCheckpoints.Verify(newCursor.nHeight, newCursor.nStakeModifierChecksum))
+ {
+ return false; // Stake modifier checkpoints mismatch
+ }
// Add to index
if (block.IsProofOfStake)
{
- itemTemplate.SetProofOfStake();
+ newCursor.SetProofOfStake();
+
+ newCursor.prevoutStake = block.vtx[1].vin[0].prevout;
+ newCursor.nStakeTime = block.vtx[1].nTime;
- itemTemplate.prevoutStake = block.vtx[1].vin[0].prevout;
- itemTemplate.nStakeTime = block.vtx[1].nTime;
+ // Save proof-of-stake hash value
+ uint256 hashProofOfStake;
+ if (!GetProofOfStakeHash(ref blockHash, out hashProofOfStake))
+ {
+ return false; // hashProofOfStake not found
+ }
+ newCursor.hashProofOfStake = hashProofOfStake;
}
- if (!itemTemplate.WriteToFile(ref writer, ref block))
+ if (!newCursor.WriteToFile(ref fStreamReadWrite, ref block))
{
return false;
}
- if (dbConn.Insert(itemTemplate) == 0)
+ if (dbConn.Insert(newCursor) == 0)
{
return false; // Insert failed
}
// Get last RowID.
- itemTemplate.ItemID = dbPlatform.SQLiteApi.LastInsertRowid(dbConn.Handle);
-
- if (!blockMap.TryAdd(blockHash, itemTemplate))
+ newCursor.ItemID = dbPlatform.SQLiteApi.LastInsertRowid(dbConn.Handle);
+
+ if (!blockMap.TryAdd(blockHash, newCursor))
{
return false; // blockMap add failed
}
- if (itemTemplate.nChainTrust > ChainParams.nBestChainTrust)
+ if (newCursor.nChainTrust > ChainParams.nBestChainTrust)
{
// New best chain
- if (!SetBestChain(ref itemTemplate))
+ if (!SetBestChain(ref newCursor))
{
return false; // SetBestChain failed.
}
}
+ // Commit transaction
+ dbConn.Commit();
+
return true;
}
@@ -1225,6 +479,11 @@ namespace Novacoin
nTimeBestReceived = Interop.GetTime();
nTransactionsUpdated++;
+ if (!UpdateTopChain(cursor))
+ {
+ return false; // unable to set top chain node.
+ }
+
return true;
}
@@ -1299,7 +558,6 @@ namespace Novacoin
}
}
-
// Connect longer branch
var txDelete = new List();
foreach (var cursor in connect)
@@ -1328,9 +586,6 @@ namespace Novacoin
return false; // UpdateTopChain failed
}
- // Make sure it's successfully written to disk
- dbConn.Commit();
-
// Resurrect memory transactions that were in the disconnected branch
foreach (var tx in txResurrect)
{
@@ -1369,9 +624,13 @@ namespace Novacoin
}
// Add to current best branch
- cursor.prev.next = cursor;
+ var prevCursor = cursor.prev;
+ prevCursor.next = cursor;
- dbConn.Commit();
+ if (!UpdateDBCursor(ref prevCursor))
+ {
+ return false; // unable to update
+ }
// Delete redundant memory transactions
foreach (var tx in block.vtx)
@@ -1383,7 +642,7 @@ namespace Novacoin
return true;
}
- private bool ConnectBlock(CBlockStoreItem cursor, ref CBlock block, bool fJustCheck=false)
+ private bool ConnectBlock(CBlockStoreItem cursor, ref CBlock block, bool fJustCheck = false)
{
// Check it again in case a previous version let a bad block in, but skip BlockSig checking
if (!block.CheckBlock(!fJustCheck, !fJustCheck, false))
@@ -1391,22 +650,29 @@ namespace Novacoin
return false; // Invalid block found.
}
- bool fScriptChecks = cursor.nHeight >= Checkpoints.TotalBlocksEstimate;
+ bool fScriptChecks = cursor.nHeight >= HashCheckpoints.TotalBlocksEstimate;
var scriptFlags = scriptflag.SCRIPT_VERIFY_NOCACHE | scriptflag.SCRIPT_VERIFY_P2SH;
- ulong nFees = 0;
- ulong nValueIn = 0;
- ulong nValueOut = 0;
+ long nFees = 0;
+ long nValueIn = 0;
+ long nValueOut = 0;
uint nSigOps = 0;
var queuedMerkleNodes = new Dictionary();
- var queued = new Dictionary();
+ var queuedOutputs = new Dictionary();
for (var nTx = 0; nTx < block.vtx.Length; nTx++)
{
var tx = block.vtx[nTx];
var hashTx = tx.Hash;
- var nTxPos = cursor.nBlockPos + block.GetTxOffset(nTx);
+
+ if (!queuedMerkleNodes.ContainsKey(hashTx))
+ {
+ var nTxPos = cursor.nBlockPos + block.GetTxOffset(nTx);
+ var mNode = new CMerkleNode(cursor.ItemID, nTxPos, tx);
+
+ queuedMerkleNodes.Add(hashTx, mNode);
+ }
Dictionary txouts;
if (GetOutputs(hashTx, out txouts))
@@ -1431,7 +697,7 @@ namespace Novacoin
else
{
bool Invalid;
- if (!FetchInputs(tx, ref queued, ref inputs, true, out Invalid))
+ if (!FetchInputs(ref tx, ref queuedOutputs, ref inputs, true, out Invalid))
{
return false; // Unable to fetch some inputs.
}
@@ -1439,14 +705,14 @@ namespace Novacoin
// Add in sigops done by pay-to-script-hash inputs;
// this is to prevent a "rogue miner" from creating
// an incredibly-expensive-to-validate block.
- nSigOps += tx.GetP2SHSigOpCount(inputs);
+ nSigOps += tx.GetP2SHSigOpCount(ref inputs);
if (nSigOps > CBlock.nMaxSigOps)
{
return false; // too many sigops
}
- ulong nTxValueIn = tx.GetValueIn(inputs);
- ulong nTxValueOut = tx.nValueOut;
+ long nTxValueIn = tx.GetValueIn(ref inputs);
+ long nTxValueOut = tx.nValueOut;
nValueIn += nTxValueIn;
nValueOut += nTxValueOut;
@@ -1456,7 +722,7 @@ namespace Novacoin
nFees += nTxValueIn - nTxValueOut;
}
- if (!ConnectInputs(tx, inputs, queued, cursor, fScriptChecks, scriptFlags))
+ if (!ConnectInputs(ref tx, ref inputs, ref queuedOutputs, ref cursor, true, fScriptChecks, scriptFlags))
{
return false;
}
@@ -1464,21 +730,23 @@ namespace Novacoin
for (var i = 0u; i < tx.vout.Length; i++)
{
- var mNode = new CMerkleNode(cursor.ItemID, nTxPos, tx);
- queuedMerkleNodes.Add(hashTx, mNode);
-
var outKey = new COutPoint(hashTx, i);
- var outData = new TxOutItem(tx.vout[i], i);
-
- outData.IsSpent = false;
+ var outData = new TxOutItem()
+ {
+ nMerkleNodeID = -1,
+ nValue = tx.vout[i].nValue,
+ scriptPubKey = tx.vout[i].scriptPubKey,
+ IsSpent = false,
+ nOut = i
+ };
- queued.Add(outKey, outData);
+ queuedOutputs.Add(outKey, outData);
}
}
if (!block.IsProofOfStake)
{
- ulong nBlockReward = CBlock.GetProofOfWorkReward(cursor.nBits, nFees);
+ long nBlockReward = CBlock.GetProofOfWorkReward(cursor.nBits, nFees);
// Check coinbase reward
if (block.vtx[0].nValueOut > nBlockReward)
@@ -1487,8 +755,8 @@ namespace Novacoin
}
}
- cursor.nMint = (long) (nValueOut - nValueIn + nFees);
- cursor.nMoneySupply = (cursor.prev != null ? cursor.prev.nMoneySupply : 0) + (long)nValueOut - (long)nValueIn;
+ cursor.nMint = nValueOut - nValueIn + nFees;
+ cursor.nMoneySupply = (cursor.prev != null ? cursor.prev.nMoneySupply : 0) + nValueOut - nValueIn;
if (!UpdateDBCursor(ref cursor))
{
@@ -1500,51 +768,75 @@ namespace Novacoin
return true;
}
+ // Flush merkle nodes.
+ var savedMerkleNodes = new Dictionary();
+ foreach (var merklePair in queuedMerkleNodes)
+ {
+ var merkleNode = merklePair.Value;
+
+ if (!SaveMerkleNode(ref merkleNode))
+ {
+ // Unable to save merkle tree cursor.
+ return false;
+ }
+
+ savedMerkleNodes.Add(merklePair.Key, merkleNode);
+ }
+
// Write queued transaction changes
- var actualMerkleNodes = new Dictionary();
- var queuedOutpointItems = new List();
- foreach(KeyValuePair outPair in queued)
+ var newOutpointItems = new List();
+ var updatedOutpointItems = new List();
+ foreach (var outPair in queuedOutputs)
{
- uint256 txID = outPair.Key.hash;
- CMerkleNode merkleNode;
+ var outItem = outPair.Value;
- if (actualMerkleNodes.ContainsKey(txID))
+ if (outItem.nMerkleNodeID == -1)
{
- merkleNode = actualMerkleNodes[txID];
+ // This outpoint doesn't exist yet, adding to insert list.
+
+ outItem.nMerkleNodeID = savedMerkleNodes[outPair.Key.hash].nMerkleNodeID;
+ newOutpointItems.Add(outItem);
}
else
{
- merkleNode = queuedMerkleNodes[txID];
- if (!SaveMerkleNode(ref merkleNode))
- {
- // Unable to save merkle tree cursor.
- return false;
- }
- actualMerkleNodes.Add(txID, merkleNode);
- }
+ // This outpount already exists, adding to update list.
- var outItem = outPair.Value;
- outItem.nMerkleNodeID = merkleNode.nMerkleNodeID;
+ updatedOutpointItems.Add(outItem);
+ }
+ }
- queuedOutpointItems.Add(outItem);
+ if (updatedOutpointItems.Count != 0 && !UpdateOutpoints(ref updatedOutpointItems))
+ {
+ return false; // Unable to update outpoints
}
- if (!SaveOutpoints(ref queuedOutpointItems))
+ if (newOutpointItems.Count != 0 && !InsertOutpoints(ref newOutpointItems))
{
- return false; // Unable to save outpoints
+ return false; // Unable to insert outpoints
}
return true;
}
///
- /// Insert set of outpoints
+ /// Insert set of new outpoints
+ ///
+ /// List of TxOutItem objects.
+ /// Result
+ private bool InsertOutpoints(ref List newOutpointItems)
+ {
+ return (dbConn.InsertAll(newOutpointItems, false) != 0);
+ }
+
+
+ ///
+ /// Update set of outpoints
///
/// List of TxOutItem objects.
/// Result
- private bool SaveOutpoints(ref List queuedOutpointItems)
+ private bool UpdateOutpoints(ref List updatedOutpointItems)
{
- return dbConn.InsertAll(queuedOutpointItems, false) != 0;
+ return (dbConn.UpdateAll(updatedOutpointItems, false) != 0);
}
///
@@ -1564,11 +856,166 @@ namespace Novacoin
return true;
}
- private bool ConnectInputs(CTransaction tx, Dictionary inputs, Dictionary queued, CBlockStoreItem cursor, bool fScriptChecks, scriptflag scriptFlags)
+ private bool ConnectInputs(ref CTransaction tx, ref Dictionary inputs, ref Dictionary queued, ref CBlockStoreItem cursorBlock, bool fBlock, bool fScriptChecks, scriptflag scriptFlags)
{
- throw new NotImplementedException();
+ // Take over previous transactions' spent items
+ // fBlock is true when this is called from AcceptBlock when a new best-block is added to the blockchain
+
+ if (!tx.IsCoinBase)
+ {
+ long nValueIn = 0;
+ long nFees = 0;
+ for (uint i = 0; i < tx.vin.Length; i++)
+ {
+ var prevout = tx.vin[i].prevout;
+ Contract.Assert(inputs.ContainsKey(prevout));
+ var input = inputs[prevout];
+
+ CBlockStoreItem parentBlockCursor;
+
+ if (input.nMerkleNodeID == -1)
+ {
+ // This input seems as is confirmed by the same block.
+
+ if (!queued.ContainsKey(prevout))
+ {
+ return false; // No such output has been queued by this block.
+ }
+
+ // TODO: Ensure that neither coinbase nor coinstake outputs are
+ // available for spending in the generation block.
+ }
+ else
+ {
+ // This input has been confirmed by one of the earlier accepted blocks.
+
+ var merkleItem = GetMerkleCursor(input, out parentBlockCursor);
+
+ if (merkleItem == null)
+ {
+ return false; // Unable to find merkle node
+ }
+
+ // If prev is coinbase or coinstake, check that it's matured
+ if (merkleItem.IsCoinBase || merkleItem.IsCoinStake)
+ {
+ if (cursorBlock.nHeight - parentBlockCursor.nHeight < NetInfo.nGeneratedMaturity)
+ {
+ return false; // tried to spend non-matured generation input.
+ }
+ }
+
+ // check transaction timestamp
+ if (merkleItem.nTime > tx.nTime)
+ {
+ return false; // transaction timestamp earlier than input transaction
+ }
+ }
+
+ // Check for negative or overflow input values
+ nValueIn += input.nValue;
+ if (!CTransaction.MoneyRange(input.nValue) || !CTransaction.MoneyRange(nValueIn))
+ {
+ return false; // txin values out of range
+ }
+
+ }
+
+ // The first loop above does all the inexpensive checks.
+ // Only if ALL inputs pass do we perform expensive ECDSA signature checks.
+ // Helps prevent CPU exhaustion attacks.
+ for (int i = 0; i < tx.vin.Length; i++)
+ {
+ var prevout = tx.vin[i].prevout;
+ Contract.Assert(inputs.ContainsKey(prevout));
+ var input = inputs[prevout];
+
+ // Check for conflicts (double-spend)
+ if (input.IsSpent)
+ {
+ return false;
+ }
+
+ // Skip ECDSA signature verification when connecting blocks (fBlock=true)
+ // before the last blockchain checkpoint. This is safe because block merkle hashes are
+ // still computed and checked, and any change will be caught at the next checkpoint.
+ if (fScriptChecks)
+ {
+ // Verify signature
+ if (!ScriptCode.VerifyScript(tx.vin[i].scriptSig, input.scriptPubKey, tx, i, (int)scriptflag.SCRIPT_VERIFY_P2SH, 0))
+ {
+ return false; // VerifyScript failed.
+ }
+ }
+
+ // Mark outpoint as spent
+ input.IsSpent = true;
+ inputs[prevout] = input;
+
+ // Write back
+ if (fBlock)
+ {
+ if (input.nMerkleNodeID != -1)
+ {
+ // Input has been confirmed earlier.
+ queued.Add(prevout, input);
+ }
+ else
+ {
+ // Input has been confirmed by current block.
+ queued[prevout] = input;
+ }
+ }
+ }
+
+ if (tx.IsCoinStake)
+ {
+ if (HashCheckpoints.LastCheckpointTime < tx.nTime)
+ {
+ // Coin stake tx earns reward instead of paying fee
+ long nCoinAge;
+ if (!tx.GetCoinAge(ref inputs, out nCoinAge))
+ {
+ return false; // unable to get coin age for coinstake
+ }
+
+ long nReward = tx.nValueOut - nValueIn;
+ long nCalculatedReward = CBlock.GetProofOfStakeReward(nCoinAge, cursorBlock.nBits, tx.nTime) - tx.GetMinFee(1, false, CTransaction.MinFeeMode.GMF_BLOCK) + CTransaction.nCent;
+
+ if (nReward > nCalculatedReward)
+ {
+ return false; // coinstake pays too much
+ }
+ }
+ }
+ else
+ {
+ if (nValueIn < tx.nValueOut)
+ {
+ return false; // value in < value out
+ }
+
+ // Tally transaction fees
+ long nTxFee = nValueIn - tx.nValueOut;
+ if (nTxFee < 0)
+ {
+ return false; // nTxFee < 0
+ }
+
+ nFees += nTxFee;
+
+ if (!CTransaction.MoneyRange(nFees))
+ {
+ return false; // nFees out of range
+ }
+ }
+
+ }
+
+ return true;
}
+
///
/// Set new top node or current best chain.
///
@@ -1589,7 +1036,7 @@ namespace Novacoin
/// Block hash
/// Proof-of-stake hash
/// Proof-of-Stake hash value
- private bool GetProofOfStakeHash(uint256 blockHash, out uint256 hashProofOfStake)
+ private bool GetProofOfStakeHash(ref uint256 blockHash, out uint256 hashProofOfStake)
{
return mapProofOfStake.TryGetValue(blockHash, out hashProofOfStake);
}
@@ -1604,7 +1051,7 @@ namespace Novacoin
return false;
}
- CBlockStoreItem prevBlockCursor = null;
+ CBlockStoreItem prevBlockCursor;
if (!blockMap.TryGetValue(block.header.prevHash, out prevBlockCursor))
{
// Unable to get the cursor.
@@ -1613,7 +1060,6 @@ namespace Novacoin
var prevBlockHeader = prevBlockCursor.BlockHeader;
- // TODO: proof-of-work/proof-of-stake verification
uint nHeight = prevBlockCursor.nHeight + 1;
// Check timestamp against prev
@@ -1632,18 +1078,36 @@ namespace Novacoin
}
}
- // TODO: Enforce rule that the coinbase starts with serialized block height
+ // Check that the block chain matches the known block chain up to a checkpoint
+ if (!HashCheckpoints.Verify(nHeight, nHash))
+ {
+ return false; // rejected by checkpoint lock-in
+ }
+
+ // Enforce rule that the coinbase starts with serialized block height
+ var expect = new CScript();
+ expect.AddNumber((int)nHeight);
+
+ byte[] expectBytes = expect;
+ byte[] scriptSig = block.vtx[0].vin[0].scriptSig;
+
+ if (!expectBytes.SequenceEqual(scriptSig.Take(expectBytes.Length)))
+ {
+ return false; // coinbase doesn't start with serialized height.
+ }
// Write block to file.
- var itemTemplate = new CBlockStoreItem()
+ var newCursor = new CBlockStoreItem()
{
nHeight = nHeight,
};
- itemTemplate.FillHeader(block.header);
+ newCursor.FillHeader(block.header);
- if (!AddItemToIndex(ref itemTemplate, ref block))
+ if (!AddItemToIndex(ref newCursor, ref block))
{
+ dbConn.Rollback();
+
return false;
}
@@ -1651,7 +1115,7 @@ namespace Novacoin
}
///
- /// GEt block by hash.
+ /// Get block by hash.
///
/// Block hash
/// Block object reference
@@ -1671,40 +1135,27 @@ namespace Novacoin
return cursor.ReadFromFile(ref fStreamReadWrite, out block);
}
-
- ///
- /// Interface for join
- ///
- interface IBlockJoinMerkle : IBlockStorageItem, IMerkleNode
- {
- }
-
///
/// Get block and transaction by transaction hash.
///
/// Transaction hash
/// Block reference
- /// Transaction reference
/// Block position reference
- /// Transaction position reference
/// Result of operation
- public bool GetBlockByTransactionID(uint256 TxID, ref CBlock block, ref CTransaction tx, ref long nBlockPos, ref long nTxPos)
+ public bool GetBlockByTransactionID(uint256 TxID, out CBlock block, out long nBlockPos)
{
- var queryResult = dbConn.Query("select * from [BlockStorage] b left join [MerkleNodes] m on (b.[ItemID] = m.[nParentBlockID]) where m.[TransactionHash] = ?", (byte[])TxID);
+ block = null;
+ nBlockPos = -1;
+
+ var queryResult = dbConn.Query("select b.* from [BlockStorage] b left join [MerkleNodes] m on (b.[ItemID] = m.[nParentBlockID]) where m.[TransactionHash] = ?", (byte[])TxID);
if (queryResult.Count == 1)
{
- CBlockStoreItem blockCursor = (CBlockStoreItem) queryResult[0];
- CMerkleNode txCursor = (CMerkleNode)queryResult[0];
+ CBlockStoreItem blockCursor = queryResult[0];
- var reader = new BinaryReader(fStreamReadWrite).BaseStream;
+ nBlockPos = blockCursor.nBlockPos;
- if (!txCursor.ReadFromFile(ref reader, blockCursor.nBlockPos, out tx))
- {
- return false; // Unable to read transaction
- }
-
- return blockCursor.ReadFromFile(ref reader, out block);
+ return blockCursor.ReadFromFile(ref fStreamReadWrite, out block);
}
// Tx not found
@@ -1739,13 +1190,6 @@ namespace Novacoin
return false;
}
- public bool WriteNodes(ref CMerkleNode[] merkleNodes)
- {
-
-
- return true;
- }
-
///
/// Get block cursor from map.
///
@@ -1766,6 +1210,34 @@ namespace Novacoin
}
///
+ /// Get merkle node cursor by output metadata.
+ ///
+ /// Output metadata object
+ /// Merkle node cursor or null
+ public CMerkleNode GetMerkleCursor(TxOutItem item, out CBlockStoreItem blockCursor)
+ {
+ blockCursor = null;
+
+ // Trying to get cursor from the database.
+ var QueryMerkleCursor = dbConn.Query("select * from [MerkleNodes] where [nMerkleNodeID] = ?", item.nMerkleNodeID);
+
+ if (QueryMerkleCursor.Count == 1)
+ {
+ var merkleNode = QueryMerkleCursor[0];
+
+ // Search for block
+ var results = blockMap.Where(x => x.Value.ItemID == merkleNode.nParentBlockID).Select(x => x.Value).ToArray();
+
+ blockCursor = results[0];
+
+ return merkleNode;
+ }
+
+ // Nothing found.
+ return null;
+ }
+
+ ///
/// Load cursor from database.
///
/// Block hash
@@ -1831,16 +1303,8 @@ namespace Novacoin
if (block.IsProofOfStake)
{
- if (!block.SignatureOK)
- {
- // Proof-of-Stake signature validation failure.
- return false;
- }
-
- // TODO: proof-of-stake validation
-
uint256 hashProofOfStake = 0, targetProofOfStake = 0;
- if (!StakeModifier.CheckProofOfStake(block.vtx[1], block.header.nBits, ref hashProofOfStake, ref targetProofOfStake))
+ if (!StakeModifier.CheckProofOfStake(block.vtx[1], block.header.nBits, out hashProofOfStake, out targetProofOfStake))
{
return false; // do not error here as we expect this during initial block download
}
@@ -1859,12 +1323,22 @@ namespace Novacoin
{
if (block.IsProofOfStake)
{
- // TODO: limit duplicity on stake
+ var proof = block.ProofOfStake;
+
+ // Limited duplicity on stake: prevents block flood attack
+ // Duplicate stake allowed only when there is orphan child block
+ if (mapStakeSeenOrphan.ContainsKey(proof) && !orphanMapByPrev.ContainsKey(blockHash))
+ {
+ return false; // duplicate proof-of-stake
+ }
+ else
+ {
+ mapStakeSeenOrphan.TryAdd(proof, blockHash);
+ }
}
- var block2 = new CBlock(block);
- orphanMap.TryAdd(blockHash, block2);
- orphanMapByPrev.TryAdd(blockHash, block2);
+ orphanMap.TryAdd(blockHash, block);
+ orphanMapByPrev.TryAdd(blockHash, block);
return true;
}
@@ -1876,32 +1350,39 @@ namespace Novacoin
return false;
}
- // Recursively process any orphan blocks that depended on this one
- var orphansQueue = new List();
- orphansQueue.Add(blockHash);
-
- for (int i = 0; i < orphansQueue.Count; i++)
+ if (orphanMapByPrev.Count > 0)
{
- var hashPrev = orphansQueue[i];
+ // Recursively process any orphan blocks that depended on this one
- foreach (var pair in orphanMap)
+ var orphansQueue = new List();
+ orphansQueue.Add(blockHash);
+
+ for (int i = 0; i < orphansQueue.Count; i++)
{
- var orphanBlock = pair.Value;
+ var hashPrev = orphansQueue[i];
- if (orphanBlock.header.prevHash == blockHash)
+ foreach (var pair in orphanMapByPrev)
{
- if (AcceptBlock(ref orphanBlock))
+ var orphanBlock = pair.Value;
+
+ if (orphanBlock.header.prevHash == blockHash)
{
- orphansQueue.Add(pair.Key);
- }
+ if (AcceptBlock(ref orphanBlock))
+ {
+ orphansQueue.Add(pair.Key);
+ }
+
+ CBlock dummy1;
+ orphanMap.TryRemove(pair.Key, out dummy1);
- CBlock dummy1;
- orphanMap.TryRemove(pair.Key, out dummy1);
+ uint256 dummyHash;
+ mapStakeSeenOrphan.TryRemove(orphanBlock.ProofOfStake, out dummyHash);
+ }
}
- }
- CBlock dummy2;
- orphanMap.TryRemove(hashPrev, out dummy2);
+ CBlock dummy2;
+ orphanMapByPrev.TryRemove(hashPrev, out dummy2);
+ }
}
return true;
@@ -1917,11 +1398,10 @@ namespace Novacoin
var intBuffer = new byte[4];
var fStream2 = File.OpenRead(BlockFile);
- var readerForBlocks = new BinaryReader(fStream2).BaseStream;
- readerForBlocks.Seek(nOffset, SeekOrigin.Begin); // Seek to previous offset + previous block length
+ fStream2.Seek(nOffset, SeekOrigin.Begin); // Seek to previous offset + previous block length
- while (readerForBlocks.Read(buffer, 0, 4) == 4) // Read magic number
+ while (fStream2.Read(buffer, 0, 4) == 4) // Read magic number
{
var nMagic = BitConverter.ToUInt32(buffer, 0);
if (nMagic != 0xe5e9e8e4)
@@ -1929,7 +1409,7 @@ namespace Novacoin
throw new Exception("Incorrect magic number.");
}
- var nBytesRead = readerForBlocks.Read(buffer, 0, 4);
+ var nBytesRead = fStream2.Read(buffer, 0, 4);
if (nBytesRead != 4)
{
throw new Exception("BLKSZ EOF");
@@ -1937,9 +1417,9 @@ namespace Novacoin
var nBlockSize = BitConverter.ToInt32(buffer, 0);
- nOffset = readerForBlocks.Position;
+ nOffset = fStream2.Position;
- nBytesRead = readerForBlocks.Read(buffer, 0, nBlockSize);
+ nBytesRead = fStream2.Read(buffer, 0, nBlockSize);
if (nBytesRead == 0 || nBytesRead != nBlockSize)
{
@@ -1960,19 +1440,9 @@ namespace Novacoin
}
int nCount = blockMap.Count;
- Console.WriteLine("nCount={0}, Hash={1}, Time={2}", nCount, block.header.Hash, DateTime.Now); // Commit on each 100th block
-
- /*
- if (nCount % 100 == 0 && nCount != 0)
- {
- Console.WriteLine("Commit...");
- dbConn.Commit();
- dbConn.BeginTransaction();
- }*/
+ Console.WriteLine("nCount={0}, Hash={1}, NumTx={2}, Time={3}", nCount, block.header.Hash, block.vtx.Length, DateTime.Now);
}
- dbConn.Commit();
-
return true;
}