Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update hardfork date for TESTNET, sync fc module and update logs #248

Merged
merged 1 commit into from
Dec 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions libraries/chain/hardfork.d/GPOS.hf
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion libraries/chain/proposal_object.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down