Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion framework/src/main/java/org/tron/core/config/args/Args.java
Original file line number Diff line number Diff line change
Expand Up @@ -998,6 +998,21 @@ private static void applyCLIParams(CLIParameter cmd, JCommander jc) {
.map(ParameterDescription::getLongestName)
.collect(Collectors.toSet());

jc.getParameters().stream()
.filter(ParameterDescription::isAssigned)
.filter(pd -> {
try {
return CLIParameter.class.getDeclaredField(pd.getParameterized().getName())
.isAnnotationPresent(Deprecated.class);
} catch (NoSuchFieldException e) {
return false;
}
})
.forEach(pd -> logger.warn(
"CLI option '{}' is deprecated and will be removed in a future release. "
+ "Please use the corresponding config-file option instead.",
pd.getLongestName()));

if (assigned.contains("--output-directory")) {
PARAMETER.outputDirectory = cmd.outputDirectory;
}
Expand All @@ -1008,7 +1023,8 @@ private static void applyCLIParams(CLIParameter cmd, JCommander jc) {
PARAMETER.supportConstant = cmd.supportConstant;
}
if (assigned.contains("--max-energy-limit-for-constant")) {
PARAMETER.maxEnergyLimitForConstant = cmd.maxEnergyLimitForConstant;
PARAMETER.maxEnergyLimitForConstant = max(3_000_000L,
cmd.maxEnergyLimitForConstant, true);
}
if (assigned.contains("--lru-cache-size")) {
PARAMETER.lruCacheSize = cmd.lruCacheSize;
Expand Down Expand Up @@ -1091,7 +1107,12 @@ private static void applyCLIParams(CLIParameter cmd, JCommander jc) {
if (assigned.contains("--log-config")) {
PARAMETER.logbackPath = cmd.logbackPath;
}
// seedNodes is a JCommander positional (main) parameter, which does not support
// isAssigned(). An empty-check is used instead — this is safe because the default
// is an empty list, so non-empty means the user explicitly passed values on CLI.
if (!cmd.seedNodes.isEmpty()) {
logger.warn("Positional seed-node arguments are deprecated. "
+ "Please use seed.node.ip.list in the config file instead.");
List<InetSocketAddress> seeds = new ArrayList<>();
for (String s : cmd.seedNodes) {
seeds.add(NetUtil.parseInetSocketAddress(s));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
* Fields here have NO default values — defaults live in CommonParameter.
* JCommander only populates fields that are explicitly passed on the
* command line.
*
* <p>Parameters marked {@code @Deprecated} are scheduled for removal.
* Use the corresponding config-file options instead.</p>
*/
@NoArgsConstructor
public class CLIParameter {
Expand Down Expand Up @@ -44,63 +47,78 @@ public class CLIParameter {
@Parameter(names = {"--password"}, description = "password")
public String password;

@Deprecated
@Parameter(names = {"--solidity"}, description = "running a solidity node for java tron")
public boolean solidityNode;

@Parameter(names = {"--keystore-factory"}, description = "running KeystoreFactory")
public boolean keystoreFactory;

@Deprecated
@Parameter(names = {"--fast-forward"})
public boolean fastForward;

@Deprecated
@Parameter(names = {"--es"}, description = "Start event subscribe server")
public boolean eventSubscribe;

@Deprecated
@Parameter(names = {"--p2p-disable"}, description = "Switch for p2p module initialization. "
+ "(default: false)", arity = 1)
public boolean p2pDisable;

@Deprecated
@Parameter(description = "--seed-nodes")
public List<String> seedNodes = new ArrayList<>();

// -- Storage parameters --
// -- Storage parameters (deprecated, use config file instead) --

@Deprecated
@Parameter(names = {"--storage-db-directory"}, description = "Storage db directory")
public String storageDbDirectory;

@Deprecated
@Parameter(names = {"--storage-db-engine"},
description = "Storage db engine.(leveldb or rocksdb)")
public String storageDbEngine;

@Deprecated
@Parameter(names = {"--storage-db-synchronous"},
description = "Storage db is synchronous or not.(true or false)")
public String storageDbSynchronous;

@Deprecated
@Parameter(names = {"--storage-index-directory"}, description = "Storage index directory")
public String storageIndexDirectory;

@Deprecated
@Parameter(names = {"--storage-index-switch"},
description = "Storage index switch.(on or off)")
public String storageIndexSwitch;

@Deprecated
@Parameter(names = {"--storage-transactionHistory-switch"},
description = "Storage transaction history switch.(on or off)")
public String storageTransactionHistorySwitch;

@Deprecated
@Parameter(names = {"--contract-parse-enable"}, description = "Switch for contract parses in "
+ "java-tron. (default: true)")
public String contractParseEnable;

// -- Runtime parameters --
// -- Runtime parameters (deprecated except --debug, use config file instead) --

@Deprecated
@Parameter(names = {"--support-constant"}, description = "Support constant calling for TVM. "
+ "(default: false)")
public boolean supportConstant;

@Deprecated
@Parameter(names = {"--max-energy-limit-for-constant"},
description = "Max energy limit for constant calling. (default: 100,000,000)")
public long maxEnergyLimitForConstant;

@Deprecated
@Parameter(names = {"--lru-cache-size"}, description = "Max LRU size for caching bytecode and "
+ "result of JUMPDEST analysis. (default: 500)")
public int lruCacheSize;
Expand All @@ -109,48 +127,60 @@ public class CLIParameter {
+ "will not check for timeout. (default: false)")
public boolean debug;

@Deprecated
@Parameter(names = {"--min-time-ratio"}, description = "Minimum CPU tolerance when executing "
+ "timeout transactions while synchronizing blocks. (default: 0.0)")
public double minTimeRatio;

@Deprecated
@Parameter(names = {"--max-time-ratio"}, description = "Maximum CPU tolerance when executing "
+ "non-timeout transactions while synchronizing blocks. (default: 5.0)")
public double maxTimeRatio;

@Deprecated
@Parameter(names = {"--save-internaltx"}, description = "Save internal transactions generated "
+ "during TVM execution, such as create, call and suicide. (default: false)")
public boolean saveInternalTx;

@Deprecated
@Parameter(names = {"--save-featured-internaltx"}, description = "Save featured internal "
+ "transactions generated during TVM execution, such as freeze, vote and so on. "
+ "(default: false)")
public boolean saveFeaturedInternalTx;

@Deprecated
@Parameter(names = {"--save-cancel-all-unfreeze-v2-details"},
description = "Record the details of the internal transactions generated by the "
+ "CANCELALLUNFREEZEV2 opcode, such as bandwidth/energy/tronpower cancel amount. "
+ "(default: false)")
public boolean saveCancelAllUnfreezeV2Details;

@Deprecated
@Parameter(names = {"--long-running-time"})
public int longRunningTime;

@Deprecated
@Parameter(names = {"--max-connect-number"}, description = "Http server max connect number "
+ "(default:50)")
public int maxHttpConnectNumber;

@Deprecated
@Parameter(names = {"--rpc-thread"}, description = "Num of gRPC thread")
public int rpcThreadNum;

@Deprecated
@Parameter(names = {"--solidity-thread"}, description = "Num of solidity thread")
public int solidityThreads;

@Deprecated
@Parameter(names = {"--validate-sign-thread"}, description = "Num of validate thread")
public int validateSignThreadNum;

@Deprecated
@Parameter(names = {"--trust-node"}, description = "Trust node addr")
public String trustNodeAddr;

@Deprecated
@Parameter(names = {"--history-balance-lookup"})
public boolean historyBalanceLookup;
}
Loading