bug fixed

Author: tempofeng

etherspace-java/src/main/java/cc/etherspace/Web3.kt

@@ -60,9 +60,6 @@ interface Web3 {
     }
 
     interface Personal {
-        @Throws(IOException::class)
-        fun ecRecover(dataThatWasSigned: String, signature: Signature): String
-
         @Throws(IOException::class)
         fun ecRecover(dataThatWasSigned: ByteArray, signature: Signature): String
     }

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

@@ -25,16 +25,10 @@ class Web3jAdapter(val web3j: Web3j) : Web3 {
     override val eth: Web3jEth = Web3jEth()
 
     class Web3jPersonal : Web3.Personal {
-        override fun ecRecover(dataThatWasSigned: String, signature: Web3.Signature): String =
-                ecRecover(dataThatWasSigned.toByteArray(Charsets.UTF_8), signature)
-
         override fun ecRecover(dataThatWasSigned: ByteArray, signature: Web3.Signature): String {
             val prefixMsgHash = attachEthereumSignedMessage(dataThatWasSigned)
-            val ecdsaSignature = ECDSASignature(Numeric.toBigInt(signature.r),
-                    Numeric.toBigInt(signature.s))
-            val publicKey = RecoverFromSignature.recoverFromSignature(signature.v - 27,
-                    ecdsaSignature,
-                    prefixMsgHash)
+            val publicKey = Sign.signedMessageToKey(prefixMsgHash,
+                    Sign.SignatureData(signature.v, signature.r, signature.s))
             return Keys.toChecksumAddress(Numeric.prependHexPrefix(Keys.getAddress(publicKey)))
         }
     }

etherspace-java/src/main/java/org/web3j/crypto/RecoverFromSignature.java

@@ -52,8 +52,8 @@ class Web3jAdapterTest {
                 Numeric.hexStringToByteArray("0x70757c5a9bad86a90c89951c078ff45e0830c99aa313576d7dba349568251a9c"))
 
         val data = Numeric.hexStringToByteArray("0x48540bdede62ae1b3868651336d31d36c29100af9db1559945879d14532a8067")
-        val address = web3jAdapter.eth.personal.ecRecover(data, signature)
-        address.`should be equal to`(address)
+        val recoveredAddress = web3jAdapter.eth.personal.ecRecover(data, signature)
+        address.`should be equal to`(recoveredAddress)
     }
 
     @Test