Merge pull request #353 from tronprotocol/develop-evan-address

Develop evan address

Author: zhaohong

src/main/java/org/tron/common/crypto/ECKey.java

@@ -40,7 +40,6 @@
 import java.util.Arrays;
 import javax.annotation.Nullable;
 import javax.crypto.KeyAgreement;
-
 import lombok.extern.slf4j.Slf4j;
 import org.spongycastle.asn1.ASN1InputStream;
 import org.spongycastle.asn1.ASN1Integer;
@@ -367,7 +366,7 @@ public static byte[] publicKeyFromPrivate(BigInteger privKey, boolean
    * Compute an address from an encoded public key.
    *
    * @param pubBytes an encoded (uncompressed) public key
-   * @return 20-byte address
+   * @return 21-byte address
    */
   public static byte[] computeAddress(byte[] pubBytes) {
     return Hash.sha3omit12(
@@ -378,7 +377,7 @@ public static byte[] computeAddress(byte[] pubBytes) {
    * Compute an address from a public point.
    *
    * @param pubPoint a public point
-   * @return 20-byte address
+   * @return 21-byte address
    */
   public static byte[] computeAddress(ECPoint pubPoint) {
     return computeAddress(pubPoint.getEncoded(/* uncompressed */ false));

src/main/java/org/tron/common/crypto/Hash.java

@@ -26,9 +26,11 @@
 import java.security.Security;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.crypto.jce.TronCastleProvider;
+import org.tron.core.Wallet;
 
 @Slf4j
 public class Hash {
+
   private static final Provider CRYPTO_PROVIDER;
 
   private static final String HASH_256_ALGORITHM_NAME;
@@ -124,10 +126,12 @@ public static byte[] sha512(byte[] input) {
    * Calculates RIGTMOST160(SHA3(input)). This is used in address calculations. *
    *
    * @param input - data
-   * @return - 20 right bytes of the hash keccak of the data
+   * @return - add_pre_fix + 20 right bytes of the hash keccak of the data
    */
   public static byte[] sha3omit12(byte[] input) {
     byte[] hash = sha3(input);
-    return copyOfRange(hash, 12, hash.length);
+    byte[] address = copyOfRange(hash, 11, hash.length);
+    address[0] = Wallet.getAddressPreFixByte();
+    return address;
   }
 }

src/main/java/org/tron/core/Constant.java

@@ -33,4 +33,10 @@ public class Constant {
   public static final String NORMAL_CONF = "config.conf";
   public static final String TEST_CONF = "config-test.conf";
   public static final String DATABASE_DIR = "storage.directory";
+
+  public static final byte ADD_PRE_FIX_BYTE_MAINNET = (byte) 0xa1;   //a1 + address  ,a1 is version
+  public static final String ADD_PRE_FIX_STRING_MAINNET = "a1";
+  public static final byte ADD_PRE_FIX_BYTE_TESTNET = (byte) 0xa0;   //a0 + address  ,a0 is version
+  public static final String ADD_PRE_FIX_STRING_TESTNET = "a0";
+  public static final int ADDRESS_SIZE = 42;
 }

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

@@ -70,6 +70,8 @@ public class Wallet {
   private Application app;
   private Node p2pnode;
   private Manager dbManager;
+  private static String addressPreFixString = Constant.ADD_PRE_FIX_STRING_TESTNET;  //default testnet
+  private static byte addressPreFixByte = Constant.ADD_PRE_FIX_BYTE_TESTNET;
 
   /**
    * Creates a new Wallet with a random ECKey.
@@ -102,6 +104,66 @@ public byte[] getAddress() {
     return ecKey.getAddress();
   }
 
+  public static String getAddressPreFixString() {
+    return addressPreFixString;
+  }
+
+  public static void setAddressPreFixString(String addressPreFixString) {
+    Wallet.addressPreFixString = addressPreFixString;
+  }
+
+  public static byte getAddressPreFixByte() {
+    return addressPreFixByte;
+  }
+
+  public static void setAddressPreFixByte(byte addressPreFixByte) {
+    Wallet.addressPreFixByte = addressPreFixByte;
+  }
+
+  public static boolean addressValid(ByteString bsAddress) {
+
+    if (bsAddress == null || bsAddress.size() == 0) {
+      logger.warn("Warning: Address is empty !!");
+      return false;
+    }
+    byte[] address = bsAddress.toByteArray();
+    return addressValid(address);
+  }
+
+  public static boolean addressValid(byte[] address) {
+    if (address == null || address.length == 0) {
+      logger.warn("Warning: Address is empty !!");
+      return false;
+    }
+    if (address.length != Constant.ADDRESS_SIZE / 2) {
+      logger.warn(
+          "Warning: Address length need " + Constant.ADDRESS_SIZE + " but " + address.length
+              + " !!");
+      return false;
+    }
+    if (address[0] != addressPreFixByte) {
+      logger.warn("Warning: Address need prefix with " + addressPreFixByte + " but "
+          + address[0] + " !!");
+      return false;
+    }
+    //Other rule;
+    return true;
+  }
+
+  public static boolean addressValid(String addressStr) {
+    if (addressStr == null || "".equals(addressStr)) {
+      logger.warn("Warning: Address is empty !!");
+      return false;
+    }
+    try {
+      byte[] address = ByteArray.fromHexString(addressStr);
+      return addressValid(address);
+    } catch (Exception e) {
+      logger.error(e.getMessage());
+      return false;
+    }
+  }
+
   /**
    * Get balance by address.
    */

src/main/java/org/tron/core/actuator/AssetIssueActuator.java

@@ -21,6 +21,7 @@
 import com.google.protobuf.InvalidProtocolBufferException;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.utils.ByteArray;
+import org.tron.core.Wallet;
 import org.tron.core.capsule.AccountCapsule;
 import org.tron.core.capsule.AssetIssueCapsule;
 import org.tron.core.capsule.TransactionResultCapsule;
@@ -85,7 +86,9 @@ public boolean validate() throws ContractValidateException {
     try {
       final AssetIssueContract assetIssueContract = this.contract.unpack(AssetIssueContract.class);
 
-      Preconditions.checkNotNull(assetIssueContract.getOwnerAddress(), "OwnerAddress is null");
+      if (!Wallet.addressValid(assetIssueContract.getOwnerAddress())) {
+        throw new ContractValidateException("Invalidate ownerAddress");
+      }
       Preconditions.checkNotNull(assetIssueContract.getName(), "name is null");
 
       if (this.dbManager.getAssetIssueStore().get(assetIssueContract.getName().toByteArray())

src/main/java/org/tron/core/actuator/CreateAccountActuator.java

@@ -5,6 +5,7 @@
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import lombok.extern.slf4j.Slf4j;
+import org.tron.core.Wallet;
 import org.tron.core.capsule.AccountCapsule;
 import org.tron.core.capsule.TransactionResultCapsule;
 import org.tron.core.db.Manager;
@@ -52,7 +53,9 @@ public boolean validate() throws ContractValidateException {
       AccountCreateContract contract = this.contract.unpack(AccountCreateContract.class);
 
       Preconditions.checkNotNull(contract.getAccountName(), "AccountName is null");
-      Preconditions.checkNotNull(contract.getOwnerAddress(), "OwnerAddress is null");
+      if (!Wallet.addressValid(contract.getOwnerAddress())) {
+        throw new ContractValidateException("Invalidate ownerAddress");
+      }
       Preconditions.checkNotNull(contract.getType(), "Type is null");
 
       if (dbManager.getAccountStore().has(contract.getOwnerAddress().toByteArray())) {

src/main/java/org/tron/core/actuator/ParticipateAssetIssueActuator.java

@@ -22,6 +22,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.joda.time.DateTime;
 import org.tron.common.utils.ByteArray;
+import org.tron.core.Wallet;
 import org.tron.core.capsule.AccountCapsule;
 import org.tron.core.capsule.AssetIssueCapsule;
 import org.tron.core.capsule.TransactionResultCapsule;
@@ -92,9 +93,12 @@ public boolean validate() throws ContractValidateException {
       final Contract.ParticipateAssetIssueContract participateAssetIssueContract =
           this.contract.unpack(Contract.ParticipateAssetIssueContract.class);
 
-      Preconditions
-          .checkNotNull(participateAssetIssueContract.getOwnerAddress(), "OwnerAddress is null");
-      Preconditions.checkNotNull(participateAssetIssueContract.getToAddress(), "ToAddress is null");
+      if (!Wallet.addressValid(participateAssetIssueContract.getOwnerAddress())) {
+        throw new ContractValidateException("Invalidate ownerAddress");
+      }
+      if (!Wallet.addressValid(participateAssetIssueContract.getToAddress())) {
+        throw new ContractValidateException("Invalidate toAddress");
+      }
       Preconditions.checkNotNull(participateAssetIssueContract.getAssetName(), "trx name is null");
       if (participateAssetIssueContract.getAmount() <= 0) {
         throw new ContractValidateException("Trx Num must be positive!");

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

@@ -5,6 +5,7 @@
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import lombok.extern.slf4j.Slf4j;
+import org.tron.core.Wallet;
 import org.tron.core.capsule.AccountCapsule;
 import org.tron.core.capsule.TransactionResultCapsule;
 import org.tron.core.config.Parameter.ChainConstant;
@@ -62,8 +63,12 @@ public boolean validate() throws ContractValidateException {
                 .getClass() + "]");
       }
       TransferContract transferContract = this.contract.unpack(TransferContract.class);
-      Preconditions.checkNotNull(transferContract.getOwnerAddress(), "OwnerAddress is null");
-      Preconditions.checkNotNull(transferContract.getToAddress(), "ToAddress is null");
+      if (!Wallet.addressValid(transferContract.getOwnerAddress())) {
+        throw new ContractValidateException("Invalidate ownerAddress");
+      }
+      if (!Wallet.addressValid(transferContract.getToAddress())) {
+        throw new ContractValidateException("Invalidate toAddress");
+      }
       Preconditions.checkNotNull(transferContract.getAmount(), "Amount is null");
 
       if (transferContract.getOwnerAddress().equals(transferContract.getToAddress())) {

src/main/java/org/tron/core/actuator/TransferAssetActuator.java

@@ -21,6 +21,7 @@
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Map;
 import org.tron.common.utils.ByteArray;
+import org.tron.core.Wallet;
 import org.tron.core.capsule.AccountCapsule;
 import org.tron.core.capsule.TransactionResultCapsule;
 import org.tron.core.db.AccountStore;
@@ -81,8 +82,12 @@ public boolean validate() throws ContractValidateException {
       TransferAssetContract transferAssetContract = this.contract
           .unpack(TransferAssetContract.class);
 
-      Preconditions.checkNotNull(transferAssetContract.getOwnerAddress(), "OwnerAddress is null");
-      Preconditions.checkNotNull(transferAssetContract.getToAddress(), "ToAddress is null");
+      if (!Wallet.addressValid(transferAssetContract.getOwnerAddress())) {
+        throw new ContractValidateException("Invalidate ownerAddress");
+      }
+      if (!Wallet.addressValid(transferAssetContract.getToAddress())) {
+        throw new ContractValidateException("Invalidate toAddress");
+      }
       Preconditions.checkNotNull(transferAssetContract.getAssetName(), "AssetName is null");
       Preconditions.checkNotNull(transferAssetContract.getAmount(), "Amount is null");
       if (transferAssetContract.getOwnerAddress().equals(transferAssetContract.getToAddress())) {

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

@@ -1,12 +1,12 @@
 package org.tron.core.actuator;
 
-import com.google.common.base.Preconditions;
 import com.google.protobuf.Any;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Iterator;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.utils.ByteArray;
+import org.tron.core.Wallet;
 import org.tron.core.capsule.AccountCapsule;
 import org.tron.core.capsule.TransactionResultCapsule;
 import org.tron.core.db.AccountStore;
@@ -50,8 +50,10 @@ public boolean validate() throws ContractValidateException {
       }
 
       VoteWitnessContract contract = this.contract.unpack(VoteWitnessContract.class);
+      if (!Wallet.addressValid(contract.getOwnerAddress())) {
+        throw new ContractValidateException("Invalidate address");
+      }
       ByteString ownerAddress = contract.getOwnerAddress();
-      Preconditions.checkNotNull(ownerAddress, "OwnerAddress is null");
 
       AccountStore accountStore = dbManager.getAccountStore();
       byte[] ownerAddressBytes = ownerAddress.toByteArray();