Remove interfaces, split database objects into new file.
[NovacoinLibrary.git] / Novacoin / CBlockStore.cs
index 935a4ab..2299e15 100644 (file)
 
 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.Text;
 
 namespace Novacoin
 {
-    /// <summary>
-    /// Block headers table
-    /// </summary>
-    [Table("BlockStorage")]
-    public class CBlockStoreItem
+    public class CBlockStore : IDisposable
     {
-        /// <summary>
-        /// Item ID in the database
-        /// </summary>
-        [PrimaryKey, AutoIncrement]
-        public int ItemID { get; set; }
+        public const uint nMagicNumber = 0xe5e9e8e4;
 
-        /// <summary>
-        /// PBKDF2+Salsa20 of block hash
-        /// </summary>
-        [Unique]
-        public byte[] Hash { get; set; }
+        private bool disposed = false;
+        private object LockObj = new object();
 
         /// <summary>
-        /// Version of block schema
+        /// SQLite connection object.
         /// </summary>
-        public uint nVersion { get; set; }
+        private SQLiteConnection dbConn;
 
         /// <summary>
-        /// Previous block hash.
+        /// Current SQLite platform
         /// </summary>
-        public byte[] prevHash { get; set; }
+        private ISQLitePlatform dbPlatform;
 
         /// <summary>
-        /// Merkle root hash.
+        /// Block file.
         /// </summary>
-        public byte[] merkleRoot { get; set; }
+        private string strBlockFile;
 
         /// <summary>
-        /// Block timestamp.
+        /// Index database file.
         /// </summary>
-        public uint nTime { get; set; }
+        private string strDbFile;
 
         /// <summary>
-        /// Compressed difficulty representation.
+        /// Map of block tree nodes.
+        /// 
+        /// blockHash => CBlockStoreItem
         /// </summary>
-        public uint nBits { get; set; }
+        private ConcurrentDictionary<uint256, CBlockStoreItem> blockMap = new ConcurrentDictionary<uint256, CBlockStoreItem>();
 
         /// <summary>
-        /// Nonce counter.
+        /// Orphaned blocks map.
         /// </summary>
-        public uint nNonce { get; set; }
+        private ConcurrentDictionary<uint256, CBlock> orphanMap = new ConcurrentDictionary<uint256, CBlock>();
+        private ConcurrentDictionary<uint256, CBlock> orphanMapByPrev = new ConcurrentDictionary<uint256, CBlock>();
 
         /// <summary>
-        /// Next block hash.
+        /// Unconfirmed transactions.
+        /// 
+        /// TxID => Transaction
         /// </summary>
-        public byte[] nextHash { get; set; }
+        private ConcurrentDictionary<uint256, CTransaction> mapUnconfirmedTx = new ConcurrentDictionary<uint256, CTransaction>();
 
         /// <summary>
-        /// Block type flags
+        /// Map of the proof-of-stake hashes. This is necessary for stake duplication checks.
         /// </summary>
-        public BlockType BlockTypeFlag { get; set; }
+        private ConcurrentDictionary<uint256, uint256> mapProofOfStake = new ConcurrentDictionary<uint256, uint256>();
 
-        /// <summary>
-        /// Stake modifier
-        /// </summary>
-        public long nStakeModifier { get; set; }
 
-        /// <summary>
-        /// Stake modifier checksum.
-        /// </summary>
-        public uint nStakeModifierChecksum { get; set; }
+        private ConcurrentDictionary<COutPoint, uint> mapStakeSeen = new ConcurrentDictionary<COutPoint, uint>();
+        private ConcurrentDictionary<COutPoint, uint> mapStakeSeenOrphan = new ConcurrentDictionary<COutPoint, uint>();
 
-        /// <summary>
-        /// Chain trust score
-        /// </summary>
-        public byte[] ChainTrust { get; set; }
 
         /// <summary>
-        /// Proof-of-Stake hash
+        /// Copy of chain state object.
         /// </summary>
-        public byte[] hashProofOfStake { get; set; }
+        private ChainState ChainParams;
 
         /// <summary>
-        /// Block height
+        /// Cursor which is pointing us to the end of best chain.
         /// </summary>
-        public uint nHeight { get; set; }
+        private CBlockStoreItem bestBlockCursor = null;
 
         /// <summary>
-        /// Block position in file
+        /// Cursor which is always pointing us to genesis block.
         /// </summary>
-        public long nBlockPos { get; set; }
+        private CBlockStoreItem genesisBlockCursor = null;
 
         /// <summary>
-        /// Block size in bytes
+        /// Current and the only instance of block storage manager. Should be a property with private setter though it's enough for the beginning.
         /// </summary>
-        public int nBlockSize { get; set; }
+        public static CBlockStore Instance = null;
 
         /// <summary>
-        /// Fill database item with data from given block header.
+        /// Block file stream with read/write access
         /// </summary>
-        /// <param name="header">Block header</param>
-        /// <returns>Header hash</returns>
-        public uint256 FillHeader(CBlockHeader header)
-        {
-            uint256 _hash;
-            Hash = _hash = header.Hash;
-
-            nVersion = header.nVersion;
-            prevHash = header.prevHash;
-            merkleRoot = header.merkleRoot;
-            nTime = header.nTime;
-            nBits = header.nBits;
-            nNonce = header.nNonce;
-
-            return _hash;
-        }
+        private Stream fStreamReadWrite;
+        private uint nTimeBestReceived;
+        private int nTransactionsUpdated;
 
         /// <summary>
-        /// Reconstruct block header from item data.
+        /// Init the block storage manager.
         /// </summary>
-        public CBlockHeader BlockHeader
+        /// <param name="IndexDB">Path to index database</param>
+        /// <param name="BlockFile">Path to block file</param>
+        public CBlockStore(string IndexDB = "blockstore.dat", string BlockFile = "blk0001.dat")
         {
-            get
-            {
-                CBlockHeader header = new CBlockHeader();
+            strDbFile = IndexDB;
+            strBlockFile = BlockFile;
 
-                header.nVersion = nVersion;
-                header.prevHash = prevHash;
-                header.merkleRoot = merkleRoot;
-                header.nTime = nTime;
-                header.nBits = nBits;
-                header.nNonce = nNonce;
+            bool firstInit = !File.Exists(strDbFile);
+            dbPlatform = new SQLitePlatformGeneric();
+            dbConn = new SQLiteConnection(dbPlatform, strDbFile);
 
-                return header;
-            }
-        }
+            fStreamReadWrite = File.Open(strBlockFile, FileMode.OpenOrCreate, FileAccess.ReadWrite);
 
-        /// <summary>
-        /// Read block from file.
-        /// </summary>
-        /// <param name="reader">Stream with read access.</param>
-        /// <param name="reader">CBlock reference.</param>
-        /// <returns>Result</returns>
-        public bool ReadFromFile(ref Stream reader, out CBlock block)
-        {
-            var buffer = new byte[nBlockSize];
-            block = null;
+            Instance = this;
 
-            try
+            if (firstInit)
             {
-                reader.Seek(nBlockPos, SeekOrigin.Begin);
-
-                if (nBlockSize != reader.Read(buffer, 0, nBlockSize))
+                lock (LockObj)
                 {
-                    return false;
-                }
-
-                block = new CBlock(buffer);
-
-                return true;
-            }
-            catch (IOException)
-            {
-                // I/O error
-                return false;
-            }
-            catch (BlockException)
-            {
-                // Constructor exception
-                return false;
-            }
-        }
+                    // Create tables
+                    dbConn.CreateTable<CBlockStoreItem>(CreateFlags.AutoIncPK);
+                    dbConn.CreateTable<CMerkleNode>(CreateFlags.AutoIncPK);
+                    dbConn.CreateTable<TxOutItem>(CreateFlags.ImplicitPK);
+                    dbConn.CreateTable<ChainState>(CreateFlags.AutoIncPK);
 
-        /// <summary>
-        /// Writes given block to file and prepares cursor object for insertion into the database.
-        /// </summary>
-        /// <param name="writer">Stream with write access.</param>
-        /// <param name="block">CBlock reference.</param>
-        /// <returns>Result</returns>
-        public bool WriteToFile(ref Stream writer, ref CBlock block)
-        {
-            try
-            {
-                byte[] blockBytes = block;
+                    ChainParams = new ChainState()
+                    {
+                        nBestChainTrust = 0,
+                        nBestHeight = 0,
+                        nHashBestChain = 0
+                    };
 
-                var magicBytes = BitConverter.GetBytes(CBlockStore.nMagicNumber);
-                var blkLenBytes = BitConverter.GetBytes(blockBytes.Length);
+                    dbConn.Insert(ChainParams);
 
-                // 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);
+                    var genesisBlock = new CBlock(
+                        Interop.HexToArray(
+                            "01000000" + // nVersion=1
+                            "0000000000000000000000000000000000000000000000000000000000000000" + // prevhash is zero
+                            "7b0502ad2f9f675528183f83d6385794fbcaa914e6d385c6cb1d866a3b3bb34c" + // merkle root
+                            "398e1151" + // nTime=1360105017
+                            "ffff0f1e" + // nBits=0x1e0fffff
+                            "d3091800" + // nNonce=1575379
+                            "01" +       // nTxCount=1
+                            "01000000" + // nVersion=1
+                            "398e1151" + // nTime=1360105017
+                            "01" +       // nInputs=1
+                            "0000000000000000000000000000000000000000000000000000000000000000" + // input txid is zero
+                            "ffffffff" + // n=uint.maxValue
+                            "4d" +       // scriptSigLen=77
+                            "04ffff001d020f274468747470733a2f2f626974636f696e74616c6b2e6f72672f696e6465782e7068703f746f7069633d3133343137392e6d736731353032313936236d736731353032313936" + // scriptSig
+                            "ffffffff" + // nSequence=uint.maxValue
+                            "01" +       // nOutputs=1
+                            "0000000000000000" + // nValue=0
+                            "00" +       // scriptPubkeyLen=0
+                            "00000000" + // nLockTime=0
+                            "00"         // sigLen=0
+                    ));
 
-                // Save block size and current position in the block cursor fields.
-                nBlockPos = writer.Position;
-                nBlockSize = blockBytes.Length;                
+                    // Write block to file.
+                    var itemTemplate = new CBlockStoreItem()
+                    {
+                        nHeight = 0
+                    };
 
-                // Write block and flush the stream.
-                writer.Write(blockBytes, 0, blockBytes.Length);
-                writer.Flush();
+                    itemTemplate.FillHeader(genesisBlock.header);
 
-                return true;
-            }
-            catch (IOException)
-            {
-                // I/O error
-                return false;
+                    if (!AddItemToIndex(ref itemTemplate, ref genesisBlock))
+                    {
+                        throw new Exception("Unable to write genesis block");
+                    }
+                }
             }
-            catch (Exception)
+            else
             {
-                // Some serialization error
-                return false;
-            }
-        }
+                var blockTreeItems = dbConn.Query<CBlockStoreItem>("select * from [BlockStorage] order by [ItemId] asc");
 
-        /// <summary>
-        /// Previous block cursor
-        /// </summary>
-        [Ignore]
-        public CBlockStoreItem prev {
-            get { return CBlockStore.Instance.GetCursor(prevHash); }
-        }
+                // Init list of block items
+                foreach (var item in blockTreeItems)
+                {
+                    blockMap.TryAdd(item.Hash, item);
 
-        /// <summary>
-        /// Next block cursor
-        /// </summary>
-        [Ignore]
-        public CBlockStoreItem next
-        {
-            get { return CBlockStore.Instance.GetCursor(nextHash); }
-        }
+                    if (item.IsProofOfStake)
+                    {
+                        // build mapStakeSeen
+                        mapStakeSeen.TryAdd(item.prevoutStake, item.nStakeTime);
+                    }
+                }
 
-        [Ignore]
-        bool IsInMainChain
-        {
-            get { return (next != null); }
+                // Load data about the top node.
+                ChainParams = dbConn.Table<ChainState>().First();
+            }
         }
 
-        /// <summary>
-        /// STake modifier generation flag
-        /// </summary>
-        [Ignore]
-        public bool GeneratedStakeModifier
+        public bool GetTxOutCursor(COutPoint outpoint, ref TxOutItem txOutCursor)
         {
-            get { return (BlockTypeFlag & BlockType.BLOCK_STAKE_MODIFIER) != 0; }
-        }
+            var queryResults = dbConn.Query<TxOutItem>("select o.* from [Outputs] o left join [MerkleNodes] m on (m.nMerkleNodeID = o.nMerkleNodeID) where m.[TransactionHash] = ?", (byte[])outpoint.hash);
 
-        /// <summary>
-        /// Stake entropy bit
-        /// </summary>
-        [Ignore]
-        public uint StakeEntropyBit
-        {
-            get { return ((uint)(BlockTypeFlag & BlockType.BLOCK_STAKE_ENTROPY) >> 1); }
-        }
+            if (queryResults.Count == 1)
+            {
+                txOutCursor = queryResults[0];
 
-        /// <summary>
-        /// Sets stake modifier and flag.
-        /// </summary>
-        /// <param name="nModifier">New stake modifier.</param>
-        /// <param name="fGeneratedStakeModifier">Set generation flag?</param>
-        public void SetStakeModifier(long nModifier, bool fGeneratedStakeModifier)
-        {
-            nStakeModifier = nModifier;
-            if (fGeneratedStakeModifier)
-                BlockTypeFlag |= BlockType.BLOCK_STAKE_MODIFIER;
-        }
+                return true;
+            }
 
-        /// <summary>
-        /// Set entropy bit.
-        /// </summary>
-        /// <param name="nEntropyBit">Entropy bit value (0 or 1).</param>
-        /// <returns>False if value is our of range.</returns>
-        public bool SetStakeEntropyBit(byte nEntropyBit)
-        {
-            if (nEntropyBit > 1)
-                return false;
-            BlockTypeFlag |= (nEntropyBit != 0 ? BlockType.BLOCK_STAKE_ENTROPY : 0);
-            return true;
-        }
+            // Tx not found
 
-        /// <summary>
-        /// Set proof-of-stake flag.
-        /// </summary>
-        public void SetProofOfStake()
-        {
-            BlockTypeFlag |= BlockType.BLOCK_PROOF_OF_STAKE;
+            return false;
         }
 
-        /// <summary>
-        /// Block has no proof-of-stake flag.
-        /// </summary>
-        [Ignore]
-        public bool IsProofOfWork
-        {
-            get { return (BlockTypeFlag & BlockType.BLOCK_PROOF_OF_STAKE) == 0; }
-        }
 
-        /// <summary>
-        /// Block has proof-of-stake flag set.
-        /// </summary>
-        [Ignore]
-        public bool IsProofOfStake 
+        public bool FetchInputs(CTransaction tx, ref Dictionary<COutPoint, TxOutItem> queued, ref Dictionary<COutPoint, TxOutItem> inputs, bool IsBlock, out bool Invalid)
         {
-            get { return (BlockTypeFlag & BlockType.BLOCK_PROOF_OF_STAKE) != 0; }
-        }
+            Invalid = false;
 
-        /// <summary>
-        /// Chain trust score.
-        /// </summary>
-        [Ignore]
-        public uint256 nChainTrust {
-            get
+            if (tx.IsCoinBase)
             {
-                if (ChainTrust.Length != 32)
-                {
-                    byte[] tmp = ChainTrust;
-                    Array.Resize(ref tmp, 32);
-                    ChainTrust = tmp;
-                }
-
-                return ChainTrust;
+                // Coinbase transactions have no inputs to fetch.
+                return true; 
             }
-            set { ChainTrust = Interop.TrimArray(value); }
-        }
 
-        /// <summary>
-        /// Block trust score.
-        /// </summary>
-        [Ignore]
-        public uint256 nBlockTrust
-        {
-            get
+            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++)
             {
-                uint256 nTarget = 0;
-                nTarget.Compact = nBits;
+                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)
+                ));
+            }
+
+            var queryResults = dbConn.Query<InputsJoin>(queryBuilder.ToString());
 
-                /* Old protocol */
-                if (nTime < NetUtils.nChainChecksSwitchTime)
+            foreach (var item in queryResults)
+            {
+                if (item.IsSpent)
                 {
-                    return IsProofOfStake ? (new uint256(1) << 256) / (nTarget + 1) : 1;
+                    return false; // Already spent
                 }
 
-                /* New protocol */
-
-                // Calculate work amount for block
-                var nPoWTrust = NetUtils.nPoWBase / (nTarget + 1);
-
-                // Set nPowTrust to 1 if we are checking PoS block or PoW difficulty is too low
-                nPoWTrust = (IsProofOfStake || !nPoWTrust) ? 1 : nPoWTrust;
+                var inputsKey =  new COutPoint(item.TransactionHash, item.nOut);
 
-                // Return nPoWTrust for the first 12 blocks
-                if (prev == null || prev.nHeight < 12)
-                    return nPoWTrust;
+                item.IsSpent = true;
 
-                CBlockStoreItem currentIndex = prev;
+                // Add output data to dictionary
+                inputs.Add(inputsKey, (TxOutItem) item);
+            }
 
-                if (IsProofOfStake)
+            if (queryResults.Count < tx.vin.Length)
+            {
+                if (IsBlock)
                 {
-                    var nNewTrust = (new uint256(1) << 256) / (nTarget + 1);
+                    // It seems that some transactions are being spent in the same block.
 
-                    // Return 1/3 of score if parent block is not the PoW block
-                    if (!prev.IsProofOfWork)
+                    foreach (var txin in tx.vin)
                     {
-                        return nNewTrust / 3;
-                    }
+                        var outPoint = txin.prevout;
 
-                    int nPoWCount = 0;
-
-                    // Check last 12 blocks type
-                    while (prev.nHeight - currentIndex.nHeight < 12)
-                    {
-                        if (currentIndex.IsProofOfWork)
+                        if (!queued.ContainsKey(outPoint))
                         {
-                            nPoWCount++;
+                            return false; // No such transaction
                         }
-                        currentIndex = currentIndex.prev;
-                    }
 
-                    // Return 1/3 of score if less than 3 PoW blocks found
-                    if (nPoWCount < 3)
-                    {
-                        return nNewTrust / 3;
-                    }
+                        // Add output data to dictionary
+                        inputs.Add(outPoint, queued[outPoint]);
 
-                    return nNewTrust;
+                        // Mark output as spent
+                        queued[outPoint].IsSpent = true;                        
+                    }
                 }
                 else
                 {
-                    var nLastBlockTrust = prev.nChainTrust - prev.prev.nChainTrust;
+                    // Unconfirmed transaction
 
-                    // Return nPoWTrust + 2/3 of previous block score if two parent blocks are not PoS blocks
-                    if (!prev.IsProofOfStake || !prev.prev.IsProofOfStake)
+                    foreach (var txin in tx.vin)
                     {
-                        return nPoWTrust + (2 * nLastBlockTrust / 3);
-                    }
-
-                    int nPoSCount = 0;
+                        var outPoint = txin.prevout;
+                        CTransaction txPrev;
 
-                    // Check last 12 blocks type
-                    while (prev.nHeight - currentIndex.nHeight < 12)
-                    {
-                        if (currentIndex.IsProofOfStake)
+                        if (!mapUnconfirmedTx.TryGetValue(outPoint.hash, out txPrev))
                         {
-                            nPoSCount++;
+                            return false; // No such transaction
                         }
-                        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);
-                    }
+                        if (outPoint.n > txPrev.vout.Length)
+                        {
+                            Invalid = true;
 
-                    nTarget.Compact = prev.nBits;
+                            return false; // nOut is out of range
+                        }
+                        
+                        // TODO: return inputs from map 
+                        throw new NotImplementedException();
 
-                    if (!nTarget)
-                    {
-                        return 0;
                     }
 
-                    var nNewTrust = (new uint256(1) << 256) / (nTarget + 1);
-
-                    // Return nPoWTrust + full trust score for previous block nBits
-                    return nPoWTrust + nNewTrust;
+                    return false;
                 }
             }
+
+            return true;
         }
 
-    }
+        private bool AddItemToIndex(ref CBlockStoreItem itemTemplate, ref CBlock block)
+        {
+            var writer = new BinaryWriter(fStreamReadWrite).BaseStream;
+            uint256 blockHash = itemTemplate.Hash;
 
-    /// <summary>
-    /// Block type.
-    /// </summary>
-    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
-    };
-
-    /// <summary>
-    /// Transaction type.
-    /// </summary>
-    public enum TxType
-    {
-        TX_COINBASE,
-        TX_COINSTAKE,
-        TX_USER
-    }
+            if (blockMap.ContainsKey(blockHash))
+            {
+                // Already have this block.
+                return false;
+            }
 
-    [Table("TransactionStorage")]
-    public class CTransactionStoreItem
-    {
-        /// <summary>
-        /// Transaction hash
-        /// </summary>
-        [PrimaryKey]
-        public byte[] TransactionHash { get; set; }
+            // Compute chain trust score
+            itemTemplate.nChainTrust = (itemTemplate.prev != null ? itemTemplate.prev.nChainTrust : 0) + itemTemplate.nBlockTrust;
 
-        /// <summary>
-        /// Block hash
-        /// </summary>
-        [ForeignKey(typeof(CBlockStoreItem), Name = "Hash")]
-        public byte[] BlockHash { get; set; }
+            if (!itemTemplate.SetStakeEntropyBit(Entropy.GetStakeEntropyBit(itemTemplate.nHeight, blockHash)))
+            {
+                return false; // SetStakeEntropyBit() failed
+            }
 
-        /// <summary>
-        /// Transaction type flag
-        /// </summary>
-        public TxType txType { get; set; }
+            // Save proof-of-stake hash value
+            if (itemTemplate.IsProofOfStake)
+            {
+                uint256 hashProofOfStake;
+                if (!GetProofOfStakeHash(blockHash, out hashProofOfStake))
+                {
+                    return false;  // hashProofOfStake not found 
+                }
+                itemTemplate.hashProofOfStake = hashProofOfStake;
+            }
 
-        /// <summary>
-        /// Tx position in file
-        /// </summary>
-        public long nTxPos { get; set; }
+            // compute stake modifier
+            long nStakeModifier = 0;
+            bool fGeneratedStakeModifier = false;
+            if (!StakeModifier.ComputeNextStakeModifier(itemTemplate, ref nStakeModifier, ref fGeneratedStakeModifier))
+            {
+                return false;  // ComputeNextStakeModifier() failed
+            }
 
-        /// <summary>
-        /// Transaction size
-        /// </summary>
-        public int nTxSize { get; set; }
+            itemTemplate.SetStakeModifier(nStakeModifier, fGeneratedStakeModifier);
+            itemTemplate.nStakeModifierChecksum = StakeModifier.GetStakeModifierChecksum(itemTemplate);
 
-        /// <summary>
-        /// Read transaction from file.
-        /// </summary>
-        /// <param name="reader">Stream with read access.</param>
-        /// <param name="tx">CTransaction reference.</param>
-        /// <returns>Result</returns>
-        public bool ReadFromFile(ref Stream reader, out CTransaction tx)
-        {
-            var buffer = new byte[CTransaction.nMaxTxSize];
-            tx = null;
+            // TODO: verify stake modifier checkpoints
 
-            try
+            // Add to index
+            if (block.IsProofOfStake)
             {
-                reader.Seek(nTxPos, SeekOrigin.Begin); // Seek to transaction offset
-
-                if (nTxSize != reader.Read(buffer, 0, nTxSize))
-                {
-                    return false;
-                }
-
-                tx = new CTransaction(buffer);
+                itemTemplate.SetProofOfStake();
 
-                return true;
+                itemTemplate.prevoutStake = block.vtx[1].vin[0].prevout;
+                itemTemplate.nStakeTime = block.vtx[1].nTime;
             }
-            catch (IOException)
+
+            if (!itemTemplate.WriteToFile(ref writer, ref block))
             {
-                // I/O error
                 return false;
             }
-            catch (TransactionConstructorException)
+
+            if (dbConn.Insert(itemTemplate) == 0)
             {
-                // Constructor error
-                return false;
+                return false; // Insert failed
             }
-        }
-    }
 
-    public class CBlockStore : IDisposable
-    {
-        public const uint nMagicNumber = 0xe5e9e8e4;
+            // Get last RowID.
+            itemTemplate.ItemID = dbPlatform.SQLiteApi.LastInsertRowid(dbConn.Handle);
+            
+            if (!blockMap.TryAdd(blockHash, itemTemplate))
+            {
+                return false; // blockMap add failed
+            }
 
-        private bool disposed = false;
-        private object LockObj = new object();
+            if (itemTemplate.nChainTrust > ChainParams.nBestChainTrust)
+            {
+                // New best chain
 
-        /// <summary>
-        /// SQLite connection object.
-        /// </summary>
-        private SQLiteConnection dbConn;
+                if (!SetBestChain(ref itemTemplate))
+                {
+                    return false; // SetBestChain failed.
+                }
+            }
 
-        /// <summary>
-        /// Block file.
-        /// </summary>
-        private string strBlockFile;
+            return true;
+        }
 
-        /// <summary>
-        /// Index database file.
-        /// </summary>
-        private string strDbFile;
+        private bool SetBestChain(ref CBlockStoreItem cursor)
+        {
+            uint256 hashBlock = cursor.Hash;
 
-        /// <summary>
-        /// Map of block tree nodes.
-        /// </summary>
-        private ConcurrentDictionary<uint256, CBlockStoreItem> blockMap = new ConcurrentDictionary<uint256, CBlockStoreItem>();
+            if (genesisBlockCursor == null && hashBlock == NetInfo.nHashGenesisBlock)
+            {
+                genesisBlockCursor = cursor;
+            }
+            else if (ChainParams.nHashBestChain == (uint256)cursor.prevHash)
+            {
+                if (!SetBestChainInner(cursor))
+                {
+                    return false;
+                }
+            }
+            else
+            {
+                // the first block in the new chain that will cause it to become the new best chain
+                var cursorIntermediate = cursor;
 
-        /// <summary>
-        /// Orphaned blocks map.
-        /// </summary>
-        private ConcurrentDictionary<uint256, CBlock> orphanMap = new ConcurrentDictionary<uint256, CBlock>();
-        private ConcurrentDictionary<uint256, CBlock> orphanMapByPrev = new ConcurrentDictionary<uint256, CBlock>();
+                // list of blocks that need to be connected afterwards
+                var secondary = new List<CBlockStoreItem>();
 
-        /// <summary>
-        /// Map of unspent items.
-        /// </summary>
-        private ConcurrentDictionary<uint256, CTransactionStoreItem> txMap = new ConcurrentDictionary<uint256, CTransactionStoreItem>();
+                // Reorganize is costly in terms of db load, as it works in a single db transaction.
+                // Try to limit how much needs to be done inside
+                while (cursorIntermediate.prev != null && cursorIntermediate.prev.nChainTrust > bestBlockCursor.nChainTrust)
+                {
+                    secondary.Add(cursorIntermediate);
+                    cursorIntermediate = cursorIntermediate.prev;
+                }
 
-        private ConcurrentDictionary<uint256, uint256> mapProofOfStake = new ConcurrentDictionary<uint256, uint256>();
+                // Switch to new best branch
+                if (!Reorganize(cursorIntermediate))
+                {
+                    InvalidChainFound(cursor);
+                    return false; // reorganize failed
+                }
 
-        public static CBlockStore Instance;
+                // Connect further blocks
+                foreach (var currentCursor in secondary)
+                {
+                    CBlock block;
+                    if (!currentCursor.ReadFromFile(ref fStreamReadWrite, out block))
+                    {
+                        // ReadFromDisk failed
+                        break;
+                    }
 
-        /// <summary>
-        /// Block file stream with read access
-        /// </summary>
-        private Stream fStreamReadWrite;
+                    // errors now are not fatal, we still did a reorganisation to a new chain in a valid way
+                    if (!SetBestChainInner(currentCursor))
+                    {
+                        break;
+                    }
+                }
+            }
 
-        /// <summary>
-        /// Init the block storage manager.
-        /// </summary>
-        /// <param name="IndexDB">Path to index database</param>
-        /// <param name="BlockFile">Path to block file</param>
-        public CBlockStore(string IndexDB = "blockstore.dat", string BlockFile = "blk0001.dat")
-        {
-            strDbFile = IndexDB;
-            strBlockFile = BlockFile;
+            bestBlockCursor = cursor;
+            nTimeBestReceived = Interop.GetTime();
+            nTransactionsUpdated++;
 
-            bool firstInit = !File.Exists(strDbFile);
-            dbConn = new SQLiteConnection(new SQLitePlatformGeneric(), strDbFile);
+            return true;
+        }
 
-            fStreamReadWrite = File.Open(strBlockFile, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+        private void InvalidChainFound(CBlockStoreItem cursor)
+        {
+            throw new NotImplementedException();
+        }
 
-            Instance = this;
+        private bool Reorganize(CBlockStoreItem cursorIntermediate)
+        {
+            // Find the fork
+            var fork = bestBlockCursor;
+            var longer = cursorIntermediate;
 
-            if (firstInit)
+            while (fork.ItemID != longer.ItemID)
             {
-                lock (LockObj)
+                while (longer.nHeight > fork.nHeight)
                 {
-                    // Create tables
-                    dbConn.CreateTable<CBlockStoreItem>(CreateFlags.AutoIncPK);
-                    dbConn.CreateTable<CTransactionStoreItem>(CreateFlags.ImplicitPK);
+                    if ((longer = longer.prev) == null)
+                    {
+                        return false; // longer.prev is null
+                    }
+                }
 
-                    var genesisBlock = new CBlock(
-                        Interop.HexToArray(
-                            "01000000" + // nVersion=1
-                            "0000000000000000000000000000000000000000000000000000000000000000" + // prevhash is zero
-                            "7b0502ad2f9f675528183f83d6385794fbcaa914e6d385c6cb1d866a3b3bb34c" + // merkle root
-                            "398e1151" + // nTime=1360105017
-                            "ffff0f1e" + // nBits=0x1e0fffff
-                            "d3091800" + // nNonce=1575379
-                            "01" +       // nTxCount=1
-                            "01000000" + // nVersion=1
-                            "398e1151" + // nTime=1360105017
-                            "01" +       // nInputs=1
-                            "0000000000000000000000000000000000000000000000000000000000000000" + // input txid is zero
-                            "ffffffff" + // n=uint.maxValue
-                            "4d" +       // scriptSigLen=77
-                            "04ffff001d020f274468747470733a2f2f626974636f696e74616c6b2e6f72672f696e6465782e7068703f746f7069633d3133343137392e6d736731353032313936236d736731353032313936" + // scriptSig
-                            "ffffffff" + // nSequence=uint.maxValue
-                            "01" +       // nOutputs=1
-                            "0000000000000000" + // nValue=0
-                            "00" +       // scriptPubkeyLen=0
-                            "00000000" + // nLockTime=0
-                            "00"         // sigLen=0
-                    ));
+                if (fork.ItemID == longer.ItemID)
+                {
+                    break;
+                }
 
-                    // Write block to file.
-                    var itemTemplate = new CBlockStoreItem()
-                    {
-                        nHeight = 0
-                    };
+                if ((fork = fork.prev) == null)
+                {
+                    return false; // fork.prev is null
+                }
+            }
 
-                    itemTemplate.FillHeader(genesisBlock.header);
+            // List of what to disconnect
+            var disconnect = new List<CBlockStoreItem>();
+            for (var cursor = bestBlockCursor; cursor.ItemID != fork.ItemID; cursor = cursor.prev)
+            {
+                disconnect.Add(cursor);
+            }
 
-                    if (!AddItemToIndex(ref itemTemplate, ref genesisBlock))
+            // List of what to connect
+            var connect = new List<CBlockStoreItem>();
+            for (var cursor = cursorIntermediate; cursor.ItemID != fork.ItemID; cursor = cursor.prev)
+            {
+                connect.Add(cursor);
+            }
+            connect.Reverse();
+
+            // Disconnect shorter branch
+            var txResurrect = new List<CTransaction>();
+            foreach (var blockCursor in disconnect)
+            {
+                CBlock block;
+                if (!blockCursor.ReadFromFile(ref fStreamReadWrite, out block))
+                {
+                    return false; // ReadFromFile for disconnect failed.
+                }
+                if (!DisconnectBlock(blockCursor, ref block))
+                {
+                    return false; // DisconnectBlock failed.
+                }
+
+                // Queue memory transactions to resurrect
+                foreach (var tx in block.vtx)
+                {
+                    if (!tx.IsCoinBase && !tx.IsCoinStake)
                     {
-                        throw new Exception("Unable to write genesis block");
+                        txResurrect.Add(tx);
                     }
                 }
             }
-            else
+
+
+            // Connect longer branch
+            var txDelete = new List<CTransaction>();
+            foreach (var cursor in connect)
             {
-                var blockTreeItems = dbConn.Query<CBlockStoreItem>("select * from [BlockStorage] order by [ItemId] asc");
+                CBlock block;
+                if (!cursor.ReadFromFile(ref fStreamReadWrite, out block))
+                {
+                    return false; // ReadFromDisk for connect failed
+                }
 
-                // Init list of block items
-                foreach (var item in blockTreeItems)
+                if (!ConnectBlock(cursor, ref block))
                 {
-                    blockMap.TryAdd(item.Hash, item);
+                    // Invalid block
+                    return false; // ConnectBlock failed
+                }
+
+                // Queue memory transactions to delete
+                foreach (var tx in block.vtx)
+                {
+                    txDelete.Add(tx);
                 }
             }
-        }
 
-        public bool GetTransaction(uint256 TxID, ref CTransaction tx)
-        {
-            var reader = new BinaryReader(fStreamReadWrite).BaseStream;
-            var QueryTx = dbConn.Query<CTransactionStoreItem>("select * from [TransactionStorage] where [TransactionHash] = ?", (byte[])TxID);
+            if (!UpdateTopChain(cursorIntermediate))
+            {
+                return false; // UpdateTopChain failed
+            }
+
+            // Make sure it's successfully written to disk 
+            dbConn.Commit();
 
-            if (QueryTx.Count == 1)
+            // Resurrect memory transactions that were in the disconnected branch
+            foreach (var tx in txResurrect)
             {
-                return QueryTx[0].ReadFromFile(ref reader, out tx);
+                mapUnconfirmedTx.TryAdd(tx.Hash, tx);
             }
 
-            // Tx not found
+            // Delete redundant memory transactions that are in the connected branch
+            foreach (var tx in txDelete)
+            {
+                CTransaction dummy;
+                mapUnconfirmedTx.TryRemove(tx.Hash, out dummy);
+            }
 
-            return false;
+            return true; // Done
         }
 
-        private bool AddItemToIndex(ref CBlockStoreItem itemTemplate, ref CBlock block)
+        private bool DisconnectBlock(CBlockStoreItem blockCursor, ref CBlock block)
         {
-            var writer = new BinaryWriter(fStreamReadWrite).BaseStream;
-            uint256 blockHash = itemTemplate.Hash;
+            throw new NotImplementedException();
+        }
 
-            if (blockMap.ContainsKey(blockHash))
+        private bool SetBestChainInner(CBlockStoreItem cursor)
+        {
+            uint256 hash = cursor.Hash;
+            CBlock block;
+            if (!cursor.ReadFromFile(ref fStreamReadWrite, out block))
             {
-                // Already have this block.
-                return false;
+                return false; // Unable to read block from file.
             }
 
-            // Compute chain trust score
-            itemTemplate.nChainTrust = (itemTemplate.prev != null ? itemTemplate.prev.nChainTrust : 0) + itemTemplate.nBlockTrust;
-
-            if (!itemTemplate.SetStakeEntropyBit(Entropy.GetStakeEntropyBit(itemTemplate.nHeight, blockHash)))
+            // Adding to current best branch
+            if (!ConnectBlock(cursor, ref block) || !UpdateTopChain(cursor))
             {
-                return false; // SetStakeEntropyBit() failed
+                InvalidChainFound(cursor);
+                return false;
             }
 
-            // Save proof-of-stake hash value
-            if (itemTemplate.IsProofOfStake)
+            // Add to current best branch
+            cursor.prev.next = cursor;
+
+            dbConn.Commit();
+
+            // Delete redundant memory transactions
+            foreach (var tx in block.vtx)
             {
-                uint256 hashProofOfStake;
-                if (!CBlockStore.Instance.GetProofOfStakeHash(blockHash, out hashProofOfStake))
-                {
-                    return false;  // hashProofOfStake not found 
-                }
-                itemTemplate.hashProofOfStake = hashProofOfStake;
+                CTransaction dummy;
+                mapUnconfirmedTx.TryRemove(tx.Hash, out dummy);
             }
 
-            // TODO: compute stake modifier
+            return true;
+        }
 
-            // ppcoin: compute stake modifier
-            long nStakeModifier = 0;
-            bool fGeneratedStakeModifier = false;
-            if (!StakeModifier.ComputeNextStakeModifier(itemTemplate, ref nStakeModifier, ref fGeneratedStakeModifier))
+        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))
             {
-                return false;  // ComputeNextStakeModifier() failed
+                return false; // Invalid block found.
             }
 
-            itemTemplate.SetStakeModifier(nStakeModifier, fGeneratedStakeModifier);
-            itemTemplate.nStakeModifierChecksum = StakeModifier.GetStakeModifierChecksum(itemTemplate);
+            bool fScriptChecks = cursor.nHeight >= Checkpoints.TotalBlocksEstimate;
+            var scriptFlags = scriptflag.SCRIPT_VERIFY_NOCACHE | scriptflag.SCRIPT_VERIFY_P2SH;
 
-            // TODO: verify stake modifier checkpoints
+            ulong nFees = 0;
+            ulong nValueIn = 0;
+            ulong nValueOut = 0;
+            uint nSigOps = 0;
 
-            // Add to index
-            if (block.IsProofOfStake)
+            var queuedMerkleNodes = new Dictionary<uint256, CMerkleNode>();
+            var queued = new Dictionary<COutPoint, TxOutItem>();
+
+            for (var nTx = 0; nTx < block.vtx.Length; nTx++)
             {
-                itemTemplate.SetProofOfStake();
+                var tx = block.vtx[nTx];
+                var hashTx = tx.Hash;
+                var nTxPos = cursor.nBlockPos + block.GetTxOffset(nTx);
+
+                Dictionary<COutPoint, TxOutItem> txouts;
+                if (GetOutputs(hashTx, out txouts))
+                {
+                    // Do not allow blocks that contain transactions which 'overwrite' older transactions,
+                    // unless those are already completely spent.
+                    return false;
+                }
+
+                nSigOps += tx.LegacySigOpCount;
+                if (nSigOps > CBlock.nMaxSigOps)
+                {
+                    return false; // too many sigops
+                }
+
+                var inputs = new Dictionary<COutPoint, TxOutItem>();
+
+                if (tx.IsCoinBase)
+                {
+                    nValueOut += tx.nValueOut;
+                }
+                else
+                {
+                    bool Invalid;
+                    if (!FetchInputs(tx, ref queued, ref inputs, true, out Invalid))
+                    {
+                        return false; // Unable to fetch some inputs.
+                    }
+
+                    // 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);
+                    if (nSigOps > CBlock.nMaxSigOps)
+                    {
+                        return false; // too many sigops
+                    }
+
+                    ulong nTxValueIn = tx.GetValueIn(inputs);
+                    ulong nTxValueOut = tx.nValueOut;
+
+                    nValueIn += nTxValueIn;
+                    nValueOut += nTxValueOut;
+
+                    if (!tx.IsCoinStake)
+                    {
+                        nFees += nTxValueIn - nTxValueOut;
+                    }
+
+                    if (!ConnectInputs(tx, inputs, queued, cursor, fScriptChecks, scriptFlags))
+                    {
+                        return false;
+                    }
+                }
+
+                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();
+
+                    outData.nValue = tx.vout[i].nValue;
+                    outData.scriptPubKey = tx.vout[i].scriptPubKey;
+                    outData.nOut = i;
+
+
+                    outData.IsSpent = false;
+
+                    queued.Add(outKey, outData);
+                }
             }
 
-            if (!itemTemplate.WriteToFile(ref writer, ref block))
+            if (!block.IsProofOfStake)
             {
-                return false;
+                ulong nBlockReward = CBlock.GetProofOfWorkReward(cursor.nBits, nFees);
+
+                // Check coinbase reward
+                if (block.vtx[0].nValueOut > nBlockReward)
+                {
+                    return false; // coinbase reward exceeded
+                }
             }
 
-            dbConn.Insert(itemTemplate);
+            cursor.nMint = (long) (nValueOut - nValueIn + nFees);
+            cursor.nMoneySupply = (cursor.prev != null ? cursor.prev.nMoneySupply : 0) + (long)nValueOut - (long)nValueIn;
 
-            // We have no SetBestChain and ConnectBlock/Disconnect block yet, so adding these transactions manually.
-            for (int i = 0; i < block.vtx.Length; i++)
+            if (!UpdateDBCursor(ref cursor))
             {
-                // Handle trasactions
+                return false; // Unable to commit changes
+            }
 
-                if (!block.vtx[i].VerifyScripts())
-                {
-                    return false;
-                }
+            if (fJustCheck)
+            {
+                return true;
+            }
 
-                var nTxOffset = itemTemplate.nBlockPos + block.GetTxOffset(i);
-                TxType txnType = TxType.TX_USER;
+            // Write queued transaction changes
+            var actualMerkleNodes = new Dictionary<uint256, CMerkleNode>();
+            var queuedOutpointItems = new List<TxOutItem>();
+            foreach(KeyValuePair<COutPoint, TxOutItem> outPair in queued)
+            {
+                uint256 txID = outPair.Key.hash;
+                CMerkleNode merkleNode;
 
-                if (block.vtx[i].IsCoinBase)
+                if (actualMerkleNodes.ContainsKey(txID))
                 {
-                    txnType = TxType.TX_COINBASE;
+                    merkleNode = actualMerkleNodes[txID];
                 }
-                else if (block.vtx[i].IsCoinStake)
+                else
                 {
-                    txnType = TxType.TX_COINSTAKE;
+                    merkleNode = queuedMerkleNodes[txID];
+                    if (!SaveMerkleNode(ref merkleNode))
+                    {
+                        // Unable to save merkle tree cursor.
+                        return false;
+                    }
+                    actualMerkleNodes.Add(txID, merkleNode);
                 }
 
-                var NewTxItem = new CTransactionStoreItem()
-                {
-                    TransactionHash = block.vtx[i].Hash,
-                    BlockHash = blockHash,
-                    nTxPos = nTxOffset,
-                    nTxSize = block.vtx[i].Size,
-                    txType = txnType
-                };
-
-                dbConn.Insert(NewTxItem);
+                var outItem = outPair.Value;
+                outItem.nMerkleNodeID = merkleNode.nMerkleNodeID;
+
+                queuedOutpointItems.Add(outItem);
             }
 
-            return blockMap.TryAdd(blockHash, itemTemplate);
+            if (!SaveOutpoints(ref queuedOutpointItems))
+            {
+                return false; // Unable to save outpoints
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Insert set of outpoints
+        /// </summary>
+        /// <param name="queuedOutpointItems">List of TxOutItem objects.</param>
+        /// <returns>Result</returns>
+        private bool SaveOutpoints(ref List<TxOutItem> queuedOutpointItems)
+        {
+            return dbConn.InsertAll(queuedOutpointItems, false) != 0;
+        }
+
+        /// <summary>
+        /// Insert merkle node into db and set actual record id value.
+        /// </summary>
+        /// <param name="merkleNode">Merkle node object reference.</param>
+        /// <returns>Result</returns>
+        private bool SaveMerkleNode(ref CMerkleNode merkleNode)
+        {
+            if (dbConn.Insert(merkleNode) == 0)
+            {
+                return false;
+            }
+
+            merkleNode.nMerkleNodeID = dbPlatform.SQLiteApi.LastInsertRowid(dbConn.Handle);
+
+            return true;
+        }
+
+        private bool ConnectInputs(CTransaction tx, Dictionary<COutPoint, TxOutItem> inputs, Dictionary<COutPoint, TxOutItem> queued, CBlockStoreItem cursor, bool fScriptChecks, scriptflag scriptFlags)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// Set new top node or current best chain.
+        /// </summary>
+        /// <param name="cursor"></param>
+        /// <returns></returns>
+        private bool UpdateTopChain(CBlockStoreItem cursor)
+        {
+            ChainParams.HashBestChain = cursor.Hash;
+            ChainParams.nBestChainTrust = cursor.nChainTrust;
+            ChainParams.nBestHeight = cursor.nHeight;
+
+            return dbConn.Update(ChainParams) != 0;
         }
 
         /// <summary>
@@ -812,7 +860,7 @@ namespace Novacoin
             uint nHeight = prevBlockCursor.nHeight + 1;
 
             // Check timestamp against prev
-            if (NetUtils.FutureDrift(block.header.nTime) < prevBlockHeader.nTime)
+            if (NetInfo.FutureDrift(block.header.nTime) < prevBlockHeader.nTime)
             {
                 // block's timestamp is too early
                 return false;
@@ -845,31 +893,43 @@ namespace Novacoin
             return true;
         }
 
+        /// <summary>
+        /// GEt block by hash.
+        /// </summary>
+        /// <param name="blockHash">Block hash</param>
+        /// <param name="block">Block object reference</param>
+        /// <param name="nBlockPos">Block position reference</param>
+        /// <returns>Result</returns>
         public bool GetBlock(uint256 blockHash, ref CBlock block, ref long nBlockPos)
         {
-            var reader = new BinaryReader(fStreamReadWrite).BaseStream;
-
-            var QueryBlock = dbConn.Query<CBlockStoreItem>("select * from [BlockStorage] where [Hash] = ?", (byte[])blockHash);
+            CBlockStoreItem cursor;
 
-            if (QueryBlock.Count == 1)
+            if (!blockMap.TryGetValue(blockHash, out cursor))
             {
-                nBlockPos = QueryBlock[0].nBlockPos;
-                return QueryBlock[0].ReadFromFile(ref reader, out block);
+                return false; // Unable to fetch block cursor
             }
 
-            // Block not found
+            nBlockPos = cursor.nBlockPos;
 
-            return false;
+            return cursor.ReadFromFile(ref fStreamReadWrite, out block);
         }
 
-        public bool GetByTransactionID(uint256 TxID, ref CBlock block, ref CTransaction tx, ref long nBlockPos, ref long nTxPos)
+        /// <summary>
+        /// Get block and transaction by transaction hash.
+        /// </summary>
+        /// <param name="TxID">Transaction hash</param>
+        /// <param name="block">Block reference</param>
+        /// <param name="nBlockPos">Block position reference</param>
+        /// <returns>Result of operation</returns>
+        public bool GetBlockByTransactionID(uint256 TxID, ref CBlock block, ref long nBlockPos)
         {
-            var QueryTx = dbConn.Query<CTransactionStoreItem>("select * from [TransactionStorage] where [TransactionHash] = ?", (byte[])TxID);
+            var queryResult = dbConn.Query<CBlockStoreItem>("select b.* from [BlockStorage] b left join [MerkleNodes] m on (b.[ItemID] = m.[nParentBlockID]) where m.[TransactionHash] = ?", (byte[])TxID);
 
-            if (QueryTx.Count == 1)
+            if (queryResult.Count == 1)
             {
-                nTxPos = QueryTx[0].nTxPos;
-                return GetBlock(QueryTx[0].BlockHash, ref block, ref nBlockPos);
+                CBlockStoreItem blockCursor = queryResult[0];
+
+                return blockCursor.ReadFromFile(ref fStreamReadWrite, out block);
             }
 
             // Tx not found
@@ -877,12 +937,46 @@ namespace Novacoin
             return false;
         }
 
+        public bool GetOutputs(uint256 transactionHash, out Dictionary<COutPoint, TxOutItem> txouts, bool fUnspentOnly=true)
+        {
+            txouts = null;
+
+            var queryParams = new object[] { (byte[])transactionHash, fUnspentOnly ? OutputFlags.AVAILABLE : (OutputFlags.AVAILABLE | OutputFlags.SPENT) };
+            var queryResult = dbConn.Query<TxOutItem>("select o.* from [Outputs] o left join [MerkleNodes] m on m.[nMerkleNodeID] = o.[nMerkleNodeID] where m.[TransactionHash] = ? and outputFlags = ?", queryParams);
+
+            if (queryResult.Count != 0)
+            {
+                txouts = new Dictionary<COutPoint, TxOutItem>();
+
+                foreach (var o in queryResult)
+                {
+                    var outpointKey = new COutPoint(transactionHash, o.nOut);
+                    var outpointData = o;
+
+                    txouts.Add(outpointKey, outpointData);
+                }
+
+                // There are some unspent inputs.
+                return true;
+            }
+
+            // This transaction has been spent completely.
+            return false;
+        }
+
+        public bool WriteNodes(ref CMerkleNode[] merkleNodes)
+        {
+            
+
+            return true;
+        }
+
         /// <summary>
         /// Get block cursor from map.
         /// </summary>
         /// <param name="blockHash">block hash</param>
         /// <returns>Cursor or null</returns>
-        public CBlockStoreItem GetCursor(uint256 blockHash)
+        public CBlockStoreItem GetMapCursor(uint256 blockHash)
         {
             if (blockHash == 0)
             {
@@ -890,13 +984,19 @@ namespace Novacoin
                 return null;
             }
 
-            // First, check our block map.
-            CBlockStoreItem item = null;
-            if (blockMap.TryGetValue(blockHash, out item))
-            {
-                return item;
-            }
+            CBlockStoreItem cursor = null;
+            blockMap.TryGetValue(blockHash, out cursor);
+
+            return cursor;
+        }
 
+        /// <summary>
+        /// Load cursor from database.
+        /// </summary>
+        /// <param name="blockHash">Block hash</param>
+        /// <returns>Block cursor object</returns>
+        public CBlockStoreItem GetDBCursor(uint256 blockHash)
+        {
             // Trying to get cursor from the database.
             var QueryBlockCursor = dbConn.Query<CBlockStoreItem>("select * from [BlockStorage] where [Hash] = ?", (byte[])blockHash);
 
@@ -909,6 +1009,27 @@ namespace Novacoin
             return null;
         }
 
+        /// <summary>
+        /// Update cursor in memory and on disk.
+        /// </summary>
+        /// <param name="cursor">Block cursor</param>
+        /// <returns>Result</returns>
+        public bool UpdateMapCursor(CBlockStoreItem cursor)
+        {
+            var original = blockMap[cursor.Hash];
+            return blockMap.TryUpdate(cursor.Hash, cursor, original);
+        }
+
+        /// <summary>
+        /// Update cursor record in database.
+        /// </summary>
+        /// <param name="cursor">Block cursor object</param>
+        /// <returns>Result</returns>
+        public bool UpdateDBCursor(ref CBlockStoreItem cursor)
+        {
+            return dbConn.Update(cursor) != 0;
+        }
+
         public bool ProcessBlock(ref CBlock block)
         {
             var blockHash = block.header.Hash;
@@ -935,7 +1056,7 @@ namespace Novacoin
 
             if (block.IsProofOfStake)
             {
-                if (!block.SignatureOK || !block.vtx[1].VerifyScripts())
+                if (!block.SignatureOK)
                 {
                     // Proof-of-Stake signature validation failure.
                     return false;
@@ -1025,8 +1146,6 @@ namespace Novacoin
 
             readerForBlocks.Seek(nOffset, SeekOrigin.Begin); // Seek to previous offset + previous block length
 
-            dbConn.BeginTransaction();
-
             while (readerForBlocks.Read(buffer, 0, 4) == 4) // Read magic number
             {
                 var nMagic = BitConverter.ToUInt32(buffer, 0);
@@ -1068,12 +1187,13 @@ 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();
-                }
+                }*/
             }
 
             dbConn.Commit();