From 3cc2b7a1335d4229a5dc61fc0a4e9f31cad9ccf7 Mon Sep 17 00:00:00 2001 From: apratt3377 Date: Thu, 27 Aug 2020 06:59:41 -0400 Subject: [PATCH 1/4] changes to be compatible with web3j 4.6.0 --- .../java/org/web3j/quorum/UnixSocketClient.java | 2 +- .../web3j/quorum/tx/ClientTransactionManager.java | 15 ++++++++++++--- .../quorum/enclave/protocol/EnclaveService.kt | 4 ++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/web3j/quorum/UnixSocketClient.java b/src/main/java/org/web3j/quorum/UnixSocketClient.java index c84fd5d..26a9dbf 100644 --- a/src/main/java/org/web3j/quorum/UnixSocketClient.java +++ b/src/main/java/org/web3j/quorum/UnixSocketClient.java @@ -40,7 +40,7 @@ public static void main(String[] args) { .build(); RequestBody requestBody = - RequestBody.create(okhttp3.MediaType.parse("application/json"), PAYLOAD); + RequestBody.create(PAYLOAD, okhttp3.MediaType.parse("application/json")); // use a proper host name as a DNS lookup still occurs (localhost should suffice) Request request = diff --git a/src/main/java/org/web3j/quorum/tx/ClientTransactionManager.java b/src/main/java/org/web3j/quorum/tx/ClientTransactionManager.java index 40ff296..d5b97c0 100644 --- a/src/main/java/org/web3j/quorum/tx/ClientTransactionManager.java +++ b/src/main/java/org/web3j/quorum/tx/ClientTransactionManager.java @@ -97,7 +97,6 @@ public EthSendTransaction sendTransaction( return quorum.ethSendTransaction(transaction).send(); } - @Override public EthSendTransaction sendTransaction( BigInteger gasPrice, BigInteger gasLimit, @@ -109,7 +108,18 @@ public EthSendTransaction sendTransaction( return sendTransaction(gasPrice, gasLimit, to, data, value); } - @Override + public EthSendTransaction sendTransactionEIP1559( + BigInteger gasPrice, + BigInteger feeCap, + BigInteger gasLimit, + String to, + String data, + BigInteger value, + boolean constructor) + throws IOException { + return sendTransactionEIP1559(gasPrice, feeCap, gasLimit, to, data, value); + } + public String sendCall(String to, String data, DefaultBlockParameter defaultBlockParameter) throws IOException { return quorum.ethCall( @@ -119,7 +129,6 @@ public String sendCall(String to, String data, DefaultBlockParameter defaultBloc .getValue(); } - @Override public EthGetCode getCode(String contractAddress, DefaultBlockParameter defaultBlockParameter) throws IOException { return quorum.ethGetCode(contractAddress, defaultBlockParameter).send(); diff --git a/src/main/kotlin/org/web3j/quorum/enclave/protocol/EnclaveService.kt b/src/main/kotlin/org/web3j/quorum/enclave/protocol/EnclaveService.kt index 069b600..3a8571f 100644 --- a/src/main/kotlin/org/web3j/quorum/enclave/protocol/EnclaveService.kt +++ b/src/main/kotlin/org/web3j/quorum/enclave/protocol/EnclaveService.kt @@ -15,9 +15,9 @@ package org.web3j.quorum.enclave.protocol import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import okhttp3.MediaType.Companion.toMediaTypeOrNull +import okhttp3.RequestBody.Companion.toRequestBody import okhttp3.OkHttpClient import okhttp3.Request -import okhttp3.RequestBody import org.web3j.quorum.enclave.EnclaveClientConnectionException /** @@ -36,7 +36,7 @@ class EnclaveService(private val url: String, private val port: Int, private val fun send(request: S, path: String, responseType: Class): T { val payload = objectMapper.writeValueAsString(request) val uri = "$url:$port/$path" - val body = RequestBody.create(JSON_MEDIA_TYPE, payload) + val body = payload.toRequestBody(JSON_MEDIA_TYPE) val buildRequest = Request.Builder() .url(uri) .post(body) From d84cbd3897b08da5a4d8cc3317e38be1ae448568 Mon Sep 17 00:00:00 2001 From: apratt3377 Date: Thu, 27 Aug 2020 07:43:36 -0400 Subject: [PATCH 2/4] add back deleted overrides --- .../java/org/web3j/quorum/tx/ClientTransactionManager.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/web3j/quorum/tx/ClientTransactionManager.java b/src/main/java/org/web3j/quorum/tx/ClientTransactionManager.java index d5b97c0..5de88e7 100644 --- a/src/main/java/org/web3j/quorum/tx/ClientTransactionManager.java +++ b/src/main/java/org/web3j/quorum/tx/ClientTransactionManager.java @@ -97,6 +97,7 @@ public EthSendTransaction sendTransaction( return quorum.ethSendTransaction(transaction).send(); } + @Override public EthSendTransaction sendTransaction( BigInteger gasPrice, BigInteger gasLimit, @@ -108,6 +109,7 @@ public EthSendTransaction sendTransaction( return sendTransaction(gasPrice, gasLimit, to, data, value); } + @Override public EthSendTransaction sendTransactionEIP1559( BigInteger gasPrice, BigInteger feeCap, @@ -120,6 +122,7 @@ public EthSendTransaction sendTransactionEIP1559( return sendTransactionEIP1559(gasPrice, feeCap, gasLimit, to, data, value); } + @Override public String sendCall(String to, String data, DefaultBlockParameter defaultBlockParameter) throws IOException { return quorum.ethCall( @@ -129,6 +132,7 @@ public String sendCall(String to, String data, DefaultBlockParameter defaultBloc .getValue(); } + @Override public EthGetCode getCode(String contractAddress, DefaultBlockParameter defaultBlockParameter) throws IOException { return quorum.ethGetCode(contractAddress, defaultBlockParameter).send(); From 0fb87a7a71249dcac966ef1fe3d4eb65b288b99e Mon Sep 17 00:00:00 2001 From: apratt3377 Date: Fri, 28 Aug 2020 09:56:29 -0400 Subject: [PATCH 3/4] thow unsupported exception for EIP1559 send --- src/main/java/org/web3j/quorum/tx/ClientTransactionManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/web3j/quorum/tx/ClientTransactionManager.java b/src/main/java/org/web3j/quorum/tx/ClientTransactionManager.java index 5de88e7..a329a20 100644 --- a/src/main/java/org/web3j/quorum/tx/ClientTransactionManager.java +++ b/src/main/java/org/web3j/quorum/tx/ClientTransactionManager.java @@ -119,7 +119,7 @@ public EthSendTransaction sendTransactionEIP1559( BigInteger value, boolean constructor) throws IOException { - return sendTransactionEIP1559(gasPrice, feeCap, gasLimit, to, data, value); + throw new UnsupportedOperationException("sendTransactionEIP1559 is not available"); } @Override From be2e29e051cb8c5459a68fa780605c470fac5e89 Mon Sep 17 00:00:00 2001 From: apratt3377 Date: Thu, 10 Sep 2020 09:33:21 -0400 Subject: [PATCH 4/4] update to current web3j version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2bc2ab9..007f94e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ group=org.web3j -version=4.6.0-SNAPSHOT +version=4.7.0-SNAPSHOT