From 8b8978dd66a4686178248b2f972a50be62d645ed Mon Sep 17 00:00:00 2001 From: dalaocu Date: Wed, 28 Oct 2020 15:35:58 +0800 Subject: [PATCH 1/2] fix bug of event parse --- .../sdk/transaction/codec/decode/TransactionDecoderService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/codec/decode/TransactionDecoderService.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/codec/decode/TransactionDecoderService.java index ce2fa1c19..329eb7a9a 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/codec/decode/TransactionDecoderService.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/codec/decode/TransactionDecoderService.java @@ -122,7 +122,7 @@ public Map>> decodeEvents(String abi, List logs) (name, events) -> { for (ABIDefinition abiDefinition : events) { ABIObjectFactory abiObjectFactory = new ABIObjectFactory(); - ABIObject outputObject = abiObjectFactory.createInputObject(abiDefinition); + ABIObject outputObject = abiObjectFactory.createEventInputObject(abiDefinition); ABICodecObject abiCodecObject = new ABICodecObject(); for (Logs log : logs) { String eventSignature = From 00b03c9c772ae3e45d870c8fa7cb94176dbe8291 Mon Sep 17 00:00:00 2001 From: dalaocu Date: Thu, 29 Oct 2020 11:11:21 +0800 Subject: [PATCH 2/2] change return code of call --- .../sdk/transaction/manager/AssembleTransactionProcessor.java | 3 ++- .../fisco/bcos/sdk/transaction/model/dto/CommonResponse.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessor.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessor.java index b794b4c0c..9ba2a7565 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessor.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessor.java @@ -40,6 +40,7 @@ import org.fisco.bcos.sdk.transaction.pusher.TransactionPusherService; import org.fisco.bcos.sdk.transaction.tools.ContractLoader; import org.fisco.bcos.sdk.transaction.tools.JsonUtils; +import org.fisco.bcos.sdk.utils.Numeric; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -315,7 +316,7 @@ private CallResponse parseCallResponseStatus(Call.CallOutput callOutput) throws TransactionBaseException { CallResponse callResponse = new CallResponse(); RetCode retCode = ReceiptParser.parseCallOutput(callOutput, ""); - callResponse.setReturnCode(retCode.getCode()); + callResponse.setReturnCode(Numeric.decodeQuantity(callOutput.getStatus()).intValue()); callResponse.setReturnMessage(retCode.getMessage()); if (!retCode.getMessage().equals(PrecompiledRetCode.CODE_SUCCESS.getMessage())) { throw new TransactionBaseException(retCode); diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/model/dto/CommonResponse.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/model/dto/CommonResponse.java index 32ac334a6..c395054a3 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/model/dto/CommonResponse.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/model/dto/CommonResponse.java @@ -42,7 +42,8 @@ public int getReturnCode() { return returnCode; } - /** @param returnCode the returnCode to set */ + /** + * @param returnCode the returnCode to set */ public void setReturnCode(int returnCode) { this.returnCode = returnCode; }