From 34f9240e8dbafd0821377dee4502d9fcb5b2e0e7 Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Tue, 30 Nov 2021 11:06:00 +0800 Subject: [PATCH 01/21] =?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/21] =?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/21] 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/21] =?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/21] =?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/21] 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/21] 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/21] 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/21] 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/21] 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/21] =?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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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 fa2a91a1f1e20204b1b251103ad0bbe29fc66792 Mon Sep 17 00:00:00 2001 From: zhangshuang53 Date: Fri, 17 Dec 2021 09:47:06 +0800 Subject: [PATCH 19/21] 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 20/21] 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 21/21] 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