Merge pull request #891 from kyonRay/feature-3.7.0

<sync>(project): sync code from master.
FISCO-BCOS · Feb 28, 2024 · 67ca800 · 67ca800
2 parents 2ada6d8 + fb0898d
commit 67ca800
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/.ci/ci_check.sh b/.ci/ci_check.sh
@@ -177,9 +177,9 @@ LOG_INFO "------ check_standard_node---------"
 check_standard_node "true" "normal" "-A"
 rm -rf ./bin
 
-LOG_INFO "------ download_binary: v3.2.3---------"
-download_build_chain "v3.2.3"
-download_binary "v3.2.3"
+LOG_INFO "------ download_binary: v3.2.6---------"
+download_build_chain "v3.2.6"
+download_binary "v3.2.6"
 LOG_INFO "------ check_standard_node---------"
 check_standard_node "false" "normal" "-A"
 LOG_INFO "------ check_sm_node---------"
@@ -203,6 +203,13 @@ rm -rf ./bin
 LOG_INFO "------ download_build_chain: v3.5.0---------"
 download_binary "v3.5.0"
 download_build_chain "v3.5.0"
+LOG_INFO "------ check_standard_node---------"
+check_standard_node "true"
+rm -rf ./bin
+
+LOG_INFO "------ download_build_chain: v3.6.0---------"
+download_binary "v3.6.0"
+download_build_chain "v3.6.0"
 LOG_INFO "------ check_wasm_node---------"
 check_wasm_node "false"
 LOG_INFO "------ check_standard_node---------"

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -50,7 +50,6 @@ jobs:
         if: runner.os == 'Windows'
         run: ./gradlew.bat build
       - name: run integration testing
-        # FIXME: macOS WASM integration testing failed
         if: runner.os != 'Windows'
         run: /bin/bash .ci/ci_check.sh
 

diff --git a/.../java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/dto/BasicDeployRequest.java b/.../java/org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/dto/BasicDeployRequest.java
@@ -19,6 +19,7 @@ public BasicDeployRequest(
 
     public BasicDeployRequest(
             String abi,
+            String bin,
             BigInteger blockLimit,
             String nonce,
             BigInteger value,
@@ -27,6 +28,7 @@ public BasicDeployRequest(
             EIP1559Struct eip1559Struct,
             byte[] extension) {
         super(abi, "", "", blockLimit, nonce, value, gasPrice, gasLimit, eip1559Struct, extension);
+        this.bin = bin;
     }
 
     public String getBin() {
@@ -43,7 +45,7 @@ public void setTo(String to) {
 
     @Override
     public boolean isTransactionEssentialSatisfy() {
-        return super.isTransactionEssentialSatisfy() && bin != null;
+        return bin != null;
     }
 
     @Override

diff --git a/...org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/dto/DeployTransactionRequest.java b/...org/fisco/bcos/sdk/v3/transaction/manager/transactionv1/dto/DeployTransactionRequest.java
@@ -20,14 +20,15 @@ public DeployTransactionRequest(
 
     public DeployTransactionRequest(
             String abi,
+            String bin,
             BigInteger blockLimit,
             String nonce,
             BigInteger value,
             BigInteger gasPrice,
             BigInteger gasLimit,
             EIP1559Struct eip1559Struct,
             byte[] extension) {
-        super(abi, blockLimit, nonce, value, gasPrice, gasLimit, eip1559Struct, extension);
+        super(abi, bin, blockLimit, nonce, value, gasPrice, gasLimit, eip1559Struct, extension);
     }
 
     public void setParams(List<Object> params) {

diff --git a/...dk/v3/transaction/manager/transactionv1/dto/DeployTransactionRequestWithStringParams.java b/...dk/v3/transaction/manager/transactionv1/dto/DeployTransactionRequestWithStringParams.java
@@ -20,14 +20,15 @@ public DeployTransactionRequestWithStringParams(
 
     public DeployTransactionRequestWithStringParams(
             String abi,
+            String bin,
             BigInteger blockLimit,
             String nonce,
             BigInteger value,
             BigInteger gasPrice,
             BigInteger gasLimit,
             EIP1559Struct eip1559Struct,
             byte[] extension) {
-        super(abi, blockLimit, nonce, value, gasPrice, gasLimit, eip1559Struct, extension);
+        super(abi, bin, blockLimit, nonce, value, gasPrice, gasLimit, eip1559Struct, extension);
     }
 
     public void setStringParams(List<String> params) {

diff --git a/.../fisco/bcos/sdk/v3/transaction/manager/transactionv1/utils/TransactionRequestBuilder.java b/.../fisco/bcos/sdk/v3/transaction/manager/transactionv1/utils/TransactionRequestBuilder.java
@@ -137,6 +137,7 @@ public DeployTransactionRequest buildDeployRequest(List<Object> params)
         DeployTransactionRequest request =
                 new DeployTransactionRequest(
                         this.abi,
+                        this.bin,
                         this.blockLimit,
                         this.nonce,
                         this.value,
@@ -163,6 +164,7 @@ public DeployTransactionRequestWithStringParams buildDeployStringParamsRequest(
         DeployTransactionRequestWithStringParams request =
                 new DeployTransactionRequestWithStringParams(
                         this.abi,
+                        this.bin,
                         this.blockLimit,
                         this.nonce,
                         this.value,