fix: conflicts

.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

deploy/deploy-peer/src/main/resources/config/application-peer.properties

@@ -12,6 +12,7 @@ server.ssl.key-store-password=
 server.ssl.trust-store=
 server.ssl.trust-store-password=
 server.ssl.trust-store-type=JKS
+
 server.ssl.protocol=
 server.ssl.enabled-protocols=
 server.ssl.ciphers=
@@ -28,4 +29,9 @@ server.ssl.hostNameVerifier=NO-OP
 #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
+#server.ssl.ciphers=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,ECC_SM4_CBC_SM3,ECDHE_SM4_GCM_SM3,ECDHE_SM4_CBC_SM3
+
+
+management.endpoints.web.exposure.include=prometheus
+management.metrics.tags.application=peer
+

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
@@ -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)

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

deploy/deploy-peer/src/main/resources/config/init/raft/raft.config

@@ -0,0 +1,45 @@
+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.block.max.num=100
+system.server.block.max.bytes=4194304
+
+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=5
+system.raft.applyBatch=32
+system.raft.sync=true
+system.raft.syncMeta=false
+system.raft.disruptorBufferSize=16384
+system.raft.replicatorPipeline=true
+system.raft.maxReplicatorInflightMsgs=256

deploy/deploy-peer/src/main/resources/config/log4j2-peer.xml

@@ -29,6 +29,8 @@
     <loggers>
         <logger name="org.springframework" level="error"></logger>
         <logger name="bftsmart" level="error"></logger>
+        <logger name="com.alipay.sofa" level="error"></logger>
+        <logger name="io.netty" level="error"></logger>
         <!--修改此处，以变更日志等级-->
         <root level="all">
             <appender-ref ref="Console"/>