diff --git a/node/config/config.go b/node/config/config.go index 25dbddf..b86f492 100644 --- a/node/config/config.go +++ b/node/config/config.go @@ -137,7 +137,7 @@ var unlock *SignedGenesisUnlock func DownloadAndVerifyGenesis(network uint) (*SignedGenesisUnlock, error) { if network != 0 { unlock = &SignedGenesisUnlock{ - GenesisSeedHex: "726573697374206d7563682c206f626579206c6974746c657c000000000000000000000006", + GenesisSeedHex: "726573697374206d7563682c206f626579206c6974746c657c000000000000000000000007", Beacon: []byte{ 0x58, 0xef, 0xd9, 0x7e, 0xdd, 0x0e, 0xb6, 0x2f, 0x51, 0xc7, 0x5d, 0x00, 0x29, 0x12, 0x45, 0x49, diff --git a/node/consensus/data/main_data_loop.go b/node/consensus/data/main_data_loop.go index dc0fd6c..d73c99f 100644 --- a/node/consensus/data/main_data_loop.go +++ b/node/consensus/data/main_data_loop.go @@ -78,7 +78,7 @@ func (e *DataClockConsensusEngine) processFrame( zap.Uint64("frame_number", dataFrame.FrameNumber), ) var err error - if !e.IsInProverTrie(e.provingKeyBytes) { + if !e.GetFrameProverTries()[0].Contains(e.provingKeyBytes) { if latestFrame, err = e.collect(dataFrame); err != nil { e.logger.Error("could not collect", zap.Error(err)) } @@ -123,6 +123,6 @@ func (e *DataClockConsensusEngine) processFrame( e.logger.Info("announcing prover join") e.announceProverJoin() } - return dataFrame + return latestFrame } } diff --git a/node/consensus/data/message_handler.go b/node/consensus/data/message_handler.go index 5d9108a..d0fac86 100644 --- a/node/consensus/data/message_handler.go +++ b/node/consensus/data/message_handler.go @@ -13,12 +13,13 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" "source.quilibrium.com/quilibrium/monorepo/node/config" + "source.quilibrium.com/quilibrium/monorepo/node/consensus" "source.quilibrium.com/quilibrium/monorepo/node/execution/intrinsics/token/application" "source.quilibrium.com/quilibrium/monorepo/node/protobufs" ) func (e *DataClockConsensusEngine) runFrameMessageHandler() { - for { + for e.state < consensus.EngineStateStopping { select { case message := <-e.frameMessageProcessorCh: e.logger.Debug("handling frame message") @@ -54,7 +55,7 @@ func (e *DataClockConsensusEngine) runFrameMessageHandler() { } func (e *DataClockConsensusEngine) runTxMessageHandler() { - for { + for e.state < consensus.EngineStateStopping { select { case message := <-e.txMessageProcessorCh: e.logger.Debug("handling tx message") @@ -127,7 +128,7 @@ func (e *DataClockConsensusEngine) runTxMessageHandler() { } func (e *DataClockConsensusEngine) runInfoMessageHandler() { - for { + for e.state < consensus.EngineStateStopping { select { case message := <-e.infoMessageProcessorCh: e.logger.Debug("handling info message")