X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=Novacoin%2FCBlockStore.cs;h=f0c830f66d32c86d3b3b3df8161ba504d17a3818;hb=2dd4edf513fe24ff6a6c2ff260598c2f72a5756f;hp=97ce54eef0f57dfc8f0a39fd65059185a189639d;hpb=183708642533185adadd50c36470927d8dd4b914;p=NovacoinLibrary.git diff --git a/Novacoin/CBlockStore.cs b/Novacoin/CBlockStore.cs index 97ce54e..f0c830f 100644 --- a/Novacoin/CBlockStore.cs +++ b/Novacoin/CBlockStore.cs @@ -208,6 +208,9 @@ namespace Novacoin // Load data about the top node. ChainParams = dbConn.Table().First(); + + genesisBlockCursor = dbConn.Query("select * from [BlockStorage] where [Hash] = ?", (byte[])NetInfo.nHashGenesisBlock).First(); + bestBlockCursor = dbConn.Query("select * from [BlockStorage] where [Hash] = ?", ChainParams.HashBestChain).First(); } } @@ -260,10 +263,8 @@ namespace Novacoin var inputsKey = new COutPoint(item.TransactionHash, item.nOut); - item.IsSpent = true; - // Add output data to dictionary - inputs.Add(inputsKey, (TxOutItem)item); + inputs.Add(inputsKey, item.getTxOutItem()); } if (queryResults.Count < tx.vin.Length) @@ -276,6 +277,11 @@ namespace Novacoin { var outPoint = txin.prevout; + if (inputs.ContainsKey(outPoint)) + { + continue; // We have already seen this input. + } + if (!queued.ContainsKey(outPoint)) { return false; // No such transaction @@ -285,7 +291,7 @@ namespace Novacoin inputs.Add(outPoint, queued[outPoint]); // Mark output as spent - queued[outPoint].IsSpent = true; + // queued[outPoint].IsSpent = true; } } else @@ -373,6 +379,7 @@ namespace Novacoin itemTemplate.prevoutStake = block.vtx[1].vin[0].prevout; itemTemplate.nStakeTime = block.vtx[1].nTime; + itemTemplate.hashProofOfStake = mapProofOfStake[blockHash]; } if (!itemTemplate.WriteToFile(ref fStreamReadWrite, ref block)) @@ -469,6 +476,11 @@ namespace Novacoin nTimeBestReceived = Interop.GetTime(); nTransactionsUpdated++; + if (!UpdateTopChain(cursor)) + { + return false; // unable to set top chain node. + } + return true; } @@ -610,7 +622,13 @@ namespace Novacoin } // Add to current best branch - cursor.prev.next = cursor; + var prevCursor = cursor.prev; + prevCursor.next = cursor; + + if (!UpdateDBCursor(ref prevCursor)) + { + return false; // unable to update + } // Delete redundant memory transactions foreach (var tx in block.vtx) @@ -639,13 +657,20 @@ namespace Novacoin uint nSigOps = 0; var queuedMerkleNodes = new Dictionary(); - var queued = new Dictionary(); + var queuedOutputs = new Dictionary(); for (var nTx = 0; nTx < block.vtx.Length; nTx++) { var tx = block.vtx[nTx]; var hashTx = tx.Hash; - var nTxPos = cursor.nBlockPos + block.GetTxOffset(nTx); + + if (!queuedMerkleNodes.ContainsKey(hashTx)) + { + var nTxPos = cursor.nBlockPos + block.GetTxOffset(nTx); + var mNode = new CMerkleNode(cursor.ItemID, nTxPos, tx); + + queuedMerkleNodes.Add(hashTx, mNode); + } Dictionary txouts; if (GetOutputs(hashTx, out txouts)) @@ -670,7 +695,7 @@ namespace Novacoin else { bool Invalid; - if (!FetchInputs(tx, ref queued, ref inputs, true, out Invalid)) + if (!FetchInputs(tx, ref queuedOutputs, ref inputs, true, out Invalid)) { return false; // Unable to fetch some inputs. } @@ -695,7 +720,7 @@ namespace Novacoin nFees += nTxValueIn - nTxValueOut; } - if (!ConnectInputs(tx, ref inputs, ref queued, ref cursor, true, fScriptChecks, scriptFlags)) + if (!ConnectInputs(tx, ref inputs, ref queuedOutputs, ref cursor, true, fScriptChecks, scriptFlags)) { return false; } @@ -703,20 +728,17 @@ namespace Novacoin for (var i = 0u; i < tx.vout.Length; i++) { - var mNode = new CMerkleNode(cursor.ItemID, nTxPos, tx); - queuedMerkleNodes.Add(hashTx, mNode); - var outKey = new COutPoint(hashTx, i); - var outData = new TxOutItem(); - - outData.nValue = tx.vout[i].nValue; - outData.scriptPubKey = tx.vout[i].scriptPubKey; - outData.nOut = i; - - - outData.IsSpent = false; + var outData = new TxOutItem() + { + nMerkleNodeID = -1, + nValue = tx.vout[i].nValue, + scriptPubKey = tx.vout[i].scriptPubKey, + IsSpent = false, + nOut = i + }; - queued.Add(outKey, outData); + queuedOutputs.Add(outKey, outData); } } @@ -744,51 +766,75 @@ namespace Novacoin return true; } + // Flush merkle nodes. + var savedMerkleNodes = new Dictionary(); + foreach (var merklePair in queuedMerkleNodes) + { + var merkleNode = merklePair.Value; + + if (!SaveMerkleNode(ref merkleNode)) + { + // Unable to save merkle tree cursor. + return false; + } + + savedMerkleNodes.Add(merklePair.Key, merkleNode); + } + // Write queued transaction changes - var actualMerkleNodes = new Dictionary(); - var queuedOutpointItems = new List(); - foreach (KeyValuePair outPair in queued) + var newOutpointItems = new List(); + var updatedOutpointItems = new List(); + foreach (var outPair in queuedOutputs) { - uint256 txID = outPair.Key.hash; - CMerkleNode merkleNode; + var outItem = outPair.Value; - if (actualMerkleNodes.ContainsKey(txID)) + if (outItem.nMerkleNodeID == -1) { - merkleNode = actualMerkleNodes[txID]; + // This outpoint doesn't exist yet, adding to insert list. + + outItem.nMerkleNodeID = savedMerkleNodes[outPair.Key.hash].nMerkleNodeID; + newOutpointItems.Add(outItem); } else { - merkleNode = queuedMerkleNodes[txID]; - if (!SaveMerkleNode(ref merkleNode)) - { - // Unable to save merkle tree cursor. - return false; - } - actualMerkleNodes.Add(txID, merkleNode); - } + // This outpount already exists, adding to update list. - var outItem = outPair.Value; - outItem.nMerkleNodeID = merkleNode.nMerkleNodeID; + updatedOutpointItems.Add(outItem); + } + } - queuedOutpointItems.Add(outItem); + if (updatedOutpointItems.Count != 0 && !UpdateOutpoints(ref updatedOutpointItems)) + { + return false; // Unable to update outpoints } - if (!SaveOutpoints(ref queuedOutpointItems)) + if (newOutpointItems.Count != 0 && !InsertOutpoints(ref newOutpointItems)) { - return false; // Unable to save outpoints + return false; // Unable to insert outpoints } return true; } /// - /// Insert set of outpoints + /// Insert set of new outpoints + /// + /// List of TxOutItem objects. + /// Result + private bool InsertOutpoints(ref List newOutpointItems) + { + return (dbConn.InsertAll(newOutpointItems, false) != 0); + } + + + /// + /// Update set of outpoints /// /// List of TxOutItem objects. /// Result - private bool SaveOutpoints(ref List queuedOutpointItems) + private bool UpdateOutpoints(ref List updatedOutpointItems) { - return dbConn.InsertAll(queuedOutpointItems, false) != 0; + return (dbConn.UpdateAll(updatedOutpointItems, false) != 0); } /// @@ -810,10 +856,8 @@ namespace Novacoin private bool ConnectInputs(CTransaction tx, ref Dictionary inputs, ref Dictionary queued, ref CBlockStoreItem cursorBlock, bool fBlock, bool fScriptChecks, scriptflag scriptFlags) { - // Take over previous transactions' spent pointers + // Take over previous transactions' spent items // fBlock is true when this is called from AcceptBlock when a new best-block is added to the blockchain - // fMiner is true when called from the internal bitcoin miner - // ... both are false when called from CTransaction::AcceptToMemoryPool if (!tx.IsCoinBase) { @@ -826,26 +870,44 @@ namespace Novacoin var input = inputs[prevout]; CBlockStoreItem parentBlockCursor; - var merkleItem = GetMerkleCursor(input, out parentBlockCursor); - if (merkleItem == null) + if (input.nMerkleNodeID == -1) { - return false; // Unable to find merkle node - } + // This input seems as is confirmed by the same block. - // If prev is coinbase or coinstake, check that it's matured - if (merkleItem.IsCoinBase || merkleItem.IsCoinStake) - { - if (cursorBlock.nHeight - parentBlockCursor.nHeight < NetInfo.nGeneratedMaturity) + if (!queued.ContainsKey(prevout)) { - return false; // tried to spend non-matured generation input. + return false; // No such output has been queued by this block. } - } - // check transaction timestamp - if (merkleItem.nTime > tx.nTime) + // TODO: Ensure that neither coinbase nor coinstake outputs are + // available for spending in the generation block. + } + else { - return false; // transaction timestamp earlier than input transaction + // This input has been confirmed by one of the earlier accepted blocks. + + var merkleItem = GetMerkleCursor(input, out parentBlockCursor); + + if (merkleItem == null) + { + return false; // Unable to find merkle node + } + + // If prev is coinbase or coinstake, check that it's matured + if (merkleItem.IsCoinBase || merkleItem.IsCoinStake) + { + if (cursorBlock.nHeight - parentBlockCursor.nHeight < NetInfo.nGeneratedMaturity) + { + return false; // tried to spend non-matured generation input. + } + } + + // check transaction timestamp + if (merkleItem.nTime > tx.nTime) + { + return false; // transaction timestamp earlier than input transaction + } } // Check for negative or overflow input values @@ -891,7 +953,16 @@ namespace Novacoin // Write back if (fBlock) { - queued.Add(prevout, input); + if (input.nMerkleNodeID != -1) + { + // Input has been confirmed earlier. + queued.Add(prevout, input); + } + else + { + // Input has been confirmed by current block. + queued[prevout] = input; + } } } @@ -904,10 +975,9 @@ namespace Novacoin return false; // unable to get coin age for coinstake } - int nTxSize = (tx.nTime > NetInfo.nStakeValidationSwitchTime) ? tx.Size : 0; ulong nReward = tx.nValueOut - nValueIn; - ulong nCalculatedReward = CBlock.GetProofOfStakeReward(nCoinAge, cursorBlock.nBits, tx.nTime) - CTransaction.GetMinFee(1, false, CTransaction.MinFeeMode.GMF_BLOCK, nTxSize) + CTransaction.nCent; + ulong nCalculatedReward = CBlock.GetProofOfStakeReward(nCoinAge, cursorBlock.nBits, tx.nTime) - tx.GetMinFee(1, false, CTransaction.MinFeeMode.GMF_BLOCK) + CTransaction.nCent; if (nReward > nCalculatedReward) { @@ -1053,14 +1123,19 @@ namespace Novacoin /// Block reference /// Block position reference /// Result of operation - public bool GetBlockByTransactionID(uint256 TxID, ref CBlock block, ref long nBlockPos) + public bool GetBlockByTransactionID(uint256 TxID, out CBlock block, out long nBlockPos) { + block = null; + nBlockPos = -1; + var queryResult = dbConn.Query("select b.* from [BlockStorage] b left join [MerkleNodes] m on (b.[ItemID] = m.[nParentBlockID]) where m.[TransactionHash] = ?", (byte[])TxID); if (queryResult.Count == 1) { CBlockStoreItem blockCursor = queryResult[0]; + nBlockPos = blockCursor.nBlockPos; + return blockCursor.ReadFromFile(ref fStreamReadWrite, out block); } @@ -1135,6 +1210,8 @@ namespace Novacoin var results = blockMap.Where(x => x.Value.ItemID == merkleNode.nParentBlockID).Select(x => x.Value).ToArray(); blockCursor = results[0]; + + return merkleNode; } // Nothing found. @@ -1216,7 +1293,7 @@ namespace Novacoin // TODO: proof-of-stake validation uint256 hashProofOfStake = 0, targetProofOfStake = 0; - if (!StakeModifier.CheckProofOfStake(block.vtx[1], block.header.nBits, ref hashProofOfStake, ref targetProofOfStake)) + if (!StakeModifier.CheckProofOfStake(block.vtx[1], block.header.nBits, out hashProofOfStake, out targetProofOfStake)) { return false; // do not error here as we expect this during initial block download } @@ -1335,7 +1412,7 @@ 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 + Console.WriteLine("nCount={0}, Hash={1}, NumTx={2}, Time={3}", nCount, block.header.Hash, block.vtx.Length, DateTime.Now); // Commit on each 100th block /* if (nCount % 100 == 0 && nCount != 0)