update web3j version.

klaytn · Jul 22, 2020 · f2f3f0f · f2f3f0f
1 parent a20a778
commit f2f3f0f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext.javapoetVersion = '1.7.0'
-    ext.web3jVersion = '4.2.0'
+    ext.web3jVersion = '4.6.1'
     ext.picocliVersion = '3.0.0'
     ext.junitVersion = '4.12'
     ext.slf4jVersion = '1.7.25'

diff --git a/codegen/src/main/java/com/klaytn/caver/codegen/SolidityFunctionWrapper.java b/codegen/src/main/java/com/klaytn/caver/codegen/SolidityFunctionWrapper.java
@@ -33,7 +33,7 @@
 import org.web3j.abi.FunctionEncoder;
 import org.web3j.abi.TypeReference;
 import org.web3j.abi.datatypes.*;
-import org.web3j.abi.datatypes.generated.AbiTypes;
+import org.web3j.abi.datatypes.AbiTypes;
 import org.web3j.protocol.ObjectMapperFactory;
 import org.web3j.protocol.core.RemoteCall;
 import org.web3j.protocol.core.methods.response.AbiDefinition;

diff --git a/core/src/main/java/com/klaytn/caver/utils/KlaySignatureDataUtils.java b/core/src/main/java/com/klaytn/caver/utils/KlaySignatureDataUtils.java
@@ -22,6 +22,7 @@
 
 import com.klaytn.caver.crypto.KlaySignatureData;
 import org.web3j.crypto.Sign;
+import org.web3j.utils.Numeric;
 
 import java.math.BigInteger;
 
@@ -35,7 +36,7 @@ public class KlaySignatureDataUtils {
      */
     public static KlaySignatureData createEip155KlaySignatureData(
             Sign.SignatureData signatureData, int chainId) {
-        int v = (signatureData.getV() + chainId * 2) + 8;
+        int v = (Numeric.toBigInt(signatureData.getV()).intValue() + chainId * 2) + 8;
         return new KlaySignatureData(BigInteger.valueOf(v).toByteArray(), signatureData.getR(), signatureData.getS());
     }
 

diff --git a/core/src/main/java/com/klaytn/caver/wallet/keyring/PrivateKey.java b/core/src/main/java/com/klaytn/caver/wallet/keyring/PrivateKey.java
@@ -73,7 +73,7 @@ public SignatureData sign(String sigHash, int chainId) {
         ECKeyPair keyPair = ECKeyPair.create(Numeric.toBigInt(privateKey));
         Sign.SignatureData signatureData = Sign.signMessage(Numeric.hexStringToByteArray(sigHash), keyPair, false);
 
-        SignatureData signData = new SignatureData(new byte[]{signatureData.getV()}, signatureData.getR(), signatureData.getS());
+        SignatureData signData = new SignatureData(signatureData.getV(), signatureData.getR(), signatureData.getS());
         signData.makeEIP155Signature(chainId);
 
         return signData;
@@ -88,7 +88,7 @@ public SignatureData signMessage(String messageHash) {
         ECKeyPair keyPair = ECKeyPair.create(Numeric.toBigInt(privateKey));
         Sign.SignatureData signatureData = Sign.signMessage(Numeric.hexStringToByteArray(messageHash), keyPair, false);
 
-        SignatureData signData = new SignatureData(new byte[]{signatureData.getV()}, signatureData.getR(), signatureData.getS());
+        SignatureData signData = new SignatureData(signatureData.getV(), signatureData.getR(), signatureData.getS());
         return signData;
     }