Working on Reorganize implementation.
[NovacoinLibrary.git] / Novacoin / CBlockStore.cs
index 7d24209..a4466ab 100644 (file)
@@ -29,15 +29,14 @@ using SQLite.Net.Platform.Generic;
 using SQLiteNetExtensions.Attributes;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using System.Text;
 
 namespace Novacoin
 {
-    /// <summary>
-    /// Block headers table
-    /// </summary>
     [Table("BlockStorage")]
-    public class CBlockStoreItem
+    public class CBlockStoreItem : IBlockStorageItem
     {
+        #region IBlockStorageItem
         /// <summary>
         /// Item ID in the database
         /// </summary>
@@ -53,77 +52,119 @@ namespace Novacoin
         /// <summary>
         /// Version of block schema
         /// </summary>
+        [Column("nVersion")]
         public uint nVersion { get; set; }
 
         /// <summary>
         /// Previous block hash.
         /// </summary>
+        [Column("prevHash")]
         public byte[] prevHash { get; set; }
 
         /// <summary>
         /// Merkle root hash.
         /// </summary>
+        [Column("merkleRoot")]
         public byte[] merkleRoot { get; set; }
 
         /// <summary>
         /// Block timestamp.
         /// </summary>
+        [Column("nTime")]
         public uint nTime { get; set; }
 
         /// <summary>
         /// Compressed difficulty representation.
         /// </summary>
+        [Column("nBits")]
         public uint nBits { get; set; }
 
         /// <summary>
         /// Nonce counter.
         /// </summary>
+        [Column("nNonce")]
         public uint nNonce { get; set; }
 
         /// <summary>
         /// Next block hash.
         /// </summary>
+        [Column("nextHash")]
         public byte[] nextHash { get; set; }
 
         /// <summary>
         /// Block type flags
         /// </summary>
+        [Column("BlockTypeFlag")]
         public BlockType BlockTypeFlag { get; set; }
 
         /// <summary>
         /// Stake modifier
         /// </summary>
+        [Column("nStakeModifier")]
         public long nStakeModifier { get; set; }
 
         /// <summary>
         /// Proof-of-Stake hash
         /// </summary>
+        [Column("hashProofOfStake")]
         public byte[] hashProofOfStake { get; set; }
 
         /// <summary>
         /// Stake generation outpoint.
         /// </summary>
+        [Column("prevoutStake")]
         public byte[] prevoutStake { get; set; }
 
         /// <summary>
         /// Stake generation time.
         /// </summary>
+        [Column("nStakeTime")]
         public uint nStakeTime { get; set; }
-        
+
         /// <summary>
-        /// Block height
+        /// Block height, encoded in VarInt format
         /// </summary>
+        [Column("nHeight")]
         public uint nHeight { get; set; }
 
         /// <summary>
-        /// Block position in file
+        /// Chain trust score, serialized and trimmed uint256 representation.
+        /// </summary>
+        [Column("ChainTrust")]
+        public byte[] ChainTrust { get; set; }
+
+        /// <summary>
+        /// Block position in file, encoded in VarInt format
+        /// </summary>
+        [Column("BlockPos")]
+        public byte[] BlockPos { get; set; }
+
+        /// <summary>
+        /// Block size in bytes, encoded in VarInt format
+        /// </summary>
+        [Column("BlockSize")]
+        public byte[] BlockSize { get; set; }
+        #endregion
+
+        /// <summary>
+        /// Accessor and mutator for BlockPos value.
         /// </summary>
-        public long nBlockPos { get; set; }
+        [Ignore]
+        public long nBlockPos
+        {
+            get { return (long)VarInt.DecodeVarInt(BlockPos); }
+            set { BlockPos = VarInt.EncodeVarInt(value); }
+        }
 
         /// <summary>
-        /// Block size in bytes
+        /// Accessor and mutator for BlockSize value.
         /// </summary>
-        public int nBlockSize { get; set; }
+        [Ignore]
+        public int nBlockSize
+        {
+            get { return (int)VarInt.DecodeVarInt(BlockSize); }
+            set { BlockSize = VarInt.EncodeVarInt(value); }
+        }
 
         /// <summary>
         /// Fill database item with data from given block header.
@@ -132,8 +173,9 @@ namespace Novacoin
         /// <returns>Header hash</returns>
         public uint256 FillHeader(CBlockHeader header)
         {
-            uint256 _hash;
-            Hash = _hash = header.Hash;
+            uint256 _hash = header.Hash;
+
+            Hash = _hash;
 
             nVersion = header.nVersion;
             prevHash = header.prevHash;
@@ -257,7 +299,15 @@ namespace Novacoin
         [Ignore]
         public CBlockStoreItem next
         {
-            get { return CBlockStore.Instance.GetCursor(nextHash); }
+            get
+            {
+                if (nextHash == null)
+                {
+                    return null;
+                }
+
+                return CBlockStore.Instance.GetCursor(nextHash);
+            }
             set
             {
                 CBlockStoreItem newCursor = this;
@@ -454,7 +504,11 @@ namespace Novacoin
         /// <summary>
         /// Chain trust score
         /// </summary>
-        public uint256 nChainTrust;
+        [Ignore]
+        public uint256 nChainTrust {
+            get { return Interop.AppendWithZeros(ChainTrust); }
+            set { ChainTrust = Interop.TrimArray(value); }
+        }
     }
 
     /// <summary>
@@ -470,7 +524,7 @@ namespace Novacoin
     /// <summary>
     /// Transaction type.
     /// </summary>
-    public enum TxType
+    public enum TxFlags : byte
     {
         TX_COINBASE,
         TX_COINSTAKE,
@@ -478,20 +532,21 @@ namespace Novacoin
     }
 
     /// <summary>
-    /// Transaction type.
+    /// Output flags.
     /// </summary>
-    public enum OutputType
+    public enum OutputFlags : byte
     {
-        TX_USER      = (1 << 0), // User output
-        TX_COINBASE  = (1 << 1), // Coinbase output
-        TX_COINSTAKE = (1 << 2), // Coinstake output
-        TX_AVAILABLE = (2 << 0), // Unspent output
-        TX_SPENT     = (2 << 1)  // Spent output
+        AVAILABLE, // Unspent output
+        SPENT      // Spent output
     }
 
     [Table("MerkleNodes")]
-    public class MerkleNode
+    public class CMerkleNode : IMerkleNode
     {
+        #region IMerkleNode
+        /// <summary>
+        /// Node identifier
+        /// </summary>
         [PrimaryKey, AutoIncrement]
         public long nMerkleNodeID { get; set; }
 
@@ -502,214 +557,139 @@ namespace Novacoin
         public long nParentBlockID { get; set; }
 
         /// <summary>
-        /// Transaction hash
-        /// </summary>
-        public byte[] TransactionHash { get; set; }
-
-        public static bool QueryParentBlockCursor(uint256 transactionHash, out CBlockStoreItem cursor)
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-    [Table("Outputs")]
-    public class TxOutItem
-    {
-        /// <summary>
-        /// Link the transaction hash with database item identifier.
-        /// </summary>
-        private static ConcurrentDictionary<uint256, long> outMap = new ConcurrentDictionary<uint256, long>();
-
-        /// <summary>
-        /// Reference to transaction item.
-        /// </summary>
-        [ForeignKey(typeof(MerkleNode), Name = "nMerkleNodeID")]
-        public long nMerkleNodeID { get; set; }
-
-        /// <summary>
-        /// Output flags
+        /// Transaction type flag
         /// </summary>
-        public OutputType outputFlags { get; set; }
+        [Column("TransactionFlags")]
+        public TxFlags TransactionFlags { get; set; }
 
         /// <summary>
-        /// Output number in VarInt format.
+        /// Transaction hash
         /// </summary>
-        public byte[] OutputNumber { get; set; }
+        [Column("TransactionHash")]
+        public byte[] TransactionHash { get; set; }
 
         /// <summary>
-        /// Output value in VarInt format.
+        /// Transaction offset from the beginning of block header, encoded in VarInt format.
         /// </summary>
-        public byte[] OutputValue { get; set; }
+        [Column("TxOffset")]
+        public byte[] TxOffset { get; set; }
 
         /// <summary>
-        /// Second half of script which contains spending instructions.
+        /// Transaction size, encoded in VarInt format.
         /// </summary>
-        public byte[] scriptPubKey { get; set; }
+        [Column("TxSize")]
+        public byte[] TxSize { get; set; }
+        #endregion
 
         /// <summary>
-        /// Construct new item from provided transaction data.
+        /// Read transaction from file.
         /// </summary>
-        /// <param name="o"></param>
-        public TxOutItem(CTransaction tx, uint nOut)
+        /// <param name="reader">Stream with read access.</param>
+        /// <param name="tx">CTransaction reference.</param>
+        /// <returns>Result</returns>
+        public bool ReadFromFile(ref Stream reader, long nBlockPos, out CTransaction tx)
         {
-            Contract.Requires<ArgumentException>(nOut < tx.vout.Length);
+            var buffer = new byte[CTransaction.nMaxTxSize];
+
+            tx = null;
 
-            long nMerkleId = 0;
-            if (!outMap.TryGetValue(tx.Hash, out nMerkleId))
+            try
             {
-                // Not in the blockchain
-                nMerkleNodeID = -1;
-            }
+                reader.Seek(nBlockPos + nTxOffset, SeekOrigin.Begin); // Seek to transaction offset
 
-            OutputNumber = VarInt.EncodeVarInt(nOut);
-            OutputValue = VarInt.EncodeVarInt(tx.vout[nOut].nValue);
-            scriptPubKey = tx.vout[nOut].scriptPubKey;
+                if (nTxSize != reader.Read(buffer, 0, nTxSize))
+                {
+                    return false;
+                }
 
-            if (tx.IsCoinBase)
+                tx = new CTransaction(buffer);
+
+                return true;
+            }
+            catch (IOException)
             {
-                outputFlags |= OutputType.TX_COINBASE;
+                // I/O error
+                return false;
             }
-            else if (tx.IsCoinStake)
+            catch (TransactionConstructorException)
             {
-                outputFlags |= OutputType.TX_COINSTAKE;
+                // Constructor error
+                return false;
             }
         }
 
         /// <summary>
-        /// Getter for output number.
-        /// </summary>
-        [Ignore]
-        public uint nOut
-        {
-            get { return (uint)VarInt.DecodeVarInt(OutputNumber); }
-        }
-
-        /// <summary>
-        /// Getter for output value.
-        /// </summary>
-        [Ignore]
-        public ulong nValue
-        {
-            get { return VarInt.DecodeVarInt(OutputValue); }
-        }
-
-        /// <summary>
-        /// Is this a user transaction output?
+        /// Transaction offset accessor
         /// </summary>
         [Ignore]
-        public bool IsUser
+        public long nTxOffset
         {
-            get { return (outputFlags & OutputType.TX_USER) != 0; }
+            get { return (long) VarInt.DecodeVarInt(TxOffset); }
         }
 
         /// <summary>
-        /// Is this a coinbase transaction output?
+        /// Transaction size accessor
         /// </summary>
         [Ignore]
-        public bool IsCoinBase
+        public int nTxSize
         {
-            get { return (outputFlags & OutputType.TX_COINBASE) != 0;  }
+            get { return (int)VarInt.DecodeVarInt(TxSize); }
         }
 
-        /// <summary>
-        /// Is this a coinstake transaction output?
-        /// </summary>
-        [Ignore]
-        public bool IsCoinStake
-        {
-            get { return (outputFlags & OutputType.TX_COINSTAKE) != 0; }
-        }
-
-        /// <summary>
-        /// Getter ans setter for IsSpent flag.
-        /// </summary>
-        [Ignore]
-        public bool IsSpent
-        {
-            get { return (outputFlags & OutputType.TX_SPENT) != 0; }
-            set { outputFlags |= value ? OutputType.TX_SPENT : OutputType.TX_AVAILABLE; }
-        }
     }
 
-
-    [Table("TransactionStorage")]
-    public class CTransactionStoreItem
+    [Table("Outputs")]
+    public class TxOutItem : ITxOutItem
     {
         /// <summary>
-        /// Transaction hash
+        /// Reference to transaction item.
         /// </summary>
-        [PrimaryKey]
-        public byte[] TransactionHash { get; set; }
+        [ForeignKey(typeof(CMerkleNode), Name = "nMerkleNodeID")]
+        public long nMerkleNodeID { get; set; }
 
         /// <summary>
-        /// Block hash
+        /// Output flags
         /// </summary>
-        [ForeignKey(typeof(CBlockStoreItem), Name = "Hash")]
-        public byte[] BlockHash { get; set; }
+        public OutputFlags outputFlags { get; set; }
 
         /// <summary>
-        /// Transaction type flag
+        /// Output number in VarInt format.
         /// </summary>
-        public TxType txType { get; set; }
+        public byte[] OutputNumber { get; set; }
 
         /// <summary>
-        /// Tx position in file
+        /// Output value in VarInt format.
         /// </summary>
-        public long nTxPos { get; set; }
+        public byte[] OutputValue { get; set; }
 
         /// <summary>
-        /// Transaction size
+        /// Second half of script which contains spending instructions.
         /// </summary>
-        public int nTxSize { get; set; }
+        public byte[] scriptPubKey { get; set; }
 
         /// <summary>
-        /// Serialized output array
+        /// Getter for output number.
         /// </summary>
-        public byte[] vOut { get; set; }
+        public uint nOut
+        {
+            get { return (uint)VarInt.DecodeVarInt(OutputNumber); }
+        }
 
         /// <summary>
-        /// Read transaction from file.
+        /// Getter for output value.
         /// </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)
+        public ulong nValue
         {
-            var buffer = new byte[CTransaction.nMaxTxSize];
-            tx = null;
-
-            try
-            {
-                reader.Seek(nTxPos, 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;
-            }
+            get { return VarInt.DecodeVarInt(OutputValue); }
         }
 
         /// <summary>
-        /// Outputs array access
+        /// Getter ans setter for IsSpent flag.
         /// </summary>
-        [Ignore]
-        public CTxOut[] Outputs {
-            get { return CTxOut.DeserializeOutputsArray(vOut); }
-            set { vOut = CTxOut.SerializeOutputsArray(value); }
+        public bool IsSpent
+        {
+            get { return (outputFlags & OutputFlags.SPENT) != 0; }
+            set { outputFlags |= value ? OutputFlags.SPENT : OutputFlags.AVAILABLE; }
         }
     }
 
@@ -726,6 +706,11 @@ namespace Novacoin
         private SQLiteConnection dbConn;
 
         /// <summary>
+        /// Current SQLite platform
+        /// </summary>
+        private ISQLitePlatform dbPlatform;
+
+        /// <summary>
         /// Block file.
         /// </summary>
         private string strBlockFile;
@@ -737,6 +722,8 @@ namespace Novacoin
 
         /// <summary>
         /// Map of block tree nodes.
+        /// 
+        /// blockHash => CBlockStoreItem
         /// </summary>
         private ConcurrentDictionary<uint256, CBlockStoreItem> blockMap = new ConcurrentDictionary<uint256, CBlockStoreItem>();
 
@@ -747,10 +734,12 @@ namespace Novacoin
         private ConcurrentDictionary<uint256, CBlock> orphanMapByPrev = new ConcurrentDictionary<uint256, CBlock>();
 
         /// <summary>
-        /// Map of unspent items.
+        /// Unconfirmed transactions.
+        /// 
+        /// TxID => Transaction
         /// </summary>
-        private ConcurrentDictionary<uint256, CTransactionStoreItem> txMap = new ConcurrentDictionary<uint256, CTransactionStoreItem>();
-        
+        private ConcurrentDictionary<uint256, CTransaction> mapUnconfirmedTx = new ConcurrentDictionary<uint256, CTransaction>();
+
         /// <summary>
         /// Map of the proof-of-stake hashes. This is necessary for stake duplication checks.
         /// </summary>
@@ -761,11 +750,6 @@ namespace Novacoin
         private ConcurrentDictionary<COutPoint, uint> mapStakeSeenOrphan = new ConcurrentDictionary<COutPoint, uint>();
 
         /// <summary>
-        /// Unconfirmed transactions.
-        /// </summary>
-        private ConcurrentDictionary<uint256, CTransaction> mapUnconfirmedTx = new ConcurrentDictionary<uint256, CTransaction>();
-
-        /// <summary>
         /// Trust score for the longest chain.
         /// </summary>
         private uint256 nBestChainTrust = 0;
@@ -794,6 +778,9 @@ namespace Novacoin
         /// Block file stream with read/write access
         /// </summary>
         private Stream fStreamReadWrite;
+        private uint nBestHeight;
+        private uint nTimeBestReceived;
+        private int nTransactionsUpdated;
 
         /// <summary>
         /// Init the block storage manager.
@@ -806,7 +793,8 @@ namespace Novacoin
             strBlockFile = BlockFile;
 
             bool firstInit = !File.Exists(strDbFile);
-            dbConn = new SQLiteConnection(new SQLitePlatformGeneric(), strDbFile);
+            dbPlatform = new SQLitePlatformGeneric();
+            dbConn = new SQLiteConnection(dbPlatform, strDbFile);
 
             fStreamReadWrite = File.Open(strBlockFile, FileMode.OpenOrCreate, FileAccess.ReadWrite);
 
@@ -818,7 +806,8 @@ namespace Novacoin
                 {
                     // Create tables
                     dbConn.CreateTable<CBlockStoreItem>(CreateFlags.AutoIncPK);
-                    dbConn.CreateTable<CTransactionStoreItem>(CreateFlags.ImplicitPK);
+                    dbConn.CreateTable<CMerkleNode>(CreateFlags.AutoIncPK);
+                    dbConn.CreateTable<TxOutItem>(CreateFlags.ImplicitPK);
 
                     var genesisBlock = new CBlock(
                         Interop.HexToArray(
@@ -876,14 +865,15 @@ namespace Novacoin
             }
         }
 
-        public bool GetTransaction(uint256 TxID, ref CTransaction tx)
+        public bool GetTxOutCursor(COutPoint outpoint, ref TxOutItem txOutCursor)
         {
-            var reader = new BinaryReader(fStreamReadWrite).BaseStream;
-            var QueryTx = dbConn.Query<CTransactionStoreItem>("select * from [TransactionStorage] where [TransactionHash] = ?", (byte[])TxID);
+            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);
 
-            if (QueryTx.Count == 1)
+            if (queryResults.Count == 1)
             {
-                return QueryTx[0].ReadFromFile(ref reader, out tx);
+                txOutCursor = queryResults[0];
+
+                return true;
             }
 
             // Tx not found
@@ -891,6 +881,101 @@ namespace Novacoin
             return false;
         }
 
+        interface InputsJoin : ITxOutItem
+        {
+            byte[] TransactionHash { get; set; }
+        }
+
+        public bool FetchInputs(ref CTransaction tx, ref Dictionary<COutPoint, CTxOut> queued, ref Dictionary<COutPoint, CTxOut> inputs, bool IsBlock, out bool Invalid)
+        {
+            Invalid = false;
+
+            if (tx.IsCoinBase)
+            {
+                // Coinbase transactions have no inputs to fetch.
+                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), 
+                    Interop.ToHex(VarInt.EncodeVarInt(tx.vin[i].prevout.n)
+                ));
+            }
+
+            var queryResults = dbConn.Query<InputsJoin>(queryBuilder.ToString());
+
+            foreach (var item in queryResults)
+            {
+                if (item.IsSpent)
+                {
+                    return false; // Already spent
+                }
+
+                var inputsKey =  new COutPoint(item.TransactionHash, item.nOut);
+
+                // Add output data to dictionary
+                inputs[inputsKey] = new CTxOut(item.nValue, item.scriptPubKey);
+            }
+
+            if (queryResults.Count < tx.vin.Length)
+            {
+                if (IsBlock)
+                {
+                    // It seems that some transactions are being spent in the same block.
+
+                    foreach (var txin in tx.vin)
+                    {
+                        var outPoint = txin.prevout;
+
+                        if (!queued.ContainsKey(outPoint))
+                        {
+                            return false; // No such transaction
+                        }
+
+                        // Add output data to dictionary
+                        inputs[outPoint] = queued[outPoint];
+
+                        // And remove it from queued data
+                        queued.Remove(outPoint);
+                    }
+                }
+                else
+                {
+                    // Unconfirmed transaction
+
+                    foreach (var txin in tx.vin)
+                    {
+                        var outPoint = txin.prevout;
+                        CTransaction txPrev;
+
+                        if (!mapUnconfirmedTx.TryGetValue(outPoint.hash, out txPrev))
+                        {
+                            return false; // No such transaction
+                        }
+
+                        if (outPoint.n > txPrev.vout.Length)
+                        {
+                            Invalid = true;
+
+                            return false; // nOut is out of range
+                        }
+
+                        inputs[outPoint] = txPrev.vout[outPoint.n];
+                    }
+
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
         private bool AddItemToIndex(ref CBlockStoreItem itemTemplate, ref CBlock block)
         {
             var writer = new BinaryWriter(fStreamReadWrite).BaseStream;
@@ -948,57 +1033,27 @@ namespace Novacoin
                 return false;
             }
 
-            if (dbConn.Insert(itemTemplate) == 0 || !blockMap.TryAdd(blockHash, itemTemplate))
+            if (dbConn.Insert(itemTemplate) == 0)
             {
-                return false;
+                return false; // Insert failed
+            }
+
+            // Get last RowID.
+            itemTemplate.ItemID = dbPlatform.SQLiteApi.LastInsertRowid(dbConn.Handle);
+            
+            if (!blockMap.TryAdd(blockHash, itemTemplate))
+            {
+                return false; // blockMap add failed
             }
 
             if (itemTemplate.nChainTrust > nBestChainTrust)
             {
                 // New best chain
 
-                // TODO: SetBestChain implementation
-
-                /*
                 if (!SetBestChain(ref itemTemplate))
                 {
                     return false; // SetBestChain failed.
                 }
-                */
-            }
-
-            // We have no SetBestChain and ConnectBlock/Disconnect block yet, so adding these transactions manually.
-            for (int i = 0; i < block.vtx.Length; i++)
-            {
-                // Handle trasactions using our temporary stub algo
-
-                if (!block.vtx[i].VerifyScripts())
-                {
-                    return false;
-                }
-
-                var nTxOffset = itemTemplate.nBlockPos + block.GetTxOffset(i);
-                TxType txnType = TxType.TX_USER;
-
-                if (block.vtx[i].IsCoinBase)
-                {
-                    txnType = TxType.TX_COINBASE;
-                }
-                else if (block.vtx[i].IsCoinStake)
-                {
-                    txnType = TxType.TX_COINSTAKE;
-                }
-
-                var NewTxItem = new CTransactionStoreItem()
-                {
-                    TransactionHash = block.vtx[i].Hash,
-                    BlockHash = blockHash,
-                    nTxPos = nTxOffset,
-                    nTxSize = block.vtx[i].Size,
-                    txType = txnType
-                };
-
-                dbConn.Insert(NewTxItem);
             }
 
             return true;
@@ -1006,8 +1061,6 @@ namespace Novacoin
 
         private bool SetBestChain(ref CBlockStoreItem cursor)
         {
-            dbConn.BeginTransaction();
-
             uint256 hashBlock = cursor.Hash;
 
             if (genesisBlockCursor == null && hashBlock == NetUtils.nHashGenesisBlock)
@@ -1024,10 +1077,10 @@ namespace Novacoin
             else
             {
                 // the first block in the new chain that will cause it to become the new best chain
-                CBlockStoreItem cursorIntermediate = cursor;
+                var cursorIntermediate = cursor;
 
                 // list of blocks that need to be connected afterwards
-                List<CBlockStoreItem> secondary = new List<CBlockStoreItem>();
+                var secondary = new List<CBlockStoreItem>();
 
                 // 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
@@ -1040,16 +1093,36 @@ namespace Novacoin
                 // Switch to new best branch
                 if (!Reorganize(cursorIntermediate))
                 {
-                    dbConn.Rollback();
                     InvalidChainFound(cursor);
                     return false; // reorganize failed
                 }
 
+                // Connect further blocks
+                foreach (var currentCursor in secondary)
+                {
+                    CBlock block;
+                    if (!currentCursor.ReadFromFile(ref fStreamReadWrite, out block))
+                    {
+                        // ReadFromDisk failed
+                        break;
+                    }
 
+                    // errors now are not fatal, we still did a reorganisation to a new chain in a valid way
+                    if (!SetBestChainInner(currentCursor))
+                    {
+                        break;
+                    }
+                }
             }
 
+            nHashBestChain = cursor.Hash;
+            bestBlockCursor = cursor;
+            nBestHeight = cursor.nHeight;
+            nBestChainTrust = cursor.nChainTrust;
+            nTimeBestReceived = Interop.GetTime();
+            nTransactionsUpdated++;
 
-            throw new NotImplementedException();
+            return true;
         }
 
         private void InvalidChainFound(CBlockStoreItem cursor)
@@ -1059,6 +1132,120 @@ namespace Novacoin
 
         private bool Reorganize(CBlockStoreItem cursorIntermediate)
         {
+            // Find the fork
+            var fork = bestBlockCursor;
+            var longer = cursorIntermediate;
+
+            while (fork.ItemID != longer.ItemID)
+            {
+                while (longer.nHeight > fork.nHeight)
+                {
+                    if ((longer = longer.prev) == null)
+                    {
+                        return false; // longer.prev is null
+                    }
+                }
+
+                if (fork.ItemID == longer.ItemID)
+                {
+                    break;
+                }
+
+                if ((fork = fork.prev) == null)
+                {
+                    return false; // fork.prev is null
+                }
+            }
+
+            // List of what to disconnect
+            var disconnect = new List<CBlockStoreItem>();
+            for (var cursor = bestBlockCursor; cursor.ItemID != fork.ItemID; cursor = cursor.prev)
+            {
+                disconnect.Add(cursor);
+            }
+
+            // 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)
+                    {
+                        txResurrect.Add(tx);
+                    }
+                }
+            }
+
+
+            // Connect longer branch
+            var txDelete = new List<CTransaction>();
+            foreach (var cursor in connect)
+            {
+                CBlock block;
+                if (!cursor.ReadFromFile(ref fStreamReadWrite, out block))
+                {
+                    return false; // ReadFromDisk for connect failed
+                }
+
+                if (!ConnectBlock(cursor, ref block))
+                {
+                    // Invalid block
+                    return false; // ConnectBlock failed
+                }
+
+                // Queue memory transactions to delete
+                foreach (var tx in block.vtx)
+                {
+                    txDelete.Add(tx);
+                }
+            }
+
+            if (!WriteHashBestChain(cursorIntermediate.Hash))
+            {
+                return false; // WriteHashBestChain 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)
+            {
+                mapUnconfirmedTx.TryAdd(tx.Hash, tx);
+            }
+
+            // Delete redundant memory transactions that are in the connected branch
+            foreach (var tx in txDelete)
+            {
+                CTransaction dummy;
+                mapUnconfirmedTx.TryRemove(tx.Hash, out dummy);
+            }
+
+            return true; // Done
+        }
+
+        private bool DisconnectBlock(CBlockStoreItem blockCursor, ref CBlock block)
+        {
             throw new NotImplementedException();
         }
 
@@ -1066,11 +1253,14 @@ namespace Novacoin
         {
             uint256 hash = cursor.Hash;
             CBlock block;
+            if (!cursor.ReadFromFile(ref fStreamReadWrite, out block))
+            {
+                return false; // Unable to read block from file.
+            }
 
             // Adding to current best branch
-            if (!ConnectBlock(cursor, false, out block) || !WriteHashBestChain(hash))
+            if (!ConnectBlock(cursor, ref block) || !WriteHashBestChain(hash))
             {
-                dbConn.Rollback();
                 InvalidChainFound(cursor);
                 return false;
             }
@@ -1090,14 +1280,8 @@ namespace Novacoin
             return true;
         }
 
-        private bool ConnectBlock(CBlockStoreItem cursor, bool fJustCheck, out CBlock block)
+        private bool ConnectBlock(CBlockStoreItem cursor, ref CBlock block, bool fJustCheck=false)
         {
-            var reader = new BinaryReader(fStreamReadWrite).BaseStream;
-            if (cursor.ReadFromFile(ref reader, out block))
-            {
-                return false; // Unable to read block from file.
-            }
-
             // Check it again in case a previous version let a bad block in, but skip BlockSig checking
             if (!block.CheckBlock(!fJustCheck, !fJustCheck, false))
             {
@@ -1198,14 +1382,40 @@ namespace Novacoin
             return false;
         }
 
+
+        /// <summary>
+        /// Interface for join
+        /// </summary>
+        interface IBlockJoinMerkle : IBlockStorageItem, IMerkleNode
+        {
+        }
+
+        /// <summary>
+        /// Get block and transaction by transaction hash.
+        /// </summary>
+        /// <param name="TxID">Transaction hash</param>
+        /// <param name="block">Block reference</param>
+        /// <param name="tx">Transaction reference</param>
+        /// <param name="nBlockPos">Block position reference</param>
+        /// <param name="nTxPos">Transaction position reference</param>
+        /// <returns>Result of operation</returns>
         public bool GetBlockByTransactionID(uint256 TxID, ref CBlock block, ref CTransaction tx, ref long nBlockPos, ref long nTxPos)
         {
-            var QueryTx = dbConn.Query<CTransactionStoreItem>("select * from [TransactionStorage] where [TransactionHash] = ?", (byte[])TxID);
+            var queryResult = dbConn.Query<IBlockJoinMerkle>("select *,  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 = (CBlockStoreItem) queryResult[0];
+                CMerkleNode txCursor = (CMerkleNode)queryResult[0];
+
+                var reader = new BinaryReader(fStreamReadWrite).BaseStream;
+
+                if (!txCursor.ReadFromFile(ref reader, blockCursor.nBlockPos, out tx))
+                {
+                    return false; // Unable to read transaction
+                }
+
+                return blockCursor.ReadFromFile(ref reader, out block);
             }
 
             // Tx not found
@@ -1379,8 +1589,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);
@@ -1422,12 +1630,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();