From d2718093451f50480919706045501153444ef4f7 Mon Sep 17 00:00:00 2001 From: gokutheengineer Date: Wed, 15 Feb 2023 16:28:44 +0300 Subject: [PATCH 01/17] update logs --- app/pocket/main.go | 2 +- consensus/debugging.go | 8 ++++---- consensus/state_sync/helpers.go | 4 ++-- consensus/state_sync/module.go | 19 ++++++++++++++++--- consensus/state_sync/server.go | 27 +++++++++++++++------------ consensus/types/errors.go | 4 ++-- consensus/types/types.go | 7 +++++++ 7 files changed, 47 insertions(+), 24 deletions(-) diff --git a/app/pocket/main.go b/app/pocket/main.go index 2ae49d495..f0ef04316 100644 --- a/app/pocket/main.go +++ b/app/pocket/main.go @@ -31,7 +31,7 @@ func main() { if err != nil { logger.Global.Fatal().Err(err).Msg("Failed to create pocket node") } - pocketNode.GetBus().GetConsensusModule().EnableServerMode() + //pocketNode.GetBus().GetConsensusModule().EnableServerMode() if err = pocketNode.Start(); err != nil { logger.Global.Fatal().Err(err).Msg("Failed to start pocket node") diff --git a/consensus/debugging.go b/consensus/debugging.go index e6e5eec08..e0dbd666b 100644 --- a/consensus/debugging.go +++ b/consensus/debugging.go @@ -123,8 +123,8 @@ func (m *consensusModule) sendGetBlockStateSyncMessage(_ *messaging.DebugMessage for _, val := range validators { valAddress := cryptoPocket.AddressFromString(val.GetAddress()) - if err := m.stateSync.SendStateSyncMessage(stateSyncGetBlockMessage, valAddress, requestHeight); err != nil { - m.logger.Debug().Msgf(typesCons.SendingStateSyncMessage(valAddress, requestHeight), err) + if err := m.stateSync.SendStateSyncMessage(stateSyncGetBlockMessage, typesCons.StateSyncGetBlockRequest, valAddress, requestHeight); err != nil { + m.logger.Error().Err(err).Msg("failed to send get block request state sync message") } } } @@ -150,8 +150,8 @@ func (m *consensusModule) sendGetMetadataStateSyncMessage(_ *messaging.DebugMess for _, val := range validators { valAddress := cryptoPocket.AddressFromString(val.GetAddress()) - if err := m.stateSync.SendStateSyncMessage(stateSyncMetaDataReqMessage, valAddress, requestHeight); err != nil { - m.logger.Debug().Msgf(typesCons.SendingStateSyncMessage(valAddress, requestHeight), err) + if err := m.stateSync.SendStateSyncMessage(stateSyncMetaDataReqMessage, typesCons.StateSyncGetMetadataRequest, valAddress, requestHeight); err != nil { + m.logger.Error().Err(err).Msg("failed to send get metadata request state sync message") } } diff --git a/consensus/state_sync/helpers.go b/consensus/state_sync/helpers.go index 8255b967d..1459753ce 100644 --- a/consensus/state_sync/helpers.go +++ b/consensus/state_sync/helpers.go @@ -6,12 +6,12 @@ import ( "google.golang.org/protobuf/types/known/anypb" ) -func (m *stateSync) SendStateSyncMessage(stateSyncMsg *typesCons.StateSyncMessage, peerId cryptoPocket.Address, blockHeight uint64) error { +func (m *stateSync) SendStateSyncMessage(stateSyncMsg *typesCons.StateSyncMessage, msgType string, peerId cryptoPocket.Address, blockHeight uint64) error { anyMsg, err := anypb.New(stateSyncMsg) if err != nil { return err } - m.logger.Info().Uint64("height", blockHeight).Msg(typesCons.SendingStateSyncMessage(peerId, blockHeight)) + m.logger.Info().Uint64("height", blockHeight).Msg(typesCons.SendingStateSyncMessage(peerId, msgType, blockHeight)) return m.sendToPeer(anyMsg, peerId) } diff --git a/consensus/state_sync/module.go b/consensus/state_sync/module.go index 74bcf353b..fdaf8239c 100644 --- a/consensus/state_sync/module.go +++ b/consensus/state_sync/module.go @@ -36,7 +36,7 @@ type StateSyncModule interface { IsServerModEnabled() bool EnableServerMode() - SendStateSyncMessage(*typesCons.StateSyncMessage, cryptoPocket.Address, uint64) error + SendStateSyncMessage(*typesCons.StateSyncMessage, string, cryptoPocket.Address, uint64) error } var ( @@ -70,6 +70,7 @@ func (*stateSync) Create(bus modules.Bus) (modules.Module, error) { } // when node is starting, it is in sync mode, as it might need to bootstrap to the latest state + // TODO: consider setting this thorugh event sent by state machine for consistency m.currentMode = Sync m.serverMode = false @@ -117,13 +118,25 @@ func (m *stateSync) EnableServerMode() { // TODO(#352): Implement this function // Placeholder function func (m *stateSync) HandleGetBlockResponse(blockRes *typesCons.GetBlockResponse) error { - m.logger.Debug().Msgf("Received get block response: %s", blockRes.Block.String()) + consensusMod := m.GetBus().GetConsensusModule() + serverNodePeerId := consensusMod.GetNodeAddress() + clientPeerId := blockRes.PeerAddress + currentHeight := consensusMod.CurrentHeight() + + m.logger.Info().Msgf("%s received get block response from: %s, for height %d. Received block is: %s \n", serverNodePeerId, clientPeerId, currentHeight, blockRes.Block.String()) + return nil } // TODO(#352): Implement the business to handle these correctly // Placeholder function func (m *stateSync) HandleStateSyncMetadataResponse(metaDataRes *typesCons.StateSyncMetadataResponse) error { - m.logger.Debug().Msgf("Received get metadata response: %s", metaDataRes.String()) + consensusMod := m.GetBus().GetConsensusModule() + serverNodePeerId := consensusMod.GetNodeAddress() + clientPeerId := metaDataRes.PeerAddress + currentHeight := consensusMod.CurrentHeight() + + m.logger.Info().Msgf("%s received get metadata response from: %s, for height %d. Received metadata is: %s \n", serverNodePeerId, clientPeerId, currentHeight, metaDataRes.String()) + return nil } diff --git a/consensus/state_sync/server.go b/consensus/state_sync/server.go index 1e7c26105..cccc836ca 100644 --- a/consensus/state_sync/server.go +++ b/consensus/state_sync/server.go @@ -22,13 +22,15 @@ type StateSyncServerModule interface { func (m *stateSync) HandleStateSyncMetadataRequest(metadataReq *typesCons.StateSyncMetadataRequest) error { consensusMod := m.GetBus().GetConsensusModule() - serverNodePeerId := m.GetBus().GetConsensusModule().GetNodeAddress() - + serverNodePeerId := consensusMod.GetNodeAddress() + currentHeight := consensusMod.CurrentHeight() clientPeerAddress := metadataReq.PeerAddress - m.logger.Info().Msgf("%s received state sync metadata request from: %s", serverNodePeerId, clientPeerAddress) - // last finalized block - persistenceContext, err := m.GetBus().GetPersistenceModule().NewReadContext(int64(consensusMod.CurrentHeight()) - 1) + m.logger.Info().Msgf("%s received state sync metadata request from: %s, at height: %d \n", serverNodePeerId, clientPeerAddress, currentHeight) + + // current height is the height of the block that is being processed, so we need to subtract 1 for the last finalized block + lastPersistedBlockHeight := currentHeight - 1 + persistenceContext, err := m.GetBus().GetPersistenceModule().NewReadContext(int64(lastPersistedBlockHeight) - 1) if err != nil { return nil } @@ -54,20 +56,21 @@ func (m *stateSync) HandleStateSyncMetadataRequest(metadataReq *typesCons.StateS }, } - return m.SendStateSyncMessage(&stateSyncMessage, cryptoPocket.AddressFromString(clientPeerAddress), m.bus.GetConsensusModule().CurrentHeight()) + return m.SendStateSyncMessage(&stateSyncMessage, typesCons.StateSyncGetMetadataRequest, cryptoPocket.AddressFromString(clientPeerAddress), m.bus.GetConsensusModule().CurrentHeight()) } func (m *stateSync) HandleGetBlockRequest(blockReq *typesCons.GetBlockRequest) error { consensusMod := m.GetBus().GetConsensusModule() serverNodePeerAddress := consensusMod.GetNodeAddress() - clientPeerAddress := blockReq.PeerAddress - m.logger.Info().Msgf("%s received state sync Get Block Req from: %s", serverNodePeerAddress, clientPeerAddress) + currentHeight := consensusMod.CurrentHeight() - currentHeight := m.GetBus().GetConsensusModule().CurrentHeight() + m.logger.Info().Msgf("%s received state sync get block request from: %s, at height: %d \n", serverNodePeerAddress, clientPeerAddress, currentHeight) - if currentHeight < blockReq.Height { - return fmt.Errorf("requested block height: %d is higher than node's block height: %d", blockReq.Height, consensusMod.CurrentHeight()) + // current height is the height of the block that is being processed, so we need to subtract 1 for the last finalized block + lastPersistedBlockHeight := currentHeight - 1 + if lastPersistedBlockHeight < blockReq.Height { + return fmt.Errorf("requested block height: %d is higher than current persisted block height: %d (which is current height -1)", blockReq.Height, lastPersistedBlockHeight) } // get block from the persistence module @@ -85,7 +88,7 @@ func (m *stateSync) HandleGetBlockRequest(blockReq *typesCons.GetBlockRequest) e }, } - return m.SendStateSyncMessage(&stateSyncMessage, cryptoPocket.AddressFromString(clientPeerAddress), blockReq.Height) + return m.SendStateSyncMessage(&stateSyncMessage, typesCons.StateSyncGetBlockRequest, cryptoPocket.AddressFromString(clientPeerAddress), blockReq.Height) } // Get a block from persistence module given block height diff --git a/consensus/types/errors.go b/consensus/types/errors.go index 18db8ad71..be2216f9d 100644 --- a/consensus/types/errors.go +++ b/consensus/types/errors.go @@ -83,8 +83,8 @@ func SendingMessage(msg *HotstuffMessage, nodeId NodeId) string { return fmt.Sprintf("✉️ Sending message ✉️ to %d at (height, step, round) (%d, %d, %d)", nodeId, msg.Height, msg.Step, msg.Round) } -func SendingStateSyncMessage(nodeId cryptoPocket.Address, height uint64) string { - return fmt.Sprintf("🔄 Sending State sync message ✉️ to node %s at height: (%d) 🔄", nodeId, height) +func SendingStateSyncMessage(nodeId cryptoPocket.Address, msgType string, height uint64) string { + return fmt.Sprintf("🔄 Sending %s state sync message ✉️ to node %s at height: (%d) 🔄", msgType, nodeId, height) } func BroadcastingMessage(msg *HotstuffMessage) string { diff --git a/consensus/types/types.go b/consensus/types/types.go index 19517d3cd..488e17eec 100644 --- a/consensus/types/types.go +++ b/consensus/types/types.go @@ -5,6 +5,13 @@ import ( coreTypes "github.com/pokt-network/pocket/shared/core/types" ) +const ( + StateSyncGetBlockRequest = "get block request" + StateSyncGetMetadataRequest = "get metadata request" + StateSyncGetBlockResponse = "get block response" + StateSyncGetMetadataResponse = "get metadata response" +) + type NodeId uint64 type ( From 4e48781a83f993e3bdc3c2810de2b4921535a1f1 Mon Sep 17 00:00:00 2001 From: gokutheengineer Date: Wed, 15 Feb 2023 16:53:54 +0300 Subject: [PATCH 02/17] small fixes --- app/pocket/main.go | 1 - consensus/state_sync/module.go | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/pocket/main.go b/app/pocket/main.go index f0ef04316..907b119a3 100644 --- a/app/pocket/main.go +++ b/app/pocket/main.go @@ -31,7 +31,6 @@ func main() { if err != nil { logger.Global.Fatal().Err(err).Msg("Failed to create pocket node") } - //pocketNode.GetBus().GetConsensusModule().EnableServerMode() if err = pocketNode.Start(); err != nil { logger.Global.Fatal().Err(err).Msg("Failed to start pocket node") diff --git a/consensus/state_sync/module.go b/consensus/state_sync/module.go index fdaf8239c..005b85c81 100644 --- a/consensus/state_sync/module.go +++ b/consensus/state_sync/module.go @@ -121,9 +121,8 @@ func (m *stateSync) HandleGetBlockResponse(blockRes *typesCons.GetBlockResponse) consensusMod := m.GetBus().GetConsensusModule() serverNodePeerId := consensusMod.GetNodeAddress() clientPeerId := blockRes.PeerAddress - currentHeight := consensusMod.CurrentHeight() - m.logger.Info().Msgf("%s received get block response from: %s, for height %d. Received block is: %s \n", serverNodePeerId, clientPeerId, currentHeight, blockRes.Block.String()) + m.logger.Info().Msgf("%s received get block response from: %s, for height %d. Received block's header %s, \n", serverNodePeerId, clientPeerId, blockRes.Block.BlockHeader.Height, blockRes.Block.BlockHeader) return nil } @@ -136,7 +135,7 @@ func (m *stateSync) HandleStateSyncMetadataResponse(metaDataRes *typesCons.State clientPeerId := metaDataRes.PeerAddress currentHeight := consensusMod.CurrentHeight() - m.logger.Info().Msgf("%s received get metadata response from: %s, for height %d. Received metadata is: %s \n", serverNodePeerId, clientPeerId, currentHeight, metaDataRes.String()) + m.logger.Info().Msgf("%s received get metadata response from: %s, current height is %d. Received metadata is: %s \n", serverNodePeerId, clientPeerId, currentHeight, metaDataRes) return nil } From c6ae7d1b9ff82b35b9c793764ba2601c82fee677 Mon Sep 17 00:00:00 2001 From: gokutheengineer Date: Wed, 15 Feb 2023 17:04:16 +0300 Subject: [PATCH 03/17] update changelogs --- app/pocket/doc/CHANGELOG.md | 4 ++++ consensus/doc/CHANGELOG.md | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/app/pocket/doc/CHANGELOG.md b/app/pocket/doc/CHANGELOG.md index 34820c0c6..14b993e75 100644 --- a/app/pocket/doc/CHANGELOG.md +++ b/app/pocket/doc/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.0.0.5] - 2023-02-15 + +- Removed unnecessary server mode enabling call via EnableServerMode() function + ## [0.0.0.4] - 2023-02-07 - Added GITHUB_WIKI tags where it was missing diff --git a/consensus/doc/CHANGELOG.md b/consensus/doc/CHANGELOG.md index 2e3e98095..af32508ec 100644 --- a/consensus/doc/CHANGELOG.md +++ b/consensus/doc/CHANGELOG.md @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.0.0.29] - 2023-02-15 + +- Update log messages in the state sync submodule with consistent style and add height information. +- Add state sync message types to the types package + ## [0.0.0.28] - 2023-02-14 - Add a few `nolint` comments to fix the code on main From f19f485f5ea42017cff466d47e7914aa5f11405f Mon Sep 17 00:00:00 2001 From: gokutheengineer Date: Wed, 15 Feb 2023 17:14:47 +0300 Subject: [PATCH 04/17] update changelogs, fix nits --- consensus/doc/CHANGELOG.md | 4 ++-- consensus/state_sync/module.go | 2 +- consensus/state_sync/server.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/consensus/doc/CHANGELOG.md b/consensus/doc/CHANGELOG.md index af32508ec..7e2696135 100644 --- a/consensus/doc/CHANGELOG.md +++ b/consensus/doc/CHANGELOG.md @@ -9,8 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [0.0.0.29] - 2023-02-15 -- Update log messages in the state sync submodule with consistent style and add height information. -- Add state sync message types to the types package +- Updated log messages in the state sync submodule with consistent style and add height information +- Added state sync message types to the types package ## [0.0.0.28] - 2023-02-14 diff --git a/consensus/state_sync/module.go b/consensus/state_sync/module.go index 005b85c81..b5a445ffe 100644 --- a/consensus/state_sync/module.go +++ b/consensus/state_sync/module.go @@ -122,7 +122,7 @@ func (m *stateSync) HandleGetBlockResponse(blockRes *typesCons.GetBlockResponse) serverNodePeerId := consensusMod.GetNodeAddress() clientPeerId := blockRes.PeerAddress - m.logger.Info().Msgf("%s received get block response from: %s, for height %d. Received block's header %s, \n", serverNodePeerId, clientPeerId, blockRes.Block.BlockHeader.Height, blockRes.Block.BlockHeader) + m.logger.Info().Msgf("%s received get block response from: %s, for height %d. Received block's header is: %s, \n", serverNodePeerId, clientPeerId, blockRes.Block.BlockHeader.Height, blockRes.Block.BlockHeader) return nil } diff --git a/consensus/state_sync/server.go b/consensus/state_sync/server.go index cccc836ca..308847051 100644 --- a/consensus/state_sync/server.go +++ b/consensus/state_sync/server.go @@ -30,7 +30,7 @@ func (m *stateSync) HandleStateSyncMetadataRequest(metadataReq *typesCons.StateS // current height is the height of the block that is being processed, so we need to subtract 1 for the last finalized block lastPersistedBlockHeight := currentHeight - 1 - persistenceContext, err := m.GetBus().GetPersistenceModule().NewReadContext(int64(lastPersistedBlockHeight) - 1) + persistenceContext, err := m.GetBus().GetPersistenceModule().NewReadContext(int64(lastPersistedBlockHeight)) if err != nil { return nil } @@ -70,7 +70,7 @@ func (m *stateSync) HandleGetBlockRequest(blockReq *typesCons.GetBlockRequest) e // current height is the height of the block that is being processed, so we need to subtract 1 for the last finalized block lastPersistedBlockHeight := currentHeight - 1 if lastPersistedBlockHeight < blockReq.Height { - return fmt.Errorf("requested block height: %d is higher than current persisted block height: %d (which is current height -1)", blockReq.Height, lastPersistedBlockHeight) + return fmt.Errorf("requested block height: %d is higher than current persisted block height: %d", blockReq.Height, lastPersistedBlockHeight) } // get block from the persistence module From 224e17d7edefde38e078cb22ec44e37ed9cdd045 Mon Sep 17 00:00:00 2001 From: goku <118421317+gokutheengineer@users.noreply.github.com> Date: Thu, 16 Feb 2023 21:29:03 +0300 Subject: [PATCH 05/17] Update consensus/types/types.go Co-authored-by: Daniel Olshansky --- consensus/types/types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/consensus/types/types.go b/consensus/types/types.go index 488e17eec..b715a6673 100644 --- a/consensus/types/types.go +++ b/consensus/types/types.go @@ -6,7 +6,7 @@ import ( ) const ( - StateSyncGetBlockRequest = "get block request" + StateSyncGetBlockRequest = "`GetBlockRequest`" StateSyncGetMetadataRequest = "get metadata request" StateSyncGetBlockResponse = "get block response" StateSyncGetMetadataResponse = "get metadata response" From dfe11a555e371ace12d2a2f85368dcde5d21fdc1 Mon Sep 17 00:00:00 2001 From: goku <118421317+gokutheengineer@users.noreply.github.com> Date: Thu, 16 Feb 2023 21:29:13 +0300 Subject: [PATCH 06/17] Update app/pocket/doc/CHANGELOG.md Co-authored-by: Daniel Olshansky --- app/pocket/doc/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/pocket/doc/CHANGELOG.md b/app/pocket/doc/CHANGELOG.md index 14b993e75..034100b84 100644 --- a/app/pocket/doc/CHANGELOG.md +++ b/app/pocket/doc/CHANGELOG.md @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [0.0.0.5] - 2023-02-15 -- Removed unnecessary server mode enabling call via EnableServerMode() function +- Removed unnecessary server mode enabling call via `EnableServerMode()` function ## [0.0.0.4] - 2023-02-07 From c39a34fce0cf7b51c40f461f0dbdc02a0b0c51a6 Mon Sep 17 00:00:00 2001 From: goku <118421317+gokutheengineer@users.noreply.github.com> Date: Thu, 16 Feb 2023 21:30:09 +0300 Subject: [PATCH 07/17] Update consensus/state_sync/module.go Co-authored-by: Daniel Olshansky --- consensus/state_sync/module.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/consensus/state_sync/module.go b/consensus/state_sync/module.go index b5a445ffe..d178fab19 100644 --- a/consensus/state_sync/module.go +++ b/consensus/state_sync/module.go @@ -70,7 +70,7 @@ func (*stateSync) Create(bus modules.Bus) (modules.Module, error) { } // when node is starting, it is in sync mode, as it might need to bootstrap to the latest state - // TODO: consider setting this thorugh event sent by state machine for consistency + // TODO: change this to to reflect the state in the fsm once merged m.currentMode = Sync m.serverMode = false From b5fbbb00934c71fd6ac357cdb12277bd0677dd19 Mon Sep 17 00:00:00 2001 From: gokutheengineer Date: Thu, 16 Feb 2023 22:56:17 +0300 Subject: [PATCH 08/17] refactor log messages, rename file, some other nits --- app/pocket/doc/CHANGELOG.md | 2 +- consensus/debugging.go | 6 ++-- consensus/doc/CHANGELOG.md | 2 +- consensus/state_sync/helpers.go | 9 ++++-- consensus/state_sync/module.go | 18 ++++++++++-- consensus/state_sync/server.go | 34 ++++++++++++++-------- consensus/types/{errors.go => messages.go} | 2 +- 7 files changed, 50 insertions(+), 23 deletions(-) rename consensus/types/{errors.go => messages.go} (99%) diff --git a/app/pocket/doc/CHANGELOG.md b/app/pocket/doc/CHANGELOG.md index 034100b84..9389ec665 100644 --- a/app/pocket/doc/CHANGELOG.md +++ b/app/pocket/doc/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [0.0.0.5] - 2023-02-15 +## [0.0.0.5] - 2023-02-16 - Removed unnecessary server mode enabling call via `EnableServerMode()` function diff --git a/consensus/debugging.go b/consensus/debugging.go index e0dbd666b..302de50b9 100644 --- a/consensus/debugging.go +++ b/consensus/debugging.go @@ -123,8 +123,8 @@ func (m *consensusModule) sendGetBlockStateSyncMessage(_ *messaging.DebugMessage for _, val := range validators { valAddress := cryptoPocket.AddressFromString(val.GetAddress()) - if err := m.stateSync.SendStateSyncMessage(stateSyncGetBlockMessage, typesCons.StateSyncGetBlockRequest, valAddress, requestHeight); err != nil { - m.logger.Error().Err(err).Msg("failed to send get block request state sync message") + if err := m.stateSync.SendStateSyncMessage(stateSyncGetBlockMessage, valAddress, requestHeight); err != nil { + m.logger.Error().Err(err).Msg("failed to send StateSyncMessage") } } } @@ -150,7 +150,7 @@ func (m *consensusModule) sendGetMetadataStateSyncMessage(_ *messaging.DebugMess for _, val := range validators { valAddress := cryptoPocket.AddressFromString(val.GetAddress()) - if err := m.stateSync.SendStateSyncMessage(stateSyncMetaDataReqMessage, typesCons.StateSyncGetMetadataRequest, valAddress, requestHeight); err != nil { + if err := m.stateSync.SendStateSyncMessage(stateSyncMetaDataReqMessage, valAddress, requestHeight); err != nil { m.logger.Error().Err(err).Msg("failed to send get metadata request state sync message") } } diff --git a/consensus/doc/CHANGELOG.md b/consensus/doc/CHANGELOG.md index 7e2696135..08a49e043 100644 --- a/consensus/doc/CHANGELOG.md +++ b/consensus/doc/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [0.0.0.29] - 2023-02-15 +## [0.0.0.29] - 2023-02-16 - Updated log messages in the state sync submodule with consistent style and add height information - Added state sync message types to the types package diff --git a/consensus/state_sync/helpers.go b/consensus/state_sync/helpers.go index 1459753ce..ba101a19d 100644 --- a/consensus/state_sync/helpers.go +++ b/consensus/state_sync/helpers.go @@ -6,12 +6,12 @@ import ( "google.golang.org/protobuf/types/known/anypb" ) -func (m *stateSync) SendStateSyncMessage(stateSyncMsg *typesCons.StateSyncMessage, msgType string, peerId cryptoPocket.Address, blockHeight uint64) error { +func (m *stateSync) SendStateSyncMessage(stateSyncMsg *typesCons.StateSyncMessage, peerId cryptoPocket.Address, height uint64) error { anyMsg, err := anypb.New(stateSyncMsg) if err != nil { return err } - m.logger.Info().Uint64("height", blockHeight).Msg(typesCons.SendingStateSyncMessage(peerId, msgType, blockHeight)) + m.logger.Info().Uint64("height", height).Msg(typesCons.SendingStateSyncMessage(peerId, getMessageType(stateSyncMsg), height)) return m.sendToPeer(anyMsg, peerId) } @@ -23,3 +23,8 @@ func (m *stateSync) sendToPeer(msg *anypb.Any, peerId cryptoPocket.Address) erro } return nil } + +func getMessageType(msg *typesCons.StateSyncMessage) string { + //return string(msg.ProtoReflect().WhichOneof(msg.ProtoReflect().Descriptor().Oneofs()).FullName()) + return string(msg.ProtoReflect().Descriptor().Name()) +} diff --git a/consensus/state_sync/module.go b/consensus/state_sync/module.go index d178fab19..0fb913073 100644 --- a/consensus/state_sync/module.go +++ b/consensus/state_sync/module.go @@ -36,7 +36,7 @@ type StateSyncModule interface { IsServerModEnabled() bool EnableServerMode() - SendStateSyncMessage(*typesCons.StateSyncMessage, string, cryptoPocket.Address, uint64) error + SendStateSyncMessage(msg *typesCons.StateSyncMessage, nodeAddress cryptoPocket.Address, height uint64) error } var ( @@ -122,7 +122,13 @@ func (m *stateSync) HandleGetBlockResponse(blockRes *typesCons.GetBlockResponse) serverNodePeerId := consensusMod.GetNodeAddress() clientPeerId := blockRes.PeerAddress - m.logger.Info().Msgf("%s received get block response from: %s, for height %d. Received block's header is: %s, \n", serverNodePeerId, clientPeerId, blockRes.Block.BlockHeader.Height, blockRes.Block.BlockHeader) + fields := map[string]interface{}{ + "current height": blockRes.Block.BlockHeader.Height, + "sender": serverNodePeerId, + "receiver": clientPeerId, + } + + m.logger.Info().Fields(fields).Msgf("Received get block response: %s", blockRes) return nil } @@ -135,7 +141,13 @@ func (m *stateSync) HandleStateSyncMetadataResponse(metaDataRes *typesCons.State clientPeerId := metaDataRes.PeerAddress currentHeight := consensusMod.CurrentHeight() - m.logger.Info().Msgf("%s received get metadata response from: %s, current height is %d. Received metadata is: %s \n", serverNodePeerId, clientPeerId, currentHeight, metaDataRes) + fields := map[string]interface{}{ + "current height": currentHeight, + "sender": serverNodePeerId, + "receiver": clientPeerId, + } + + m.logger.Info().Fields(fields).Msgf("Received get metadata response: %s", metaDataRes) return nil } diff --git a/consensus/state_sync/server.go b/consensus/state_sync/server.go index 308847051..7ce213cd8 100644 --- a/consensus/state_sync/server.go +++ b/consensus/state_sync/server.go @@ -22,14 +22,19 @@ type StateSyncServerModule interface { func (m *stateSync) HandleStateSyncMetadataRequest(metadataReq *typesCons.StateSyncMetadataRequest) error { consensusMod := m.GetBus().GetConsensusModule() - serverNodePeerId := consensusMod.GetNodeAddress() - currentHeight := consensusMod.CurrentHeight() + serverNodePeerAddress := consensusMod.GetNodeAddress() clientPeerAddress := metadataReq.PeerAddress + // current height is the height of the block that is being processed, so we need to subtract 1 for the last finalized block + lastPersistedBlockHeight := consensusMod.CurrentHeight() - 1 - m.logger.Info().Msgf("%s received state sync metadata request from: %s, at height: %d \n", serverNodePeerId, clientPeerAddress, currentHeight) + fields := map[string]interface{}{ + "height": lastPersistedBlockHeight, + "sender": serverNodePeerAddress, + "receiver": clientPeerAddress, + } + + m.logger.Info().Fields(fields).Msgf("Received state sync get block request: %s", metadataReq) - // current height is the height of the block that is being processed, so we need to subtract 1 for the last finalized block - lastPersistedBlockHeight := currentHeight - 1 persistenceContext, err := m.GetBus().GetPersistenceModule().NewReadContext(int64(lastPersistedBlockHeight)) if err != nil { return nil @@ -49,26 +54,31 @@ func (m *stateSync) HandleStateSyncMetadataRequest(metadataReq *typesCons.StateS stateSyncMessage := typesCons.StateSyncMessage{ Message: &typesCons.StateSyncMessage_MetadataRes{ MetadataRes: &typesCons.StateSyncMetadataResponse{ - PeerAddress: serverNodePeerId, + PeerAddress: serverNodePeerAddress, MinHeight: minHeight, MaxHeight: uint64(maxHeight), }, }, } - return m.SendStateSyncMessage(&stateSyncMessage, typesCons.StateSyncGetMetadataRequest, cryptoPocket.AddressFromString(clientPeerAddress), m.bus.GetConsensusModule().CurrentHeight()) + return m.SendStateSyncMessage(&stateSyncMessage, cryptoPocket.AddressFromString(clientPeerAddress), m.bus.GetConsensusModule().CurrentHeight()) } func (m *stateSync) HandleGetBlockRequest(blockReq *typesCons.GetBlockRequest) error { consensusMod := m.GetBus().GetConsensusModule() serverNodePeerAddress := consensusMod.GetNodeAddress() clientPeerAddress := blockReq.PeerAddress - currentHeight := consensusMod.CurrentHeight() + // current height is the height of the block that is being processed, so we need to subtract 1 for the last finalized block + lastPersistedBlockHeight := consensusMod.CurrentHeight() - 1 - m.logger.Info().Msgf("%s received state sync get block request from: %s, at height: %d \n", serverNodePeerAddress, clientPeerAddress, currentHeight) + fields := map[string]interface{}{ + "height": lastPersistedBlockHeight, + "sender": serverNodePeerAddress, + "receiver": clientPeerAddress, + } + + m.logger.Info().Fields(fields).Msgf("Received state sync get block request: %s", blockReq) - // current height is the height of the block that is being processed, so we need to subtract 1 for the last finalized block - lastPersistedBlockHeight := currentHeight - 1 if lastPersistedBlockHeight < blockReq.Height { return fmt.Errorf("requested block height: %d is higher than current persisted block height: %d", blockReq.Height, lastPersistedBlockHeight) } @@ -88,7 +98,7 @@ func (m *stateSync) HandleGetBlockRequest(blockReq *typesCons.GetBlockRequest) e }, } - return m.SendStateSyncMessage(&stateSyncMessage, typesCons.StateSyncGetBlockRequest, cryptoPocket.AddressFromString(clientPeerAddress), blockReq.Height) + return m.SendStateSyncMessage(&stateSyncMessage, cryptoPocket.AddressFromString(clientPeerAddress), blockReq.Height) } // Get a block from persistence module given block height diff --git a/consensus/types/errors.go b/consensus/types/messages.go similarity index 99% rename from consensus/types/errors.go rename to consensus/types/messages.go index be2216f9d..9681f8692 100644 --- a/consensus/types/errors.go +++ b/consensus/types/messages.go @@ -84,7 +84,7 @@ func SendingMessage(msg *HotstuffMessage, nodeId NodeId) string { } func SendingStateSyncMessage(nodeId cryptoPocket.Address, msgType string, height uint64) string { - return fmt.Sprintf("🔄 Sending %s state sync message ✉️ to node %s at height: (%d) 🔄", msgType, nodeId, height) + return fmt.Sprintf("✉️ Sending %s ✉️ to node %s at height: (%d) 🔄", msgType, nodeId, height) } func BroadcastingMessage(msg *HotstuffMessage) string { From cd6f3c758081f2944a13bd9ad50ed328c096d48b Mon Sep 17 00:00:00 2001 From: gokutheengineer Date: Thu, 16 Feb 2023 23:23:46 +0300 Subject: [PATCH 09/17] golint error, update error logs --- consensus/debugging.go | 4 ++-- consensus/state_sync/helpers.go | 23 ++++++++++++++++++++--- consensus/state_sync/module.go | 12 ++++++------ consensus/types/messages.go | 5 ----- consensus/types/types.go | 7 ------- 5 files changed, 28 insertions(+), 23 deletions(-) diff --git a/consensus/debugging.go b/consensus/debugging.go index 302de50b9..034455638 100644 --- a/consensus/debugging.go +++ b/consensus/debugging.go @@ -124,7 +124,7 @@ func (m *consensusModule) sendGetBlockStateSyncMessage(_ *messaging.DebugMessage for _, val := range validators { valAddress := cryptoPocket.AddressFromString(val.GetAddress()) if err := m.stateSync.SendStateSyncMessage(stateSyncGetBlockMessage, valAddress, requestHeight); err != nil { - m.logger.Error().Err(err).Msg("failed to send StateSyncMessage") + m.logger.Error().Err(err).Str("proto_type", "GetBlockRequest").Msg("failed to send StateSyncMessage") } } } @@ -151,7 +151,7 @@ func (m *consensusModule) sendGetMetadataStateSyncMessage(_ *messaging.DebugMess for _, val := range validators { valAddress := cryptoPocket.AddressFromString(val.GetAddress()) if err := m.stateSync.SendStateSyncMessage(stateSyncMetaDataReqMessage, valAddress, requestHeight); err != nil { - m.logger.Error().Err(err).Msg("failed to send get metadata request state sync message") + m.logger.Error().Err(err).Str("proto_type", "GetMetaDataRequest").Msg("failed to send StateSyncMessage") } } diff --git a/consensus/state_sync/helpers.go b/consensus/state_sync/helpers.go index ba101a19d..0b4ce6d19 100644 --- a/consensus/state_sync/helpers.go +++ b/consensus/state_sync/helpers.go @@ -11,7 +11,14 @@ func (m *stateSync) SendStateSyncMessage(stateSyncMsg *typesCons.StateSyncMessag if err != nil { return err } - m.logger.Info().Uint64("height", height).Msg(typesCons.SendingStateSyncMessage(peerId, getMessageType(stateSyncMsg), height)) + + fields := map[string]interface{}{ + "height": height, + "peerId": peerId, + "proto_type": getMessageType(stateSyncMsg), + } + + m.logger.Info().Fields(fields).Msg("Sending StateSync Message") return m.sendToPeer(anyMsg, peerId) } @@ -25,6 +32,16 @@ func (m *stateSync) sendToPeer(msg *anypb.Any, peerId cryptoPocket.Address) erro } func getMessageType(msg *typesCons.StateSyncMessage) string { - //return string(msg.ProtoReflect().WhichOneof(msg.ProtoReflect().Descriptor().Oneofs()).FullName()) - return string(msg.ProtoReflect().Descriptor().Name()) + switch msg.Message.(type) { + case *typesCons.StateSyncMessage_MetadataReq: + return "MetadataRequest" + case *typesCons.StateSyncMessage_MetadataRes: + return "MetadataResponse" + case *typesCons.StateSyncMessage_GetBlockReq: + return "GetBlockRequest" + case *typesCons.StateSyncMessage_GetBlockRes: + return "GetBlockResponse" + default: + return "Unknown" + } } diff --git a/consensus/state_sync/module.go b/consensus/state_sync/module.go index 0fb913073..80707845e 100644 --- a/consensus/state_sync/module.go +++ b/consensus/state_sync/module.go @@ -123,9 +123,9 @@ func (m *stateSync) HandleGetBlockResponse(blockRes *typesCons.GetBlockResponse) clientPeerId := blockRes.PeerAddress fields := map[string]interface{}{ - "current height": blockRes.Block.BlockHeader.Height, - "sender": serverNodePeerId, - "receiver": clientPeerId, + "currentHeight": blockRes.Block.BlockHeader.Height, + "sender": serverNodePeerId, + "receiver": clientPeerId, } m.logger.Info().Fields(fields).Msgf("Received get block response: %s", blockRes) @@ -142,9 +142,9 @@ func (m *stateSync) HandleStateSyncMetadataResponse(metaDataRes *typesCons.State currentHeight := consensusMod.CurrentHeight() fields := map[string]interface{}{ - "current height": currentHeight, - "sender": serverNodePeerId, - "receiver": clientPeerId, + "currentHeight": currentHeight, + "sender": serverNodePeerId, + "receiver": clientPeerId, } m.logger.Info().Fields(fields).Msgf("Received get metadata response: %s", metaDataRes) diff --git a/consensus/types/messages.go b/consensus/types/messages.go index 9681f8692..ec0ee174c 100644 --- a/consensus/types/messages.go +++ b/consensus/types/messages.go @@ -9,7 +9,6 @@ import ( "github.com/pokt-network/pocket/logger" "github.com/pokt-network/pocket/shared/codec" - cryptoPocket "github.com/pokt-network/pocket/shared/crypto" "google.golang.org/protobuf/proto" ) @@ -83,10 +82,6 @@ func SendingMessage(msg *HotstuffMessage, nodeId NodeId) string { return fmt.Sprintf("✉️ Sending message ✉️ to %d at (height, step, round) (%d, %d, %d)", nodeId, msg.Height, msg.Step, msg.Round) } -func SendingStateSyncMessage(nodeId cryptoPocket.Address, msgType string, height uint64) string { - return fmt.Sprintf("✉️ Sending %s ✉️ to node %s at height: (%d) 🔄", msgType, nodeId, height) -} - func BroadcastingMessage(msg *HotstuffMessage) string { return fmt.Sprintf("📣 Broadcasting message 📣 (height, step, round): (%d, %d, %d)", msg.GetHeight(), msg.GetStep(), msg.GetRound()) } diff --git a/consensus/types/types.go b/consensus/types/types.go index b715a6673..19517d3cd 100644 --- a/consensus/types/types.go +++ b/consensus/types/types.go @@ -5,13 +5,6 @@ import ( coreTypes "github.com/pokt-network/pocket/shared/core/types" ) -const ( - StateSyncGetBlockRequest = "`GetBlockRequest`" - StateSyncGetMetadataRequest = "get metadata request" - StateSyncGetBlockResponse = "get block response" - StateSyncGetMetadataResponse = "get metadata response" -) - type NodeId uint64 type ( From 7447a1efb1762c49624012e070102656c65df7ff Mon Sep 17 00:00:00 2001 From: gokutheengineer Date: Thu, 16 Feb 2023 23:45:24 +0300 Subject: [PATCH 10/17] fix sending message to self --- consensus/debugging.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/consensus/debugging.go b/consensus/debugging.go index 034455638..f5386b4c7 100644 --- a/consensus/debugging.go +++ b/consensus/debugging.go @@ -122,9 +122,11 @@ func (m *consensusModule) sendGetBlockStateSyncMessage(_ *messaging.DebugMessage } for _, val := range validators { - valAddress := cryptoPocket.AddressFromString(val.GetAddress()) - if err := m.stateSync.SendStateSyncMessage(stateSyncGetBlockMessage, valAddress, requestHeight); err != nil { - m.logger.Error().Err(err).Str("proto_type", "GetBlockRequest").Msg("failed to send StateSyncMessage") + if m.GetNodeAddress() != val.GetAddress() { + valAddress := cryptoPocket.AddressFromString(val.GetAddress()) + if err := m.stateSync.SendStateSyncMessage(stateSyncGetBlockMessage, valAddress, requestHeight); err != nil { + m.logger.Error().Err(err).Str("proto_type", "GetBlockRequest").Msg("failed to send StateSyncMessage") + } } } } @@ -149,9 +151,11 @@ func (m *consensusModule) sendGetMetadataStateSyncMessage(_ *messaging.DebugMess } for _, val := range validators { - valAddress := cryptoPocket.AddressFromString(val.GetAddress()) - if err := m.stateSync.SendStateSyncMessage(stateSyncMetaDataReqMessage, valAddress, requestHeight); err != nil { - m.logger.Error().Err(err).Str("proto_type", "GetMetaDataRequest").Msg("failed to send StateSyncMessage") + if m.GetNodeAddress() != val.GetAddress() { + valAddress := cryptoPocket.AddressFromString(val.GetAddress()) + if err := m.stateSync.SendStateSyncMessage(stateSyncMetaDataReqMessage, valAddress, requestHeight); err != nil { + m.logger.Error().Err(err).Str("proto_type", "GetMetaDataRequest").Msg("failed to send StateSyncMessage") + } } } From ff8e076e6d8fa7dfd9a6637ef8acf42fbd807209 Mon Sep 17 00:00:00 2001 From: goku <118421317+gokutheengineer@users.noreply.github.com> Date: Fri, 17 Feb 2023 12:38:28 +0300 Subject: [PATCH 11/17] Update consensus/state_sync/module.go Co-authored-by: Daniel Olshansky --- consensus/state_sync/module.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/consensus/state_sync/module.go b/consensus/state_sync/module.go index 80707845e..12c6de5a6 100644 --- a/consensus/state_sync/module.go +++ b/consensus/state_sync/module.go @@ -147,7 +147,7 @@ func (m *stateSync) HandleStateSyncMetadataResponse(metaDataRes *typesCons.State "receiver": clientPeerId, } - m.logger.Info().Fields(fields).Msgf("Received get metadata response: %s", metaDataRes) + m.logger.Info().Fields(fields).Msgf("Received StateSync MetadataResponse: %s", metaDataRes) return nil } From aae5a925937e9f2aae42d9ed15c728f62f51a0d0 Mon Sep 17 00:00:00 2001 From: goku <118421317+gokutheengineer@users.noreply.github.com> Date: Fri, 17 Feb 2023 12:39:43 +0300 Subject: [PATCH 12/17] Update consensus/state_sync/module.go Co-authored-by: Daniel Olshansky --- consensus/state_sync/module.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/consensus/state_sync/module.go b/consensus/state_sync/module.go index 12c6de5a6..b863340e1 100644 --- a/consensus/state_sync/module.go +++ b/consensus/state_sync/module.go @@ -128,7 +128,7 @@ func (m *stateSync) HandleGetBlockResponse(blockRes *typesCons.GetBlockResponse) "receiver": clientPeerId, } - m.logger.Info().Fields(fields).Msgf("Received get block response: %s", blockRes) + m.logger.Info().Fields(fields).Msgf("Received StateSync GetBlockResponse: %s", blockRes) return nil } From a75fe0d75ddec6516842ab0d33823707c2434bfb Mon Sep 17 00:00:00 2001 From: goku <118421317+gokutheengineer@users.noreply.github.com> Date: Fri, 17 Feb 2023 12:40:54 +0300 Subject: [PATCH 13/17] Update consensus/state_sync/server.go Co-authored-by: Daniel Olshansky --- consensus/state_sync/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/consensus/state_sync/server.go b/consensus/state_sync/server.go index 7ce213cd8..ee882dff4 100644 --- a/consensus/state_sync/server.go +++ b/consensus/state_sync/server.go @@ -33,7 +33,7 @@ func (m *stateSync) HandleStateSyncMetadataRequest(metadataReq *typesCons.StateS "receiver": clientPeerAddress, } - m.logger.Info().Fields(fields).Msgf("Received state sync get block request: %s", metadataReq) + m.logger.Info().Fields(fields).Msgf("Received StateSync Metadata %s", metadataReq) persistenceContext, err := m.GetBus().GetPersistenceModule().NewReadContext(int64(lastPersistedBlockHeight)) if err != nil { From 5e5dcaaeea44819be4555315dae207b579ae2e71 Mon Sep 17 00:00:00 2001 From: goku <118421317+gokutheengineer@users.noreply.github.com> Date: Fri, 17 Feb 2023 12:41:17 +0300 Subject: [PATCH 14/17] Update consensus/state_sync/server.go Co-authored-by: Daniel Olshansky --- consensus/state_sync/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/consensus/state_sync/server.go b/consensus/state_sync/server.go index ee882dff4..aaa2cf8c2 100644 --- a/consensus/state_sync/server.go +++ b/consensus/state_sync/server.go @@ -77,7 +77,7 @@ func (m *stateSync) HandleGetBlockRequest(blockReq *typesCons.GetBlockRequest) e "receiver": clientPeerAddress, } - m.logger.Info().Fields(fields).Msgf("Received state sync get block request: %s", blockReq) + m.logger.Info().Fields(fields).Msgf("Received StateSync GetBlockRequest: %s", blockReq) if lastPersistedBlockHeight < blockReq.Height { return fmt.Errorf("requested block height: %d is higher than current persisted block height: %d", blockReq.Height, lastPersistedBlockHeight) From 6a71c73abe9918f3cbca192a61844079c97fe871 Mon Sep 17 00:00:00 2001 From: goku <118421317+gokutheengineer@users.noreply.github.com> Date: Fri, 17 Feb 2023 12:41:54 +0300 Subject: [PATCH 15/17] Update consensus/debugging.go Co-authored-by: Daniel Olshansky --- consensus/debugging.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/consensus/debugging.go b/consensus/debugging.go index f5386b4c7..a2529ed01 100644 --- a/consensus/debugging.go +++ b/consensus/debugging.go @@ -122,11 +122,12 @@ func (m *consensusModule) sendGetBlockStateSyncMessage(_ *messaging.DebugMessage } for _, val := range validators { - if m.GetNodeAddress() != val.GetAddress() { - valAddress := cryptoPocket.AddressFromString(val.GetAddress()) - if err := m.stateSync.SendStateSyncMessage(stateSyncGetBlockMessage, valAddress, requestHeight); err != nil { - m.logger.Error().Err(err).Str("proto_type", "GetBlockRequest").Msg("failed to send StateSyncMessage") - } + if m.GetNodeAddress() == val.GetAddress() { + continue + } + valAddress := cryptoPocket.AddressFromString(val.GetAddress()) + if err := m.stateSync.SendStateSyncMessage(stateSyncGetBlockMessage, valAddress, requestHeight); err != nil { + m.logger.Error().Err(err).Str("proto_type", "GetBlockRequest").Msg("failed to send StateSyncMessage") } } } From 00f137d06941f9eaeec0f8276b9d636a454c10be Mon Sep 17 00:00:00 2001 From: gokutheengineer Date: Fri, 17 Feb 2023 12:55:04 +0300 Subject: [PATCH 16/17] address comment, update changelog --- app/pocket/doc/CHANGELOG.md | 2 +- consensus/debugging.go | 9 +++++---- consensus/doc/CHANGELOG.md | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/pocket/doc/CHANGELOG.md b/app/pocket/doc/CHANGELOG.md index 9389ec665..d3b0055d0 100644 --- a/app/pocket/doc/CHANGELOG.md +++ b/app/pocket/doc/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [0.0.0.5] - 2023-02-16 +## [0.0.0.5] - 2023-02-17 - Removed unnecessary server mode enabling call via `EnableServerMode()` function diff --git a/consensus/debugging.go b/consensus/debugging.go index a2529ed01..70e07ca7c 100644 --- a/consensus/debugging.go +++ b/consensus/debugging.go @@ -153,10 +153,11 @@ func (m *consensusModule) sendGetMetadataStateSyncMessage(_ *messaging.DebugMess for _, val := range validators { if m.GetNodeAddress() != val.GetAddress() { - valAddress := cryptoPocket.AddressFromString(val.GetAddress()) - if err := m.stateSync.SendStateSyncMessage(stateSyncMetaDataReqMessage, valAddress, requestHeight); err != nil { - m.logger.Error().Err(err).Str("proto_type", "GetMetaDataRequest").Msg("failed to send StateSyncMessage") - } + continue + } + valAddress := cryptoPocket.AddressFromString(val.GetAddress()) + if err := m.stateSync.SendStateSyncMessage(stateSyncMetaDataReqMessage, valAddress, requestHeight); err != nil { + m.logger.Error().Err(err).Str("proto_type", "GetMetaDataRequest").Msg("failed to send StateSyncMessage") } } diff --git a/consensus/doc/CHANGELOG.md b/consensus/doc/CHANGELOG.md index 08a49e043..267acae52 100644 --- a/consensus/doc/CHANGELOG.md +++ b/consensus/doc/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [0.0.0.29] - 2023-02-16 +## [0.0.0.29] - 2023-02-17 - Updated log messages in the state sync submodule with consistent style and add height information - Added state sync message types to the types package From b4a39554c470ce5b0f543fc5e9195b2d69fda6c0 Mon Sep 17 00:00:00 2001 From: gokutheengineer Date: Fri, 17 Feb 2023 22:23:42 +0300 Subject: [PATCH 17/17] refactor: change interface{} to any --- consensus/state_sync/helpers.go | 2 +- consensus/state_sync/module.go | 4 ++-- consensus/state_sync/server.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/consensus/state_sync/helpers.go b/consensus/state_sync/helpers.go index 0b4ce6d19..95ad01796 100644 --- a/consensus/state_sync/helpers.go +++ b/consensus/state_sync/helpers.go @@ -12,7 +12,7 @@ func (m *stateSync) SendStateSyncMessage(stateSyncMsg *typesCons.StateSyncMessag return err } - fields := map[string]interface{}{ + fields := map[string]any{ "height": height, "peerId": peerId, "proto_type": getMessageType(stateSyncMsg), diff --git a/consensus/state_sync/module.go b/consensus/state_sync/module.go index 3ae2650f3..01d20972d 100644 --- a/consensus/state_sync/module.go +++ b/consensus/state_sync/module.go @@ -123,7 +123,7 @@ func (m *stateSync) HandleGetBlockResponse(blockRes *typesCons.GetBlockResponse) serverNodePeerId := consensusMod.GetNodeAddress() clientPeerId := blockRes.PeerAddress - fields := map[string]interface{}{ + fields := map[string]any{ "currentHeight": blockRes.Block.BlockHeader.Height, "sender": serverNodePeerId, "receiver": clientPeerId, @@ -142,7 +142,7 @@ func (m *stateSync) HandleStateSyncMetadataResponse(metaDataRes *typesCons.State clientPeerId := metaDataRes.PeerAddress currentHeight := consensusMod.CurrentHeight() - fields := map[string]interface{}{ + fields := map[string]any{ "currentHeight": currentHeight, "sender": serverNodePeerId, "receiver": clientPeerId, diff --git a/consensus/state_sync/server.go b/consensus/state_sync/server.go index aaa2cf8c2..1eae8917a 100644 --- a/consensus/state_sync/server.go +++ b/consensus/state_sync/server.go @@ -27,7 +27,7 @@ func (m *stateSync) HandleStateSyncMetadataRequest(metadataReq *typesCons.StateS // current height is the height of the block that is being processed, so we need to subtract 1 for the last finalized block lastPersistedBlockHeight := consensusMod.CurrentHeight() - 1 - fields := map[string]interface{}{ + fields := map[string]any{ "height": lastPersistedBlockHeight, "sender": serverNodePeerAddress, "receiver": clientPeerAddress, @@ -71,7 +71,7 @@ func (m *stateSync) HandleGetBlockRequest(blockReq *typesCons.GetBlockRequest) e // current height is the height of the block that is being processed, so we need to subtract 1 for the last finalized block lastPersistedBlockHeight := consensusMod.CurrentHeight() - 1 - fields := map[string]interface{}{ + fields := map[string]any{ "height": lastPersistedBlockHeight, "sender": serverNodePeerAddress, "receiver": clientPeerAddress,