<fix>(transaction,client): fix transaction manager async method not call back when exception occurs, DefaultTransactionManager adapt jni new interface with nonce, fix negotiatedProtocol init moment. (#865)

Author: kyonRay

build.gradle

@@ -24,7 +24,7 @@ ext {
     webankJavaCryptoVersion = "1.0.3"
     junitVersion = '4.13.2'
     commonsCollections4Version = "4.4"
-    bcosSdkJniVersion = "3.6.0-SNAPSHOT"
+    bcosSdkJniVersion = "3.6.0-DEV-SNAPSHOT"
     slf4jApiVerison = '1.7.36'
     mockitoVersion = '4.8.0'
     gsonVersion = '2.10.1'
@@ -159,13 +159,13 @@ configurations {
 }
 
 task integrationTest(type: Test) {
-    dependsOn test
+//    dependsOn test
     testClassesDirs = sourceSets.integrationTest.output.classesDirs
     classpath = sourceSets.integrationTest.runtimeClasspath
 }
 
 task integrationWasmTest(type: Test) {
-    dependsOn test
+//    dependsOn test
     testClassesDirs = sourceSets.integrationWasmTest.output.classesDirs
     classpath = sourceSets.integrationWasmTest.runtimeClasspath
 }
@@ -208,9 +208,9 @@ jacocoTestReport {
     }
 }
 
-tasks.withType(Test) {
-    finalizedBy jacocoTestReport
-}
+//tasks.withType(Test) {
+//    finalizedBy jacocoTestReport
+//}
 
 publishing {
     publications {

src/main/java/org/fisco/bcos/sdk/v3/client/ClientImpl.java

@@ -158,8 +158,6 @@ protected ClientImpl(String groupID, ConfigOption configOption, long nativePoint
         this.groupID = groupID;
         this.configOption = configOption;
         this.rpcJniObj = RpcJniObj.build(nativePointer);
-        this.negotiatedProtocol = BcosSDKJniObj.negotiatedProtocolInfo(nativePointer);
-
         // start rpc
         start();
 
@@ -181,7 +179,8 @@ protected ClientImpl(String groupID, ConfigOption configOption, long nativePoint
                 this.cryptoSuite = new CryptoSuite(CryptoType.ECDSA_TYPE, configOption);
             }
         }
-
+        // should be assigned after session connect
+        this.negotiatedProtocol = BcosSDKJniObj.negotiatedProtocolInfo(nativePointer);
         logger.info(
                 "ClientImpl constructor, groupID: {}, nativePointer: {}, smCrypto: {}, wasm: {}",
                 groupID,

src/main/java/org/fisco/bcos/sdk/v3/contract/Contract.java

@@ -568,7 +568,10 @@ protected String createSignedTransaction(Function function) {
                         this.functionEncoder.encode(function),
                         BigInteger.ZERO,
                         BigInteger.ZERO,
-                        BigInteger.ZERO);
+                        BigInteger.ZERO,
+                        client.getBlockLimit(),
+                        "",
+                        false);
             } catch (JniException e) {
                 logger.error("createSignedTransaction failed, error info: {}", e.getMessage(), e);
                 return null;

src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv2/DefaultTransactionManager.java

@@ -11,6 +11,7 @@
 import org.fisco.bcos.sdk.v3.client.protocol.response.BcosTransactionReceipt;
 import org.fisco.bcos.sdk.v3.client.protocol.response.Call;
 import org.fisco.bcos.sdk.v3.crypto.signature.SignatureResult;
+import org.fisco.bcos.sdk.v3.model.Response;
 import org.fisco.bcos.sdk.v3.model.TransactionReceipt;
 import org.fisco.bcos.sdk.v3.model.callback.RespCallback;
 import org.fisco.bcos.sdk.v3.model.callback.TransactionCallback;
@@ -36,7 +37,7 @@ public class DefaultTransactionManager extends TransactionManager {
     private NonceProvider nonceProvider = new DefaultNonceProvider();
     private static final Logger logger = LoggerFactory.getLogger(DefaultTransactionManager.class);
 
-    protected DefaultTransactionManager(Client client) {
+    public DefaultTransactionManager(Client client) {
         super(client);
     }
 
@@ -142,32 +143,11 @@ public TransactionReceipt sendTransaction(
             String abi,
             boolean constructor)
             throws JniException {
-        int transactionAttribute;
-        if (client.isWASM()) {
-            transactionAttribute = TransactionAttribute.LIQUID_SCALE_CODEC;
-            if (constructor) {
-                transactionAttribute |= TransactionAttribute.LIQUID_CREATE;
-            }
-        } else {
-            transactionAttribute = TransactionAttribute.EVM_ABI_CODEC;
-        }
-        TxPair txPair =
-                TransactionBuilderV2JniObj.createSignedTransactionWithFullFields(
-                        client.getCryptoSuite().getCryptoKeyPair().getJniKeyPair(),
-                        client.getGroup(),
-                        client.getChainId(),
-                        to == null ? "" : to,
-                        data,
-                        (abi == null || !constructor) ? "" : abi,
-                        blockLimit.longValue(),
-                        Numeric.toHexString(value),
-                        Numeric.toHexString(gasPrice),
-                        gasLimit == null ? 0 : gasLimit.longValue(),
-                        transactionAttribute,
-                        client.getExtraData());
+        String signTx =
+                createSignedTransaction(
+                        to, data, value, gasPrice, gasLimit, blockLimit, abi, constructor);
 
-        BcosTransactionReceipt bcosTransactionReceipt =
-                client.sendTransaction(txPair.getSignedTx(), false);
+        BcosTransactionReceipt bcosTransactionReceipt = client.sendTransaction(signTx, false);
         return bcosTransactionReceipt.getTransactionReceipt();
     }
 
@@ -179,15 +159,30 @@ public TransactionReceipt sendTransaction(
      * @param value The value to be transferred with the transaction.
      * @param gasPrice The price of gas for the transaction.
      * @param gasLimit The maximum amount of gas that can be used for the transaction.
+     * @param blockLimit The maximum block number that can be used for the transaction, if
+     *     blockLimit is zero, then get client blockLimit
+     * @param abi ABI JSON string, generated by compile contract, should fill in when you deploy
+     *     contract
+     * @param constructor If you deploy contract, should set to be true.
      * @return A Hex string representation of the signed transaction.
      */
     @Override
     public String createSignedTransaction(
-            String to, byte[] data, BigInteger value, BigInteger gasPrice, BigInteger gasLimit)
+            String to,
+            byte[] data,
+            BigInteger value,
+            BigInteger gasPrice,
+            BigInteger gasLimit,
+            BigInteger blockLimit,
+            String abi,
+            boolean constructor)
             throws JniException {
         int transactionAttribute;
         if (client.isWASM()) {
             transactionAttribute = TransactionAttribute.LIQUID_SCALE_CODEC;
+            if (constructor) {
+                transactionAttribute |= TransactionAttribute.LIQUID_CREATE;
+            }
         } else {
             transactionAttribute = TransactionAttribute.EVM_ABI_CODEC;
         }
@@ -197,9 +192,10 @@ public String createSignedTransaction(
                         client.getGroup(),
                         client.getChainId(),
                         to == null ? "" : to,
+                        getNonceProvider().getNonce(),
                         data,
-                        "",
-                        client.getBlockLimit().longValue(),
+                        (abi == null || !constructor) ? "" : abi,
+                        blockLimit.longValue(),
                         Numeric.toHexString(value),
                         Numeric.toHexString(gasPrice),
                         gasLimit == null ? 0 : gasLimit.longValue(),
@@ -324,6 +320,7 @@ public String asyncSendTransaction(
                         client.getGroup(),
                         client.getChainId(),
                         to == null ? "" : to,
+                        getNonceProvider().getNonce(),
                         data,
                         (abi == null || !constructor) ? "" : abi,
                         blockLimit.longValue(),
@@ -398,6 +395,7 @@ public TransactionReceipt sendTransactionEIP1559(
                         client.getGroup(),
                         client.getChainId(),
                         to == null ? "" : to,
+                        getNonceProvider().getNonce(),
                         data,
                         (abi == null || !constructor) ? "" : abi,
                         blockLimit.longValue(),
@@ -476,6 +474,7 @@ public String asyncSendTransactionEIP1559(
                         client.getGroup(),
                         client.getChainId(),
                         to == null ? "" : to,
+                        getNonceProvider().getNonce(),
                         data,
                         (abi == null || !constructor) ? "" : abi,
                         blockLimit.longValue(),
@@ -542,7 +541,7 @@ public void asyncSendCall(String to, byte[] data, RespCallback<Call> callback) {
                     new Transaction("", to, data), Hex.toHexString(signature.encode()), callback);
         } catch (Exception e) {
             logger.error("Send call failed, error message: {}", e.getMessage(), e);
-            throw new RuntimeException(e);
+            callback.onError(new Response(-1, e.getMessage()));
         }
     }