release 1.6.0

core

@@ -1 +1 @@
-Subproject commit 2014c9ac8946765fb5119ddaf262e7d75e25e269
+Subproject commit 3b533cb94bec300c6bc4935d3c0a2db0257c19a4

deploy/deploy-gateway/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>deploy-root</artifactId>
-		<version>1.6.0-SNAPSHOT</version>
+		<version>1.6.0.RELEASE</version>
 	</parent>
 	<artifactId>deploy-gateway</artifactId>
 

deploy/deploy-peer/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>deploy-root</artifactId>
-		<version>1.6.0-SNAPSHOT</version>
+		<version>1.6.0.RELEASE</version>
 	</parent>
 	<artifactId>deploy-peer</artifactId>
 

deploy/pom.xml

@@ -5,15 +5,15 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-parent</artifactId>
-		<version>1.1.6-SNAPSHOT</version>
+		<version>1.1.6.RELEASE</version>
 		<relativePath>../project/parent</relativePath>
 	</parent>
 	<artifactId>deploy-root</artifactId>
-	<version>1.6.0-SNAPSHOT</version>
+	<version>1.6.0.RELEASE</version>
 	<packaging>pom</packaging>
 
 	<properties>
-		<core.version>1.6.0-SNAPSHOT</core.version>
+		<core.version>1.6.0.RELEASE</core.version>
 	</properties>
 
 	<modules>

docs/contract.md

@@ -90,7 +90,7 @@ JD Chain 以 Java 语言作为合约代码语言，合约引擎是基于 JVM 构
   <packaging>contract</packaging>
 
   <properties>
-     <jdchain.version>1.4.2.RELEASE</jdchain.version>
+     <jdchain.version>1.6.0.RELEASE</jdchain.version>
   </properties>
   
   <dependencies>

explorer

@@ -1 +1 @@
-Subproject commit 6940d904f10364f4b019193b50230c4fb3390732
+Subproject commit 371b776aa045d3fac3ebc31b2ed7c3b4e98c19f8

framework

@@ -1 +1 @@
-Subproject commit 7421aa54f3bbaad0eb52c6201eb2709afa75dc88
+Subproject commit 95e75db78ab53e91d9ff93560e2318b0408e3d89

libs/bft-smart

@@ -1 +1 @@
-Subproject commit d4f6246a533ec0fc50dcb3e9036dcb145dc2155a
+Subproject commit d64b566a4eca23655c7ae8cfc2f5f5873004212c

libs/binary-proto

@@ -1 +1 @@
-Subproject commit d9666111bbb33cbbb0a34ff96ffcefba34f46c72
+Subproject commit 2fec50a46f0c8cbc62a46b057d199b722ad7bc8b

libs/utils

@@ -1 +1 @@
-Subproject commit 3afed47ba644095ad0505aab49609dfe94ecc2a1
+Subproject commit 6b2fee074500d7233dc1134ffdf1327325abedff

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.jd.blockchain</groupId>
 	<artifactId>jdchain-root</artifactId>
-	<version>1.6.0-SNAPSHOT</version>
+	<version>1.6.0.RELEASE</version>
 	<packaging>pom</packaging>
 	<description>jdchain root project</description>
 

project

@@ -1 +1 @@
-Subproject commit 731ab7ec8602655d7b050516f05c194eb07f13d1
+Subproject commit f3ecdaaaaea64b59b60200d9a2d13665d99dfccf

samples/contract-samples/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.jd.blockchain</groupId>
         <artifactId>jdchain-samples</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0.RELEASE</version>
     </parent>
 
     <!-- 声明为合约代码工程，编译输出扩展名为".car"合约代码 -->

samples/pom.xml

@@ -4,12 +4,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.jd.blockchain</groupId>
     <artifactId>jdchain-samples</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.6.0.RELEASE</version>
     <packaging>pom</packaging>
 
     <properties>
-        <framework.version>1.6.0-SNAPSHOT</framework.version>
-        <core.version>1.6.0-SNAPSHOT</core.version>
+        <framework.version>1.6.0.RELEASE</framework.version>
+        <core.version>1.6.0.RELEASE</core.version>
     </properties>
 
     <modules>

samples/sdk-samples/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.jd.blockchain</groupId>
         <artifactId>jdchain-samples</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0.RELEASE</version>
     </parent>
     <artifactId>sdk-samples</artifactId>
 

samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/TestNet.java

@@ -287,7 +287,7 @@ public class TestNet {
         txTemp.eventAccounts().register(user.getIdentity());
         txTemp.eventAccount(user.getAddress()).publish("sample-event", "sample-content", -1);
         // 初始化一个合约
-        txTemp.contracts().deploy(user.getIdentity(), FileUtils.readBytes(new ClassPathResource("contract-samples-1.5.0.RELEASE.car").getFile()));
+        txTemp.contracts().deploy(user.getIdentity(), FileUtils.readBytes(new ClassPathResource("contract-samples-1.6.0.RELEASE.car").getFile()));
 
         PreparedTransaction ptx = txTemp.prepare();
         ptx.sign(admin);

samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/ContractSample.java

@@ -42,7 +42,7 @@ public class ContractSample extends SampleBase {
         BlockchainKeypair contractAccount = BlockchainKeyGenerator.getInstance().generate();
         System.out.println("合约地址：" + contractAccount.getAddress());
         // 部署合约
-        txTemp.contracts().deploy(contractAccount.getIdentity(), FileUtils.readBytes("src/main/resources/contract-samples-1.5.0.RELEASE.car"));
+        txTemp.contracts().deploy(contractAccount.getIdentity(), FileUtils.readBytes("src/main/resources/contract-samples-1.6.0.RELEASE.car"));
         // 准备交易
         PreparedTransaction ptx = txTemp.prepare();
         // 提交交易
@@ -63,7 +63,7 @@ public class ContractSample extends SampleBase {
         BlockchainIdentity contractIdentity = new BlockchainIdentityData(KeyGenUtils.decodePubKey("7VeRCfSaoBW3uRuvTqVb26PYTNwvQ1iZ5HBY92YKpEVN7Qht"));
         System.out.println("合约地址：" + contractIdentity.getAddress());
         // 部署合约
-        txTemp.contracts().deploy(contractIdentity, FileUtils.readBytes("src/main/resources/contract-samples-1.5.0.RELEASE.car"));
+        txTemp.contracts().deploy(contractIdentity, FileUtils.readBytes("src/main/resources/contract-samples-1.6.0.RELEASE.car"));
         // 准备交易
         PreparedTransaction ptx = txTemp.prepare();
         // 提交交易

test

@@ -1 +1 @@
-Subproject commit cb39949bd5ddd4d6734ddcf217cc54dde1eb195e
+Subproject commit 87fae6a8e6795433a0c07c1bbc0129c1e964b400