using checksum address if we can

Author: tempofeng

etherspace-java/src/main/java/cc/etherspace/web3j/Web3jAbi.kt

@@ -11,6 +11,7 @@ import org.web3j.abi.datatypes.*
 import org.web3j.abi.datatypes.Event
 import org.web3j.abi.datatypes.Function
 import org.web3j.abi.datatypes.generated.*
+import org.web3j.crypto.Keys
 import unsigned.*
 import java.lang.reflect.Constructor
 import java.math.BigInteger
@@ -89,7 +90,7 @@ class Web3jAbi : Web3.Abi {
             is unsigned.Uint -> Uint32(value.toBigInt())
             is unsigned.Ulong -> Uint64(value.toBigInt())
             is SolNumber -> value.toWeb3jValue()
-            is SolAddress -> Address(value.address)
+            is SolAddress -> Address(Keys.toChecksumAddress(value.address))
             is Byte -> Bytes1(byteArrayOf(value))
             is SolBytes -> value.toWeb3jValue()
             is ByteArray -> DynamicBytes(value)
@@ -143,7 +144,7 @@ class Web3jAbi : Web3.Abi {
             is Uint32 -> value.value.toUint()
             is Uint16 -> value.value.toUshort()
             is NumericType -> value.toSolValue()
-            is Address -> SolAddress(value.value)
+            is Address -> SolAddress(Keys.toChecksumAddress(value.value))
             is Bytes1 -> value.value[0]
             is Bytes -> value.toSolValue()
             is DynamicBytes -> value.value

etherspace-java/src/main/java/cc/etherspace/web3j/Web3jAdapter.kt

@@ -84,9 +84,9 @@ class Web3jAdapter(val web3j: Web3j) : Web3 {
                     blockNumber,
                     transactionHash,
                     transactionIndex,
-                    from,
-                    to,
-                    contractAddress,
+                    from?.let { Keys.toChecksumAddress(it) },
+                    to?.let { Keys.toChecksumAddress(it) },
+                    contractAddress?.let { Keys.toChecksumAddress(it) },
                     cumulativeGasUsed,
                     gasUsed,
                     logs.map { it.toWeb3Log() },

etherspace-java/src/test/java/cc/etherspace/CredentialsTest.kt

@@ -2,20 +2,21 @@ package cc.etherspace
 
 import org.amshove.kluent.`should be equal to`
 import org.junit.Test
+import org.web3j.crypto.Keys
 
 class CredentialsTest {
     @Test
     fun create() {
         val credentials = Credentials("0xab1e199623aa5bb2c381c349b1734e31b5be08de0486ffab68e3af4853d9980b")
-        credentials.address.`should be equal to`("0x39759a3c0ada2d61b6ca8eb6afc8243075307ed3")
+        credentials.address.`should be equal to`(Keys.toChecksumAddress("0x39759a3c0ada2d61b6ca8eb6afc8243075307ed3"))
         credentials.privateKey.`should be equal to`("0xab1e199623aa5bb2c381c349b1734e31b5be08de0486ffab68e3af4853d9980b")
     }
 
     @Test
     fun create_wallet() {
         val credentials = Credentials("etherspace",
                 "{\"address\":\"c1574afd83ad551280f692f448679a2e7633ed5d\",\"id\":\"7f3d1f13-ee1d-4370-b6eb-60c230472802\",\"version\":3,\"crypto\":{\"cipher\":\"aes-128-ctr\",\"ciphertext\":\"594605db2823c918c1e6f1e09bdd0345c70dbb457727b0140488f87335a2d2ad\",\"cipherparams\":{\"iv\":\"c28d25055c656fd5592d12e9ae8c05ef\"},\"kdf\":\"scrypt\",\"kdfparams\":{\"dklen\":32,\"n\":262144,\"p\":1,\"r\":8,\"salt\":\"eb1ac7b57f5f7a95aeef253ce179a72241bcab12577cdba6ac92b5f4895a69e0\"},\"mac\":\"95765f8b19be3498d446427f5331916062330d616be7e5f02259eefa816dd224\"}}")
-        credentials.address.`should be equal to`("0xc1574afd83ad551280f692f448679a2e7633ed5d")
+        credentials.address.`should be equal to`(Keys.toChecksumAddress("0xc1574afd83ad551280f692f448679a2e7633ed5d"))
         credentials.privateKey.`should be equal to`("0x8eb73b6101b5b82cde31cf3818db392dfdca84b1790c91e01c4c34536a288394")
     }
 }

etherspace-java/src/test/java/cc/etherspace/Tests.kt

@@ -1,7 +1,11 @@
 package cc.etherspace
 
+import org.web3j.crypto.Keys
+
 object Tests {
     const val TEST_WALLET_KEY = "0xab1e199623aa5bb2c381c349b1734e31b5be08de0486ffab68e3af4853d9980b"
-    const val TEST_WALLET_ADDRESS = "0x39759a3c0ada2d61b6ca8eb6afc8243075307ed3"
-    const val TEST_CONTRACT_ADDRESS = "0xa871c507184ecfaf947253e187826c1907e8dc7d"
+    @JvmField
+    val TEST_WALLET_ADDRESS = Keys.toChecksumAddress("0x39759a3c0ada2d61b6ca8eb6afc8243075307ed3")!!
+    @JvmField
+    val TEST_CONTRACT_ADDRESS = Keys.toChecksumAddress("0xa871c507184ecfaf947253e187826c1907e8dc7d")!!
 }