Merge pull request #713 from FISCO-BCOS/release-2.6.2

Release 2.6.2

Author: ywy2090

.ci/ci_check.sh

@@ -7,11 +7,11 @@ java -version
 # code format check
 bash gradlew verifyGoogleJavaFormat
 # build
-bash gradlew build
+bash gradlew build -x integrationTest
 # UT test
 bash gradlew test
 
-curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.5.0/build_chain.sh && chmod u+x build_chain.sh
+curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.6.0/build_chain.sh && chmod u+x build_chain.sh
 echo "127.0.0.1:4 agency1 1,2,3" > ipconf
 
 # bash build_chain.sh -h

.github/workflows/workflow.yml

@@ -1,4 +1,4 @@
-name: Java-SDK GitHub Actions
+name: Web3SDK GitHub Actions
 on:
   push:
   pull_request:
@@ -18,9 +18,6 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 5
-      - name: check commit
-        if: ${{ runner.os == 'Linux' && github.base_ref != 'master' && github.event_name == 'pull_request' }}
-        run: bash .ci/ci_check_commit.sh
       - name: install macOS dependencies
         if: runner.os == 'macOS'
         run: brew install [email protected] openjdk

.travis.yml

@@ -29,13 +29,27 @@ jobs:
       dist: xenial
       sudo: required
 
+    # ubuntu 16
+    - language: java
+      jdk: openjdk14
+      os: linux
+      dist: xenial
+      sudo: required
+
     # ubuntu 16
     - language: java
       jdk: oraclejdk11
       os: linux
       dist: xenial
       sudo: required
 
+    # ubuntu 16
+    - language: java
+      jdk: oraclejdk14
+      os: linux
+      dist: xenial
+      sudo: required
+
     # ubuntu 18
     - language: java
       jdk: openjdk8
@@ -50,13 +64,27 @@ jobs:
       dist: bionic
       sudo: required
 
+    # ubuntu 18
+    - language: java
+      jdk: openjdk14
+      os: linux
+      dist: bionic
+      sudo: required
+
     # ubuntu 18
     - language: java
       jdk: oraclejdk11
       os: linux
       dist: bionic
       sudo: required
 
+    # ubuntu 18
+    - language: java
+      jdk: oraclejdk14
+      os: linux
+      dist: bionic
+      sudo: required
+
 #    # os
 #    - language: java
 #        os: osx
@@ -73,7 +101,5 @@ cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
-before_install:
-  - gradle wrapper
 script: |
   bash .ci/ci_check.sh

Changelog.md

@@ -1,3 +1,17 @@
+### v2.6.2
+
+(2020-08-24)
+
+* 新增
+1. 支持JDK 14
+
+* 修复
+1. 修复`Table.sol Entry::getUint`接口返回`int256`的bug
+
+* 兼容
+1. 适配fisco-bcos 2.6.0版本，支持Channel Message v1/V2/V3协议
+
+
 ### v2.6.0
 
 (2020-08-12)

build.gradle

@@ -141,9 +141,9 @@ tasks.clean.dependsOn(tasks.cleanBuildArtifacts)
 check.dependsOn integrationTest
 integrationTest.mustRunAfter test
 
-check.dependsOn.remove(test)
-check.dependsOn.remove(integrationTest)
-check.dependsOn.remove(verifyGoogleJavaFormat)
+//check.dependsOn.remove(test)
+//check.dependsOn.remove(integrationTest)
+//check.dependsOn.remove(verifyGoogleJavaFormat)
 
 jar {
     // destinationDir file('dist/apps')
@@ -195,7 +195,7 @@ jar {
 
 test {
     testLogging {
-        // showStandardStreams = true
+        showStandardStreams = true
         // events "started","passed","skipped","failed"
         events "passed","skipped","failed"
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

publish.gradle

@@ -94,7 +94,7 @@ dependencies {
 
 archivesBaseName = 'web3sdk'
 group = 'org.fisco-bcos'
-version = '2.6.0-SNAPSHOT'
+version = '2.6.2-SNAPSHOT'
 
 // Additional attribute definition
 

release_note.txt

@@ -1 +1 @@
-v2.6.0
+v2.6.2

solidity/Table.sol

@@ -26,7 +26,7 @@ contract Condition {
 //one record
 contract Entry {
     function getInt(string) public constant returns (int256);
-    function getUInt(string) public constant returns (int256);
+    function getUInt(string) public constant returns (uint256);
     function getAddress(string) public constant returns (address);
     function getBytes64(string) public constant returns (bytes1[64]);
     function getBytes32(string) public constant returns (bytes32);
@@ -60,7 +60,7 @@ contract KVTableFactory {
     function createTable(string, string, string) public returns (int256);
 }
 
-//KVTable per permiary key has only one Entry
+//KVTable per primary key has only one Entry
 contract KVTable {
     function get(string) public constant returns (bool, Entry);
     function set(string, Entry) public returns (int256);

src/integration-test/java/org/fisco/bcos/precompile/CnsServiceTest.java

@@ -79,7 +79,8 @@ public void getContractAddressFromNameAndVersion() throws Exception {
         "cnsResolver address"
             + cnsService.getAddressByContractNameAndVersion(okDemo.getContractAddress()));
 
-    Ok okLoaded = Ok.load(name, web3j, credentials, gasPrice, gasLimit);
+    String contractAddress = cnsService.getAddressByContractNameAndVersion(name + ":10.0");
+    Ok okLoaded = Ok.load(contractAddress, web3j, credentials, gasPrice, gasLimit);
     System.out.println(okLoaded.isValid());
     BigInteger balance = okLoaded.get().send();
     System.out.println("balance = " + balance);

src/integration-test/java/org/fisco/bcos/precompile/PermissionServiceTest.java

@@ -1,22 +1,26 @@
 package org.fisco.bcos.precompile;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import org.fisco.bcos.TestBase;
-import org.fisco.bcos.web3j.precompile.exception.PrecompileMessageException;
+import org.fisco.bcos.web3j.precompile.common.PrecompiledCommon;
 import org.fisco.bcos.web3j.precompile.permission.PermissionService;
+import org.fisco.bcos.web3j.protocol.core.methods.response.TransactionReceipt;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class PermissionServiceTest extends TestBase {
 
 
   private PermissionService permissionService = new PermissionService(web3j, credentials);
 
-  @Test(expected= PrecompileMessageException.class) 
+  @Test
   public void userTableManager() throws Exception {
-  	
-	  permissionService.grantUserTableManager("tt", Common.TX_ORIGIN);
-  
+		TransactionReceipt transactionReceipt = permissionService.grantAndRetReceipt("tt", Common.TX_ORIGIN);
+		Assert.assertTrue(transactionReceipt.isStatusOK());
+		int i = PrecompiledCommon.handleTransactionReceiptForCRUD(transactionReceipt);
+		assertEquals(i , 1);
   }
 
   @Test

src/integration-test/java/org/fisco/bcos/web3j/Web3jApITest.java

@@ -56,6 +56,12 @@ public void getBlockNumberCache() throws IOException {
     assertNotNull(blockNumberCache);
   }
 
+  @Test
+  public void getBlockNumberLimit() throws IOException {
+    BigInteger blockLimit = web3j.getBlockLimit();
+    assertNotNull(blockLimit);
+  }
+
   @Test
   public void pbftView() throws Exception {
     PbftView pbftView = web3j.getPbftView().send();

src/main/java/org/fisco/bcos/channel/client/BcosResponseCallback.java

@@ -14,7 +14,7 @@ public abstract class BcosResponseCallback {
     public abstract void onResponse(BcosResponse response);
 
     public void onTimeout() {
-        logger.error("Processing bcos message timeout:{}");
+        // logger.error("Processing bcos message timeout:{}");
 
         BcosResponse response = new BcosResponse();
         response.setErrorCode(ChannelMessageError.MESSAGE_TIMEOUT.getError());

src/main/java/org/fisco/bcos/channel/client/ChannelResponseCallback2.java

@@ -49,7 +49,7 @@ public final void onResponse(ChannelResponse response) {
     }
 
     public final void onTimeout() {
-        logger.error("send message timeout:{}", message.getSeq());
+        // logger.error("send message timeout:{}", message.getSeq());
 
         ChannelResponse response = new ChannelResponse();
         response.setErrorCode(ChannelMessageError.MESSAGE_TIMEOUT.getError());

src/main/java/org/fisco/bcos/channel/client/Service.java

@@ -18,6 +18,7 @@
 import java.security.NoSuchProviderException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
+import java.security.Security;
 import java.security.cert.CertificateException;
 import java.security.spec.InvalidKeySpecException;
 import java.util.ArrayList;
@@ -292,7 +293,11 @@ private void parseFromTopic2KeyInfo()
     }
 
     public void initJavaOpt() {
-        logger.trace(" initJavaOpt empty func .");
+
+        logger.info(" #jdk.disabled.namedCurves. ");
+
+        Security.setProperty("jdk.disabled.namedCurves", "");
+
         /*
         System.setProperty("jdk.tls.namedGroups", "secp256k1");
         logger.info(
@@ -485,9 +490,12 @@ public void asyncSendEthereumMessage(
                             new TimerTask() {
                                 @Override
                                 public void run(Timeout timeout) throws Exception {
-                                    // 处理超时逻辑
+                                    logger.error(
+                                            "transaction callback timeout, seq: {}, timeout: {}",
+                                            request.getMessageID(),
+                                            request.getTimeout());
+
                                     callbackInner.onTimeout();
-                                    // timeout时清除map的数据,所以尽管后面有回包数据，也会找不到seq->callback的关系
                                     seq2TransactionCallback.remove(request.getMessageID());
                                 }
                             },
@@ -588,6 +596,10 @@ public void asyncSendEthereumMessage(BcosRequest request, BcosResponseCallback c
 
                                     @Override
                                     public void run(Timeout timeout) throws Exception {
+                                        logger.error(
+                                                "process bcos message timeout, seq: {}, timeout: {}",
+                                                bcosMessage.getSeq(),
+                                                request.getTimeout());
                                         // handle timer
                                         _callback.onTimeout();
                                     }
@@ -702,6 +714,10 @@ public void asyncSendChannelMessage2(
                                         public void run(Timeout timeout) throws Exception {
                                             // process timeout logic
                                             _callback.onTimeout();
+                                            logger.error(
+                                                    "process channel message timeout, seq: {}, timeout: {}",
+                                                    channelMessage.getSeq(),
+                                                    request.getTimeout());
                                         }
                                     },
                                     request.getTimeout(),

src/main/java/org/fisco/bcos/channel/client/TransactionSucCallback.java

@@ -12,12 +12,10 @@ public abstract class TransactionSucCallback {
     public abstract void onResponse(TransactionReceipt response);
 
     public void onTimeout() {
-        logger.error("transactionSuc timeout");
-
         TransactionReceipt receipt = new TransactionReceipt();
-        receipt.setStatus("Transaction receipt timeout.");
+        receipt.setStatus("Transaction receipt timeout");
         // For console can get error message when timeout
-        receipt.setMessage("Transaction receipt timeout.");
+        receipt.setMessage("Transaction receipt timeout");
         onResponse(receipt);
     }
 

src/main/java/org/fisco/bcos/channel/handler/ChannelConnections.java

@@ -91,10 +91,10 @@ public class ChannelConnections {
     private long sslHandShakeTimeout = (long) 10000;
 
     private static final String helpInfo =
-            "The reasons for failure may be: "
-                    + "1. the configured certificate is not the same set of certificates as the node's certificate; "
-                    + "2. the configured certificate is not issued by the same authority as the node's certificate. "
-                    + "Please refer to https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/sdk/java_sdk.html#id24";
+            "The reasons for failure may be: \n"
+                    + "\t1. the configured certificate is not the same set of certificates as the node's certificate; \n"
+                    + "\t2. the configured certificate is not issued by the same authority as the node's certificate. \n"
+                    + "\tPlease refer to https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/sdk/java_sdk.html#id24 \n";
 
     public Map<String, ChannelHandlerContext> networkConnections =
             new ConcurrentHashMap<String, ChannelHandlerContext>();
@@ -459,7 +459,6 @@ public void initChannel(SocketChannel ch) throws Exception {
                             tuple3.getValue1(),
                             tuple3.getValue2());
                     errorMessageList.add(sslHandshakeFailedMessage);
-                    errorMessageList.add(helpInfo);
                     continue;
                 }
 
@@ -478,7 +477,6 @@ public void initChannel(SocketChannel ch) throws Exception {
                                     + tuple3.getValue2();
 
                     errorMessageList.add(sslHandshakeFailedMessage);
-                    errorMessageList.add(helpInfo);
                 }
             }
         }
@@ -487,7 +485,7 @@ public void initChannel(SocketChannel ch) throws Exception {
         if (!atLeastOneConnectSuccess) {
             logger.error(" all connections have failed, " + errorMessageList.toString());
             throw new RuntimeException(
-                    " Failed to connect to nodes: " + errorMessageList.toString());
+                    " Failed to connect to nodes: " + errorMessageList.toString() + helpInfo);
         }
 
         running = true;

src/main/java/org/fisco/bcos/channel/handler/ConnectionCallback.java

@@ -308,6 +308,9 @@ public void onResponse(BcosResponse response) {
                                     public void run(Timeout timeout) throws Exception {
                                         // handle timer
                                         _callback.onTimeout();
+                                        logger.error(
+                                                "queryNodeVersion timeout, seq: {}",
+                                                bcosMessage.getSeq());
                                     }
                                 },
                                 queryNodeVersionTimeoutMS,