Merge branch 'release-1212'

* release-1212: updated mainnet hardfork time set mainnet contract update hardfork time UTC 2018-12-26T04:00:00 # Conflicts: # libraries/chain/include/graphene/chain/hardfork.hpp
gxchain · Dec 12, 2018 · 7b6209f · 7b6209f
2 parents 9979b59 + 2908575
commit 7b6209f
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/libraries/chain/include/graphene/chain/hardfork.hpp b/libraries/chain/include/graphene/chain/hardfork.hpp
@@ -57,27 +57,27 @@
 
 // enable smart contract update
 #ifndef HARDFORK_1009_TIME
-#define HARDFORK_1009_TIME (fc::time_point_sec( 1544630400 )) // for mainnet, 2018-12-13T00:00:00
+#define HARDFORK_1009_TIME (fc::time_point_sec( 1545796800 )) // for mainnet, 2018-12-26T04:00:00
 #endif
 
 // set min witness num 21
 #ifndef HARDFORK_1010_TIME
-#define HARDFORK_1010_TIME (fc::time_point_sec( 1544630400 )) // for mainnet, 2018-12-13T00:00:00
+#define HARDFORK_1010_TIME (fc::time_point_sec( 1545796800 )) // for mainnet, 2018-12-26T04:00:00
 #endif
 
 // contract call fee
 #ifndef HARDFORK_1011_TIME
-#define HARDFORK_1011_TIME (fc::time_point_sec( 1544630400 )) // for mainnet, 2018-12-13T00:00:00
+#define HARDFORK_1011_TIME (fc::time_point_sec( 1545796800 )) // for mainnet, 2018-12-26T04:00:00
 #endif
 
 // update active trustnodes
 #ifndef HARDFORK_1012_TIME
-#define HARDFORK_1012_TIME (fc::time_point_sec( 1544630400 )) // for mainnet, 2018-12-13T00:00:00
+#define HARDFORK_1012_TIME (fc::time_point_sec( 1545796800 )) // for mainnet, 2018-12-26T04:00:00
 #endif
 
 // enable witness guaranty
 #ifndef HARDFORK_1129_TIME
-#define HARDFORK_1129_TIME (fc::time_point_sec( 1544630400 )) // for mainnet, 2018-12-13T00:00:00
+#define HARDFORK_1129_TIME (fc::time_point_sec( 1545796800 )) // for mainnet, 2018-12-26T04:00:00
 #endif
 
 // #1103 the time point before you can renaming asset symbol