Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Cutting work threshold when on the test network.

Browse source
This commit is contained in:
clemahieu 2014-12-28 10:46:55 -06:00
commit 31a728227f
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rai/secure.cpp
View file

@ -184,7 +184,6 @@ namespace {
size_t constexpr stepping (16);
}
rai::work::work (size_t entries_a) :
threshold_requirement (0xfff0000000000000),
entries (entries_a),
data (new uint64_t [entries_a])
{
@ -260,7 +259,7 @@ uint64_t rai::work::generate (CryptoPP::SHA3 & hash, rai::uint256_union const &
uint64_t rai::work::create (rai::uint256_union const & seed)
{
xorshift1024star rng;
rng.s.fill (0x0123456789abcdef);// No seed here, we're not securing anything, s just can't be 0 per the spec
rng.s.fill (0x0123456789abcdef);// No seed here, we're not securing anything, s just can't be 0 per the xorshift1024star spec
uint64_t result;
rai::uint256_union value;
CryptoPP::SHA3 hash (32);
@ -269,7 +268,7 @@ uint64_t rai::work::create (rai::uint256_union const & seed)
result = rng.next ();
value = generate (hash, seed, result);
hash.Restart ();
} while (value < threshold_requirement);
} while (value < rai::block::publish_threshold);
return result;
}
@ -277,7 +276,7 @@ bool rai::work::validate (rai::uint256_union const & seed, uint64_t nonce)
{
CryptoPP::SHA3 hash (32);
auto value (generate (hash, seed, nonce));
return value < threshold_requirement;
return value < rai::block::publish_threshold;
}
rai::ledger::ledger (bool & init_a, leveldb::Status const & store_init_a, rai::block_store & store_a) :

4
rai/secure.hpp
View file

@ -192,6 +192,9 @@ namespace rai
static size_t const publish_test_work = 1024;
static size_t const publish_full_work = 8 * 1024; // 8 * 8 * 1024 = 64k to generate work
static size_t const publish_work = rai::rai_network == rai::rai_networks::rai_test_network ? publish_test_work : publish_full_work;
static uint64_t const publish_test_threshold = 0xfc00000000000000;
static uint64_t const publish_full_threshold = 0xfff0000000000000;
static uint64_t const publish_threshold = rai::rai_network == rai::rai_networks::rai_test_network ? publish_test_threshold : publish_full_threshold;
};
class unique_ptr_block_hash
{
@ -512,7 +515,6 @@ namespace rai
uint64_t generate (CryptoPP::SHA3 &, rai::uint256_union const &, uint64_t);
uint64_t create (rai::uint256_union const &);
bool validate (rai::uint256_union const &, uint64_t);
uint64_t const threshold_requirement;
size_t const entries;
std::unique_ptr <uint64_t []> data;
};