Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

testnet3

Browse source
This commit is contained in:
crypro.zoidberg 2019-04-19 21:46:22 +02:00
parent 89356d9a33
commit d69f4b9095
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/currency_core/currency_config.h
View file

@ -7,7 +7,7 @@
#pragma once
#define CURRENCY_FORMATION_VERSION 79
#define CURRENCY_FORMATION_VERSION 80
#define CURRENCY_MAX_BLOCK_NUMBER 500000000
@ -53,7 +53,7 @@
// #define CURRENCY_FIXED_REWARD_ZONE_REWARD_AMOUNT ((uint64_t)100000000) // should be TX_MINIMUM_FEE * CURRENCY_FIXED_REWARD_ZONE_FEE_MULTIPLIER
// #define CURRENCY_FIXED_REWARD_ZONE_FEE_MULTIPLIER 1000 // reward in minimum fees for a block in the zone
#define CURRENCY_TESTNET_CONST_REWARD 100000000000000
#define CURRENCY_BLOCK_REWARD 1000000000000 // 1.0 coin
#define WALLET_MAX_ALLOWED_OUTPUT_AMOUNT ((uint64_t)0xffffffffffffffffLL)

2
src/currency_core/currency_format_utils.cpp
View file

@ -2377,7 +2377,7 @@ namespace currency
if (!height)
return PREMINE_AMOUNT;
return CURRENCY_TESTNET_CONST_REWARD;
return CURRENCY_BLOCK_REWARD;
}
//-----------------------------------------------------------------------------------------------
bool get_block_reward(bool is_pos, size_t median_size, size_t current_block_size, const boost::multiprecision::uint128_t& already_generated_coins, uint64_t &reward, uint64_t height)

2
tests/core_tests/checkpoints_tests.cpp
View file

@ -628,7 +628,7 @@ bool gen_no_attchments_in_coinbase::init_config_set_cp(currency::core& c, size_t
crc.pos_minimum_heigh = 1;
c.get_blockchain_storage().set_core_runtime_config(crc);
m_checkpoints.add_checkpoint(12, "446b25ca3816e36df92745ea91c3c54a8745db565bafd4d2aa7df9da49220a19");
m_checkpoints.add_checkpoint(12, "ea03a5c99aeedc2050ca5dae011a6c411b31f8b7fb9d0b82735c403b5c608b7b");
c.set_checkpoints(currency::checkpoints(m_checkpoints));
return true;

2
tests/core_tests/multisig_wallet_tests.cpp
View file

@ -1625,7 +1625,7 @@ multisig_and_checkpoints::multisig_and_checkpoints()
bool multisig_and_checkpoints::set_cp(currency::core& c, size_t ev_index, const std::vector<test_event_entry>& events)
{
currency::checkpoints checkpoints;
checkpoints.add_checkpoint(15, "37da2a30fd8cf1daa05ba11cb2ac5f7a3cc998bce56e4b575fbbea58f0592f5b");
checkpoints.add_checkpoint(15, "46f45b849160be33937c60fa564e820792b0aaa6cf4a080e6002b6f25d84d688");
c.set_checkpoints(std::move(checkpoints));
return true;