From 5013963e2119da4c743a818231864810c98bc213 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Fri, 7 May 2021 11:59:53 -0500 Subject: [PATCH 1/2] reset testnet --- src/currency_core/blockchain_storage.cpp | 2 +- src/currency_core/checkpoints_create.h | 2 +- src/currency_core/currency_config.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/currency_core/blockchain_storage.cpp b/src/currency_core/blockchain_storage.cpp index e422a446..34e26385 100644 --- a/src/currency_core/blockchain_storage.cpp +++ b/src/currency_core/blockchain_storage.cpp @@ -5627,7 +5627,7 @@ bool blockchain_storage::handle_block_to_main_chain(const block& bl, const crypt set_lost_tx_unmixable_for_height(bei.height); - LOG_PRINT_L1("+++++ BLOCK SUCCESSFULLY ADDED " << (is_pos_bl ? "[PoS]" : "[PoW]") << " Sq: " << sequence_factor + LOG_PRINT_L1("+++++ BLOCK SUCCESSFULLY ADDED " << (is_pos_bl ? "[PoS]" : "[PoW]") << "["<< static_cast(bei.bl.major_version) << "." << static_cast(bei.bl.minor_version) << "] "<< " Sq: " << sequence_factor << ENDL << "id:\t" << id << timestamp_str_entry.str() << ENDL << powpos_str_entry.str() << ENDL << "HEIGHT " << bei.height << ", difficulty: " << current_diffic << ", cumul_diff_precise: " << bei.cumulative_diff_precise << ", cumul_diff_adj: " << bei.cumulative_diff_adjusted << " (+" << cumulative_diff_delta << ")" diff --git a/src/currency_core/checkpoints_create.h b/src/currency_core/checkpoints_create.h index 9a14c2f8..ea87d78c 100644 --- a/src/currency_core/checkpoints_create.h +++ b/src/currency_core/checkpoints_create.h @@ -17,7 +17,7 @@ namespace currency inline bool create_checkpoints(currency::checkpoints& checkpoints) { #ifdef TESTNET - ADD_CHECKPOINT(50000, "492ef71f5d722a8a182d65eb0ff731b740e023a2d64881f43db9af7b39ba7988"); + //ADD_CHECKPOINT(50000, "492ef71f5d722a8a182d65eb0ff731b740e023a2d64881f43db9af7b39ba7988"); #else // MAINNET ADD_CHECKPOINT(425000, "46a6c36d5dec2d484d5e4845a8525ca322aafc06915ed9c8da2a241b51b7d1e8"); diff --git a/src/currency_core/currency_config.h b/src/currency_core/currency_config.h index 0c43cc88..4f39e718 100644 --- a/src/currency_core/currency_config.h +++ b/src/currency_core/currency_config.h @@ -10,7 +10,7 @@ #ifndef TESTNET #define CURRENCY_FORMATION_VERSION 84 #else -#define CURRENCY_FORMATION_VERSION 87 +#define CURRENCY_FORMATION_VERSION 88 #endif #define CURRENCY_GENESIS_NONCE (CURRENCY_FORMATION_VERSION + 101011010121) //bender's nightmare From bd9e57c6d8d82a78db26863731d8d292954ab61c Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Tue, 25 May 2021 16:51:16 +0200 Subject: [PATCH 2/2] fixed subrepo(again) --- src/gui/qt-daemon/layout | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/qt-daemon/layout b/src/gui/qt-daemon/layout index e19aa811..0d3831a3 160000 --- a/src/gui/qt-daemon/layout +++ b/src/gui/qt-daemon/layout @@ -1 +1 @@ -Subproject commit e19aa811be78b8ff3a0b622bd889b11a2685bc0c +Subproject commit 0d3831a3e4c13ab3016aca26d40d01f9e87c7282