smeb_y/ceremonyclient
1
0
Fork 0
mirror of https://source.quilibrium.com/quilibrium/ceremonyclient.git synced 2024-11-13 03:35:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: resync can happen again if distance is significant

Browse Source
This commit is contained in:
Cassandra Heart 2023-10-05 12:43:43 -05:00
parent b0a755cdc3
commit 53a19f3f23
No known key found for this signature in database
GPG Key ID: 6352152859385958
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
node/consensus/ceremony/ceremony_data_clock_consensus_engine.go
View File

@ -87,6 +87,7 @@ type CeremonyDataClockConsensusEngine struct {
peerAnnounceMap map[string]*protobufs.CeremonyPeerListAnnounce peerAnnounceMap map[string]*protobufs.CeremonyPeerListAnnounce
peerMap map[string]*peerInfo peerMap map[string]*peerInfo
activeChannelsMap map[string]ChannelServer activeChannelsMap map[string]ChannelServer
fullResync bool
} }
var _ consensus.DataConsensusEngine = (*CeremonyDataClockConsensusEngine)(nil) var _ consensus.DataConsensusEngine = (*CeremonyDataClockConsensusEngine)(nil)

8
node/consensus/ceremony/consensus_frames.go
View File

@ -885,6 +885,7 @@ func (e *CeremonyDataClockConsensusEngine) collect(
zap.String("peer_id", peer.ID(peerId).String()), zap.String("peer_id", peer.ID(peerId).String()),
) )
willPerformFullResync := false
cc, err := e.pubSub.GetDirectChannel(peerId) cc, err := e.pubSub.GetDirectChannel(peerId)
if err != nil { if err != nil {
e.logger.Error( e.logger.Error(
@ -895,7 +896,7 @@ func (e *CeremonyDataClockConsensusEngine) collect(
from := latest.FrameNumber from := latest.FrameNumber
if from == 0 { if from == 0 {
from = 1 from = 1
} else if maxFrame-from > 32 { } else if maxFrame-from > 32 && !e.fullResync {
// divergence is high, we need to confirm we're not in a fork // divergence is high, we need to confirm we're not in a fork
from = 1 from = 1
latest, _, err = e.clockStore.GetDataClockFrame(e.filter, 0) latest, _, err = e.clockStore.GetDataClockFrame(e.filter, 0)
@ -907,6 +908,7 @@ func (e *CeremonyDataClockConsensusEngine) collect(
) )
panic(err) panic(err)
} }
willPerformFullResync = true
} }
client := protobufs.NewCeremonyServiceClient(cc) client := protobufs.NewCeremonyServiceClient(cc)
@ -946,6 +948,10 @@ func (e *CeremonyDataClockConsensusEngine) collect(
if err := cc.Close(); err != nil { if err := cc.Close(); err != nil {
e.logger.Error("error while closing connection", zap.Error(err)) e.logger.Error("error while closing connection", zap.Error(err))
} }
if willPerformFullResync {
e.fullResync = true
}
} }
} }