GOSTSec/poolserver
1
0
Fork 0
mirror of https://github.com/GOSTSec/poolserver synced 2025-02-06 03:54:28 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into peercoin

Browse Source
This commit is contained in:
Intel 2014-05-12 09:45:05 -04:00
commit 487c7865ac
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/shared/Bitcoin/Block.cpp
View File

@ -1,5 +1,4 @@
#include "Block.h" #include "Block.h"
#include "Log.h"
namespace Bitcoin namespace Bitcoin
{ {
@ -36,7 +35,7 @@ namespace Bitcoin
uint32 j = 0; uint32 j = 0;
for (uint32 size = tx.size(); size > 1; size = (size+1)/2) for (uint32 size = tx.size(); size > 1; size = (size+1)/2)
{ {
merkleTree[size] = Crypto::SHA256D(Util::Join(merkleTree[j], merkleTree[j+1])); merkleTree[j+size] = Crypto::SHA256D(Util::Join(merkleTree[j], merkleTree[j+1]));
j += size; j += size;
} }