GOSTSec
/
poolserver
mirror of https://github.com/GOSTSec/poolserver
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

correct merkle tree calculation

master
orignal 7 years ago
parent
841ee3c24f
commit
e7ccdfa9db
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/server/shared/Bitcoin/Block.cpp

6
src/server/shared/Bitcoin/Block.cpp
Unescape View File

@ -15,8 +15,8 @@ namespace Bitcoin
{ {
for (uint32 i = 0; i < size; i += 2) for (uint32 i = 0; i < size; i += 2)
{ {
uint32 i2 = std::min(i+1, size-1); // uint32 i2 = std::min(i+1, size-1);
merkleTree.push_back(Crypto::GOSTD(Util::Join(merkleTree[j+i], merkleTree[j+i2]))); merkleTree.push_back(Crypto::GOSTD(Util::Join(merkleTree[j+i], merkleTree[j+i])));
} }
j += size; j += size;
@ -35,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[j+size] = Crypto::GOSTD(Util::Join(merkleTree[j], merkleTree[j+1])); merkleTree[j+size] = Crypto::GOSTD(Util::Join(merkleTree[j], merkleTree[j]));
j += size; j += size;
} }

Write Preview
Loading…
Cancel
Save