diff --git a/node/app/db_console.go b/node/app/db_console.go index e5e5899..864863a 100644 --- a/node/app/db_console.go +++ b/node/app/db_console.go @@ -886,11 +886,11 @@ func logoVersion(width int) string { out += " ####################################### ########\n" out += " ############################# ##\n" out += " \n" - out += " Quilibrium Node - v1.2.10 – Dawn\n" + out += " Quilibrium Node - v1.2.11 – Dawn\n" out += " \n" out += " DB Console\n" } else { - out = "Quilibrium Node - v1.2.10 – Dawn - DB Console\n" + out = "Quilibrium Node - v1.2.11 – Dawn - DB Console\n" } return out } diff --git a/node/consensus/ceremony/ceremony_data_clock_consensus_engine.go b/node/consensus/ceremony/ceremony_data_clock_consensus_engine.go index d6f6cf3..cc10ab3 100644 --- a/node/consensus/ceremony/ceremony_data_clock_consensus_engine.go +++ b/node/consensus/ceremony/ceremony_data_clock_consensus_engine.go @@ -83,6 +83,7 @@ type CeremonyDataClockConsensusEngine struct { stagedLobbyStateTransitions *protobufs.CeremonyLobbyStateTransition minimumPeersRequired int statsClient protobufs.NodeStatsClient + currentReceivingSyncPeers int frameChan chan *protobufs.ClockFrame executionEngines map[string]execution.ExecutionEngine @@ -219,18 +220,19 @@ func NewCeremonyDataClockConsensusEngine( 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }, - lastFrameReceivedAt: time.Time{}, - frameProverTrie: &tries.RollingFrecencyCritbitTrie{}, - inclusionProver: inclusionProver, - syncingStatus: SyncStatusNotSyncing, - peerAnnounceMap: map[string]*protobufs.CeremonyPeerListAnnounce{}, - peerMap: map[string]*peerInfo{}, - uncooperativePeersMap: map[string]*peerInfo{}, - minimumPeersRequired: minimumPeersRequired, - frameProver: frameProver, - masterTimeReel: masterTimeReel, - dataTimeReel: dataTimeReel, - statsClient: statsClient, + currentReceivingSyncPeers: 0, + lastFrameReceivedAt: time.Time{}, + frameProverTrie: &tries.RollingFrecencyCritbitTrie{}, + inclusionProver: inclusionProver, + syncingStatus: SyncStatusNotSyncing, + peerAnnounceMap: map[string]*protobufs.CeremonyPeerListAnnounce{}, + peerMap: map[string]*peerInfo{}, + uncooperativePeersMap: map[string]*peerInfo{}, + minimumPeersRequired: minimumPeersRequired, + frameProver: frameProver, + masterTimeReel: masterTimeReel, + dataTimeReel: dataTimeReel, + statsClient: statsClient, } logger.Info("constructing consensus engine") diff --git a/node/consensus/ceremony/peer_messaging.go b/node/consensus/ceremony/peer_messaging.go index 68bd243..c5d4c4a 100644 --- a/node/consensus/ceremony/peer_messaging.go +++ b/node/consensus/ceremony/peer_messaging.go @@ -30,6 +30,28 @@ func (e *CeremonyDataClockConsensusEngine) GetCompressedSyncFrames( zap.Uint64("to_frame_number", request.ToFrameNumber), ) + if e.currentReceivingSyncPeers > 4 { + e.logger.Info( + "currently processing maximum sync requests, returning", + ) + + if err := server.SendMsg( + &protobufs.ClockFramesResponse{ + Filter: request.Filter, + FromFrameNumber: 0, + ToFrameNumber: 0, + ClockFrames: []*protobufs.ClockFrame{}, + }, + ); err != nil { + return errors.Wrap(err, "get compressed sync frames") + } + + return nil + } + + e.currentReceivingSyncPeers++ + defer func() { e.currentReceivingSyncPeers-- }() + from := request.FromFrameNumber parent := request.ParentSelector diff --git a/node/consensus/consensus_engine.go b/node/consensus/consensus_engine.go index 97cce14..ff82928 100644 --- a/node/consensus/consensus_engine.go +++ b/node/consensus/consensus_engine.go @@ -55,9 +55,9 @@ func GetMinimumVersionCutoff() time.Time { } func GetMinimumVersion() []byte { - return []byte{0x01, 0x02, 0x0A} + return []byte{0x01, 0x02, 0x0B} } func GetVersion() []byte { - return []byte{0x01, 0x02, 0x0A} + return []byte{0x01, 0x02, 0x0B} } diff --git a/node/main.go b/node/main.go index b657290..8dc5639 100644 --- a/node/main.go +++ b/node/main.go @@ -306,5 +306,5 @@ func printLogo() { func printVersion() { fmt.Println(" ") - fmt.Println(" Quilibrium Node - v1.2.10 – Dawn") + fmt.Println(" Quilibrium Node - v1.2.11 – Dawn") }