Skip to content

Commit e12927a

Browse files
Federico2014Federico2014
committed
refactor(toolkit): move keystore-factory to plugins module
1 parent bb8b4be commit e12927a

27 files changed

Lines changed: 119 additions & 77 deletions

File tree

‎common/src/main/java/org/tron/common/parameter/CommonParameter.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,6 @@ public class CommonParameter {
153153
@Setter
154154
public boolean solidityNode = false;
155155

156-
// If you are running KeystoreFactory,
157-
// this flag is set to true
158-
@Getter
159-
@Setter
160-
public boolean keystoreFactory = false;
161-
162156
// -- RPC / HTTP --
163157
@Getter
164158
@Setter

framework/src/main/java/org/tron/keystore/Credentials.java renamed to crypto/src/main/java/org/tron/common/crypto/keystore/Credentials.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.tron.keystore;
1+
package org.tron.common.crypto.keystore;
22

33
import java.util.Objects;
44
import org.tron.common.crypto.SignInterface;

framework/src/main/java/org/tron/keystore/Wallet.java renamed to crypto/src/main/java/org/tron/common/crypto/keystore/Wallet.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.tron.keystore;
1+
package org.tron.common.crypto.keystore;
22

33
import static java.nio.charset.StandardCharsets.UTF_8;
44

@@ -23,7 +23,6 @@
2323
import org.tron.common.crypto.SignUtils;
2424
import org.tron.common.utils.ByteArray;
2525
import org.tron.common.utils.StringUtil;
26-
import org.tron.core.config.args.Args;
2726
import org.tron.core.exception.CipherException;
2827

2928
/**
@@ -212,7 +211,7 @@ public static SignInterface decrypt(String password, WalletFile walletFile)
212211
byte[] encryptKey = Arrays.copyOfRange(derivedKey, 0, 16);
213212
byte[] privateKey = performCipherOperation(Cipher.DECRYPT_MODE, iv, encryptKey, cipherText);
214213

215-
return SignUtils.fromPrivate(privateKey, Args.getInstance().isECKeyCryptoEngine());
214+
return SignUtils.fromPrivate(privateKey, true);
216215
}
217216

218217
static void validate(WalletFile walletFile) throws CipherException {

framework/src/main/java/org/tron/keystore/WalletFile.java renamed to crypto/src/main/java/org/tron/common/crypto/keystore/WalletFile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.tron.keystore;
1+
package org.tron.common.crypto.keystore;
22

33
import com.fasterxml.jackson.annotation.JsonSetter;
44
import com.fasterxml.jackson.annotation.JsonSubTypes;

framework/src/main/java/org/tron/keystore/WalletUtils.java renamed to crypto/src/main/java/org/tron/common/crypto/keystore/WalletUtils.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.tron.keystore;
1+
package org.tron.common.crypto.keystore;
22

33
import com.fasterxml.jackson.core.JsonParser;
44
import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -17,7 +17,6 @@
1717
import org.tron.common.crypto.SignInterface;
1818
import org.tron.common.crypto.SignUtils;
1919
import org.tron.common.utils.Utils;
20-
import org.tron.core.config.args.Args;
2120
import org.tron.core.exception.CipherException;
2221

2322
/**
@@ -48,11 +47,9 @@ public static String generateLightNewWalletFile(String password, File destinatio
4847

4948
public static String generateNewWalletFile(
5049
String password, File destinationDirectory, boolean useFullScrypt)
51-
throws CipherException, IOException, InvalidAlgorithmParameterException,
52-
NoSuchAlgorithmException, NoSuchProviderException {
50+
throws CipherException, IOException {
5351

54-
SignInterface ecKeyPair = SignUtils.getGeneratedRandomSign(Utils.getRandom(),
55-
Args.getInstance().isECKeyCryptoEngine());
52+
SignInterface ecKeyPair = SignUtils.getGeneratedRandomSign(Utils.getRandom(), true);
5653
return generateWalletFile(password, ecKeyPair, destinationDirectory, useFullScrypt);
5754
}
5855

‎framework/src/main/java/org/tron/core/Wallet.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ public WitnessList getPaginatedNowWitnessList(long offset, long limit) throws
780780
if (limit > WITNESS_COUNT_LIMIT_MAX) {
781781
limit = WITNESS_COUNT_LIMIT_MAX;
782782
}
783-
783+
784784
/*
785785
In the maintenance period, the VoteStores will be cleared.
786786
To avoid the race condition of VoteStores deleted but Witness vote counts not updated,
@@ -1502,8 +1502,8 @@ public Protocol.ChainParameters getChainParameters() {
15021502
builder.addChainParameter(Protocol.ChainParameters.ChainParameter.newBuilder()
15031503
.setKey("getAllowTvmSelfdestructRestriction")
15041504
.setValue(dbManager.getDynamicPropertiesStore().getAllowTvmSelfdestructRestriction())
1505-
.build());
1506-
1505+
.build());
1506+
15071507
builder.addChainParameter(Protocol.ChainParameters.ChainParameter.newBuilder()
15081508
.setKey("getProposalExpireTime")
15091509
.setValue(dbManager.getDynamicPropertiesStore().getProposalExpireTime())
@@ -2608,7 +2608,7 @@ public DiversifierMessage getDiversifier() throws ZksnarkException {
26082608

26092609
byte[] d;
26102610
while (true) {
2611-
d = org.tron.keystore.Wallet.generateRandomBytes(Constant.ZC_DIVERSIFIER_SIZE);
2611+
d = org.tron.common.crypto.keystore.Wallet.generateRandomBytes(Constant.ZC_DIVERSIFIER_SIZE);
26122612
if (JLibrustzcash.librustzcashCheckDiversifier(d)) {
26132613
break;
26142614
}

‎framework/src/main/java/org/tron/core/config/args/Args.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,9 +1143,6 @@ private static void applyCLIParams(CLIParameter cmd, JCommander jc) {
11431143
if (assigned.contains("--solidity")) {
11441144
PARAMETER.solidityNode = cmd.solidityNode;
11451145
}
1146-
if (assigned.contains("--keystore-factory")) {
1147-
PARAMETER.keystoreFactory = cmd.keystoreFactory;
1148-
}
11491146
if (assigned.contains("--rpc-thread")) {
11501147
PARAMETER.rpcThreadNum = cmd.rpcThreadNum;
11511148
}
@@ -1832,7 +1829,7 @@ private static String getCommitIdAbbrev() {
18321829

18331830
private static Map<String, String[]> getOptionGroup() {
18341831
String[] tronOption = new String[] {"version", "help", "shellConfFileName", "logbackPath",
1835-
"eventSubscribe", "solidityNode", "keystoreFactory"};
1832+
"eventSubscribe", "solidityNode"};
18361833
String[] dbOption = new String[] {"outputDirectory"};
18371834
String[] witnessOption = new String[] {"witness", "privateKey"};
18381835
String[] vmOption = new String[] {"debug"};

‎framework/src/main/java/org/tron/core/config/args/WitnessInitializer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
import lombok.extern.slf4j.Slf4j;
88
import org.apache.commons.lang3.StringUtils;
99
import org.tron.common.crypto.SignInterface;
10+
import org.tron.common.crypto.keystore.Credentials;
11+
import org.tron.common.crypto.keystore.WalletUtils;
1012
import org.tron.common.utils.ByteArray;
1113
import org.tron.common.utils.Commons;
1214
import org.tron.common.utils.LocalWitnesses;
1315
import org.tron.core.exception.CipherException;
1416
import org.tron.core.exception.TronError;
15-
import org.tron.keystore.Credentials;
16-
import org.tron.keystore.WalletUtils;
1717

1818
@Slf4j
1919
public class WitnessInitializer {

‎framework/src/main/java/org/tron/core/zen/address/DiversifierT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import lombok.AllArgsConstructor;
44
import lombok.Getter;
55
import lombok.Setter;
6+
import org.tron.common.crypto.keystore.Wallet;
67
import org.tron.common.zksnark.JLibrustzcash;
78
import org.tron.core.Constant;
89
import org.tron.core.exception.ZksnarkException;
9-
import org.tron.keystore.Wallet;
1010

1111
@AllArgsConstructor
1212
public class DiversifierT {

‎framework/src/main/java/org/tron/program/FullNode.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ public static void main(String[] args) {
3232
SolidityNode.start();
3333
return;
3434
}
35-
if (parameter.isKeystoreFactory()) {
36-
KeystoreFactory.start();
37-
return;
38-
}
3935
logger.info("Full node running.");
4036
if (Args.getInstance().isDebug()) {
4137
logger.info("in debug mode, it won't check energy time");

0 commit comments

Comments
 (0)