From 6081b6f461731e8fa777e35714403e5ce3b0b19f Mon Sep 17 00:00:00 2001 From: dalaocu Date: Fri, 12 Nov 2021 17:05:31 +0800 Subject: [PATCH] fix methods --- .../manager/AssembleTransactionProcessor.java | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 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 e3d8e0d4d..40db65bb1 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 @@ -246,9 +246,9 @@ public TransactionResponse sendTransactionAndGetResponse( throws TransactionBaseException, ABICodecException { String signedData; if (cryptoKeyPair == null) { - signedData = createSignedTransaction(to, data, cryptoKeyPair); - } else { signedData = createSignedTransaction(to, data, this.cryptoKeyPair); + } else { + signedData = createSignedTransaction(to, data, cryptoKeyPair); } TransactionReceipt receipt = this.transactionPusher.push(signedData); try { @@ -282,8 +282,19 @@ public TransactionResponse sendTransactionAndGetResponse( public TransactionResponse sendTransactionWithStringParamsAndGetResponse( String to, String abi, String functionName, List params) throws ABICodecException, TransactionBaseException { + return sendTransactionWithStringParamsAndGetResponse( + to, abi, functionName, params, this.cryptoKeyPair); + } + + public TransactionResponse sendTransactionWithStringParamsAndGetResponse( + String to, + String abi, + String functionName, + List params, + CryptoKeyPair cryptoKeyPair) + throws ABICodecException, TransactionBaseException { String data = abiCodec.encodeMethodFromString(abi, functionName, params); - return sendTransactionAndGetResponse(to, abi, functionName, data); + return sendTransactionAndGetResponse(to, abi, functionName, data, cryptoKeyPair); } @Override @@ -314,11 +325,8 @@ public TransactionResponse sendTransactionAndGetResponseByContractLoader( String functionName, List funcParams) throws ABICodecException, TransactionBaseException { - return sendTransactionAndGetResponse( - contractAddress, - contractLoader.getABIByContractName(contractName), - functionName, - funcParams); + return sendTransactionAndGetResponseByContractLoader( + contractName, contractAddress, functionName, funcParams, this.cryptoKeyPair); } public TransactionResponse sendTransactionAndGetResponseByContractLoader(