<fix>(transaction): fix transaction version not set bug. (#900)

kyonRay · web-flow · commit e1a3eae56bdc · 2024-03-11T19:30:24.000+08:00
diff --git a/src/integration-test/java/org/fisco/bcos/sdk/v3/test/transaction/manager/TransactionManagerPayableTest.java b/src/integration-test/java/org/fisco/bcos/sdk/v3/test/transaction/manager/TransactionManagerPayableTest.java
@@ -168,6 +168,7 @@ private boolean checkSkip() throws ContractException {
                 balanceService.getBalance(client.getCryptoSuite().getCryptoKeyPair().getAddress());
         if (balance.compareTo(BigInteger.valueOf(100000)) < 0) {
             System.out.println("balance is not enough");
+            return true;
         }
         return false;
     }
diff --git a/src/main/java/org/fisco/bcos/sdk/v3/client/protocol/model/JsonTransactionResponse.java b/src/main/java/org/fisco/bcos/sdk/v3/client/protocol/model/JsonTransactionResponse.java
@@ -550,6 +550,9 @@ public String toString() {
                 + ", maxPriorityFeePerGas='"
                 + maxPriorityFeePerGas
                 + '\''
+                + ", extension='"
+                + (extension == null ? "null" : Hex.toHexString(extension))
+                + '\''
                 + '}';
     }
 }
diff --git a/src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/AssembleTransactionService.java b/src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/AssembleTransactionService.java
@@ -102,6 +102,7 @@ public TransactionResponse sendTransaction(BasicRequest request)
         }
         AbiEncodedRequest abiEncodedRequest = new AbiEncodedRequest(request);
         abiEncodedRequest.setEncodedData(encodeMethod);
+        abiEncodedRequest.setVersion(request.getVersion());
 
         TransactionReceipt receipt = transactionManager.sendTransaction(abiEncodedRequest);
         if (Objects.nonNull(receipt)
@@ -152,6 +153,7 @@ public TransactionResponse deployContract(BasicDeployRequest request)
         }
         AbiEncodedRequest abiEncodedRequest = new AbiEncodedRequest(request);
         abiEncodedRequest.setEncodedData(encodeConstructor);
+        abiEncodedRequest.setVersion(request.getVersion());
         abiEncodedRequest.setCreate(true);
         TransactionReceipt receipt = transactionManager.sendTransaction(abiEncodedRequest);
         if (Objects.nonNull(receipt)
@@ -201,6 +203,7 @@ public String asyncSendTransaction(BasicRequest request, TransactionCallback cal
             throw new ContractCodecException("Request type error, please check.");
         }
         AbiEncodedRequest abiEncodedRequest = new AbiEncodedRequest(request);
+        abiEncodedRequest.setVersion(request.getVersion());
         abiEncodedRequest.setEncodedData(encodeMethod);
         return transactionManager.asyncSendTransaction(abiEncodedRequest, callback);
     }
@@ -246,6 +249,7 @@ public String asyncDeployContract(BasicDeployRequest request, TransactionCallbac
         }
         AbiEncodedRequest abiEncodedRequest = new AbiEncodedRequest(request);
         abiEncodedRequest.setEncodedData(encodeConstructor);
+        abiEncodedRequest.setVersion(request.getVersion());
         abiEncodedRequest.setCreate(true);
         return transactionManager.asyncSendTransaction(abiEncodedRequest, callback);
     }
diff --git a/src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/DefaultTransactionManager.java b/src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/DefaultTransactionManager.java
@@ -158,6 +158,7 @@ public TxPair createSignedTransaction(AbiEncodedRequest request) throws JniExcep
 
         TransactionData transactionData =
                 new TransactionData()
+                        .buildVersion(request.getVersion().getValue())
                         .buildGroupId(client.getGroup())
                         .buildChainId(client.getChainId())
                         .buildTo(request.getTo())
diff --git a/src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/ProxySignTransactionManager.java b/src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/ProxySignTransactionManager.java
@@ -9,7 +9,6 @@
 import org.fisco.bcos.sdk.jni.utilities.tx.TransactionData;
 import org.fisco.bcos.sdk.jni.utilities.tx.TransactionDataV1;
 import org.fisco.bcos.sdk.jni.utilities.tx.TransactionDataV2;
-import org.fisco.bcos.sdk.jni.utilities.tx.TransactionStructBuilderJniObj;
 import org.fisco.bcos.sdk.jni.utilities.tx.TransactionVersion;
 import org.fisco.bcos.sdk.jni.utilities.tx.TxPair;
 import org.fisco.bcos.sdk.v3.client.Client;
@@ -178,6 +177,7 @@ public TxPair createSignedTransaction(AbiEncodedRequest request) throws JniExcep
 
         TransactionData transactionData =
                 new TransactionData()
+                        .buildVersion(request.getVersion().getValue())
                         .buildGroupId(client.getGroup())
                         .buildChainId(client.getChainId())
                         .buildTo(request.getTo())
@@ -208,9 +208,7 @@ public TxPair createSignedTransaction(AbiEncodedRequest request) throws JniExcep
                     new TransactionDataV2((TransactionDataV1) transactionData)
                             .buildExtension(request.getExtension());
         }
-        String dataHash =
-                TransactionStructBuilderJniObj.calcTransactionDataStructHash(
-                        cryptoType, transactionData);
+        String dataHash = transactionData.calculateHash(cryptoType);
 
         CompletableFuture<SignatureResult> signFuture = new CompletableFuture<>();
         SignatureResult signatureResult;
@@ -230,12 +228,13 @@ public TxPair createSignedTransaction(AbiEncodedRequest request) throws JniExcep
             throw new JniException("Sign transaction failed, error message: " + e.getMessage());
         }
         String signedTransactionWithSignature =
-                TransactionStructBuilderJniObj.createEncodedTransaction(
-                        transactionData,
-                        Hex.toHexString(signatureResult.encode()),
-                        dataHash,
-                        transactionAttribute,
-                        client.getExtraData());
+                new org.fisco.bcos.sdk.jni.utilities.tx.Transaction()
+                        .buildTransactionData(transactionData)
+                        .buildDataHash(Hex.decode(dataHash))
+                        .buildAttribute(transactionAttribute)
+                        .buildSignature(signatureResult.encode())
+                        .buildExtraData(client.getExtraData())
+                        .encode();
         return new TxPair(dataHash, signedTransactionWithSignature);
     }
 
diff --git a/src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/dto/AbiEncodedRequest.java b/src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/dto/AbiEncodedRequest.java
@@ -1,6 +1,7 @@
 package org.fisco.bcos.sdk.v3.transaction.manager.transactionv1.dto;
 
 import java.math.BigInteger;
+import org.fisco.bcos.sdk.jni.utilities.tx.TransactionVersion;
 import org.fisco.bcos.sdk.v3.transaction.gasProvider.EIP1559Struct;
 
 public class AbiEncodedRequest extends BasicRequest {
@@ -9,6 +10,7 @@ public class AbiEncodedRequest extends BasicRequest {
     protected boolean isCreate = false;
 
     public AbiEncodedRequest(
+            TransactionVersion version,
             String abi,
             String to,
             BigInteger blockLimit,
@@ -18,11 +20,23 @@ public AbiEncodedRequest(
             BigInteger gasLimit,
             EIP1559Struct eip1559Struct,
             byte[] extension) {
-        super(abi, "", to, blockLimit, nonce, value, gasPrice, gasLimit, eip1559Struct, extension);
+        super(
+                version,
+                abi,
+                "",
+                to,
+                blockLimit,
+                nonce,
+                value,
+                gasPrice,
+                gasLimit,
+                eip1559Struct,
+                extension);
     }
 
     public AbiEncodedRequest(BasicRequest request) {
         super(
+                request.getVersion(),
                 request.getAbi(),
                 "",
                 request.getTo(),
diff --git a/src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/dto/BasicDeployRequest.java b/src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/dto/BasicDeployRequest.java
@@ -1,6 +1,7 @@
 package org.fisco.bcos.sdk.v3.transaction.manager.transactionv1.dto;
 
 import java.math.BigInteger;
+import org.fisco.bcos.sdk.jni.utilities.tx.TransactionVersion;
 import org.fisco.bcos.sdk.v3.transaction.gasProvider.EIP1559Struct;
 
 public class BasicDeployRequest extends BasicRequest {
@@ -18,6 +19,7 @@ public BasicDeployRequest(
     }
 
     public BasicDeployRequest(
+            TransactionVersion version,
             String abi,
             String bin,
             BigInteger blockLimit,
@@ -27,7 +29,18 @@ public BasicDeployRequest(
             BigInteger gasLimit,
             EIP1559Struct eip1559Struct,
             byte[] extension) {
-        super(abi, "", "", blockLimit, nonce, value, gasPrice, gasLimit, eip1559Struct, extension);
+        super(
+                version,
+                abi,
+                "",
+                "",
+                blockLimit,
+                nonce,
+                value,
+                gasPrice,
+                gasLimit,
+                eip1559Struct,
+                extension);
         this.bin = bin;
     }
 
diff --git a/src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/dto/BasicRequest.java b/src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/dto/BasicRequest.java
@@ -6,7 +6,7 @@
 
 public class BasicRequest {
 
-    protected TransactionVersion version = TransactionVersion.V0;
+    protected TransactionVersion version = TransactionVersion.V1;
     protected String abi;
     protected String method;
     protected BigInteger blockLimit;
@@ -38,6 +38,7 @@ public BasicRequest(
     }
 
     public BasicRequest(
+            TransactionVersion version,
             String abi,
             String method,
             String to,
@@ -48,6 +49,7 @@ public BasicRequest(
             BigInteger gasLimit,
             EIP1559Struct eip1559Struct,
             byte[] extension) {
+        this.version = version;
         this.abi = abi;
         this.method = method;
         this.blockLimit = blockLimit;
diff --git a/src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/dto/DeployTransactionRequest.java b/src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/dto/DeployTransactionRequest.java
@@ -2,6 +2,7 @@
 
 import java.math.BigInteger;
 import java.util.List;
+import org.fisco.bcos.sdk.jni.utilities.tx.TransactionVersion;
 import org.fisco.bcos.sdk.v3.transaction.gasProvider.EIP1559Struct;
 
 public class DeployTransactionRequest extends BasicDeployRequest {
@@ -19,6 +20,7 @@ public DeployTransactionRequest(
     }
 
     public DeployTransactionRequest(
+            TransactionVersion version,
             String abi,
             String bin,
             BigInteger blockLimit,
@@ -28,7 +30,17 @@ public DeployTransactionRequest(
             BigInteger gasLimit,
             EIP1559Struct eip1559Struct,
             byte[] extension) {
-        super(abi, bin, blockLimit, nonce, value, gasPrice, gasLimit, eip1559Struct, extension);
+        super(
+                version,
+                abi,
+                bin,
+                blockLimit,
+                nonce,
+                value,
+                gasPrice,
+                gasLimit,
+                eip1559Struct,
+                extension);
     }
 
     public void setParams(List<Object> params) {
diff --git a/src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/dto/DeployTransactionRequestWithStringParams.java b/src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/dto/DeployTransactionRequestWithStringParams.java
@@ -2,6 +2,7 @@
 
 import java.math.BigInteger;
 import java.util.List;
+import org.fisco.bcos.sdk.jni.utilities.tx.TransactionVersion;
 import org.fisco.bcos.sdk.v3.transaction.gasProvider.EIP1559Struct;
 
 public class DeployTransactionRequestWithStringParams extends BasicDeployRequest {
@@ -19,6 +20,7 @@ public DeployTransactionRequestWithStringParams(
     }
 
     public DeployTransactionRequestWithStringParams(
+            TransactionVersion version,
             String abi,
             String bin,
             BigInteger blockLimit,
@@ -28,7 +30,17 @@ public DeployTransactionRequestWithStringParams(
             BigInteger gasLimit,
             EIP1559Struct eip1559Struct,
             byte[] extension) {
-        super(abi, bin, blockLimit, nonce, value, gasPrice, gasLimit, eip1559Struct, extension);
+        super(
+                version,
+                abi,
+                bin,
+                blockLimit,
+                nonce,
+                value,
+                gasPrice,
+                gasLimit,
+                eip1559Struct,
+                extension);
     }
 
     public void setStringParams(List<String> params) {
diff --git a/src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/dto/TransactionRequest.java b/src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/dto/TransactionRequest.java
@@ -2,6 +2,7 @@
 
 import java.math.BigInteger;
 import java.util.List;
+import org.fisco.bcos.sdk.jni.utilities.tx.TransactionVersion;
 import org.fisco.bcos.sdk.v3.transaction.gasProvider.EIP1559Struct;
 
 public class TransactionRequest extends BasicRequest {
@@ -19,6 +20,7 @@ public TransactionRequest(
     }
 
     public TransactionRequest(
+            TransactionVersion version,
             String abi,
             String method,
             String to,
@@ -30,6 +32,7 @@ public TransactionRequest(
             EIP1559Struct eip1559Struct,
             byte[] extension) {
         super(
+                version,
                 abi,
                 method,
                 to,
diff --git a/src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/dto/TransactionRequestWithStringParams.java b/src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/dto/TransactionRequestWithStringParams.java
@@ -2,6 +2,7 @@
 
 import java.math.BigInteger;
 import java.util.List;
+import org.fisco.bcos.sdk.jni.utilities.tx.TransactionVersion;
 import org.fisco.bcos.sdk.v3.transaction.gasProvider.EIP1559Struct;
 
 public class TransactionRequestWithStringParams extends BasicRequest {
@@ -20,6 +21,7 @@ public TransactionRequestWithStringParams(
     }
 
     public TransactionRequestWithStringParams(
+            TransactionVersion version,
             String abi,
             String method,
             String to,
@@ -31,6 +33,7 @@ public TransactionRequestWithStringParams(
             EIP1559Struct eip1559Struct,
             byte[] extension) {
         super(
+                version,
                 abi,
                 method,
                 to,
diff --git a/src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/utils/TransactionRequestBuilder.java b/src/main/java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/utils/TransactionRequestBuilder.java

Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,7 @@ private boolean checkSkip() throws ContractException {`
`168`	`168`	`balanceService.getBalance(client.getCryptoSuite().getCryptoKeyPair().getAddress());`
`169`	`169`	`if (balance.compareTo(BigInteger.valueOf(100000)) < 0) {`
`170`	`170`	`System.out.println("balance is not enough");`
	`171`	`+ return true;`
`171`	`172`	`}`
`172`	`173`	`return false;`
`173`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -550,6 +550,9 @@ public String toString() {`
`550`	`550`	`+ ", maxPriorityFeePerGas='"`
`551`	`551`	`+ maxPriorityFeePerGas`
`552`	`552`	`+ '\''`
	`553`	`+ + ", extension='"`
	`554`	`+ + (extension == null ? "null" : Hex.toHexString(extension))`
	`555`	`+ + '\''`
`553`	`556`	`+ '}';`
`554`	`557`	`}`
`555`	`558`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ public TransactionResponse sendTransaction(BasicRequest request)`
`102`	`102`	`}`
`103`	`103`	`AbiEncodedRequest abiEncodedRequest = new AbiEncodedRequest(request);`
`104`	`104`	`abiEncodedRequest.setEncodedData(encodeMethod);`
	`105`	`+ abiEncodedRequest.setVersion(request.getVersion());`
`105`	`106`
`106`	`107`	`TransactionReceipt receipt = transactionManager.sendTransaction(abiEncodedRequest);`
`107`	`108`	`if (Objects.nonNull(receipt)`
`@@ -152,6 +153,7 @@ public TransactionResponse deployContract(BasicDeployRequest request)`
`152`	`153`	`}`
`153`	`154`	`AbiEncodedRequest abiEncodedRequest = new AbiEncodedRequest(request);`
`154`	`155`	`abiEncodedRequest.setEncodedData(encodeConstructor);`
	`156`	`+ abiEncodedRequest.setVersion(request.getVersion());`
`155`	`157`	`abiEncodedRequest.setCreate(true);`
`156`	`158`	`TransactionReceipt receipt = transactionManager.sendTransaction(abiEncodedRequest);`
`157`	`159`	`if (Objects.nonNull(receipt)`
`@@ -201,6 +203,7 @@ public String asyncSendTransaction(BasicRequest request, TransactionCallback cal`
`201`	`203`	`throw new ContractCodecException("Request type error, please check.");`
`202`	`204`	`}`
`203`	`205`	`AbiEncodedRequest abiEncodedRequest = new AbiEncodedRequest(request);`
	`206`	`+ abiEncodedRequest.setVersion(request.getVersion());`
`204`	`207`	`abiEncodedRequest.setEncodedData(encodeMethod);`
`205`	`208`	`return transactionManager.asyncSendTransaction(abiEncodedRequest, callback);`
`206`	`209`	`}`
`@@ -246,6 +249,7 @@ public String asyncDeployContract(BasicDeployRequest request, TransactionCallbac`
`246`	`249`	`}`
`247`	`250`	`AbiEncodedRequest abiEncodedRequest = new AbiEncodedRequest(request);`
`248`	`251`	`abiEncodedRequest.setEncodedData(encodeConstructor);`
	`252`	`+ abiEncodedRequest.setVersion(request.getVersion());`
`249`	`253`	`abiEncodedRequest.setCreate(true);`
`250`	`254`	`return transactionManager.asyncSendTransaction(abiEncodedRequest, callback);`
`251`	`255`	`}`