From bbbf8417ee0076dbb2cc0e40799d2872fa837bb8 Mon Sep 17 00:00:00 2001 From: liuyuanmu Date: Fri, 29 Oct 2021 20:04:38 +0800 Subject: [PATCH] release 1.6.0 --- core | 2 +- deploy/deploy-gateway/pom.xml | 2 +- deploy/deploy-peer/pom.xml | 2 +- deploy/pom.xml | 6 +++--- docs/contract.md | 2 +- explorer | 2 +- framework | 2 +- libs/bft-smart | 2 +- libs/binary-proto | 2 +- libs/utils | 2 +- pom.xml | 2 +- project | 2 +- samples/contract-samples/pom.xml | 2 +- samples/pom.xml | 6 +++--- samples/sdk-samples/pom.xml | 2 +- .../src/main/java/com/jdchain/samples/sdk/TestNet.java | 2 +- .../main/resources/contract-samples-1.5.0.RELEASE.car | Bin 3537 -> 0 bytes .../main/resources/contract-samples-1.6.0.RELEASE.car | Bin 0 -> 6616 bytes .../java/com/jdchain/samples/sdk/ContractSample.java | 4 ++-- test | 2 +- 20 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 samples/sdk-samples/src/main/resources/contract-samples-1.5.0.RELEASE.car create mode 100644 samples/sdk-samples/src/main/resources/contract-samples-1.6.0.RELEASE.car 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 e159fb3b65e8e464f30d8e9fc99a8a282ac39cd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 KcmV+b0RR6000031 literal 3537 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 z00;;GE|J7io7ZwsQ2_t|-~s>uF#rGnV{dIQYGh+*VQFqJb75_8Y-MvVV{dMBa$#e1 zFH>P{aBO8mZ*FvQVPkYIV{Bn_bDfb(PQx$|hG+UpDd_`RBsc(wf&# zo`|)K6vFx8Xv*fy378r?u8E}@57tp``X0jGeWHvEg(tQ212I%8GR#n3jc_#LQRqyc z96yNoGoLW293CkXGj5!Vug%q5C^JB)C>9EYYUU5&?4PDmPj)QEQX3IJXb~eE6r}2} zN(kNj-X$|^$azGqA@p)JbNVgs&JsV6dXlN>d%EH!5sFg}_D_V+aHAyV;#vm8x-JW6 zfylc*No^qPuk%vm@OTln2+&z3y$t-Fn*Ms(dN{|k#f>4GEovU=(q_sxV z(oiN)hmBQGC(y`*KcGRtE&?`zW)Wx-XcZN25oi|`Z<{900000000mG?LiO$ z002!zR6#9CPDU?KO928D0}22D2mk;sk;GB}000000000000004000000000001yD} zK{o*a0Ap`$FHlPX0u%!Z000O804|ZlQUCw|000000000001N;C000000000G0PR6p z0RRAFZ*4DXWMgPyX>Ko2O928D0}22D2mk;sk;GB}00000000000000K0000000000 z01yD}L4yGR0Ap`$FKT3CXklq?FLPmSaBO9BFHlPX0u%!Z000O804|ZlQUCw|00000 z000000384T000000000G0PR7w0RRAFZ*4DXWMgPyX>KobVQp}1WpgiMZ*FvQVPkYJ zP)h*<6ay3h00;;GE|J7iD@0&Kqz3>1L>B-6H2?qr0000000000q=E1O003ieZ7*tM zV`yP%ZZC6TZE$R5b1!3WZgg^CV{|W5VQp}1WkYXnbaG*1bV+S+Y%XJLVRLg(O928D z0~7!N2nYZ!k;GD)*K$x%0RRBt0ssIp00000000000001_f#(ST0Ap`$FKT3CXklq? zFLPmSaBO9BFJo_RbaG*1bT3n3ZE$R5LvL<$a$#e1E@NzAb8}Ej1qJ{B000O82mmw! L004&z00000)v~+S 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 0000000000000000000000000000000000000000..28782dc37e3bbe05a6f0c32393e57126bdc3a1b1 GIT binary patch literal 6616 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 z002!zR6#9CPDU?HK~70VMN?ERO-4{l0Rj{Q3IG5I007yQT~h!60000000000000R9 z00000000005CH8#5&-}JO+{2eElEyBFHlPX0u%!Z000O80N9mXQvd(}0000000000 z00aO4000000000G0PR6J0RRAFZ*4D7O928D0}22D2mk=sm0eQ+00000000000000C z000000000001yD}L0bU;0Ap`$FKT3CXklq?FHlPX0u%!Z000O80N9mXQvd(}00000 z0000002BZK000000000G0PR7A0RRAFZ*4DXWMgPyX>KobVQp}1Wpgi3O928D0}22D z2mk=sm0eQ+00000000000000T000000000001yD}LAL<_0Ap`$FKT3CXklq?FLPmS zaBO9BFJo_RbaG*1bT3d#0Rj{Q6aWAS2msiXT~l}#%Y|SN000s*001=r0000000000 z005+c@&NzP{aBO8mZ*FvQVPkYj zZE$QZV{Bn_b5KhG0u%!j000OG0N9mXQ-hM?BE$gz0LKFW05<>t00000000000HlGX z5&!^WZ*4DXWMgPyX>KobVQp}1WpgiMZ*FvQVPkYJQ(P{aBO8mZ*FvQVPkYIV{Bn_b5KhK W1^@s600{sI0GR>+04Wy$0002({+;^( literal 0 KcmV+b0RR6000031 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