Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,15 @@ public class CommonParameter {
//If you are running a solidity node for java tron, this flag is set to true
@Getter
@Setter
@Parameter(names = {"--solidity"}, description = "running a solidity node for java tron")
public boolean solidityNode = false;

//If you are running KeystoreFactory, this flag is set to true
@Getter
@Setter
@Parameter(names = {"--keystore"}, description = "running KeystoreFactory")
public boolean keystore = false;

@Getter
@Setter
public int rpcPort;
Expand Down
23 changes: 0 additions & 23 deletions framework/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -212,35 +212,12 @@ startScripts.enabled = false
run.enabled = false
tasks.distTar.enabled = false

createScript(project, 'org.tron.program.SolidityNode', 'SolidityNode')
createScript(project, 'org.tron.program.FullNode', 'FullNode')
createScript(project, 'org.tron.program.KeystoreFactory', 'KeystoreFactory')
createScript(project, 'org.tron.program.DBConvert', 'DBConvert')

def releaseBinary = hasProperty('binaryRelease') ? getProperty('binaryRelease') : 'true'
def skipSolidity = hasProperty('skipSolidity') ? true : false
def skipKeystore = hasProperty('skipKeystore') ? true : false
def skipConvert = hasProperty('skipConvert') ? true : false
def skipAll = hasProperty('skipAll') ? true : false
if (releaseBinary == 'true') {
artifacts {
archives(binaryRelease('buildFullNodeJar', 'FullNode', 'org.tron.program.FullNode'))
}
if (!skipAll) {
if (!skipSolidity) {
artifacts {
archives(binaryRelease('buildSolidityNodeJar', 'SolidityNode', 'org.tron.program.SolidityNode'))}
}
if (!skipKeystore) {
artifacts {
archives(binaryRelease('buildKeystoreFactoryJar', 'KeystoreFactory', 'org.tron.program.KeystoreFactory'))}
}
if (!skipConvert) {
artifacts {
archives(binaryRelease('buildDBConvertJar', 'DBConvert', 'org.tron.program.DBConvert'))}
}
}

}

task copyToParent(type: Copy) {
Expand Down
3 changes: 2 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 @@ -172,6 +172,7 @@ public static void clearParam() {
PARAMETER.tcpNettyWorkThreadNum = 0;
PARAMETER.udpNettyWorkThreadNum = 0;
PARAMETER.solidityNode = false;
PARAMETER.keystore = false;
PARAMETER.trustNodeAddr = "";
PARAMETER.walletExtensionApi = false;
PARAMETER.estimateEnergy = false;
Expand Down Expand Up @@ -345,7 +346,7 @@ private static String getCommitIdAbbrev() {

private static Map<String, String[]> getOptionGroup() {
String[] tronOption = new String[] {"version", "help", "shellConfFileName", "logbackPath",
"eventSubscribe"};
"eventSubscribe", "solidityNode", "keystore"};
String[] dbOption = new String[] {"outputDirectory"};
String[] witnessOption = new String[] {"witness", "privateKey"};
String[] vmOption = new String[] {"debug"};
Expand Down
Loading