Merge pull request #1842 from tronprotocol/hardfork_effective_when_maintenance

renchenchang · web-flow · commit 23725f824bcd · 2018-12-12T13:32:42.000+08:00
block version = 6
diff --git a/src/main/java/org/tron/core/config/Parameter.java b/src/main/java/org/tron/core/config/Parameter.java
@@ -23,7 +23,7 @@ interface ChainConstant {
     int BLOCK_FILLED_SLOTS_NUMBER = 128;
     int MAX_VOTE_NUMBER = 30;
     int MAX_FROZEN_NUMBER = 1;
-    int BLOCK_VERSION = 5;
+    int BLOCK_VERSION = 6;
   }
 
   interface NodeConstant {

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ interface ChainConstant {`
`23`	`23`	`int BLOCK_FILLED_SLOTS_NUMBER = 128;`
`24`	`24`	`int MAX_VOTE_NUMBER = 30;`
`25`	`25`	`int MAX_FROZEN_NUMBER = 1;`
`26`		`- int BLOCK_VERSION = 5;`
	`26`	`+ int BLOCK_VERSION = 6;`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`interface NodeConstant {`