Skip to content

Commit af5c739

Browse files
author
Liulei
committed
feat(tvm,proposal): add fork 4_8_0
1 parent ecdae3a commit af5c739

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

actuator/src/main/java/org/tron/core/utils/ProposalUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ public static void validator(DynamicPropertiesStore dynamicPropertiesStore,
780780
break;
781781
}
782782
case ALLOW_TVM_CANCUN: {
783-
if (!forkController.pass(ForkBlockVersionEnum.VERSION_4_7_5)) {
783+
if (!forkController.pass(ForkBlockVersionEnum.VERSION_4_8_0)) {
784784
throw new ContractValidateException(
785785
"Bad chain parameter id [ALLOW_TVM_CANCUN]");
786786
}

common/src/main/java/org/tron/core/config/Parameter.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ public enum ForkBlockVersionEnum {
2424
VERSION_4_7_1(27, 1596780000000L, 80),
2525
VERSION_4_7_2(28, 1596780000000L, 80),
2626
VERSION_4_7_4(29, 1596780000000L, 80),
27-
VERSION_4_7_5(30, 1596780000000L, 80);
27+
VERSION_4_7_5(30, 1596780000000L, 80),
28+
VERSION_4_8_0(31, 1596780000000L, 80);
2829
// if add a version, modify BLOCK_VERSION simultaneously
2930

3031
@Getter
@@ -73,7 +74,7 @@ public class ChainConstant {
7374
public static final int SINGLE_REPEAT = 1;
7475
public static final int BLOCK_FILLED_SLOTS_NUMBER = 128;
7576
public static final int MAX_FROZEN_NUMBER = 1;
76-
public static final int BLOCK_VERSION = 30;
77+
public static final int BLOCK_VERSION = 31;
7778
public static final long FROZEN_PERIOD = 86_400_000L;
7879
public static final long DELEGATE_PERIOD = 3 * 86_400_000L;
7980
public static final long TRX_PRECISION = 1000_000L;

0 commit comments

Comments
 (0)