以太坊生成地址默认支持效验

QuincySx · Jun 21, 2018 · cd992ba · cd992ba
1 parent 5b02e47
commit cd992ba
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/library/src/main/java/com/quincysx/crypto/eip55/EthCheckAddress.java b/library/src/main/java/com/quincysx/crypto/eip55/EthCheckAddress.java
@@ -20,7 +20,9 @@ public static String toChecksumAddress(String address) {
 
         StringBuilder result = new StringBuilder(lowercaseAddress.length() + 2);
 
-        result.append("0x");
+        if (containsHexPrefix(address)) {
+            result.append("0x");
+        }
 
         for (int i = 0; i < lowercaseAddress.length(); i++) {
             if (Integer.parseInt(String.valueOf(addressHash.charAt(i)), 16) >= 8) {

diff --git a/library/src/main/java/com/quincysx/crypto/ethereum/EthECKeyPair.java b/library/src/main/java/com/quincysx/crypto/ethereum/EthECKeyPair.java
@@ -3,6 +3,7 @@
 import com.quincysx.crypto.ECKeyPair;
 import com.quincysx.crypto.Key;
 import com.quincysx.crypto.bip32.ValidationException;
+import com.quincysx.crypto.eip55.EthCheckAddress;
 import com.quincysx.crypto.utils.HexUtils;
 import com.quincysx.crypto.utils.KECCAK256;
 
@@ -70,7 +71,7 @@ public byte[] getRawAddress() {
 
     @Override
     public String getAddress() {
-        return HexUtils.toHex(getRawAddress());
+        return EthCheckAddress.toChecksumAddress(HexUtils.toHex(getRawAddress()));
     }
 
     public ECDSASignature doSign(byte[] input) {