Merge pull request #107 from peerplays-network/hardfork-50/50

Hardfork 50/50
peerplays-network · Sep 3, 2019 · a50da70 · a50da70
2 parents 651e781 + a029784
commit a50da70
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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)
 

diff --git a/libraries/fc b/libraries/fc