From bec591858641975c38086f7be1554ca3f73ebbcf Mon Sep 17 00:00:00 2001 From: pbattu123 Date: Tue, 3 Sep 2019 11:07:00 -0300 Subject: [PATCH 1/2] update hardfork date for 18.04 upgrade + 50/50 dApp --- libraries/chain/hardfork.d/CORE-429.hf | 2 +- libraries/chain/hardfork.d/SWEEPS.hf | 2 +- libraries/chain/include/graphene/chain/config.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/chain/hardfork.d/CORE-429.hf b/libraries/chain/hardfork.d/CORE-429.hf index dfb90e8d..9c51fb71 100644 --- a/libraries/chain/hardfork.d/CORE-429.hf +++ b/libraries/chain/hardfork.d/CORE-429.hf @@ -1,4 +1,4 @@ // bitshares-core #429 rounding issue when creating assets #ifndef HARDFORK_CORE_429_TIME -#define HARDFORK_CORE_429_TIME (fc::time_point_sec( 1566784800 )) +#define HARDFORK_CORE_429_TIME (fc::time_point_sec( 1568167200 )) #endif diff --git a/libraries/chain/hardfork.d/SWEEPS.hf b/libraries/chain/hardfork.d/SWEEPS.hf index 247a36b9..3f4c354a 100644 --- a/libraries/chain/hardfork.d/SWEEPS.hf +++ b/libraries/chain/hardfork.d/SWEEPS.hf @@ -1,3 +1,3 @@ #ifndef HARDFORK_SWEEPS_TIME -#define HARDFORK_SWEEPS_TIME (fc::time_point_sec( 1566784800 )) +#define HARDFORK_SWEEPS_TIME (fc::time_point_sec( 1568167200 )) #endif diff --git a/libraries/chain/include/graphene/chain/config.hpp b/libraries/chain/include/graphene/chain/config.hpp index becf73d6..7b8134ea 100644 --- a/libraries/chain/include/graphene/chain/config.hpp +++ b/libraries/chain/include/graphene/chain/config.hpp @@ -151,7 +151,7 @@ #define GRAPHENE_RECENTLY_MISSED_COUNT_INCREMENT 4 #define GRAPHENE_RECENTLY_MISSED_COUNT_DECREMENT 3 -#define GRAPHENE_CURRENT_DB_VERSION "PPY2.2" +#define GRAPHENE_CURRENT_DB_VERSION "PPY2.3" #define GRAPHENE_IRREVERSIBLE_THRESHOLD (70 * GRAPHENE_1_PERCENT) From a029784a761c626e8fb88e733fcafdabd4aef7f6 Mon Sep 17 00:00:00 2001 From: PBSA Date: Tue, 3 Sep 2019 19:08:58 +0000 Subject: [PATCH 2/2] update to fc path(pointed to peerplays-network --- .gitmodules | 6 +++--- docs | 2 +- libraries/fc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4a2c72e0..be375a4c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,6 +3,6 @@ url = https://github.com/bitshares/bitshares-core.wiki.git ignore = dirty [submodule "libraries/fc"] - path = libraries/fc - url = https://github.com/PBSA/peerplays-fc.git - ignore = dirty + path = libraries/fc + url = https://github.com/peerplays-network/peerplays-fc.git + ignore = dirty diff --git a/docs b/docs index 8d8b69d8..8df8f663 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 8d8b69d82482101279460fa02f814d0e4030966f +Subproject commit 8df8f66389853df73ab8f6dd73981be2a6957df8 diff --git a/libraries/fc b/libraries/fc index 94b046dc..961452f0 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 94b046dce6bb86fd22abd1831fc9056103f4aa5d +Subproject commit 961452f06ffc5740c9b95819dde8f6f7babcd2b0