From a4d399d6ccff4e2d3953e4069c44476a172e4dd1 Mon Sep 17 00:00:00 2001 From: pbattu123 Date: Tue, 17 Dec 2019 09:18:34 -0400 Subject: [PATCH] Update hardfork date for TESTNET, sync fc module and update logs --- .gitmodules | 2 +- libraries/chain/hardfork.d/GPOS.hf | 4 ++-- libraries/chain/proposal_object.cpp | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4d3518d1..0cf82577 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,5 +5,5 @@ [submodule "libraries/fc"] path = libraries/fc url = https://github.com/peerplays-network/peerplays-fc.git - branch = latest-fc + branch = beatrice ignore = dirty diff --git a/libraries/chain/hardfork.d/GPOS.hf b/libraries/chain/hardfork.d/GPOS.hf index 626cf003..5d40decd 100644 --- a/libraries/chain/hardfork.d/GPOS.hf +++ b/libraries/chain/hardfork.d/GPOS.hf @@ -1,4 +1,4 @@ -// GPOS HARDFORK Thursday, October 1, 2020 05:00:00 AM GMT +// GPOS HARDFORK Monday, Dec 23, 2019 04:00:00 AM GMT #ifndef HARDFORK_GPOS_TIME -#define HARDFORK_GPOS_TIME (fc::time_point_sec( 1601528400 )) +#define HARDFORK_GPOS_TIME (fc::time_point_sec( 1577073600 )) #endif diff --git a/libraries/chain/proposal_object.cpp b/libraries/chain/proposal_object.cpp index 2186b0b6..04c6168d 100644 --- a/libraries/chain/proposal_object.cpp +++ b/libraries/chain/proposal_object.cpp @@ -43,7 +43,9 @@ bool proposal_object::is_authorized_to_execute(database& db) const } catch ( const fc::exception& e ) { - elog( "caught exception ${e} while checking authorization of proposal operations",("e", e.to_detail_string()) ); + #ifndef NDEBUG + wlog( "caught exception ${e} while checking authorization of proposal operations",("e", e.to_detail_string()) ); + #endif return false; } return true;