Skip to content

Commit 119dbd9

Browse files
marilasmarilas
committed
merge param class
1 parent bd1f41a commit 119dbd9

33 files changed

Lines changed: 63 additions & 78 deletions

‎actuator/src/main/java/org/tron/core/actuator/TransferActuator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.tron.core.actuator;
22

3-
import static org.tron.core.config.args.Parameter.ChainConstant.TRANSFER_FEE;
3+
import static org.tron.core.config.Parameter.ChainConstant.TRANSFER_FEE;
44

55
import com.google.protobuf.ByteString;
66
import com.google.protobuf.InvalidProtocolBufferException;

‎actuator/src/main/java/org/tron/core/actuator/VoteWitnessActuator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import static org.tron.core.actuator.ActuatorConstant.ACCOUNT_EXCEPTION_STR;
44
import static org.tron.core.actuator.ActuatorConstant.NOT_EXIST_STR;
55
import static org.tron.core.actuator.ActuatorConstant.WITNESS_EXCEPTION_STR;
6-
import static org.tron.core.config.args.Parameter.ChainConstant.MAX_VOTE_NUMBER;
6+
import static org.tron.core.config.Parameter.ChainConstant.MAX_VOTE_NUMBER;
77

88
import com.google.common.math.LongMath;
99
import com.google.protobuf.ByteString;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.tron.core.utils;
22

33
import org.tron.common.utils.ForkUtils;
4-
import org.tron.core.config.args.Parameter.ForkBlockVersionConsts;
5-
import org.tron.core.config.args.Parameter.ForkBlockVersionEnum;
4+
import org.tron.core.config.Parameter.ForkBlockVersionConsts;
5+
import org.tron.core.config.Parameter.ForkBlockVersionEnum;
66
import org.tron.core.exception.ContractValidateException;
77
import org.tron.core.store.DynamicPropertiesStore;
88

‎actuator/src/main/java/org/tron/core/vm/repository/RepositoryImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.tron.core.vm.repository;
22

33
import static java.lang.Long.max;
4-
import static org.tron.core.config.args.Parameter.ChainConstant.BLOCK_PRODUCED_INTERVAL;
4+
import static org.tron.core.config.Parameter.ChainConstant.BLOCK_PRODUCED_INTERVAL;
55

66
import com.google.protobuf.ByteString;
77
import java.util.HashMap;

‎chainbase/src/main/java/org/tron/common/utils/ForkUtils.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import lombok.Getter;
66
import lombok.Setter;
77
import lombok.extern.slf4j.Slf4j;
8-
import org.tron.core.config.args.Parameter.ForkBlockVersionConsts;
9-
import org.tron.core.config.args.Parameter.ForkBlockVersionEnum;
8+
import org.tron.core.config.Parameter.ForkBlockVersionConsts;
9+
import org.tron.core.config.Parameter.ForkBlockVersionEnum;
1010
import org.tron.core.store.DynamicPropertiesStore;
1111
import org.tron.core.store.WitnessStore;
1212

@@ -96,7 +96,6 @@ protected void upgrade(int version, int slotSize) {
9696
}
9797
}
9898

99-
10099
public synchronized void reset() {
101100
for (ForkBlockVersionEnum versionEnum : ForkBlockVersionEnum.values()) {
102101
int versionValue = versionEnum.getValue();

‎chainbase/src/main/java/org/tron/core/capsule/ProposalCapsule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.tron.core.capsule;
22

3-
import static org.tron.core.config.args.Parameter.ChainConstant.MAX_ACTIVE_WITNESS_NUM;
3+
import static org.tron.core.config.Parameter.ChainConstant.MAX_ACTIVE_WITNESS_NUM;
44

55
import com.google.common.collect.Lists;
66
import com.google.protobuf.ByteString;

‎chainbase/src/main/java/org/tron/core/capsule/ReceiptCapsule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.tron.common.utils.Sha256Hash;
1010
import org.tron.common.utils.StringUtil;
1111
import org.tron.core.Constant;
12-
import org.tron.core.config.args.Parameter.ForkBlockVersionEnum;
12+
import org.tron.core.config.Parameter.ForkBlockVersionEnum;
1313
import org.tron.core.db.EnergyProcessor;
1414
import org.tron.core.exception.BalanceInsufficientException;
1515
import org.tron.core.store.AccountStore;

‎chainbase/src/main/java/org/tron/core/config/Parameter.java‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
package org.tron.core.config;
22

3+
import lombok.Getter;
4+
35
public class Parameter {
46

57
public class ChainConstant {
6-
8+
public static final int MAX_ACTIVE_WITNESS_NUM = 27;
9+
public static final long TRANSFER_FEE = 0; // free
10+
public static final int BLOCK_PRODUCED_INTERVAL = 3000; //ms,produce block period, must be divisible by 60. millisecond
11+
public static final int MAX_VOTE_NUMBER = 30;
712
public static final int WITNESS_STANDBY_LENGTH = 127;
813
public static final int SOLIDIFIED_THRESHOLD = 70; // 70%
914
public static final int PRIVATE_KEY_LENGTH = 64;
10-
public static final int MAX_ACTIVE_WITNESS_NUM = 27;
1115
public static final int BLOCK_SIZE = 2_000_000;
1216
public static final long CLOCK_MAX_DELAY = 3600000; // 3600 * 1000 ms
1317
public static final int BLOCK_PRODUCED_TIME_OUT = 50; // 50%
@@ -65,4 +69,27 @@ public class AdaptiveResourceLimitConstants {
6569
public static final int PERIODS_MS = 60_000;
6670
public static final int LIMIT_MULTIPLIER = 1000; //s
6771
}
72+
73+
public enum ForkBlockVersionEnum {
74+
ENERGY_LIMIT(5),
75+
VERSION_3_2_2(6),
76+
VERSION_3_5(7),
77+
VERSION_3_6(8),
78+
VERSION_3_6_5(9),
79+
VERSION_4_0(15);
80+
81+
@Getter
82+
private int value;
83+
84+
ForkBlockVersionEnum(int value) {
85+
this.value = value;
86+
}
87+
}
88+
89+
@Deprecated
90+
public class ForkBlockVersionConsts {
91+
public static final int START_NEW_TRANSACTION = 4;
92+
public static final int ENERGY_LIMIT = 5;
93+
}
94+
6895
}

‎chainbase/src/main/java/org/tron/core/config/args/Parameter.java‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎chainbase/src/main/java/org/tron/core/db/EnergyProcessor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.tron.core.db;
22

33
import static java.lang.Long.max;
4-
import static org.tron.core.config.args.Parameter.ChainConstant.BLOCK_PRODUCED_INTERVAL;
4+
import static org.tron.core.config.Parameter.ChainConstant.BLOCK_PRODUCED_INTERVAL;
55

66
import lombok.extern.slf4j.Slf4j;
77
import org.tron.common.utils.DBConfig;

0 commit comments

Comments
 (0)