File tree Expand file tree Collapse file tree 5 files changed +8
-7
lines changed
actuator/src/main/java/org/tron/core
chainbase/src/main/java/org/tron/common/utils
framework/src/main/java/org/tron/core/config/args Expand file tree Collapse file tree 5 files changed +8
-7
lines changed Original file line number Diff line number Diff line change @@ -52,7 +52,7 @@ public class ShieldedTransferActuator extends AbstractActuator {
52
52
53
53
public ShieldedTransferActuator () {
54
54
super (ContractType .ShieldedTransferContract , ShieldedTransferContract .class );
55
- zenTokenId = VMConfig .getZenTokenId ();
55
+ zenTokenId = DBConfig .getZenTokenId ();
56
56
}
57
57
58
58
@ Override
Original file line number Diff line number Diff line change @@ -43,10 +43,6 @@ public class VMConfig {
43
43
@ Setter
44
44
private static boolean solidityNode ;
45
45
46
- @ Getter
47
- @ Setter
48
- private static String zenTokenId ;
49
-
50
46
@ Getter
51
47
@ Setter
52
48
private static int checkFrozenTime ; // for test only
Original file line number Diff line number Diff line change @@ -97,6 +97,10 @@ public class DBConfig {
97
97
@ Setter
98
98
private static long changedDelegation ;
99
99
100
+ @ Getter
101
+ @ Setter
102
+ private static String zenTokenId ;
103
+
100
104
@ Getter
101
105
@ Setter
102
106
private static Set <String > actuatorSet ;
Original file line number Diff line number Diff line change @@ -46,7 +46,7 @@ private static Property getProperty(String dbName) {
46
46
}
47
47
48
48
public static String getOutputDirectory () {
49
- if (!DBConfig .getOutputDirectoryConfig (). equals ( "" ) && !DBConfig .getOutputDirectoryConfig ().endsWith (File .separator )) {
49
+ if (!"" . equals ( DBConfig .getOutputDirectoryConfig ()) && !DBConfig .getOutputDirectoryConfig ().endsWith (File .separator )) {
50
50
return DBConfig .getOutputDirectoryConfig () + File .separator ;
51
51
}
52
52
return DBConfig .getOutputDirectoryConfig ();
Original file line number Diff line number Diff line change 58
58
import org .tron .core .config .Configuration ;
59
59
import org .tron .core .config .Parameter .NetConstants ;
60
60
import org .tron .core .config .Parameter .NodeConstant ;
61
+ import org .tron .core .db2 .common .DB ;
61
62
import org .tron .core .store .AccountStore ;
62
63
import org .tron .core .vm .config .VMConfig ;
63
64
import org .tron .keystore .CipherException ;
@@ -1040,7 +1041,6 @@ public static void initVMConfig(Args cfgArgs) {
1040
1041
VMConfig .setMaxTimeRatio (cfgArgs .getMaxTimeRatio ());
1041
1042
VMConfig .setMinTimeRatio (cfgArgs .getMinTimeRatio ());
1042
1043
VMConfig .setDebug (cfgArgs .isDebug ());
1043
- VMConfig .setZenTokenId (cfgArgs .getZenTokenId ());
1044
1044
VMConfig .setCheckFrozenTime (cfgArgs .getCheckFrozenTime ());
1045
1045
VMConfig .setProposalExpireTime (cfgArgs .getProposalExpireTime ());
1046
1046
VMConfig .setSolidityNode (cfgArgs .isSolidityNode ());
@@ -1084,6 +1084,7 @@ public static void initDBConfig(Args cfgArgs) {
1084
1084
DBConfig .setLongRunningTime (cfgArgs .getLongRunningTime ());
1085
1085
DBConfig .setChangedDelegation (cfgArgs .getChangedDelegation ());
1086
1086
DBConfig .setActuatorSet (cfgArgs .getActuatorSet ());
1087
+ DBConfig .setZenTokenId (cfgArgs .getZenTokenId ());
1087
1088
}
1088
1089
1089
1090
public void setFullNodeAllowShieldedTransaction (boolean fullNodeAllowShieldedTransaction ) {
You can’t perform that action at this time.
0 commit comments