diff --git a/core b/core index 2014c9ac..3b533cb9 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 2014c9ac8946765fb5119ddaf262e7d75e25e269 +Subproject commit 3b533cb94bec300c6bc4935d3c0a2db0257c19a4 diff --git a/deploy/deploy-gateway/pom.xml b/deploy/deploy-gateway/pom.xml index f13dbf16..4a5809d3 100644 --- a/deploy/deploy-gateway/pom.xml +++ b/deploy/deploy-gateway/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain deploy-root - 1.6.0-SNAPSHOT + 1.6.0.RELEASE deploy-gateway diff --git a/deploy/deploy-peer/pom.xml b/deploy/deploy-peer/pom.xml index 129a1c82..6f3982bf 100644 --- a/deploy/deploy-peer/pom.xml +++ b/deploy/deploy-peer/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain deploy-root - 1.6.0-SNAPSHOT + 1.6.0.RELEASE deploy-peer diff --git a/deploy/pom.xml b/deploy/pom.xml index 92566af0..aa02a497 100644 --- a/deploy/pom.xml +++ b/deploy/pom.xml @@ -5,15 +5,15 @@ com.jd.blockchain jdchain-parent - 1.1.6-SNAPSHOT + 1.1.6.RELEASE ../project/parent deploy-root - 1.6.0-SNAPSHOT + 1.6.0.RELEASE pom - 1.6.0-SNAPSHOT + 1.6.0.RELEASE diff --git a/docs/contract.md b/docs/contract.md index fca1fa53..d95bc638 100644 --- a/docs/contract.md +++ b/docs/contract.md @@ -90,7 +90,7 @@ JD Chain 以 Java 语言作为合约代码语言,合约引擎是基于 JVM 构 contract - 1.4.2.RELEASE + 1.6.0.RELEASE diff --git a/explorer b/explorer index 6940d904..371b776a 160000 --- a/explorer +++ b/explorer @@ -1 +1 @@ -Subproject commit 6940d904f10364f4b019193b50230c4fb3390732 +Subproject commit 371b776aa045d3fac3ebc31b2ed7c3b4e98c19f8 diff --git a/framework b/framework index 7421aa54..95e75db7 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 7421aa54f3bbaad0eb52c6201eb2709afa75dc88 +Subproject commit 95e75db78ab53e91d9ff93560e2318b0408e3d89 diff --git a/libs/bft-smart b/libs/bft-smart index d4f6246a..d64b566a 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit d4f6246a533ec0fc50dcb3e9036dcb145dc2155a +Subproject commit d64b566a4eca23655c7ae8cfc2f5f5873004212c diff --git a/libs/binary-proto b/libs/binary-proto index d9666111..2fec50a4 160000 --- a/libs/binary-proto +++ b/libs/binary-proto @@ -1 +1 @@ -Subproject commit d9666111bbb33cbbb0a34ff96ffcefba34f46c72 +Subproject commit 2fec50a46f0c8cbc62a46b057d199b722ad7bc8b diff --git a/libs/utils b/libs/utils index 3afed47b..6b2fee07 160000 --- a/libs/utils +++ b/libs/utils @@ -1 +1 @@ -Subproject commit 3afed47ba644095ad0505aab49609dfe94ecc2a1 +Subproject commit 6b2fee074500d7233dc1134ffdf1327325abedff diff --git a/pom.xml b/pom.xml index e8583531..bb6f4a63 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain jdchain-root - 1.6.0-SNAPSHOT + 1.6.0.RELEASE pom jdchain root project diff --git a/project b/project index 731ab7ec..f3ecdaaa 160000 --- a/project +++ b/project @@ -1 +1 @@ -Subproject commit 731ab7ec8602655d7b050516f05c194eb07f13d1 +Subproject commit f3ecdaaaaea64b59b60200d9a2d13665d99dfccf diff --git a/samples/contract-samples/pom.xml b/samples/contract-samples/pom.xml index 79a7b2ad..6636a31d 100644 --- a/samples/contract-samples/pom.xml +++ b/samples/contract-samples/pom.xml @@ -6,7 +6,7 @@ com.jd.blockchain jdchain-samples - 1.6.0-SNAPSHOT + 1.6.0.RELEASE diff --git a/samples/pom.xml b/samples/pom.xml index 7b89fee3..15e7952b 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -4,12 +4,12 @@ 4.0.0 com.jd.blockchain jdchain-samples - 1.6.0-SNAPSHOT + 1.6.0.RELEASE pom - 1.6.0-SNAPSHOT - 1.6.0-SNAPSHOT + 1.6.0.RELEASE + 1.6.0.RELEASE diff --git a/samples/sdk-samples/pom.xml b/samples/sdk-samples/pom.xml index 670da363..58621ec6 100644 --- a/samples/sdk-samples/pom.xml +++ b/samples/sdk-samples/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain jdchain-samples - 1.6.0-SNAPSHOT + 1.6.0.RELEASE sdk-samples diff --git a/samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/TestNet.java b/samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/TestNet.java index d8dc2a47..53a49f85 100644 --- a/samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/TestNet.java +++ b/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); diff --git a/samples/sdk-samples/src/main/resources/contract-samples-1.5.0.RELEASE.car b/samples/sdk-samples/src/main/resources/contract-samples-1.5.0.RELEASE.car deleted file mode 100644 index e159fb3b..00000000 Binary files a/samples/sdk-samples/src/main/resources/contract-samples-1.5.0.RELEASE.car and /dev/null differ diff --git a/samples/sdk-samples/src/main/resources/contract-samples-1.6.0.RELEASE.car b/samples/sdk-samples/src/main/resources/contract-samples-1.6.0.RELEASE.car new file mode 100644 index 00000000..28782dc3 Binary files /dev/null and b/samples/sdk-samples/src/main/resources/contract-samples-1.6.0.RELEASE.car differ diff --git a/samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/ContractSample.java b/samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/ContractSample.java index db6ef26a..aa9e4947 100644 --- a/samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/ContractSample.java +++ b/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(); // 提交交易 diff --git a/test b/test index cb39949b..87fae6a8 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit cb39949bd5ddd4d6734ddcf217cc54dde1eb195e +Subproject commit 87fae6a8e6795433a0c07c1bbc0129c1e964b400