From 34f9240e8dbafd0821377dee4502d9fcb5b2e0e7 Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Tue, 30 Nov 2021 11:06:00 +0800 Subject: [PATCH 01/42] =?UTF-8?q?raft=20consensus=20=E5=88=86=E6=94=AF?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 3b533cb9..509b6c8e 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 3b533cb94bec300c6bc4935d3c0a2db0257c19a4 +Subproject commit 509b6c8e29a0013f9d9e1359a6af29cb18c5905e From bb2135937c26b9d5dbacdf6f96669b21a0a78798 Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Tue, 30 Nov 2021 11:23:41 +0800 Subject: [PATCH 02/42] =?UTF-8?q?=E6=9B=B4=E6=96=B0framework=E5=88=86?= =?UTF-8?q?=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 1 + framework | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index ec3fca5a..7935a520 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,7 @@ [submodule "framework"] path = framework url = git@github.com:blockchain-jd-com/jdchain-framework.git + branch = 1b8f848 [submodule "core"] path = core url = git@github.com:blockchain-jd-com/jdchain-core.git diff --git a/framework b/framework index 95e75db7..1b8f8481 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 95e75db78ab53e91d9ff93560e2318b0408e3d89 +Subproject commit 1b8f8481d8ae1e2360e07008b20f1bab69dc3350 From b7446b260e93496db91c55dd70c88b18a0340e34 Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Thu, 2 Dec 2021 10:06:41 +0800 Subject: [PATCH 03/42] update core module --- core | 2 +- framework | 2 +- libs/bft-smart | 2 +- libs/binary-proto | 2 +- libs/httpservice | 2 +- libs/utils | 2 +- test | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core b/core index 509b6c8e..f1a08230 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 509b6c8e29a0013f9d9e1359a6af29cb18c5905e +Subproject commit f1a0823040b82b510fd79bc953cd3ccd20b23229 diff --git a/framework b/framework index 1b8f8481..7744d79d 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 1b8f8481d8ae1e2360e07008b20f1bab69dc3350 +Subproject commit 7744d79d4a11b559ed86e64f888bc05f0fda2639 diff --git a/libs/bft-smart b/libs/bft-smart index d64b566a..db6cbc79 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit d64b566a4eca23655c7ae8cfc2f5f5873004212c +Subproject commit db6cbc794fc941b799ce2ccdf8f969c5b3ee9403 diff --git a/libs/binary-proto b/libs/binary-proto index 2fec50a4..4b8a14a0 160000 --- a/libs/binary-proto +++ b/libs/binary-proto @@ -1 +1 @@ -Subproject commit 2fec50a46f0c8cbc62a46b057d199b722ad7bc8b +Subproject commit 4b8a14a05c8d4b4ef9f9390cc4255c5b84788024 diff --git a/libs/httpservice b/libs/httpservice index a6cb4583..55190ca8 160000 --- a/libs/httpservice +++ b/libs/httpservice @@ -1 +1 @@ -Subproject commit a6cb4583fc6271ce62e2b8b1d6273c3bdd03b810 +Subproject commit 55190ca843098d30740e61aa1911239983fdd032 diff --git a/libs/utils b/libs/utils index 6b2fee07..7f0b301a 160000 --- a/libs/utils +++ b/libs/utils @@ -1 +1 @@ -Subproject commit 6b2fee074500d7233dc1134ffdf1327325abedff +Subproject commit 7f0b301addd9ec6237c2c947cdb629b12831fd43 diff --git a/test b/test index 87fae6a8..24dca7cc 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit 87fae6a8e6795433a0c07c1bbc0129c1e964b400 +Subproject commit 24dca7ccdca0d6b8d7d765a1edd7e24427b04470 From 0f61149bb0058af9297a0c52e59a577a483128fd Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Tue, 30 Nov 2021 11:06:00 +0800 Subject: [PATCH 04/42] =?UTF-8?q?raft=20consensus=20=E5=88=86=E6=94=AF?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core | 2 +- framework | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core b/core index 923fc870..f1a08230 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 923fc8701594b57df1936c4e770dc6cf5388438d +Subproject commit f1a0823040b82b510fd79bc953cd3ccd20b23229 diff --git a/framework b/framework index 8624047c..7744d79d 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 8624047cd598d85a614b3a9dada64578cb2af1d3 +Subproject commit 7744d79d4a11b559ed86e64f888bc05f0fda2639 From d0e5160f45d9992b249a90b32016339a644cfc83 Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Tue, 30 Nov 2021 11:23:41 +0800 Subject: [PATCH 05/42] =?UTF-8?q?=E6=9B=B4=E6=96=B0framework=E5=88=86?= =?UTF-8?q?=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index ec3fca5a..7935a520 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,7 @@ [submodule "framework"] path = framework url = git@github.com:blockchain-jd-com/jdchain-framework.git + branch = 1b8f848 [submodule "core"] path = core url = git@github.com:blockchain-jd-com/jdchain-core.git From ca84b0fe0a7d3d45bd79c8922ccec2996af50634 Mon Sep 17 00:00:00 2001 From: zhangshuang53 Date: Thu, 2 Dec 2021 18:32:51 +0800 Subject: [PATCH 06/42] update core and framework sub module --- core | 2 +- framework | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core b/core index f1a08230..b0d1a61d 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit f1a0823040b82b510fd79bc953cd3ccd20b23229 +Subproject commit b0d1a61d3a3488f7aaa8a4b4526dfd2196675ef8 diff --git a/framework b/framework index 7744d79d..2d6bc324 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 7744d79d4a11b559ed86e64f888bc05f0fda2639 +Subproject commit 2d6bc3242209a9e9e3f932fbf252f3520c901571 From 5d3c43920405b4099f5c055066bb1b36aff208d3 Mon Sep 17 00:00:00 2001 From: zhangshuang53 Date: Fri, 3 Dec 2021 11:08:02 +0800 Subject: [PATCH 07/42] fix consensus switch bug, update core submodule --- core | 2 +- .../resources/config/init/raft/raft.config | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 deploy/deploy-peer/src/main/resources/config/init/raft/raft.config diff --git a/core b/core index b0d1a61d..9a5517e5 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit b0d1a61d3a3488f7aaa8a4b4526dfd2196675ef8 +Subproject commit 9a5517e5ed4a0b3574244d1413c66a9e95ea7280 diff --git a/deploy/deploy-peer/src/main/resources/config/init/raft/raft.config b/deploy/deploy-peer/src/main/resources/config/init/raft/raft.config new file mode 100644 index 00000000..445b723a --- /dev/null +++ b/deploy/deploy-peer/src/main/resources/config/init/raft/raft.config @@ -0,0 +1,40 @@ +system.server.0.network.host=127.0.0.1 +system.server.0.network.port=16000 +system.server.0.network.secure=false +system.server.0.raft.path=/Users/zhangshuang3/Desktop/4nodesTestnet-develop/0 + +system.server.1.network.host=127.0.0.1 +system.server.1.network.port=16010 +system.server.1.network.secure=false +system.server.1.raft.path=/Users/zhangshuang3/Desktop/4nodesTestnet-develop/1 + +system.server.2.network.host=127.0.0.1 +system.server.2.network.port=16020 +system.server.2.network.secure=false +system.server.2.raft.path=/Users/zhangshuang3/Desktop/4nodesTestnet-develop/2 + +system.server.3.network.host=127.0.0.1 +system.server.3.network.port=16030 +system.server.3.network.secure=false +system.server.3.raft.path=/Users/zhangshuang3/Desktop/4nodesTestnet-develop/3 + +system.server.election.timeout=1000 +system.server.snapshot.interval=3600 + +system.server.rpc.connect.timeout=1000 +system.server.rpc.default.timeout=5000 +system.server.rpc.snapshot.timeout=30000 +system.server.rpc.request.timeout=1000 + +system.raft.maxByteCountPerRpc=131072 +system.raft.maxEntriesSize=1024 +system.raft.maxBodySize=524288 +system.raft.maxAppendBufferSize=262144 +system.raft.maxElectionDelayMs=1000 +system.raft.electionHeartbeatFactor=10 +system.raft.applyBatch=32 +system.raft.sync=true +system.raft.syncMeta=false +system.raft.disruptorBufferSize=16384 +system.raft.replicatorPipeline=true +system.raft.maxReplicatorInflightMsgs=256 \ No newline at end of file From c70be7db50c6d61e7fbff3209844f4cc21bc757b Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Fri, 3 Dec 2021 19:02:09 +0800 Subject: [PATCH 08/42] update core module --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 9a5517e5..a49de9e1 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 9a5517e5ed4a0b3574244d1413c66a9e95ea7280 +Subproject commit a49de9e1106878b745d6d605a9c20735ab924d28 From 216f9a1be5b7408c24e45bd8cc7154457a00fb1c Mon Sep 17 00:00:00 2001 From: zhangshuang53 Date: Mon, 6 Dec 2021 11:35:55 +0800 Subject: [PATCH 09/42] code merge, update core, framework, bff, test sub module --- core | 2 +- framework | 2 +- libs/bft-smart | 2 +- test | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core b/core index a49de9e1..6f3f3dc9 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit a49de9e1106878b745d6d605a9c20735ab924d28 +Subproject commit 6f3f3dc9faea0743956715281fa145c1af600260 diff --git a/framework b/framework index 2d6bc324..9a1bc417 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 2d6bc3242209a9e9e3f932fbf252f3520c901571 +Subproject commit 9a1bc417de40948f06306dbaa2d85d9c02c60844 diff --git a/libs/bft-smart b/libs/bft-smart index db6cbc79..9a746efa 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit db6cbc794fc941b799ce2ccdf8f969c5b3ee9403 +Subproject commit 9a746efa59fe4cdb18c3416e5ba820804bff13ed diff --git a/test b/test index 24dca7cc..1fa67d1e 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit 24dca7ccdca0d6b8d7d765a1edd7e24427b04470 +Subproject commit 1fa67d1ea67fddbbb526fc023bdbe3e0172c5599 From e6e34aee3bd760fdbd739b94222b1ad922fba132 Mon Sep 17 00:00:00 2001 From: zhangshuang53 Date: Mon, 6 Dec 2021 11:39:10 +0800 Subject: [PATCH 10/42] modify deploy config file --- .../deploy-peer/src/main/resources/config/init/bftsmart.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/deploy-peer/src/main/resources/config/init/bftsmart.config b/deploy/deploy-peer/src/main/resources/config/init/bftsmart.config index 3bafbaee..d2820acd 100644 --- a/deploy/deploy-peer/src/main/resources/config/init/bftsmart.config +++ b/deploy/deploy-peer/src/main/resources/config/init/bftsmart.config @@ -134,7 +134,7 @@ system.totalordermulticast.timeout_highMark = 200 system.totalordermulticast.log = true system.totalordermulticast.log_parallel = false -system.totalordermulticast.log_to_disk = true +system.totalordermulticast.log_to_disk = false system.totalordermulticast.sync_log = false #Period at which BFT-SMaRt requests the state to the application (for the state transfer state protocol) From d7262797acf3f39622333007fc13b06691ba1d96 Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Mon, 6 Dec 2021 17:06:25 +0800 Subject: [PATCH 11/42] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=85=B1=E8=AF=86?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 6f3f3dc9..6ed1108b 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 6f3f3dc9faea0743956715281fa145c1af600260 +Subproject commit 6ed1108bd1a95ae7a36651f6d4e550fbf9cd2a00 From 6661cea5d64706189e43ce8e16279c131b342ae4 Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Mon, 6 Dec 2021 21:14:21 +0800 Subject: [PATCH 12/42] update expore display consensus update operation --- core | 2 +- explorer | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core b/core index 6ed1108b..5820e5e7 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 6ed1108bd1a95ae7a36651f6d4e550fbf9cd2a00 +Subproject commit 5820e5e7b7ebb6f90cb03f200e7b9a99affbc877 diff --git a/explorer b/explorer index 371b776a..43f6a735 160000 --- a/explorer +++ b/explorer @@ -1 +1 @@ -Subproject commit 371b776aa045d3fac3ebc31b2ed7c3b4e98c19f8 +Subproject commit 43f6a73511c1ea6bca7de91e50b2ea2ab339a54c From ce99204a593f1964c48c5518f823301cae631679 Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Thu, 9 Dec 2021 10:43:40 +0800 Subject: [PATCH 13/42] update rocksdb && sofajraft version --- core | 2 +- project | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core b/core index 5820e5e7..b5da486a 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 5820e5e7b7ebb6f90cb03f200e7b9a99affbc877 +Subproject commit b5da486ad87f2a1d296e9d36aee4b0da8aab6ece diff --git a/project b/project index f3ecdaaa..3b379357 160000 --- a/project +++ b/project @@ -1 +1 @@ -Subproject commit f3ecdaaaaea64b59b60200d9a2d13665d99dfccf +Subproject commit 3b379357728f1b88b58de72e145198611bd819d1 From acf9205597bc56213dcd961f88dcffe7cf03b61d Mon Sep 17 00:00:00 2001 From: zhangshuang53 Date: Fri, 10 Dec 2021 16:40:51 +0800 Subject: [PATCH 14/42] add crypto algo switch implement, update core and framework --- core | 2 +- framework | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core b/core index b5da486a..4997a047 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit b5da486ad87f2a1d296e9d36aee4b0da8aab6ece +Subproject commit 4997a04733b8aa9cc87d435e6cf7069a270710a7 diff --git a/framework b/framework index 9a1bc417..d04a0224 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 9a1bc417de40948f06306dbaa2d85d9c02c60844 +Subproject commit d04a02245b1fe6f0d25b94a664e5e0bbf051fa9f From 6f5c239a8a236e78352cab3a997536ea2f6a053d Mon Sep 17 00:00:00 2001 From: zhangshuang53 Date: Fri, 10 Dec 2021 17:24:27 +0800 Subject: [PATCH 15/42] fix log4j leak, update core , project, kvdb sub module --- core | 2 +- libs/kvdb | 2 +- project | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core b/core index 4997a047..c0c4fd06 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 4997a04733b8aa9cc87d435e6cf7069a270710a7 +Subproject commit c0c4fd06ca919b9aed5c7e370dbd2c64f77c46ed diff --git a/libs/kvdb b/libs/kvdb index 9a7235f1..1ce1e457 160000 --- a/libs/kvdb +++ b/libs/kvdb @@ -1 +1 @@ -Subproject commit 9a7235f1eb63f7f22bc1f5995778633c9a086c89 +Subproject commit 1ce1e45731125614cd457d11f33c3accef68dea1 diff --git a/project b/project index 3b379357..87cc3f4b 160000 --- a/project +++ b/project @@ -1 +1 @@ -Subproject commit 3b379357728f1b88b58de72e145198611bd819d1 +Subproject commit 87cc3f4bcaa45cefa77b1df4b76f4eb4c8a5ec51 From e971317294063a0da9b829d37e3c2d83442d7269 Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Fri, 10 Dec 2021 17:39:09 +0800 Subject: [PATCH 16/42] modify deploy raft config --- .../main/resources/config/init/ledger.init | 13 +++++++++++-- .../resources/config/init/raft/raft.config | 19 ++++++++++++------- .../src/main/resources/config/log4j2-peer.xml | 2 ++ 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/deploy/deploy-peer/src/main/resources/config/init/ledger.init b/deploy/deploy-peer/src/main/resources/config/init/ledger.init index 2028713a..2e6c2011 100644 --- a/deploy/deploy-peer/src/main/resources/config/init/ledger.init +++ b/deploy/deploy-peer/src/main/resources/config/init/ledger.init @@ -57,11 +57,20 @@ ledger.data.structure=MERKLE_TREE #----------------------------------------------- #共识服务提供者；必须； -consensus.service-provider=com.jd.blockchain.consensus.bftsmart.BftsmartConsensusProvider - +#consensus.service-provider #共识服务的参数配置；推荐使用绝对路径；必须； +#consensus.conf + +# BFT共识配置 +consensus.service-provider=com.jd.blockchain.consensus.bftsmart.BftsmartConsensusProvider consensus.conf=bftsmart.config +# RAFT共识配置 +#consensus.service-provider=com.jd.blockchain.consensus.raft.RaftConsensusProvider +#consensus.conf=raft.config + +#------------------------------------------------ + #密码服务提供者列表，以英文逗点“,”分隔；必须； crypto.service-providers=com.jd.blockchain.crypto.service.classic.ClassicCryptoService, \ com.jd.blockchain.crypto.service.sm.SMCryptoService diff --git a/deploy/deploy-peer/src/main/resources/config/init/raft/raft.config b/deploy/deploy-peer/src/main/resources/config/init/raft/raft.config index 445b723a..fbf592ec 100644 --- a/deploy/deploy-peer/src/main/resources/config/init/raft/raft.config +++ b/deploy/deploy-peer/src/main/resources/config/init/raft/raft.config @@ -18,20 +18,25 @@ system.server.3.network.port=16030 system.server.3.network.secure=false system.server.3.raft.path=/Users/zhangshuang3/Desktop/4nodesTestnet-develop/3 -system.server.election.timeout=1000 -system.server.snapshot.interval=3600 +system.server.block.max.num=100 +system.server.block.max.bytes=4194304 -system.server.rpc.connect.timeout=1000 -system.server.rpc.default.timeout=5000 -system.server.rpc.snapshot.timeout=30000 -system.server.rpc.request.timeout=1000 +system.server.election.timeout=5000 +system.server.snapshot.interval=1800 + +system.client.configuration.refresh.interval=60000 + +system.server.rpc.connect.timeout=10000 +system.server.rpc.default.timeout=10000 +system.server.rpc.snapshot.timeout=300000 +system.server.rpc.request.timeout=20000 system.raft.maxByteCountPerRpc=131072 system.raft.maxEntriesSize=1024 system.raft.maxBodySize=524288 system.raft.maxAppendBufferSize=262144 system.raft.maxElectionDelayMs=1000 -system.raft.electionHeartbeatFactor=10 +system.raft.electionHeartbeatFactor=5 system.raft.applyBatch=32 system.raft.sync=true system.raft.syncMeta=false diff --git a/deploy/deploy-peer/src/main/resources/config/log4j2-peer.xml b/deploy/deploy-peer/src/main/resources/config/log4j2-peer.xml index d519bee0..6d5b45be 100644 --- a/deploy/deploy-peer/src/main/resources/config/log4j2-peer.xml +++ b/deploy/deploy-peer/src/main/resources/config/log4j2-peer.xml @@ -29,6 +29,8 @@ + + From 3b5d8ca8bac0acb0c2048adf1416db6b3cb17d5a Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Fri, 10 Dec 2021 17:43:00 +0800 Subject: [PATCH 17/42] add raft consensus ssl/tls --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index c0c4fd06..2bec9b52 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit c0c4fd06ca919b9aed5c7e370dbd2c64f77c46ed +Subproject commit 2bec9b52f17cdf8bd3d1657b2f047d0cb0c0808d From 3f58aec5c3cf99bf0141851ca7aeeae9b50beac1 Mon Sep 17 00:00:00 2001 From: zhangshuang53 Date: Thu, 16 Dec 2021 15:04:14 +0800 Subject: [PATCH 18/42] fix active/deactive/update participants bug, update core, bft, framework sub module --- core | 2 +- framework | 2 +- libs/bft-smart | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core b/core index 2bec9b52..d14877b7 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 2bec9b52f17cdf8bd3d1657b2f047d0cb0c0808d +Subproject commit d14877b7766504dd77bee8448e8f5277472513d9 diff --git a/framework b/framework index d04a0224..c7cc8ca7 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit d04a02245b1fe6f0d25b94a664e5e0bbf051fa9f +Subproject commit c7cc8ca71ad49565d60b5645bf27a6246c816ad7 diff --git a/libs/bft-smart b/libs/bft-smart index 9a746efa..149fe4ee 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit 9a746efa59fe4cdb18c3416e5ba820804bff13ed +Subproject commit 149fe4eefac837903add354ccd5cd4ad70ff09b6 From 8a8981b46a0054e1ac9ed04bb29766b77dbe8851 Mon Sep 17 00:00:00 2001 From: liuyuanmu Date: Thu, 16 Dec 2021 21:13:56 +0800 Subject: [PATCH 19/42] add protocol,enabled-protocols,ciphers settings --- core | 2 +- .../src/main/resources/config/application-gw.properties | 5 ++++- .../src/main/resources/config/application-peer.properties | 3 +++ deploy/deploy-peer/src/main/resources/config/init/local.conf | 3 +++ libs/bft-smart | 2 +- libs/httpservice | 2 +- libs/utils | 2 +- 7 files changed, 14 insertions(+), 5 deletions(-) diff --git a/core b/core index fb383738..97f0839d 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit fb383738ea80654293d2fa1d78d1844a1ca47f0d +Subproject commit 97f0839d82430462f85e4a510db612db5f2daaf8 diff --git a/deploy/deploy-gateway/src/main/resources/config/application-gw.properties b/deploy/deploy-gateway/src/main/resources/config/application-gw.properties index 89ab714b..bcf7d476 100644 --- a/deploy/deploy-gateway/src/main/resources/config/application-gw.properties +++ b/deploy/deploy-gateway/src/main/resources/config/application-gw.properties @@ -2,7 +2,10 @@ server.compression.enabled=true server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain -# TLS +# SSL +server.ssl.protocol= +server.ssl.enabled-protocols= +server.ssl.ciphers= server.ssl.key-store= server.ssl.key-store-type=PKCS12 server.ssl.key-alias= diff --git a/deploy/deploy-peer/src/main/resources/config/application-peer.properties b/deploy/deploy-peer/src/main/resources/config/application-peer.properties index 1b00fc08..728ed961 100644 --- a/deploy/deploy-peer/src/main/resources/config/application-peer.properties +++ b/deploy/deploy-peer/src/main/resources/config/application-peer.properties @@ -5,6 +5,9 @@ server.compression.mime-types=application/json,application/xml,text/html,text/xm # 管理服务TLS配置 server.ssl.enabled=false server.ssl.client-auth=none +server.ssl.protocol= +server.ssl.enabled-protocols= +server.ssl.ciphers= server.ssl.key-store= server.ssl.key-store-type=PKCS12 server.ssl.key-alias= diff --git a/deploy/deploy-peer/src/main/resources/config/init/local.conf b/deploy/deploy-peer/src/main/resources/config/init/local.conf index 56ef3328..dabd8753 100644 --- a/deploy/deploy-peer/src/main/resources/config/init/local.conf +++ b/deploy/deploy-peer/src/main/resources/config/init/local.conf @@ -15,6 +15,9 @@ local.parti.privkey-path= local.parti.pwd= #当前参与方的共识服务TLS配置 +local.parti.ssl.protocol= +local.parti.ssl.enabled-protocols= +local.parti.ssl.ciphers= local.parti.ssl.key-store= local.parti.ssl.key-store-type= local.parti.ssl.key-alias= diff --git a/libs/bft-smart b/libs/bft-smart index db6cbc79..73f80091 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit db6cbc794fc941b799ce2ccdf8f969c5b3ee9403 +Subproject commit 73f80091f432201a5d6793a13098f5e8560901e9 diff --git a/libs/httpservice b/libs/httpservice index 55190ca8..5257ed25 160000 --- a/libs/httpservice +++ b/libs/httpservice @@ -1 +1 @@ -Subproject commit 55190ca843098d30740e61aa1911239983fdd032 +Subproject commit 5257ed25bc6b89af413842739d06f8923e40ab14 diff --git a/libs/utils b/libs/utils index 7f0b301a..df08741c 160000 --- a/libs/utils +++ b/libs/utils @@ -1 +1 @@ -Subproject commit 7f0b301addd9ec6237c2c947cdb629b12831fd43 +Subproject commit df08741c65808d5f36ca032152b0bcc341a5a409 From fa2a91a1f1e20204b1b251103ad0bbe29fc66792 Mon Sep 17 00:00:00 2001 From: zhangshuang53 Date: Fri, 17 Dec 2021 09:47:06 +0800 Subject: [PATCH 20/42] node running data sync test, participant active, deactive, del , exception tx test completed, update core, bft, framework submodule --- .../deploy-peer/src/main/resources/config/init/bftsmart.config | 2 +- libs/bft-smart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/deploy-peer/src/main/resources/config/init/bftsmart.config b/deploy/deploy-peer/src/main/resources/config/init/bftsmart.config index d2820acd..0793149e 100644 --- a/deploy/deploy-peer/src/main/resources/config/init/bftsmart.config +++ b/deploy/deploy-peer/src/main/resources/config/init/bftsmart.config @@ -120,7 +120,7 @@ system.shutdownhook = true system.totalordermulticast.state_transfer = true #Maximum ahead-of-time message not discarded -system.totalordermulticast.highMark = 10000 +system.totalordermulticast.highMark = 50 #Maximum ahead-of-time message not discarded when the replica is still on EID 0 (after which the state transfer is triggered) system.totalordermulticast.revival_highMark = 10 diff --git a/libs/bft-smart b/libs/bft-smart index 149fe4ee..f35ef526 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit 149fe4eefac837903add354ccd5cd4ad70ff09b6 +Subproject commit f35ef52636acd406092e71bb5426055958519ba3 From 95381129f9c028180154411760adc17455815763 Mon Sep 17 00:00:00 2001 From: zhangshuang53 Date: Fri, 17 Dec 2021 15:01:54 +0800 Subject: [PATCH 21/42] add ledger anti tamper verify interface, update core submodule --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index d14877b7..b62180f7 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit d14877b7766504dd77bee8448e8f5277472513d9 +Subproject commit b62180f7edbb12c538c595a065abae919febfe6e From 2992a78b2ea4d8f30451457911333381a3dfc15e Mon Sep 17 00:00:00 2001 From: liuyuanmu Date: Wed, 29 Dec 2021 09:27:36 +0800 Subject: [PATCH 22/42] add prometheus for peer --- core | 2 +- .../src/main/resources/config/application-peer.properties | 5 ++++- framework | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core b/core index b62180f7..d1503215 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit b62180f7edbb12c538c595a065abae919febfe6e +Subproject commit d1503215e0c3f321bebc3f44ffad73f2ed825f6e diff --git a/deploy/deploy-peer/src/main/resources/config/application-peer.properties b/deploy/deploy-peer/src/main/resources/config/application-peer.properties index 1b00fc08..365e1527 100644 --- a/deploy/deploy-peer/src/main/resources/config/application-peer.properties +++ b/deploy/deploy-peer/src/main/resources/config/application-peer.properties @@ -11,4 +11,7 @@ server.ssl.key-alias= server.ssl.key-store-password= server.ssl.trust-store= server.ssl.trust-store-password= -server.ssl.trust-store-type=JKS \ No newline at end of file +server.ssl.trust-store-type=JKS + +management.endpoints.web.exposure.include=prometheus +management.metrics.tags.application=peer \ No newline at end of file diff --git a/framework b/framework index c7cc8ca7..c2d42c67 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit c7cc8ca71ad49565d60b5645bf27a6246c816ad7 +Subproject commit c2d42c6717c7ba3a9df4e38d8a423bea03acfc65 From 3474bebd528879d2f5e7a8f11a87f6b67404739b Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Wed, 29 Dec 2021 18:23:36 +0800 Subject: [PATCH 23/42] add gm tls support --- build/pack.sh | 2 +- core | 2 +- deploy/deploy-gateway/pom.xml | 3 +++ .../src/main/resources/assembly.xml | 1 + .../config/application-gw.properties | 23 ++++++++++++---- .../src/main/resources/assembly.xml | 4 +++ .../config/application-peer.properties | 22 +++++++++++++--- libs/bft-smart | 2 +- libs/httpservice | 2 +- libs/utils | 2 +- project | 2 +- tree.txt | 26 ------------------- 12 files changed, 50 insertions(+), 41 deletions(-) delete mode 100644 tree.txt diff --git a/build/pack.sh b/build/pack.sh index 34d87ff8..51baae7d 100755 --- a/build/pack.sh +++ b/build/pack.sh @@ -21,7 +21,7 @@ fi echo "--------------- 开始编译打包 ---------------" cd $DEPLOY_DIR -echo "当前目录：`pwd`" +echo "当前目录：$(pwd)" #初始化变量 SKIP_TESTS； if [ ! $SKIP_TESTS ] diff --git a/core b/core index 97f0839d..b6892393 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 97f0839d82430462f85e4a510db612db5f2daaf8 +Subproject commit b68923932c2397d619217b42e042221bfeb8d7cf diff --git a/deploy/deploy-gateway/pom.xml b/deploy/deploy-gateway/pom.xml index e7e20c8a..b790ad89 100644 --- a/deploy/deploy-gateway/pom.xml +++ b/deploy/deploy-gateway/pom.xml @@ -45,6 +45,9 @@ org.springframework.boot spring-boot-maven-plugin + + true + diff --git a/deploy/deploy-gateway/src/main/resources/assembly.xml b/deploy/deploy-gateway/src/main/resources/assembly.xml index 09a964df..c1595bd8 100644 --- a/deploy/deploy-gateway/src/main/resources/assembly.xml +++ b/deploy/deploy-gateway/src/main/resources/assembly.xml @@ -24,6 +24,7 @@ docs unix + diff --git a/deploy/deploy-gateway/src/main/resources/config/application-gw.properties b/deploy/deploy-gateway/src/main/resources/config/application-gw.properties index bcf7d476..464efe20 100644 --- a/deploy/deploy-gateway/src/main/resources/config/application-gw.properties +++ b/deploy/deploy-gateway/src/main/resources/config/application-gw.properties @@ -2,14 +2,27 @@ server.compression.enabled=true server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain -# SSL -server.ssl.protocol= -server.ssl.enabled-protocols= -server.ssl.ciphers= +# TLS server.ssl.key-store= server.ssl.key-store-type=PKCS12 server.ssl.key-alias= server.ssl.key-store-password= +server.ssl.protocol= +server.ssl.enabled-protocols= +server.ssl.ciphers= server.ssl.trust-store= server.ssl.trust-store-password= -server.ssl.trust-store-type=JKS \ No newline at end of file +server.ssl.trust-store-type=JKS +server.ssl.hostNameVerifier=NO-OP + +#GM TLS +#: http.secure=true && server.ssl.protocol=GMSSLv1.1 +#ʾ: +#server.ssl.key-store=cert/sm2.node0.both.pfx +#server.ssl.key-store-type=PKCS12 +#server.ssl.key-alias= +#server.ssl.key-store-password=12345678 +#server.ssl.protocol=GMSSLv1.1 +#server.ssl.hostNameVerifier=NO-OP +#server.ssl.enabled-protocols=TLSv1.2,GMSSLv1.1 +#server.ssl.ciphers=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,ECC_SM4_CBC_SM3,ECDHE_SM4_GCM_SM3,ECDHE_SM4_CBC_SM3 diff --git a/deploy/deploy-peer/src/main/resources/assembly.xml b/deploy/deploy-peer/src/main/resources/assembly.xml index 2594ae14..5cbf00eb 100644 --- a/deploy/deploy-peer/src/main/resources/assembly.xml +++ b/deploy/deploy-peer/src/main/resources/assembly.xml @@ -24,6 +24,10 @@ docs unix + + ${basedir}/../../libs/utils/utils-sm-tls/lib + libs + diff --git a/deploy/deploy-peer/src/main/resources/config/application-peer.properties b/deploy/deploy-peer/src/main/resources/config/application-peer.properties index 728ed961..1de58741 100644 --- a/deploy/deploy-peer/src/main/resources/config/application-peer.properties +++ b/deploy/deploy-peer/src/main/resources/config/application-peer.properties @@ -5,13 +5,27 @@ server.compression.mime-types=application/json,application/xml,text/html,text/xm # 管理服务TLS配置 server.ssl.enabled=false server.ssl.client-auth=none -server.ssl.protocol= -server.ssl.enabled-protocols= -server.ssl.ciphers= server.ssl.key-store= server.ssl.key-store-type=PKCS12 server.ssl.key-alias= server.ssl.key-store-password= server.ssl.trust-store= server.ssl.trust-store-password= -server.ssl.trust-store-type=JKS \ No newline at end of file +server.ssl.trust-store-type=JKS +server.ssl.protocol= +server.ssl.enabled-protocols= +server.ssl.ciphers= +server.ssl.hostNameVerifier=NO-OP + +#GM TLS配置 +#启用条件: server.ssl.enabled=true && server.ssl.protocol=GMSSLv1.1 +#示例: +#server.ssl.enabled=true +#server.ssl.key-store=cert/sm2.node0.both.pfx +#server.ssl.key-store-type=PKCS12 +#server.ssl.key-alias= +#server.ssl.key-store-password=12345678 +#server.ssl.protocol=GMSSLv1.1 +#server.ssl.hostNameVerifier=NO-OP +#server.ssl.enabled-protocols=TLSv1.2,GMSSLv1.1 +#server.ssl.ciphers=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,ECC_SM4_CBC_SM3,ECDHE_SM4_GCM_SM3,ECDHE_SM4_CBC_SM3 \ No newline at end of file diff --git a/libs/bft-smart b/libs/bft-smart index 73f80091..6392c0e9 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit 73f80091f432201a5d6793a13098f5e8560901e9 +Subproject commit 6392c0e98e8bfea0dcd0dea6c0e4e372bb404848 diff --git a/libs/httpservice b/libs/httpservice index 5257ed25..2d1f81dc 160000 --- a/libs/httpservice +++ b/libs/httpservice @@ -1 +1 @@ -Subproject commit 5257ed25bc6b89af413842739d06f8923e40ab14 +Subproject commit 2d1f81dcc672cd34ea7ddcee882a0ddc1453075c diff --git a/libs/utils b/libs/utils index df08741c..633eb609 160000 --- a/libs/utils +++ b/libs/utils @@ -1 +1 @@ -Subproject commit df08741c65808d5f36ca032152b0bcc341a5a409 +Subproject commit 633eb609c0874b2fdfb772edd6c73c7123fca0fa diff --git a/project b/project index db4db74c..8e39c385 160000 --- a/project +++ b/project @@ -1 +1 @@ -Subproject commit db4db74cc03d3a45d01a85893665372a6fd95bbc +Subproject commit 8e39c385db8bcb484da7a134ec2721bfe59726e1 diff --git a/tree.txt b/tree.txt deleted file mode 100644 index 695c4b34..00000000 --- a/tree.txt +++ /dev/null @@ -1,26 +0,0 @@ -[INFO] Scanning for projects... -[WARNING] -[WARNING] Some problems were encountered while building the effective model for com.jd.blockchain:jdchain-parent:pom:1.1.4.RELEASE -[WARNING] 'parent.relativePath' of POM com.jd.blockchain:jdchain-dependencies:1.1.4.RELEASE (F:\gitCode\jdchain-all\jdchain\project\dependencies\pom.xml) points at com.jd.blockchain:jdchain-project instead of org.springframework.boot:spring-boot-starter-parent, please verify your project structure @ com.jd.blockchain:jdchain-dependencies:1.1.4.RELEASE, F:\gitCode\jdchain-all\jdchain\project\dependencies\pom.xml, line 6, column 10 -[WARNING] -[WARNING] Some problems were encountered while building the effective model for com.jd.blockchain:bft-smart:jar:0.6.1.RELEASE -[WARNING] 'build.plugins.plugin.version' for org.apache.maven.plugins:maven-compiler-plugin is missing. @ line 89, column 12 -[WARNING] -[WARNING] Some problems were encountered while building the effective model for com.jd.blockchain:bft-smart:jar:0.6.1.RELEASE -[WARNING] 'build.plugins.plugin.version' for org.apache.maven.plugins:maven-compiler-plugin is missing. @ line 89, column 12 -[WARNING] -[WARNING] Some problems were encountered while building the effective model for com.jd.blockchain:bft-smart:jar:0.6.1.RELEASE -[WARNING] 'build.plugins.plugin.version' for org.apache.maven.plugins:maven-compiler-plugin is missing. @ line 89, column 12 -[WARNING] -[WARNING] It is highly recommended to fix these problems because they threaten the stability of your build. -[WARNING] -[WARNING] For this reason, future Maven versions might no longer support building such malformed projects. -[WARNING] -[ERROR] [ERROR] Project 'com.jd.blockchain:utils-serialize:1.2.1.RELEASE' is duplicated in the reactor @ -[ERROR] Project 'com.jd.blockchain:utils-serialize:1.2.1.RELEASE' is duplicated in the reactor -> [Help 1] -[ERROR] -[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch. -[ERROR] Re-run Maven using the -X switch to enable full debug logging. -[ERROR] -[ERROR] For more information about the errors and possible solutions, please read the following articles: -[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/DuplicateProjectException From 95594799973b438b47f2f6f1127eb5d2fb4305dd Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Thu, 30 Dec 2021 20:15:52 +0800 Subject: [PATCH 24/42] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=9B=BD=E5=AF=86=E5=8F=8C=E8=AF=81=E4=B9=A6=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core | 2 +- libs/utils | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core b/core index b6892393..3679b861 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit b68923932c2397d619217b42e042221bfeb8d7cf +Subproject commit 3679b86111f464557d64d271438e23b4b9ad5d13 diff --git a/libs/utils b/libs/utils index 633eb609..d40b6e3a 160000 --- a/libs/utils +++ b/libs/utils @@ -1 +1 @@ -Subproject commit 633eb609c0874b2fdfb772edd6c73c7123fca0fa +Subproject commit d40b6e3a09acadffed81924b776df685c614857c From 19dc6ebeb800f52e5fbe5c145c662ea19d6ba757 Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Fri, 31 Dec 2021 13:29:08 +0800 Subject: [PATCH 25/42] update module --- core | 2 +- libs/utils | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core b/core index 3679b861..7d649aed 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 3679b86111f464557d64d271438e23b4b9ad5d13 +Subproject commit 7d649aed8f8ac09f8b98298bb5e3ded2f8b2092e diff --git a/libs/utils b/libs/utils index d40b6e3a..002a04ef 160000 --- a/libs/utils +++ b/libs/utils @@ -1 +1 @@ -Subproject commit d40b6e3a09acadffed81924b776df685c614857c +Subproject commit 002a04ef9d5fe8db7fced48abc5b12864c978bcc From 225a35dc0cfc3b2691f374f7f23aeb08996ef184 Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Tue, 4 Jan 2022 10:31:31 +0800 Subject: [PATCH 26/42] update core module --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 7d649aed..7cb935bf 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 7d649aed8f8ac09f8b98298bb5e3ded2f8b2092e +Subproject commit 7cb935bfa23c6e8474bd12f19e6f8dee814e8a47 From 573ea55de2a364e8ebe5f25bbc36508fc728d766 Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Tue, 4 Jan 2022 11:53:55 +0800 Subject: [PATCH 27/42] update framework, bft-samrt module --- framework | 2 +- libs/bft-smart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/framework b/framework index 8624047c..c2d42c67 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 8624047cd598d85a614b3a9dada64578cb2af1d3 +Subproject commit c2d42c6717c7ba3a9df4e38d8a423bea03acfc65 diff --git a/libs/bft-smart b/libs/bft-smart index 6392c0e9..40b5b03e 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit 6392c0e98e8bfea0dcd0dea6c0e4e372bb404848 +Subproject commit 40b5b03eade73e3d30ed0efeb5d87e4294173d28 From 17dbbd61b59e3a8a5aac31342fd2c9044cddd303 Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Tue, 4 Jan 2022 13:42:02 +0800 Subject: [PATCH 28/42] update explorer, project module --- explorer | 2 +- project | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/explorer b/explorer index 371b776a..43f6a735 160000 --- a/explorer +++ b/explorer @@ -1 +1 @@ -Subproject commit 371b776aa045d3fac3ebc31b2ed7c3b4e98c19f8 +Subproject commit 43f6a73511c1ea6bca7de91e50b2ea2ab339a54c diff --git a/project b/project index 8e39c385..45d798a4 160000 --- a/project +++ b/project @@ -1 +1 @@ -Subproject commit 8e39c385db8bcb484da7a134ec2721bfe59726e1 +Subproject commit 45d798a4c12621da3458c43a7f2c1489e1ea0f3d From bd1960910ea34c17f6e06d949c6fc65ee2aa93cc Mon Sep 17 00:00:00 2001 From: zhangshuang53 Date: Tue, 4 Jan 2022 14:43:58 +0800 Subject: [PATCH 29/42] fix bug 695, and kv config --- core | 2 +- deploy/deploy-peer/src/main/resources/config/init/ledger.init | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core b/core index 7cb935bf..337f2dd2 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 7cb935bfa23c6e8474bd12f19e6f8dee814e8a47 +Subproject commit 337f2dd2835f66c1c4a4255b95fd67569d515d50 diff --git a/deploy/deploy-peer/src/main/resources/config/init/ledger.init b/deploy/deploy-peer/src/main/resources/config/init/ledger.init index 2e6c2011..c08bb293 100644 --- a/deploy/deploy-peer/src/main/resources/config/init/ledger.init +++ b/deploy/deploy-peer/src/main/resources/config/init/ledger.init @@ -14,7 +14,7 @@ root-ca-path= created-time=2019-08-01 14:26:58.069+0800 #账本数据底层结构，分为：MERKLE_TREE, KV两种，默认MERKLE_TREE -ledger.data.structure=MERKLE_TREE +ledger.data.structure=KV #----------------------------------------------- # 初始的角色名称列表；可选项； From 4255d97802408ed4c82f4a93eb606e24e21522cc Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Thu, 6 Jan 2022 10:30:34 +0800 Subject: [PATCH 30/42] update module --- core | 2 +- .../src/main/resources/config/application-gw.properties | 6 +++--- explorer | 2 +- framework | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core b/core index 337f2dd2..83d69b14 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 337f2dd2835f66c1c4a4255b95fd67569d515d50 +Subproject commit 83d69b14538b9ba4caaea0ec144ad2dcdac0805c diff --git a/deploy/deploy-gateway/src/main/resources/config/application-gw.properties b/deploy/deploy-gateway/src/main/resources/config/application-gw.properties index 464efe20..0f38b469 100644 --- a/deploy/deploy-gateway/src/main/resources/config/application-gw.properties +++ b/deploy/deploy-gateway/src/main/resources/config/application-gw.properties @@ -15,9 +15,9 @@ server.ssl.trust-store-password= server.ssl.trust-store-type=JKS server.ssl.hostNameVerifier=NO-OP -#GM TLS -#: http.secure=true && server.ssl.protocol=GMSSLv1.1 -#ʾ: +#GM TLS Config +#Enable Condition: http.secure=true && server.ssl.protocol=GMSSLv1.1 +#Example: #server.ssl.key-store=cert/sm2.node0.both.pfx #server.ssl.key-store-type=PKCS12 #server.ssl.key-alias= diff --git a/explorer b/explorer index 43f6a735..67d9109f 160000 --- a/explorer +++ b/explorer @@ -1 +1 @@ -Subproject commit 43f6a73511c1ea6bca7de91e50b2ea2ab339a54c +Subproject commit 67d9109f383e7d3fecb74af4c70927a924f3d931 diff --git a/framework b/framework index c2d42c67..53e5d19b 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit c2d42c6717c7ba3a9df4e38d8a423bea03acfc65 +Subproject commit 53e5d19bc96bf6a8b46476c4e24e1e947b68f109 From 31524186d8ff04e94a8abe8109e6b3ff39c23bbf Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Thu, 6 Jan 2022 17:25:52 +0800 Subject: [PATCH 31/42] update module --- core | 2 +- framework | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core b/core index 83d69b14..838f8b43 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 83d69b14538b9ba4caaea0ec144ad2dcdac0805c +Subproject commit 838f8b43390f0e507c43c1980ec7db19177b29e3 diff --git a/framework b/framework index 53e5d19b..fa1a59c6 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 53e5d19bc96bf6a8b46476c4e24e1e947b68f109 +Subproject commit fa1a59c6676b140aca5b6a27352ecb6ca6dcf5b0 From 2b6f238f9a53825d17e9007884b551bb29cdd322 Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Fri, 7 Jan 2022 20:01:04 +0800 Subject: [PATCH 32/42] =?UTF-8?q?1.=20update=20core=20module=202.=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9peer=E5=8C=85=E6=89=93=E5=8C=85=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core | 2 +- deploy/deploy-peer/src/main/resources/assembly.xml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core b/core index 838f8b43..5d74db6b 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 838f8b43390f0e507c43c1980ec7db19177b29e3 +Subproject commit 5d74db6b31607e52771e0d3f50b63fb66cd556b5 diff --git a/deploy/deploy-peer/src/main/resources/assembly.xml b/deploy/deploy-peer/src/main/resources/assembly.xml index 5cbf00eb..9a479b1f 100644 --- a/deploy/deploy-peer/src/main/resources/assembly.xml +++ b/deploy/deploy-peer/src/main/resources/assembly.xml @@ -28,6 +28,10 @@ ${basedir}/../../libs/utils/utils-sm-tls/lib libs + + ${basedir}/../../core/consensus/consensus-raft/lib + libs + From 7c2091c4b2efe1f583b52d8fe39f9f9df0bee75b Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Mon, 10 Jan 2022 14:28:15 +0800 Subject: [PATCH 33/42] update module --- explorer | 2 +- framework | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/explorer b/explorer index 67d9109f..ad64e4e2 160000 --- a/explorer +++ b/explorer @@ -1 +1 @@ -Subproject commit 67d9109f383e7d3fecb74af4c70927a924f3d931 +Subproject commit ad64e4e20b6b7f51703a2366717eace7ebb7bcd1 diff --git a/framework b/framework index fa1a59c6..6b1af67e 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit fa1a59c6676b140aca5b6a27352ecb6ca6dcf5b0 +Subproject commit 6b1af67ee0dfb6c043cea5ea16f0c975cc7418c0 From 6d311d20d90e566db6ae2c08b63bd2e77515d046 Mon Sep 17 00:00:00 2001 From: zhangshuang53 Date: Mon, 10 Jan 2022 15:10:43 +0800 Subject: [PATCH 34/42] fix bft bug, update bft sub module --- libs/bft-smart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/bft-smart b/libs/bft-smart index 40b5b03e..170d4b66 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit 40b5b03eade73e3d30ed0efeb5d87e4294173d28 +Subproject commit 170d4b66c44c05aa65ba3e16192bf262aabb027f From 6c01377c685511ff17a816f612071a8ec3813374 Mon Sep 17 00:00:00 2001 From: zhangshuang53 Date: Wed, 12 Jan 2022 15:13:42 +0800 Subject: [PATCH 35/42] update test sub module --- test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test b/test index 24dca7cc..a554ac8f 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit 24dca7ccdca0d6b8d7d765a1edd7e24427b04470 +Subproject commit a554ac8ff6815f521f6051af366e5404e81724cb From 6b971b8ea44d69d709e7c408bc6600bad45ecea5 Mon Sep 17 00:00:00 2001 From: zhangshuang53 Date: Wed, 12 Jan 2022 17:28:00 +0800 Subject: [PATCH 36/42] update core sub module --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 5d74db6b..55843d57 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 5d74db6b31607e52771e0d3f50b63fb66cd556b5 +Subproject commit 55843d5775ed7ff8c1becaa53e55138b7125eae4 From 6538eb6d6eaf69287d4cde4cff9a15dbfef98d43 Mon Sep 17 00:00:00 2001 From: zhangshuang53 Date: Tue, 18 Jan 2022 19:18:04 +0800 Subject: [PATCH 37/42] fix tls error in docker env, update core and bft submodule --- core | 2 +- libs/bft-smart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core b/core index 55843d57..2ebd043e 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 55843d5775ed7ff8c1becaa53e55138b7125eae4 +Subproject commit 2ebd043ec35934bbf4a11116fe3c43ff6640cc82 diff --git a/libs/bft-smart b/libs/bft-smart index 170d4b66..67fdad31 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit 170d4b66c44c05aa65ba3e16192bf262aabb027f +Subproject commit 67fdad315051e9b7256e10c7ddf5965615a41e15 From f44d5652795cdcd02dd8aa2a03ceb2b29747ffe2 Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Tue, 8 Feb 2022 19:48:45 +0800 Subject: [PATCH 38/42] =?UTF-8?q?fix=20raft=E5=AE=A2=E6=88=B7=E7=AB=AF?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=97=B6=E6=97=A0=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core | 2 +- framework | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core b/core index 2ebd043e..8cccf19e 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 2ebd043ec35934bbf4a11116fe3c43ff6640cc82 +Subproject commit 8cccf19e3f637315f922f21e408efa44f072961b diff --git a/framework b/framework index 6b1af67e..ac0e25a8 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 6b1af67ee0dfb6c043cea5ea16f0c975cc7418c0 +Subproject commit ac0e25a8de5ec7b1d42b662b089fb313f0c109cf From 9d1b51c40fa809dc847b62b821ef3c02c4a6f696 Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Tue, 15 Feb 2022 09:51:27 +0800 Subject: [PATCH 39/42] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9raft=E6=9C=AA?= =?UTF-8?q?=E9=85=8D=E7=BD=AEtruststore=E6=97=B6TLS=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=202.=20=E6=9B=B4=E6=96=B0core=20module?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 8cccf19e..68327a87 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 8cccf19e3f637315f922f21e408efa44f072961b +Subproject commit 68327a876afbea4b1443d06996b615a841da5fe6 From 2e885112f346cd7815bb991cf6ee1ce7572dbcfa Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Tue, 15 Feb 2022 17:32:52 +0800 Subject: [PATCH 40/42] =?UTF-8?q?1.=20raft=E5=85=B1=E8=AF=86=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E8=8A=82=E7=82=B9=E5=8A=9F=E8=83=BD=E6=94=AF=E6=8C=81?= =?UTF-8?q?TLS=202.=20=E6=9B=B4=E6=96=B0core=20module?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 68327a87..661d0e09 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 68327a876afbea4b1443d06996b615a841da5fe6 +Subproject commit 661d0e09963a38b0ea20fde10358a936bbdd449f From edb47453e21b9d563e8b5c647e155ce28537813b Mon Sep 17 00:00:00 2001 From: liuyuanmu Date: Tue, 15 Feb 2022 18:19:25 +0800 Subject: [PATCH 41/42] do not remove SunEC --- framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework b/framework index ac0e25a8..4f240417 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit ac0e25a8de5ec7b1d42b662b089fb313f0c109cf +Subproject commit 4f240417fd553974e1b4078285b01434ff0f4c37 From dbd7f6b1979e542e447e6623ff05a6403a51dca5 Mon Sep 17 00:00:00 2001 From: zhangshuang53 Date: Thu, 24 Feb 2022 18:40:15 +0800 Subject: [PATCH 42/42] fix jinrong test bug , update core sub module --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 661d0e09..cbe126e5 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 661d0e09963a38b0ea20fde10358a936bbdd449f +Subproject commit cbe126e5a51f9d6268239c05e75b4b5f356cd8f7