X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=Novacoin%2FCBlockStore.cs;h=e8981ebebe49bd2e704fd484c4264443f2fa061c;hb=fed302c65257c4124ec996f50ee228dd12acd6d3;hp=6485f0c1d5464b17dafdc795ebd94538bfae59a2;hpb=44f86919230cc66a0a84ab4778ceea547f99a509;p=NovacoinLibrary.git
diff --git a/Novacoin/CBlockStore.cs b/Novacoin/CBlockStore.cs
index 6485f0c..e8981eb 100644
--- a/Novacoin/CBlockStore.cs
+++ b/Novacoin/CBlockStore.cs
@@ -1108,14 +1108,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);
}
@@ -1273,7 +1278,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
}
@@ -1392,7 +1397,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)