Merge branch 'feature/mergeBitrice' of gitlab.peersafe.cn:chainsql/chainsqld into feature/mergeBitrice

Author: luleigreat

src/peersafe/consensus/Adaptor.h

@@ -321,7 +321,9 @@ class Adaptor
         bool haveCorrectLCL);
 
     virtual void
-    InitAnnounce(STInitAnnounce const& initAnnounce);
+    InitAnnounce(
+        STInitAnnounce const& initAnnounce,
+        boost::optional<PublicKey> pubKey = boost::none);
 
     void
     signMessage(protocol::TMConsensus& consensus);

src/peersafe/consensus/impl/Adaptor.cpp

@@ -162,7 +162,7 @@ Adaptor::notify(
 }
 
 void
-Adaptor::InitAnnounce(STInitAnnounce const& initAnnounce)
+Adaptor::InitAnnounce(STInitAnnounce const& initAnnounce, boost::optional<PublicKey> pubKey /* = boost::none */)
 {
     Blob v = initAnnounce.getSerialized();
 
@@ -172,7 +172,10 @@ Adaptor::InitAnnounce(STInitAnnounce const& initAnnounce)
     consensus.set_msgtype(ConsensusMessageType::mtINITANNOUNCE);
     consensus.set_schemaid(app_.schemaId().begin(), uint256::size());
 
-    signAndSendMessage(consensus);
+    if (pubKey)
+        signAndSendMessage(*pubKey, consensus); 
+    else
+        signAndSendMessage(consensus);
 }
 
 void

src/peersafe/consensus/pop/PopConsensus.h

@@ -181,6 +181,8 @@ class PopConsensus : public ConsensusBase
 
     void
     initAnnounce();
+    void
+    initAnnounceToPeer(PublicKey const& pubKey);
 
     void
     startRoundInternal(

src/peersafe/consensus/pop/impl/PopConsensus.cpp

@@ -449,6 +449,20 @@ PopConsensus::initAnnounce()
     adaptor_.InitAnnounce(*initAnnounce);
 }
 
+void
+PopConsensus::initAnnounceToPeer(PublicKey const& pubKey)
+{
+    auto seq = adaptor_.app_.getLedgerMaster().getValidLedgerIndex();
+    auto hash = adaptor_.app_.getLedgerMaster().getValidatedLedger()->info().hash;
+    JLOG(j_.info()) << "Init announce to other peers prevSeq=" << seq
+                    << ", prevHash=" << hash;
+    auto initAnnounce = std::make_shared<STInitAnnounce>(
+        seq, hash, adaptor_.valPublic(),
+        adaptor_.closeTime());
+
+    adaptor_.InitAnnounce(*initAnnounce,pubKey);
+}
+
 void
 PopConsensus::startRoundInternal(
     NetClock::time_point const& now,
@@ -901,6 +915,9 @@ PopConsensus::peerProposalInternal(
     NetClock::time_point const& now,
     PeerPosition_t const& newPeerPos)
 {
+    if (waitingForInit())
+        return false;
+
     // Nothing to do for now if we are currently working on a ledger
     if (phase_ == ConsensusPhase::accepted)
     {
@@ -1160,6 +1177,9 @@ PopConsensus::peerViewChange(
 bool
 PopConsensus::peerViewChangeInternal(STViewChange::ref viewChange)
 {
+    if (waitingForInit())
+        return false;
+
     JLOG(j_.info()) << "Processing peer ViewChange toView="
                     << viewChange->toView() << ", PublicKey index="
                     << adaptor_.getPubIndex(viewChange->nodePublic())
@@ -1175,27 +1195,27 @@ PopConsensus::peerViewChangeInternal(STViewChange::ref viewChange)
 
         checkChangeView(viewChange->toView());
 
-        if (waitingForInit() && mode_.get() != ConsensusMode::wrongLedger)
-        {
-            if (viewChange->prevSeq() > prevLedgerSeq_)
-            {
-                JLOG(j_.warn())
-                    << "Init time switch to netLedger " << viewChange->prevSeq()
-                    << ":" << viewChange->prevHash();
-                prevLedgerID_ = viewChange->prevHash();
-                prevLedgerSeq_ = viewChange->prevSeq();
-                //view_ = viewChange->toView() - 1;
-                //checkLedger();
-            }
-            else if (
-                viewChange->prevSeq() == previousLedger_.seq() &&
-                viewChange->toView() > view_ + 1)
-            {
-                JLOG(j_.warn())
-                    << "Init time switch to view " << viewChange->toView() - 1;
-                view_ = viewChange->toView() - 1;
-            }
-        }
+    //    if (waitingForInit() && mode_.get() != ConsensusMode::wrongLedger)
+    //    {
+    //        if (viewChange->prevSeq() > prevLedgerSeq_)
+    //        {
+    //            JLOG(j_.warn())
+    //                << "Init time switch to netLedger " << viewChange->prevSeq()
+    //                << ":" << viewChange->prevHash();
+    //            prevLedgerID_ = viewChange->prevHash();
+    //            prevLedgerSeq_ = viewChange->prevSeq();
+    //            //view_ = viewChange->toView() - 1;
+    //            //checkLedger();
+    //        }
+    //        else if (
+    //            viewChange->prevSeq() == previousLedger_.seq() &&
+    //            viewChange->toView() > view_ + 1)
+    //        {
+    //            JLOG(j_.warn())
+    //                << "Init time switch to view " << viewChange->toView() - 1;
+    //            view_ = viewChange->toView() - 1;
+    //        }
+    //    }
     }
 
     adaptor_.touchAcquringLedger(viewChange->prevHash());
@@ -1300,6 +1320,9 @@ PopConsensus::peerValidation(
     bool isTrusted,
     std::shared_ptr<protocol::TMConsensus> const& m)
 {
+    if (waitingForInit())
+        return false;
+
     if (m->msg().size() < 50)
     {
         JLOG(j_.warn()) << "Validation: Too small";
@@ -1372,7 +1395,8 @@ PopConsensus::peerInitAnnounceInternal(STInitAnnounce::ref initAnnounce)
 {
     if (!waitingForInit())
     {
-        JLOG(j_.info()) << "Ignored InitAnnounce, I'm initialized";
+        initAnnounceToPeer(initAnnounce->nodePublic());
+        //JLOG(j_.info()) << "Ignored InitAnnounce, I'm initialized";
         return false;
     }
 

src/ripple/app/main/Tuning.h

@@ -22,8 +22,8 @@
 
 namespace ripple {
 
-constexpr std::size_t fullBelowTargetSize = 524288;
-constexpr std::chrono::seconds fullBelowExpiration = std::chrono::minutes{10};
+constexpr std::size_t fullBelowTargetSize = 5242880;
+constexpr std::chrono::seconds fullBelowExpiration = std::chrono::minutes{30};
 
 }  // namespace ripple