From 33015adc5391bbf1437d39f1237b738c7f9449be Mon Sep 17 00:00:00 2001 From: Cassandra Heart Date: Thu, 24 Oct 2024 22:15:36 -0500 Subject: [PATCH] more small adjustments --- node/consensus/data/message_handler.go | 19 +++++++++---------- node/consensus/data/peer_messaging.go | 6 ++++++ .../data/pre_midnight_proof_worker.go | 4 ++-- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/node/consensus/data/message_handler.go b/node/consensus/data/message_handler.go index fc674a5..eb91132 100644 --- a/node/consensus/data/message_handler.go +++ b/node/consensus/data/message_handler.go @@ -201,16 +201,15 @@ func (e *DataClockConsensusEngine) handleClockFrame( return errors.Wrap(err, "handle clock frame data") } - for _, trie := range e.GetFrameProverTries()[:1] { - if trie.Contains(addr.Bytes()) { - e.logger.Info( - "prover not in trie at frame, address may be in fork", - zap.Binary("address", address), - zap.Binary("filter", frame.Filter), - zap.Uint64("frame_number", frame.FrameNumber), - ) - return nil - } + trie := e.GetFrameProverTries()[0] + if !trie.Contains(addr.Bytes()) { + e.logger.Info( + "prover not in trie at frame, address may be in fork", + zap.Binary("address", address), + zap.Binary("filter", frame.Filter), + zap.Uint64("frame_number", frame.FrameNumber), + ) + return nil } e.logger.Info( diff --git a/node/consensus/data/peer_messaging.go b/node/consensus/data/peer_messaging.go index 7a00179..1f38a5f 100644 --- a/node/consensus/data/peer_messaging.go +++ b/node/consensus/data/peer_messaging.go @@ -101,6 +101,7 @@ func (e *DataClockConsensusEngine) HandlePreMidnightMint( ) (*protobufs.PreMidnightMintResponse, error) { addr, err := e.handleMint(t) if err != nil { + e.logger.Error("error while handling pre-midnight mint", zap.Error(err)) return nil, err } @@ -222,6 +223,11 @@ func (e *DataClockConsensusEngine) handleMint( return nil, errors.Wrap(application.ErrInvalidStateTransition, "handle mint") } + e.logger.Debug( + "got pre-midnight mint request", + zap.String("peer", peerId.String()), + ) + if len(t.Proofs) >= 3 && len(t.Proofs) < 204 && bytes.Equal( diff --git a/node/consensus/data/pre_midnight_proof_worker.go b/node/consensus/data/pre_midnight_proof_worker.go index 8600238..9a93177 100644 --- a/node/consensus/data/pre_midnight_proof_worker.go +++ b/node/consensus/data/pre_midnight_proof_worker.go @@ -64,8 +64,8 @@ func (e *DataClockConsensusEngine) runPreMidnightProofWorker() { for { tries := e.GetFrameProverTries() - if len(tries) == 0 { - e.logger.Info("waiting for more frame info to appear") + if len(tries) == 0 || e.pubSub.GetNetworkPeersCount() < 3 { + e.logger.Info("waiting for more peer info to appear") time.Sleep(10 * time.Second) continue }