Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Merge branch 'feature/579-enable-hardfork-check' into 'develop'

Browse source 
#579 - Enable witness hardfork check

See merge request PBSA/peerplays!264
This commit is contained in:
Vlad Dobromyslov 2024-01-22 06:09:54 +00:00
commit 90351647a3
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/chain/db_init.cpp
View file

@ -360,12 +360,14 @@ void database::initialize_hardforks()
_hardfork_times.emplace_back(HARDFORK_1001_TIME); _hardfork_times.emplace_back(HARDFORK_1001_TIME);
_hardfork_times.emplace_back(HARDFORK_5050_1_TIME); _hardfork_times.emplace_back(HARDFORK_5050_1_TIME);
_hardfork_times.emplace_back(HARDFORK_CORE_429_TIME); _hardfork_times.emplace_back(HARDFORK_CORE_429_TIME);
_hardfork_times.emplace_back(HARDFORK_HOTFIX_2024_TIME);
_hardfork_times.emplace_back(HARDFORK_GPOS_TIME); _hardfork_times.emplace_back(HARDFORK_GPOS_TIME);
_hardfork_times.emplace_back(HARDFORK_NFT_TIME); _hardfork_times.emplace_back(HARDFORK_NFT_TIME);
_hardfork_times.emplace_back(HARDFORK_SON_FOR_HIVE_TIME); _hardfork_times.emplace_back(HARDFORK_SIDECHAIN_DELETE_TIME);
_hardfork_times.emplace_back(HARDFORK_SON_TIME); _hardfork_times.emplace_back(HARDFORK_SON_TIME);
_hardfork_times.emplace_back(HARDFORK_SON2_TIME); _hardfork_times.emplace_back(HARDFORK_SON2_TIME);
_hardfork_times.emplace_back(HARDFORK_SON_FOR_ETHEREUM_TIME); _hardfork_times.emplace_back(HARDFORK_SON_FOR_ETHEREUM_TIME);
_hardfork_times.emplace_back(HARDFORK_SON_FOR_HIVE_TIME);
_hardfork_times.emplace_back(HARDFORK_SWEEPS_TIME); _hardfork_times.emplace_back(HARDFORK_SWEEPS_TIME);
std::sort(_hardfork_times.begin(), _hardfork_times.end()); std::sort(_hardfork_times.begin(), _hardfork_times.end());

2
libraries/net/node.cpp
View file

@ -94,7 +94,7 @@
#define DEFAULT_LOGGER "p2p" #define DEFAULT_LOGGER "p2p"
#define P2P_IN_DEDICATED_THREAD 1 #define P2P_IN_DEDICATED_THREAD 1
#define DISABLE_WITNESS_HF_CHECK 1 #define DISABLE_WITNESS_HF_CHECK 0
#define INVOCATION_COUNTER(name) \ #define INVOCATION_COUNTER(name) \
static unsigned total_ ## name ## _counter = 0; \ static unsigned total_ ## name ## _counter = 0; \