fix(p2p): validating gossiped block is created by the proposer

CHANGELOG.md

@@ -1,7 +1,7 @@
-# [](https://github.com/dymensionxyz/dymint/compare/v1.1.0-rc02...v) (2024-05-03)
+# [](https://github.com/dymensionxyz/dymint/compare/v1.1.0-rc02...v) (2024-05-05)
 
 
 ### Bug Fixes
 
 * **bug:** sync from da and p2p when starting a node ([#763](https://github.com/dymensionxyz/dymint/issues/763)) ([68ffd05](https://github.com/dymensionxyz/dymint/commit/68ffd05794949ddc42df1c132d1fde5f21b505f4))
 * **celestia test:** fix race in test ([#755](https://github.com/dymensionxyz/dymint/issues/755)) ([0b36781](https://github.com/dymensionxyz/dymint/commit/0b367818bf6aa8da4a4fd8e4e5c78223b60b44e0))
@@ -13,27 +13,29 @@
 * **doc:** manager cache comment ([#767](https://github.com/dymensionxyz/dymint/issues/767)) ([b88bf6e](https://github.com/dymensionxyz/dymint/commit/b88bf6e72820c944b290147724255cc8466ada50))
 * **logging:** added reason for websocket closed debug msg ([#746](https://github.com/dymensionxyz/dymint/issues/746)) ([3aa7d80](https://github.com/dymensionxyz/dymint/commit/3aa7d80ace92b3b0f79e4f338f10bb94c96ab6dd))
 * **logs:** make logs more readable in a couple places, fix race cond ([#749](https://github.com/dymensionxyz/dymint/issues/749)) ([f05ef39](https://github.com/dymensionxyz/dymint/commit/f05ef3957b754c05fbc90aa39eabce80bbe65933))
+* **manager:** get fresh height in loop ([#781](https://github.com/dymensionxyz/dymint/issues/781)) ([e4df480](https://github.com/dymensionxyz/dymint/commit/e4df48037a78965dbac9e747dd296f39360e396c))
 * **p2p:** validate block before applying and not before caching in p2p gossiping ([#723](https://github.com/dymensionxyz/dymint/issues/723)) ([98371b5](https://github.com/dymensionxyz/dymint/commit/98371b5220613e70f3274fab5593e02ba532f7db))
 * **produce loop:** handle unauthenticated error in settlement layer ([#726](https://github.com/dymensionxyz/dymint/issues/726)) ([33e78d1](https://github.com/dymensionxyz/dymint/commit/33e78d116b5f14b91b8b3bda2b6cbfee9040e2d3))
 * **rpc:** nil panic in rpc/json/handler.go WriteError ([#750](https://github.com/dymensionxyz/dymint/issues/750)) ([e09709b](https://github.com/dymensionxyz/dymint/commit/e09709b428a33da002defb9f13178fa19b81a69b))
 * **settlement:** remove state index from proto ([#777](https://github.com/dymensionxyz/dymint/issues/777)) ([767b8fd](https://github.com/dymensionxyz/dymint/commit/767b8fdb490c37deee43ac023688410bbb98ccb0))
 * **sync:** make sure we use a latest state index as a start point ([#760](https://github.com/dymensionxyz/dymint/issues/760)) ([43e2d96](https://github.com/dymensionxyz/dymint/commit/43e2d965f2b505751f8e5260549e909c976141ee))
+* **sync:** removing height condition for applying cached blocks from p2p ([#787](https://github.com/dymensionxyz/dymint/issues/787)) ([b97299c](https://github.com/dymensionxyz/dymint/commit/b97299ce7f78168863c5e1c2d7fc479aed2ae6da))
 * **tests:** fix unit tests, mocks, cleanup/dry hub queries ([#782](https://github.com/dymensionxyz/dymint/issues/782)) ([c276aea](https://github.com/dymensionxyz/dymint/commit/c276aea12c9cd37f62fcf9d684c4efe901a510bf))
 
 
 ### Features
 
 * **produce:** limiting block size by maxBatchSize ([#784](https://github.com/dymensionxyz/dymint/issues/784)) ([f90042c](https://github.com/dymensionxyz/dymint/commit/f90042cd61fc6b60093478cd65491f8aa1106457))
 
 
 
 # [1.1.0-rc02](https://github.com/dymensionxyz/dymint/compare/v1.1.0-rc01...v1.1.0-rc02) (2024-04-26)
 
 
 
 # [1.1.0-rc01](https://github.com/dymensionxyz/dymint/compare/v1.0.1-alpha...v1.1.0-rc01) (2024-04-25)
 
 
 ### Bug Fixes
 
 * **block production:** apply block before gossiping ([#695](https://github.com/dymensionxyz/dymint/issues/695)) ([5c496b4](https://github.com/dymensionxyz/dymint/commit/5c496b453e98bbcc67feb6df3a2d4ad340586816))

node/node.go

@@ -202,7 +202,7 @@ func NewNode(
 	mpIDs := nodemempool.NewMempoolIDs()
 
 	// Set p2p client and it's validators
-	p2pValidator := p2p.NewValidator(logger.With("module", "p2p_validator"), pubsubServer)
+	p2pValidator := p2p.NewValidator(logger.With("module", "p2p_validator"), pubsubServer, settlementlc)
 
 	conf.P2P.GossipCacheSize = conf.BlockManagerConfig.GossipedBlocksCacheSize
 	conf.P2P.BoostrapTime = conf.BootstrapTime

p2p/events.go

@@ -1,8 +1,6 @@
 package p2p
 
 import (
-	"github.com/dymensionxyz/dymint/p2p/pb"
-	"github.com/dymensionxyz/dymint/types"
 	uevent "github.com/dymensionxyz/dymint/utils/event"
 )
 
@@ -19,64 +17,6 @@ const (
 	EventNewGossipedBlock = "NewGossipedBlock"
 )
 
-/* -------------------------------------------------------------------------- */
-/*                                 Event Data                                 */
-/* -------------------------------------------------------------------------- */
-
-// GossipedBlock defines the struct of the event data for the GossipedBlock
-type GossipedBlock struct {
-	// Block is the block that was gossiped
-	Block types.Block
-	// Commit is the commit that was gossiped
-	Commit types.Commit
-}
-
-// MarshalBinary encodes GossipedBlock into binary form and returns it.
-func (e *GossipedBlock) MarshalBinary() ([]byte, error) {
-	return e.ToProto().Marshal()
-}
-
-// UnmarshalBinary decodes binary form of GossipedBlock into object.
-func (e *GossipedBlock) UnmarshalBinary(data []byte) error {
-	var pbGossipedBlock pb.GossipedBlock
-	err := pbGossipedBlock.Unmarshal(data)
-	if err != nil {
-		return err
-	}
-	err = e.FromProto(&pbGossipedBlock)
-	return err
-}
-
-// ToProto converts Data into protobuf representation and returns it.
-func (e *GossipedBlock) ToProto() *pb.GossipedBlock {
-	return &pb.GossipedBlock{
-		Block:  e.Block.ToProto(),
-		Commit: e.Commit.ToProto(),
-	}
-}
-
-// FromProto fills GossipedBlock with data from its protobuf representation.
-func (e *GossipedBlock) FromProto(other *pb.GossipedBlock) error {
-	if err := e.Block.FromProto(other.Block); err != nil {
-		return err
-	}
-	if err := e.Commit.FromProto(other.Commit); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Validate run basic validation on the gossiped block
-func (e *GossipedBlock) Validate() error {
-	if err := e.Block.ValidateBasic(); err != nil {
-		return err
-	}
-	if err := e.Commit.ValidateBasic(); err != nil {
-		return err
-	}
-	return nil
-}
-
 /* -------------------------------------------------------------------------- */
 /*                                   Queries                                  */
 /* -------------------------------------------------------------------------- */

p2p/gossiped_block.go

@@ -0,0 +1,74 @@
+package p2p
+
+import (
+	"github.com/dymensionxyz/dymint/p2p/pb"
+	"github.com/dymensionxyz/dymint/types"
+	tmtypes "github.com/tendermint/tendermint/types"
+)
+
+/* -------------------------------------------------------------------------- */
+/*                                 Event Data                                 */
+/* -------------------------------------------------------------------------- */
+
+// GossipedBlock defines the struct of the event data for the GossipedBlock
+type GossipedBlock struct {
+	// Block is the block that was gossiped
+	Block types.Block
+	// Commit is the commit that was gossiped
+	Commit types.Commit
+}
+
+// MarshalBinary encodes GossipedBlock into binary form and returns it.
+func (e *GossipedBlock) MarshalBinary() ([]byte, error) {
+	return e.ToProto().Marshal()
+}
+
+// UnmarshalBinary decodes binary form of GossipedBlock into object.
+func (e *GossipedBlock) UnmarshalBinary(data []byte) error {
+	var pbGossipedBlock pb.GossipedBlock
+	err := pbGossipedBlock.Unmarshal(data)
+	if err != nil {
+		return err
+	}
+	err = e.FromProto(&pbGossipedBlock)
+	return err
+}
+
+// ToProto converts Data into protobuf representation and returns it.
+func (e *GossipedBlock) ToProto() *pb.GossipedBlock {
+	return &pb.GossipedBlock{
+		Block:  e.Block.ToProto(),
+		Commit: e.Commit.ToProto(),
+	}
+}
+
+// FromProto fills GossipedBlock with data from its protobuf representation.
+func (e *GossipedBlock) FromProto(other *pb.GossipedBlock) error {
+	if err := e.Block.FromProto(other.Block); err != nil {
+		return err
+	}
+	if err := e.Commit.FromProto(other.Commit); err != nil {
+		return err
+	}
+	return nil
+}
+
+// Validate run basic validation on the gossiped block
+func (e *GossipedBlock) Validate(proposer *types.Sequencer) error {
+	if err := e.Block.ValidateBasic(); err != nil {
+		return err
+	}
+	if err := e.Commit.ValidateBasic(); err != nil {
+		return err
+	}
+	if err := e.Commit.ValidateWithHeader(proposer, &e.Block.Header); err != nil {
+		return err
+	}
+	abciData := tmtypes.Data{
+		Txs: types.ToABCIBlockDataTxs(&e.Block.Data),
+	}
+	if e.Block.Header.DataHash != [32]byte(abciData.Hash()) {
+		return types.ErrInvalidHeaderDataHash
+	}
+	return nil
+}