Resolve issue caused by 0.4.25 in favor of the fork used by the 0.4.2…

…5-RC2 delegates.
bitshares · Dec 12, 2014 · 2e82bd9 · 2e82bd9
1 parent 6206ed9
commit 2e82bd9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/libraries/blockchain/include/bts/blockchain/checkpoints.hpp b/libraries/blockchain/include/bts/blockchain/checkpoints.hpp
@@ -17,5 +17,7 @@ const static std::map<uint32_t, bts::blockchain::block_id_type> CHECKPOINT_BLOCK
     { 1000000, bts::blockchain::block_id_type( "20da1352f86f0fc7d5b42f5e96be86ea5b219b6f" ) },
     { 1100000, bts::blockchain::block_id_type( "bec7da4758ad453a49a9d9d4128acb92a1fdfd04" ) },
     { 1200000, bts::blockchain::block_id_type( "9e514e0f0a17d78be7c0045f9f22a253812c6c92" ) },
-    { 1243000, bts::blockchain::block_id_type( "cf3fa80cbd07c8fe1fa415dabf9344f015ae6227" ) }
+    { 1243000, bts::blockchain::block_id_type( "cf3fa80cbd07c8fe1fa415dabf9344f015ae6227" ) },
+    { 1246469, bts::blockchain::block_id_type( "68b7e003ca08d50843faaddcf696cfff1954ede3" ) },
+    { 1246900, bts::blockchain::block_id_type( "b5214c1bc914ea5da6c1bb8f774d07f12b85dbe2" ) }
 };
diff --git a/libraries/blockchain/include/bts/blockchain/config.hpp b/libraries/blockchain/include/bts/blockchain/config.hpp
@@ -11,7 +11,7 @@
  *  @brief Defines global constants that determine blockchain behavior
  */
 #define BTS_BLOCKCHAIN_VERSION                              109
-#define BTS_BLOCKCHAIN_DATABASE_VERSION                     170
+#define BTS_BLOCKCHAIN_DATABASE_VERSION                     171
 
 /**
  *  The address prepended to string representation of

diff --git a/libraries/blockchain/include/bts/blockchain/fork_blocks.hpp b/libraries/blockchain/include/bts/blockchain/fork_blocks.hpp
@@ -30,7 +30,7 @@
 
 #define BTS_CHECK_CANONICAL_SIGNATURE_FORK_BLOCK_NUM BTS_V0_4_25_FORK_BLOCK_NUM
 
-#define FORK_25 1249400 // FIXME
+#define FORK_25 1246900 // FIXME
 
 #define BTS_FORK_TO_UNIX_TIME_LIST  ((BTS_V0_4_0_FORK_BLOCK_NUM,   "0.4.0",     1408064036)) \
                                     ((BTS_V0_4_9_FORK_2_BLOCK_NUM, "0.4.9",     1409193626)) \