Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add debug logging

Browse source
This commit is contained in:
theoreticalbts 2016-12-14 13:09:01 -05:00
parent ad3efeb28a
commit beca6a8264
1 changed files with 44 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
vendor/equihash/src/pow.cpp vendored
View file

@ -8,6 +8,16 @@ Modifications by Steemit, Inc. 2016
#include <equihash/blake2.h> #include <equihash/blake2.h>
#include <algorithm> #include <algorithm>
#ifdef EQUIHASH_POW_VERBOSE
#include <iomanip>
#include <iostream>
#define EQUIHASH_LOG(s) \
std::cerr << s << std::endl;
#else
#define EQUIHASH_LOG(s)
#endif
static uint64_t rdtsc(void) { static uint64_t rdtsc(void) {
#ifdef _MSC_VER #ifdef _MSC_VER
return __rdtsc(); return __rdtsc();
@ -297,7 +307,10 @@ bool Proof::FullTest()const
{ {
// Length must be 2**k // Length must be 2**k
if( inputs.size() != size_t(1 << k) ) if( inputs.size() != size_t(1 << k) )
{
EQUIHASH_LOG( "PoW failed length test" );
return false; return false;
}
// Ensure all values are distinct // Ensure all values are distinct
std::vector<Input> sorted_inputs = inputs; std::vector<Input> sorted_inputs = inputs;
@ -305,7 +318,10 @@ bool Proof::FullTest()const
for( size_t i=1; i<inputs.size(); i++ ) for( size_t i=1; i<inputs.size(); i++ )
{ {
if( sorted_inputs[i-1] >= sorted_inputs[i] ) if( sorted_inputs[i-1] >= sorted_inputs[i] )
{
EQUIHASH_LOG( "PoW failed distinct test" );
return false; return false;
}
} }
// Ensure all values are canonically indexed // Ensure all values are canonically indexed
@ -330,7 +346,10 @@ bool Proof::FullTest()const
{ {
input[SEED_LENGTH + 1] = inputs[i]; input[SEED_LENGTH + 1] = inputs[i];
if( inputs[i] >= max_input ) if( inputs[i] >= max_input )
{
EQUIHASH_LOG( "PoW failed max_input test" );
return false; return false;
}
blake2b((uint8_t*)buf, &input, NULL, sizeof(buf), sizeof(input), 0); blake2b((uint8_t*)buf, &input, NULL, sizeof(buf), sizeof(input), 0);
blocks.emplace_back(); blocks.emplace_back();
@ -345,29 +364,48 @@ bool Proof::FullTest()const
while( true ) while( true )
{ {
/* #ifdef EQUIHASH_POW_VERBOSE
std::cout << "\n\nBegin loop iteration\n"; std::cerr << "\n\nBegin loop iteration\n";
for( const std::vector< uint32_t >& x : blocks ) for( const std::vector< uint32_t >& x : blocks )
{ {
for( const uint32_t& e : x ) for( const uint32_t& e : x )
std::cout << std::hex << std::setw(5) << e << " "; std::cerr << std::hex << std::setw(5) << e << " ";
std::cout << std::endl; std::cerr << std::endl;
} }
*/ #endif
size_t count = blocks.size(); size_t count = blocks.size();
if( count == 0 ) if( count == 0 )
{
EQUIHASH_LOG( "PoW failed with count == 0" );
return false; return false;
}
if( count == 1 ) if( count == 1 )
{ {
return (blocks[0].size() == 1) && (blocks[0][0] == 0); if( blocks[0].size() != 1 )
{
EQUIHASH_LOG( "PoW failed due to vector size" );
return false;
}
if( blocks[0][0] != 0 )
{
EQUIHASH_LOG( "PoW failed because final bits are not zero" );
return false;
}
return true;
} }
if( (count&1) != 0 ) if( (count&1) != 0 )
{
EQUIHASH_LOG( "PoW failed with odd count" );
return false; return false;
}
for( size_t i=0,new_i=0; i<count; i+=2,new_i++ ) for( size_t i=0,new_i=0; i<count; i+=2,new_i++ )
{ {
if( blocks[i][0] != blocks[i+1][0] ) if( blocks[i][0] != blocks[i+1][0] )
{
EQUIHASH_LOG( "PoW failed because leading element of vector pair does not match" );
return false; return false;
}
for( size_t j=1; j<blocks[i].size(); j++ ) for( size_t j=1; j<blocks[i].size(); j++ )
blocks[new_i][j-1] = blocks[i][j] ^ blocks[i+1][j]; blocks[new_i][j-1] = blocks[i][j] ^ blocks[i+1][j];
blocks[new_i].resize(blocks[new_i].size()-1); blocks[new_i].resize(blocks[new_i].size()-1);